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