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

1
src/App/Application.cpp
View File

@@ -121,7 +121,6 @@
#include <boost/tokenizer.hpp>
#include <boost/token_functions.hpp>
#include <boost/signals.hpp>
#include <boost/bind.hpp>
#include <boost/version.hpp>
#include <QDir>

62
src/App/Application.h
View File

@@ -25,7 +25,7 @@
#ifndef APP_APPLICATION_H
#define APP_APPLICATION_H
#include <boost/signal.hpp>
#include <boost/signals2.hpp>
#include <vector>
@@ -99,31 +99,31 @@ public:
/** @name Signals of the Application */
//@{
/// signal on new Document
boost::signal<void (const Document&)> signalNewDocument;
boost::signals2::signal<void (const Document&)> signalNewDocument;
/// signal on document getting deleted
boost::signal<void (const Document&)> signalDeleteDocument;
boost::signals2::signal<void (const Document&)> signalDeleteDocument;
/// signal on already deleted Document
boost::signal<void ()> signalDeletedDocument;
boost::signals2::signal<void ()> signalDeletedDocument;
/// signal on relabeling Document (user name)
boost::signal<void (const Document&)> signalRelabelDocument;
boost::signals2::signal<void (const Document&)> signalRelabelDocument;
/// signal on renaming Document (internal name)
boost::signal<void (const Document&)> signalRenameDocument;
boost::signals2::signal<void (const Document&)> signalRenameDocument;
/// signal on activating Document
boost::signal<void (const Document&)> signalActiveDocument;
boost::signals2::signal<void (const Document&)> signalActiveDocument;
/// signal on saving Document
boost::signal<void (const Document&)> signalSaveDocument;
boost::signals2::signal<void (const Document&)> signalSaveDocument;
/// signal on starting to restore Document
boost::signal<void (const Document&)> signalStartRestoreDocument;
boost::signals2::signal<void (const Document&)> signalStartRestoreDocument;
/// signal on restoring Document
boost::signal<void (const Document&)> signalFinishRestoreDocument;
boost::signals2::signal<void (const Document&)> signalFinishRestoreDocument;
/// signal on starting to save Document
boost::signal<void (const Document&, const std::string&)> signalStartSaveDocument;
boost::signals2::signal<void (const Document&, const std::string&)> signalStartSaveDocument;
/// signal on saved Document
boost::signal<void (const Document&, const std::string&)> signalFinishSaveDocument;
boost::signals2::signal<void (const Document&, const std::string&)> signalFinishSaveDocument;
/// signal on undo in document
boost::signal<void (const Document&)> signalUndoDocument;
boost::signals2::signal<void (const Document&)> signalUndoDocument;
/// signal on redo in document
boost::signal<void (const Document&)> signalRedoDocument;
boost::signals2::signal<void (const Document&)> signalRedoDocument;
//@}
@@ -133,32 +133,32 @@ public:
*/
//@{
/// signal before change of doc property
boost::signal<void (const App::Document&, const App::Property&)> signalBeforeChangeDocument;
boost::signals2::signal<void (const App::Document&, const App::Property&)> signalBeforeChangeDocument;
/// signal on changed doc property
boost::signal<void (const App::Document&, const App::Property&)> signalChangedDocument;
boost::signals2::signal<void (const App::Document&, const App::Property&)> signalChangedDocument;
/// signal on new Object
boost::signal<void (const App::DocumentObject&)> signalNewObject;
//boost::signal<void (const App::DocumentObject&)> m_sig;
boost::signals2::signal<void (const App::DocumentObject&)> signalNewObject;
//boost::signals2::signal<void (const App::DocumentObject&)> m_sig;
/// signal on deleted Object
boost::signal<void (const App::DocumentObject&)> signalDeletedObject;
boost::signals2::signal<void (const App::DocumentObject&)> signalDeletedObject;
/// signal on changed Object
boost::signal<void (const App::DocumentObject&, const App::Property&)> signalBeforeChangeObject;
boost::signals2::signal<void (const App::DocumentObject&, const App::Property&)> signalBeforeChangeObject;
/// signal on changed Object
boost::signal<void (const App::DocumentObject&, const App::Property&)> signalChangedObject;
boost::signals2::signal<void (const App::DocumentObject&, const App::Property&)> signalChangedObject;
/// signal on relabeled Object
boost::signal<void (const App::DocumentObject&)> signalRelabelObject;
boost::signals2::signal<void (const App::DocumentObject&)> signalRelabelObject;
/// signal on activated Object
boost::signal<void (const App::DocumentObject&)> signalActivatedObject;
boost::signals2::signal<void (const App::DocumentObject&)> signalActivatedObject;
/// signal on recomputed document
boost::signal<void (const App::Document&)> signalRecomputed;
boost::signals2::signal<void (const App::Document&)> signalRecomputed;
/// signal on recomputed document object
boost::signal<void (const App::DocumentObject&)> signalObjectRecomputed;
boost::signals2::signal<void (const App::DocumentObject&)> signalObjectRecomputed;
// signal on opened transaction
boost::signal<void (const App::Document&, std::string)> signalOpenTransaction;
boost::signals2::signal<void (const App::Document&, std::string)> signalOpenTransaction;
// signal a committed transaction
boost::signal<void (const App::Document&)> signalCommitTransaction;
boost::signals2::signal<void (const App::Document&)> signalCommitTransaction;
// signal an aborted transaction
boost::signal<void (const App::Document&)> signalAbortTransaction;
boost::signals2::signal<void (const App::Document&)> signalAbortTransaction;
//@}
/** @name Signals of property changes
@@ -167,11 +167,11 @@ public:
*/
//@{
/// signal on adding a dynamic property
boost::signal<void (const App::Property&)> signalAppendDynamicProperty;
boost::signals2::signal<void (const App::Property&)> signalAppendDynamicProperty;
/// signal on about removing a dynamic property
boost::signal<void (const App::Property&)> signalRemoveDynamicProperty;
boost::signals2::signal<void (const App::Property&)> signalRemoveDynamicProperty;
/// signal on about changing the editor mode of a property
boost::signal<void (const App::Property&)> signalChangePropertyEditor;
boost::signals2::signal<void (const App::Property&)> signalChangePropertyEditor;
//@}

