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

9
src/Mod/Part/App/PartFeature.cpp
View File

@@ -53,7 +53,7 @@
#endif
#include <boost/algorithm/string/predicate.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <Base/Console.h>
#include <Base/Writer.h>
#include <Base/Reader.h>
@@ -74,6 +74,7 @@
#include "TopoShapePy.h"
using namespace Part;
namespace bp = boost::placeholders;
FC_LOG_LEVEL_INIT("Part",true,true)
@@ -222,11 +223,11 @@ struct ShapeCache {
return;
inited = true;
App::GetApplication().signalDeleteDocument.connect(
boost::bind(&ShapeCache::slotDeleteDocument, this, _1));
boost::bind(&ShapeCache::slotDeleteDocument, this, bp::_1));
App::GetApplication().signalDeletedObject.connect(
boost::bind(&ShapeCache::slotClear, this, _1));
boost::bind(&ShapeCache::slotClear, this, bp::_1));
App::GetApplication().signalChangedObject.connect(
boost::bind(&ShapeCache::slotChanged, this, _1,_2));
boost::bind(&ShapeCache::slotChanged, this, bp::_1,bp::_2));
}
void slotDeleteDocument(const App::Document &doc) {

2
src/Mod/Part/App/PreCompiled.h
View File

@@ -77,7 +77,7 @@
// Boost
#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/utility.hpp>

5
src/Mod/Part/Gui/CrossSections.cpp
View File

@@ -36,7 +36,7 @@
# include <QFutureWatcher>
# include <QKeyEvent>
# include <QtConcurrentMap>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <Python.h>
# include <Inventor/nodes/SoBaseColor.h>
# include <Inventor/nodes/SoCoordinate3.h>
@@ -61,6 +61,7 @@
#include <Base/UnitsApi.h>
using namespace PartGui;
namespace bp = boost::placeholders;
#undef CS_FUTURE // multi-threading causes some problems
namespace PartGui {
@@ -218,7 +219,7 @@ void CrossSections::apply()
for (std::vector<App::DocumentObject*>::iterator it = obj.begin(); it != obj.end(); ++it) {
Part::CrossSection cs(a,b,c,static_cast<Part::Feature*>(*it)->Shape.getValue());
QFuture< std::list<TopoDS_Wire> > future = QtConcurrent::mapped
(d, boost::bind(&Part::CrossSection::section, &cs, _1));
(d, boost::bind(&Part::CrossSection::section, &cs, bp::_1));
future.waitForFinished();
QFuture< std::list<TopoDS_Wire> >::const_iterator ft;
TopoDS_Compound comp;

7
src/Mod/Part/Gui/DlgBooleanOperation.cpp
View File

@@ -27,7 +27,7 @@
# include <QTreeWidget>
# include <TopoDS_Shape.hxx>
# include <TopExp_Explorer.hxx>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include "DlgBooleanOperation.h"
@@ -47,6 +47,7 @@
#include <Gui/WaitCursor.h>
using namespace PartGui;
namespace bp = boost::placeholders;
namespace PartGui {
class BooleanOperationItem : public QTreeWidgetItem
@@ -89,9 +90,9 @@ DlgBooleanOperation::DlgBooleanOperation(QWidget* parent)
connect(ui->secondShape, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
this, SLOT(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)));
this->connectNewObject = App::GetApplication().signalNewObject.connect(boost::bind
(&DlgBooleanOperation::slotCreatedObject, this, _1));
(&DlgBooleanOperation::slotCreatedObject, this, bp::_1));
this->connectModObject = App::GetApplication().signalChangedObject.connect(boost::bind
(&DlgBooleanOperation::slotChangedObject, this, _1, _2));
(&DlgBooleanOperation::slotChangedObject, this, bp::_1, bp::_2));
findShapes();
}

7
src/Mod/Part/Gui/DlgFilletEdges.cpp
View File

