From e4debdcfcea561af2e5b6e82770b54aa1900b43f Mon Sep 17 00:00:00 2001 From: wandererfan Date: Thu, 10 May 2018 12:00:13 -0400 Subject: [PATCH] Convert deprecated boost::signal to signals2 --- src/Mod/TechDraw/App/DrawPage.h | 4 ++-- src/Mod/TechDraw/App/DrawView.cpp | 1 - src/Mod/TechDraw/App/DrawView.h | 4 ++-- src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp | 3 ++- src/Mod/TechDraw/Gui/ViewProviderDrawingView.h | 4 +++- src/Mod/TechDraw/Gui/ViewProviderPage.cpp | 3 ++- src/Mod/TechDraw/Gui/ViewProviderPage.h | 4 +++- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawPage.h b/src/Mod/TechDraw/App/DrawPage.h index ff695915ee..33f0420dc1 100644 --- a/src/Mod/TechDraw/App/DrawPage.h +++ b/src/Mod/TechDraw/App/DrawPage.h @@ -24,7 +24,7 @@ #ifndef _DrawPage_h_ #define _DrawPage_h_ -#include +#include #include #include @@ -59,7 +59,7 @@ public: int addView(App::DocumentObject *docObj); int removeView(App::DocumentObject* docObj); short mustExecute() const; - boost::signal signalGuiPaint; + boost::signals2::signal signalGuiPaint; /// returns the type name of the ViewProvider virtual const char* getViewProviderName(void) const { diff --git a/src/Mod/TechDraw/App/DrawView.cpp b/src/Mod/TechDraw/App/DrawView.cpp index 85ff7cae6e..eef4736df7 100644 --- a/src/Mod/TechDraw/App/DrawView.cpp +++ b/src/Mod/TechDraw/App/DrawView.cpp @@ -357,7 +357,6 @@ bool DrawView::keepUpdated(void) void DrawView::requestPaint(void) { - Base::Console().Message("TRACE - DV::requestPaint()\n"); signalGuiPaint(this); } diff --git a/src/Mod/TechDraw/App/DrawView.h b/src/Mod/TechDraw/App/DrawView.h index dde8baa358..3f09a015f3 100644 --- a/src/Mod/TechDraw/App/DrawView.h +++ b/src/Mod/TechDraw/App/DrawView.h @@ -23,7 +23,7 @@ #ifndef _DrawView_h_ #define _DrawView_h_ -#include +#include #include @@ -85,7 +85,7 @@ public: virtual bool checkFit(DrawPage*) const; virtual void setPosition(double x, double y); bool keepUpdated(void); - boost::signal signalGuiPaint; + boost::signals2::signal signalGuiPaint; virtual double getScale(void) const; void checkScale(void); void requestPaint(void); diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp index 1175c1aff8..32fe47afe8 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp @@ -25,7 +25,8 @@ #include "PreCompiled.h" #ifndef _PreComp_ -#include +#include +#include #include #endif diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h index 679fc84135..31970b4a67 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h @@ -25,6 +25,8 @@ #ifndef DRAWINGGUI_VIEWPROVIDERVIEW_H #define DRAWINGGUI_VIEWPROVIDERVIEW_H +#include + #include #include @@ -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; diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp index adeafd7669..e9273d57fc 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp @@ -29,7 +29,8 @@ # include # include #include -#include +#include +#include #include #endif diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.h b/src/Mod/TechDraw/Gui/ViewProviderPage.h index e24f55073a..4f900cf0f2 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.h +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.h @@ -28,6 +28,8 @@ #include #include +#include + 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);