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

boost 1.73.0: The practice of declaring the Bind placeholders (_1, _2, ...) in the global namespace is deprecated

Browse Source
This commit is contained in:
wmayer
2020-06-09 12:55:29 +02:00
committed by wwmayer
parent 3f212ad8ac
commit 4ec45b545e
112 changed files with 451 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Mod/PartDesign/App/Body.cpp
View File

@@ -24,7 +24,6 @@
#include "PreCompiled.h"
#ifndef _PreComp_
#include <boost/bind.hpp>
#endif
#include <Base/Console.h>

7
src/Mod/PartDesign/App/ShapeBinder.cpp
View File

@@ -24,7 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <cfloat>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <gp_Lin.hxx>
# include <gp_Pln.hxx>
# include <BRep_Builder.hxx>
@@ -51,6 +51,7 @@ FC_LOG_LEVEL_INIT("PartDesign",true,true)
#endif
using namespace PartDesign;
namespace bp = boost::placeholders;
// ============================================================================
@@ -229,7 +230,7 @@ void ShapeBinder::onSettingDocument()
App::Document* document = getDocument();
if (document) {
this->connectDocumentChangedObject = document->signalChangedObject.connect(boost::bind
(&ShapeBinder::slotChangedObject, this, _1, _2));
(&ShapeBinder::slotChangedObject, this, bp::_1, bp::_2));
}
}
@@ -608,7 +609,7 @@ void SubShapeBinder::onChanged(const App::Property *prop) {
{
contextDoc = Context.getValue()->getDocument();
connRecomputedObj = contextDoc->signalRecomputedObject.connect(
boost::bind(&SubShapeBinder::slotRecomputedObject, this, _1));
boost::bind(&SubShapeBinder::slotRecomputedObject, this, bp::_1));
}
}else if(!isRestoring()) {
if(prop == &Support) {

2
src/Mod/PartDesign/Gui/PreCompiled.h
View File

@@ -62,7 +62,7 @@
#include <algorithm>
// Boost
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
// OCC
#include <Standard_math.hxx>

1
src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
View File

@@ -31,7 +31,6 @@
# include <QMessageBox>
# include <Precision.hxx>
# include <Standard_Failure.hxx>
# include <boost/bind.hpp>
#endif
#include <Base/Console.h>

5
src/Mod/PartDesign/Gui/TaskHoleParameters.cpp
View File

@@ -25,7 +25,7 @@
#ifndef _PreComp_
# include <QMessageBox>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include "ui_TaskHoleParameters.h"
@@ -43,6 +43,7 @@
using namespace PartDesignGui;
using namespace Gui;
namespace bp = boost::placeholders;
/* TRANSLATOR PartDesignGui::TaskHoleParameters */
@@ -118,7 +119,7 @@ TaskHoleParameters::TaskHoleParameters(ViewProviderHole *HoleView, QWidget *pare
ui->TaperedAngle->bind(pcHole->TaperedAngle);
connectPropChanged = App::GetApplication().signalChangePropertyEditor.connect(
boost::bind(&TaskHoleParameters::changedObject, this, _1, _2));
boost::bind(&TaskHoleParameters::changedObject, this, bp::_1, bp::_2));
this->groupLayout()->addWidget(proxy);
}

2
src/Mod/PartDesign/Gui/TaskHoleParameters.h
View File

@@ -28,7 +28,7 @@
#include <Gui/Selection.h>
#include <Gui/TaskView/TaskDialog.h>
#include <App/DocumentObserver.h>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include "TaskSketchBasedParameters.h"
#include "ViewProviderHole.h"

2
src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
View File

@@ -29,8 +29,6 @@
# include <QTextStream>
# include <QMessageBox>
# include <Precision.hxx>
# include <boost/bind/bind.hpp>
# include <boost/bind.hpp>
#endif
#include "TaskPrimitiveParameters.h"

5
src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp
View File

@@ -24,7 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include "ui_TaskTransformedMessages.h"
@@ -37,6 +37,7 @@
using namespace PartDesignGui;
using namespace Gui::TaskView;
namespace bp = boost::placeholders;
TaskTransformedMessages::TaskTransformedMessages(ViewProviderTransformed *transformedView_)
: TaskBox(Gui::BitmapFactory().pixmap("document-new"),tr("Transformed feature messages"),true, 0),
@@ -54,7 +55,7 @@ TaskTransformedMessages::TaskTransformedMessages(ViewProviderTransformed *transf
this->groupLayout()->addWidget(proxy);
ui->labelTransformationStatus->setText(transformedView->getMessage());
connectionDiagnosis = transformedView->signalDiagnosis.connect(boost::bind(&PartDesignGui::TaskTransformedMessages::slotDiagnosis, this,_1));
connectionDiagnosis = transformedView->signalDiagnosis.connect(boost::bind(&PartDesignGui::TaskTransformedMessages::slotDiagnosis, this, bp::_1));
}
TaskTransformedMessages::~TaskTransformedMessages()

7
src/Mod/PartDesign/Gui/ViewProviderBody.cpp
View File

@@ -24,7 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <Inventor/nodes/SoSeparator.h>
# include <Inventor/actions/SoGetBoundingBoxAction.h>
# include <Precision.hxx>
@@ -60,6 +60,7 @@
#include <Gui/MDIView.h>
using namespace PartDesignGui;
namespace bp = boost::placeholders;
const char* PartDesignGui::ViewProviderBody::BodyModeEnum[] = {"Through","Tip",NULL};
@@ -96,10 +97,10 @@ void ViewProviderBody::attach(App::DocumentObject *pcFeat)
assert ( gdoc );
connectChangedObjectApp = adoc->signalChangedObject.connect (
boost::bind ( &ViewProviderBody::slotChangedObjectApp, this, _1, _2) );
boost::bind ( &ViewProviderBody::slotChangedObjectApp, this, bp::_1, bp::_2) );
connectChangedObjectGui = gdoc->signalChangedObject.connect (
boost::bind ( &ViewProviderBody::slotChangedObjectGui, this, _1, _2) );
boost::bind ( &ViewProviderBody::slotChangedObjectGui, this, bp::_1, bp::_2) );
}
// TODO on activating the body switch to the "Through" mode (2015-09-05, Fat-Zer)

