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

move from deprecated boost.signals to boost.signals2 library

Browse Source
This commit is contained in:
wmayer
2018-10-30 19:09:03 +01:00
parent 3858b179c3
commit f898eafd64
86 changed files with 268 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/Drawing/Gui/TaskOrthoViews.cpp
View File

@@ -641,11 +641,12 @@ void OrthoViews::del_view(int rel_x, int rel_y) // remove a view fro
if (num > 0)
{
connectDocumentDeletedObject.block();
views[num]->deleteme();
delete views[num];
views.erase(views.begin() + num);
connectDocumentDeletedObject.unblock();
{
boost::signals2::shared_connection_block blocker(connectDocumentDeletedObject);
views[num]->deleteme();
delete views[num];
views.erase(views.begin() + num);
}
min_r_x = max_r_x = 0;
min_r_y = max_r_y = 0;
@@ -667,14 +668,13 @@ void OrthoViews::del_view(int rel_x, int rel_y) // remove a view fro
void OrthoViews::del_all()
{
connectDocumentDeletedObject.block();
boost::signals2::shared_connection_block blocker(connectDocumentDeletedObject);
for (int i = views.size() - 1; i >= 0; i--) // count downwards to delete from back
{
views[i]->deleteme();
delete views[i];
views.pop_back();
}
connectDocumentDeletedObject.unblock();
}
int OrthoViews::is_Ortho(int rel_x, int rel_y) // is the view at r_x, r_y an ortho or axo one?

8
src/Mod/Drawing/Gui/TaskOrthoViews.h
View File

@@ -30,9 +30,9 @@
#include <gp_Ax2.hxx>
#include <vector>
#include <boost/signals.hpp>
#include <boost/signals2.hpp>
#include <Mod/Drawing/App/FeatureViewPart.h>
#include <Mod/Drawing/App/FeatureViewPart.h>
@@ -148,8 +148,8 @@ private:
bool hidden, smooth;
bool autodims;
boost::BOOST_SIGNALS_NAMESPACE::scoped_connection connectDocumentDeletedObject;
boost::BOOST_SIGNALS_NAMESPACE::scoped_connection connectApplicationDeletedDocument;
boost::signals2::scoped_connection connectDocumentDeletedObject;
boost::signals2::scoped_connection connectApplicationDeletedDocument;
};