62
src/App/Document.h
View File

@@ -37,7 +37,7 @@
#include <stack>
#include <functional>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
namespace Base {
class Writer;
@@ -113,57 +113,57 @@ public:
/** @name Signals of the document */
//@{
/// signal before changing an doc property
boost::signal<void (const App::Document&, const App::Property&)> signalBeforeChange;
boost::signals2::signal<void (const App::Document&, const App::Property&)> signalBeforeChange;
/// signal on changed doc property
boost::signal<void (const App::Document&, const App::Property&)> signalChanged;
boost::signals2::signal<void (const App::Document&, const App::Property&)> signalChanged;
/// signal on new Object
boost::signal<void (const App::DocumentObject&)> signalNewObject;
//boost::signal<void (const App::DocumentObject&)> m_sig;
boost::signals2::signal<void (const App::DocumentObject&)> signalNewObject;
//boost::signals2::signal<void (const App::DocumentObject&)> m_sig;
/// signal on deleted Object
boost::signal<void (const App::DocumentObject&)> signalDeletedObject;
boost::signals2::signal<void (const App::DocumentObject&)> signalDeletedObject;
/// signal before changing an Object
boost::signal<void (const App::DocumentObject&, const App::Property&)> signalBeforeChangeObject;
boost::signals2::signal<void (const App::DocumentObject&, const App::Property&)> signalBeforeChangeObject;
/// signal on changed Object
boost::signal<void (const App::DocumentObject&, const App::Property&)> signalChangedObject;
boost::signals2::signal<void (const App::DocumentObject&, const App::Property&)> signalChangedObject;
/// signal on relabeled Object
boost::signal<void (const App::DocumentObject&)> signalRelabelObject;
boost::signals2::signal<void (const App::DocumentObject&)> signalRelabelObject;
/// signal on activated Object
boost::signal<void (const App::DocumentObject&)> signalActivatedObject;
boost::signals2::signal<void (const App::DocumentObject&)> signalActivatedObject;
/// signal on created object
boost::signal<void (const App::DocumentObject&, Transaction*)> signalTransactionAppend;
boost::signals2::signal<void (const App::DocumentObject&, Transaction*)> signalTransactionAppend;
/// signal on removed object
boost::signal<void (const App::DocumentObject&, Transaction*)> signalTransactionRemove;
boost::signals2::signal<void (const App::DocumentObject&, Transaction*)> signalTransactionRemove;
/// signal on undo
boost::signal<void (const App::Document&)> signalUndo;
boost::signals2::signal<void (const App::Document&)> signalUndo;
/// signal on redo
boost::signal<void (const App::Document&)> signalRedo;
boost::signals2::signal<void (const App::Document&)> 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<void (Base::Writer &)> signalSaveDocument;
boost::signal<void (Base::XMLReader&)> signalRestoreDocument;
boost::signal<void (const std::vector<App::DocumentObject*>&,
Base::Writer &)> signalExportObjects;
boost::signal<void (const std::vector<App::DocumentObject*>&,
Base::Writer &)> signalExportViewObjects;
boost::signal<void (const std::vector<App::DocumentObject*>&,
Base::XMLReader&)> signalImportObjects;
boost::signal<void (const std::vector<App::DocumentObject*>&, Base::Reader&,
const std::map<std::string, std::string>&)> signalImportViewObjects;
boost::signals2::signal<void (Base::Writer &)> signalSaveDocument;
boost::signals2::signal<void (Base::XMLReader&)> signalRestoreDocument;
boost::signals2::signal<void (const std::vector<App::DocumentObject*>&,
Base::Writer &)> signalExportObjects;
boost::signals2::signal<void (const std::vector<App::DocumentObject*>&,
Base::Writer &)> signalExportViewObjects;
boost::signals2::signal<void (const std::vector<App::DocumentObject*>&,
Base::XMLReader&)> signalImportObjects;
boost::signals2::signal<void (const std::vector<App::DocumentObject*>&, Base::Reader&,
const std::map<std::string, std::string>&)> signalImportViewObjects;
//signal starting a save action to a file
boost::signal<void (const App::Document&, const std::string&)> signalStartSave;
boost::signals2::signal<void (const App::Document&, const std::string&)> signalStartSave;
//signal finishing a save action to a file
boost::signal<void (const App::Document&, const std::string&)> signalFinishSave;
boost::signal<void (const App::Document&)> signalRecomputed;
boost::signal<void (const App::DocumentObject&)> signalRecomputedObject;
boost::signals2::signal<void (const App::Document&, const std::string&)> signalFinishSave;
boost::signals2::signal<void (const App::Document&)> signalRecomputed;
boost::signals2::signal<void (const App::DocumentObject&)> signalRecomputedObject;
//signal a new opened transaction
boost::signal<void (const App::Document&, std::string)> signalOpenTransaction;
boost::signals2::signal<void (const App::Document&, std::string)> signalOpenTransaction;
// signal a committed transaction
boost::signal<void (const App::Document&)> signalCommitTransaction;
boost::signals2::signal<void (const App::Document&)> signalCommitTransaction;
// signal an aborted transaction
boost::signal<void (const App::Document&)> signalAbortTransaction;
boost::signals2::signal<void (const App::Document&)> signalAbortTransaction;
//@}
/** @name File handling of the document */

8
src/App/DocumentObject.h
View File

@@ -33,7 +33,7 @@
#include <CXX/Objects.hxx>
#include <bitset>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
namespace App
{
@@ -291,9 +291,9 @@ protected: // attributes
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;

1
src/App/DocumentObserver.cpp
View File

@@ -27,7 +27,6 @@
# include <sstream>
#endif
#include <boost/signals.hpp>
#include <boost/bind.hpp>
#include "Application.h"

4
src/App/DocumentObserver.h
View File

@@ -25,7 +25,7 @@
#define APP_DOCUMENTOBSERVER_H
#include <Base/BaseClass.h>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <set>
namespace App
@@ -161,7 +161,7 @@ protected:
private:
App::Document* _document;
typedef boost::signals::connection Connection;
typedef boost::signals2::connection Connection;
Connection connectApplicationCreatedDocument;
Connection connectApplicationDeletedDocument;
Connection connectDocumentCreatedObject;

4
src/App/DocumentObserverPython.h
View File

@@ -26,7 +26,7 @@
#include <CXX/Objects.hxx>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <boost/bind.hpp>
namespace App
@@ -100,7 +100,7 @@ private:
Py::Object inst;
static std::vector<DocumentObserverPython*> _instances;
typedef boost::signals::connection Connection;
typedef boost::signals2::connection Connection;
Connection connectApplicationCreatedDocument;
Connection connectApplicationDeletedDocument;
Connection connectApplicationRelabelDocument;

4
src/App/MergeDocuments.h
View File

@@ -24,7 +24,7 @@
#ifndef APP_MERGEDOCUMENTS_H
#define APP_MERGEDOCUMENTS_H
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <Base/Persistence.h>
namespace zipios {
@@ -57,7 +57,7 @@ private:
App::Document* appdoc;
std::vector<App::DocumentObject*> objects;
std::map<std::string, std::string> nameMap;
typedef boost::signals::connection Connection;
typedef boost::signals2::connection Connection;
Connection connectExport;
Connection connectImport;
};

2
src/App/PreCompiled.h
View File

@@ -75,7 +75,7 @@
#include <random>
// Boost
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#include <boost/regex.hpp>

4
src/App/PropertyExpressionEngine.h
View File

@@ -25,7 +25,7 @@
#include <boost/unordered/unordered_map.hpp>
#include <boost/function.hpp>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/topological_sort.hpp>
#include <App/Property.h>
@@ -125,7 +125,7 @@ public:
void slotObjectDeleted(const DocumentObject &obj);
///signal called when an expression was changed
boost::signal<void (const App::ObjectIdentifier &)> expressionChanged;
boost::signals2::signal<void (const App::ObjectIdentifier &)> expressionChanged;
void onDocumentRestored();

13
src/Base/Tools.h
View File

@@ -30,7 +30,7 @@
#include <iostream>
#include <vector>
#include <string>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <QString>
namespace Base
@@ -180,17 +180,14 @@ private:
// ----------------------------------------------------------------------------
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);
}
};

