move from deprecated boost.signals to boost.signals2 library
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
#include <App/PropertyStandard.h>
|
||||
#include <Mod/Part/App/BodyBase.h>
|
||||
|
||||
#include <boost/signals.hpp>
|
||||
#include <boost/signals2.hpp>
|
||||
|
||||
namespace App {
|
||||
class Origin;
|
||||
@@ -145,7 +145,7 @@ protected:
|
||||
virtual void unsetupObject () override;
|
||||
|
||||
private:
|
||||
boost::signals::scoped_connection connection;
|
||||
boost::signals2::scoped_connection connection;
|
||||
};
|
||||
|
||||
} //namespace PartDesign
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#define PARTDESIGN_DATUMSHAPE_H
|
||||
|
||||
#include <QString>
|
||||
#include <boost/signals.hpp>
|
||||
#include <boost/signals2.hpp>
|
||||
#include <App/PropertyLinks.h>
|
||||
#include <Mod/Part/App/DatumFeature.h>
|
||||
|
||||
@@ -67,7 +67,7 @@ private:
|
||||
void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop);
|
||||
virtual void onSettingDocument();
|
||||
|
||||
typedef boost::signals::connection Connection;
|
||||
typedef boost::signals2::connection Connection;
|
||||
Connection connectDocumentChangedObject;
|
||||
};
|
||||
|
||||
|
||||
@@ -49,7 +49,6 @@ TaskFeatureParameters::TaskFeatureParameters(PartDesignGui::ViewProvider *vp, QW
|
||||
{
|
||||
Gui::Document* doc = vp->getDocument();
|
||||
this->attachDocument(doc);
|
||||
this->enableNotifications(DocumentObserver::Delete);
|
||||
}
|
||||
|
||||
void TaskFeatureParameters::slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj)
|
||||
|
||||
@@ -121,7 +121,7 @@ private:
|
||||
|
||||
private:
|
||||
|
||||
typedef boost::BOOST_SIGNALS_NAMESPACE::scoped_connection Connection;
|
||||
typedef boost::signals2::scoped_connection Connection;
|
||||
Connection connectPropChanged;
|
||||
|
||||
std::unique_ptr<Observer> observer;
|
||||
|
||||
@@ -183,7 +183,6 @@ TaskBoxPrimitives::TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent)
|
||||
|
||||
Gui::Document* doc = vp->getDocument();
|
||||
this->attachDocument(doc);
|
||||
this->enableNotifications(DocumentObserver::Delete);
|
||||
|
||||
//show the parts coordinate system axis for selection
|
||||
PartDesign::Body * body = PartDesign::Body::findBodyOf(vp->getObject());
|
||||
|
||||
@@ -48,8 +48,6 @@ class ViewProvider;
|
||||
|
||||
namespace PartDesignGui {
|
||||
|
||||
namespace s = boost::signals;
|
||||
|
||||
class TaskBoxPrimitives : public Gui::TaskView::TaskBox,
|
||||
public Gui::DocumentObserver
|
||||
{
|
||||
|
||||
@@ -25,10 +25,10 @@
|
||||
#define GUI_TASKVIEW_TaskTransformedMessages_H
|
||||
|
||||
#include <Gui/TaskView/TaskView.h>
|
||||
#include <boost/signals.hpp>
|
||||
#include <boost/signals2.hpp>
|
||||
|
||||
class Ui_TaskTransformedMessages;
|
||||
typedef boost::signals::connection Connection;
|
||||
typedef boost::signals2::connection Connection;
|
||||
|
||||
namespace App {
|
||||
class Property;
|
||||
|
||||
@@ -76,7 +76,6 @@ TaskTransformedParameters::TaskTransformedParameters(ViewProviderTransformed *Tr
|
||||
if (TransformedView) {
|
||||
Gui::Document* doc = TransformedView->getDocument();
|
||||
this->attachDocument(doc);
|
||||
this->enableNotifications(DocumentObserver::Delete);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -96,8 +96,8 @@ protected:
|
||||
private:
|
||||
static const char* BodyModeEnum[];
|
||||
|
||||
boost::signals::connection connectChangedObjectApp;
|
||||
boost::signals::connection connectChangedObjectGui;
|
||||
boost::signals2::connection connectChangedObjectApp;
|
||||
boost::signals2::connection connectChangedObjectGui;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ public:
|
||||
virtual bool onDelete(const std::vector<std::string> &);
|
||||
|
||||
/// signals if the transformation contains errors
|
||||
boost::signal<void (QString msg)> signalDiagnosis;
|
||||
boost::signals2::signal<void (QString msg)> signalDiagnosis;
|
||||
|
||||
// The feature name of the subclass
|
||||
std::string featureName;
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#ifndef WORKFLOWMANAGER_H_PB7A5GCM
|
||||
#define WORKFLOWMANAGER_H_PB7A5GCM
|
||||
|
||||
#include <boost/signals.hpp>
|
||||
#include <boost/signals2.hpp>
|
||||
#include <map>
|
||||
|
||||
namespace App {
|
||||
@@ -98,9 +98,9 @@ private:
|
||||
private:
|
||||
std::map<const App::Document*, Workflow> dwMap;
|
||||
|
||||
boost::signals::connection connectNewDocument;
|
||||
boost::signals::connection connectFinishRestoreDocument;
|
||||
boost::signals::connection connectDeleteDocument;
|
||||
boost::signals2::connection connectNewDocument;
|
||||
boost::signals2::connection connectFinishRestoreDocument;
|
||||
boost::signals2::connection connectDeleteDocument;
|
||||
|
||||
static WorkflowManager* _instance;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user