diff options
Diffstat (limited to 'kig/misc')
| -rw-r--r-- | kig/misc/object_constructor.cpp | 14 | ||||
| -rw-r--r-- | kig/misc/special_constructors.cpp | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/kig/misc/object_constructor.cpp b/kig/misc/object_constructor.cpp index 625554a8..6db3d802 100644 --- a/kig/misc/object_constructor.cpp +++ b/kig/misc/object_constructor.cpp @@ -130,7 +130,7 @@ void SimpleObjectTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPai Args args; using namespace std; transform( parents.begin(), parents.end(), - back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); + back_inserter( args ), mem_fn( &ObjectCalcer::imp ) ); ObjectImp* data = mtype->calc( args, doc ); drawer.draw( *data, p, true ); delete data; @@ -184,7 +184,7 @@ void MultiObjectTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPain Args args; using namespace std; transform( parents.begin(), parents.end(), - back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); + back_inserter( args ), mem_fn( &ObjectCalcer::imp ) ); for ( vector<int>::const_iterator i = mparams.begin(); i != mparams.end(); ++i ) { @@ -302,7 +302,7 @@ TQString StandardConstructorBase::useText( const ObjectCalcer& o, const std::vec { using namespace std; Args args; - transform( sel.begin(), sel.end(), back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); + transform( sel.begin(), sel.end(), back_inserter( args ), mem_fn( &ObjectCalcer::imp ) ); std::string ret = margsparser.usetext( o.imp(), args ); if ( ret.empty() ) return TQString(); @@ -315,7 +315,7 @@ TQString StandardConstructorBase::selectStatement( { using namespace std; Args args; - transform( sel.begin(), sel.end(), back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); + transform( sel.begin(), sel.end(), back_inserter( args ), mem_fn( &ObjectCalcer::imp ) ); std::string ret = margsparser.selectStatement( args ); if ( ret.empty() ) return TQString(); @@ -419,7 +419,7 @@ TQString MacroConstructor::selectStatement( using namespace std; Args args; transform( sel.begin(), sel.end(), back_inserter( args ), - mem_fun( &ObjectCalcer::imp ) ); + mem_fn( &ObjectCalcer::imp ) ); std::string ret = mparser.selectStatement( args ); if ( ret.empty() ) return TQString(); else return i18n( ret.c_str() ); @@ -432,7 +432,7 @@ TQString MacroConstructor::useText( const ObjectCalcer& o, const std::vector<Obj using namespace std; Args args; transform( sel.begin(), sel.end(), back_inserter( args ), - mem_fun( &ObjectCalcer::imp ) ); + mem_fn( &ObjectCalcer::imp ) ); std::string ret = mparser.usetext( o.imp(), args ); if ( ret.empty() ) return TQString(); else return i18n( ret.c_str() ); @@ -447,7 +447,7 @@ void MacroConstructor::handlePrelim( KigPainter& p, const std::vector<ObjectCalc using namespace std; Args args; transform( sel.begin(), sel.end(), back_inserter( args ), - mem_fun( &ObjectCalcer::imp ) ); + mem_fn( &ObjectCalcer::imp ) ); args = mparser.parse( args ); std::vector<ObjectImp*> ret = mhier.calc( args, doc ); for ( uint i = 0; i < ret.size(); ++i ) diff --git a/kig/misc/special_constructors.cpp b/kig/misc/special_constructors.cpp index 1cc27ecb..c8137966 100644 --- a/kig/misc/special_constructors.cpp +++ b/kig/misc/special_constructors.cpp @@ -116,7 +116,7 @@ void ConicRadicalConstructor::drawprelim( { Args args; std::transform( parents.begin(), parents.end(), - std::back_inserter( args ), std::mem_fun( &ObjectCalcer::imp ) ); + std::back_inserter( args ), std::mem_fn( &ObjectCalcer::imp ) ); for ( int i = -1; i < 2; i += 2 ) { IntImp root( i ); @@ -803,7 +803,7 @@ void PolygonBCVConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& Args args; std::transform( parents.begin(), parents.end(), - std::back_inserter( args ), std::mem_fun( &ObjectCalcer::imp ) ); + std::back_inserter( args ), std::mem_fn( &ObjectCalcer::imp ) ); ObjectImp* data = mtype->calc( args, doc ); drawer.draw( *data, p, true ); @@ -1196,7 +1196,7 @@ void MeasureTransportConstructor::drawprelim( const ObjectDrawer& drawer, Args args; using namespace std; transform( parents.begin(), parents.end(), - back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); + back_inserter( args ), mem_fn( &ObjectCalcer::imp ) ); ObjectImp* data = mtype->calc( args, doc ); drawer.draw( *data, p, true ); delete data; |