kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Convert deprecated boost::signal to signals2

Browse Source
This commit is contained in:
wandererfan
2018-05-10 12:00:13 -04:00
committed by Yorik van Havre
parent 8a183a0ba0
commit e4debdcfce
7 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/TechDraw/App/DrawPage.h
View File

@@ -24,7 +24,7 @@
#ifndef _DrawPage_h_
#define _DrawPage_h_
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <App/DocumentObject.h>
#include <App/DocumentObjectGroup.h>
@@ -59,7 +59,7 @@ public:
int addView(App::DocumentObject *docObj);
int removeView(App::DocumentObject* docObj);
short mustExecute() const;
boost::signal<void (const DrawPage*)> signalGuiPaint;
boost::signals2::signal<void (const DrawPage*)> signalGuiPaint;
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {

1
src/Mod/TechDraw/App/DrawView.cpp
View File

@@ -357,7 +357,6 @@ bool DrawView::keepUpdated(void)
void DrawView::requestPaint(void)
{
Base::Console().Message("TRACE - DV::requestPaint()\n");
signalGuiPaint(this);
}

4
src/Mod/TechDraw/App/DrawView.h
View File

@@ -23,7 +23,7 @@
#ifndef _DrawView_h_
#define _DrawView_h_
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <QRectF>
@@ -85,7 +85,7 @@ public:
virtual bool checkFit(DrawPage*) const;
virtual void setPosition(double x, double y);
bool keepUpdated(void);
boost::signal<void (const DrawView*)> signalGuiPaint;
boost::signals2::signal<void (const DrawView*)> signalGuiPaint;
virtual double getScale(void) const;
void checkScale(void);
void requestPaint(void);

3
src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp
View File

@@ -25,7 +25,8 @@
#include "PreCompiled.h"
#ifndef _PreComp_
#include <boost/signal.hpp>
#include <boost/signals2.hpp>
#include <boost/signals2/connection.hpp>
#include <boost/bind.hpp>
#endif

4
src/Mod/TechDraw/Gui/ViewProviderDrawingView.h
View File

@@ -25,6 +25,8 @@
#ifndef DRAWINGGUI_VIEWPROVIDERVIEW_H
#define DRAWINGGUI_VIEWPROVIDERVIEW_H
#include <boost/signals2.hpp>
#include <Gui/ViewProviderFeature.h>
#include <Gui/ViewProviderDocumentObjectGroup.h>
@@ -78,7 +80,7 @@ public:
virtual TechDraw::DrawView* getViewObject() const;
void onGuiRepaint(const TechDraw::DrawView* dv);
typedef boost::signals::scoped_connection Connection;
typedef boost::signals2::scoped_connection Connection;
Connection connectGuiRepaint;

3
src/Mod/TechDraw/Gui/ViewProviderPage.cpp
View File

@@ -29,7 +29,8 @@
# include <QMenu>
# include <QTimer>
#include <QPointer>
#include <boost/signal.hpp>
#include <boost/signals2.hpp>
#include <boost/signals2/connection.hpp>
#include <boost/bind.hpp>
#endif

4
src/Mod/TechDraw/Gui/ViewProviderPage.h
View File

@@ -28,6 +28,8 @@
#include <QPointer>
#include <Gui/ViewProviderDocumentObject.h>
#include <boost/signals2.hpp>
namespace TechDraw{
class DrawPage;
}
@@ -72,7 +74,7 @@ public:
TechDraw::DrawPage* getDrawPage() const;
void onGuiRepaint(const TechDraw::DrawPage* dp);
typedef boost::signals::scoped_connection Connection;
typedef boost::signals2::scoped_connection Connection;
Connection connectGuiRepaint;
void unsetEdit(int ModNum);