2
src/Gui/Action.cpp
View File

@@ -24,7 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <boost/signals.hpp>
# include <boost/signals2.hpp>
# include <boost/bind.hpp>
# include <QAbstractItemView>
# include <QActionEvent>

2
src/Gui/Application.cpp
View File

@@ -25,7 +25,7 @@
#ifndef _PreComp_
# include "InventorAll.h"
# include <boost/signals.hpp>
# include <boost/signals2.hpp>
# include <boost/bind.hpp>
# include <sstream>
# include <stdexcept>

32
src/Gui/Application.h
View File

@@ -89,37 +89,37 @@ public:
/** @name Signals of the Application */
//@{
/// signal on new Document
boost::signal<void (const Gui::Document&)> signalNewDocument;
boost::signals2::signal<void (const Gui::Document&)> signalNewDocument;
/// signal on deleted Document
boost::signal<void (const Gui::Document&)> signalDeleteDocument;
boost::signals2::signal<void (const Gui::Document&)> signalDeleteDocument;
/// signal on relabeling Document
boost::signal<void (const Gui::Document&)> signalRelabelDocument;
boost::signals2::signal<void (const Gui::Document&)> signalRelabelDocument;
/// signal on renaming Document
boost::signal<void (const Gui::Document&)> signalRenameDocument;
boost::signals2::signal<void (const Gui::Document&)> signalRenameDocument;
/// signal on activating Document
boost::signal<void (const Gui::Document&)> signalActiveDocument;
boost::signals2::signal<void (const Gui::Document&)> signalActiveDocument;
/// signal on new Object
boost::signal<void (const Gui::ViewProvider&)> signalNewObject;
boost::signals2::signal<void (const Gui::ViewProvider&)> signalNewObject;
/// signal on deleted Object
boost::signal<void (const Gui::ViewProvider&)> signalDeletedObject;
boost::signals2::signal<void (const Gui::ViewProvider&)> signalDeletedObject;
/// signal on changed object property
boost::signal<void (const Gui::ViewProvider&, const App::Property&)> signalChangedObject;
boost::signals2::signal<void (const Gui::ViewProvider&, const App::Property&)> signalChangedObject;
/// signal on renamed Object
boost::signal<void (const Gui::ViewProvider&)> signalRelabelObject;
boost::signals2::signal<void (const Gui::ViewProvider&)> signalRelabelObject;
/// signal on activated Object
boost::signal<void (const Gui::ViewProvider&)> signalActivatedObject;
boost::signals2::signal<void (const Gui::ViewProvider&)> signalActivatedObject;
/// signal on activated workbench
boost::signal<void (const char*)> signalActivateWorkbench;
boost::signals2::signal<void (const char*)> signalActivateWorkbench;
/// signal on added workbench
boost::signal<void (const char*)> signalAddWorkbench;
boost::signals2::signal<void (const char*)> signalAddWorkbench;
/// signal on removed workbench
boost::signal<void (const char*)> signalRemoveWorkbench;
boost::signals2::signal<void (const char*)> signalRemoveWorkbench;
/// signal on activating view
boost::signal<void (const Gui::MDIView*)> signalActivateView;
boost::signals2::signal<void (const Gui::MDIView*)> signalActivateView;
/// signal on entering in edit mode
boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalInEdit;
boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&)> signalInEdit;
/// signal on leaving edit mode
boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalResetEdit;
boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&)> signalResetEdit;
//@}
/** @name methods for Document handling */

