Merge pull request #19132 from tritao/base-remove-boost-signals
Base: Remove Boost-based signals and switch to `FastSignals`.
This commit is contained in:
@@ -256,7 +256,7 @@ public:
|
||||
{
|
||||
return lastMalformedConstraints;
|
||||
}
|
||||
boost::signals2::signal<void()> signalSolverUpdate;
|
||||
fastsignals::signal<void()> signalSolverUpdate;
|
||||
|
||||
private:
|
||||
std::shared_ptr<MbD::ASMTAssembly> mbdAssembly;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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>;
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -139,7 +139,7 @@ public:
|
||||
|
||||
private:
|
||||
std::set<ViewProviderFemPostObject*> views;
|
||||
using Connection = boost::signals2::scoped_connection;
|
||||
using Connection = fastsignals::scoped_connection;
|
||||
Connection connectSelection;
|
||||
};
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -168,7 +168,7 @@ protected:
|
||||
SoSeparator* pLineSeparatorSecondary;
|
||||
|
||||
private:
|
||||
boost::signals2::connection _mVisibilityChangedConnection;
|
||||
fastsignals::connection _mVisibilityChangedConnection;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -310,7 +310,7 @@ private:
|
||||
|
||||
private:
|
||||
std::unordered_map<std::string, TopoShape> cache;
|
||||
boost::signals2::scoped_connection connChanged;
|
||||
fastsignals::scoped_connection connChanged;
|
||||
};
|
||||
|
||||
} // namespace Part
|
||||
|
||||
@@ -39,7 +39,7 @@ class Property;
|
||||
namespace PartGui
|
||||
{
|
||||
|
||||
using Connection = boost::signals2::connection;
|
||||
using Connection = fastsignals::connection;
|
||||
class Ui_DlgBooleanOperation;
|
||||
class DlgBooleanOperation: public QWidget
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -174,7 +174,7 @@ private:
|
||||
Attacher::SuggestResult lastSuggestResult;
|
||||
bool completed;
|
||||
|
||||
using Connection = boost::signals2::connection;
|
||||
using Connection = fastsignals::connection;
|
||||
Connection connectDelObject;
|
||||
Connection connectDelDocument;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -161,7 +161,7 @@ protected:
|
||||
void onDocumentRestored() override;
|
||||
|
||||
private:
|
||||
boost::signals2::scoped_connection connection;
|
||||
fastsignals::scoped_connection connection;
|
||||
bool showTip = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <Gui/TaskView/TaskView.h>
|
||||
|
||||
class Ui_TaskTransformedMessages;
|
||||
using Connection = boost::signals2::connection;
|
||||
using Connection = fastsignals::connection;
|
||||
|
||||
namespace App
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#include <Gui/TaskView/TaskView.h>
|
||||
#include <Gui/TaskView/TaskDialog.h>
|
||||
#include <Gui/Selection/Selection.h>
|
||||
#include <boost/signals2.hpp>
|
||||
#include <fastsignals/signal.h>
|
||||
|
||||
|
||||
class QComboBox;
|
||||
@@ -156,27 +156,30 @@ public:
|
||||
void restoreComboboxPref(int comboboxindex);
|
||||
|
||||
template<typename F>
|
||||
boost::signals2::connection registerParameterTabOrEnterPressed(F&& fn)
|
||||
fastsignals::advanced_connection registerParameterTabOrEnterPressed(F&& fn)
|
||||
{
|
||||
return signalParameterTabOrEnterPressed.connect(std::forward<F>(fn));
|
||||
return signalParameterTabOrEnterPressed.connect(
|
||||
std::forward<F>(fn),
|
||||
fastsignals::advanced_tag()
|
||||
);
|
||||
}
|
||||
|
||||
template<typename F>
|
||||
boost::signals2::connection registerParameterValueChanged(F&& fn)
|
||||
fastsignals::advanced_connection registerParameterValueChanged(F&& fn)
|
||||
{
|
||||
return signalParameterValueChanged.connect(std::forward<F>(fn));
|
||||
return signalParameterValueChanged.connect(std::forward<F>(fn), fastsignals::advanced_tag());
|
||||
}
|
||||
|
||||
template<typename F>
|
||||
boost::signals2::connection registerCheckboxCheckedChanged(F&& fn)
|
||||
fastsignals::advanced_connection registerCheckboxCheckedChanged(F&& fn)
|
||||
{
|
||||
return signalCheckboxCheckedChanged.connect(std::forward<F>(fn));
|
||||
return signalCheckboxCheckedChanged.connect(std::forward<F>(fn), fastsignals::advanced_tag());
|
||||
}
|
||||
|
||||
template<typename F>
|
||||
boost::signals2::connection registerComboboxSelectionChanged(F&& fn)
|
||||
fastsignals::advanced_connection registerComboboxSelectionChanged(F&& fn)
|
||||
{
|
||||
return signalComboboxSelectionChanged.connect(std::forward<F>(fn));
|
||||
return signalComboboxSelectionChanged.connect(std::forward<F>(fn), fastsignals::advanced_tag());
|
||||
}
|
||||
|
||||
|
||||
@@ -218,10 +221,10 @@ private:
|
||||
private:
|
||||
std::unique_ptr<Ui_SketcherToolDefaultWidget> ui;
|
||||
|
||||
boost::signals2::signal<void(int parameterindex)> signalParameterTabOrEnterPressed;
|
||||
boost::signals2::signal<void(int parameterindex, double value)> signalParameterValueChanged;
|
||||
boost::signals2::signal<void(int checkboxindex, bool value)> signalCheckboxCheckedChanged;
|
||||
boost::signals2::signal<void(int comboindex, int value)> signalComboboxSelectionChanged;
|
||||
fastsignals::signal<void(int parameterindex)> signalParameterTabOrEnterPressed;
|
||||
fastsignals::signal<void(int parameterindex, double value)> signalParameterValueChanged;
|
||||
fastsignals::signal<void(int checkboxindex, bool value)> signalCheckboxCheckedChanged;
|
||||
fastsignals::signal<void(int comboindex, int value)> signalComboboxSelectionChanged;
|
||||
|
||||
/// lock to block QT slots
|
||||
bool blockParameterSlots;
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#ifndef SKETCHERGUI_TaskDlgEditSketch_H
|
||||
#define SKETCHERGUI_TaskDlgEditSketch_H
|
||||
|
||||
#include <boost/signals2.hpp>
|
||||
#include <fastsignals/signal.h>
|
||||
|
||||
#include <Gui/TaskView/TaskDialog.h>
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
#include "ViewProviderSketch.h"
|
||||
|
||||
|
||||
using Connection = boost::signals2::connection;
|
||||
using Connection = fastsignals::connection;
|
||||
|
||||
namespace SketcherGui
|
||||
{
|
||||
@@ -75,7 +75,7 @@ public:
|
||||
|
||||
/** @brief Function used to register a slot to be triggered when the tool widget is changed. */
|
||||
template<typename F>
|
||||
boost::signals2::connection registerToolWidgetChanged(F&& f)
|
||||
fastsignals::connection registerToolWidgetChanged(F&& f)
|
||||
{
|
||||
return ToolSettings->registerToolWidgetChanged(std::forward<F>(f));
|
||||
}
|
||||
|
||||
@@ -982,7 +982,7 @@ TaskSketcherConstraints::TaskSketcherConstraints(ViewProviderSketch* sketchView)
|
||||
//NOLINTBEGIN
|
||||
Gui::Application* app = Gui::Application::Instance;
|
||||
changedSketchView = app->signalChangedObject.connect(
|
||||
std::bind(&TaskSketcherConstraints::onChangedSketchView, this, sp::_1, sp::_2));
|
||||
std::bind(&TaskSketcherConstraints::onChangedSketchView, this, sp::_1, sp::_2), fastsignals::advanced_tag());
|
||||
//NOLINTEND
|
||||
|
||||
updateList();
|
||||
|
||||
@@ -200,7 +200,7 @@ public:
|
||||
protected:
|
||||
void changeEvent(QEvent* e) override;
|
||||
ViewProviderSketch* sketchView;
|
||||
using Connection = boost::signals2::connection;
|
||||
using Connection = fastsignals::connection;
|
||||
Connection connectionConstraintsChanged;
|
||||
|
||||
private:
|
||||
@@ -221,7 +221,7 @@ private:
|
||||
// constraints associated with the
|
||||
// selected geometry
|
||||
ConstraintFilterList* filterList;
|
||||
boost::signals2::scoped_connection changedSketchView;
|
||||
fastsignals::advanced_scoped_connection changedSketchView;
|
||||
|
||||
// Buffering structures
|
||||
std::unordered_map<int, ConstraintItem*> constraintMap;
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <QListWidget>
|
||||
#include <QStyledItemDelegate>
|
||||
|
||||
#include <boost/signals2.hpp>
|
||||
#include <fastsignals/signal.h>
|
||||
|
||||
#include <Gui/Selection/Selection.h>
|
||||
#include <Gui/TaskView/TaskView.h>
|
||||
@@ -152,7 +152,7 @@ protected:
|
||||
void changeEvent(QEvent* e) override;
|
||||
void leaveEvent(QEvent* event) override;
|
||||
ViewProviderSketch* sketchView;
|
||||
using Connection = boost::signals2::connection;
|
||||
using Connection = fastsignals::connection;
|
||||
Connection connectionElementsChanged;
|
||||
|
||||
private:
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <Gui/TaskView/TaskView.h>
|
||||
#include <Gui/TaskView/TaskDialog.h>
|
||||
#include <Gui/Selection/Selection.h>
|
||||
#include <boost/signals2.hpp>
|
||||
#include <fastsignals/signal.h>
|
||||
|
||||
namespace App
|
||||
{
|
||||
@@ -63,7 +63,7 @@ public:
|
||||
void toolChanged(const std::string& toolname);
|
||||
|
||||
template<typename F>
|
||||
boost::signals2::connection registerToolWidgetChanged(F&& f)
|
||||
fastsignals::connection registerToolWidgetChanged(F&& f)
|
||||
{
|
||||
return signalToolWidgetChanged.connect(std::forward<F>(f));
|
||||
}
|
||||
@@ -71,9 +71,9 @@ public:
|
||||
private:
|
||||
ViewProviderSketch* sketchView;
|
||||
std::unique_ptr<QWidget> widget;
|
||||
boost::signals2::scoped_connection changedSketchView;
|
||||
fastsignals::scoped_connection changedSketchView;
|
||||
|
||||
boost::signals2::signal<void(QWidget* newwidget)> signalToolWidgetChanged;
|
||||
fastsignals::signal<void(QWidget* newwidget)> signalToolWidgetChanged;
|
||||
};
|
||||
|
||||
} // namespace SketcherGui
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <Inventor/sensors/SoNodeSensor.h>
|
||||
#include <QCoreApplication>
|
||||
#include <QMetaObject>
|
||||
#include <boost/signals2.hpp>
|
||||
#include <fastsignals/signal.h>
|
||||
#include <memory>
|
||||
|
||||
#include <Base/Parameter.h>
|
||||
@@ -704,19 +704,19 @@ public:
|
||||
/** @name Signals for controlling information in Task dialogs */
|
||||
//@{
|
||||
/// signals if the constraints list has changed
|
||||
boost::signals2::signal<void()> signalConstraintsChanged;
|
||||
fastsignals::signal<void()> signalConstraintsChanged;
|
||||
/// signals if the sketch has been set up
|
||||
boost::signals2::signal<
|
||||
fastsignals::signal<
|
||||
void(const QString& state, const QString& msg, const QString& url, const QString& linkText)>
|
||||
signalSetUp;
|
||||
/// signals if the elements list has changed
|
||||
boost::signals2::signal<void()> signalElementsChanged;
|
||||
fastsignals::signal<void()> signalElementsChanged;
|
||||
//@}
|
||||
|
||||
/** @name Register slot for signal */
|
||||
//@{
|
||||
template<typename F>
|
||||
boost::signals2::connection registerToolChanged(F&& f)
|
||||
fastsignals::connection registerToolChanged(F&& f)
|
||||
{
|
||||
return signalToolChanged.connect(std::forward<F>(f));
|
||||
}
|
||||
@@ -863,7 +863,7 @@ private:
|
||||
/** @name signals*/
|
||||
//@{
|
||||
/// signals a tool change
|
||||
boost::signals2::signal<void(const std::string& toolname)> signalToolChanged;
|
||||
fastsignals::signal<void(const std::string& toolname)> signalToolChanged;
|
||||
//@}
|
||||
|
||||
void slotToolWidgetChanged(QWidget* newwidget);
|
||||
@@ -969,9 +969,9 @@ private:
|
||||
//@}
|
||||
|
||||
private:
|
||||
boost::signals2::connection connectUndoDocument;
|
||||
boost::signals2::connection connectRedoDocument;
|
||||
boost::signals2::connection connectSolverUpdate;
|
||||
fastsignals::connection connectUndoDocument;
|
||||
fastsignals::connection connectRedoDocument;
|
||||
fastsignals::connection connectSolverUpdate;
|
||||
|
||||
QMetaObject::Connection screenChangeConnection;
|
||||
|
||||
@@ -1005,7 +1005,7 @@ private:
|
||||
|
||||
ViewProviderParameters viewProviderParameters;
|
||||
|
||||
using Connection = boost::signals2::connection;
|
||||
using Connection = fastsignals::connection;
|
||||
Connection connectionToolWidget;
|
||||
|
||||
SoNodeSensor cameraSensor;
|
||||
|
||||
@@ -353,7 +353,7 @@ private:
|
||||
/*! The associated python object */
|
||||
Py::SmartPtr PythonObject;
|
||||
|
||||
std::map<const App::DocumentObject*, boost::signals2::scoped_connection> depConnections;
|
||||
std::map<const App::DocumentObject*, fastsignals::scoped_connection> depConnections;
|
||||
|
||||
int updateCount = 0;
|
||||
bool restoring = false;
|
||||
|
||||
@@ -231,15 +231,15 @@ public:
|
||||
|
||||
// Signals
|
||||
|
||||
boost::signals2::signal<void(App::CellAddress)> cellUpdated;
|
||||
fastsignals::signal<void(App::CellAddress)> cellUpdated;
|
||||
|
||||
boost::signals2::signal<void(App::Range)> rangeUpdated;
|
||||
fastsignals::signal<void(App::Range)> rangeUpdated;
|
||||
|
||||
boost::signals2::signal<void(App::CellAddress)> cellSpanChanged;
|
||||
fastsignals::signal<void(App::CellAddress)> cellSpanChanged;
|
||||
|
||||
boost::signals2::signal<void(int, int)> columnWidthChanged;
|
||||
fastsignals::signal<void(int, int)> columnWidthChanged;
|
||||
|
||||
boost::signals2::signal<void(int, int)> rowHeightChanged;
|
||||
fastsignals::signal<void(int, int)> rowHeightChanged;
|
||||
|
||||
void renameObjectIdentifiers(
|
||||
const std::map<App::ObjectIdentifier, App::ObjectIdentifier>& paths
|
||||
|
||||
@@ -60,8 +60,8 @@ private:
|
||||
void cellUpdated(App::CellAddress address);
|
||||
void rangeUpdated(const App::Range& range);
|
||||
|
||||
boost::signals2::scoped_connection cellUpdatedConnection;
|
||||
boost::signals2::scoped_connection rangeUpdatedConnection;
|
||||
fastsignals::scoped_connection cellUpdatedConnection;
|
||||
fastsignals::scoped_connection rangeUpdatedConnection;
|
||||
Spreadsheet::Sheet* sheet;
|
||||
QColor aliasBgColor;
|
||||
QColor textFgColor;
|
||||
|
||||
@@ -125,7 +125,7 @@ protected:
|
||||
|
||||
QTimer timer;
|
||||
|
||||
boost::signals2::scoped_connection cellSpanChangedConnection;
|
||||
fastsignals::scoped_connection cellSpanChangedConnection;
|
||||
std::set<App::CellAddress> spanChanges;
|
||||
};
|
||||
|
||||
|
||||
@@ -139,9 +139,9 @@ protected:
|
||||
Spreadsheet::Sheet* sheet;
|
||||
SpreadsheetDelegate* delegate;
|
||||
SheetModel* model;
|
||||
boost::signals2::scoped_connection columnWidthChangedConnection;
|
||||
boost::signals2::scoped_connection rowHeightChangedConnection;
|
||||
boost::signals2::scoped_connection positionChangedConnection;
|
||||
fastsignals::scoped_connection columnWidthChangedConnection;
|
||||
fastsignals::scoped_connection rowHeightChangedConnection;
|
||||
fastsignals::scoped_connection positionChangedConnection;
|
||||
|
||||
std::map<int, int> newColumnSizes;
|
||||
std::map<int, int> newRowSizes;
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#ifndef DrawPage_h_
|
||||
#define DrawPage_h_
|
||||
|
||||
#include <boost/signals2.hpp>
|
||||
#include <fastsignals/signal.h>
|
||||
|
||||
#include <App/DocumentObject.h>
|
||||
#include <App/PropertyStandard.h>
|
||||
@@ -63,7 +63,7 @@ public:
|
||||
int addView(App::DocumentObject* docObj, bool setPosition = true);
|
||||
int removeView(App::DocumentObject* docObj);
|
||||
short mustExecute() const override;
|
||||
boost::signals2::signal<void(const DrawPage*)> signalGuiPaint;
|
||||
fastsignals::signal<void(const DrawPage*)> signalGuiPaint;
|
||||
|
||||
/// returns the type name of the ViewProvider
|
||||
const char* getViewProviderName() const override { return "TechDrawGui::ViewProviderPage"; }
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#ifndef DrawView_h_
|
||||
#define DrawView_h_
|
||||
|
||||
#include <boost/signals2.hpp>
|
||||
#include <fastsignals/signal.h>
|
||||
#include <QCoreApplication>
|
||||
#include <QRectF>
|
||||
|
||||
@@ -101,8 +101,8 @@ public:
|
||||
virtual Base::Vector3d getPosition() const { return Base::Vector3d(X.getValue(), Y.getValue(), 0.0); }
|
||||
virtual bool keepUpdated(void);
|
||||
|
||||
boost::signals2::signal<void (const DrawView*)> signalGuiPaint;
|
||||
boost::signals2::signal<void (const DrawView*, std::string, std::string)> signalProgressMessage;
|
||||
fastsignals::signal<void (const DrawView*)> signalGuiPaint;
|
||||
fastsignals::signal<void (const DrawView*, std::string, std::string)> signalProgressMessage;
|
||||
void requestPaint(void);
|
||||
void showProgressMessage(std::string featureName, std::string text);
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
#include <QPrintDialog>
|
||||
#include <QPrintPreviewDialog>
|
||||
#include <QPrinter>
|
||||
#include <boost/signals2.hpp>
|
||||
#include <fastsignals/signal.h>
|
||||
#include <cmath>
|
||||
|
||||
|
||||
|
||||
@@ -136,7 +136,7 @@ protected:
|
||||
void sceneSelectionManager();
|
||||
|
||||
private:
|
||||
using Connection = boost::signals2::connection;
|
||||
using Connection = fastsignals::connection;
|
||||
Connection connectDeletedObject;
|
||||
|
||||
QAction *m_toggleFrameAction;
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#include <Mod/TechDraw/TechDrawGlobal.h>
|
||||
|
||||
#include <boost/signals2.hpp>
|
||||
#include <fastsignals/signal.h>
|
||||
|
||||
#include <QColor>
|
||||
#include <QFont>
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
***************************************************************************/
|
||||
|
||||
#include <limits>
|
||||
#include <boost/signals2.hpp>
|
||||
#include <boost/signals2/connection.hpp>
|
||||
#include <fastsignals/signal.h>
|
||||
#include <fastsignals/connection.h>
|
||||
|
||||
#include <App/Application.h>
|
||||
#include <App/Document.h>
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
#include <Mod/TechDraw/TechDrawGlobal.h>
|
||||
|
||||
#include <boost/signals2.hpp>
|
||||
#include <fastsignals/signal.h>
|
||||
|
||||
#include <Gui/Document.h>
|
||||
#include <Gui/ViewProviderDocumentObject.h>
|
||||
@@ -89,7 +89,7 @@ public:
|
||||
void onProgressMessage(const TechDraw::DrawView* dv,
|
||||
const std::string featureName,
|
||||
const std::string text);
|
||||
using Connection = boost::signals2::scoped_connection;
|
||||
using Connection = fastsignals::scoped_connection;
|
||||
Connection connectGuiRepaint;
|
||||
Connection connectProgressMessage;
|
||||
|
||||
|
||||
@@ -28,8 +28,8 @@
|
||||
# include <QPointer>
|
||||
# include <QTextStream>
|
||||
|
||||
# include <boost/signals2.hpp>
|
||||
# include <boost/signals2/connection.hpp>
|
||||
#include <fastsignals/signal.h>
|
||||
#include <fastsignals/connection.h>
|
||||
|
||||
#include <App/Document.h>
|
||||
#include <App/DocumentObject.h>
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <QObject>
|
||||
#include <QPointer>
|
||||
|
||||
#include <boost/signals2.hpp>
|
||||
#include <fastsignals/signal.h>
|
||||
|
||||
#include <App/PropertyUnits.h>
|
||||
#include <Gui/ViewProviderDocumentObject.h>
|
||||
@@ -110,7 +110,7 @@ public:
|
||||
void onGuiRepaint(const TechDraw::DrawPage* dp);
|
||||
|
||||
// NOLINTBEGIN
|
||||
using Connection = boost::signals2::scoped_connection;
|
||||
using Connection = fastsignals::scoped_connection;
|
||||
Connection connectGuiRepaint;
|
||||
// NOLINTEND
|
||||
|
||||
|
||||
Reference in New Issue
Block a user