23
src/Mod/PartDesign/Gui/Workbench.cpp
View File

@@ -24,7 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <QMessageBox>
#endif
@@ -46,6 +46,7 @@
#include "WorkflowManager.h"
using namespace PartDesignGui;
namespace bp = boost::placeholders;
#if 0 // needed for Qt's lupdate utility
qApp->translate("Workbench", "Part Design");
@@ -433,22 +434,22 @@ void Workbench::activated()
Gui::Control().showTaskView();
// Let us be notified when a document is activated, so that we can update the ActivePartObject
Gui::Application::Instance->signalActiveDocument.connect(boost::bind(&Workbench::slotActiveDocument, this, _1));
App::GetApplication().signalNewDocument.connect(boost::bind(&Workbench::slotNewDocument, this, _1));
App::GetApplication().signalFinishRestoreDocument.connect(boost::bind(&Workbench::slotFinishRestoreDocument, this, _1));
App::GetApplication().signalDeleteDocument.connect(boost::bind(&Workbench::slotDeleteDocument, this, _1));
Gui::Application::Instance->signalActiveDocument.connect(boost::bind(&Workbench::slotActiveDocument, this, bp::_1));
App::GetApplication().signalNewDocument.connect(boost::bind(&Workbench::slotNewDocument, this, bp::_1));
App::GetApplication().signalFinishRestoreDocument.connect(boost::bind(&Workbench::slotFinishRestoreDocument, this, bp::_1));
App::GetApplication().signalDeleteDocument.connect(boost::bind(&Workbench::slotDeleteDocument, this, bp::_1));
// Watch out for objects being added to the active document, so that we can add them to the body
//App::GetApplication().signalNewObject.connect(boost::bind(&Workbench::slotNewObject, this, _1));
//App::GetApplication().signalNewObject.connect(boost::bind(&Workbench::slotNewObject, this, bp::_1));
}
void Workbench::deactivated()
{
// Let us be notified when a document is activated, so that we can update the ActivePartObject
Gui::Application::Instance->signalActiveDocument.disconnect(boost::bind(&Workbench::slotActiveDocument, this, _1));
App::GetApplication().signalNewDocument.disconnect(boost::bind(&Workbench::slotNewDocument, this, _1));
App::GetApplication().signalFinishRestoreDocument.disconnect(boost::bind(&Workbench::slotFinishRestoreDocument, this, _1));
App::GetApplication().signalDeleteDocument.disconnect(boost::bind(&Workbench::slotDeleteDocument, this, _1));
//App::GetApplication().signalNewObject.disconnect(boost::bind(&Workbench::slotNewObject, this, _1));
Gui::Application::Instance->signalActiveDocument.disconnect(boost::bind(&Workbench::slotActiveDocument, this, bp::_1));
App::GetApplication().signalNewDocument.disconnect(boost::bind(&Workbench::slotNewDocument, this, bp::_1));
App::GetApplication().signalFinishRestoreDocument.disconnect(boost::bind(&Workbench::slotFinishRestoreDocument, this, bp::_1));
App::GetApplication().signalDeleteDocument.disconnect(boost::bind(&Workbench::slotDeleteDocument, this, bp::_1));
//App::GetApplication().signalNewObject.disconnect(boost::bind(&Workbench::slotNewObject, this, bp::_1));
removeTaskWatcher();
// reset the active Body

9
src/Mod/PartDesign/Gui/WorkflowManager.cpp
View File

@@ -26,7 +26,7 @@
# include <vector>
# include <list>
# include <set>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <QMessageBox>
# include <QPushButton>
#endif
@@ -43,6 +43,7 @@
using namespace PartDesignGui;
namespace bp = boost::placeholders;
WorkflowManager * WorkflowManager::_instance = nullptr;
@@ -55,11 +56,11 @@ WorkflowManager::WorkflowManager() {
}
connectNewDocument = App::GetApplication().signalNewDocument.connect(
boost::bind( &WorkflowManager::slotNewDocument, this, _1 ) );
boost::bind( &WorkflowManager::slotNewDocument, this, bp::_1 ) );
connectFinishRestoreDocument = App::GetApplication().signalFinishRestoreDocument.connect(
boost::bind( &WorkflowManager::slotFinishRestoreDocument, this, _1 ) );
boost::bind( &WorkflowManager::slotFinishRestoreDocument, this, bp::_1 ) );
connectDeleteDocument = App::GetApplication().signalDeleteDocument.connect(
boost::bind( &WorkflowManager::slotDeleteDocument, this, _1 ) );
boost::bind( &WorkflowManager::slotDeleteDocument, this, bp::_1 ) );
}
WorkflowManager::~WorkflowManager() {