boost 1.73.0: The practice of declaring the Bind placeholders (_1, _2, ...) in the global namespace is deprecated
This commit is contained in:
@@ -25,7 +25,6 @@
|
||||
#define SANDBOX_DOCUMENTPROTECTOR_H
|
||||
|
||||
#include <string>
|
||||
#include <boost/bind.hpp>
|
||||
#include <App/DocumentObserver.h>
|
||||
|
||||
namespace App {
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
# if BOOST_VERSION >= 104100
|
||||
# include <boost/thread/future.hpp>
|
||||
# endif
|
||||
# include <boost/bind.hpp>
|
||||
# include <boost/bind/bind.hpp>
|
||||
# include <boost/shared_ptr.hpp>
|
||||
#endif
|
||||
|
||||
@@ -81,6 +81,8 @@
|
||||
#include "GLGraphicsView.h"
|
||||
#include "TaskPanelView.h"
|
||||
|
||||
namespace bp = boost::placeholders;
|
||||
|
||||
DEF_STD_CMD(CmdSandboxDocumentThread);
|
||||
|
||||
CmdSandboxDocumentThread::CmdSandboxDocumentThread()
|
||||
@@ -829,7 +831,7 @@ void CmdSandboxMeshTestJob::activated(int)
|
||||
Base::Console().Message("Mesh test (step %d)...\n",iteration++);
|
||||
MeshTestJob meshJob;
|
||||
QFuture<Mesh::MeshObject*> mesh_future = QtConcurrent::mapped
|
||||
(mesh_groups, boost::bind(&MeshTestJob::run, &meshJob, _1));
|
||||
(mesh_groups, boost::bind(&MeshTestJob::run, &meshJob, bp::_1));
|
||||
|
||||
// keep it responsive during computation
|
||||
QFutureWatcher<Mesh::MeshObject*> mesh_watcher;
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
/// Here the FreeCAD includes sorted by Base,App,Gui......
|
||||
|
||||
#include <boost/bind.hpp>
|
||||
#include <boost/bind/bind.hpp>
|
||||
#include <QVariant>
|
||||
#include <QAction>
|
||||
#include <QApplication>
|
||||
@@ -55,6 +55,7 @@
|
||||
|
||||
|
||||
using namespace SandboxGui;
|
||||
namespace bp = boost::placeholders;
|
||||
|
||||
|
||||
#if defined(QSINT_ACTIONPANEL)
|
||||
@@ -557,27 +558,27 @@ TaskPanelView::TaskPanelView(QWidget *parent)
|
||||
|
||||
QAction* defaultAction = new QAction(this);
|
||||
connect(ui->rbDefaultScheme, SIGNAL(toggled(bool)), defaultAction, SIGNAL(toggled(bool)));
|
||||
func->toggle(defaultAction, boost::bind(&TaskPanelView::on_rbDefaultScheme_toggled, this, _1));
|
||||
func->toggle(defaultAction, boost::bind(&TaskPanelView::on_rbDefaultScheme_toggled, this, bp::_1));
|
||||
|
||||
QAction* xpBlueAction = new QAction(this);
|
||||
connect(ui->rbXPBlueScheme, SIGNAL(toggled(bool)), xpBlueAction, SIGNAL(toggled(bool)));
|
||||
func->toggle(xpBlueAction, boost::bind(&TaskPanelView::on_rbXPBlueScheme_toggled, this, _1));
|
||||
func->toggle(xpBlueAction, boost::bind(&TaskPanelView::on_rbXPBlueScheme_toggled, this, bp::_1));
|
||||
|
||||
QAction* xpBlue2Action = new QAction(this);
|
||||
connect(ui->rbXPBlue2Scheme, SIGNAL(toggled(bool)), xpBlue2Action, SIGNAL(toggled(bool)));
|
||||
func->toggle(xpBlue2Action, boost::bind(&TaskPanelView::on_rbXPBlue2Scheme_toggled, this, _1));
|
||||
func->toggle(xpBlue2Action, boost::bind(&TaskPanelView::on_rbXPBlue2Scheme_toggled, this, bp::_1));
|
||||
|
||||
QAction* vistaAction = new QAction(this);
|
||||
connect(ui->rbVistaScheme, SIGNAL(toggled(bool)), vistaAction, SIGNAL(toggled(bool)));
|
||||
func->toggle(vistaAction, boost::bind(&TaskPanelView::on_rbVistaScheme_toggled, this, _1));
|
||||
func->toggle(vistaAction, boost::bind(&TaskPanelView::on_rbVistaScheme_toggled, this, bp::_1));
|
||||
|
||||
QAction* macAction = new QAction(this);
|
||||
connect(ui->rbMacScheme, SIGNAL(toggled(bool)), macAction, SIGNAL(toggled(bool)));
|
||||
func->toggle(macAction, boost::bind(&TaskPanelView::on_rbMacScheme_toggled, this, _1));
|
||||
func->toggle(macAction, boost::bind(&TaskPanelView::on_rbMacScheme_toggled, this, bp::_1));
|
||||
|
||||
QAction* androidAction = new QAction(this);
|
||||
connect(ui->rbAndroidScheme, SIGNAL(toggled(bool)), androidAction, SIGNAL(toggled(bool)));
|
||||
func->toggle(androidAction, boost::bind(&TaskPanelView::on_rbAndroidScheme_toggled, this, _1));
|
||||
func->toggle(androidAction, boost::bind(&TaskPanelView::on_rbAndroidScheme_toggled, this, bp::_1));
|
||||
}
|
||||
#else
|
||||
setWindowTitle(QLatin1String("Task View"));
|
||||
|
||||
Reference in New Issue
Block a user