@@ -43,7 +43,7 @@
# include <QItemSelection>
# include <QItemSelectionModel>
# include <QTimer>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <Python.h>
# include <Inventor/actions/SoSearchAction.h>
# include <Inventor/details/SoLineDetail.h>
@@ -75,6 +75,7 @@
#include <Gui/Window.h>
using namespace PartGui;
namespace bp = boost::placeholders;
FilletRadiusDelegate::FilletRadiusDelegate(QObject *parent) : QItemDelegate(parent)
{
@@ -245,9 +246,9 @@ DlgFilletEdges::DlgFilletEdges(FilletType type, Part::FilletBase* fillet, QWidge
d->fillet = fillet;
d->connectApplicationDeletedObject = App::GetApplication().signalDeletedObject
.connect(boost::bind(&DlgFilletEdges::onDeleteObject, this, _1));
.connect(boost::bind(&DlgFilletEdges::onDeleteObject, this, bp::_1));
d->connectApplicationDeletedDocument = App::GetApplication().signalDeleteDocument
.connect(boost::bind(&DlgFilletEdges::onDeleteDocument, this, _1));
.connect(boost::bind(&DlgFilletEdges::onDeleteDocument, this, bp::_1));
// set tree view with three columns
QStandardItemModel* model = new FilletRadiusModel(this);
connect(model, SIGNAL(toggleCheckState(const QModelIndex&)),

1
src/Mod/Part/Gui/Mirroring.cpp
View File

@@ -28,7 +28,6 @@
# include <QTreeWidget>
# include <TopoDS_Shape.hxx>
# include <TopExp_Explorer.hxx>
# include <boost/bind.hpp>
# include <cfloat>
# include <Python.h>
# include <Inventor/system/inttypes.h>

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

@@ -176,7 +176,7 @@
// Boost
#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
// Qt Toolkit
#ifndef __Qt4All__

7
src/Mod/Part/Gui/TaskAttacher.cpp
View File

@@ -31,7 +31,7 @@
# include <QMessageBox>
# include <Precision.hxx>
# include <Standard_Failure.hxx>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include <Base/Console.h>
@@ -62,6 +62,7 @@
using namespace PartGui;
using namespace Gui;
using namespace Attacher;
namespace bp = boost::placeholders;
/* TRANSLATOR PartDesignGui::TaskAttacher */
@@ -217,8 +218,8 @@ TaskAttacher::TaskAttacher(Gui::ViewProviderDocumentObject *ViewProvider, QWidge
updatePreview();
// connect object deletion with slot
auto bnd1 = boost::bind(&TaskAttacher::objectDeleted, this, _1);
auto bnd2 = boost::bind(&TaskAttacher::documentDeleted, this, _1);
auto bnd1 = boost::bind(&TaskAttacher::objectDeleted, this, bp::_1);
auto bnd2 = boost::bind(&TaskAttacher::documentDeleted, this, bp::_1);
Gui::Document* document = Gui::Application::Instance->getDocument(ViewProvider->getObject()->getDocument());
connectDelObject = document->signalDeletedObject.connect(bnd1);
connectDelDocument = document->signalDeleteDocument.connect(bnd2);

6
src/Mod/Part/Gui/TaskDimension.cpp
View File

@@ -27,7 +27,7 @@
# include <QPushButton>
# include <sstream>
# include <Python.h>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <TopoDS_Shape.hxx>
# include <TopoDS_Vertex.hxx>
@@ -79,6 +79,8 @@
#include "TaskDimension.h"
namespace bp = boost::placeholders;
static bool _MeasureInfoInited;
static void slotDeleteDocument(const App::Document &doc);
@@ -92,7 +94,7 @@ struct MeasureInfo {
{
if(!_MeasureInfoInited) {
_MeasureInfoInited = true;
App::GetApplication().signalDeleteDocument.connect(boost::bind(slotDeleteDocument, _1));
App::GetApplication().signalDeleteDocument.connect(boost::bind(slotDeleteDocument, bp::_1));
}
}
};

9
src/Mod/Part/Gui/TaskFaceColors.cpp
View File

@@ -44,7 +44,7 @@
# include <Inventor/nodes/SoCamera.h>
# include <Inventor/nodes/SoSeparator.h>
# include <boost/signals2.hpp>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include "ui_TaskFaceColors.h"
@@ -68,6 +68,7 @@
using namespace PartGui;
namespace bp = boost::placeholders;
namespace PartGui {
class FaceSelection : public Gui::SelectionFilterGate
@@ -274,11 +275,11 @@ FaceColors::FaceColors(ViewProviderPartExt* vp, QWidget* parent)
Gui::Selection().addSelectionGate(gate);
d->connectDelDoc = Gui::Application::Instance->signalDeleteDocument.connect(boost::bind
(&FaceColors::slotDeleteDocument, this, _1));
(&FaceColors::slotDeleteDocument, this, bp::_1));
d->connectDelObj = Gui::Application::Instance->signalDeletedObject.connect(boost::bind
(&FaceColors::slotDeleteObject, this, _1));
(&FaceColors::slotDeleteObject, this, bp::_1));
d->connectUndoDoc = d->doc->signalUndoDocument.connect(boost::bind
(&FaceColors::slotUndoDocument, this, _1));
(&FaceColors::slotUndoDocument, this, bp::_1));
}
FaceColors::~FaceColors()

5
src/Mod/Part/Gui/ViewProviderSpline.cpp
View File

@@ -45,7 +45,7 @@
# include <Inventor/nodes/SoSwitch.h>
# include <QAction>
# include <QMenu>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include <App/PropertyStandard.h>
@@ -56,6 +56,7 @@
using namespace PartGui;
namespace bp = boost::placeholders;
PROPERTY_SOURCE(PartGui::ViewProviderSpline, PartGui::ViewProviderPartExt)
@@ -79,7 +80,7 @@ void ViewProviderSpline::setupContextMenu(QMenu* menu, QObject* receiver, const
QAction* act = menu->addAction(QObject::tr("Show control points"));
act->setCheckable(true);
act->setChecked(ControlPoints.getValue());
func->toggle(act, boost::bind(&ViewProviderSpline::toggleControlPoints, this, _1));
func->toggle(act, boost::bind(&ViewProviderSpline::toggleControlPoints, this, bp::_1));
}
void ViewProviderSpline::toggleControlPoints(bool on)