From f898eafd64f88902ea1916b01303705b3baa2c46 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 30 Oct 2018 19:09:03 +0100 Subject: [PATCH] move from deprecated boost.signals to boost.signals2 library --- CMakeLists.txt | 4 +- src/App/Application.cpp | 1 - src/App/Application.h | 62 +++++++++---------- src/App/Document.h | 62 +++++++++---------- src/App/DocumentObject.h | 8 +-- src/App/DocumentObserver.cpp | 1 - src/App/DocumentObserver.h | 4 +- src/App/DocumentObserverPython.h | 4 +- src/App/MergeDocuments.h | 4 +- src/App/PreCompiled.h | 2 +- src/App/PropertyExpressionEngine.h | 4 +- src/Base/Tools.h | 13 ++-- src/Gui/Action.cpp | 2 +- src/Gui/Application.cpp | 2 +- src/Gui/Application.h | 32 +++++----- src/Gui/AutoSaver.h | 4 +- src/Gui/DAGView/DAGModel.cpp | 1 - src/Gui/DAGView/DAGModel.h | 4 +- src/Gui/DlgDisplayPropertiesImp.h | 6 +- src/Gui/Document.cpp | 12 ++-- src/Gui/Document.h | 32 +++++----- src/Gui/DocumentModel.cpp | 2 +- src/Gui/DocumentObserver.cpp | 14 ----- src/Gui/DocumentObserver.h | 23 +------ src/Gui/DocumentObserverPython.h | 4 +- src/Gui/ExpressionBinding.h | 4 +- src/Gui/GraphvizView.h | 4 +- src/Gui/MDIView.cpp | 2 +- src/Gui/MDIView.h | 2 +- src/Gui/MainWindow.cpp | 1 - src/Gui/ManualAlignment.cpp | 1 - src/Gui/ManualAlignment.h | 4 +- src/Gui/MergeDocuments.h | 4 +- src/Gui/Placement.h | 4 +- src/Gui/PreCompiled.h | 2 +- src/Gui/ProjectView.cpp | 1 - src/Gui/PropertyView.h | 14 ++--- src/Gui/Selection.cpp | 7 +-- src/Gui/Selection.h | 6 +- src/Gui/TaskView/TaskAppearance.h | 4 +- src/Gui/TaskView/TaskSelectLinkProperty.h | 1 - src/Gui/TaskView/TaskView.h | 4 +- src/Gui/Tree.cpp | 1 - src/Gui/Tree.h | 4 +- src/Gui/ViewProvider.h | 8 +-- src/Gui/ViewProviderOriginGroup.h | 2 - src/Gui/ViewProviderOriginGroupExtension.h | 4 +- src/Gui/ViewProviderPythonFeature.cpp | 1 - src/Mod/Drawing/Gui/TaskOrthoViews.cpp | 14 ++--- src/Mod/Drawing/Gui/TaskOrthoViews.h | 8 +-- src/Mod/Fem/Gui/TaskPostBoxes.h | 13 ++-- src/Mod/Fem/Gui/ViewProviderFemPostFunction.h | 37 +++-------- src/Mod/Inspection/App/InspectionFeature.cpp | 1 - src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp | 1 - src/Mod/Mesh/Gui/MeshEditor.h | 4 +- src/Mod/Part/App/PreCompiled.h | 10 +-- src/Mod/Part/Gui/DlgBooleanOperation.h | 4 +- src/Mod/Part/Gui/DlgFilletEdges.cpp | 2 +- src/Mod/Part/Gui/TaskAttacher.h | 2 +- src/Mod/Part/Gui/TaskFaceColors.cpp | 4 +- src/Mod/PartDesign/App/Body.h | 4 +- src/Mod/PartDesign/App/ShapeBinder.h | 4 +- .../PartDesign/Gui/TaskFeatureParameters.cpp | 1 - src/Mod/PartDesign/Gui/TaskHoleParameters.h | 2 +- .../Gui/TaskPrimitiveParameters.cpp | 1 - .../PartDesign/Gui/TaskPrimitiveParameters.h | 2 - .../PartDesign/Gui/TaskTransformedMessages.h | 4 +- .../Gui/TaskTransformedParameters.cpp | 1 - src/Mod/PartDesign/Gui/ViewProviderBody.h | 4 +- .../PartDesign/Gui/ViewProviderTransformed.h | 2 +- src/Mod/PartDesign/Gui/WorkflowManager.h | 8 +-- src/Mod/Sandbox/App/DocumentProtector.h | 17 +++-- src/Mod/Sketcher/App/PropertyConstraintList.h | 6 +- src/Mod/Sketcher/App/SketchObject.h | 4 +- src/Mod/Sketcher/Gui/TaskDlgEditSketch.h | 4 +- src/Mod/Sketcher/Gui/TaskSketcherConstrains.h | 4 +- src/Mod/Sketcher/Gui/TaskSketcherElements.h | 4 +- src/Mod/Sketcher/Gui/TaskSketcherMessages.h | 4 +- .../Sketcher/Gui/TaskSketcherSolverAdvanced.h | 1 - src/Mod/Sketcher/Gui/ViewProviderSketch.h | 15 +++-- src/Mod/Spreadsheet/App/Sheet.h | 12 ++-- src/Mod/Spreadsheet/Gui/SheetModel.h | 2 +- src/Mod/Spreadsheet/Gui/SheetTableView.h | 2 +- src/Mod/Spreadsheet/Gui/SpreadsheetView.h | 6 +- src/Mod/TechDraw/Gui/MDIViewPage.cpp | 2 +- src/Mod/TechDraw/Gui/MDIViewPage.h | 2 +- 86 files changed, 268 insertions(+), 342 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d0a72edc53da..0cf396c486b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -586,7 +586,7 @@ endif() SET(_boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS}) - set (BOOST_COMPONENTS filesystem program_options regex signals system thread) + set (BOOST_COMPONENTS filesystem program_options regex system thread) find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS ${BOOST_COMPONENTS} REQUIRED) @@ -1100,7 +1100,7 @@ ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8) IF(MSVC) # set default compiler settings SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zm150") - SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFC_DEBUG /Zm150") + SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFC_DEBUG /Zm150 /bigobj") # set default libs SET (CMAKE_C_STANDARD_LIBRARIES "kernel32.lib user32.lib gdi32.lib winspool.lib SHFolder.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib winmm.lib comsupp.lib Ws2_32.lib dbghelp.lib ") set (CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES}") diff --git a/src/App/Application.cpp b/src/App/Application.cpp index 6c09b4b3204e..1f5e86c1ff2d 100644 --- a/src/App/Application.cpp +++ b/src/App/Application.cpp @@ -121,7 +121,6 @@ #include #include -#include #include #include #include diff --git a/src/App/Application.h b/src/App/Application.h index 486514b4ed36..68afef12a8ba 100644 --- a/src/App/Application.h +++ b/src/App/Application.h @@ -25,7 +25,7 @@ #ifndef APP_APPLICATION_H #define APP_APPLICATION_H -#include +#include #include @@ -99,31 +99,31 @@ class AppExport Application /** @name Signals of the Application */ //@{ /// signal on new Document - boost::signal signalNewDocument; + boost::signals2::signal signalNewDocument; /// signal on document getting deleted - boost::signal signalDeleteDocument; + boost::signals2::signal signalDeleteDocument; /// signal on already deleted Document - boost::signal signalDeletedDocument; + boost::signals2::signal signalDeletedDocument; /// signal on relabeling Document (user name) - boost::signal signalRelabelDocument; + boost::signals2::signal signalRelabelDocument; /// signal on renaming Document (internal name) - boost::signal signalRenameDocument; + boost::signals2::signal signalRenameDocument; /// signal on activating Document - boost::signal signalActiveDocument; + boost::signals2::signal signalActiveDocument; /// signal on saving Document - boost::signal signalSaveDocument; + boost::signals2::signal signalSaveDocument; /// signal on starting to restore Document - boost::signal signalStartRestoreDocument; + boost::signals2::signal signalStartRestoreDocument; /// signal on restoring Document - boost::signal signalFinishRestoreDocument; + boost::signals2::signal signalFinishRestoreDocument; /// signal on starting to save Document - boost::signal signalStartSaveDocument; + boost::signals2::signal signalStartSaveDocument; /// signal on saved Document - boost::signal signalFinishSaveDocument; + boost::signals2::signal signalFinishSaveDocument; /// signal on undo in document - boost::signal signalUndoDocument; + boost::signals2::signal signalUndoDocument; /// signal on redo in document - boost::signal signalRedoDocument; + boost::signals2::signal signalRedoDocument; //@} @@ -133,32 +133,32 @@ class AppExport Application */ //@{ /// signal before change of doc property - boost::signal signalBeforeChangeDocument; + boost::signals2::signal signalBeforeChangeDocument; /// signal on changed doc property - boost::signal signalChangedDocument; + boost::signals2::signal signalChangedDocument; /// signal on new Object - boost::signal signalNewObject; - //boost::signal m_sig; + boost::signals2::signal signalNewObject; + //boost::signals2::signal m_sig; /// signal on deleted Object - boost::signal signalDeletedObject; + boost::signals2::signal signalDeletedObject; /// signal on changed Object - boost::signal signalBeforeChangeObject; + boost::signals2::signal signalBeforeChangeObject; /// signal on changed Object - boost::signal signalChangedObject; + boost::signals2::signal signalChangedObject; /// signal on relabeled Object - boost::signal signalRelabelObject; + boost::signals2::signal signalRelabelObject; /// signal on activated Object - boost::signal signalActivatedObject; + boost::signals2::signal signalActivatedObject; /// signal on recomputed document - boost::signal signalRecomputed; + boost::signals2::signal signalRecomputed; /// signal on recomputed document object - boost::signal signalObjectRecomputed; + boost::signals2::signal signalObjectRecomputed; // signal on opened transaction - boost::signal signalOpenTransaction; + boost::signals2::signal signalOpenTransaction; // signal a committed transaction - boost::signal signalCommitTransaction; + boost::signals2::signal signalCommitTransaction; // signal an aborted transaction - boost::signal signalAbortTransaction; + boost::signals2::signal signalAbortTransaction; //@} /** @name Signals of property changes @@ -167,11 +167,11 @@ class AppExport Application */ //@{ /// signal on adding a dynamic property - boost::signal signalAppendDynamicProperty; + boost::signals2::signal signalAppendDynamicProperty; /// signal on about removing a dynamic property - boost::signal signalRemoveDynamicProperty; + boost::signals2::signal signalRemoveDynamicProperty; /// signal on about changing the editor mode of a property - boost::signal signalChangePropertyEditor; + boost::signals2::signal signalChangePropertyEditor; //@} diff --git a/src/App/Document.h b/src/App/Document.h index e2525936c2ae..e570cc5c85c5 100644 --- a/src/App/Document.h +++ b/src/App/Document.h @@ -37,7 +37,7 @@ #include #include -#include +#include namespace Base { class Writer; @@ -113,57 +113,57 @@ class AppExport Document : public App::PropertyContainer /** @name Signals of the document */ //@{ /// signal before changing an doc property - boost::signal signalBeforeChange; + boost::signals2::signal signalBeforeChange; /// signal on changed doc property - boost::signal signalChanged; + boost::signals2::signal signalChanged; /// signal on new Object - boost::signal signalNewObject; - //boost::signal m_sig; + boost::signals2::signal signalNewObject; + //boost::signals2::signal m_sig; /// signal on deleted Object - boost::signal signalDeletedObject; + boost::signals2::signal signalDeletedObject; /// signal before changing an Object - boost::signal signalBeforeChangeObject; + boost::signals2::signal signalBeforeChangeObject; /// signal on changed Object - boost::signal signalChangedObject; + boost::signals2::signal signalChangedObject; /// signal on relabeled Object - boost::signal signalRelabelObject; + boost::signals2::signal signalRelabelObject; /// signal on activated Object - boost::signal signalActivatedObject; + boost::signals2::signal signalActivatedObject; /// signal on created object - boost::signal signalTransactionAppend; + boost::signals2::signal signalTransactionAppend; /// signal on removed object - boost::signal signalTransactionRemove; + boost::signals2::signal signalTransactionRemove; /// signal on undo - boost::signal signalUndo; + boost::signals2::signal signalUndo; /// signal on redo - boost::signal signalRedo; + boost::signals2::signal signalRedo; /** signal on load/save document * this signal is given when the document gets streamed. * you can use this hook to write additional information in * the file (like the Gui::Document does). */ - boost::signal signalSaveDocument; - boost::signal signalRestoreDocument; - boost::signal&, - Base::Writer &)> signalExportObjects; - boost::signal&, - Base::Writer &)> signalExportViewObjects; - boost::signal&, - Base::XMLReader&)> signalImportObjects; - boost::signal&, Base::Reader&, - const std::map&)> signalImportViewObjects; + boost::signals2::signal signalSaveDocument; + boost::signals2::signal signalRestoreDocument; + boost::signals2::signal&, + Base::Writer &)> signalExportObjects; + boost::signals2::signal&, + Base::Writer &)> signalExportViewObjects; + boost::signals2::signal&, + Base::XMLReader&)> signalImportObjects; + boost::signals2::signal&, Base::Reader&, + const std::map&)> signalImportViewObjects; //signal starting a save action to a file - boost::signal signalStartSave; + boost::signals2::signal signalStartSave; //signal finishing a save action to a file - boost::signal signalFinishSave; - boost::signal signalRecomputed; - boost::signal signalRecomputedObject; + boost::signals2::signal signalFinishSave; + boost::signals2::signal signalRecomputed; + boost::signals2::signal signalRecomputedObject; //signal a new opened transaction - boost::signal signalOpenTransaction; + boost::signals2::signal signalOpenTransaction; // signal a committed transaction - boost::signal signalCommitTransaction; + boost::signals2::signal signalCommitTransaction; // signal an aborted transaction - boost::signal signalAbortTransaction; + boost::signals2::signal signalAbortTransaction; //@} /** @name File handling of the document */ diff --git a/src/App/DocumentObject.h b/src/App/DocumentObject.h index 63c0194fce9b..30dc94ea838a 100644 --- a/src/App/DocumentObject.h +++ b/src/App/DocumentObject.h @@ -33,7 +33,7 @@ #include #include -#include +#include namespace App { @@ -291,9 +291,9 @@ class AppExport DocumentObject: public App::TransactionalObject App::Document* _pDoc; // Connections to track relabeling of document and document objects - boost::BOOST_SIGNALS_NAMESPACE::scoped_connection onRelabledDocumentConnection; - boost::BOOST_SIGNALS_NAMESPACE::scoped_connection onRelabledObjectConnection; - boost::BOOST_SIGNALS_NAMESPACE::scoped_connection onDeletedObjectConnection; + boost::signals2::scoped_connection onRelabledDocumentConnection; + boost::signals2::scoped_connection onRelabledObjectConnection; + boost::signals2::scoped_connection onDeletedObjectConnection; /// Old label; used for renaming expressions std::string oldLabel; diff --git a/src/App/DocumentObserver.cpp b/src/App/DocumentObserver.cpp index 6ee2604c07aa..818e1ddd37d0 100644 --- a/src/App/DocumentObserver.cpp +++ b/src/App/DocumentObserver.cpp @@ -27,7 +27,6 @@ # include #endif -#include #include #include "Application.h" diff --git a/src/App/DocumentObserver.h b/src/App/DocumentObserver.h index fe5f6183802e..f97fd65d5938 100644 --- a/src/App/DocumentObserver.h +++ b/src/App/DocumentObserver.h @@ -25,7 +25,7 @@ #define APP_DOCUMENTOBSERVER_H #include -#include +#include #include namespace App @@ -161,7 +161,7 @@ class AppExport DocumentObserver private: App::Document* _document; - typedef boost::signals::connection Connection; + typedef boost::signals2::connection Connection; Connection connectApplicationCreatedDocument; Connection connectApplicationDeletedDocument; Connection connectDocumentCreatedObject; diff --git a/src/App/DocumentObserverPython.h b/src/App/DocumentObserverPython.h index 71643d9084f3..afff82b45b54 100644 --- a/src/App/DocumentObserverPython.h +++ b/src/App/DocumentObserverPython.h @@ -26,7 +26,7 @@ #include -#include +#include #include namespace App @@ -100,7 +100,7 @@ class AppExport DocumentObserverPython Py::Object inst; static std::vector _instances; - typedef boost::signals::connection Connection; + typedef boost::signals2::connection Connection; Connection connectApplicationCreatedDocument; Connection connectApplicationDeletedDocument; Connection connectApplicationRelabelDocument; diff --git a/src/App/MergeDocuments.h b/src/App/MergeDocuments.h index cc9620eeef38..4e2249240ed6 100644 --- a/src/App/MergeDocuments.h +++ b/src/App/MergeDocuments.h @@ -24,7 +24,7 @@ #ifndef APP_MERGEDOCUMENTS_H #define APP_MERGEDOCUMENTS_H -#include +#include #include namespace zipios { @@ -57,7 +57,7 @@ class AppExport MergeDocuments : public Base::Persistence App::Document* appdoc; std::vector objects; std::map nameMap; - typedef boost::signals::connection Connection; + typedef boost::signals2::connection Connection; Connection connectExport; Connection connectImport; }; diff --git a/src/App/PreCompiled.h b/src/App/PreCompiled.h index 2b3ff8558de3..49cba36526ca 100644 --- a/src/App/PreCompiled.h +++ b/src/App/PreCompiled.h @@ -75,7 +75,7 @@ #include // Boost -#include +#include #include #include diff --git a/src/App/PropertyExpressionEngine.h b/src/App/PropertyExpressionEngine.h index 9cf8f39398dd..868ed2387b11 100644 --- a/src/App/PropertyExpressionEngine.h +++ b/src/App/PropertyExpressionEngine.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include @@ -125,7 +125,7 @@ class AppExport PropertyExpressionEngine : public App::Property, private App::At void slotObjectDeleted(const DocumentObject &obj); ///signal called when an expression was changed - boost::signal expressionChanged; + boost::signals2::signal expressionChanged; void onDocumentRestored(); diff --git a/src/Base/Tools.h b/src/Base/Tools.h index 4e844bc38db4..affd12c95efe 100644 --- a/src/Base/Tools.h +++ b/src/Base/Tools.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include namespace Base @@ -180,17 +180,14 @@ class StateLocker // ---------------------------------------------------------------------------- class ConnectionBlocker { - typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection; - bool b; - Connection& c; + typedef boost::signals2::connection Connection; + typedef boost::signals2::shared_connection_block ConnectionBlock; + ConnectionBlock blocker; public: - ConnectionBlocker(Connection& c) : c(c) { - b = c.blocked(); - c.block(true); + ConnectionBlocker(Connection& c) : blocker(c) { } ~ConnectionBlocker() { - c.block(b); } }; diff --git a/src/Gui/Action.cpp b/src/Gui/Action.cpp index 4b8e326744bf..4ba3c3f7a54b 100644 --- a/src/Gui/Action.cpp +++ b/src/Gui/Action.cpp @@ -24,7 +24,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include +# include # include # include # include diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index c15445d6c9fb..24d8f75b28ff 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -25,7 +25,7 @@ #ifndef _PreComp_ # include "InventorAll.h" -# include +# include # include # include # include diff --git a/src/Gui/Application.h b/src/Gui/Application.h index 73ca82a56d1e..7d121d96b10c 100644 --- a/src/Gui/Application.h +++ b/src/Gui/Application.h @@ -89,37 +89,37 @@ class GuiExport Application /** @name Signals of the Application */ //@{ /// signal on new Document - boost::signal signalNewDocument; + boost::signals2::signal signalNewDocument; /// signal on deleted Document - boost::signal signalDeleteDocument; + boost::signals2::signal signalDeleteDocument; /// signal on relabeling Document - boost::signal signalRelabelDocument; + boost::signals2::signal signalRelabelDocument; /// signal on renaming Document - boost::signal signalRenameDocument; + boost::signals2::signal signalRenameDocument; /// signal on activating Document - boost::signal signalActiveDocument; + boost::signals2::signal signalActiveDocument; /// signal on new Object - boost::signal signalNewObject; + boost::signals2::signal signalNewObject; /// signal on deleted Object - boost::signal signalDeletedObject; + boost::signals2::signal signalDeletedObject; /// signal on changed object property - boost::signal signalChangedObject; + boost::signals2::signal signalChangedObject; /// signal on renamed Object - boost::signal signalRelabelObject; + boost::signals2::signal signalRelabelObject; /// signal on activated Object - boost::signal signalActivatedObject; + boost::signals2::signal signalActivatedObject; /// signal on activated workbench - boost::signal signalActivateWorkbench; + boost::signals2::signal signalActivateWorkbench; /// signal on added workbench - boost::signal signalAddWorkbench; + boost::signals2::signal signalAddWorkbench; /// signal on removed workbench - boost::signal signalRemoveWorkbench; + boost::signals2::signal signalRemoveWorkbench; /// signal on activating view - boost::signal signalActivateView; + boost::signals2::signal signalActivateView; /// signal on entering in edit mode - boost::signal signalInEdit; + boost::signals2::signal signalInEdit; /// signal on leaving edit mode - boost::signal signalResetEdit; + boost::signals2::signal signalResetEdit; //@} /** @name methods for Document handling */ diff --git a/src/Gui/AutoSaver.h b/src/Gui/AutoSaver.h index 2b0ae0858079..9e7d77d59a27 100644 --- a/src/Gui/AutoSaver.h +++ b/src/Gui/AutoSaver.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include namespace App { class Document; @@ -53,7 +53,7 @@ class AutoSaveProperty private: void slotNewObject(const App::DocumentObject&); void slotChangePropertyData(const App::Property&); - typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection; + typedef boost::signals2::connection Connection; Connection documentNew; Connection documentMod; }; diff --git a/src/Gui/DAGView/DAGModel.cpp b/src/Gui/DAGView/DAGModel.cpp index 574843dc4882..31ace8757b2f 100644 --- a/src/Gui/DAGView/DAGModel.cpp +++ b/src/Gui/DAGView/DAGModel.cpp @@ -22,7 +22,6 @@ #include "PreCompiled.h" #ifndef _PreComp_ -#include #include #include #include diff --git a/src/Gui/DAGView/DAGModel.h b/src/Gui/DAGView/DAGModel.h index f317500fe5bc..6ae263b3234c 100644 --- a/src/Gui/DAGView/DAGModel.h +++ b/src/Gui/DAGView/DAGModel.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include @@ -86,7 +86,7 @@ namespace Gui private: Model(){} //documentObject slots. - typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection; + typedef boost::signals2::connection Connection; Connection connectNewObject; Connection connectDelObject; Connection connectChgObject; diff --git a/src/Gui/DlgDisplayPropertiesImp.h b/src/Gui/DlgDisplayPropertiesImp.h index 0bdda40b9af1..50e0b79eedd4 100644 --- a/src/Gui/DlgDisplayPropertiesImp.h +++ b/src/Gui/DlgDisplayPropertiesImp.h @@ -25,7 +25,7 @@ #define GUI_DIALOG_DLGDISPLAYPROPERTIES_IMP_H #include -#include +#include #include "ui_DlgDisplayProperties.h" #include "Selection.h" @@ -42,7 +42,7 @@ namespace Gui { class Command; namespace Dialog { -typedef boost::signals::connection DlgDisplayPropertiesImp_Connection; +typedef boost::signals2::connection DlgDisplayPropertiesImp_Connection; /** * The DlgDisplayPropertiesImp class implements a dialog containing all available document @@ -79,7 +79,7 @@ private Q_SLOTS: private: void slotChangedObject(const Gui::ViewProvider&, const App::Property& Prop); - void reject(); + void reject(); void setDisplayModes(const std::vector&); void setMaterial(const std::vector&); void setColorPlot(const std::vector&); diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp index 5c495d3211a5..771b0ac1217a 100644 --- a/src/Gui/Document.cpp +++ b/src/Gui/Document.cpp @@ -32,7 +32,7 @@ # include # include # include -# include +# include # include # include # include @@ -90,7 +90,7 @@ struct DocumentP std::map _ViewProviderMap; std::map _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); diff --git a/src/Gui/Document.h b/src/Gui/Document.h index 04074af09571..eb2483485a97 100644 --- a/src/Gui/Document.h +++ b/src/Gui/Document.h @@ -92,36 +92,36 @@ class GuiExport Document : public Base::Persistence /** @name Signals of the document */ //@{ /// signal on new Object - mutable boost::signal signalNewObject; + mutable boost::signals2::signal signalNewObject; /// signal on deleted Object - mutable boost::signal signalDeletedObject; + mutable boost::signals2::signal signalDeletedObject; /** signal on changed Object, the 2nd argument is the changed property of the referenced document object, not of the view provider */ - mutable boost::signal signalChangedObject; /// signal on renamed Object - mutable boost::signal signalRelabelObject; + mutable boost::signals2::signal signalRelabelObject; /// signal on activated Object - mutable boost::signal signalActivatedObject; + mutable boost::signals2::signal signalActivatedObject; /// signal on entering in edit mode - mutable boost::signal signalInEdit; + mutable boost::signals2::signal signalInEdit; /// signal on leaving edit mode - mutable boost::signal signalResetEdit; + mutable boost::signals2::signal signalResetEdit; /// signal on changed Object, the 2nd argument is the highlite mode to use - mutable boost::signal signalHighlightObject; + mutable boost::signals2::signal signalHighlightObject; /// signal on changed Object, the 2nd argument is the highlite mode to use - mutable boost::signal signalExpandObject; + mutable boost::signals2::signal signalExpandObject; /// signal on scrolling to an object - mutable boost::signal signalScrollToObject; + mutable boost::signals2::signal signalScrollToObject; /// signal on undo Document - mutable boost::signal signalUndoDocument; + mutable boost::signals2::signal signalUndoDocument; /// signal on redo Document - mutable boost::signal signalRedoDocument; + mutable boost::signals2::signal signalRedoDocument; /// signal on deleting Document - mutable boost::signal signalDeleteDocument; + mutable boost::signals2::signal signalDeleteDocument; //@} /** @name I/O of the document */ diff --git a/src/Gui/DocumentModel.cpp b/src/Gui/DocumentModel.cpp index 7b3420b14611..4ec20c140334 100644 --- a/src/Gui/DocumentModel.cpp +++ b/src/Gui/DocumentModel.cpp @@ -26,7 +26,7 @@ #ifndef _PreComp_ # include # include -# include +# include # include #endif diff --git a/src/Gui/DocumentObserver.cpp b/src/Gui/DocumentObserver.cpp index 5852d5a15100..d46c0b1a1fd5 100644 --- a/src/Gui/DocumentObserver.cpp +++ b/src/Gui/DocumentObserver.cpp @@ -27,7 +27,6 @@ # include #endif -#include #include #include "Application.h" @@ -89,19 +88,6 @@ void DocumentObserver::detachDocument() this->connectDocumentDelete.disconnect(); } -void DocumentObserver::enableNotifications(DocumentObserver::Notifications value) -{ - this->connectDocumentCreatedObject.block(!(value & Create)); - this->connectDocumentDeletedObject.block(!(value & Delete)); - this->connectDocumentChangedObject.block(!(value & Change)); - this->connectDocumentRelabelObject.block(!(value & Relabel)); - this->connectDocumentActivateObject.block(!(value & Activate)); - this->connectDocumentEditObject.block(!(value & Edit)); - this->connectDocumentResetObject.block(!(value & Reset)); - this->connectDocumentUndo.block(!(value & Undo)); - this->connectDocumentRedo.block(!(value & Redo)); -} - void DocumentObserver::slotUndoDocument(const Document& /*Doc*/) { } diff --git a/src/Gui/DocumentObserver.h b/src/Gui/DocumentObserver.h index 083e789615c5..08a9399e24a8 100644 --- a/src/Gui/DocumentObserver.h +++ b/src/Gui/DocumentObserver.h @@ -25,8 +25,7 @@ #define GUI_DOCUMENTOBSERVER_H #include -#include -#include +#include namespace App { class Property; } namespace Gui @@ -45,21 +44,6 @@ class ViewProviderDocumentObject; class GuiExport DocumentObserver { public: - enum Notification { - None = 0x0000, - Create = 0x0001, - Delete = 0x0002, - Change = 0x0004, - Relabel = 0x0008, - Activate = 0x0010, - Edit = 0x0020, - Reset = 0x0040, - Undo = 0x0080, - Redo = 0x0100, - All = 0x01ff - }; - Q_DECLARE_FLAGS(Notifications, Notification) - /// Constructor DocumentObserver(); virtual ~DocumentObserver(); @@ -72,9 +56,6 @@ class GuiExport DocumentObserver * is not longer observed then. */ void detachDocument(); - /** Activates the connection depending on the given value. - */ - void enableNotifications(Notifications value); private: /** Notifies when an object has been created. */ @@ -100,7 +81,7 @@ class GuiExport DocumentObserver virtual void slotDeleteDocument(const Document& Doc); private: - typedef boost::BOOST_SIGNALS_NAMESPACE::scoped_connection Connection; + typedef boost::signals2::scoped_connection Connection; Connection connectDocumentCreatedObject; Connection connectDocumentDeletedObject; Connection connectDocumentChangedObject; diff --git a/src/Gui/DocumentObserverPython.h b/src/Gui/DocumentObserverPython.h index 280e26887caf..ca3318a79ff7 100644 --- a/src/Gui/DocumentObserverPython.h +++ b/src/Gui/DocumentObserverPython.h @@ -26,7 +26,7 @@ #include -#include +#include #include namespace Gui @@ -75,7 +75,7 @@ class GuiExport DocumentObserverPython Py::Object inst; static std::vector _instances; - typedef boost::signals::connection Connection; + typedef boost::signals2::connection Connection; Connection connectApplicationCreatedDocument; Connection connectApplicationDeletedDocument; Connection connectApplicationRelabelDocument; diff --git a/src/Gui/ExpressionBinding.h b/src/Gui/ExpressionBinding.h index 8280dec18d09..765073751585 100644 --- a/src/Gui/ExpressionBinding.h +++ b/src/Gui/ExpressionBinding.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include namespace App { class Expression; @@ -75,7 +75,7 @@ class GuiExport ExpressionBinding int iconHeight; void expressionChange(const App::ObjectIdentifier& id); - boost::signals::scoped_connection connection; + boost::signals2::scoped_connection connection; bool m_autoApply; }; diff --git a/src/Gui/GraphvizView.h b/src/Gui/GraphvizView.h index 3452e54578e3..5a9dc204b377 100644 --- a/src/Gui/GraphvizView.h +++ b/src/Gui/GraphvizView.h @@ -26,7 +26,7 @@ #include "MDIView.h" #include -#include +#include class QGraphicsScene; @@ -84,7 +84,7 @@ private Q_SLOTS: GraphvizWorker* thread; int nPending; - typedef boost::BOOST_SIGNALS_NAMESPACE::scoped_connection Connection; + typedef boost::signals2::scoped_connection Connection; Connection recomputeConnection; Connection undoConnection; Connection redoConnection; diff --git a/src/Gui/MDIView.cpp b/src/Gui/MDIView.cpp index 1f6421429a79..6d8fbcc5fdc8 100644 --- a/src/Gui/MDIView.cpp +++ b/src/Gui/MDIView.cpp @@ -24,7 +24,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include +# include # include # include # include diff --git a/src/Gui/MDIView.h b/src/Gui/MDIView.h index 8704a0d4d46e..a10be328c92c 100644 --- a/src/Gui/MDIView.h +++ b/src/Gui/MDIView.h @@ -150,7 +150,7 @@ protected Q_SLOTS: Qt::WindowStates wstate; // list of active objects of this view ActiveObjectList ActiveObjects; - typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection; + typedef boost::signals2::connection Connection; Connection connectDelObject; //remove active object upon delete. }; diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index e3a60af34e8d..390aa96a948b 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -51,7 +51,6 @@ # include #endif -#include #include // FreeCAD Base header diff --git a/src/Gui/ManualAlignment.cpp b/src/Gui/ManualAlignment.cpp index 31d1289b5092..8ae2323f09a2 100644 --- a/src/Gui/ManualAlignment.cpp +++ b/src/Gui/ManualAlignment.cpp @@ -49,7 +49,6 @@ # include #endif -#include #include #include diff --git a/src/Gui/ManualAlignment.h b/src/Gui/ManualAlignment.h index 7b00b17d47f5..68998863415b 100644 --- a/src/Gui/ManualAlignment.h +++ b/src/Gui/ManualAlignment.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include class SbVec3f; class SoPickedPoint; @@ -245,7 +245,7 @@ protected Q_SLOTS: static ManualAlignment* _instance; - typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection; + typedef boost::signals2::connection Connection; Connection connectApplicationDeletedDocument; Connection connectDocumentDeletedObject; diff --git a/src/Gui/MergeDocuments.h b/src/Gui/MergeDocuments.h index 42bc252e026e..d4d1be0f3d69 100644 --- a/src/Gui/MergeDocuments.h +++ b/src/Gui/MergeDocuments.h @@ -24,7 +24,7 @@ #ifndef GUI_MERGEDOCUMENTS_H #define GUI_MERGEDOCUMENTS_H -#include +#include #include namespace zipios { @@ -57,7 +57,7 @@ class GuiExport MergeDocuments : public Base::Persistence Gui::Document* document; std::vector objects; std::map nameMap; - typedef boost::signals::connection Connection; + typedef boost::signals2::connection Connection; Connection connectExport; Connection connectImport; }; diff --git a/src/Gui/Placement.h b/src/Gui/Placement.h index 3365d4f07f08..b2b3ef61eee0 100644 --- a/src/Gui/Placement.h +++ b/src/Gui/Placement.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include class QSignalMapper; @@ -88,7 +88,7 @@ private Q_SLOTS: private: typedef Gui::LocationInterfaceComp Ui_PlacementComp; - typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection; + typedef boost::signals2::connection Connection; Ui_PlacementComp* ui; QSignalMapper* signalMapper; Connection connectAct; diff --git a/src/Gui/PreCompiled.h b/src/Gui/PreCompiled.h index 8b41562a247b..536e538d679d 100644 --- a/src/Gui/PreCompiled.h +++ b/src/Gui/PreCompiled.h @@ -75,7 +75,7 @@ #include // Boost -#include +#include #include #include #include diff --git a/src/Gui/ProjectView.cpp b/src/Gui/ProjectView.cpp index 327ac4bc697f..bbef326fd38e 100644 --- a/src/Gui/ProjectView.cpp +++ b/src/Gui/ProjectView.cpp @@ -24,7 +24,6 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include # include # include # include diff --git a/src/Gui/PropertyView.h b/src/Gui/PropertyView.h index ea58045b8ce0..0feff23a106d 100644 --- a/src/Gui/PropertyView.h +++ b/src/Gui/PropertyView.h @@ -28,7 +28,7 @@ #include "DockWindow.h" #include "Selection.h" -#include +#include class QPixmap; class QTabWidget; @@ -65,15 +65,15 @@ class PropertyView : public QWidget, public Gui::SelectionObserver Gui::PropertyEditor::PropertyEditor* propertyEditorView; Gui::PropertyEditor::PropertyEditor* propertyEditorData; -public Q_SLOTS: - /// Stores a preference for the last tab selected - void tabChanged(int index); - +public Q_SLOTS: + /// Stores a preference for the last tab selected + void tabChanged(int index); + protected: void changeEvent(QEvent *e); private: - void onSelectionChanged(const SelectionChanges& msg); + void onSelectionChanged(const SelectionChanges& msg); void slotChangePropertyData(const App::DocumentObject&, const App::Property&); void slotChangePropertyView(const Gui::ViewProvider&, const App::Property&); void slotAppendDynamicProperty(const App::Property&); @@ -84,7 +84,7 @@ public Q_SLOTS: private: struct PropInfo; struct PropFind; - typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection; + typedef boost::signals2::connection Connection; Connection connectPropData; Connection connectPropView; Connection connectPropAppend; diff --git a/src/Gui/Selection.cpp b/src/Gui/Selection.cpp index 9e05d11a24ff..8d1057b9d0ad 100644 --- a/src/Gui/Selection.cpp +++ b/src/Gui/Selection.cpp @@ -26,7 +26,6 @@ #ifndef _PreComp_ # include # include -# include # include # include # include @@ -54,7 +53,7 @@ FC_LOG_LEVEL_INIT("Selection",false,true,true) using namespace Gui; using namespace std; -SelectionObserver::SelectionObserver() +SelectionObserver::SelectionObserver() : blocker(connectSelection, false) { attachSelection(); } @@ -68,9 +67,9 @@ bool SelectionObserver::blockConnection(bool block) { bool ok = connectSelection.blocked(); if (block) - connectSelection.block(); + blocker.block(); else - connectSelection.unblock(); + blocker.unblock(); return ok; } diff --git a/src/Gui/Selection.h b/src/Gui/Selection.h index e68988191f9a..54266f0b07ab 100644 --- a/src/Gui/Selection.h +++ b/src/Gui/Selection.h @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -144,8 +145,9 @@ class GuiExport SelectionObserver void _onSelectionChanged(const SelectionChanges& msg); private: - typedef boost::signals::connection Connection; + typedef boost::signals2::connection Connection; Connection connectSelection; + boost::signals2::shared_connection_block blocker; }; /** @@ -293,7 +295,7 @@ class GuiExport SelectionSingleton : public Base::Subject signalSelectionChanged; + boost::signals2::signal signalSelectionChanged; /** Returns a vector of selection objects * If no document name is given the objects of the active are returned. diff --git a/src/Gui/TaskView/TaskAppearance.h b/src/Gui/TaskView/TaskAppearance.h index cdcbe1faff6f..1e3de8a898a3 100644 --- a/src/Gui/TaskView/TaskAppearance.h +++ b/src/Gui/TaskView/TaskAppearance.h @@ -26,7 +26,7 @@ #include "TaskView.h" #include -#include +#include class Ui_TaskAppearance; @@ -38,7 +38,7 @@ class Property; namespace Gui { class ViewProvider; namespace TaskView { -typedef boost::signals::connection TaskAppearance_Connection; +typedef boost::signals2::connection TaskAppearance_Connection; class TaskAppearance : public TaskBox, public Gui::SelectionSingleton::ObserverType { diff --git a/src/Gui/TaskView/TaskSelectLinkProperty.h b/src/Gui/TaskView/TaskSelectLinkProperty.h index 85dbf456c4ad..7f2e1dcadc25 100644 --- a/src/Gui/TaskView/TaskSelectLinkProperty.h +++ b/src/Gui/TaskView/TaskSelectLinkProperty.h @@ -26,7 +26,6 @@ #include "TaskView.h" #include -#include #include diff --git a/src/Gui/TaskView/TaskView.h b/src/Gui/TaskView/TaskView.h index 621482ebfbab..5a368c8e3c65 100644 --- a/src/Gui/TaskView/TaskView.h +++ b/src/Gui/TaskView/TaskView.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #if !defined (QSINT_ACTIONPANEL) @@ -51,7 +51,7 @@ class CombiView; } namespace TaskView { -typedef boost::signals::connection Connection; +typedef boost::signals2::connection Connection; class TaskEditControl; class TaskDialog; diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp index e52727abe933..a659e1bf9ef2 100644 --- a/src/Gui/Tree.cpp +++ b/src/Gui/Tree.cpp @@ -24,7 +24,6 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include # include # include # include diff --git a/src/Gui/Tree.h b/src/Gui/Tree.h index c970f07977ae..cc45a2c4e317 100644 --- a/src/Gui/Tree.h +++ b/src/Gui/Tree.h @@ -185,7 +185,7 @@ class DocumentItem : public QTreeWidgetItem const Gui::Document* pDocument; std::map ObjectMap; - typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection; + typedef boost::signals2::connection Connection; Connection connectNewObject; Connection connectDelObject; Connection connectChgObject; @@ -223,7 +223,7 @@ class DocumentObjectItem : public QTreeWidgetItem void slotChangeStatusTip(const QString&); private: - typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection; + typedef boost::signals2::connection Connection; int previousStatus; Gui::ViewProviderDocumentObject* viewObject; Connection connectIcon; diff --git a/src/Gui/ViewProvider.h b/src/Gui/ViewProvider.h index 96ac6dd8c4dd..9c6867e44427 100644 --- a/src/Gui/ViewProvider.h +++ b/src/Gui/ViewProvider.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include @@ -200,11 +200,11 @@ class GuiExport ViewProvider : public App::TransactionalObject /** @name Signals of the view provider */ //@{ /// signal on icon change - boost::signal signalChangeIcon; + boost::signals2::signal signalChangeIcon; /// signal on tooltip change - boost::signal signalChangeToolTip; + boost::signals2::signal signalChangeToolTip; /// signal on status tip change - boost::signal signalChangeStatusTip; + boost::signals2::signal signalChangeStatusTip; //@} /** update the content of the ViewProvider diff --git a/src/Gui/ViewProviderOriginGroup.h b/src/Gui/ViewProviderOriginGroup.h index 06ff7112f43f..31db1d6d0c3c 100644 --- a/src/Gui/ViewProviderOriginGroup.h +++ b/src/Gui/ViewProviderOriginGroup.h @@ -23,8 +23,6 @@ #ifndef VIEWPROVIDERORIGINGROUP_H_JIXBOPA7 #define VIEWPROVIDERORIGINGROUP_H_JIXBOPA7 -#include - #include "ViewProviderGeoFeatureGroup.h" #include "ViewProviderOriginGroupExtension.h" diff --git a/src/Gui/ViewProviderOriginGroupExtension.h b/src/Gui/ViewProviderOriginGroupExtension.h index a326dca013ff..4804aa9d80a7 100644 --- a/src/Gui/ViewProviderOriginGroupExtension.h +++ b/src/Gui/ViewProviderOriginGroupExtension.h @@ -56,8 +56,8 @@ class GuiExport ViewProviderOriginGroupExtension : public ViewProviderGeoFeature std::vector constructChildren ( const std::vector &children ) const; - boost::signals::connection connectChangedObjectApp; - boost::signals::connection connectChangedObjectGui; + boost::signals2::connection connectChangedObjectApp; + boost::signals2::connection connectChangedObjectGui; }; typedef ViewProviderExtensionPythonT ViewProviderOriginGroupExtensionPython; diff --git a/src/Gui/ViewProviderPythonFeature.cpp b/src/Gui/ViewProviderPythonFeature.cpp index 7ff9443d6255..90f54a42ec7c 100644 --- a/src/Gui/ViewProviderPythonFeature.cpp +++ b/src/Gui/ViewProviderPythonFeature.cpp @@ -30,7 +30,6 @@ # include # include # include -# include # include # include # include diff --git a/src/Mod/Drawing/Gui/TaskOrthoViews.cpp b/src/Mod/Drawing/Gui/TaskOrthoViews.cpp index a921361871bc..385dce60bb01 100644 --- a/src/Mod/Drawing/Gui/TaskOrthoViews.cpp +++ b/src/Mod/Drawing/Gui/TaskOrthoViews.cpp @@ -641,11 +641,12 @@ void OrthoViews::del_view(int rel_x, int rel_y) // remove a view fro if (num > 0) { - connectDocumentDeletedObject.block(); - views[num]->deleteme(); - delete views[num]; - views.erase(views.begin() + num); - connectDocumentDeletedObject.unblock(); + { + boost::signals2::shared_connection_block blocker(connectDocumentDeletedObject); + views[num]->deleteme(); + delete views[num]; + views.erase(views.begin() + num); + } min_r_x = max_r_x = 0; min_r_y = max_r_y = 0; @@ -667,14 +668,13 @@ void OrthoViews::del_view(int rel_x, int rel_y) // remove a view fro void OrthoViews::del_all() { - connectDocumentDeletedObject.block(); + boost::signals2::shared_connection_block blocker(connectDocumentDeletedObject); for (int i = views.size() - 1; i >= 0; i--) // count downwards to delete from back { views[i]->deleteme(); delete views[i]; views.pop_back(); } - connectDocumentDeletedObject.unblock(); } int OrthoViews::is_Ortho(int rel_x, int rel_y) // is the view at r_x, r_y an ortho or axo one? diff --git a/src/Mod/Drawing/Gui/TaskOrthoViews.h b/src/Mod/Drawing/Gui/TaskOrthoViews.h index a00b449b4eb2..dfeae41f7293 100644 --- a/src/Mod/Drawing/Gui/TaskOrthoViews.h +++ b/src/Mod/Drawing/Gui/TaskOrthoViews.h @@ -30,9 +30,9 @@ #include #include -#include +#include -#include +#include @@ -148,8 +148,8 @@ class OrthoViews bool hidden, smooth; bool autodims; - boost::BOOST_SIGNALS_NAMESPACE::scoped_connection connectDocumentDeletedObject; - boost::BOOST_SIGNALS_NAMESPACE::scoped_connection connectApplicationDeletedDocument; + boost::signals2::scoped_connection connectDocumentDeletedObject; + boost::signals2::scoped_connection connectApplicationDeletedDocument; }; diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.h b/src/Mod/Fem/Gui/TaskPostBoxes.h index 3dc24a180052..dca2526dca66 100644 --- a/src/Mod/Fem/Gui/TaskPostBoxes.h +++ b/src/Mod/Fem/Gui/TaskPostBoxes.h @@ -30,7 +30,6 @@ #include #include #include "ViewProviderFemPostFunction.h" -#include class QComboBox; class Ui_TaskPostDisplay; @@ -139,15 +138,15 @@ class TaskPostBox : public Gui::TaskView::TaskBox { ~TaskPostBox(); virtual void applyPythonCode() = 0; - virtual bool isGuiTaskOnly() {return false;}; //return true if only gui properties are manipulated + virtual bool isGuiTaskOnly() {return false;} //return true if only gui properties are manipulated protected: - App::DocumentObject* getObject() {return m_object;}; + App::DocumentObject* getObject() {return m_object;} template - T* getTypedObject() {return static_cast(m_object);}; - Gui::ViewProviderDocumentObject* getView() {return m_view;}; + T* getTypedObject() {return static_cast(m_object);} + Gui::ViewProviderDocumentObject* getView() {return m_view;} template - T* getTypedView() {return static_cast(m_view);}; + T* getTypedView() {return static_cast(m_view);} bool autoApply(); void recompute(); @@ -203,7 +202,7 @@ class TaskPostDisplay : public TaskPostBox ~TaskPostDisplay(); virtual void applyPythonCode(); - virtual bool isGuiTaskOnly() {return true;}; + virtual bool isGuiTaskOnly() {return true;} private Q_SLOTS: void on_Representation_activated(int i); diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h index 55fb8d0bd3f6..3197fea469f0 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h @@ -28,28 +28,7 @@ #include #include #include - - -#if defined(signals) && defined(QOBJECTDEFS_H) && \ - !defined(QT_MOC_CPP) -# undef signals -# define signals signals -#endif - -#include -namespace boost -{ - namespace signalslib = signals; -} - -#if defined(signals) && defined(QOBJECTDEFS_H) && \ - !defined(QT_MOC_CPP) -# undef signals -// Restore the macro definition of "signals", as it was -// defined by Qt's . -# define signals protected -#endif - +#include class SoScale; class SoSurroundScale; @@ -70,19 +49,19 @@ class FemGuiExport FunctionWidget : public QWidget { Q_OBJECT public: - FunctionWidget() {}; - virtual ~FunctionWidget() {}; + FunctionWidget() {} + virtual ~FunctionWidget() {} virtual void applyPythonCode() = 0; virtual void setViewProvider(ViewProviderFemPostFunction* view); void onObjectsChanged(const App::DocumentObject& obj, const App::Property&); protected: - ViewProviderFemPostFunction* getView() {return m_view;}; - Fem::FemPostFunction* getObject(){return m_object;}; + ViewProviderFemPostFunction* getView() {return m_view;} + Fem::FemPostFunction* getObject(){return m_object;} - bool blockObjectUpdates() {return m_block;}; - void setBlockObjectUpdates(bool val) {m_block = val;}; + bool blockObjectUpdates() {return m_block;} + void setBlockObjectUpdates(bool val) {m_block = val;} virtual void onChange(const App::Property& p) = 0; @@ -90,7 +69,7 @@ class FemGuiExport FunctionWidget : public QWidget { bool m_block; ViewProviderFemPostFunction* m_view; Fem::FemPostFunction* m_object; - boost::signalslib::scoped_connection m_connection; + boost::signals2::scoped_connection m_connection; }; class FemGuiExport ViewProviderFemPostFunctionProvider : public Gui::ViewProviderDocumentObject diff --git a/src/Mod/Inspection/App/InspectionFeature.cpp b/src/Mod/Inspection/App/InspectionFeature.cpp index d5c5946bf6ef..2f18d177daac 100644 --- a/src/Mod/Inspection/App/InspectionFeature.cpp +++ b/src/Mod/Inspection/App/InspectionFeature.cpp @@ -35,7 +35,6 @@ #include #include -#include #include #include diff --git a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp index c4bdc9c54b89..79a6e02041d8 100644 --- a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp +++ b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp @@ -31,7 +31,6 @@ #include "ui_DlgEvaluateMesh.h" #include "DlgEvaluateSettings.h" -#include #include #include diff --git a/src/Mod/Mesh/Gui/MeshEditor.h b/src/Mod/Mesh/Gui/MeshEditor.h index 43be6e9799a7..9d5b248ff411 100644 --- a/src/Mod/Mesh/Gui/MeshEditor.h +++ b/src/Mod/Mesh/Gui/MeshEditor.h @@ -25,7 +25,7 @@ #include #include -#include +#include class SoCoordinate3; class SoFaceSet; @@ -139,7 +139,7 @@ private Q_SLOTS: private: typedef std::vector TBoundary; - typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection; + typedef boost::signals2::connection Connection; static void fileHoleCallback(void * ud, SoEventCallback * n); void createPolygons(); diff --git a/src/Mod/Part/App/PreCompiled.h b/src/Mod/Part/App/PreCompiled.h index ad0c3508f767..9d21862fa385 100644 --- a/src/Mod/Part/App/PreCompiled.h +++ b/src/Mod/Part/App/PreCompiled.h @@ -63,7 +63,7 @@ #include // Boost -#include +#include #include #include @@ -73,10 +73,10 @@ #include //namespace po = boost::program_options; -#include -#include -#include - +#include +#include +#include + #include "OpenCascadeAll.h" #elif defined(FC_OS_WIN32) diff --git a/src/Mod/Part/Gui/DlgBooleanOperation.h b/src/Mod/Part/Gui/DlgBooleanOperation.h index dedc9015a91f..03e8d1cbf200 100644 --- a/src/Mod/Part/Gui/DlgBooleanOperation.h +++ b/src/Mod/Part/Gui/DlgBooleanOperation.h @@ -25,7 +25,7 @@ #include #include -#include +#include class QTreeWidgetItem; @@ -35,7 +35,7 @@ class Property; } namespace PartGui { -typedef boost::signals::connection Connection; +typedef boost::signals2::connection Connection; class Ui_DlgBooleanOperation; class DlgBooleanOperation : public QWidget { diff --git a/src/Mod/Part/Gui/DlgFilletEdges.cpp b/src/Mod/Part/Gui/DlgFilletEdges.cpp index 07548a8595cd..d9f593238a16 100644 --- a/src/Mod/Part/Gui/DlgFilletEdges.cpp +++ b/src/Mod/Part/Gui/DlgFilletEdges.cpp @@ -207,7 +207,7 @@ namespace PartGui { std::vector edge_ids; TopTools_IndexedMapOfShape all_edges; TopTools_IndexedMapOfShape all_faces; - typedef boost::signals::connection Connection; + typedef boost::signals2::connection Connection; Connection connectApplicationDeletedObject; Connection connectApplicationDeletedDocument; diff --git a/src/Mod/Part/Gui/TaskAttacher.h b/src/Mod/Part/Gui/TaskAttacher.h index 7cac9e647f60..703eb1a45d91 100644 --- a/src/Mod/Part/Gui/TaskAttacher.h +++ b/src/Mod/Part/Gui/TaskAttacher.h @@ -131,7 +131,7 @@ private Q_SLOTS: Attacher::SuggestResult lastSuggestResult; bool completed; - typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection; + typedef boost::signals2::connection Connection; Connection connectDelObject; }; diff --git a/src/Mod/Part/Gui/TaskFaceColors.cpp b/src/Mod/Part/Gui/TaskFaceColors.cpp index 0f630f989a62..71b9a7bcea48 100644 --- a/src/Mod/Part/Gui/TaskFaceColors.cpp +++ b/src/Mod/Part/Gui/TaskFaceColors.cpp @@ -45,7 +45,7 @@ # include #endif -#include +#include #include #include "ui_TaskFaceColors.h" @@ -94,7 +94,7 @@ namespace PartGui { class FaceColors::Private { public: - typedef boost::signals::connection Connection; + typedef boost::signals2::connection Connection; Ui_TaskFaceColors* ui; Gui::View3DInventorViewer* view; ViewProviderPartExt* vp; diff --git a/src/Mod/PartDesign/App/Body.h b/src/Mod/PartDesign/App/Body.h index b91148b45378..6d5e4032cfc5 100644 --- a/src/Mod/PartDesign/App/Body.h +++ b/src/Mod/PartDesign/App/Body.h @@ -27,7 +27,7 @@ #include #include -#include +#include namespace App { class Origin; @@ -145,7 +145,7 @@ class PartDesignExport Body : public Part::BodyBase virtual void unsetupObject () override; private: - boost::signals::scoped_connection connection; + boost::signals2::scoped_connection connection; }; } //namespace PartDesign diff --git a/src/Mod/PartDesign/App/ShapeBinder.h b/src/Mod/PartDesign/App/ShapeBinder.h index f6329c21097a..b5908e75f396 100644 --- a/src/Mod/PartDesign/App/ShapeBinder.h +++ b/src/Mod/PartDesign/App/ShapeBinder.h @@ -25,7 +25,7 @@ #define PARTDESIGN_DATUMSHAPE_H #include -#include +#include #include #include @@ -67,7 +67,7 @@ class PartDesignExport ShapeBinder : public Part::Feature void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop); virtual void onSettingDocument(); - typedef boost::signals::connection Connection; + typedef boost::signals2::connection Connection; Connection connectDocumentChangedObject; }; diff --git a/src/Mod/PartDesign/Gui/TaskFeatureParameters.cpp b/src/Mod/PartDesign/Gui/TaskFeatureParameters.cpp index 5ce247fa5520..8be9d830705c 100644 --- a/src/Mod/PartDesign/Gui/TaskFeatureParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskFeatureParameters.cpp @@ -49,7 +49,6 @@ TaskFeatureParameters::TaskFeatureParameters(PartDesignGui::ViewProvider *vp, QW { Gui::Document* doc = vp->getDocument(); this->attachDocument(doc); - this->enableNotifications(DocumentObserver::Delete); } void TaskFeatureParameters::slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.h b/src/Mod/PartDesign/Gui/TaskHoleParameters.h index a0b9884223a8..7a00c9fd64f0 100644 --- a/src/Mod/PartDesign/Gui/TaskHoleParameters.h +++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.h @@ -121,7 +121,7 @@ private Q_SLOTS: private: - typedef boost::BOOST_SIGNALS_NAMESPACE::scoped_connection Connection; + typedef boost::signals2::scoped_connection Connection; Connection connectPropChanged; std::unique_ptr observer; diff --git a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp index 48da6a07d767..b7f910475ff0 100644 --- a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp @@ -183,7 +183,6 @@ TaskBoxPrimitives::TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent) Gui::Document* doc = vp->getDocument(); this->attachDocument(doc); - this->enableNotifications(DocumentObserver::Delete); //show the parts coordinate system axis for selection PartDesign::Body * body = PartDesign::Body::findBodyOf(vp->getObject()); diff --git a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h index 073a4d445049..1dcb2cf90d01 100644 --- a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h @@ -48,8 +48,6 @@ class ViewProvider; namespace PartDesignGui { -namespace s = boost::signals; - class TaskBoxPrimitives : public Gui::TaskView::TaskBox, public Gui::DocumentObserver { diff --git a/src/Mod/PartDesign/Gui/TaskTransformedMessages.h b/src/Mod/PartDesign/Gui/TaskTransformedMessages.h index f0075c630846..e95aa9f73ddf 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedMessages.h +++ b/src/Mod/PartDesign/Gui/TaskTransformedMessages.h @@ -25,10 +25,10 @@ #define GUI_TASKVIEW_TaskTransformedMessages_H #include -#include +#include class Ui_TaskTransformedMessages; -typedef boost::signals::connection Connection; +typedef boost::signals2::connection Connection; namespace App { class Property; diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp index bf4750260778..16b408f8fec4 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp @@ -76,7 +76,6 @@ TaskTransformedParameters::TaskTransformedParameters(ViewProviderTransformed *Tr if (TransformedView) { Gui::Document* doc = TransformedView->getDocument(); this->attachDocument(doc); - this->enableNotifications(DocumentObserver::Delete); } } diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.h b/src/Mod/PartDesign/Gui/ViewProviderBody.h index 41e53c0ef71f..dffab56d4b5f 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBody.h +++ b/src/Mod/PartDesign/Gui/ViewProviderBody.h @@ -96,8 +96,8 @@ class PartDesignGuiExport ViewProviderBody : public PartGui::ViewProviderPart, p private: static const char* BodyModeEnum[]; - boost::signals::connection connectChangedObjectApp; - boost::signals::connection connectChangedObjectGui; + boost::signals2::connection connectChangedObjectApp; + boost::signals2::connection connectChangedObjectGui; }; diff --git a/src/Mod/PartDesign/Gui/ViewProviderTransformed.h b/src/Mod/PartDesign/Gui/ViewProviderTransformed.h index 3ca5242c1c5a..db8ee43169ee 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderTransformed.h +++ b/src/Mod/PartDesign/Gui/ViewProviderTransformed.h @@ -47,7 +47,7 @@ class PartDesignGuiExport ViewProviderTransformed : public ViewProvider virtual bool onDelete(const std::vector &); /// signals if the transformation contains errors - boost::signal signalDiagnosis; + boost::signals2::signal signalDiagnosis; // The feature name of the subclass std::string featureName; diff --git a/src/Mod/PartDesign/Gui/WorkflowManager.h b/src/Mod/PartDesign/Gui/WorkflowManager.h index b5508881589e..91e7e8a31553 100644 --- a/src/Mod/PartDesign/Gui/WorkflowManager.h +++ b/src/Mod/PartDesign/Gui/WorkflowManager.h @@ -23,7 +23,7 @@ #ifndef WORKFLOWMANAGER_H_PB7A5GCM #define WORKFLOWMANAGER_H_PB7A5GCM -#include +#include #include namespace App { @@ -98,9 +98,9 @@ class PartDesignGuiExport WorkflowManager { private: std::map dwMap; - boost::signals::connection connectNewDocument; - boost::signals::connection connectFinishRestoreDocument; - boost::signals::connection connectDeleteDocument; + boost::signals2::connection connectNewDocument; + boost::signals2::connection connectFinishRestoreDocument; + boost::signals2::connection connectDeleteDocument; static WorkflowManager* _instance; }; diff --git a/src/Mod/Sandbox/App/DocumentProtector.h b/src/Mod/Sandbox/App/DocumentProtector.h index 3c051a72dd52..603b92932aa2 100644 --- a/src/Mod/Sandbox/App/DocumentProtector.h +++ b/src/Mod/Sandbox/App/DocumentProtector.h @@ -25,7 +25,6 @@ #define SANDBOX_DOCUMENTPROTECTOR_H #include -#include #include #include @@ -49,9 +48,9 @@ class SandboxAppExport DocumentProtector : public App::DocumentObserver void recompute(); private: - /** Checks if the given document is about to be closed */ - void slotDeletedDocument(const App::Document& Doc); - void validate(); + /** Checks if the given document is about to be closed */ + void slotDeletedDocument(const App::Document& Doc); + void validate(); }; class AbstractCallable @@ -80,8 +79,8 @@ class Callable : public AbstractCallable virtual void operator()() const { - T* v = static_cast(obj); - (v->*method)(); + T* v = static_cast(obj); + (v->*method)(); } private: @@ -101,8 +100,8 @@ class CallableWithArgs : public AbstractCallable virtual void operator()() const { - T* v = static_cast(obj); - (v->*method)(arg); + T* v = static_cast(obj); + (v->*method)(arg); } private: @@ -122,7 +121,7 @@ class SandboxAppExport DocumentObjectProtector void purgeTouched(); private: - void validate(); + void validate(); private: App::DocumentObject* obj; diff --git a/src/Mod/Sketcher/App/PropertyConstraintList.h b/src/Mod/Sketcher/App/PropertyConstraintList.h index e8f580208907..b35e469abba2 100644 --- a/src/Mod/Sketcher/App/PropertyConstraintList.h +++ b/src/Mod/Sketcher/App/PropertyConstraintList.h @@ -32,7 +32,7 @@ #include #include #include "Constraint.h" -#include +#include #include namespace Base { @@ -129,8 +129,8 @@ class SketcherExport PropertyConstraintList : public App::PropertyLists typedef std::pair ConstraintInfo ; - boost::signal &)> signalConstraintsRenamed; - boost::signal &)> signalConstraintsRemoved; + boost::signals2::signal &)> signalConstraintsRenamed; + boost::signals2::signal &)> signalConstraintsRemoved; static std::string getConstraintName(const std::string &name, int i); diff --git a/src/Mod/Sketcher/App/SketchObject.h b/src/Mod/Sketcher/App/SketchObject.h index 8cb5df55b839..7ee39d29b7f8 100644 --- a/src/Mod/Sketcher/App/SketchObject.h +++ b/src/Mod/Sketcher/App/SketchObject.h @@ -437,8 +437,8 @@ class SketcherExport SketchObject : public Part::Part2DObject std::vector lastConflicting; std::vector lastRedundant; - boost::signals::scoped_connection constraintsRenamedConn; - boost::signals::scoped_connection constraintsRemovedConn; + boost::signals2::scoped_connection constraintsRenamedConn; + boost::signals2::scoped_connection constraintsRemovedConn; bool AutoLockTangencyAndPerpty(Constraint* cstr, bool bForce = false, bool bLock = true); diff --git a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h index 8a9de4f7bc79..9417ec383813 100644 --- a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h +++ b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h @@ -32,9 +32,9 @@ #include "TaskSketcherGeneral.h" #include "TaskSketcherMessages.h" #include "TaskSketcherSolverAdvanced.h" -#include +#include -typedef boost::signals::connection Connection; +typedef boost::signals2::connection Connection; namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.h b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.h index 754603cb3cc6..7d6eaf73f831 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include namespace App { @@ -92,7 +92,7 @@ public Q_SLOTS: protected: void changeEvent(QEvent *e); ViewProviderSketch *sketchView; - typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection; + typedef boost::signals2::connection Connection; Connection connectionConstraintsChanged; private: diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.h b/src/Mod/Sketcher/Gui/TaskSketcherElements.h index 511a2dbb1790..990e5517a77f 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include namespace App { @@ -116,7 +116,7 @@ public Q_SLOTS: void changeEvent(QEvent *e); void leaveEvent ( QEvent * event ); ViewProviderSketch *sketchView; - typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection; + typedef boost::signals2::connection Connection; Connection connectionElementsChanged; private: diff --git a/src/Mod/Sketcher/Gui/TaskSketcherMessages.h b/src/Mod/Sketcher/Gui/TaskSketcherMessages.h index ff4c00aa6125..3e230f1d243c 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherMessages.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherMessages.h @@ -26,10 +26,10 @@ #include #include -#include +#include class Ui_TaskSketcherMessages; -typedef boost::signals::connection Connection; +typedef boost::signals2::connection Connection; namespace App { class Property; diff --git a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h index 92b1423bc6ec..69ca70d30f7d 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h @@ -26,7 +26,6 @@ #include #include -#include class Ui_TaskSketcherSolverAdvanced; diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.h b/src/Mod/Sketcher/Gui/ViewProviderSketch.h index decb96390758..8baa3d372a8c 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.h +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.h @@ -33,11 +33,10 @@ #include #include #include -#include +#include #include #include -#include class TopoDS_Shape; class TopoDS_Face; @@ -234,13 +233,13 @@ class SketcherGuiExport ViewProviderSketch : public PartGui::ViewProvider2DObjec friend struct ::EditData; /// signals if the constraints list has changed - boost::signal signalConstraintsChanged; + boost::signals2::signal signalConstraintsChanged; /// signals if the sketch has been set up - boost::signal signalSetUp; + boost::signals2::signal signalSetUp; /// signals if the sketch has been solved - boost::signal signalSolved; + boost::signals2::signal signalSolved; /// signals if the elements list has changed - boost::signal signalElementsChanged; + boost::signals2::signal signalElementsChanged; protected: virtual bool setEdit(int ModNum); @@ -269,8 +268,8 @@ class SketcherGuiExport ViewProviderSketch : public PartGui::ViewProvider2DObjec void slotRedoDocument(const Gui::Document&); protected: - boost::signals::connection connectUndoDocument; - boost::signals::connection connectRedoDocument; + boost::signals2::connection connectUndoDocument; + boost::signals2::connection connectRedoDocument; /// Return display string for constraint including hiding units if //requested. diff --git a/src/Mod/Spreadsheet/App/Sheet.h b/src/Mod/Spreadsheet/App/Sheet.h index 59becc77028b..1f2e88ea4d07 100644 --- a/src/Mod/Spreadsheet/App/Sheet.h +++ b/src/Mod/Spreadsheet/App/Sheet.h @@ -170,13 +170,13 @@ class SpreadsheetExport Sheet : public App::DocumentObject // Signals - boost::signal cellUpdated; + boost::signals2::signal cellUpdated; - boost::signal cellSpanChanged; + boost::signals2::signal cellSpanChanged; - boost::signal columnWidthChanged; + boost::signals2::signal columnWidthChanged; - boost::signal rowHeightChanged; + boost::signals2::signal rowHeightChanged; /** @name Access properties */ //@{ @@ -296,8 +296,8 @@ class SpreadsheetExport Sheet : public App::DocumentObject typedef std::map ObserverMap; ObserverMap observers; - boost::BOOST_SIGNALS_NAMESPACE::scoped_connection onRelabledDocumentConnection; - boost::BOOST_SIGNALS_NAMESPACE::scoped_connection onRenamedDocumentConnection; + boost::signals2::scoped_connection onRelabledDocumentConnection; + boost::signals2::scoped_connection onRenamedDocumentConnection; friend class SheetObserver; diff --git a/src/Mod/Spreadsheet/Gui/SheetModel.h b/src/Mod/Spreadsheet/Gui/SheetModel.h index 44a599359b66..6c2cb8dade0d 100644 --- a/src/Mod/Spreadsheet/Gui/SheetModel.h +++ b/src/Mod/Spreadsheet/Gui/SheetModel.h @@ -52,7 +52,7 @@ class SheetModel : public QAbstractTableModel private: void cellUpdated(App::CellAddress address); - boost::BOOST_SIGNALS_NAMESPACE::scoped_connection cellUpdatedConnection; + boost::signals2::scoped_connection cellUpdatedConnection; Spreadsheet::Sheet * sheet; QColor aliasBgColor; QColor textFgColor; diff --git a/src/Mod/Spreadsheet/Gui/SheetTableView.h b/src/Mod/Spreadsheet/Gui/SheetTableView.h index c23f9912dce5..31fd94b7878b 100644 --- a/src/Mod/Spreadsheet/Gui/SheetTableView.h +++ b/src/Mod/Spreadsheet/Gui/SheetTableView.h @@ -79,7 +79,7 @@ protected Q_SLOTS: QModelIndex currentEditIndex; Spreadsheet::Sheet * sheet; - boost::BOOST_SIGNALS_NAMESPACE::scoped_connection cellSpanChangedConnection; + boost::signals2::scoped_connection cellSpanChangedConnection; }; } diff --git a/src/Mod/Spreadsheet/Gui/SpreadsheetView.h b/src/Mod/Spreadsheet/Gui/SpreadsheetView.h index b0da2c7e3a39..ad7f9d1cbfc0 100644 --- a/src/Mod/Spreadsheet/Gui/SpreadsheetView.h +++ b/src/Mod/Spreadsheet/Gui/SpreadsheetView.h @@ -100,9 +100,9 @@ protected Q_SLOTS: Spreadsheet::Sheet * sheet; SpreadsheetDelegate * delegate; SheetModel * model; - boost::BOOST_SIGNALS_NAMESPACE::scoped_connection columnWidthChangedConnection; - boost::BOOST_SIGNALS_NAMESPACE::scoped_connection rowHeightChangedConnection; - boost::BOOST_SIGNALS_NAMESPACE::scoped_connection positionChangedConnection; + boost::signals2::scoped_connection columnWidthChangedConnection; + boost::signals2::scoped_connection rowHeightChangedConnection; + boost::signals2::scoped_connection positionChangedConnection; QMap newColumnSizes; QMap newRowSizes; diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp index 2c224a92f762..32a2bdedc8e9 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp +++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp @@ -38,7 +38,7 @@ #include #include #include - #include + #include #include #endif // #ifndef _PreComp_ diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.h b/src/Mod/TechDraw/Gui/MDIViewPage.h index 10896f348bbb..2f1d14f89b55 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.h +++ b/src/Mod/TechDraw/Gui/MDIViewPage.h @@ -125,7 +125,7 @@ public Q_SLOTS: void onDeleteObject(const App::DocumentObject& obj); - typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection; + typedef boost::signals2::connection Connection; Connection connectDeletedObject; bool compareSelections(std::vector treeSel,QList sceneSel);