4
src/Gui/AutoSaver.h
View File

@@ -29,7 +29,7 @@
#include <map>
#include <set>
#include <string>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
namespace App {
class Document;
@@ -53,7 +53,7 @@ public:
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;
};

1
src/Gui/DAGView/DAGModel.cpp
View File

@@ -22,7 +22,6 @@
#include "PreCompiled.h"
#ifndef _PreComp_
#include <boost/signals.hpp>
#include <boost/bind.hpp>
#include <boost/graph/topological_sort.hpp>
#include <boost/graph/reverse_graph.hpp>

4
src/Gui/DAGView/DAGModel.h
View File

@@ -26,7 +26,7 @@
#include <memory>
#include <vector>
#include <boost/signal.hpp>
#include <boost/signals2.hpp>
#include <QGraphicsScene>
#include <QBrush>
@@ -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;

6
src/Gui/DlgDisplayPropertiesImp.h
View File

@@ -25,7 +25,7 @@
#define GUI_DIALOG_DLGDISPLAYPROPERTIES_IMP_H
#include <vector>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#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 @@ protected:
private:
void slotChangedObject(const Gui::ViewProvider&, const App::Property& Prop);
void reject();
void reject();
void setDisplayModes(const std::vector<ViewProvider*>&);
void setMaterial(const std::vector<ViewProvider*>&);
void setColorPlot(const std::vector<ViewProvider*>&);

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);

32
src/Gui/Document.h
View File

@@ -92,36 +92,36 @@ public:
/** @name Signals of the document */
//@{
/// signal on new Object
mutable boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalNewObject;
mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&)> signalNewObject;
/// signal on deleted Object
mutable boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalDeletedObject;
mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&)> 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<void (const Gui::ViewProviderDocumentObject&,
mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&,
const App::Property&)> signalChangedObject;
/// signal on renamed Object
mutable boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalRelabelObject;
mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&)> signalRelabelObject;
/// signal on activated Object
mutable boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalActivatedObject;
mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&)> signalActivatedObject;
/// signal on entering in edit mode
mutable boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalInEdit;
mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&)> signalInEdit;
/// signal on leaving edit mode
mutable boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalResetEdit;
mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&)> signalResetEdit;
/// signal on changed Object, the 2nd argument is the highlite mode to use
mutable boost::signal<void (const Gui::ViewProviderDocumentObject&,
const Gui::HighlightMode&,
bool)> signalHighlightObject;
mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&,
const Gui::HighlightMode&,
bool)> signalHighlightObject;
/// signal on changed Object, the 2nd argument is the highlite mode to use
mutable boost::signal<void (const Gui::ViewProviderDocumentObject&,
const Gui::TreeItemMode&)> signalExpandObject;
mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&,
const Gui::TreeItemMode&)> signalExpandObject;
/// signal on scrolling to an object
mutable boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalScrollToObject;
mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&)> signalScrollToObject;
/// signal on undo Document
mutable boost::signal<void (const Gui::Document& doc)> signalUndoDocument;
mutable boost::signals2::signal<void (const Gui::Document& doc)> signalUndoDocument;
/// signal on redo Document
mutable boost::signal<void (const Gui::Document& doc)> signalRedoDocument;
mutable boost::signals2::signal<void (const Gui::Document& doc)> signalRedoDocument;
/// signal on deleting Document
mutable boost::signal<void (const Gui::Document& doc)> signalDeleteDocument;
mutable boost::signals2::signal<void (const Gui::Document& doc)> signalDeleteDocument;
//@}
/** @name I/O of the document */

2
src/Gui/DocumentModel.cpp
View File

@@ -26,7 +26,7 @@
#ifndef _PreComp_
# include <QApplication>
# include <algorithm>
# include <boost/signals.hpp>
# include <boost/signals2.hpp>
# include <boost/bind.hpp>
#endif

14
src/Gui/DocumentObserver.cpp
View File

@@ -27,7 +27,6 @@
# include <sstream>
#endif
#include <boost/signals.hpp>
#include <boost/bind.hpp>
#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*/)
{
}

23
src/Gui/DocumentObserver.h
View File

@@ -25,8 +25,7 @@
#define GUI_DOCUMENTOBSERVER_H
#include <Base/BaseClass.h>
#include <boost/signals.hpp>
#include <QFlags>
#include <boost/signals2.hpp>
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 @@ public:
* 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 @@ private:
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;

4
src/Gui/DocumentObserverPython.h
View File

@@ -26,7 +26,7 @@
#include <CXX/Objects.hxx>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <boost/bind.hpp>
namespace Gui
@@ -75,7 +75,7 @@ private:
Py::Object inst;
static std::vector<DocumentObserverPython*> _instances;
typedef boost::signals::connection Connection;
typedef boost::signals2::connection Connection;
Connection connectApplicationCreatedDocument;
Connection connectApplicationDeletedDocument;
Connection connectApplicationRelabelDocument;

4
src/Gui/ExpressionBinding.h
View File

@@ -27,7 +27,7 @@
#include <App/ObjectIdentifier.h>
#include <boost/shared_ptr.hpp>
#include <QLabel>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
namespace App {
class Expression;
@@ -75,7 +75,7 @@ protected:
int iconHeight;
void expressionChange(const App::ObjectIdentifier& id);
boost::signals::scoped_connection connection;
boost::signals2::scoped_connection connection;
bool m_autoApply;
};

4
src/Gui/GraphvizView.h
View File

