electron-rare/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 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-12 17:51:33 +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
src/3rdParty/salomesmesh/src/SMESH/SMESH_Mesh.cpp
Vendored
+2 -2
View File
@@ -76,10 +76,10 @@
#ifndef WIN32
#include <boost/thread/thread.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#else
#include <boost/thread/thread.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
//#include <pthread.h>
#endif
src/App/Application.cpp
+21 -20
View File
@@ -122,7 +122,7 @@
#include <boost/tokenizer.hpp>
#include <boost/token_functions.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <boost/version.hpp>
#include <QDir>
#include <QFileInfo>
@@ -131,6 +131,7 @@ using namespace App;
using namespace std;
using namespace boost;
using namespace boost::program_options;
namespace bp = boost::placeholders;
// scriptings (scripts are built-in but can be overridden by command line option)
@@ -413,26 +414,26 @@ Document* Application::newDocument(const char * Name, const char * UserName, boo
// connect the signals to the application for the new document
_pActiveDoc->signalBeforeChange.connect(boost::bind(&App::Application::slotBeforeChangeDocument, this, _1, _2));
_pActiveDoc->signalChanged.connect(boost::bind(&App::Application::slotChangedDocument, this, _1, _2));
_pActiveDoc->signalNewObject.connect(boost::bind(&App::Application::slotNewObject, this, _1));
_pActiveDoc->signalDeletedObject.connect(boost::bind(&App::Application::slotDeletedObject, this, _1));
_pActiveDoc->signalBeforeChangeObject.connect(boost::bind(&App::Application::slotBeforeChangeObject, this, _1, _2));
_pActiveDoc->signalChangedObject.connect(boost::bind(&App::Application::slotChangedObject, this, _1, _2));
_pActiveDoc->signalRelabelObject.connect(boost::bind(&App::Application::slotRelabelObject, this, _1));
_pActiveDoc->signalActivatedObject.connect(boost::bind(&App::Application::slotActivatedObject, this, _1));
_pActiveDoc->signalUndo.connect(boost::bind(&App::Application::slotUndoDocument, this, _1));
_pActiveDoc->signalRedo.connect(boost::bind(&App::Application::slotRedoDocument, this, _1));
_pActiveDoc->signalRecomputedObject.connect(boost::bind(&App::Application::slotRecomputedObject, this, _1));
_pActiveDoc->signalRecomputed.connect(boost::bind(&App::Application::slotRecomputed, this, _1));
_pActiveDoc->signalBeforeRecompute.connect(boost::bind(&App::Application::slotBeforeRecompute, this, _1));
_pActiveDoc->signalOpenTransaction.connect(boost::bind(&App::Application::slotOpenTransaction, this, _1, _2));
_pActiveDoc->signalCommitTransaction.connect(boost::bind(&App::Application::slotCommitTransaction, this, _1));
_pActiveDoc->signalAbortTransaction.connect(boost::bind(&App::Application::slotAbortTransaction, this, _1));
_pActiveDoc->signalStartSave.connect(boost::bind(&App::Application::slotStartSaveDocument, this, _1, _2));
_pActiveDoc->signalFinishSave.connect(boost::bind(&App::Application::slotFinishSaveDocument, this, _1, _2));
_pActiveDoc->signalBeforeChange.connect(boost::bind(&App::Application::slotBeforeChangeDocument, this, bp::_1, bp::_2));
_pActiveDoc->signalChanged.connect(boost::bind(&App::Application::slotChangedDocument, this, bp::_1, bp::_2));
_pActiveDoc->signalNewObject.connect(boost::bind(&App::Application::slotNewObject, this, bp::_1));
_pActiveDoc->signalDeletedObject.connect(boost::bind(&App::Application::slotDeletedObject, this, bp::_1));
_pActiveDoc->signalBeforeChangeObject.connect(boost::bind(&App::Application::slotBeforeChangeObject, this, bp::_1, bp::_2));
_pActiveDoc->signalChangedObject.connect(boost::bind(&App::Application::slotChangedObject, this, bp::_1, bp::_2));
_pActiveDoc->signalRelabelObject.connect(boost::bind(&App::Application::slotRelabelObject, this, bp::_1));
_pActiveDoc->signalActivatedObject.connect(boost::bind(&App::Application::slotActivatedObject, this, bp::_1));
_pActiveDoc->signalUndo.connect(boost::bind(&App::Application::slotUndoDocument, this, bp::_1));
_pActiveDoc->signalRedo.connect(boost::bind(&App::Application::slotRedoDocument, this, bp::_1));
_pActiveDoc->signalRecomputedObject.connect(boost::bind(&App::Application::slotRecomputedObject, this, bp::_1));
_pActiveDoc->signalRecomputed.connect(boost::bind(&App::Application::slotRecomputed, this, bp::_1));
_pActiveDoc->signalBeforeRecompute.connect(boost::bind(&App::Application::slotBeforeRecompute, this, bp::_1));
_pActiveDoc->signalOpenTransaction.connect(boost::bind(&App::Application::slotOpenTransaction, this, bp::_1, bp::_2));
_pActiveDoc->signalCommitTransaction.connect(boost::bind(&App::Application::slotCommitTransaction, this, bp::_1));
_pActiveDoc->signalAbortTransaction.connect(boost::bind(&App::Application::slotAbortTransaction, this, bp::_1));
_pActiveDoc->signalStartSave.connect(boost::bind(&App::Application::slotStartSaveDocument, this, bp::_1, bp::_2));
_pActiveDoc->signalFinishSave.connect(boost::bind(&App::Application::slotFinishSaveDocument, this, bp::_1, bp::_2));
_pActiveDoc->signalChangePropertyEditor.connect(
boost::bind(&App::Application::slotChangePropertyEditor, this, _1, _2));
boost::bind(&App::Application::slotChangePropertyEditor, this, bp::_1, bp::_2));
// make sure that the active document is set in case no GUI is up
{
src/App/Document.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ recompute path. Also, it enables more complicated dependencies beyond trees.
#include <boost/graph/visitors.hpp>
#endif //USE_OLD_DAG
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <boost/regex.hpp>
#include <unordered_set>
#include <unordered_map>
src/App/DocumentObject.cpp
+1 -1
View File
@@ -42,7 +42,7 @@
#include "DocumentObjectExtension.h"
#include "GeoFeatureGroupExtension.h"
#include <App/DocumentObjectPy.h>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
FC_LOG_LEVEL_INIT("App",true,true)
src/App/DocumentObserver.cpp
+15 -14
View File
@@ -27,7 +27,7 @@
# include <sstream>
#endif
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <Base/Tools.h>
#include "Application.h"
@@ -38,6 +38,7 @@
#include "GeoFeature.h"
using namespace App;
namespace bp = boost::placeholders;
DocumentT::DocumentT()
@@ -400,7 +401,7 @@ public:
Private(App::Document* doc) : _document(doc) {
if (doc) {
connectApplicationDeletedDocument = App::GetApplication().signalDeleteDocument.connect(boost::bind
(&Private::deletedDocument, this, _1));
(&Private::deletedDocument, this, bp::_1));
}
}
@@ -478,12 +479,12 @@ public:
if (obj) {
indocument = true;
connectApplicationDeletedDocument = App::GetApplication().signalDeleteDocument.connect(boost::bind
(&Private::deletedDocument, this, _1));
(&Private::deletedDocument, this, bp::_1));
App::Document* doc = obj->getDocument();
connectDocumentCreatedObject = doc->signalNewObject.connect(boost::bind
(&Private::createdObject, this, _1));
(&Private::createdObject, this, bp::_1));
connectDocumentDeletedObject = doc->signalDeletedObject.connect(boost::bind
(&Private::deletedObject, this, _1));
(&Private::deletedObject, this, bp::_1));
}
}
App::DocumentObject* get() const noexcept {
@@ -550,18 +551,18 @@ bool DocumentObjectWeakPtrT::operator!= (const DocumentObjectWeakPtrT& p) const
DocumentObserver::DocumentObserver() : _document(nullptr)
{
this->connectApplicationCreatedDocument = App::GetApplication().signalNewDocument.connect(boost::bind
(&DocumentObserver::slotCreatedDocument, this, _1));
(&DocumentObserver::slotCreatedDocument, this, bp::_1));
this->connectApplicationDeletedDocument = App::GetApplication().signalDeleteDocument.connect(boost::bind
(&DocumentObserver::slotDeletedDocument, this, _1));
(&DocumentObserver::slotDeletedDocument, this, bp::_1));
}
DocumentObserver::DocumentObserver(Document* doc) : _document(nullptr)
{
// Connect to application and given document
this->connectApplicationCreatedDocument = App::GetApplication().signalNewDocument.connect(boost::bind
(&DocumentObserver::slotCreatedDocument, this, _1));
(&DocumentObserver::slotCreatedDocument, this, bp::_1));
this->connectApplicationDeletedDocument = App::GetApplication().signalDeleteDocument.connect(boost::bind
(&DocumentObserver::slotDeletedDocument, this, _1));
(&DocumentObserver::slotDeletedDocument, this, bp::_1));
attachDocument(doc);
}
@@ -585,15 +586,15 @@ void DocumentObserver::attachDocument(Document* doc)
_document = doc;
this->connectDocumentCreatedObject = _document->signalNewObject.connect(boost::bind
(&DocumentObserver::slotCreatedObject, this, _1));
(&DocumentObserver::slotCreatedObject, this, bp::_1));
this->connectDocumentDeletedObject = _document->signalDeletedObject.connect(boost::bind
(&DocumentObserver::slotDeletedObject, this, _1));
(&DocumentObserver::slotDeletedObject, this, bp::_1));
this->connectDocumentChangedObject = _document->signalChangedObject.connect(boost::bind
(&DocumentObserver::slotChangedObject, this, _1, _2));
(&DocumentObserver::slotChangedObject, this, bp::_1, bp::_2));
this->connectDocumentRecomputedObject = _document->signalRecomputedObject.connect(boost::bind
(&DocumentObserver::slotRecomputedObject, this, _1));
(&DocumentObserver::slotRecomputedObject, this, bp::_1));
this->connectDocumentRecomputed = _document->signalRecomputed.connect(boost::bind
(&DocumentObserver::slotRecomputedDocument, this, _1));
(&DocumentObserver::slotRecomputedDocument, this, bp::_1));
}
}
src/App/DocumentObserverPython.cpp
+3 -2
View File
@@ -34,6 +34,7 @@
#include <Base/Console.h>
using namespace App;
namespace bp = boost::placeholders;
std::vector<DocumentObserverPython*> DocumentObserverPython::_instances;
@@ -72,7 +73,7 @@ DocumentObserverPython::DocumentObserverPython(const Py::Object& obj) : inst(obj
FC_PY_GetCallable(obj.ptr(), "slot" #_name1, py##_name1.py);\
if (!py##_name1.py.isNone())\
py##_name1.slot = App::GetApplication().signal##_name2.connect(\
boost::bind(&DocumentObserverPython::slot##_name1, this, _1));\
boost::bind(&DocumentObserverPython::slot##_name1, this, bp::_1));\
}\
while(0);
@@ -80,7 +81,7 @@ DocumentObserverPython::DocumentObserverPython(const Py::Object& obj) : inst(obj
FC_PY_GetCallable(obj.ptr(), "slot" #_name1, py##_name1.py);\
if (!py##_name1.py.isNone())\
py##_name1.slot = App::GetApplication().signal##_name2.connect(\
boost::bind(&DocumentObserverPython::slot##_name1, this, _1, _2));\
boost::bind(&DocumentObserverPython::slot##_name1, this, bp::_1, bp::_2));\
}\
while(0);
src/App/DocumentObserverPython.h
+1 -1
View File
@@ -27,7 +27,7 @@
#include <CXX/Objects.hxx>
#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <string>
src/App/GroupExtension.cpp
+3 -2
View File
@@ -24,7 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include "DocumentObjectGroup.h"
@@ -37,6 +37,7 @@
#include <Base/Tools.h>
using namespace App;
namespace bp = boost::placeholders;
EXTENSION_PROPERTY_SOURCE(App::GroupExtension, App::DocumentObjectExtension)
@@ -362,7 +363,7 @@ void GroupExtension::extensionOnChanged(const Property* p) {
for(auto obj : Group.getValue()) {
if(obj && obj->getNameInDocument()) {
_Conns[obj] = obj->signalChanged.connect(boost::bind(
&GroupExtension::slotChildChanged,this,_1,_2));
&GroupExtension::slotChildChanged,this,bp::_1, bp::_2));
}
}
}
src/App/Link.cpp
+4 -3
View File
@@ -23,7 +23,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include <boost/algorithm/string/predicate.hpp>
@@ -47,6 +47,7 @@ FC_LOG_LEVEL_INIT("App::Link", true,true)
using namespace App;
using namespace Base;
namespace bp = boost::placeholders;
EXTENSION_PROPERTY_SOURCE(App::LinkBaseExtension, App::DocumentObjectExtension)
@@ -820,7 +821,7 @@ void LinkBaseExtension::updateGroup() {
FC_LOG("new group connection " << getExtendedObject()->getFullName()
<< " -> " << group->getFullName());
conn = group->signalChanged.connect(
boost::bind(&LinkBaseExtension::slotChangedPlainGroup,this,_1,_2));
boost::bind(&LinkBaseExtension::slotChangedPlainGroup,this,bp::_1,bp::_2));
}
std::size_t count = children.size();
ext->getAllChildren(children,childSet);
@@ -834,7 +835,7 @@ void LinkBaseExtension::updateGroup() {
FC_LOG("new group connection " << getExtendedObject()->getFullName()
<< " -> " << child->getFullName());
conn = child->signalChanged.connect(
boost::bind(&LinkBaseExtension::slotChangedPlainGroup,this,_1,_2));
boost::bind(&LinkBaseExtension::slotChangedPlainGroup,this,bp::_1,bp::_2));
}
}
}
src/App/MergeDocuments.cpp
+4 -3
View File
@@ -23,7 +23,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <stack>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include <QCoreApplication>
@@ -36,6 +36,7 @@
#include <App/DocumentObject.h>
using namespace App;
namespace bp = boost::placeholders;
namespace App {
@@ -127,9 +128,9 @@ private:
MergeDocuments::MergeDocuments(App::Document* doc) : guiup(false), verbose(true), stream(0), appdoc(doc)
{
connectExport = doc->signalExportObjects.connect
(boost::bind(&MergeDocuments::exportObject, this, _1, _2));
(boost::bind(&MergeDocuments::exportObject, this, bp::_1, bp::_2));
connectImport = doc->signalImportObjects.connect
(boost::bind(&MergeDocuments::importObject, this, _1, _2));
(boost::bind(&MergeDocuments::importObject, this, bp::_1, bp::_2));
QCoreApplication* app = QCoreApplication::instance();
if (app && app->inherits("QApplication")) {
src/App/PreCompiled.h
+1 -1
View File
@@ -79,7 +79,7 @@
// Boost
#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <boost/regex.hpp>
#include <boost/tuple/tuple.hpp>
src/App/PropertyExpressionEngine.cpp
+1 -1
View File
@@ -34,7 +34,7 @@
#include "PropertyStandard.h"
#include "PropertyUnits.h"
#include <CXX/Objects.hxx>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/adjacency_list.hpp>
src/App/PropertyLinks.cpp
+5 -4
View File
@@ -33,7 +33,7 @@
#include <QDir>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
/// Here the FreeCAD includes sorted by Base,App,Gui......
#include <CXX/Objects.hxx>
@@ -55,6 +55,7 @@ FC_LOG_LEVEL_INIT("PropertyLinks",true,true)
using namespace App;
using namespace Base;
using namespace std;
namespace bp = boost::placeholders;
//**************************************************************************
//**************************************************************************
@@ -2573,11 +2574,11 @@ public:
myPath = myPos->first.toUtf8().constData();
App::Application &app = App::GetApplication();
connFinishRestoreDocument = app.signalFinishRestoreDocument.connect(
boost::bind(&DocInfo::slotFinishRestoreDocument,this,_1));
boost::bind(&DocInfo::slotFinishRestoreDocument,this,bp::_1));
connDeleteDocument = app.signalDeleteDocument.connect(
boost::bind(&DocInfo::slotDeleteDocument,this,_1));
boost::bind(&DocInfo::slotDeleteDocument,this,bp::_1));
connSaveDocument = app.signalSaveDocument.connect(
boost::bind(&DocInfo::slotSaveDocument,this,_1));
boost::bind(&DocInfo::slotSaveDocument,this,bp::_1));
QString fullpath(getFullPath());
if(fullpath.isEmpty())
src/Gui/Action.cpp
+5 -4
View File
@@ -25,7 +25,7 @@
#ifndef _PreComp_
# include <boost/signals2.hpp>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <QAbstractItemView>
# include <QActionEvent>
# include <QApplication>
@@ -55,6 +55,7 @@
using namespace Gui;
using namespace Gui::Dialog;
namespace bp = boost::placeholders;
/**
* Constructs an action called \a name with parent \a parent. It also stores a pointer
@@ -522,9 +523,9 @@ WorkbenchGroup::WorkbenchGroup ( Command* pcCmd, QObject * parent )
action->setData(QVariant(i)); // set the index
}
Application::Instance->signalActivateWorkbench.connect(boost::bind(&WorkbenchGroup::slotActivateWorkbench, this, _1));
Application::Instance->signalAddWorkbench.connect(boost::bind(&WorkbenchGroup::slotAddWorkbench, this, _1));
Application::Instance->signalRemoveWorkbench.connect(boost::bind(&WorkbenchGroup::slotRemoveWorkbench, this, _1));
Application::Instance->signalActivateWorkbench.connect(boost::bind(&WorkbenchGroup::slotActivateWorkbench, this, bp::_1));
Application::Instance->signalAddWorkbench.connect(boost::bind(&WorkbenchGroup::slotAddWorkbench, this, bp::_1));
Application::Instance->signalRemoveWorkbench.connect(boost::bind(&WorkbenchGroup::slotRemoveWorkbench, this, bp::_1));
}
WorkbenchGroup::~WorkbenchGroup()
src/Gui/Application.cpp
+15 -14
View File
@@ -26,7 +26,7 @@
#ifndef _PreComp_
# include "InventorAll.h"
# include <boost/signals2.hpp>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <sstream>
# include <stdexcept>
# include <iostream>
@@ -137,6 +137,7 @@
using namespace Gui;
using namespace Gui::DockWnd;
using namespace std;
namespace bp = boost::placeholders;
Application* Application::Instance = 0L;
@@ -294,12 +295,12 @@ Application::Application(bool GUIenabled)
{
//App::GetApplication().Attach(this);
if (GUIenabled) {
App::GetApplication().signalNewDocument.connect(boost::bind(&Gui::Application::slotNewDocument, this, _1, _2));
App::GetApplication().signalDeleteDocument.connect(boost::bind(&Gui::Application::slotDeleteDocument, this, _1));
App::GetApplication().signalRenameDocument.connect(boost::bind(&Gui::Application::slotRenameDocument, this, _1));
App::GetApplication().signalActiveDocument.connect(boost::bind(&Gui::Application::slotActiveDocument, this, _1));
App::GetApplication().signalRelabelDocument.connect(boost::bind(&Gui::Application::slotRelabelDocument, this, _1));
App::GetApplication().signalShowHidden.connect(boost::bind(&Gui::Application::slotShowHidden, this, _1));
App::GetApplication().signalNewDocument.connect(boost::bind(&Gui::Application::slotNewDocument, this, bp::_1, bp::_2));
App::GetApplication().signalDeleteDocument.connect(boost::bind(&Gui::Application::slotDeleteDocument, this, bp::_1));
App::GetApplication().signalRenameDocument.connect(boost::bind(&Gui::Application::slotRenameDocument, this, bp::_1));
App::GetApplication().signalActiveDocument.connect(boost::bind(&Gui::Application::slotActiveDocument, this, bp::_1));
App::GetApplication().signalRelabelDocument.connect(boost::bind(&Gui::Application::slotRelabelDocument, this, bp::_1));
App::GetApplication().signalShowHidden.connect(boost::bind(&Gui::Application::slotShowHidden, this, bp::_1));
// install the last active language
@@ -717,13 +718,13 @@ void Application::slotNewDocument(const App::Document& Doc, bool isMainDoc)
d->documents[&Doc] = pDoc;
// connect the signals to the application for the new document
pDoc->signalNewObject.connect(boost::bind(&Gui::Application::slotNewObject, this, _1));
pDoc->signalDeletedObject.connect(boost::bind(&Gui::Application::slotDeletedObject, this, _1));
pDoc->signalChangedObject.connect(boost::bind(&Gui::Application::slotChangedObject, this, _1, _2));
pDoc->signalRelabelObject.connect(boost::bind(&Gui::Application::slotRelabelObject, this, _1));
pDoc->signalActivatedObject.connect(boost::bind(&Gui::Application::slotActivatedObject, this, _1));
pDoc->signalInEdit.connect(boost::bind(&Gui::Application::slotInEdit, this, _1));
pDoc->signalResetEdit.connect(boost::bind(&Gui::Application::slotResetEdit, this, _1));
pDoc->signalNewObject.connect(boost::bind(&Gui::Application::slotNewObject, this, bp::_1));
pDoc->signalDeletedObject.connect(boost::bind(&Gui::Application::slotDeletedObject, this, bp::_1));
pDoc->signalChangedObject.connect(boost::bind(&Gui::Application::slotChangedObject, this, bp::_1, bp::_2));
pDoc->signalRelabelObject.connect(boost::bind(&Gui::Application::slotRelabelObject, this, bp::_1));
pDoc->signalActivatedObject.connect(boost::bind(&Gui::Application::slotActivatedObject, this, bp::_1));
pDoc->signalInEdit.connect(boost::bind(&Gui::Application::slotInEdit, this, bp::_1));
pDoc->signalResetEdit.connect(boost::bind(&Gui::Application::slotResetEdit, this, bp::_1));
signalNewDocument(*pDoc, isMainDoc);
if(isMainDoc)
src/Gui/AutoSaver.cpp
+6 -5
View File
@@ -30,7 +30,7 @@
# include <QRunnable>
# include <QTextStream>
# include <QThreadPool>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <sstream>
#endif
@@ -53,14 +53,15 @@
FC_LOG_LEVEL_INIT("App",true,true)
using namespace Gui;
namespace bp = boost::placeholders;
AutoSaver* AutoSaver::self = 0;
AutoSaver::AutoSaver(QObject* parent)
: QObject(parent), timeout(900000), compressed(true)
{
App::GetApplication().signalNewDocument.connect(boost::bind(&AutoSaver::slotCreateDocument, this, _1));
App::GetApplication().signalDeleteDocument.connect(boost::bind(&AutoSaver::slotDeleteDocument, this, _1));
App::GetApplication().signalNewDocument.connect(boost::bind(&AutoSaver::slotCreateDocument, this, bp::_1));
App::GetApplication().signalDeleteDocument.connect(boost::bind(&AutoSaver::slotDeleteDocument, this, bp::_1));
}
AutoSaver::~AutoSaver()
@@ -242,9 +243,9 @@ void AutoSaver::timerEvent(QTimerEvent * event)
AutoSaveProperty::AutoSaveProperty(const App::Document* doc) : timerId(-1)
{
documentNew = const_cast<App::Document*>(doc)->signalNewObject.connect
(boost::bind(&AutoSaveProperty::slotNewObject, this, _1));
(boost::bind(&AutoSaveProperty::slotNewObject, this, bp::_1));
documentMod = const_cast<App::Document*>(doc)->signalChangedObject.connect
(boost::bind(&AutoSaveProperty::slotChangePropertyData, this, _2));
(boost::bind(&AutoSaveProperty::slotChangePropertyData, this, bp::_2));
}
AutoSaveProperty::~AutoSaveProperty()
src/Gui/CommandView.cpp
+3 -2
View File
@@ -39,7 +39,7 @@
# include <QPainter>
# include <QPointer>
# include <QTextStream>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include "Command.h"
@@ -93,6 +93,7 @@
using namespace Gui;
using Gui::Dialog::DlgSettingsImageImp;
namespace bp = boost::placeholders;
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -585,7 +586,7 @@ StdCmdDrawStyle::StdCmdDrawStyle()
sPixmap = "DrawStyleAsIs";
eType = Alter3DView;
this->getGuiApplication()->signalActivateView.connect(boost::bind(&StdCmdDrawStyle::updateIcon, this, _1));
this->getGuiApplication()->signalActivateView.connect(boost::bind(&StdCmdDrawStyle::updateIcon, this, bp::_1));
}
Gui::Action * StdCmdDrawStyle::createAction(void)
src/Gui/DAGView/DAGModel.cpp
+7 -6
View File
@@ -22,7 +22,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <boost/graph/topological_sort.hpp>
#include <boost/graph/reverse_graph.hpp>
@@ -64,6 +64,7 @@
using namespace Gui;
using namespace DAG;
namespace bp = boost::placeholders;
LineEdit::LineEdit(QWidget* parentIn): QLineEdit(parentIn)
{
@@ -145,11 +146,11 @@ Model::Model(QObject *parentIn, const Gui::Document &documentIn) : QGraphicsScen
connect(this->editingFinishedAction, SIGNAL(triggered()),
this, SLOT(editingFinishedSlot()));
connectNewObject = documentIn.signalNewObject.connect(boost::bind(&Model::slotNewObject, this, _1));
connectDelObject = documentIn.signalDeletedObject.connect(boost::bind(&Model::slotDeleteObject, this, _1));
connectChgObject = documentIn.signalChangedObject.connect(boost::bind(&Model::slotChangeObject, this, _1, _2));
connectEdtObject = documentIn.signalInEdit.connect(boost::bind(&Model::slotInEdit, this, _1));
connectResObject = documentIn.signalResetEdit.connect(boost::bind(&Model::slotResetEdit, this, _1));
connectNewObject = documentIn.signalNewObject.connect(boost::bind(&Model::slotNewObject, this, bp::_1));
connectDelObject = documentIn.signalDeletedObject.connect(boost::bind(&Model::slotDeleteObject, this, bp::_1));
connectChgObject = documentIn.signalChangedObject.connect(boost::bind(&Model::slotChangeObject, this, bp::_1, bp::_2));
connectEdtObject = documentIn.signalInEdit.connect(boost::bind(&Model::slotInEdit, this, bp::_1));
connectResObject = documentIn.signalResetEdit.connect(boost::bind(&Model::slotResetEdit, this, bp::_1));
for (auto obj : documentIn.getDocument()->getObjects()) {
auto vpd = Base::freecad_dynamic_cast<Gui::ViewProviderDocumentObject>(documentIn.getViewProvider(obj));
src/Gui/DAGView/DAGView.cpp
+6 -5
View File
@@ -22,7 +22,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <QAbstractEventDispatcher>
#include <QVBoxLayout>
#endif
@@ -42,6 +42,7 @@
using namespace Gui;
using namespace DAG;
namespace bp = boost::placeholders;
DAG::DockWindow::DockWindow(Gui::Document* gDocumentIn, QWidget* parent): Gui::DockWindow(gDocumentIn, parent)
{
@@ -55,8 +56,8 @@ View::View(QWidget* parentIn): QGraphicsView(parentIn)
{
this->setRenderHint(QPainter::Antialiasing, true);
this->setRenderHint(QPainter::TextAntialiasing, true);
Application::Instance->signalActiveDocument.connect(boost::bind(&View::slotActiveDocument, this, _1));
Application::Instance->signalDeleteDocument.connect(boost::bind(&View::slotDeleteDocument, this, _1));
Application::Instance->signalActiveDocument.connect(boost::bind(&View::slotActiveDocument, this, bp::_1));
Application::Instance->signalDeleteDocument.connect(boost::bind(&View::slotDeleteDocument, this, bp::_1));
//just update the dagview when the gui process is idle.
connect(QAbstractEventDispatcher::instance(), SIGNAL(awake()), this, SLOT(awakeSlot()));
@@ -64,8 +65,8 @@ View::View(QWidget* parentIn): QGraphicsView(parentIn)
View::~View()
{
Application::Instance->signalActiveDocument.disconnect(boost::bind(&View::slotActiveDocument, this, _1));
Application::Instance->signalDeleteDocument.disconnect(boost::bind(&View::slotDeleteDocument, this, _1));
Application::Instance->signalActiveDocument.disconnect(boost::bind(&View::slotActiveDocument, this, bp::_1));
Application::Instance->signalDeleteDocument.disconnect(boost::bind(&View::slotDeleteDocument, this, bp::_1));
}
void View::slotActiveDocument(const Document &documentIn)
src/Gui/DlgDisplayPropertiesImp.cpp
+3 -2
View File
@@ -24,7 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <algorithm>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <boost/signals2.hpp>
# include <QDockWidget>
#endif
@@ -51,6 +51,7 @@
using namespace Gui::Dialog;
using namespace std;
namespace bp = boost::placeholders;
/* TRANSLATOR Gui::Dialog::DlgDisplayPropertiesImp */
@@ -111,7 +112,7 @@ DlgDisplayPropertiesImp::DlgDisplayPropertiesImp(bool floating, QWidget* parent,
d->connectChangedObject =
Gui::Application::Instance->signalChangedObject.connect(boost::bind
(&DlgDisplayPropertiesImp::slotChangedObject, this, _1, _2));
(&DlgDisplayPropertiesImp::slotChangedObject, this, bp::_1, bp::_2));
}
/**
src/Gui/Document.cpp
+24 -23
View File
@@ -33,7 +33,7 @@
# include <qmessagebox.h>
# include <qstatusbar.h>
# include <boost/signals2.hpp>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <Inventor/actions/SoSearchAction.h>
# include <Inventor/nodes/SoSeparator.h>
#endif
@@ -75,6 +75,7 @@
FC_LOG_LEVEL_INIT("Gui",true,true)
using namespace Gui;
namespace bp = boost::placeholders;
namespace Gui {
@@ -165,54 +166,54 @@ Document::Document(App::Document* pcDocument,Application * app)
// Setup the connections
d->connectNewObject = pcDocument->signalNewObject.connect
(boost::bind(&Gui::Document::slotNewObject, this, _1));
(boost::bind(&Gui::Document::slotNewObject, this, bp::_1));
d->connectDelObject = pcDocument->signalDeletedObject.connect
(boost::bind(&Gui::Document::slotDeletedObject, this, _1));
(boost::bind(&Gui::Document::slotDeletedObject, this, bp::_1));
d->connectCngObject = pcDocument->signalChangedObject.connect
(boost::bind(&Gui::Document::slotChangedObject, this, _1, _2));
(boost::bind(&Gui::Document::slotChangedObject, this, bp::_1, bp::_2));
d->connectRenObject = pcDocument->signalRelabelObject.connect
(boost::bind(&Gui::Document::slotRelabelObject, this, _1));
(boost::bind(&Gui::Document::slotRelabelObject, this, bp::_1));
d->connectActObject = pcDocument->signalActivatedObject.connect
(boost::bind(&Gui::Document::slotActivatedObject, this, _1));
(boost::bind(&Gui::Document::slotActivatedObject, this, bp::_1));
d->connectActObjectBlocker = boost::signals2::shared_connection_block
(d->connectActObject, false);
d->connectSaveDocument = pcDocument->signalSaveDocument.connect
(boost::bind(&Gui::Document::Save, this, _1));
(boost::bind(&Gui::Document::Save, this, bp::_1));
d->connectRestDocument = pcDocument->signalRestoreDocument.connect
(boost::bind(&Gui::Document::Restore, this, _1));
(boost::bind(&Gui::Document::Restore, this, bp::_1));
d->connectStartLoadDocument = App::GetApplication().signalStartRestoreDocument.connect
(boost::bind(&Gui::Document::slotStartRestoreDocument, this, _1));
(boost::bind(&Gui::Document::slotStartRestoreDocument, this, bp::_1));
d->connectFinishLoadDocument = App::GetApplication().signalFinishRestoreDocument.connect
(boost::bind(&Gui::Document::slotFinishRestoreDocument, this, _1));
(boost::bind(&Gui::Document::slotFinishRestoreDocument, this, bp::_1));
d->connectShowHidden = App::GetApplication().signalShowHidden.connect
(boost::bind(&Gui::Document::slotShowHidden, this, _1));
(boost::bind(&Gui::Document::slotShowHidden, this, bp::_1));
d->connectChangePropertyEditor = pcDocument->signalChangePropertyEditor.connect
(boost::bind(&Gui::Document::slotChangePropertyEditor, this, _1, _2));
(boost::bind(&Gui::Document::slotChangePropertyEditor, this, bp::_1, bp::_2));
d->connectFinishRestoreObject = pcDocument->signalFinishRestoreObject.connect
(boost::bind(&Gui::Document::slotFinishRestoreObject, this, _1));
(boost::bind(&Gui::Document::slotFinishRestoreObject, this, bp::_1));
d->connectExportObjects = pcDocument->signalExportViewObjects.connect
(boost::bind(&Gui::Document::exportObjects, this, _1, _2));
(boost::bind(&Gui::Document::exportObjects, this, bp::_1, bp::_2));
d->connectImportObjects = pcDocument->signalImportViewObjects.connect
(boost::bind(&Gui::Document::importObjects, this, _1, _2, _3));
(boost::bind(&Gui::Document::importObjects, this, bp::_1, bp::_2, bp::_3));
d->connectFinishImportObjects = pcDocument->signalFinishImportObjects.connect
(boost::bind(&Gui::Document::slotFinishImportObjects, this, _1));
(boost::bind(&Gui::Document::slotFinishImportObjects, this, bp::_1));
d->connectUndoDocument = pcDocument->signalUndo.connect
(boost::bind(&Gui::Document::slotUndoDocument, this, _1));
(boost::bind(&Gui::Document::slotUndoDocument, this, bp::_1));
d->connectRedoDocument = pcDocument->signalRedo.connect
(boost::bind(&Gui::Document::slotRedoDocument, this, _1));
(boost::bind(&Gui::Document::slotRedoDocument, this, bp::_1));
d->connectRecomputed = pcDocument->signalRecomputed.connect
(boost::bind(&Gui::Document::slotRecomputed, this, _1));
(boost::bind(&Gui::Document::slotRecomputed, this, bp::_1));
d->connectSkipRecompute = pcDocument->signalSkipRecompute.connect
(boost::bind(&Gui::Document::slotSkipRecompute, this, _1, _2));
(boost::bind(&Gui::Document::slotSkipRecompute, this, bp::_1, bp::_2));
d->connectTouchedObject = pcDocument->signalTouchedObject.connect
(boost::bind(&Gui::Document::slotTouchedObject, this, _1));
(boost::bind(&Gui::Document::slotTouchedObject, this, bp::_1));
d->connectTransactionAppend = pcDocument->signalTransactionAppend.connect
(boost::bind(&Gui::Document::slotTransactionAppend, this, _1, _2));
(boost::bind(&Gui::Document::slotTransactionAppend, this, bp::_1, bp::_2));
d->connectTransactionRemove = pcDocument->signalTransactionRemove.connect
(boost::bind(&Gui::Document::slotTransactionRemove, this, _1, _2));
(boost::bind(&Gui::Document::slotTransactionRemove, this, bp::_1, bp::_2));
// pointer to the python class
// NOTE: As this Python object doesn't get returned to the interpreter we
// mustn't increment it (Werner Jan-12-2006)
src/Gui/DocumentModel.cpp
+14 -13
View File
@@ -27,7 +27,7 @@
# include <QApplication>
# include <algorithm>
# include <boost/signals2.hpp>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include <boost/unordered_set.hpp>
@@ -42,6 +42,7 @@
#include <App/PropertyLinks.h>
using namespace Gui;
namespace bp = boost::placeholders;
namespace Gui {
// forward declaration
@@ -367,11 +368,11 @@ DocumentModel::DocumentModel(QObject* parent)
}
// Setup connections
Application::Instance->signalNewDocument.connect(boost::bind(&DocumentModel::slotNewDocument, this, _1));
Application::Instance->signalDeleteDocument.connect(boost::bind(&DocumentModel::slotDeleteDocument, this, _1));
Application::Instance->signalRenameDocument.connect(boost::bind(&DocumentModel::slotRenameDocument, this, _1));
Application::Instance->signalActiveDocument.connect(boost::bind(&DocumentModel::slotActiveDocument, this, _1));
Application::Instance->signalRelabelDocument.connect(boost::bind(&DocumentModel::slotRelabelDocument, this, _1));
Application::Instance->signalNewDocument.connect(boost::bind(&DocumentModel::slotNewDocument, this, bp::_1));
Application::Instance->signalDeleteDocument.connect(boost::bind(&DocumentModel::slotDeleteDocument, this, bp::_1));
Application::Instance->signalRenameDocument.connect(boost::bind(&DocumentModel::slotRenameDocument, this, bp::_1));
Application::Instance->signalActiveDocument.connect(boost::bind(&DocumentModel::slotActiveDocument, this, bp::_1));
Application::Instance->signalRelabelDocument.connect(boost::bind(&DocumentModel::slotRelabelDocument, this, bp::_1));
}
DocumentModel::~DocumentModel()
@@ -381,13 +382,13 @@ DocumentModel::~DocumentModel()
void DocumentModel::slotNewDocument(const Gui::Document& Doc)
{
Doc.signalNewObject.connect(boost::bind(&DocumentModel::slotNewObject, this, _1));
Doc.signalDeletedObject.connect(boost::bind(&DocumentModel::slotDeleteObject, this, _1));
Doc.signalChangedObject.connect(boost::bind(&DocumentModel::slotChangeObject, this, _1, _2));
Doc.signalRelabelObject.connect(boost::bind(&DocumentModel::slotRenameObject, this, _1));
Doc.signalActivatedObject.connect(boost::bind(&DocumentModel::slotActiveObject, this, _1));
Doc.signalInEdit.connect(boost::bind(&DocumentModel::slotInEdit, this, _1));
Doc.signalResetEdit.connect(boost::bind(&DocumentModel::slotResetEdit, this, _1));
Doc.signalNewObject.connect(boost::bind(&DocumentModel::slotNewObject, this, bp::_1));
Doc.signalDeletedObject.connect(boost::bind(&DocumentModel::slotDeleteObject, this, bp::_1));
Doc.signalChangedObject.connect(boost::bind(&DocumentModel::slotChangeObject, this, bp::_1, bp::_2));
Doc.signalRelabelObject.connect(boost::bind(&DocumentModel::slotRenameObject, this, bp::_1));
Doc.signalActivatedObject.connect(boost::bind(&DocumentModel::slotActiveObject, this, bp::_1));
Doc.signalInEdit.connect(boost::bind(&DocumentModel::slotInEdit, this, bp::_1));
Doc.signalResetEdit.connect(boost::bind(&DocumentModel::slotResetEdit, this, bp::_1));
QModelIndex parent = createIndex(0,0,d->rootItem);
int count_docs = d->rootItem->childCount();
src/Gui/DocumentObserver.cpp
+16 -16
View File
@@ -25,10 +25,9 @@
#ifndef _PreComp_
# include <sstream>
# include <boost/bind/bind.hpp>
#endif
#include <boost/bind.hpp>
#include "Application.h"
#include "Document.h"
#include "ViewProviderDocumentObject.h"
@@ -36,6 +35,7 @@
#include <App/Document.h>
using namespace Gui;
namespace bp = boost::placeholders;
DocumentT::DocumentT()
@@ -204,7 +204,7 @@ public:
Private(Gui::Document* doc) : _document(doc) {
if (doc) {
connectApplicationDeletedDocument = doc->signalDeleteDocument.connect(boost::bind
(&Private::deletedDocument, this, _1));
(&Private::deletedDocument, this, bp::_1));
}
}
@@ -255,11 +255,11 @@ public:
indocument = true;
Gui::Document* doc = obj->getDocument();
connectApplicationDeletedDocument = doc->signalDeleteDocument.connect(boost::bind
(&Private::deletedDocument, this, _1));
(&Private::deletedDocument, this, bp::_1));
connectDocumentCreatedObject = doc->signalNewObject.connect(boost::bind
(&Private::createdObject, this, _1));
(&Private::createdObject, this, bp::_1));
connectDocumentDeletedObject = doc->signalDeletedObject.connect(boost::bind
(&Private::deletedObject, this, _1));
(&Private::deletedObject, this, bp::_1));
}
}
void deletedDocument(const Gui::Document& doc) {
@@ -346,25 +346,25 @@ void DocumentObserver::attachDocument(Document* doc)
return;
this->connectDocumentCreatedObject = doc->signalNewObject.connect(boost::bind
(&DocumentObserver::slotCreatedObject, this, _1));
(&DocumentObserver::slotCreatedObject, this, bp::_1));
this->connectDocumentDeletedObject = doc->signalDeletedObject.connect(boost::bind
(&DocumentObserver::slotDeletedObject, this, _1));
(&DocumentObserver::slotDeletedObject, this, bp::_1));
this->connectDocumentChangedObject = doc->signalChangedObject.connect(boost::bind
(&DocumentObserver::slotChangedObject, this, _1, _2));
(&DocumentObserver::slotChangedObject, this, bp::_1, bp::_2));
this->connectDocumentRelabelObject = doc->signalRelabelObject.connect(boost::bind
(&DocumentObserver::slotRelabelObject, this, _1));
(&DocumentObserver::slotRelabelObject, this, bp::_1));
this->connectDocumentActivateObject = doc->signalActivatedObject.connect(boost::bind
(&DocumentObserver::slotActivatedObject, this, _1));
(&DocumentObserver::slotActivatedObject, this, bp::_1));
this->connectDocumentEditObject = doc->signalInEdit.connect(boost::bind
(&DocumentObserver::slotEnterEditObject, this, _1));
(&DocumentObserver::slotEnterEditObject, this, bp::_1));
this->connectDocumentResetObject = doc->signalResetEdit.connect(boost::bind
(&DocumentObserver::slotResetEditObject, this, _1));
(&DocumentObserver::slotResetEditObject, this, bp::_1));
this->connectDocumentUndo = doc->signalUndoDocument.connect(boost::bind
(&DocumentObserver::slotUndoDocument, this, _1));
(&DocumentObserver::slotUndoDocument, this, bp::_1));
this->connectDocumentRedo = doc->signalRedoDocument.connect(boost::bind
(&DocumentObserver::slotRedoDocument, this, _1));
(&DocumentObserver::slotRedoDocument, this, bp::_1));
this->connectDocumentDelete = doc->signalDeleteDocument.connect(boost::bind
(&DocumentObserver::slotDeleteDocument, this, _1));
(&DocumentObserver::slotDeleteDocument, this, bp::_1));
}
void DocumentObserver::detachDocument()
src/Gui/DocumentObserverPython.cpp
+3 -2
View File
@@ -35,6 +35,7 @@
#include <Base/Console.h>
using namespace Gui;
namespace bp = boost::placeholders;
std::vector<DocumentObserverPython*> DocumentObserverPython::_instances;
@@ -64,7 +65,7 @@ DocumentObserverPython::DocumentObserverPython(const Py::Object& obj) : inst(obj
FC_PY_GetCallable(obj.ptr(), "slot" #_name1, py##_name1.py);\
if (!py##_name1.py.isNone())\
py##_name1.slot = Application::Instance->signal##_name2.connect(\
boost::bind(&DocumentObserverPython::slot##_name1, this, _1));\
boost::bind(&DocumentObserverPython::slot##_name1, this, bp::_1));\
}\
while(0);
@@ -72,7 +73,7 @@ DocumentObserverPython::DocumentObserverPython(const Py::Object& obj) : inst(obj
FC_PY_GetCallable(obj.ptr(), "slot" #_name1, py##_name1.py);\
if (!py##_name1.py.isNone())\
py##_name1.slot = Application::Instance->signal##_name2.connect(\
boost::bind(&DocumentObserverPython::slot##_name1, this, _1, _2));\
boost::bind(&DocumentObserverPython::slot##_name1, this, bp::_1, bp::_2));\
}\
while(0);
src/Gui/DocumentObserverPython.h
+1 -1
View File
@@ -27,7 +27,7 @@
#include <CXX/Objects.hxx>
#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
namespace Gui
{
src/Gui/ExpressionBinding.cpp
+3 -2
View File
@@ -34,12 +34,13 @@
#include <App/ObjectIdentifier.h>
#include <App/Document.h>
#include <App/Application.h>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
FC_LOG_LEVEL_INIT("Expression",true,true)
using namespace Gui;
using namespace App;
namespace bp = boost::placeholders;
ExpressionBinding::ExpressionBinding()
: iconLabel(0)
@@ -99,7 +100,7 @@ void ExpressionBinding::bind(const App::ObjectIdentifier &_path)
//connect to be informed about changes
DocumentObject * docObj = path.getDocumentObject();
connection = docObj->ExpressionEngine.expressionChanged.connect(boost::bind(&ExpressionBinding::expressionChange, this, _1));
connection = docObj->ExpressionEngine.expressionChanged.connect(boost::bind(&ExpressionBinding::expressionChange, this, bp::_1));
}
void ExpressionBinding::bind(const Property &prop)
src/Gui/GraphvizView.cpp
+5 -4
View File
@@ -37,7 +37,7 @@
# include <QGraphicsView>
# include <QThread>
# include <QProcess>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include "GraphicsViewZoom.h"
#include "FileDialog.h"
@@ -50,6 +50,7 @@
#include <App/Document.h>
using namespace Gui;
namespace bp = boost::placeholders;
namespace Gui {
@@ -187,9 +188,9 @@ GraphvizView::GraphvizView(App::Document & _doc, QWidget* parent)
connect(thread, SIGNAL(svgFileRead(const QByteArray &)), this, SLOT(svgFileRead(const QByteArray &)));
// Connect signal from document
recomputeConnection = _doc.signalRecomputed.connect(boost::bind(&GraphvizView::updateSvgItem, this, _1));
undoConnection = _doc.signalUndo.connect(boost::bind(&GraphvizView::updateSvgItem, this, _1));
redoConnection = _doc.signalRedo.connect(boost::bind(&GraphvizView::updateSvgItem, this, _1));
recomputeConnection = _doc.signalRecomputed.connect(boost::bind(&GraphvizView::updateSvgItem, this, bp::_1));
undoConnection = _doc.signalUndo.connect(boost::bind(&GraphvizView::updateSvgItem, this, bp::_1));
redoConnection = _doc.signalRedo.connect(boost::bind(&GraphvizView::updateSvgItem, this, bp::_1));
updateSvgItem(_doc);
}
src/Gui/MDIView.cpp
+3 -2
View File
@@ -25,7 +25,7 @@
#ifndef _PreComp_
# include <boost/signals2.hpp>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <qapplication.h>
# include <qregexp.h>
# include <QEvent>
@@ -44,6 +44,7 @@
#include "ViewProviderDocumentObject.h"
using namespace Gui;
namespace bp = boost::placeholders;
TYPESYSTEM_SOURCE_ABSTRACT(Gui::MDIView,Gui::BaseView)
@@ -61,7 +62,7 @@ MDIView::MDIView(Gui::Document* pcDocument,QWidget* parent, Qt::WindowFlags wfla
if (pcDocument)
{
connectDelObject = pcDocument->signalDeletedObject.connect
(boost::bind(&ActiveObjectList::objectDeleted, &ActiveObjects, _1));
(boost::bind(&ActiveObjectList::objectDeleted, &ActiveObjects, bp::_1));
assert(connectDelObject.connected());
}
}
src/Gui/MainWindow.cpp
-2
View File
@@ -53,8 +53,6 @@
# include <QWhatsThis>
#endif
#include <boost/bind.hpp>
// FreeCAD Base header
#include <Base/Parameter.h>
#include <Base/Exception.h>
src/Gui/ManualAlignment.cpp
+4 -3
View File
@@ -47,9 +47,9 @@
# include <Inventor/nodes/SoSeparator.h>
# include <Inventor/nodes/SoTranslation.h>
# include <Inventor/sensors/SoNodeSensor.h>
# include <boost/bind/bind.hpp>
#endif
#include <boost/bind.hpp>
#include <App/Document.h>
#include <App/GeoFeature.h>
@@ -70,6 +70,7 @@
using namespace Gui;
namespace bp = boost::placeholders;
AlignmentGroup::AlignmentGroup()
{
@@ -668,7 +669,7 @@ ManualAlignment::ManualAlignment()
{
// connect with the application's signal for deletion of documents
this->connectApplicationDeletedDocument = Gui::Application::Instance->signalDeleteDocument
.connect(boost::bind(&ManualAlignment::slotDeletedDocument, this, _1));
.connect(boost::bind(&ManualAlignment::slotDeletedDocument, this, bp::_1));
// setup sensor connection
d->sensorCam1 = new SoNodeSensor(Private::syncCameraCB, this);
@@ -862,7 +863,7 @@ void ManualAlignment::startAlignment(Base::Type mousemodel)
if (this->connectDocumentDeletedObject.connected())
this->connectDocumentDeletedObject.disconnect();
this->connectDocumentDeletedObject = myDocument->signalDeletedObject.connect(boost::bind
(&ManualAlignment::slotDeletedObject, this, _1));
(&ManualAlignment::slotDeletedObject, this, bp::_1));
continueAlignment();
}
src/Gui/MergeDocuments.cpp
+4 -3
View File
@@ -23,7 +23,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <stack>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include "MergeDocuments.h"
#include <Base/Console.h>
@@ -36,6 +36,7 @@
#include <Gui/ViewProvider.h>
using namespace Gui;
namespace bp = boost::placeholders;
namespace Gui {
@@ -122,9 +123,9 @@ private:
MergeDocuments::MergeDocuments(App::Document* doc) : stream(0), appdoc(doc)
{
connectExport = doc->signalExportObjects.connect
(boost::bind(&MergeDocuments::exportObject, this, _1, _2));
(boost::bind(&MergeDocuments::exportObject, this, bp::_1, bp::_2));
connectImport = doc->signalImportObjects.connect
(boost::bind(&MergeDocuments::importObject, this, _1, _2));
(boost::bind(&MergeDocuments::importObject, this, bp::_1, bp::_2));
document = Gui::Application::Instance->getDocument(doc);
}
src/Gui/Placement.cpp
+5 -1
View File
@@ -22,11 +22,14 @@
#include "PreCompiled.h"
#ifndef _PreComp_
#include <QSignalMapper>
#include <QDockWidget>
#include <QMessageBox>
#include <QClipboard>
#include <QMetaObject>
#include <boost/bind/bind.hpp>
#endif
#include "Placement.h"
#include "ui_Placement.h"
@@ -45,6 +48,7 @@
#include <Base/UnitsApi.h>
using namespace Gui::Dialog;
namespace bp = boost::placeholders;
namespace Gui { namespace Dialog {
class find_placement
@@ -118,7 +122,7 @@ Placement::Placement(QWidget* parent, Qt::WindowFlags fl)
connect(signalMapper, SIGNAL(mapped(int)),
this, SLOT(onPlacementChanged(int)));
connectAct = Application::Instance->signalActiveDocument.connect
(boost::bind(&Placement::slotActiveDocument, this, _1));
(boost::bind(&Placement::slotActiveDocument, this, bp::_1));
App::Document* activeDoc = App::GetApplication().getActiveDocument();
if (activeDoc) documents.insert(activeDoc->getName());
src/Gui/Placement.h
-1
View File
@@ -30,7 +30,6 @@
#include <Base/Placement.h>
#include <boost/signals2.hpp>
#include <boost/bind.hpp>
class QSignalMapper;
src/Gui/PreCompiled.h
+1 -1
View File
@@ -78,7 +78,7 @@
// Boost
#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <boost/program_options.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/utility.hpp>
src/Gui/ProjectView.cpp
-1
View File
@@ -24,7 +24,6 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <boost/bind.hpp>
# include <QAction>
# include <QActionGroup>
# include <QApplication>
src/Gui/PropertyView.cpp
+11 -10
View File
@@ -27,9 +27,9 @@
# include <QHeaderView>
# include <QEvent>
# include <QTimer>
# include <boost/bind/bind.hpp>
#endif
#include <boost/bind.hpp>
/// Here the FreeCAD includes sorted by Base,App,Gui......
#include <Base/Parameter.h>
@@ -57,6 +57,7 @@ using namespace std;
using namespace Gui;
using namespace Gui::DockWnd;
using namespace Gui::PropertyEditor;
namespace bp = boost::placeholders;
static ParameterGrp::handle _GetParam() {
static ParameterGrp::handle hGrp;
@@ -111,19 +112,19 @@ PropertyView::PropertyView(QWidget *parent)
this->connectPropData =
App::GetApplication().signalChangedObject.connect(boost::bind
(&PropertyView::slotChangePropertyData, this, _1, _2));
(&PropertyView::slotChangePropertyData, this, bp::_1, bp::_2));
this->connectPropView =
Gui::Application::Instance->signalChangedObject.connect(boost::bind
(&PropertyView::slotChangePropertyView, this, _1, _2));
(&PropertyView::slotChangePropertyView, this, bp::_1, bp::_2));
this->connectPropAppend =
App::GetApplication().signalAppendDynamicProperty.connect(boost::bind
(&PropertyView::slotAppendDynamicProperty, this, _1));
(&PropertyView::slotAppendDynamicProperty, this, bp::_1));
this->connectPropRemove =
App::GetApplication().signalRemoveDynamicProperty.connect(boost::bind
(&PropertyView::slotRemoveDynamicProperty, this, _1));
(&PropertyView::slotRemoveDynamicProperty, this, bp::_1));
this->connectPropChange =
App::GetApplication().signalChangePropertyEditor.connect(boost::bind
(&PropertyView::slotChangePropertyEditor, this, _1, _2));
(&PropertyView::slotChangePropertyEditor, this, bp::_1, bp::_2));
this->connectUndoDocument =
App::GetApplication().signalUndoDocument.connect(boost::bind
(&PropertyView::slotRollback, this));
@@ -132,16 +133,16 @@ PropertyView::PropertyView(QWidget *parent)
(&PropertyView::slotRollback, this));
this->connectActiveDoc =
Application::Instance->signalActiveDocument.connect(boost::bind
(&PropertyView::slotActiveDocument, this, _1));
(&PropertyView::slotActiveDocument, this, bp::_1));
this->connectDelDocument =
Application::Instance->signalDeleteDocument.connect(
boost::bind(&PropertyView::slotDeleteDocument, this, _1));
boost::bind(&PropertyView::slotDeleteDocument, this, bp::_1));
this->connectDelViewObject =
Application::Instance->signalDeletedObject.connect(
boost::bind(&PropertyView::slotDeletedViewObject, this, _1));
boost::bind(&PropertyView::slotDeletedViewObject, this, bp::_1));
this->connectDelObject =
App::GetApplication().signalDeletedObject.connect(
boost::bind(&PropertyView::slotDeletedObject, this, _1));
boost::bind(&PropertyView::slotDeletedObject, this, bp::_1));
}
PropertyView::~PropertyView()
src/Gui/Selection.cpp
+5 -4
View File
@@ -26,7 +26,7 @@
#ifndef _PreComp_
# include <assert.h>
# include <string>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <QApplication>
# include <QString>
# include <QStatusBar>
@@ -60,6 +60,7 @@ FC_LOG_LEVEL_INIT("Selection",false,true,true)
using namespace Gui;
using namespace std;
namespace bp = boost::placeholders;
SelectionGateFilterExternal::SelectionGateFilterExternal(const char *docName, const char *objName) {
if(docName) {
@@ -134,7 +135,7 @@ void SelectionObserver::attachSelection()
resolve?Selection().signalSelectionChanged2:
Selection().signalSelectionChanged);
connectSelection = signal.connect(boost::bind
(&SelectionObserver::_onSelectionChanged, this, _1));
(&SelectionObserver::_onSelectionChanged, this, bp::_1));
if(filterDocName.size())
Selection().addSelectionGate(
new SelectionGateFilterExternal(filterDocName.c_str(),filterObjName.c_str()));
@@ -1761,8 +1762,8 @@ SelectionSingleton::SelectionSingleton()
hz = 0;
ActiveGate = 0;
gateResolve = 1;
App::GetApplication().signalDeletedObject.connect(boost::bind(&Gui::SelectionSingleton::slotDeletedObject, this, _1));
signalSelectionChanged.connect(boost::bind(&Gui::SelectionSingleton::slotSelectionChanged, this, _1));
App::GetApplication().signalDeletedObject.connect(boost::bind(&Gui::SelectionSingleton::slotDeletedObject, this, bp::_1));
signalSelectionChanged.connect(boost::bind(&Gui::SelectionSingleton::slotSelectionChanged, this, bp::_1));
}
/**
src/Gui/TaskElementColors.cpp
+4 -3
View File
@@ -28,7 +28,7 @@
#include <QColorDialog>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include "ui_TaskElementColors.h"
@@ -52,6 +52,7 @@
FC_LOG_LEVEL_INIT("Gui",true,true)
using namespace Gui;
namespace bp = boost::placeholders;
class ElementColors::Private: public Gui::SelectionGate
{
@@ -323,9 +324,9 @@ ElementColors::ElementColors(ViewProviderDocumentObject* vp, bool noHide)
Selection().addSelectionGate(d,0);
d->connectDelDoc = Application::Instance->signalDeleteDocument.connect(boost::bind
(&ElementColors::slotDeleteDocument, this, _1));
(&ElementColors::slotDeleteDocument, this, bp::_1));
d->connectDelObj = Application::Instance->signalDeletedObject.connect(boost::bind
(&ElementColors::slotDeleteObject, this, _1));
(&ElementColors::slotDeleteObject, this, bp::_1));
d->populate();
}
src/Gui/TaskView/TaskAppearance.cpp
+3 -2
View File
@@ -25,7 +25,7 @@
#ifndef _PreComp_
# include <algorithm>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include "ui_TaskAppearance.h"
@@ -38,6 +38,7 @@
#include <Base/Console.h>
using namespace Gui::TaskView;
namespace bp = boost::placeholders;
/* TRANSLATOR Gui::TaskView::TaskAppearance */
@@ -57,7 +58,7 @@ TaskAppearance::TaskAppearance(QWidget *parent)
this->connectChangedObject =
Gui::Application::Instance->signalChangedObject.connect(boost::bind
(&TaskAppearance::slotChangedObject, this, _1, _2));
(&TaskAppearance::slotChangedObject, this, bp::_1, bp::_2));
}
TaskAppearance::~TaskAppearance()
src/Gui/TaskView/TaskSelectLinkProperty.cpp
-1
View File
@@ -25,7 +25,6 @@
#ifndef _PreComp_
# include <algorithm>
# include <boost/bind.hpp>
#endif
#include "ui_TaskSelectLinkProperty.h"
src/Gui/TaskView/TaskView.cpp
+5 -4
View File
@@ -24,7 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <QAbstractSpinBox>
# include <QActionEvent>
# include <QApplication>
@@ -53,6 +53,7 @@
#endif
using namespace Gui::TaskView;
namespace bp = boost::placeholders;
//**************************************************************************
//**************************************************************************
@@ -398,16 +399,16 @@ TaskView::TaskView(QWidget *parent)
connectApplicationActiveDocument =
App::GetApplication().signalActiveDocument.connect
(boost::bind(&Gui::TaskView::TaskView::slotActiveDocument, this, _1));
(boost::bind(&Gui::TaskView::TaskView::slotActiveDocument, this, bp::_1));
connectApplicationDeleteDocument =
App::GetApplication().signalDeletedDocument.connect
(boost::bind(&Gui::TaskView::TaskView::slotDeletedDocument, this));
connectApplicationUndoDocument =
App::GetApplication().signalUndoDocument.connect
(boost::bind(&Gui::TaskView::TaskView::slotUndoDocument, this, _1));
(boost::bind(&Gui::TaskView::TaskView::slotUndoDocument, this, bp::_1));
connectApplicationRedoDocument =
App::GetApplication().signalRedoDocument.connect
(boost::bind(&Gui::TaskView::TaskView::slotRedoDocument, this, _1));
(boost::bind(&Gui::TaskView::TaskView::slotRedoDocument, this, bp::_1));
}
TaskView::~TaskView()
src/Gui/TextDocumentEditorView.cpp
+3 -3
View File
@@ -30,11 +30,11 @@
# include <QMessageBox>
# include <QPushButton>
# include <QTextBlock>
# include <iostream>
# include <boost/bind/bind.hpp>
# include <boost/signals2.hpp>
#endif
#include <iostream>
#include <boost/bind.hpp>
#include <boost/signals2.hpp>
#include <App/TextDocument.h>
#include <Gui/Document.h>
src/Gui/Tree.cpp
+24 -23
View File
@@ -24,7 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <QAction>
# include <QActionGroup>
# include <QApplication>
@@ -78,6 +78,7 @@ FC_LOG_LEVEL_INIT("Tree",false,true,true)
#define TREE_TRACE(_msg) _TREE_PRINT(FC_LOGLEVEL_TRACE,NotifyLog,_msg)
using namespace Gui;
namespace bp = boost::placeholders;
/////////////////////////////////////////////////////////////////////////////////
@@ -262,9 +263,9 @@ public:
connectIcon = viewObject->signalChangeIcon.connect(
boost::bind(&DocumentObjectData::slotChangeIcon, this));
connectTool = viewObject->signalChangeToolTip.connect(
boost::bind(&DocumentObjectData::slotChangeToolTip, this, _1));
boost::bind(&DocumentObjectData::slotChangeToolTip, this, bp::_1));
connectStat = viewObject->signalChangeStatusTip.connect(
boost::bind(&DocumentObjectData::slotChangeStatusTip, this, _1));
boost::bind(&DocumentObjectData::slotChangeStatusTip, this, bp::_1));
removeChildrenFromRoot = viewObject->canRemoveChildrenFromRoot();
itemHidden = !viewObject->showInTree();
@@ -487,18 +488,18 @@ TreeWidget::TreeWidget(const char *name, QWidget* parent)
this, SLOT(onSearchObjects()));
// Setup connections
connectNewDocument = Application::Instance->signalNewDocument.connect(boost::bind(&TreeWidget::slotNewDocument, this, _1, _2));
connectDelDocument = Application::Instance->signalDeleteDocument.connect(boost::bind(&TreeWidget::slotDeleteDocument, this, _1));
connectRenDocument = Application::Instance->signalRenameDocument.connect(boost::bind(&TreeWidget::slotRenameDocument, this, _1));
connectActDocument = Application::Instance->signalActiveDocument.connect(boost::bind(&TreeWidget::slotActiveDocument, this, _1));
connectRelDocument = Application::Instance->signalRelabelDocument.connect(boost::bind(&TreeWidget::slotRelabelDocument, this, _1));
connectShowHidden = Application::Instance->signalShowHidden.connect(boost::bind(&TreeWidget::slotShowHidden, this, _1));
connectNewDocument = Application::Instance->signalNewDocument.connect(boost::bind(&TreeWidget::slotNewDocument, this, bp::_1, bp::_2));
connectDelDocument = Application::Instance->signalDeleteDocument.connect(boost::bind(&TreeWidget::slotDeleteDocument, this, bp::_1));
connectRenDocument = Application::Instance->signalRenameDocument.connect(boost::bind(&TreeWidget::slotRenameDocument, this, bp::_1));
connectActDocument = Application::Instance->signalActiveDocument.connect(boost::bind(&TreeWidget::slotActiveDocument, this, bp::_1));
connectRelDocument = Application::Instance->signalRelabelDocument.connect(boost::bind(&TreeWidget::slotRelabelDocument, this, bp::_1));
connectShowHidden = Application::Instance->signalShowHidden.connect(boost::bind(&TreeWidget::slotShowHidden, this, bp::_1));
// Gui::Document::signalChangedObject informs the App::Document property
// change, not view provider's own property, which is what the signal below
// for
connectChangedViewObj = Application::Instance->signalChangedObject.connect(
boost::bind(&TreeWidget::slotChangedViewObject, this, _1,_2));
boost::bind(&TreeWidget::slotChangedViewObject, this, bp::_1, bp::_2));
// make sure to show a horizontal scrollbar if needed
#if QT_VERSION >= 0x050000
@@ -2393,9 +2394,9 @@ void TreeWidget::onUpdateStatus(void)
if(!docItem->connectChgObject.connected()) {
docItem->connectChgObject = docItem->document()->signalChangedObject.connect(
boost::bind(&TreeWidget::slotChangeObject, this, _1, _2));
boost::bind(&TreeWidget::slotChangeObject, this, bp::_1, bp::_2));
docItem->connectTouchedObject = doc->signalTouchedObject.connect(
boost::bind(&TreeWidget::slotTouchedObject, this, _1));
boost::bind(&TreeWidget::slotTouchedObject, this, bp::_1));
}
if(doc->testStatus(App::Document::PartialDoc))
@@ -2973,26 +2974,26 @@ DocumentItem::DocumentItem(const Gui::Document* doc, QTreeWidgetItem * parent)
: QTreeWidgetItem(parent, TreeWidget::DocumentType), pDocument(const_cast<Gui::Document*>(doc))
{
// Setup connections
connectNewObject = doc->signalNewObject.connect(boost::bind(&DocumentItem::slotNewObject, this, _1));
connectNewObject = doc->signalNewObject.connect(boost::bind(&DocumentItem::slotNewObject, this, bp::_1));
connectDelObject = doc->signalDeletedObject.connect(
boost::bind(&TreeWidget::slotDeleteObject, getTree(), _1));
boost::bind(&TreeWidget::slotDeleteObject, getTree(), bp::_1));
if(!App::GetApplication().isRestoring()) {
connectChgObject = doc->signalChangedObject.connect(
boost::bind(&TreeWidget::slotChangeObject, getTree(), _1, _2));
boost::bind(&TreeWidget::slotChangeObject, getTree(), bp::_1, bp::_2));
connectTouchedObject = doc->getDocument()->signalTouchedObject.connect(
boost::bind(&TreeWidget::slotTouchedObject, getTree(), _1));
boost::bind(&TreeWidget::slotTouchedObject, getTree(), bp::_1));
}
connectEdtObject = doc->signalInEdit.connect(boost::bind(&DocumentItem::slotInEdit, this, _1));
connectResObject = doc->signalResetEdit.connect(boost::bind(&DocumentItem::slotResetEdit, this, _1));
connectEdtObject = doc->signalInEdit.connect(boost::bind(&DocumentItem::slotInEdit, this, bp::_1));
connectResObject = doc->signalResetEdit.connect(boost::bind(&DocumentItem::slotResetEdit, this, bp::_1));
connectHltObject = doc->signalHighlightObject.connect(
boost::bind(&DocumentItem::slotHighlightObject, this, _1,_2,_3,_4,_5));
boost::bind(&DocumentItem::slotHighlightObject, this, bp::_1, bp::_2, bp::_3, bp::_4, bp::_5));
connectExpObject = doc->signalExpandObject.connect(
boost::bind(&DocumentItem::slotExpandObject, this, _1,_2,_3,_4));
connectScrObject = doc->signalScrollToObject.connect(boost::bind(&DocumentItem::slotScrollToObject, this, _1));
boost::bind(&DocumentItem::slotExpandObject, this, bp::_1, bp::_2, bp::_3, bp::_4));
connectScrObject = doc->signalScrollToObject.connect(boost::bind(&DocumentItem::slotScrollToObject, this, bp::_1));
auto adoc = doc->getDocument();
connectRecomputed = adoc->signalRecomputed.connect(boost::bind(&DocumentItem::slotRecomputed, this, _1, _2));
connectRecomputed = adoc->signalRecomputed.connect(boost::bind(&DocumentItem::slotRecomputed, this, bp::_1, bp::_2));
connectRecomputedObj = adoc->signalRecomputedObject.connect(
boost::bind(&DocumentItem::slotRecomputedObject, this, _1));
boost::bind(&DocumentItem::slotRecomputedObject, this, bp::_1));
setFlags(Qt::ItemIsEnabled|Qt::ItemIsSelectable/*|Qt::ItemIsEditable*/);
src/Gui/ViewProvider.cpp
+1 -1
View File
@@ -38,6 +38,7 @@
# include <Inventor/actions/SoGetMatrixAction.h>
# include <Inventor/actions/SoSearchAction.h>
# include <Inventor/actions/SoGetBoundingBoxAction.h>
# include <boost/bind/bind.hpp>
#endif
/// Here the FreeCAD includes sorted by Base,App,Gui......
@@ -61,7 +62,6 @@
#include "ViewProviderLink.h"
#include "ViewParams.h"
#include <boost/bind.hpp>
FC_LOG_LEVEL_INIT("ViewProvider",true,true)
src/Gui/ViewProviderLink.cpp
+1 -1
View File
@@ -47,7 +47,7 @@
#include <QFileInfo>
#include <QMenu>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <Base/Console.h>
#include <Base/PlacementPy.h>
#include <Base/MatrixPy.h>
src/Gui/ViewProviderOrigin.cpp
-1
View File
@@ -29,7 +29,6 @@
# include <QPixmap>
# include <Inventor/actions/SoGetBoundingBoxAction.h>
# include <Inventor/nodes/SoSeparator.h>
# include <boost/bind.hpp>
#endif
src/Gui/ViewProviderOriginGroup.cpp
-3
View File
@@ -23,9 +23,6 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Inventor/actions/SoGetBoundingBoxAction.h>
# include <Inventor/nodes/SoSeparator.h>
# include <boost/bind.hpp>
#endif
#include <Base/Console.h>
src/Gui/ViewProviderOriginGroupExtension.cpp
+7 -5
View File
@@ -25,6 +25,9 @@
#include "PreCompiled.h"
#ifndef _PreComp_
#include <boost/bind/bind.hpp>
#include <Inventor/actions/SoGetBoundingBoxAction.h>
#include <Inventor/nodes/SoSeparator.h>
#endif
#include "ViewProviderOriginGroupExtension.h"
@@ -39,11 +42,10 @@
#include <App/Document.h>
#include <App/Origin.h>
#include <Base/Console.h>
#include <boost/bind.hpp>
#include <Inventor/actions/SoGetBoundingBoxAction.h>
#include <Inventor/nodes/SoSeparator.h>
using namespace Gui;
namespace bp = boost::placeholders;
EXTENSION_PROPERTY_SOURCE(Gui::ViewProviderOriginGroupExtension, Gui::ViewProviderGeoFeatureGroupExtension)
@@ -97,10 +99,10 @@ void ViewProviderOriginGroupExtension::extensionAttach(App::DocumentObject *pcOb
assert ( gdoc );
connectChangedObjectApp = adoc->signalChangedObject.connect (
boost::bind ( &ViewProviderOriginGroupExtension::slotChangedObjectApp, this, _1) );
boost::bind ( &ViewProviderOriginGroupExtension::slotChangedObjectApp, this, bp::_1) );
connectChangedObjectGui = gdoc->signalChangedObject.connect (
boost::bind ( &ViewProviderOriginGroupExtension::slotChangedObjectGui, this, _1) );
boost::bind ( &ViewProviderOriginGroupExtension::slotChangedObjectGui, this, bp::_1) );
}
void ViewProviderOriginGroupExtension::extensionUpdateData( const App::Property* prop ) {
src/Gui/ViewProviderPart.cpp
+1 -1
View File
@@ -27,7 +27,7 @@
# include <QApplication>
# include <QMenu>
# include <QPixmap>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include <App/Part.h>
src/Gui/ViewProviderPythonFeature.cpp
+5 -4
View File
@@ -30,7 +30,7 @@
# include <QFileInfo>
# include <QMenu>
# include <QPixmap>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <Inventor/nodes/SoDrawStyle.h>
# include <Inventor/nodes/SoMaterial.h>
# include <Inventor/nodes/SoSeparator.h>
@@ -71,6 +71,7 @@ FC_LOG_LEVEL_INIT("ViewProviderPythonFeature",true,true)
using namespace Gui;
namespace bp = boost::placeholders;
// #0003564: Python objects: updateData calls to proxy instance that should have been deleted
// See https://forum.freecadweb.org/viewtopic.php?f=22&t=30429&p=252429#p252429
@@ -274,11 +275,11 @@ void ViewProviderPythonFeatureObserver::slotDeleteObject(const Gui::ViewProvider
ViewProviderPythonFeatureObserver::ViewProviderPythonFeatureObserver()
{
Gui::Application::Instance->signalDeletedObject.connect(boost::bind
(&ViewProviderPythonFeatureObserver::slotDeleteObject, this, _1));
(&ViewProviderPythonFeatureObserver::slotDeleteObject, this, bp::_1));
Gui::Application::Instance->signalNewObject.connect(boost::bind
(&ViewProviderPythonFeatureObserver::slotAppendObject, this, _1));
(&ViewProviderPythonFeatureObserver::slotAppendObject, this, bp::_1));
Gui::Application::Instance->signalDeleteDocument.connect(boost::bind
(&ViewProviderPythonFeatureObserver::slotDeleteDocument, this, _1));
(&ViewProviderPythonFeatureObserver::slotDeleteDocument, this, bp::_1));
}
ViewProviderPythonFeatureObserver::~ViewProviderPythonFeatureObserver()
src/Gui/ViewProviderTextDocument.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#ifndef _PreComp_
# include <QMenu>
# include <QPlainTextEdit>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include <Base/Type.h>
src/Mod/Assembly/App/opendcm/core/imp/clustergraph_imp.hpp
+5 -3
View File
@@ -27,7 +27,9 @@
#include <boost/fusion/include/at_c.hpp>
#include <boost/fusion/include/make_vector.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
namespace bp = boost::placeholders;
namespace dcm {
@@ -686,7 +688,7 @@ void ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::downstreamRemo
re.push_back(* (it.first));
};
std::for_each(re.begin(), re.end(), boost::bind(&ClusterGraph::simpleRemoveEdge, this, _1));
std::for_each(re.begin(), re.end(), boost::bind(&ClusterGraph::simpleRemoveEdge, this, bp::_1));
//if we have the real vertex here and not only a containing cluster we can delete it
if(!isCluster(res.first)) {
@@ -751,7 +753,7 @@ template<typename Functor>
void ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::removeEdge(LocalEdge id, Functor& f) {
std::vector<edge_bundle_single>& vec = fusion::at_c<1> ((*this) [id]);
std::for_each(vec.begin(), vec.end(), boost::bind<void> (boost::ref(apply_remove_prediacte<placehoder, ClusterGraph> (f, -1)), _1));
std::for_each(vec.begin(), vec.end(), boost::bind<void> (boost::ref(apply_remove_prediacte<placehoder, ClusterGraph> (f, -1)), bp::_1));
boost::remove_edge(id, *this);
};
src/Mod/Assembly/App/opendcm/module3d/imp/module_imp.hpp
+3 -2
View File
@@ -22,10 +22,11 @@
#include "../module.hpp"
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include "constraint3d_imp.hpp"
#include "geometry3d_imp.hpp"
namespace bp = boost::placeholders;
namespace dcm {
@@ -112,7 +113,7 @@ void Module3D<Typelist, ID>::type<Sys>::inheriter_base::removeGeometry3D(Geom g)
g->template emitSignal<remove>(g);
//remove the vertex from graph and emit all edges that get removed with the functor
boost::function<void(GlobalEdge)> functor = boost::bind(&inheriter_base::apply_edge_remove, this, _1);
boost::function<void(GlobalEdge)> functor = boost::bind(&inheriter_base::apply_edge_remove, this, bp::_1);
m_this->m_cluster->removeVertex(v, functor);
m_this->erase(g);
};
src/Mod/Assembly/App/opendcm/moduleShape3d/generator.hpp
+4 -3
View File
@@ -28,7 +28,8 @@
#include "defines.hpp"
#include <boost/exception/errinfo_errno.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
namespace bp = boost::placeholders;
namespace dcm {
@@ -159,7 +160,7 @@ struct segment3D {
base::append(g1);
g1->template linkTo<tag::segment3D>(base::m_shape,0);
g1->template setProperty<typename base::shape_purpose_prop>(line);
g1->template connectSignal<recalculated>(boost::bind(&base::Shape3D::recalc, base::m_shape, _1));
g1->template connectSignal<recalculated>(boost::bind(&base::Shape3D::recalc, base::m_shape, bp::_1));
//we have a segment, lets link the two points to it
boost::shared_ptr<Geometry3D> g2 = base::m_system->createGeometry3D();
@@ -205,7 +206,7 @@ struct segment3D {
base::append(g3);
g3->template linkTo<tag::segment3D>(base::m_shape,0);
g3->template setProperty<typename base::shape_purpose_prop>(line);
g3->template connectSignal<recalculated>(boost::bind(&base::Shape3D::recalc, base::m_shape, _1));
g3->template connectSignal<recalculated>(boost::bind(&base::Shape3D::recalc, base::m_shape, bp::_1));
//link the points to our new segment
g1->template linkTo<tag::point3D>(base::m_shape, 0);
src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp
-1
View File
@@ -42,7 +42,6 @@
#include <Gui/ViewProvider.h>
#include <Gui/MainWindow.h>
#include <Gui/BitmapFactory.h>
#include <boost/bind.hpp>
using namespace AssemblyGui;
using namespace Gui::TaskView;
src/Mod/Assembly/Gui/Workbench.cpp
+10 -10
View File
@@ -25,7 +25,7 @@
#ifndef _PreComp_
# include <qobject.h>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
@@ -39,7 +39,7 @@
#include "Workbench.h"
using namespace AssemblyGui;
namespace bp = boost::placeholders;
@@ -202,10 +202,10 @@ void Workbench::activated()
//}
// 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));
Gui::Control().showModelView();
@@ -216,10 +216,10 @@ void Workbench::deactivated()
Gui::Command::doCommand(Gui::Command::Doc,"AssemblyGui.setActiveAssembly(None)");
// Disconnect all document signals...
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));
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));
Gui::Workbench::deactivated();
removeTaskWatcher();
src/Mod/Drawing/Gui/TaskOrthoViews.cpp
+4 -3
View File
@@ -37,12 +37,13 @@
#include <Mod/Part/App/PartFeature.h>
#include <Mod/Drawing/App/FeaturePage.h>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
using namespace Gui;
using namespace DrawingGui;
using namespace std;
namespace bp = boost::placeholders;
#ifndef PI
@@ -304,9 +305,9 @@ OrthoViews::OrthoViews(App::Document* doc, const char * pagename, const char * p
num_gaps_x = num_gaps_y = 0;
this->connectDocumentDeletedObject = doc->signalDeletedObject.connect(boost::bind
(&OrthoViews::slotDeletedObject, this, _1));
(&OrthoViews::slotDeletedObject, this, bp::_1));
this->connectApplicationDeletedDocument = App::GetApplication().signalDeleteDocument.connect(boost::bind
(&OrthoViews::slotDeletedDocument, this, _1));
(&OrthoViews::slotDeletedDocument, this, bp::_1));
}
OrthoViews::~OrthoViews()
src/Mod/Fem/Gui/PreCompiled.h
+1 -1
View File
@@ -69,7 +69,7 @@
#include <sstream>
// boost
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <boost/lexical_cast.hpp>
#ifdef FC_OS_WIN32
src/Mod/Fem/Gui/ViewProviderAnalysis.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
#ifndef _PreComp_
# include <Standard_math.hxx>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <QAction>
# include <QMenu>
#endif
src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp
+3 -2
View File
@@ -47,7 +47,7 @@
# include <QMessageBox>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <math.h>
#endif
@@ -69,12 +69,13 @@
#include "ui_SphereWidget.h"
using namespace FemGui;
namespace bp = boost::placeholders;
void FunctionWidget::setViewProvider(ViewProviderFemPostFunction* view) {
m_view = view;
m_object = static_cast<Fem::FemPostFunction*>(view->getObject());
m_connection = m_object->getDocument()->signalChangedObject.connect(boost::bind(&FunctionWidget::onObjectsChanged, this, _1, _2));
m_connection = m_object->getDocument()->signalChangedObject.connect(boost::bind(&FunctionWidget::onObjectsChanged, this, bp::_1, bp::_2));
}
void FunctionWidget::onObjectsChanged(const App::DocumentObject& obj, const App::Property& p) {
src/Mod/Inspection/App/InspectionFeature.cpp
+3 -2
View File
@@ -36,7 +36,7 @@
#include <QFutureWatcher>
#include <QtConcurrentMap>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <Base/Console.h>
#include <Base/Exception.h>
@@ -59,6 +59,7 @@
using namespace Inspection;
namespace bp = boost::placeholders;
InspectActualMesh::InspectActualMesh(const Mesh::MeshObject& rMesh) : _mesh(rMesh.getKernel())
{
@@ -786,7 +787,7 @@ App::DocumentObjectExecReturn* Feature::execute(void)
std::generate(index.begin(), index.end(), Base::iotaGen<unsigned long>(0));
DistanceInspection check(this->SearchRadius.getValue(), actual, inspectNominal);
QFuture<float> future = QtConcurrent::mapped
(index, boost::bind(&DistanceInspection::mapped, &check, _1));
(index, boost::bind(&DistanceInspection::mapped, &check, bp::_1));
//future.waitForFinished(); // blocks the GUI
Base::FutureWatcherProgress progress("Inspecting...", actual->countPoints());
QFutureWatcher<float> watcher;
src/Mod/Mesh/App/Core/Curvature.cpp
+3 -2
View File
@@ -28,7 +28,7 @@
#include <QFuture>
#include <QFutureWatcher>
#include <QtConcurrentMap>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
//#define OPTIMIZE_CURVATURE
#ifdef OPTIMIZE_CURVATURE
@@ -48,6 +48,7 @@
#include <Base/Tools.h>
using namespace MeshCore;
namespace bp = boost::placeholders;
MeshCurvature::MeshCurvature(const MeshKernel& kernel)
: myKernel(kernel), myMinPoints(20), myRadius(0.5f)
@@ -79,7 +80,7 @@ void MeshCurvature::ComputePerFace(bool parallel)
}
else {
QFuture<CurvatureInfo> future = QtConcurrent::mapped
(mySegment, boost::bind(&FacetCurvature::Compute, &face, _1));
(mySegment, boost::bind(&FacetCurvature::Compute, &face, bp::_1));
QFutureWatcher<CurvatureInfo> watcher;
watcher.setFuture(future);
watcher.waitForFinished();
src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp
-2
View File
@@ -31,8 +31,6 @@
#include "ui_DlgEvaluateMesh.h"
#include "DlgEvaluateSettings.h"
#include <boost/bind.hpp>
#include <Base/Interpreter.h>
#include <Base/Sequencer.h>
#include <Gui/Application.h>
src/Mod/Mesh/Gui/MeshEditor.cpp
+3 -2
View File
@@ -45,7 +45,7 @@
# include <Inventor/nodes/SoPickStyle.h>
# include <Inventor/nodes/SoSeparator.h>
# include <Inventor/nodes/SoShapeHints.h>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include "MeshEditor.h"
@@ -61,6 +61,7 @@
#include <Gui/View3DInventorViewer.h>
using namespace MeshGui;
namespace bp = boost::placeholders;
PROPERTY_SOURCE(MeshGui::ViewProviderFace, Gui::ViewProviderDocumentObject)
@@ -477,7 +478,7 @@ void MeshFillHole::startEditing(MeshGui::ViewProviderMesh* vp)
viewer->addEventCallback(SoEvent::getClassTypeId(),
MeshFillHole::fileHoleCallback, this);
myConnection = App::GetApplication().signalChangedObject.connect(
boost::bind(&MeshFillHole::slotChangedObject, this, _1, _2));
boost::bind(&MeshFillHole::slotChangedObject, this, bp::_1, bp::_2));
Gui::coinRemoveAllChildren(myBoundariesRoot);
myBoundariesRoot->addChild(viewer->getHeadlight());
src/Mod/Mesh/Gui/ViewProvider.cpp
+5 -5
View File
@@ -57,7 +57,7 @@
#include <QFuture>
#include <QFutureWatcher>
#include <QtConcurrentMap>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
/// Here the FreeCAD includes sorted by Base,App,Gui......
#include <Base/Console.h>
@@ -100,7 +100,6 @@
#include <Mod/Mesh/App/MeshFeature.h>
#include <Mod/Mesh/Gui/ViewProviderMeshPy.h>
#include <zipios++/gzipoutputstream.h>
#include <boost/bind.hpp>
#include "ViewProvider.h"
#include "SoFCIndexedFaceSet.h"
@@ -108,6 +107,7 @@
using namespace MeshGui;
namespace bp = boost::placeholders;
using Mesh::Feature;
using MeshCore::MeshKernel;
@@ -739,13 +739,13 @@ void ViewProviderMesh::setupContextMenu(QMenu* menu, QObject* receiver, const ch
act->setCheckable(true);
act->setChecked(pcMatBinding->value.getValue() == SoMaterialBinding::PER_FACE &&
highlightMode == "Component");
func->toggle(act, boost::bind(&ViewProviderMesh::setHighlightedComponents, this, _1));
func->toggle(act, boost::bind(&ViewProviderMesh::setHighlightedComponents, this, bp::_1));
QAction* seg = menu->addAction(QObject::tr("Display segments"));
seg->setCheckable(true);
seg->setChecked(pcMatBinding->value.getValue() == SoMaterialBinding::PER_FACE &&
highlightMode == "Segment");
func->toggle(seg, boost::bind(&ViewProviderMesh::setHighlightedSegments, this, _1));
func->toggle(seg, boost::bind(&ViewProviderMesh::setHighlightedSegments, this, bp::_1));
}
bool ViewProviderMesh::setEdit(int ModNum)
@@ -1383,7 +1383,7 @@ std::vector<unsigned long> ViewProviderMesh::getVisibleFacets(const SbViewportRe
Vertex v(kernel, grid, Base::convertTo<Base::Vector3f>(pos));
QFuture<bool> future = QtConcurrent::mapped
(points, boost::bind(&Vertex::visible, &v, _1));
(points, boost::bind(&Vertex::visible, &v, bp::_1));
QFutureWatcher<bool> watcher;
watcher.setFuture(future);
watcher.waitForFinished();
src/Mod/MeshPart/Gui/CrossSections.cpp
+3 -2
View File
@@ -36,7 +36,7 @@
# include <QKeyEvent>
# include <QMessageBox>
# include <QtConcurrentMap>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
# include <Python.h>
# include <Inventor/nodes/SoBaseColor.h>
# include <Inventor/nodes/SoCoordinate3.h>
@@ -63,6 +63,7 @@
#include <Base/UnitsApi.h>
using namespace MeshPartGui;
namespace bp = boost::placeholders;
namespace MeshPartGui {
class ViewProviderCrossSections : public Gui::ViewProvider
@@ -274,7 +275,7 @@ void CrossSections::apply()
MeshCrossSection cs(kernel, grid, a, b, c, connectEdges, eps);
QFuture< std::list<TopoDS_Wire> > future = QtConcurrent::mapped
(d, boost::bind(&MeshCrossSection::section, &cs, _1));
(d, boost::bind(&MeshCrossSection::section, &cs, bp::_1));
future.waitForFinished();
TopoDS_Compound comp;
src/Mod/Part/App/PartFeature.cpp
+5 -4
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) {
src/Mod/Part/App/PreCompiled.h
+1 -1
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>
src/Mod/Part/Gui/CrossSections.cpp
+3 -2
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;
src/Mod/Part/Gui/DlgBooleanOperation.cpp
+4 -3
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();
}
src/Mod/Part/Gui/DlgFilletEdges.cpp
+4 -3
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&)),
src/Mod/Part/Gui/Mirroring.cpp
-1
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>
src/Mod/Part/Gui/PreCompiled.h
+1 -1
View File
@@ -176,7 +176,7 @@
// Boost
#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
// Qt Toolkit
#ifndef __Qt4All__
src/Mod/Part/Gui/TaskAttacher.cpp
+4 -3
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);
src/Mod/Part/Gui/TaskDimension.cpp
+4 -2
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));
}
}
};
src/Mod/Part/Gui/TaskFaceColors.cpp
+5 -4
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()
src/Mod/Part/Gui/ViewProviderSpline.cpp
+3 -2
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)
src/Mod/PartDesign/App/Body.cpp
-1
View File
@@ -24,7 +24,6 @@
#include "PreCompiled.h"
#ifndef _PreComp_
#include <boost/bind.hpp>
#endif
#include <Base/Console.h>
src/Mod/PartDesign/App/ShapeBinder.cpp
+4 -3
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) {
src/Mod/PartDesign/Gui/PreCompiled.h
+1 -1
View File
@@ -62,7 +62,7 @@
#include <algorithm>
// Boost
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
// OCC
#include <Standard_math.hxx>
src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
-1
View File
@@ -31,7 +31,6 @@
# include <QMessageBox>
# include <Precision.hxx>
# include <Standard_Failure.hxx>
# include <boost/bind.hpp>
#endif
#include <Base/Console.h>
src/Mod/PartDesign/Gui/TaskHoleParameters.cpp
+3 -2
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);
}
src/Mod/PartDesign/Gui/TaskHoleParameters.h
+1 -1
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"
src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
-2
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"
src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp
+3 -2
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()
src/Mod/PartDesign/Gui/ViewProviderBody.cpp
+4 -3
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)
src/Mod/PartDesign/Gui/Workbench.cpp
+12 -11
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
src/Mod/PartDesign/Gui/WorkflowManager.cpp
+5 -4
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() {
src/Mod/Path/App/Area.cpp
+3
View File
@@ -21,6 +21,9 @@
****************************************************************************/
#include "PreCompiled.h"
// From Boost 1.75 on the geometry component requires C++14
#define BOOST_GEOMETRY_DISABLE_DEPRECATED_03_WARNING
#ifndef _PreComp_
# include <cfloat>
# include <boost/version.hpp>
src/Mod/Path/libarea/PythonStuff.cpp
+4 -2
View File
@@ -30,8 +30,10 @@
#pragma implementation
#endif
#include <boost/progress.hpp>
#include <boost/timer.hpp>
#define BOOST_BIND_GLOBAL_PLACEHOLDERS
//#include <boost/progress.hpp>
//#include <boost/timer.hpp>
#include <boost/foreach.hpp>
#include <boost/python.hpp>
#include <boost/python/module.hpp>
src/Mod/ReverseEngineering/App/ApproxSurface.cpp
+3 -2
View File
@@ -30,7 +30,7 @@
#include <QFuture>
#include <QFutureWatcher>
#include <QtConcurrentMap>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <Mod/Mesh/App/Core/Approximation.h>
#include <Base/Sequencer.h>
@@ -40,6 +40,7 @@
#include "ApproxSurface.h"
using namespace Reen;
namespace bp = boost::placeholders;
// SplineBasisfunction
@@ -1090,7 +1091,7 @@ bool BSplineParameterCorrection::SolveWithSmoothing(double fWeight)
std::generate(columns.begin(), columns.end(), Base::iotaGen<int>(0));
ScalarProduct scalar(M);
QFuture< std::vector<double> > future = QtConcurrent::mapped
(columns, boost::bind(&ScalarProduct::multiply, &scalar, _1));
(columns, boost::bind(&ScalarProduct::multiply, &scalar, bp::_1));
QFutureWatcher< std::vector<double> > watcher;
watcher.setFuture(future);
watcher.waitForFinished();
src/Mod/Sandbox/App/DocumentProtector.h
-1
View File
@@ -25,7 +25,6 @@
#define SANDBOX_DOCUMENTPROTECTOR_H
#include <string>
#include <boost/bind.hpp>
#include <App/DocumentObserver.h>
namespace App {
src/Mod/Sandbox/Gui/Command.cpp
+4 -2
View File
@@ -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;
src/Mod/Sandbox/Gui/TaskPanelView.cpp
+8 -7
View File
@@ -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"));
src/Mod/Sketcher/App/PreCompiled.h
+1 -1
View File
@@ -59,7 +59,7 @@
#include <QDateTime>
// Boost
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <boost/shared_ptr.hpp>
// Opencascade
src/Mod/Sketcher/App/SketchObject.cpp
+5 -4
View File
@@ -58,7 +58,7 @@
# include <Standard_Version.hxx>
# include <cmath>
# include <vector>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
//# include <QtGlobal>
#endif
@@ -88,6 +88,7 @@
using namespace Sketcher;
using namespace Base;
namespace bp = boost::placeholders;
FC_LOG_LEVEL_INIT("Sketch",true,true)
@@ -134,10 +135,10 @@ SketchObject::SketchObject()
noRecomputes=false;
ExpressionEngine.setValidator(boost::bind(&Sketcher::SketchObject::validateExpression, this, _1, _2));
ExpressionEngine.setValidator(boost::bind(&Sketcher::SketchObject::validateExpression, this, bp::_1, bp::_2));
constraintsRemovedConn = Constraints.signalConstraintsRemoved.connect(boost::bind(&Sketcher::SketchObject::constraintsRemoved, this, _1));
constraintsRenamedConn = Constraints.signalConstraintsRenamed.connect(boost::bind(&Sketcher::SketchObject::constraintsRenamed, this, _1));
constraintsRemovedConn = Constraints.signalConstraintsRemoved.connect(boost::bind(&Sketcher::SketchObject::constraintsRemoved, this, bp::_1));
constraintsRenamedConn = Constraints.signalConstraintsRenamed.connect(boost::bind(&Sketcher::SketchObject::constraintsRenamed, this, bp::_1));
analyser = new SketchAnalysis(this);
}
src/Mod/Sketcher/Gui/PreCompiled.h
+1 -1
View File
@@ -67,7 +67,7 @@
// Boost
#include <boost/math/special_functions/fpclassify.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <boost/scoped_ptr.hpp>
#ifdef FC_OS_WIN32
src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp
+4 -3
View File
@@ -24,7 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include "TaskDlgEditSketch.h"
@@ -32,6 +32,7 @@
#include <Gui/Command.h>
using namespace SketcherGui;
namespace bp = boost::placeholders;
//**************************************************************************
@@ -75,9 +76,9 @@ TaskDlgEditSketch::TaskDlgEditSketch(ViewProviderSketch *sketchView)
App::Document* document = sketchView->getObject()->getDocument();
connectUndoDocument =
document->signalUndo.connect(boost::bind(&TaskDlgEditSketch::slotUndoDocument, this, _1));
document->signalUndo.connect(boost::bind(&TaskDlgEditSketch::slotUndoDocument, this, bp::_1));
connectRedoDocument =
document->signalRedo.connect(boost::bind(&TaskDlgEditSketch::slotRedoDocument, this, _1));
document->signalRedo.connect(boost::bind(&TaskDlgEditSketch::slotRedoDocument, this, bp::_1));
}
TaskDlgEditSketch::~TaskDlgEditSketch()
src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp
+1 -1
View File
@@ -33,7 +33,7 @@
# include <QStyledItemDelegate>
# include <QPainter>
# include <QPixmapCache>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include "TaskSketcherConstrains.h"
src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
+1 -1
View File
@@ -31,7 +31,7 @@
# include <QString>
# include <QImage>
# include <QPixmap>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include "TaskSketcherElements.h"

Some files were not shown because too many files have changed in this diff Show More