electron-rare/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Base: Remove Boost-based signals and switch to FastSignals.

Browse Source
This commit is contained in:
tritao
2026-01-07 21:16:16 +00:00
parent 4ed69332c5
commit 69058376e6
123 changed files with 385 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/3rdParty/CMakeLists.txt
Vendored
+2
View File
@@ -1,3 +1,5 @@
add_subdirectory(FastSignals)
# Build SalomeMesh for all Platforms since heavily patched
if (BUILD_SMESH)
add_subdirectory(salomesmesh)
src/App/Application.cpp
+2 -2
View File
@@ -651,8 +651,8 @@ struct DocTiming {
class DocOpenGuard {
public:
bool &flag;
boost::signals2::signal<void ()> &signal;
DocOpenGuard(bool &f, boost::signals2::signal<void ()> &s)
fastsignals::signal<void ()> &signal;
DocOpenGuard(bool &f, fastsignals::signal<void ()> &s)
:flag(f),signal(s)
{
flag = true;
src/App/Application.h
+45 -44
View File
@@ -26,10 +26,11 @@
#ifndef SRC_APP_APPLICATION_H_
#define SRC_APP_APPLICATION_H_
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <QtCore/qtextstream.h>
#include <deque>
#include <list>
#include <vector>
#include <list>
#include <set>
@@ -222,49 +223,49 @@ public:
/** @name Signals of the Application */
//@{
/// signal on new Document
boost::signals2::signal<void (const Document&, bool)> signalNewDocument;
fastsignals::signal<void (const Document&, bool)> signalNewDocument;
/// signal on document getting deleted
boost::signals2::signal<void (const Document&)> signalDeleteDocument;
fastsignals::signal<void (const Document&)> signalDeleteDocument;
/// signal on already deleted Document
boost::signals2::signal<void ()> signalDeletedDocument;
fastsignals::signal<void ()> signalDeletedDocument;
/// signal on relabeling Document (user name)
boost::signals2::signal<void (const Document&)> signalRelabelDocument;
fastsignals::signal<void (const Document&)> signalRelabelDocument;
/// signal on renaming Document (internal name)
boost::signals2::signal<void (const Document&)> signalRenameDocument;
fastsignals::signal<void (const Document&)> signalRenameDocument;
/// signal on activating Document
boost::signals2::signal<void (const Document&)> signalActiveDocument;
fastsignals::signal<void (const Document&)> signalActiveDocument;
/// signal on saving Document
boost::signals2::signal<void (const Document&)> signalSaveDocument;
fastsignals::signal<void (const Document&)> signalSaveDocument;
/// signal on starting to restore Document
boost::signals2::signal<void (const Document&)> signalStartRestoreDocument;
fastsignals::signal<void (const Document&)> signalStartRestoreDocument;
/// signal on restoring Document
boost::signals2::signal<void (const Document&)> signalFinishRestoreDocument;
fastsignals::signal<void (const Document&)> signalFinishRestoreDocument;
/// signal on pending reloading of a partial Document
boost::signals2::signal<void (const Document&)> signalPendingReloadDocument;
fastsignals::signal<void (const Document&)> signalPendingReloadDocument;
/// signal on starting to save Document
boost::signals2::signal<void (const Document&, const std::string&)> signalStartSaveDocument;
fastsignals::signal<void (const Document&, const std::string&)> signalStartSaveDocument;
/// signal on saved Document
boost::signals2::signal<void (const Document&, const std::string&)> signalFinishSaveDocument;
fastsignals::signal<void (const Document&, const std::string&)> signalFinishSaveDocument;
/// signal on undo in document
boost::signals2::signal<void (const Document&)> signalUndoDocument;
fastsignals::signal<void (const Document&)> signalUndoDocument;
/// signal on application wide undo
boost::signals2::signal<void ()> signalUndo;
fastsignals::signal<void ()> signalUndo;
/// signal on redo in document
boost::signals2::signal<void (const Document&)> signalRedoDocument;
fastsignals::signal<void (const Document&)> signalRedoDocument;
/// signal on application wide redo
boost::signals2::signal<void ()> signalRedo;
fastsignals::signal<void ()> signalRedo;
/// signal before open active transaction
boost::signals2::signal<void (const std::string&)> signalBeforeOpenTransaction;
fastsignals::signal<void (const std::string&)> signalBeforeOpenTransaction;
/// signal before close/abort active transaction
boost::signals2::signal<void (bool)> signalBeforeCloseTransaction;
fastsignals::signal<void (bool)> signalBeforeCloseTransaction;
/// signal after close/abort active transaction
boost::signals2::signal<void (bool)> signalCloseTransaction;
fastsignals::signal<void (bool)> signalCloseTransaction;
/// signal on show hidden items
boost::signals2::signal<void (const Document&)> signalShowHidden;
fastsignals::signal<void (const Document&)> signalShowHidden;
/// signal on start opening document(s)
boost::signals2::signal<void ()> signalStartOpenDocument;
fastsignals::signal<void ()> signalStartOpenDocument;
/// signal on finished opening document(s)
boost::signals2::signal<void ()> signalFinishOpenDocument;
fastsignals::signal<void ()> signalFinishOpenDocument;
//@}
@@ -274,34 +275,34 @@ public:
*/
//@{
/// signal before change of doc property
boost::signals2::signal<void (const App::Document&, const App::Property&)> signalBeforeChangeDocument;
fastsignals::signal<void (const App::Document&, const App::Property&)> signalBeforeChangeDocument;
/// signal on changed doc property
boost::signals2::signal<void (const App::Document&, const App::Property&)> signalChangedDocument;
fastsignals::signal<void (const App::Document&, const App::Property&)> signalChangedDocument;
/// signal on new Object
boost::signals2::signal<void (const App::DocumentObject&)> signalNewObject;
//boost::signals2::signal<void (const App::DocumentObject&)> m_sig;
fastsignals::signal<void (const App::DocumentObject&)> signalNewObject;
//fastsignals::signal<void (const App::DocumentObject&)> m_sig;
/// signal on deleted Object
boost::signals2::signal<void (const App::DocumentObject&)> signalDeletedObject;
fastsignals::signal<void (const App::DocumentObject&)> signalDeletedObject;
/// signal on changed Object
boost::signals2::signal<void (const App::DocumentObject&, const App::Property&)> signalBeforeChangeObject;
fastsignals::signal<void (const App::DocumentObject&, const App::Property&)> signalBeforeChangeObject;
/// signal on changed Object
boost::signals2::signal<void (const App::DocumentObject&, const App::Property&)> signalChangedObject;
fastsignals::signal<void (const App::DocumentObject&, const App::Property&)> signalChangedObject;
/// signal on relabeled Object
boost::signals2::signal<void (const App::DocumentObject&)> signalRelabelObject;
fastsignals::signal<void (const App::DocumentObject&)> signalRelabelObject;
/// signal on activated Object
boost::signals2::signal<void (const App::DocumentObject&)> signalActivatedObject;
fastsignals::signal<void (const App::DocumentObject&)> signalActivatedObject;
/// signal before recomputed document
boost::signals2::signal<void (const App::Document&)> signalBeforeRecomputeDocument;
fastsignals::signal<void (const App::Document&)> signalBeforeRecomputeDocument;
/// signal on recomputed document
boost::signals2::signal<void (const App::Document&)> signalRecomputed;
fastsignals::signal<void (const App::Document&)> signalRecomputed;
/// signal on recomputed document object
boost::signals2::signal<void (const App::DocumentObject&)> signalObjectRecomputed;
fastsignals::signal<void (const App::DocumentObject&)> signalObjectRecomputed;
// signal on opened transaction
boost::signals2::signal<void (const App::Document&, std::string)> signalOpenTransaction;
fastsignals::signal<void (const App::Document&, std::string)> signalOpenTransaction;
// signal a committed transaction
boost::signals2::signal<void (const App::Document&)> signalCommitTransaction;
fastsignals::signal<void (const App::Document&)> signalCommitTransaction;
// signal an aborted transaction
boost::signals2::signal<void (const App::Document&)> signalAbortTransaction;
fastsignals::signal<void (const App::Document&)> signalAbortTransaction;
//@}
/** @name Signals of property changes
@@ -310,13 +311,13 @@ public:
*/
//@{
/// signal on adding a dynamic property
boost::signals2::signal<void (const App::Property&)> signalAppendDynamicProperty;
fastsignals::signal<void (const App::Property&)> signalAppendDynamicProperty;
/// signal on renaming a dynamic property
boost::signals2::signal<void (const App::Property&, const char*)> signalRenameDynamicProperty;
fastsignals::signal<void (const App::Property&, const char*)> signalRenameDynamicProperty;
/// signal on about removing a dynamic property
boost::signals2::signal<void (const App::Property&)> signalRemoveDynamicProperty;
fastsignals::signal<void (const App::Property&)> signalRemoveDynamicProperty;
/// signal on about changing the editor mode of a property
boost::signals2::signal<void (const App::Document&, const App::Property&)> signalChangePropertyEditor;
fastsignals::signal<void (const App::Document&, const App::Property&)> signalChangePropertyEditor;
//@}
/** @name Signals of extension changes
@@ -326,9 +327,9 @@ public:
*/
//@{
/// signal before adding the extension
boost::signals2::signal<void (const App::ExtensionContainer&, std::string extension)> signalBeforeAddingDynamicExtension;
fastsignals::signal<void (const App::ExtensionContainer&, std::string extension)> signalBeforeAddingDynamicExtension;
/// signal after the extension was added
boost::signals2::signal<void (const App::ExtensionContainer&, std::string extension)> signalAddedDynamicExtension;
fastsignals::signal<void (const App::ExtensionContainer&, std::string extension)> signalAddedDynamicExtension;
//@}
// clang-format off
// NOLINTEND
src/App/Document.h
+32 -32
View File
@@ -165,61 +165,61 @@ public:
//@{
// clang-format off
/// signal before changing an doc property
boost::signals2::signal<void(const Document&, const Property&)> signalBeforeChange;
fastsignals::signal<void(const Document&, const Property&)> signalBeforeChange;
/// signal on changed doc property
boost::signals2::signal<void(const Document&, const Property&)> signalChanged;
fastsignals::signal<void(const Document&, const Property&)> signalChanged;
/// signal on new Object
boost::signals2::signal<void(const DocumentObject&)> signalNewObject;
fastsignals::signal<void(const DocumentObject&)> signalNewObject;
/// signal on deleted Object
boost::signals2::signal<void(const DocumentObject&)> signalDeletedObject;
fastsignals::signal<void(const DocumentObject&)> signalDeletedObject;
/// signal before changing an Object
boost::signals2::signal<void(const DocumentObject&, const Property&)> signalBeforeChangeObject;
fastsignals::signal<void(const DocumentObject&, const Property&)> signalBeforeChangeObject;
/// signal on changed Object
boost::signals2::signal<void(const DocumentObject&, const Property&)> signalChangedObject;
fastsignals::signal<void(const DocumentObject&, const Property&)> signalChangedObject;
/// signal on manually called DocumentObject::touch()
boost::signals2::signal<void(const DocumentObject&)> signalTouchedObject;
fastsignals::signal<void(const DocumentObject&)> signalTouchedObject;
/// signal on relabeled Object
boost::signals2::signal<void(const DocumentObject&)> signalRelabelObject;
fastsignals::signal<void(const DocumentObject&)> signalRelabelObject;
/// signal on activated Object
boost::signals2::signal<void(const DocumentObject&)> signalActivatedObject;
fastsignals::signal<void(const DocumentObject&)> signalActivatedObject;
/// signal on created object
boost::signals2::signal<void(const DocumentObject&, Transaction*)> signalTransactionAppend;
fastsignals::signal<void(const DocumentObject&, Transaction*)> signalTransactionAppend;
/// signal on removed object
boost::signals2::signal<void(const DocumentObject&, Transaction*)> signalTransactionRemove;
fastsignals::signal<void(const DocumentObject&, Transaction*)> signalTransactionRemove;
/// signal on undo
boost::signals2::signal<void(const Document&)> signalUndo;
fastsignals::signal<void(const Document&)> signalUndo;
/// signal on redo
boost::signals2::signal<void(const Document&)> signalRedo;
fastsignals::signal<void(const 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::signals2::signal<void(Base::Writer&)> signalSaveDocument;
boost::signals2::signal<void(Base::XMLReader&)> signalRestoreDocument;
boost::signals2::signal<void(const std::vector<DocumentObject*>&, Base::Writer&)> signalExportObjects;
boost::signals2::signal<void(const std::vector<DocumentObject*>&, Base::Writer&)> signalExportViewObjects;
boost::signals2::signal<void(const std::vector<DocumentObject*>&, Base::XMLReader&)> signalImportObjects;
boost::signals2::signal<void(const std::vector<DocumentObject*>&, Base::Reader&,
fastsignals::signal<void(Base::Writer&)> signalSaveDocument;
fastsignals::signal<void(Base::XMLReader&)> signalRestoreDocument;
fastsignals::signal<void(const std::vector<DocumentObject*>&, Base::Writer&)> signalExportObjects;
fastsignals::signal<void(const std::vector<DocumentObject*>&, Base::Writer&)> signalExportViewObjects;
fastsignals::signal<void(const std::vector<DocumentObject*>&, Base::XMLReader&)> signalImportObjects;
fastsignals::signal<void(const std::vector<DocumentObject*>&, Base::Reader&,
const std::map<std::string, std::string>&)> signalImportViewObjects;
boost::signals2::signal<void(const std::vector<DocumentObject*>&)> signalFinishImportObjects;
fastsignals::signal<void(const std::vector<DocumentObject*>&)> signalFinishImportObjects;
// signal starting a save action to a file
boost::signals2::signal<void(const Document&, const std::string&)> signalStartSave;
fastsignals::signal<void(const Document&, const std::string&)> signalStartSave;
// signal finishing a save action to a file
boost::signals2::signal<void(const Document&, const std::string&)> signalFinishSave;
boost::signals2::signal<void(const Document&)> signalBeforeRecompute;
boost::signals2::signal<void(const Document&, const std::vector<DocumentObject*>&)> signalRecomputed;
boost::signals2::signal<void(const DocumentObject&)> signalRecomputedObject;
fastsignals::signal<void(const Document&, const std::string&)> signalFinishSave;
fastsignals::signal<void(const Document&)> signalBeforeRecompute;
fastsignals::signal<void(const Document&, const std::vector<DocumentObject*>&)> signalRecomputed;
fastsignals::signal<void(const DocumentObject&)> signalRecomputedObject;
// signal a new opened transaction
boost::signals2::signal<void(const Document&, std::string)> signalOpenTransaction;
fastsignals::signal<void(const Document&, std::string)> signalOpenTransaction;
// signal a committed transaction
boost::signals2::signal<void(const Document&)> signalCommitTransaction;
fastsignals::signal<void(const Document&)> signalCommitTransaction;
// signal an aborted transaction
boost::signals2::signal<void(const Document&)> signalAbortTransaction;
boost::signals2::signal<void(const Document&, const std::vector<DocumentObject*>&)> signalSkipRecompute;
boost::signals2::signal<void(const DocumentObject&)> signalFinishRestoreObject;
boost::signals2::signal<void(const Document&, const Property&)> signalChangePropertyEditor;
boost::signals2::signal<void(std::string)> signalLinkXsetValue;
fastsignals::signal<void(const Document&)> signalAbortTransaction;
fastsignals::signal<void(const Document&, const std::vector<DocumentObject*>&)> signalSkipRecompute;
fastsignals::signal<void(const DocumentObject&)> signalFinishRestoreObject;
fastsignals::signal<void(const Document&, const Property&)> signalChangePropertyEditor;
fastsignals::signal<void(std::string)> signalLinkXsetValue;
// clang-format on
//@}
// NOLINTEND
src/App/DocumentObject.h
+3 -3
View File
@@ -129,11 +129,11 @@ public:
// clang-format off
/// signal before changing a property of this object
boost::signals2::signal<void(const App::DocumentObject&, const App::Property&)> signalBeforeChange;
fastsignals::signal<void(const App::DocumentObject&, const App::Property&)> signalBeforeChange;
/// signal on changed property of this object
boost::signals2::signal<void(const App::DocumentObject&, const App::Property&)> signalChanged;
fastsignals::signal<void(const App::DocumentObject&, const App::Property&)> signalChanged;
/// signal on changed property of this object before document scoped signalChangedObject
boost::signals2::signal<void(const App::DocumentObject&, const App::Property&)> signalEarlyChanged;
fastsignals::signal<void(const App::DocumentObject&, const App::Property&)> signalEarlyChanged;
// clang-format on
/// returns the type name of the ViewProvider
src/App/DocumentObserver.cpp
+2 -2
View File
@@ -709,7 +709,7 @@ public:
}
App::Document* _document;
using Connection = boost::signals2::scoped_connection;
using Connection = fastsignals::scoped_connection;
Connection connectApplicationDeletedDocument;
};
@@ -800,7 +800,7 @@ public:
App::DocumentObject* object;
bool indocument {false};
using Connection = boost::signals2::scoped_connection;
using Connection = fastsignals::scoped_connection;
Connection connectApplicationDeletedDocument;
Connection connectDocumentCreatedObject;
Connection connectDocumentDeletedObject;
src/App/DocumentObserver.h
+2 -2
View File
@@ -28,7 +28,7 @@
#include <Base/BaseClass.h>
#include <Base/Bitmask.h>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <memory>
#include <set>
#include <FCGlobal.h>
@@ -559,7 +559,7 @@ protected:
private:
App::Document* _document;
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
Connection connectApplicationCreatedDocument;
Connection connectApplicationDeletedDocument;
Connection connectApplicationActivateDocument;
src/App/DocumentObserverPython.h
+2 -2
View File
@@ -27,7 +27,7 @@
#define APP_DOCUMENTOBSERVERPYTHON_H
#include <FCGlobal.h>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <CXX/Objects.hxx>
#include <string>
#include <vector>
@@ -125,7 +125,7 @@ private:
using Connection = struct PythonObject
{
boost::signals2::scoped_connection slot;
fastsignals::scoped_connection slot;
Py::Object py;
PyObject* ptr()
{
src/App/GroupExtension.h
+1 -1
View File
@@ -154,7 +154,7 @@ private:
// for tracking children visibility
void slotChildChanged(const App::DocumentObject&, const App::Property&);
std::unordered_map<const App::DocumentObject*, boost::signals2::scoped_connection> _Conns;
std::unordered_map<const App::DocumentObject*, fastsignals::scoped_connection> _Conns;
};
src/App/Link.cpp
+1 -1
View File
@@ -797,7 +797,7 @@ void LinkBaseExtension::setupCopyOnChange(DocumentObject* parent, bool checkSour
bool LinkBaseExtension::setupCopyOnChange(
DocumentObject* parent,
DocumentObject* linked,
std::vector<boost::signals2::scoped_connection>* copyOnChangeConns,
std::vector<fastsignals::scoped_connection>* copyOnChangeConns,
bool checkExisting)
{
if (!parent || !linked) {
src/App/Link.h
+5 -5
View File
@@ -420,7 +420,7 @@ public:
static bool
setupCopyOnChange(App::DocumentObject* obj,
App::DocumentObject* linked,
std::vector<boost::signals2::scoped_connection>* copyOnChangeConns,
std::vector<fastsignals::scoped_connection>* copyOnChangeConns,
bool checkExisting);
static bool isCopyOnChangeProperty(App::DocumentObject* obj, const Property& prop);
@@ -483,7 +483,7 @@ protected:
mutable std::vector<std::string> mySubElements;
mutable std::string mySubName;
std::unordered_map<const App::DocumentObject*, boost::signals2::scoped_connection>
std::unordered_map<const App::DocumentObject*, fastsignals::scoped_connection>
plainGroupConns;
long prevLinkedObjectID = 0;
@@ -492,14 +492,14 @@ protected:
mutable bool enableLabelCache {false};
bool hasOldSubElement {false};
std::vector<boost::signals2::scoped_connection> copyOnChangeConns;
std::vector<boost::signals2::scoped_connection> copyOnChangeSrcConns;
std::vector<fastsignals::scoped_connection> copyOnChangeConns;
std::vector<fastsignals::scoped_connection> copyOnChangeSrcConns;
bool hasCopyOnChange {true};
mutable bool checkingProperty = false;
bool pauseCopyOnChange = false;
boost::signals2::scoped_connection connCopyOnChangeSource;
fastsignals::scoped_connection connCopyOnChangeSource;
};
///////////////////////////////////////////////////////////////////////////
src/App/MergeDocuments.h
+2 -2
View File
@@ -27,7 +27,7 @@
#define APP_MERGEDOCUMENTS_H
#include <Base/Persistence.h>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
namespace zipios
{
@@ -72,7 +72,7 @@ private:
App::Document* appdoc {nullptr};
std::vector<App::DocumentObject*> objects;
std::map<std::string, std::string> nameMap;
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
Connection connectExport;
Connection connectImport;
};
src/App/ObjectIdentifier.h
+1
View File
@@ -27,6 +27,7 @@
#define APP_PATH_H
#include <bitset>
#include <climits>
#include <map>
#include <limits>
#include <set>
src/App/PreCompiled.h
+1 -1
View File
@@ -74,7 +74,7 @@
// Boost
#include <boost_graph_adjacency_list.hpp>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <boost/program_options.hpp>
#include <boost/regex.hpp>
src/App/Property.h
+2 -2
View File
@@ -29,7 +29,7 @@
#include <Base/Exception.h>
#include <Base/Persistence.h>
#include <boost/any.hpp>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <bitset>
#include <string>
#include <FCGlobal.h>
@@ -608,7 +608,7 @@ private:
public:
/// Signal emitted when the property value has changed.
boost::signals2::signal<void(const App::Property&)> signalChanged;
fastsignals::signal<void(const App::Property&)> signalChanged;
};
src/App/PropertyExpressionEngine.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ struct PropertyExpressionEngine::Private
{
// For some reason, MSVC has trouble with vector of scoped_connection if
// defined in header, hence the private structure here.
std::vector<boost::signals2::scoped_connection> conns;
std::vector<fastsignals::scoped_connection> conns;
std::unordered_map<std::string, std::vector<ObjectIdentifier>> propMap;
};
src/App/PropertyExpressionEngine.h
+2 -2
View File
@@ -29,7 +29,7 @@
#include <set>
#include <boost/unordered/unordered_map.hpp>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <boost_graph_adjacency_list.hpp>
#include <boost/graph/topological_sort.hpp>
@@ -184,7 +184,7 @@ public:
size_t numExpressions() const;
/// signal called when an expression was changed
boost::signals2::signal<void(const App::ObjectIdentifier&)> expressionChanged;
fastsignals::signal<void(const App::ObjectIdentifier&)> expressionChanged;
void afterRestore() override;
void onContainerRestored() override;
src/App/PropertyLinks.cpp
+1 -1
View File
@@ -3304,7 +3304,7 @@ DocInfoMap _DocInfoMap;
class App::DocInfo: public std::enable_shared_from_this<App::DocInfo>
{
public:
using Connection = boost::signals2::scoped_connection;
using Connection = fastsignals::scoped_connection;
Connection connFinishRestoreDocument;
Connection connPendingReloadDocument;
Connection connDeleteDocument;
src/App/PropertyLinks.h
+1 -1
View File
@@ -618,7 +618,7 @@ public:
void setSilentRestore(bool enable);
boost::signals2::signal<void(const std::string&, const std::string&)>
fastsignals::signal<void(const std::string&, const std::string&)>
signalUpdateElementReference;
protected:
src/App/TextDocument.cpp
+3 -3
View File
@@ -53,12 +53,12 @@ const char* TextDocument::getViewProviderName() const
return "Gui::ViewProviderTextDocument";
}
boost::signals2::connection TextDocument::connectText(const TextSlot& sub)
fastsignals::advanced_connection TextDocument::connectText(const TextSlot& sub)
{
return textChanged.connect(sub);
return textChanged.connect(sub, fastsignals::advanced_tag());
}
boost::signals2::connection TextDocument::connectLabel(const TextSlot& sub)
fastsignals::connection TextDocument::connectLabel(const TextSlot& sub)
{
return labelChanged.connect(sub);
}
src/App/TextDocument.h
+3 -3
View File
@@ -38,7 +38,7 @@ class AppExport TextDocument: public App::DocumentObject
PROPERTY_HEADER_WITH_OVERRIDE(App::TextDocument);
public:
using TextSignal = boost::signals2::signal<void()>;
using TextSignal = fastsignals::signal<void()>;
using TextSlot = TextSignal::slot_type;
PropertyString Text;
@@ -49,8 +49,8 @@ public:
void onChanged(const Property* prop) override;
const char* getViewProviderName() const override;
boost::signals2::connection connectText(const TextSlot& sub);
boost::signals2::connection connectLabel(const TextSlot& sub);
fastsignals::advanced_connection connectText(const TextSlot& sub);
fastsignals::connection connectLabel(const TextSlot& sub);
private:
TextSignal textChanged;
src/Base/CMakeLists.txt
+1 -1
View File
@@ -84,7 +84,7 @@ endif()
list(APPEND FreeCADBase_LIBS ${QtCore_LIBRARIES})
list(APPEND FreeCADBase_LIBS fmt::fmt)
list(APPEND FreeCADBase_LIBS libfastsignals fmt::fmt)
if (BUILD_DYNAMIC_LINK_PYTHON)
list(APPEND FreeCADBase_LIBS ${Python3_LIBRARIES})
src/Base/Parameter.h
+2 -2
View File
@@ -51,7 +51,7 @@ using PyObject = struct _object;
#include <map>
#include <vector>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <xercesc/util/XercesDefs.hpp>
#include "Handle.h"
@@ -565,7 +565,7 @@ public:
* - Group removal: both 'name' and 'value' are empty
* - Group rename: 'name' is the new name, and 'value' is the old name
*/
boost::signals2::signal<
fastsignals::signal<
void(ParameterGrp* /*param*/, ParamType /*type*/, const char* /*name*/, const char* /*value*/)>
signalParamChanged;
src/Base/ParameterPy.cpp
+1 -1
View File
@@ -92,7 +92,7 @@ public:
public:
// NOLINTBEGIN
Py::Object callable;
boost::signals2::scoped_connection conn;
fastsignals::scoped_connection conn;
ParameterGrp* _target = nullptr; // no reference counted, do not access
// NOLINTEND
src/Base/Tools.h
+4 -15
View File
@@ -29,22 +29,13 @@
#ifndef FC_GLOBAL_H
# include <FCGlobal.h>
#endif
#include <algorithm>
#include <cmath>
#include <numbers>
#include <ostream>
#include <string>
#include <vector>
#include <boost/signals2/shared_connection_block.hpp>
namespace boost
{
namespace signals2
{
class connection;
}
} // namespace boost
#include <fastsignals/signal.h>
class QString;
@@ -332,12 +323,10 @@ private:
class ConnectionBlocker
{
using Connection = boost::signals2::connection;
using ConnectionBlock = boost::signals2::shared_connection_block;
ConnectionBlock blocker;
fastsignals::shared_connection_block blocker;
public:
ConnectionBlocker(Connection& c)
ConnectionBlocker(fastsignals::advanced_connection& c)
: blocker(c)
{}
~ConnectionBlocker() = default;
src/Gui/Application.h
+19 -19
View File
@@ -118,43 +118,43 @@ public:
/** @name Signals of the Application */
//@{
/// signal on new Document
boost::signals2::signal<void(const Gui::Document&, bool)> signalNewDocument;
fastsignals::signal<void(const Gui::Document&, bool)> signalNewDocument;
/// signal on deleted Document
boost::signals2::signal<void(const Gui::Document&)> signalDeleteDocument;
fastsignals::signal<void(const Gui::Document&)> signalDeleteDocument;
/// signal on relabeling Document
boost::signals2::signal<void(const Gui::Document&)> signalRelabelDocument;
fastsignals::signal<void(const Gui::Document&)> signalRelabelDocument;
/// signal on renaming Document
boost::signals2::signal<void(const Gui::Document&)> signalRenameDocument;
fastsignals::signal<void(const Gui::Document&)> signalRenameDocument;
/// signal on activating Document
boost::signals2::signal<void(const Gui::Document&)> signalActiveDocument;
fastsignals::signal<void(const Gui::Document&)> signalActiveDocument;
/// signal on new Object
boost::signals2::signal<void(const Gui::ViewProvider&)> signalNewObject;
fastsignals::signal<void(const Gui::ViewProvider&)> signalNewObject;
/// signal on deleted Object
boost::signals2::signal<void(const Gui::ViewProvider&)> signalDeletedObject;
fastsignals::signal<void(const Gui::ViewProvider&)> signalDeletedObject;
/// signal on changed Object
boost::signals2::signal<void(const Gui::ViewProvider&, const App::Property&)> signalBeforeChangeObject;
fastsignals::signal<void(const Gui::ViewProvider&, const App::Property&)> signalBeforeChangeObject;
/// signal on changed object property
boost::signals2::signal<void(const Gui::ViewProvider&, const App::Property&)> signalChangedObject;
fastsignals::signal<void(const Gui::ViewProvider&, const App::Property&)> signalChangedObject;
/// signal on renamed Object
boost::signals2::signal<void(const Gui::ViewProvider&)> signalRelabelObject;
fastsignals::signal<void(const Gui::ViewProvider&)> signalRelabelObject;
/// signal on activated Object
boost::signals2::signal<void(const Gui::ViewProvider&)> signalActivatedObject;
fastsignals::signal<void(const Gui::ViewProvider&)> signalActivatedObject;
/// signal on activated workbench
boost::signals2::signal<void(const char*)> signalActivateWorkbench;
fastsignals::signal<void(const char*)> signalActivateWorkbench;
/// signal on added/removed workbench
boost::signals2::signal<void()> signalRefreshWorkbenches;
fastsignals::signal<void()> signalRefreshWorkbenches;
/// signal on show hidden items
boost::signals2::signal<void(const Gui::Document&)> signalShowHidden;
fastsignals::signal<void(const Gui::Document&)> signalShowHidden;
/// signal on activating view
boost::signals2::signal<void(const Gui::MDIView*)> signalActivateView;
fastsignals::signal<void(const Gui::MDIView*)> signalActivateView;
/// signal on closing view
boost::signals2::signal<void(const Gui::MDIView*)> signalCloseView;
fastsignals::signal<void(const Gui::MDIView*)> signalCloseView;
/// signal on entering in edit mode
boost::signals2::signal<void(const Gui::ViewProviderDocumentObject&)> signalInEdit;
fastsignals::signal<void(const Gui::ViewProviderDocumentObject&)> signalInEdit;
/// signal on leaving edit mode
boost::signals2::signal<void(const Gui::ViewProviderDocumentObject&)> signalResetEdit;
fastsignals::signal<void(const Gui::ViewProviderDocumentObject&)> signalResetEdit;
/// signal on changing user edit mode
boost::signals2::signal<void(int)> signalUserEditModeChanged;
fastsignals::signal<void(int)> signalUserEditModeChanged;
//@}
/** @name methods for Document handling */
src/Gui/AutoSaver.h
+2 -2
View File
@@ -29,7 +29,7 @@
#include <map>
#include <set>
#include <string>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <Base/Writer.h>
namespace App
@@ -56,7 +56,7 @@ public:
private:
void slotNewObject(const App::DocumentObject&);
void slotChangePropertyData(const App::Property&);
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
Connection documentNew;
Connection documentMod;
};
src/Gui/CMakeLists.txt
+4
View File
@@ -83,6 +83,8 @@ target_include_directories(
FreeCADGui
SYSTEM
PRIVATE
${FastSignals_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIR}
${3DCONNEXION_INCLUDE_DIR}
)
@@ -99,6 +101,7 @@ endif(MSVC)
if(MSVC)
set(FreeCADGui_LIBS
FreeCADApp
libfastsignals
${OPENGL_gl_LIBRARY}
)
@@ -111,6 +114,7 @@ if(MSVC)
else(MSVC)
set(FreeCADGui_LIBS
FreeCADApp
libfastsignals
${Boost_LIBRARIES}
${OPENGL_gl_LIBRARY}
${3DCONNEXION_LINKFLAGS}
src/Gui/Command.cpp
+2 -2
View File
@@ -1595,7 +1595,7 @@ bool PythonCommand::isChecked() const
}
}
void PythonCommand::onActionInit() const
void PythonCommand::onActionInit()
{
try {
Base::PyGILStateLocker lock;
@@ -1979,7 +1979,7 @@ bool PythonGroupCommand::hasDropDownMenu() const
}
}
void PythonGroupCommand::onActionInit() const
void PythonGroupCommand::onActionInit()
{
try {
Base::PyGILStateLocker lock;
src/Gui/Command.h
+7 -7
View File
@@ -28,7 +28,7 @@
#include <map>
#include <string>
#include <vector>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <Base/Type.h>
#include <Gui/Application.h>
@@ -829,9 +829,9 @@ protected:
/// the activation sequence
std::string Activation;
//// set the parameters on action creation
void onActionInit() const;
void onActionInit();
boost::signals2::connection connPyCmdInitialized;
fastsignals::connection connPyCmdInitialized;
};
/** The Python group command class
@@ -880,13 +880,13 @@ protected:
/// Returns the resource values
const char* getResource(const char* sName) const;
//// set the parameters on action creation
void onActionInit() const;
void onActionInit();
/// a pointer to the Python command object
PyObject* _pcPyCommand;
/// the command object resources
PyObject* _pcPyResource;
boost::signals2::connection connPyCmdInitialized;
fastsignals::connection connPyCmdInitialized;
};
@@ -1019,10 +1019,10 @@ public:
}
/// Signal on any addition or removal of command
boost::signals2::signal<void()> signalChanged;
fastsignals::signal<void()> signalChanged;
/// Signal to Python command on first workbench activation
boost::signals2::signal<void()> signalPyCmdInitialized;
fastsignals::signal<void()> signalPyCmdInitialized;
/**
* Returns a pointer to a conflicting command, or nullptr if there is no conflict.
src/Gui/DAGView/DAGModel.h
+2 -2
View File
@@ -27,7 +27,7 @@
#include <memory>
#include <vector>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <QBrush>
#include <QGraphicsScene>
@@ -87,7 +87,7 @@ private Q_SLOTS:
private:
Model() = default;
// documentObject slots.
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
Connection connectNewObject;
Connection connectDelObject;
Connection connectChgObject;
src/Gui/DAGView/DAGModelGraph.h
+2 -2
View File
@@ -36,7 +36,7 @@
#include <boost/multi_index_container.hpp>
#include <boost/multi_index/member.hpp>
#include <boost/multi_index/ordered_index.hpp>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include "DAGRectItem.h"
@@ -85,7 +85,7 @@ struct VertexProperty
std::shared_ptr<QGraphicsPixmapItem> stateIcon; //!< visible Icon
std::shared_ptr<QGraphicsPixmapItem> icon; //!< icon
std::shared_ptr<QGraphicsTextItem> text; //!< text
boost::signals2::connection connChangeIcon;
fastsignals::connection connChangeIcon;
int row = 0; //!< row for this entry.
ColumnMask column = 0; //!< column number containing the point.
int topoSortIndex = 0;
src/Gui/DAGView/DAGView.h
+3 -3
View File
@@ -26,7 +26,7 @@
#include <memory>
#include <QGraphicsView>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <Gui/DockWindow.h>
#include <Gui/Document.h>
@@ -58,8 +58,8 @@ private:
using ModelMap = std::map<const Gui::Document*, std::shared_ptr<Model>>;
ModelMap modelMap;
boost::signals2::scoped_connection conActive;
boost::signals2::scoped_connection conDelete;
fastsignals::scoped_connection conActive;
fastsignals::scoped_connection conDelete;
};
//! @brief dock window for DAG viewer
src/Gui/Dialogs/DlgKeyboardImp.cpp
+3 -3
View File
@@ -22,7 +22,7 @@
* *
***************************************************************************/
#include <boost/signals2/connection.hpp>
#include <fastsignals/connection.h>
#include <QAction>
#include <QHeaderView>
@@ -230,7 +230,7 @@ void DlgCustomKeyboardImp::populateCommandList(
commandTreeWidget->resizeColumnToContents(3);
}
boost::signals2::connection DlgCustomKeyboardImp::initCommandList(
fastsignals::connection DlgCustomKeyboardImp::initCommandList(
QTreeWidget* commandTreeWidget,
QTreeWidgetItem* separatorItem,
QComboBox* combo
@@ -317,7 +317,7 @@ void DlgCustomKeyboardImp::initPriorityList(
});
}
boost::signals2::connection DlgCustomKeyboardImp::initCommandWidgets(
fastsignals::connection DlgCustomKeyboardImp::initCommandWidgets(
QTreeWidget* commandTreeWidget,
QTreeWidgetItem* separatorItem,
QComboBox* comboGroups,
src/Gui/Dialogs/DlgKeyboardImp.h
+4 -4
View File
@@ -26,7 +26,7 @@
#ifndef GUI_DIALOG_DLGKEYBOARD_IMP_H
#define GUI_DIALOG_DLGKEYBOARD_IMP_H
#include <boost/signals2.hpp>
#include <fastsignals/connection.h>
#include <memory>
#include <QPointer>
#include <QAction>
@@ -77,7 +77,7 @@ public:
* @return Return a boost signal connection for monitoring command changes.
* Most disconnect the signal before widgets gets destroyed.
*/
static boost::signals2::connection initCommandWidgets(
static fastsignals::connection initCommandWidgets(
QTreeWidget* commandTreeWidget,
QTreeWidgetItem* separatorItem,
QComboBox* comboGroups,
@@ -99,7 +99,7 @@ protected:
QTreeWidget* treeWidget,
QTreeWidgetItem* separatorItem
);
static boost::signals2::connection initCommandList(QTreeWidget*, QTreeWidgetItem*, QComboBox* combo);
static fastsignals::connection initCommandList(QTreeWidget*, QTreeWidgetItem*, QComboBox* combo);
static void initPriorityList(QTreeWidget*, QAbstractButton* buttonUp, QAbstractButton* buttonDown);
static void populateCommandGroups(QComboBox*);
static void populateCommandList(QTreeWidget*, QTreeWidgetItem*, QComboBox*);
@@ -132,7 +132,7 @@ protected:
private:
std::unique_ptr<Ui_DlgCustomKeyboard> ui;
bool firstShow;
boost::signals2::scoped_connection conn;
fastsignals::scoped_connection conn;
};
} // namespace Dialog
src/Gui/Dialogs/DlgToolbarsImp.h
+2 -2
View File
@@ -26,7 +26,7 @@
#ifndef GUI_DIALOG_DLGTOOLBARS_IMP_H
#define GUI_DIALOG_DLGTOOLBARS_IMP_H
#include <boost/signals2/connection.hpp>
#include <fastsignals/connection.h>
#include "PropertyPage.h"
#include <memory>
@@ -100,7 +100,7 @@ protected:
private:
Type type;
boost::signals2::scoped_connection conn;
fastsignals::scoped_connection conn;
};
/** This class implements the creation of user defined toolbars.
src/Gui/DockWindowManager.cpp
+3 -2
View File
@@ -158,7 +158,7 @@ struct DockWindowManagerP
QMap<QString, QPointer<QWidget>> _dockWindows;
DockWindowItems _dockWindowItems;
ParameterGrp::handle _hPref;
boost::signals2::scoped_connection _connParam;
fastsignals::advanced_scoped_connection _connParam;
QTimer _timer;
DockWidgetEventFilter _dockWidgetEventFilter;
QPointer<OverlayManager> overlayManager;
@@ -228,7 +228,8 @@ void DockWindowManager::setupOverlayManagement()
break;
}
}
}
},
fastsignals::advanced_tag()
);
d->_timer.setSingleShot(true);
src/Gui/Document.cpp
+11 -8
View File
@@ -117,12 +117,13 @@ struct DocumentP
std::map<std::string, ViewProvider*> _ViewProviderMapAnnotation;
std::list<ViewProviderDocumentObject*> _redoViewProviders;
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
using AdvancedConnection = fastsignals::advanced_connection;
Connection connectNewObject;
Connection connectDelObject;
Connection connectCngObject;
Connection connectRenObject;
Connection connectActObject;
AdvancedConnection connectActObject;
Connection connectSaveDocument;
Connection connectRestDocument;
Connection connectStartLoadDocument;
@@ -141,9 +142,9 @@ struct DocumentP
Connection connectTransactionRemove;
Connection connectTouchedObject;
Connection connectChangePropertyEditor;
Connection connectChangeDocument;
AdvancedConnection connectChangeDocument;
using ConnectionBlock = boost::signals2::shared_connection_block;
using ConnectionBlock = fastsignals::shared_connection_block;
ConnectionBlock connectActObjectBlocker;
ConnectionBlock connectChangeDocumentBlocker;
@@ -458,9 +459,10 @@ Document::Document(App::Document* pcDocument, Application* app)
std::bind(&Gui::Document::slotRelabelObject, this, sp::_1)
);
d->connectActObject = pcDocument->signalActivatedObject.connect(
std::bind(&Gui::Document::slotActivatedObject, this, sp::_1)
std::bind(&Gui::Document::slotActivatedObject, this, sp::_1),
fastsignals::advanced_tag()
);
d->connectActObjectBlocker = boost::signals2::shared_connection_block(d->connectActObject, false);
d->connectActObjectBlocker = fastsignals::shared_connection_block(d->connectActObject, false);
d->connectSaveDocument = pcDocument->signalSaveDocument.connect(
std::bind(&Gui::Document::Save, this, sp::_1)
);
@@ -482,9 +484,10 @@ Document::Document(App::Document* pcDocument, Application* app)
);
d->connectChangeDocument
= d->_pcDocument->signalChanged.connect // use the same slot function
(std::bind(&Gui::Document::slotChangePropertyEditor, this, sp::_1, sp::_2));
(std::bind(&Gui::Document::slotChangePropertyEditor, this, sp::_1, sp::_2),
fastsignals::advanced_tag());
d->connectChangeDocumentBlocker
= boost::signals2::shared_connection_block(d->connectChangeDocument, true);
= fastsignals::shared_connection_block(d->connectChangeDocument, true);
d->connectFinishRestoreObject = pcDocument->signalFinishRestoreObject.connect(
std::bind(&Gui::Document::slotFinishRestoreObject, this, sp::_1)
);
src/Gui/Document.h
+15 -15
View File
@@ -26,7 +26,7 @@
#include <list>
#include <map>
#include <string>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <QString>
#include <Base/Persistence.h>
@@ -112,23 +112,23 @@ public:
/** @name Signals of the document */
//@{
/// signal on new Object
mutable boost::signals2::signal<void(const Gui::ViewProviderDocumentObject&)> signalNewObject;
mutable fastsignals::signal<void(const Gui::ViewProviderDocumentObject&)> signalNewObject;
/// signal on deleted Object
mutable boost::signals2::signal<void(const Gui::ViewProviderDocumentObject&)> signalDeletedObject;
mutable fastsignals::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::signals2::signal<void(const Gui::ViewProviderDocumentObject&, const App::Property&)>
mutable fastsignals::signal<void(const Gui::ViewProviderDocumentObject&, const App::Property&)>
signalChangedObject;
/// signal on renamed Object
mutable boost::signals2::signal<void(const Gui::ViewProviderDocumentObject&)> signalRelabelObject;
mutable fastsignals::signal<void(const Gui::ViewProviderDocumentObject&)> signalRelabelObject;
/// signal on activated Object
mutable boost::signals2::signal<void(const Gui::ViewProviderDocumentObject&)> signalActivatedObject;
mutable fastsignals::signal<void(const Gui::ViewProviderDocumentObject&)> signalActivatedObject;
/// signal on entering in edit mode
mutable boost::signals2::signal<void(const Gui::ViewProviderDocumentObject&)> signalInEdit;
mutable fastsignals::signal<void(const Gui::ViewProviderDocumentObject&)> signalInEdit;
/// signal on leaving edit mode
mutable boost::signals2::signal<void(const Gui::ViewProviderDocumentObject&)> signalResetEdit;
mutable fastsignals::signal<void(const Gui::ViewProviderDocumentObject&)> signalResetEdit;
/// signal on changed Object, the 2nd argument is the highlite mode to use
mutable boost::signals2::signal<void(
mutable fastsignals::signal<void(
const Gui::ViewProviderDocumentObject&,
const Gui::HighlightMode&,
bool,
@@ -137,7 +137,7 @@ public:
)>
signalHighlightObject;
/// signal on changed Object, the 2nd argument is the highlite mode to use
mutable boost::signals2::signal<void(
mutable fastsignals::signal<void(
const Gui::ViewProviderDocumentObject&,
const Gui::TreeItemMode&,
App::DocumentObject* parent,
@@ -145,15 +145,15 @@ public:
)>
signalExpandObject;
/// signal on changed ShowInTree property in view provider
mutable boost::signals2::signal<void(const Gui::ViewProviderDocumentObject&)> signalShowItem;
mutable fastsignals::signal<void(const Gui::ViewProviderDocumentObject&)> signalShowItem;
/// signal on scrolling to an object
mutable boost::signals2::signal<void(const Gui::ViewProviderDocumentObject&)> signalScrollToObject;
mutable fastsignals::signal<void(const Gui::ViewProviderDocumentObject&)> signalScrollToObject;
/// signal on undo Document
mutable boost::signals2::signal<void(const Gui::Document& doc)> signalUndoDocument;
mutable fastsignals::signal<void(const Gui::Document& doc)> signalUndoDocument;
/// signal on redo Document
mutable boost::signals2::signal<void(const Gui::Document& doc)> signalRedoDocument;
mutable fastsignals::signal<void(const Gui::Document& doc)> signalRedoDocument;
/// signal on deleting Document
mutable boost::signals2::signal<void(const Gui::Document& doc)> signalDeleteDocument;
mutable fastsignals::signal<void(const Gui::Document& doc)> signalDeleteDocument;
//@}
/** @name I/O of the document */
src/Gui/DocumentObserver.cpp
+2 -2
View File
@@ -248,7 +248,7 @@ public:
}
Gui::Document* _document;
using Connection = boost::signals2::scoped_connection;
using Connection = fastsignals::scoped_connection;
Connection connectApplicationDeletedDocument;
};
@@ -349,7 +349,7 @@ public:
Gui::ViewProviderDocumentObject* object;
bool indocument {false};
using Connection = boost::signals2::scoped_connection;
using Connection = fastsignals::scoped_connection;
Connection connectApplicationDeletedDocument;
Connection connectDocumentCreatedObject;
Connection connectDocumentDeletedObject;
src/Gui/DocumentObserver.h
+2 -2
View File
@@ -24,7 +24,7 @@
#define GUI_DOCUMENTOBSERVER_H
#include <Base/BaseClass.h>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
namespace App
@@ -370,7 +370,7 @@ private:
virtual void slotDeleteDocument(const Document& Doc);
private:
using Connection = boost::signals2::scoped_connection;
using Connection = fastsignals::scoped_connection;
Connection connectDocumentCreatedObject;
Connection connectDocumentDeletedObject;
Connection connectDocumentChangedObject;
src/Gui/DocumentObserverPython.h
+2 -2
View File
@@ -25,7 +25,7 @@
#define GUI_DOCUMENTOBSERVERPYTHON_H
#include <FCGlobal.h>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <CXX/Objects.hxx>
#include <string>
#include <vector>
@@ -89,7 +89,7 @@ private:
using Connection = struct PythonObject
{
boost::signals2::scoped_connection slot;
fastsignals::scoped_connection slot;
Py::Object py;
PyObject* ptr()
{
src/Gui/ExpressionBinding.h
+4 -4
View File
@@ -27,7 +27,7 @@
#include <string>
#include <App/ObjectIdentifier.h>
#include <QPalette>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
namespace App
@@ -89,9 +89,9 @@ protected:
void expressionChange(const App::ObjectIdentifier& id);
void objectDeleted(const App::DocumentObject&);
void onDocumentDeleted(const App::Document&);
boost::signals2::scoped_connection expressionchanged;
boost::signals2::scoped_connection objectdeleted;
boost::signals2::scoped_connection documentdeleted;
fastsignals::scoped_connection expressionchanged;
fastsignals::scoped_connection objectdeleted;
fastsignals::scoped_connection documentdeleted;
bool m_autoApply {false};
};
src/Gui/GraphvizView.h
+3 -2
View File
@@ -23,8 +23,9 @@
#ifndef GUI_GRAPHVIZVIEW_H
#define GUI_GRAPHVIZVIEW_H
#include "MDIView.h"
#include <fastsignals/signal.h>
#include "MDIView.h"
class QGraphicsScene;
class QGraphicsView;
@@ -81,7 +82,7 @@ private:
GraphvizWorker* thread;
int nPending;
using Connection = boost::signals2::scoped_connection;
using Connection = fastsignals::scoped_connection;
Connection recomputeConnection;
Connection undoConnection;
Connection redoConnection;
src/Gui/MDIView.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
* *
***************************************************************************/
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <boost/core/ignore_unused.hpp>
#include <QAction>
#include <QApplication>
src/Gui/MDIView.h
+2 -2
View File
@@ -23,7 +23,7 @@
#ifndef GUI_MDIVIEW_H
#define GUI_MDIVIEW_H
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <QMainWindow>
#include <Gui/ActiveObjectList.h>
#include <Gui/View.h>
@@ -207,7 +207,7 @@ private:
Qt::WindowStates wstate;
// list of active objects of this view
ActiveObjectList ActiveObjects;
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
Connection connectDelObject; // remove active object upon delete.
friend class MainWindow;
src/Gui/MainWindow.cpp
+3 -2
View File
@@ -321,7 +321,7 @@ struct MainWindowP
int actionUpdateDelay = 0;
QMap<QString, QPointer<UrlHandler>> urlHandler;
std::string hiddenDockWindows;
boost::signals2::scoped_connection connParam;
fastsignals::advanced_scoped_connection connParam;
ParameterGrp::handle hGrp;
bool _restoring = false;
QTime _showNormal;
@@ -367,7 +367,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags f)
OverlayManager::instance()->reload(OverlayManager::ReloadMode::ReloadPause);
d->restoreStateTimer.start(100);
}
}
},
fastsignals::advanced_tag()
);
d->hGrp = App::GetApplication().GetParameterGroupByPath(
src/Gui/ManualAlignment.h
+1 -1
View File
@@ -263,7 +263,7 @@ private:
static ManualAlignment* _instance;
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
Connection connectApplicationDeletedDocument;
Connection connectDocumentDeletedObject;
src/Gui/MergeDocuments.h
+2 -2
View File
@@ -27,7 +27,7 @@
#include <Base/Persistence.h>
#include <map>
#include <vector>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
namespace zipios
{
@@ -62,7 +62,7 @@ private:
Gui::Document* document;
std::vector<App::DocumentObject*> objects;
std::map<std::string, std::string> nameMap;
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
Connection connectExport;
Connection connectImport;
};
src/Gui/NotificationArea.cpp
+1 -1
View File
@@ -52,7 +52,7 @@
using namespace Gui;
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
namespace sp = std::placeholders;
src/Gui/OverlayManager.cpp
+1 -1
View File
@@ -199,7 +199,7 @@ struct OverlayInfo
Qt::DockWidgetArea dockArea;
std::unordered_map<QDockWidget*, OverlayInfo*>& overlayMap;
ParameterGrp::handle hGrp;
boost::signals2::scoped_connection conn;
fastsignals::scoped_connection conn;
OverlayInfo(
QWidget* parent,
src/Gui/ParamHandler.h
+2 -2
View File
@@ -24,7 +24,7 @@
#include <map>
#include <memory>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <QTimer>
#include <FCGlobal.h>
@@ -261,7 +261,7 @@ public:
protected:
std::map<ParamKey, std::shared_ptr<ParamHandler>> handlers;
std::set<std::shared_ptr<ParamHandler>> pendings;
boost::signals2::scoped_connection conn;
fastsignals::scoped_connection conn;
QTimer timer;
};
src/Gui/Placement.h
+1 -1
View File
@@ -95,7 +95,7 @@ private Q_SLOTS:
void openTransaction();
private:
using Connection = boost::signals2::scoped_connection;
using Connection = fastsignals::scoped_connection;
std::string propertyName; // the name of the placement property
std::set<std::string> documents;
/** If false apply the placement directly to the transform nodes,
src/Gui/PreCompiled.h
+1 -1
View File
@@ -67,7 +67,7 @@
// Boost
#include <boost_graph_adjacency_list.hpp>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/bind/bind.hpp>
#include <boost/core/ignore_unused.hpp>
src/Gui/PropertyView.h
+1 -1
View File
@@ -99,7 +99,7 @@ private:
private:
struct PropInfo;
struct PropFind;
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
Connection connectPropData;
Connection connectPropView;
Connection connectPropAppend;
src/Gui/Selection/Selection.h
+4 -4
View File
@@ -260,7 +260,7 @@ private:
void _onSelectionChanged(const SelectionChanges& msg);
private:
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
Connection connectSelection;
std::string filterDocName;
std::string filterObjName;
@@ -503,12 +503,12 @@ public:
void setClarifySelectionActive(bool active);
/// signal on new object
boost::signals2::signal<void(const SelectionChanges& msg)> signalSelectionChanged;
fastsignals::signal<void(const SelectionChanges& msg)> signalSelectionChanged;
/// signal on selection change with resolved object
boost::signals2::signal<void(const SelectionChanges& msg)> signalSelectionChanged2;
fastsignals::signal<void(const SelectionChanges& msg)> signalSelectionChanged2;
/// signal on selection change with resolved object and sub element map
boost::signals2::signal<void(const SelectionChanges& msg)> signalSelectionChanged3;
fastsignals::signal<void(const SelectionChanges& msg)> signalSelectionChanged3;
/** Returns a vector of selection objects
*
src/Gui/TaskElementColors.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ namespace sp = std::placeholders;
class ElementColors::Private: public Gui::SelectionGate
{
public:
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
std::unique_ptr<Ui_TaskElementColors> ui;
ViewProviderDocumentObject* vp;
ViewProviderDocumentObject* vpParent;
src/Gui/TaskView/TaskAppearance.h
+1 -1
View File
@@ -41,7 +41,7 @@ class ViewProvider;
namespace TaskView
{
using TaskAppearance_Connection = boost::signals2::connection;
using TaskAppearance_Connection = fastsignals::connection;
class Ui_TaskAppearance;
class TaskAppearance: public TaskBox, public Gui::SelectionSingleton::ObserverType
src/Gui/TaskView/TaskSolverMessages.h
+2 -2
View File
@@ -24,12 +24,12 @@
#ifndef GUI_TASKVIEW_TaskSolverMessages_H
#define GUI_TASKVIEW_TaskSolverMessages_H
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <Gui/TaskView/TaskView.h>
class Ui_TaskSolverMessages;
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
namespace App
{
src/Gui/TaskView/TaskView.h
+1 -1
View File
@@ -51,7 +51,7 @@ class ComboView;
namespace TaskView
{
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
class TaskEditControl;
class TaskDialog;
src/Gui/TextDocumentEditorView.cpp
+1 -1
View File
@@ -125,7 +125,7 @@ void TextDocumentEditorView::refresh()
void TextDocumentEditorView::saveToObject()
{
boost::signals2::shared_connection_block textBlock {textConnection};
fastsignals::shared_connection_block textBlock {textConnection};
textDocument->Text.setValue(getEditor()->document()->toPlainText().toUtf8());
textDocument->purgeTouched();
}
src/Gui/TextDocumentEditorView.h
+2 -2
View File
@@ -75,8 +75,8 @@ private:
private:
QPlainTextEdit* const editor;
App::TextDocument* const textDocument;
boost::signals2::connection textConnection;
boost::signals2::connection labelConnection;
fastsignals::advanced_connection textConnection;
fastsignals::connection labelConnection;
bool aboutToClose = false;
};
src/Gui/ToolBarAreaWidget.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ ToolBarAreaWidget::ToolBarAreaWidget(
QWidget* parent,
ToolBarArea area,
const ParameterGrp::handle& hParam,
boost::signals2::scoped_connection& conn,
fastsignals::advanced_scoped_connection& conn,
QTimer* timer
)
: QWidget(parent)
src/Gui/ToolBarAreaWidget.h
+3 -3
View File
@@ -26,7 +26,7 @@
#include <QToolBar>
#include <QPointer>
#include <QWidget>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <Base/Parameter.h>
namespace Gui
@@ -56,7 +56,7 @@ public:
QWidget* parent,
ToolBarArea area,
const ParameterGrp::handle& hParam,
boost::signals2::scoped_connection& conn,
fastsignals::advanced_scoped_connection& conn,
QTimer* timer = nullptr
);
@@ -110,7 +110,7 @@ private:
QHBoxLayout* _layout;
QPointer<QTimer> _sizingTimer;
ParameterGrp::handle _hParam;
boost::signals2::scoped_connection& _conn;
fastsignals::advanced_scoped_connection& _conn;
ToolBarArea _area;
};
src/Gui/ToolBarManager.cpp
+2 -1
View File
@@ -503,7 +503,8 @@ void ToolBarManager::setupConnection()
timer.start(100);
}
}
}
},
fastsignals::advanced_tag()
);
}
src/Gui/ToolBarManager.h
+2 -2
View File
@@ -25,7 +25,7 @@
#define GUI_TOOLBARMANAGER_H
#include <string>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <QStringList>
#include <QPointer>
@@ -226,7 +226,7 @@ private:
QTimer menuBarTimer;
QTimer sizeTimer;
QTimer resizeTimer;
boost::signals2::scoped_connection connParam;
fastsignals::advanced_scoped_connection connParam;
ToolBarAreaWidget* statusBarAreaWidget = nullptr;
ToolBarAreaWidget* menuBarLeftAreaWidget = nullptr;
ToolBarAreaWidget* menuBarRightAreaWidget = nullptr;
src/Gui/Tree.cpp
+1 -1
View File
@@ -251,7 +251,7 @@ public:
std::string label2;
std::string internalName;
using Connection = boost::signals2::scoped_connection;
using Connection = fastsignals::scoped_connection;
Connection connectIcon;
Connection connectTool;
src/Gui/Tree.h
+3 -3
View File
@@ -300,7 +300,7 @@ private:
friend class TreeParams;
friend class TreeWidgetItemDelegate;
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
Connection connectNewDocument;
Connection connectDelDocument;
Connection connectRenDocument;
@@ -430,7 +430,7 @@ private:
ExpandInfoPtr _ExpandInfo;
void restoreItemExpansion(const ExpandInfoPtr&, DocumentObjectItem*);
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
Connection connectNewObject;
Connection connectDelObject;
Connection connectChgObject;
@@ -531,7 +531,7 @@ private:
DocumentItem* myOwner;
DocumentObjectDataPtr myData;
std::vector<std::string> mySubs;
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
int previousStatus;
int selected;
bool populated;
src/Gui/View3DSettings.h
+1 -1
View File
@@ -72,7 +72,7 @@ private:
void parameterChanged(ParameterGrp::MessageType pName);
ParameterGrp::handle hGrp;
View3DInventorViewer* _viewer;
boost::signals2::connection connectParameterChanged;
fastsignals::connection connectParameterChanged;
};
} // namespace Gui
src/Gui/ViewProvider.h
+5 -5
View File
@@ -28,7 +28,7 @@
#include <string>
#include <vector>
#include <QIcon>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <boost/intrusive_ptr.hpp>
#include <App/Material.h>
@@ -449,13 +449,13 @@ public:
/** @name Signals of the view provider */
//@{
/// signal on icon change
boost::signals2::signal<void()> signalChangeIcon;
fastsignals::signal<void()> signalChangeIcon;
/// signal on tooltip change
boost::signals2::signal<void(const QString&)> signalChangeToolTip;
fastsignals::signal<void(const QString&)> signalChangeToolTip;
/// signal on status tip change
boost::signals2::signal<void(const QString&)> signalChangeStatusTip;
fastsignals::signal<void(const QString&)> signalChangeStatusTip;
/// signal on highlight change
boost::signals2::signal<void(bool, Gui::HighlightMode)> signalChangeHighlight;
fastsignals::signal<void(bool, Gui::HighlightMode)> signalChangeHighlight;
//@}
/** update the content of the ViewProvider
src/Gui/ViewProviderLink.cpp
+1 -1
View File
@@ -121,7 +121,7 @@ class Gui::LinkInfo
public:
std::atomic<int> ref;
using Connection = boost::signals2::scoped_connection;
using Connection = fastsignals::scoped_connection;
Connection connChangeIcon;
ViewProviderDocumentObject* pcLinked;
src/Gui/Window.h
+1 -1
View File
@@ -55,7 +55,7 @@ protected:
private:
ParameterGrp::handle _handle;
boost::signals2::connection connParamChanged;
fastsignals::connection connParamChanged;
};
src/Mod/Assembly/App/AssemblyObject.h
+1 -1
View File
@@ -256,7 +256,7 @@ public:
{
return lastMalformedConstraints;
}
boost::signals2::signal<void()> signalSolverUpdate;
fastsignals::signal<void()> signalSolverUpdate;
private:
std::shared_ptr<MbD::ASMTAssembly> mbdAssembly;
src/Mod/Assembly/Gui/ViewProviderAssembly.cpp
+3 -3
View File
@@ -300,9 +300,9 @@ bool ViewProviderAssembly::setEdit(int mode)
}
auto* assembly = getObject<AssemblyObject>();
connectSolverUpdate = assembly->signalSolverUpdate.connect(
boost::bind(&ViewProviderAssembly::UpdateSolverInformation, this)
);
connectSolverUpdate = assembly->signalSolverUpdate.connect([this] {
UpdateSolverInformation();
});
return true;
}
src/Mod/Assembly/Gui/ViewProviderAssembly.h
+4 -4
View File
@@ -25,7 +25,7 @@
#define ASSEMBLYGUI_VIEWPROVIDER_ViewProviderAssembly_H
#include <QCoreApplication>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <Mod/Assembly/AssemblyGlobal.h>
@@ -247,7 +247,7 @@ public:
SoFieldSensor* translationSensor = nullptr;
SoFieldSensor* rotationSensor = nullptr;
boost::signals2::signal<
fastsignals::signal<
void(const QString& state, const QString& msg, const QString& url, const QString& linkText)>
signalSetUp;
@@ -284,8 +284,8 @@ private:
std::set<App::DocumentObject*>& visited
);
boost::signals2::connection connectSolverUpdate;
boost::signals2::scoped_connection m_preTransactionConn;
fastsignals::connection connectSolverUpdate;
fastsignals::scoped_connection m_preTransactionConn;
};
} // namespace AssemblyGui
src/Mod/Fem/App/FemConstraint.h
+1 -1
View File
@@ -231,7 +231,7 @@ private:
double sizeFactor;
void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop);
boost::signals2::connection connDocChangedObject;
fastsignals::connection connDocChangedObject;
};
using ConstraintPython = App::FeaturePythonT<Constraint>;
src/Mod/Fem/Gui/TaskPostBoxes.h
+1 -1
View File
@@ -204,7 +204,7 @@ private:
QPixmap m_icon;
App::DocumentObjectWeakPtrT m_object;
Gui::ViewProviderWeakPtrT m_view;
boost::signals2::connection m_connection;
fastsignals::connection m_connection;
};
src/Mod/Fem/Gui/ViewProviderFemPostFunction.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include <Inventor/SbBox3f.h>
#include <QWidget>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <Gui/ViewProviderDocumentObjectGroup.h>
#include <Mod/Fem/App/FemPostFunction.h>
@@ -90,7 +90,7 @@ private:
bool m_block {false};
ViewProviderFemPostFunction* m_view {nullptr};
Fem::FemPostFunction* m_object {nullptr};
boost::signals2::scoped_connection m_connection;
fastsignals::scoped_connection m_connection;
};
class FemGuiExport ViewProviderFemPostFunctionProvider: public Gui::ViewProviderDocumentObjectGroup
src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
+1 -1
View File
@@ -139,7 +139,7 @@ public:
private:
std::set<ViewProviderFemPostObject*> views;
using Connection = boost::signals2::scoped_connection;
using Connection = fastsignals::scoped_connection;
Connection connectSelection;
};
src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include <QSignalBlocker>
#include <algorithm>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <Base/Console.h>
#include <Gui/Application.h>
@@ -50,7 +50,7 @@ namespace sp = std::placeholders;
class DlgDisplayPropertiesImp::Private
{
using DlgDisplayPropertiesImp_Connection = boost::signals2::connection;
using DlgDisplayPropertiesImp_Connection = fastsignals::connection;
public:
Ui::DlgDisplayProperties ui;
src/Mod/Material/Gui/DlgMaterialImp.cpp
+2 -2
View File
@@ -26,7 +26,7 @@
#include <QSignalBlocker>
#include <QString>
#include <algorithm>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <Base/Console.h>
#include <Gui/Application.h>
@@ -58,7 +58,7 @@ namespace sp = std::placeholders;
class DlgMaterialImp::Private
{
using DlgMaterialImp_Connection = boost::signals2::connection;
using DlgMaterialImp_Connection = fastsignals::connection;
public:
Ui::DlgMaterial ui;
src/Mod/Measure/App/MeasureBase.h
+1 -1
View File
@@ -58,7 +58,7 @@ public:
App::PropertyPlacement Placement;
// boost::signals2::signal<void (const MeasureBase*)> signalGuiInit;
// fastsignals::signal<void (const MeasureBase*)> signalGuiInit;
// return PyObject as MeasureBasePy
PyObject* getPyObject() override;
src/Mod/Measure/Gui/TaskMeasure.h
+2 -2
View File
@@ -43,7 +43,7 @@
#include <Gui/TaskView/TaskView.h>
#include <Gui/Selection/Selection.h>
#include <boost/signals2/connection.hpp>
#include <fastsignals/connection.h>
namespace MeasureGui
{
@@ -90,7 +90,7 @@ private:
QAction* newMeasurementBehaviourAction {nullptr};
QToolButton* mSettings {nullptr};
boost::signals2::connection m_deletedConnection;
fastsignals::connection m_deletedConnection;
void removeObject();
void onModeChanged(int index);
src/Mod/Measure/Gui/ViewProviderMeasureBase.h
+1 -1
View File
@@ -168,7 +168,7 @@ protected:
SoSeparator* pLineSeparatorSecondary;
private:
boost::signals2::connection _mVisibilityChangedConnection;
fastsignals::connection _mVisibilityChangedConnection;
};
src/Mod/Mesh/Gui/MeshEditor.h
+1 -1
View File
@@ -161,7 +161,7 @@ private Q_SLOTS:
private:
using TBoundary = std::vector<Mesh::PointIndex>;
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
static void fileHoleCallback(void* ud, SoEventCallback* n);
void createPolygons();
src/Mod/Part/App/OCAF/ImportExportSettings.h
+1
View File
@@ -25,6 +25,7 @@
#ifndef PART_OCAF_IMPORTEXPORTSETTINGS_H
#define PART_OCAF_IMPORTEXPORTSETTINGS_H
#include <list>
#include <memory>
#include <Mod/Part/App/Interface.h>
#include <Base/Parameter.h>
src/Mod/Part/App/PropertyTopoShape.h
+1 -1
View File
@@ -310,7 +310,7 @@ private:
private:
std::unordered_map<std::string, TopoShape> cache;
boost::signals2::scoped_connection connChanged;
fastsignals::scoped_connection connChanged;
};
} // namespace Part
src/Mod/Part/Gui/DlgBooleanOperation.h
+1 -1
View File
@@ -39,7 +39,7 @@ class Property;
namespace PartGui
{
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
class Ui_DlgBooleanOperation;
class DlgBooleanOperation: public QWidget
{
src/Mod/Part/Gui/DlgFilletEdges.cpp
+1 -1
View File
@@ -220,7 +220,7 @@ public:
std::vector<int> edge_ids;
TopTools_IndexedMapOfShape all_edges;
TopTools_IndexedMapOfShape all_faces;
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
Connection connectApplicationDeletedObject;
Connection connectApplicationDeletedDocument;
src/Mod/Part/Gui/TaskAttacher.h
+1 -1
View File
@@ -174,7 +174,7 @@ private:
Attacher::SuggestResult lastSuggestResult;
bool completed;
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
Connection connectDelObject;
Connection connectDelDocument;
src/Mod/Part/Gui/TaskFaceAppearances.cpp
+1 -1
View File
@@ -95,7 +95,7 @@ public:
class FaceAppearances::Private
{
public:
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
Ui_TaskFaceAppearances* ui;
QPointer<Gui::View3DInventorViewer> view;
ViewProviderPartExt* vp;
src/Mod/PartDesign/App/Body.h
+1 -1
View File
@@ -161,7 +161,7 @@ protected:
void onDocumentRestored() override;
private:
boost::signals2::scoped_connection connection;
fastsignals::scoped_connection connection;
bool showTip = false;
};
src/Mod/PartDesign/App/ShapeBinder.h
+2 -2
View File
@@ -81,7 +81,7 @@ private:
void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop);
void onSettingDocument() override;
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
Connection connectDocumentChangedObject;
};
@@ -168,7 +168,7 @@ protected:
void slotRecomputedObject(const App::DocumentObject& Obj);
using Connection = boost::signals2::scoped_connection;
using Connection = fastsignals::scoped_connection;
Connection connRecomputedObj;
App::Document* contextDoc = nullptr;
src/Mod/PartDesign/Gui/TaskHoleParameters.h
+1 -1
View File
@@ -144,7 +144,7 @@ private:
void updateHoleTypeCombo();
private:
using Connection = boost::signals2::scoped_connection;
using Connection = fastsignals::scoped_connection;
Connection connectPropChanged;
std::unique_ptr<Observer> observer;
src/Mod/PartDesign/Gui/TaskTransformedMessages.h
+1 -1
View File
@@ -27,7 +27,7 @@
#include <Gui/TaskView/TaskView.h>
class Ui_TaskTransformedMessages;
using Connection = boost::signals2::connection;
using Connection = fastsignals::connection;
namespace App
{
src/Mod/PartDesign/Gui/ViewProviderTransformed.h
+1 -1
View File
@@ -54,7 +54,7 @@ public:
void setupContextMenu(QMenu*, QObject*, const char*) override;
/// signals if the transformation contains errors
boost::signals2::signal<void(QString msg)> signalDiagnosis;
fastsignals::signal<void(QString msg)> signalDiagnosis;
// Name of menu dialog
QString menuName;
src/Mod/PartDesign/Gui/WorkflowManager.h
+3 -3
View File
@@ -100,9 +100,9 @@ private:
private:
std::map<const App::Document*, Workflow> dwMap;
boost::signals2::connection connectNewDocument;
boost::signals2::connection connectFinishRestoreDocument;
boost::signals2::connection connectDeleteDocument;
fastsignals::connection connectNewDocument;
fastsignals::connection connectFinishRestoreDocument;
fastsignals::connection connectDeleteDocument;
static WorkflowManager* _instance;
};
src/Mod/Sketcher/App/PropertyConstraintList.h
+3 -3
View File
@@ -29,7 +29,7 @@
#include <vector>
#include <boost/unordered/unordered_map.hpp>
#include <boost/signals2.hpp>
#include <fastsignals/signal.h>
#include <App/Property.h>
#include <Mod/Part/App/Geometry.h>
@@ -152,9 +152,9 @@ public:
using ConstraintInfo = std::pair<int, const Constraint*>;
boost::signals2::signal<void(const std::map<App::ObjectIdentifier, App::ObjectIdentifier>&)>
fastsignals::signal<void(const std::map<App::ObjectIdentifier, App::ObjectIdentifier>&)>
signalConstraintsRenamed;
boost::signals2::signal<void(const std::set<App::ObjectIdentifier>&)> signalConstraintsRemoved;
fastsignals::signal<void(const std::set<App::ObjectIdentifier>&)> signalConstraintsRemoved;
static std::string getConstraintName(const std::string& name, int i);
src/Mod/Sketcher/App/SketchObject.h
+4 -4
View File
@@ -971,8 +971,8 @@ public:
std::vector<Base::Vector3d> getOpenVertices() const;
// Signaled when solver has done update
boost::signals2::signal<void()> signalSolverUpdate;
boost::signals2::signal<void()> signalElementsChanged;
fastsignals::signal<void()> signalSolverUpdate;
fastsignals::signal<void()> signalElementsChanged;
Part::TopoShape buildInternals(const Part::TopoShape& edges) const;
@@ -1161,8 +1161,8 @@ private:
std::vector<int> lastPartiallyRedundant;
std::vector<int> lastMalformedConstraints;
boost::signals2::scoped_connection constraintsRenamedConn;
boost::signals2::scoped_connection constraintsRemovedConn;
fastsignals::scoped_connection constraintsRenamedConn;
fastsignals::scoped_connection constraintsRemovedConn;
bool AutoLockTangencyAndPerpty(Constraint* cstr, bool bForce = false, bool bLock = true);
src/Mod/Sketcher/Gui/DrawSketchDefaultWidgetController.h
+7 -11
View File
@@ -95,7 +95,7 @@ private:
SketcherToolDefaultWidget* toolWidget;
using Connection = boost::signals2::connection;
using Connection = fastsignals::advanced_connection;
Connection connectionParameterTabOrEnterPressed;
Connection connectionParameterValueChanged;
@@ -378,12 +378,12 @@ private:
/// Resets the widget
void resetDefaultWidget()
{
boost::signals2::shared_connection_block parameter_focus_block(
fastsignals::shared_connection_block parameter_focus_block(
connectionParameterTabOrEnterPressed
);
boost::signals2::shared_connection_block parameter_block(connectionParameterValueChanged);
boost::signals2::shared_connection_block checkbox_block(connectionCheckboxCheckedChanged);
boost::signals2::shared_connection_block combobox_block(connectionComboboxSelectionChanged);
fastsignals::shared_connection_block parameter_block(connectionParameterValueChanged);
fastsignals::shared_connection_block checkbox_block(connectionCheckboxCheckedChanged);
fastsignals::shared_connection_block combobox_block(connectionComboboxSelectionChanged);
nParameter = WidgetParametersT::size(handler->constructionMethod());
nCheckbox = WidgetCheckboxesT::size(handler->constructionMethod());
@@ -403,9 +403,7 @@ private:
if (currentindex != methodint) {
// avoid triggering of method change
boost::signals2::shared_connection_block combobox_block(
connectionComboboxSelectionChanged
);
fastsignals::shared_connection_block combobox_block(connectionComboboxSelectionChanged);
toolWidget->setComboboxIndex(WCombobox::FirstCombo, methodint);
}
}
@@ -454,9 +452,7 @@ private:
auto actualconstructionmethod = static_cast<int>(handler->constructionMethod());
if (constructionmethod != actualconstructionmethod) {
boost::signals2::shared_connection_block combobox_block(
connectionComboboxSelectionChanged
);
fastsignals::shared_connection_block combobox_block(connectionComboboxSelectionChanged);
toolWidget->setComboboxIndex(WCombobox::FirstCombo, actualconstructionmethod);
}
}

Some files were not shown because too many files have changed in this diff Show More