@@ -26,7 +26,7 @@
#include "MDIView.h"
#include <boost/shared_ptr.hpp>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
class QGraphicsScene;
@@ -84,7 +84,7 @@ private:
GraphvizWorker* thread;
int nPending;
typedef boost::BOOST_SIGNALS_NAMESPACE::scoped_connection Connection;
typedef boost::signals2::scoped_connection Connection;
Connection recomputeConnection;
Connection undoConnection;
Connection redoConnection;

2
src/Gui/MDIView.cpp
View File

@@ -24,7 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <boost/signals.hpp>
# include <boost/signals2.hpp>
# include <boost/bind.hpp>
# include <qapplication.h>
# include <qregexp.h>

2
src/Gui/MDIView.h
View File

@@ -150,7 +150,7 @@ private:
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.
};

1
src/Gui/MainWindow.cpp
View File

@@ -51,7 +51,6 @@
# include <QWhatsThis>
#endif
#include <boost/signals.hpp>
#include <boost/bind.hpp>
// FreeCAD Base header

1
src/Gui/ManualAlignment.cpp
View File

@@ -49,7 +49,6 @@
# include <Inventor/sensors/SoNodeSensor.h>
#endif
#include <boost/signals.hpp>
#include <boost/bind.hpp>
#include <App/Document.h>

4
src/Gui/ManualAlignment.h
View File

@@ -30,7 +30,7 @@
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/ViewProviderDocumentObject.h>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
class SbVec3f;
class SoPickedPoint;
@@ -245,7 +245,7 @@ private:
static ManualAlignment* _instance;
typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection;
typedef boost::signals2::connection Connection;
Connection connectApplicationDeletedDocument;
Connection connectDocumentDeletedObject;

4
src/Gui/MergeDocuments.h
View File

@@ -24,7 +24,7 @@
#ifndef GUI_MERGEDOCUMENTS_H
#define GUI_MERGEDOCUMENTS_H
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <Base/Persistence.h>
namespace zipios {
@@ -57,7 +57,7 @@ private:
Gui::Document* document;
std::vector<App::DocumentObject*> objects;
std::map<std::string, std::string> nameMap;
typedef boost::signals::connection Connection;
typedef boost::signals2::connection Connection;
Connection connectExport;
Connection connectImport;
};

4
src/Gui/Placement.h
View File

@@ -29,7 +29,7 @@
#include <Gui/TaskView/TaskView.h>
#include <Base/Placement.h>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <boost/bind.hpp>
class QSignalMapper;
@@ -88,7 +88,7 @@ Q_SIGNALS:
private:
typedef Gui::LocationInterfaceComp<Ui_Placement> Ui_PlacementComp;
typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection;
typedef boost::signals2::connection Connection;
Ui_PlacementComp* ui;
QSignalMapper* signalMapper;
Connection connectAct;

2
src/Gui/PreCompiled.h
View File

@@ -75,7 +75,7 @@
#include <bitset>
// Boost
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#include <boost/program_options.hpp>
#include <boost/tuple/tuple.hpp>

1
src/Gui/ProjectView.cpp
View File

@@ -24,7 +24,6 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <boost/signals.hpp>
# include <boost/bind.hpp>
# include <QAction>
# include <QActionGroup>

14
src/Gui/PropertyView.h
View File

@@ -28,7 +28,7 @@
#include "DockWindow.h"
#include "Selection.h"
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
class QPixmap;
class QTabWidget;
@@ -65,15 +65,15 @@ public:
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 @@ private:
private:
struct PropInfo;
struct PropFind;
typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection;
typedef boost::signals2::connection Connection;
Connection connectPropData;
Connection connectPropView;
Connection connectPropAppend;

7
src/Gui/Selection.cpp
View File

@@ -26,7 +26,6 @@
#ifndef _PreComp_
# include <assert.h>
# include <string>
# include <boost/signals.hpp>
# include <boost/bind.hpp>
# include <QApplication>
# include <QString>
@@ -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;
}

6
src/Gui/Selection.h
View File

