Use STL bind (not Boost) and the std::placeholders.
This commit is contained in:
parent
f22b7000b6
commit
d877a311b5
|
@ -15,7 +15,6 @@
|
||||||
|
|
||||||
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <boost/bind.hpp>
|
|
||||||
#include <QAction>
|
#include <QAction>
|
||||||
#include <QMenu>
|
#include <QMenu>
|
||||||
#include <QMenuBar>
|
#include <QMenuBar>
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
|
|
||||||
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <boost/bind.hpp>
|
|
||||||
#include <QAction>
|
#include <QAction>
|
||||||
#include <QMenu>
|
#include <QMenu>
|
||||||
#include <QMenuBar>
|
#include <QMenuBar>
|
||||||
|
|
|
@ -17,8 +17,8 @@
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <functional>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <boost/bind.hpp>
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QImage>
|
#include <QImage>
|
||||||
#include "hurricane/configuration/Configuration.h"
|
#include "hurricane/configuration/Configuration.h"
|
||||||
|
@ -200,7 +200,7 @@ namespace Hurricane {
|
||||||
//cerr << "(w,h) = (" << w << "," << h << ")" << endl;
|
//cerr << "(w,h) = (" << w << "," << h << ")" << endl;
|
||||||
//cerr << "(dw,dh) = (" << drawingWidth << "," << drawingHeight << ")" << endl;
|
//cerr << "(dw,dh) = (" << drawingWidth << "," << drawingHeight << ")" << endl;
|
||||||
|
|
||||||
CellWidget::PainterCb_t cb = boost::bind( &CellImage::pageDecorate, this, _1 );
|
CellWidget::PainterCb_t cb = std::bind( &CellImage::pageDecorate, this, std::placeholders::_1 );
|
||||||
_cellWidget->copyToImage( _image, cb );
|
_cellWidget->copyToImage( _image, cb );
|
||||||
|
|
||||||
return _image;
|
return _image;
|
||||||
|
|
|
@ -16,8 +16,8 @@
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <functional>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <boost/bind.hpp>
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QPrinter>
|
#include <QPrinter>
|
||||||
#include "hurricane/configuration/Configuration.h"
|
#include "hurricane/configuration/Configuration.h"
|
||||||
|
@ -378,7 +378,7 @@ namespace Hurricane {
|
||||||
//cerr << " (xpaper,ypaper) = (" << _xpaper << "," << _ypaper << ")" << endl;
|
//cerr << " (xpaper,ypaper) = (" << _xpaper << "," << _ypaper << ")" << endl;
|
||||||
//cerr << " (dw,dh) = (" << _drawingWidth << "," << _drawingHeight << ")" << endl;
|
//cerr << " (dw,dh) = (" << _drawingWidth << "," << _drawingHeight << ")" << endl;
|
||||||
|
|
||||||
CellWidget::PainterCb_t cb = boost::bind( &CellPrinter::pageDecorate, this, _1 );
|
CellWidget::PainterCb_t cb = std::bind( &CellPrinter::pageDecorate, this, std::placeholders::_1 );
|
||||||
_cellWidget->copyToPrinter( _xpaper, _ypaper, _printer, cb );
|
_cellWidget->copyToPrinter( _xpaper, _ypaper, _printer, cb );
|
||||||
|
|
||||||
_printer = NULL;
|
_printer = NULL;
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
// +-----------------------------------------------------------------+
|
// +-----------------------------------------------------------------+
|
||||||
|
|
||||||
|
|
||||||
#include <boost/bind.hpp>
|
#include <functional>
|
||||||
#include <QAction>
|
#include <QAction>
|
||||||
#include <QMenu>
|
#include <QMenu>
|
||||||
#include <QMenuBar>
|
#include <QMenuBar>
|
||||||
|
@ -223,7 +223,7 @@ namespace Katana {
|
||||||
KatanaEngine* katana = KatanaEngine::get( cell );
|
KatanaEngine* katana = KatanaEngine::get( cell );
|
||||||
if (not katana) {
|
if (not katana) {
|
||||||
katana = KatanaEngine::create( cell );
|
katana = KatanaEngine::create( cell );
|
||||||
katana->setPostEventCb( boost::bind(&GraphicKatanaEngine::postEvent,this) );
|
katana->setPostEventCb( std::bind(&GraphicKatanaEngine::postEvent,this) );
|
||||||
katana->setViewer( _viewer );
|
katana->setViewer( _viewer );
|
||||||
katana->printConfiguration();
|
katana->printConfiguration();
|
||||||
katana->digitalInit();
|
katana->digitalInit();
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
// +-----------------------------------------------------------------+
|
// +-----------------------------------------------------------------+
|
||||||
|
|
||||||
|
|
||||||
#include <boost/bind.hpp>
|
#include <functional>
|
||||||
#include <QAction>
|
#include <QAction>
|
||||||
#include <QMenu>
|
#include <QMenu>
|
||||||
#include <QMenuBar>
|
#include <QMenuBar>
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
// +-----------------------------------------------------------------+
|
// +-----------------------------------------------------------------+
|
||||||
|
|
||||||
|
|
||||||
#include <boost/bind.hpp>
|
#include <functional>
|
||||||
#include <QAction>
|
#include <QAction>
|
||||||
#include <QMenu>
|
#include <QMenu>
|
||||||
#include <QMenuBar>
|
#include <QMenuBar>
|
||||||
|
|
Loading…
Reference in New Issue