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

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

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

29
src/App/DocumentObserver.cpp
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));
}
}