@@ -30,6 +30,7 @@
#include <vector>
#include <list>
#include <map>
#include <boost/signals2.hpp>
#include <CXX/Objects.hxx>
#include <Base/Observer.h>
@@ -144,8 +145,9 @@ private:
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 @@ public:
};
/// signal on new object
boost::signal<void (const SelectionChanges& msg)> signalSelectionChanged;
boost::signals2::signal<void (const SelectionChanges& msg)> signalSelectionChanged;
/** Returns a vector of selection objects
* If no document name is given the objects of the active are returned.

4
src/Gui/TaskView/TaskAppearance.h
View File

@@ -26,7 +26,7 @@
#include "TaskView.h"
#include <Gui/Selection.h>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
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
{

1
src/Gui/TaskView/TaskSelectLinkProperty.h
View File

@@ -26,7 +26,6 @@
#include "TaskView.h"
#include <Gui/Selection.h>
#include <boost/signals.hpp>
#include <App/PropertyLinks.h>

4
src/Gui/TaskView/TaskView.h
View File

@@ -29,7 +29,7 @@
#include <map>
#include <string>
#include <vector>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <QScrollArea>
#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;

1
src/Gui/Tree.cpp
View File

@@ -24,7 +24,6 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <boost/signals.hpp>
# include <boost/bind.hpp>
# include <QAction>
# include <QActionGroup>

4
src/Gui/Tree.h
View File

@@ -185,7 +185,7 @@ private:
const Gui::Document* pDocument;
std::map<std::string,DocumentObjectItemsPtr> ObjectMap;
typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection;
typedef boost::signals2::connection Connection;
Connection connectNewObject;
Connection connectDelObject;
Connection connectChgObject;
@@ -223,7 +223,7 @@ protected:
void slotChangeStatusTip(const QString&);
private:
typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection;
typedef boost::signals2::connection Connection;
int previousStatus;
Gui::ViewProviderDocumentObject* viewObject;
Connection connectIcon;

8
src/Gui/ViewProvider.h
View File

@@ -29,7 +29,7 @@
#include <string>
#include <bitset>
#include <QIcon>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <App/TransactionalObject.h>
#include <Base/Vector3D.h>
@@ -200,11 +200,11 @@ public:
/** @name Signals of the view provider */
//@{
/// signal on icon change
boost::signal<void ()> signalChangeIcon;
boost::signals2::signal<void ()> signalChangeIcon;
/// signal on tooltip change
boost::signal<void (const QString&)> signalChangeToolTip;
boost::signals2::signal<void (const QString&)> signalChangeToolTip;
/// signal on status tip change
boost::signal<void (const QString&)> signalChangeStatusTip;
boost::signals2::signal<void (const QString&)> signalChangeStatusTip;
//@}
/** update the content of the ViewProvider

2
src/Gui/ViewProviderOriginGroup.h
View File

@@ -23,8 +23,6 @@
#ifndef VIEWPROVIDERORIGINGROUP_H_JIXBOPA7
#define VIEWPROVIDERORIGINGROUP_H_JIXBOPA7
#include <boost/signals.hpp>
#include "ViewProviderGeoFeatureGroup.h"
#include "ViewProviderOriginGroupExtension.h"

4
src/Gui/ViewProviderOriginGroupExtension.h
View File

@@ -56,8 +56,8 @@ private:
std::vector<App::DocumentObject*> constructChildren (
const std::vector<App::DocumentObject*> &children ) const;
boost::signals::connection connectChangedObjectApp;
boost::signals::connection connectChangedObjectGui;
boost::signals2::connection connectChangedObjectApp;
boost::signals2::connection connectChangedObjectGui;
};
typedef ViewProviderExtensionPythonT<Gui::ViewProviderOriginGroupExtension> ViewProviderOriginGroupExtensionPython;

1
src/Gui/ViewProviderPythonFeature.cpp
View File

@@ -30,7 +30,6 @@
# include <QFileInfo>
# include <QMenu>
# include <QPixmap>
# include <boost/signals.hpp>
# include <boost/bind.hpp>
# include <Inventor/nodes/SoDrawStyle.h>
# include <Inventor/nodes/SoMaterial.h>

14
src/Mod/Drawing/Gui/TaskOrthoViews.cpp
View File

@@ -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?

8
src/Mod/Drawing/Gui/TaskOrthoViews.h
View File

@@ -30,9 +30,9 @@
#include <gp_Ax2.hxx>
#include <vector>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <Mod/Drawing/App/FeatureViewPart.h>
#include <Mod/Drawing/App/FeatureViewPart.h>
@@ -148,8 +148,8 @@ private:
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;
};

13
src/Mod/Fem/Gui/TaskPostBoxes.h
View File

@@ -30,7 +30,6 @@
#include <Base/Parameter.h>
#include <App/PropertyLinks.h>
#include "ViewProviderFemPostFunction.h"
#include <boost/signals.hpp>
class QComboBox;
class Ui_TaskPostDisplay;
@@ -139,15 +138,15 @@ public:
~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<typename T>
T* getTypedObject() {return static_cast<T*>(m_object);};
Gui::ViewProviderDocumentObject* getView() {return m_view;};
T* getTypedObject() {return static_cast<T*>(m_object);}
Gui::ViewProviderDocumentObject* getView() {return m_view;}
template<typename T>
T* getTypedView() {return static_cast<T*>(m_view);};
T* getTypedView() {return static_cast<T*>(m_view);}
bool autoApply();
void recompute();
@@ -203,7 +202,7 @@ public:
~TaskPostDisplay();
virtual void applyPythonCode();
virtual bool isGuiTaskOnly() {return true;};
virtual bool isGuiTaskOnly() {return true;}
private Q_SLOTS:
void on_Representation_activated(int i);

37
src/Mod/Fem/Gui/ViewProviderFemPostFunction.h
View File

@@ -28,28 +28,7 @@
#include <Mod/Fem/App/FemPostFunction.h>
#include <Inventor/SbMatrix.h>
#include <QWidget>
#if defined(signals) && defined(QOBJECTDEFS_H) && \
!defined(QT_MOC_CPP)
# undef signals
# define signals signals
#endif
#include <boost/signal.hpp>
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 <qobjectdefs.h>.
# define signals protected
#endif
#include <boost/signals2.hpp>
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 @@ private:
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

1
src/Mod/Inspection/App/InspectionFeature.cpp
View File

@@ -35,7 +35,6 @@
#include <QFutureWatcher>
#include <QtConcurrentMap>
#include <boost/signals.hpp>
#include <boost/bind.hpp>
#include <Base/Console.h>

1
src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp
View File

@@ -31,7 +31,6 @@
#include "ui_DlgEvaluateMesh.h"
#include "DlgEvaluateSettings.h"
#include <boost/signals.hpp>
#include <boost/bind.hpp>
#include <Base/Interpreter.h>

4
src/Mod/Mesh/Gui/MeshEditor.h
View File

@@ -25,7 +25,7 @@
#include <QObject>
#include <Mod/Mesh/Gui/ViewProvider.h>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
class SoCoordinate3;
class SoFaceSet;
@@ -139,7 +139,7 @@ private Q_SLOTS:
private:
typedef std::vector<unsigned long> TBoundary;
typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection;
typedef boost::signals2::connection Connection;
static void fileHoleCallback(void * ud, SoEventCallback * n);
void createPolygons();

10
src/Mod/Part/App/PreCompiled.h
View File

@@ -63,7 +63,7 @@
#include <map>
// Boost
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#include <boost/tuple/tuple.hpp>
@@ -73,10 +73,10 @@
#include <boost/program_options.hpp>
//namespace po = boost::program_options;
#include <boost/filesystem/path.hpp>
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/exception.hpp>
#include <boost/filesystem/path.hpp>
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/exception.hpp>
#include "OpenCascadeAll.h"
#elif defined(FC_OS_WIN32)

4
src/Mod/Part/Gui/DlgBooleanOperation.h
View File

@@ -25,7 +25,7 @@
#include <Gui/TaskView/TaskDialog.h>
#include <Gui/TaskView/TaskView.h>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
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
{

2
src/Mod/Part/Gui/DlgFilletEdges.cpp
View File

@@ -207,7 +207,7 @@ namespace PartGui {
std::vector<int> edge_ids;
TopTools_IndexedMapOfShape all_edges;
TopTools_IndexedMapOfShape all_faces;
typedef boost::signals::connection Connection;
typedef boost::signals2::connection Connection;
Connection connectApplicationDeletedObject;
Connection connectApplicationDeletedDocument;

2
src/Mod/Part/Gui/TaskAttacher.h
View File

@@ -131,7 +131,7 @@ private:
Attacher::SuggestResult lastSuggestResult;
bool completed;
typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection;
typedef boost::signals2::connection Connection;
Connection connectDelObject;
};

4
src/Mod/Part/Gui/TaskFaceColors.cpp
View File

@@ -45,7 +45,7 @@
# include <Inventor/nodes/SoSeparator.h>
#endif
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#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;

4
src/Mod/PartDesign/App/Body.h
View File

@@ -27,7 +27,7 @@
#include <App/PropertyStandard.h>
#include <Mod/Part/App/BodyBase.h>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
namespace App {
class Origin;
@@ -145,7 +145,7 @@ protected:
virtual void unsetupObject () override;
private:
boost::signals::scoped_connection connection;
boost::signals2::scoped_connection connection;
};
} //namespace PartDesign

4
src/Mod/PartDesign/App/ShapeBinder.h
View File

@@ -25,7 +25,7 @@
#define PARTDESIGN_DATUMSHAPE_H
#include <QString>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <App/PropertyLinks.h>
#include <Mod/Part/App/DatumFeature.h>
@@ -67,7 +67,7 @@ private:
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;
};

1
src/Mod/PartDesign/Gui/TaskFeatureParameters.cpp
View File

@@ -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)

2
src/Mod/PartDesign/Gui/TaskHoleParameters.h
View File

@@ -121,7 +121,7 @@ private:
private:
typedef boost::BOOST_SIGNALS_NAMESPACE::scoped_connection Connection;
typedef boost::signals2::scoped_connection Connection;
Connection connectPropChanged;
std::unique_ptr<Observer> observer;

1
src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
View File

@@ -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());

2
src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h
View File

@@ -48,8 +48,6 @@ class ViewProvider;
namespace PartDesignGui {
namespace s = boost::signals;
class TaskBoxPrimitives : public Gui::TaskView::TaskBox,
public Gui::DocumentObserver
{

4
src/Mod/PartDesign/Gui/TaskTransformedMessages.h
View File

@@ -25,10 +25,10 @@
#define GUI_TASKVIEW_TaskTransformedMessages_H
#include <Gui/TaskView/TaskView.h>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
class Ui_TaskTransformedMessages;
typedef boost::signals::connection Connection;
typedef boost::signals2::connection Connection;
namespace App {
class Property;

1
src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp
View File

@@ -76,7 +76,6 @@ TaskTransformedParameters::TaskTransformedParameters(ViewProviderTransformed *Tr
if (TransformedView) {
Gui::Document* doc = TransformedView->getDocument();
this->attachDocument(doc);
this->enableNotifications(DocumentObserver::Delete);
}
}

4
src/Mod/PartDesign/Gui/ViewProviderBody.h
View File

@@ -96,8 +96,8 @@ protected:
private:
static const char* BodyModeEnum[];
boost::signals::connection connectChangedObjectApp;
boost::signals::connection connectChangedObjectGui;
boost::signals2::connection connectChangedObjectApp;
boost::signals2::connection connectChangedObjectGui;
};

2
src/Mod/PartDesign/Gui/ViewProviderTransformed.h
View File

@@ -47,7 +47,7 @@ public:
virtual bool onDelete(const std::vector<std::string> &);
/// signals if the transformation contains errors
boost::signal<void (QString msg)> signalDiagnosis;
boost::signals2::signal<void (QString msg)> signalDiagnosis;
// The feature name of the subclass
std::string featureName;

8
src/Mod/PartDesign/Gui/WorkflowManager.h
View File

@@ -23,7 +23,7 @@
#ifndef WORKFLOWMANAGER_H_PB7A5GCM
#define WORKFLOWMANAGER_H_PB7A5GCM
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <map>
namespace App {
@@ -98,9 +98,9 @@ private:
private:
std::map<const App::Document*, Workflow> 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;
};

17
src/Mod/Sandbox/App/DocumentProtector.h
View File

@@ -25,7 +25,6 @@
#define SANDBOX_DOCUMENTPROTECTOR_H
#include <string>
#include <boost/signals.hpp>
#include <boost/bind.hpp>
#include <App/DocumentObserver.h>
@@ -49,9 +48,9 @@ public:
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 @@ public:
virtual void operator()() const
{
T* v = static_cast<T*>(obj);
(v->*method)();
T* v = static_cast<T*>(obj);
(v->*method)();
}
private:
@@ -101,8 +100,8 @@ public:
virtual void operator()() const
{
T* v = static_cast<T*>(obj);
(v->*method)(arg);
T* v = static_cast<T*>(obj);
(v->*method)(arg);
}
private:
@@ -122,7 +121,7 @@ public:
void purgeTouched();
private:
void validate();
void validate();
private:
App::DocumentObject* obj;

6
src/Mod/Sketcher/App/PropertyConstraintList.h
View File

@@ -32,7 +32,7 @@
#include <App/Property.h>
#include <Mod/Part/App/Geometry.h>
#include "Constraint.h"
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <boost/unordered/unordered_map.hpp>
namespace Base {
@@ -129,8 +129,8 @@ public:
typedef std::pair<int, const Constraint*> ConstraintInfo ;
boost::signal<void (const std::map<App::ObjectIdentifier, App::ObjectIdentifier> &)> signalConstraintsRenamed;
boost::signal<void (const std::set<App::ObjectIdentifier> &)> signalConstraintsRemoved;
boost::signals2::signal<void (const std::map<App::ObjectIdentifier, App::ObjectIdentifier> &)> signalConstraintsRenamed;
boost::signals2::signal<void (const std::set<App::ObjectIdentifier> &)> signalConstraintsRemoved;
static std::string getConstraintName(const std::string &name, int i);

4
src/Mod/Sketcher/App/SketchObject.h
View File

@@ -437,8 +437,8 @@ private:
std::vector<int> lastConflicting;
std::vector<int> 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);

4
src/Mod/Sketcher/Gui/TaskDlgEditSketch.h
View File

@@ -32,9 +32,9 @@
#include "TaskSketcherGeneral.h"
#include "TaskSketcherMessages.h"
#include "TaskSketcherSolverAdvanced.h"
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
typedef boost::signals::connection Connection;
typedef boost::signals2::connection Connection;
namespace SketcherGui {

4
src/Mod/Sketcher/Gui/TaskSketcherConstrains.h
View File

@@ -26,7 +26,7 @@
#include <Gui/TaskView/TaskView.h>
#include <Gui/Selection.h>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <QListWidget>
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:

4
src/Mod/Sketcher/Gui/TaskSketcherElements.h
View File

@@ -26,7 +26,7 @@
#include <Gui/TaskView/TaskView.h>
#include <Gui/Selection.h>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <QListWidget>
namespace App {
@@ -116,7 +116,7 @@ protected:
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:

4
src/Mod/Sketcher/Gui/TaskSketcherMessages.h
View File

@@ -26,10 +26,10 @@
#include <Gui/TaskView/TaskView.h>
#include <Gui/Selection.h>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
class Ui_TaskSketcherMessages;
typedef boost::signals::connection Connection;
typedef boost::signals2::connection Connection;
namespace App {
class Property;

1
src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h
View File

@@ -26,7 +26,6 @@
#include <Gui/TaskView/TaskView.h>
#include <Gui/Selection.h>
#include <boost/signals.hpp>
class Ui_TaskSketcherSolverAdvanced;

15
src/Mod/Sketcher/Gui/ViewProviderSketch.h
View File

@@ -33,11 +33,10 @@
#include <Gui/Selection.h>
#include <Gui/GLPainter.h>
#include <App/Part.h>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <QCoreApplication>
#include <Gui/Document.h>
#include <boost/signals.hpp>
class TopoDS_Shape;
class TopoDS_Face;
@@ -234,13 +233,13 @@ public:
friend struct ::EditData;
/// signals if the constraints list has changed
boost::signal<void ()> signalConstraintsChanged;
boost::signals2::signal<void ()> signalConstraintsChanged;
/// signals if the sketch has been set up
boost::signal<void (QString msg)> signalSetUp;
boost::signals2::signal<void (QString msg)> signalSetUp;
/// signals if the sketch has been solved
boost::signal<void (QString msg)> signalSolved;
boost::signals2::signal<void (QString msg)> signalSolved;
/// signals if the elements list has changed
boost::signal<void ()> signalElementsChanged;
boost::signals2::signal<void ()> signalElementsChanged;
protected:
virtual bool setEdit(int ModNum);
@@ -269,8 +268,8 @@ protected:
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.

12
src/Mod/Spreadsheet/App/Sheet.h
View File

@@ -170,13 +170,13 @@ public:
// Signals
boost::signal<void (App::CellAddress)> cellUpdated;
boost::signals2::signal<void (App::CellAddress)> cellUpdated;
boost::signal<void (App::CellAddress)> cellSpanChanged;
boost::signals2::signal<void (App::CellAddress)> cellSpanChanged;
boost::signal<void (int, int)> columnWidthChanged;
boost::signals2::signal<void (int, int)> columnWidthChanged;
boost::signal<void (int, int)> rowHeightChanged;
boost::signals2::signal<void (int, int)> rowHeightChanged;
/** @name Access properties */
//@{
@@ -296,8 +296,8 @@ protected:
typedef std::map<std::string, SheetObserver* > 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;

