Adrian Schröter
58dd0de9bb
- Add support for Boost::Signals2, Boost::Signals has been deprecated since Boost 1.54 and removed in 1.69: * 0001-Convert-deprecated-boost-signal-to-signals2.patch * 0002-move-from-deprecated-boost.signals-to-boost.signals2.patch * 0003-fix-blocking-of-SelectionObserver.patch - Add explicit double-conversion-devel BuildRequires OBS-URL: https://build.opensuse.org/request/show/685411 OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=70
134 lines
4.5 KiB
Diff
134 lines
4.5 KiB
Diff
From ca29d09d51f20d147c5377e66207a1c959698afd Mon Sep 17 00:00:00 2001
|
|
From: wandererfan <wandererfan@gmail.com>
|
|
Date: Thu, 10 May 2018 12:00:13 -0400
|
|
Subject: [PATCH 1/3] Convert deprecated boost::signal to signals2
|
|
|
|
---
|
|
src/Mod/TechDraw/App/DrawPage.h | 4 ++--
|
|
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 +++-
|
|
6 files changed, 14 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/src/Mod/TechDraw/App/DrawPage.h b/src/Mod/TechDraw/App/DrawPage.h
|
|
index 60df838b8..cfde590d0 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 <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 {
|
|
diff --git a/src/Mod/TechDraw/App/DrawView.h b/src/Mod/TechDraw/App/DrawView.h
|
|
index dde8baa35..3f09a015f 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 <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);
|
|
diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp
|
|
index 1175c1aff..32fe47afe 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 <boost/signal.hpp>
|
|
+#include <boost/signals2.hpp>
|
|
+#include <boost/signals2/connection.hpp>
|
|
#include <boost/bind.hpp>
|
|
|
|
#endif
|
|
diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h
|
|
index 679fc8413..31970b4a6 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 <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;
|
|
|
|
|
|
diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp
|
|
index fd5903bc1..245e39a9b 100644
|
|
--- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp
|
|
+++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp
|
|
@@ -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
|
|
diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.h b/src/Mod/TechDraw/Gui/ViewProviderPage.h
|
|
index e12be67fb..73e41bdc7 100644
|
|
--- a/src/Mod/TechDraw/Gui/ViewProviderPage.h
|
|
+++ b/src/Mod/TechDraw/Gui/ViewProviderPage.h
|
|
@@ -30,6 +30,8 @@
|
|
#include <Gui/ViewProviderDocumentObjectGroup.h>
|
|
#include <Gui/Selection.h>
|
|
|
|
+#include <boost/signals2.hpp>
|
|
+
|
|
namespace TechDraw{
|
|
class DrawPage;
|
|
}
|
|
@@ -81,7 +83,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);
|
|
--
|
|
2.21.0
|
|
|