kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

move from deprecated boost.signals to boost.signals2 library

Browse Source
This commit is contained in:
wmayer
2018-10-30 19:09:03 +01:00
parent 3858b179c3
commit f898eafd64
86 changed files with 268 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Gui/Document.cpp
View File

@@ -32,7 +32,7 @@
# include <QKeySequence>
# include <qmessagebox.h>
# include <qstatusbar.h>
# include <boost/signals.hpp>
# include <boost/signals2.hpp>
# include <boost/bind.hpp>
# include <Inventor/actions/SoSearchAction.h>
# include <Inventor/nodes/SoSeparator.h>
@@ -90,7 +90,7 @@ struct DocumentP
std::map<const App::DocumentObject*,ViewProviderDocumentObject*> _ViewProviderMap;
std::map<std::string,ViewProvider*> _ViewProviderMapAnnotation;
typedef boost::signals::connection Connection;
typedef boost::signals2::connection Connection;
Connection connectNewObject;
Connection connectDelObject;
Connection connectCngObject;
@@ -106,6 +106,8 @@ struct DocumentP
Connection connectRedoDocument;
Connection connectTransactionAppend;
Connection connectTransactionRemove;
typedef boost::signals2::shared_connection_block ConnectionBlock;
ConnectionBlock connectActObjectBlocker;
};
} // namespace Gui
@@ -139,6 +141,8 @@ Document::Document(App::Document* pcDocument,Application * app)
(boost::bind(&Gui::Document::slotRelabelObject, this, _1));
d->connectActObject = pcDocument->signalActivatedObject.connect
(boost::bind(&Gui::Document::slotActivatedObject, this, _1));
d->connectActObjectBlocker = boost::signals2::shared_connection_block
(d->connectActObject, false);
d->connectSaveDocument = pcDocument->signalSaveDocument.connect
(boost::bind(&Gui::Document::Save, this, _1));
d->connectRestDocument = pcDocument->signalRestoreDocument.connect
@@ -866,14 +870,14 @@ void Document::slotStartRestoreDocument(const App::Document& doc)
if (d->_pcDocument != &doc)
return;
// disable this signal while loading a document
d->connectActObject.block();
d->connectActObjectBlocker.block();
}
void Document::slotFinishRestoreDocument(const App::Document& doc)
{
if (d->_pcDocument != &doc)
return;
d->connectActObject.unblock();
d->connectActObjectBlocker.unblock();
App::DocumentObject* act = doc.getActiveObject();
if (act) {
ViewProvider* viewProvider = getViewProvider(act);