2
src/Mod/Spreadsheet/Gui/SheetModel.h
View File

@@ -52,7 +52,7 @@ public:
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;

2
src/Mod/Spreadsheet/Gui/SheetTableView.h
View File

@@ -79,7 +79,7 @@ protected:
QModelIndex currentEditIndex;
Spreadsheet::Sheet * sheet;
boost::BOOST_SIGNALS_NAMESPACE::scoped_connection cellSpanChangedConnection;
boost::signals2::scoped_connection cellSpanChangedConnection;
};
}

6
src/Mod/Spreadsheet/Gui/SpreadsheetView.h
View File

@@ -100,9 +100,9 @@ protected:
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<int, int> newColumnSizes;
QMap<int, int> newRowSizes;

2
src/Mod/TechDraw/Gui/MDIViewPage.cpp
View File

@@ -38,7 +38,7 @@
#include <QPrinter>
#include <QPrintDialog>
#include <QPrintPreviewDialog>
#include <boost/signal.hpp>
#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#endif // #ifndef _PreComp_

2
src/Mod/TechDraw/Gui/MDIViewPage.h
View File

@@ -125,7 +125,7 @@ protected:
void onDeleteObject(const App::DocumentObject& obj);
typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection;
typedef boost::signals2::connection Connection;
Connection connectDeletedObject;
bool compareSelections(std::vector<Gui::SelectionObject> treeSel,QList<QGraphicsItem*> sceneSel);