summaryrefslogtreecommitdiffstats
path: root/kig/misc/object_constructor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kig/misc/object_constructor.cpp')
-rw-r--r--kig/misc/object_constructor.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kig/misc/object_constructor.cpp b/kig/misc/object_constructor.cpp
index ae2a37d0..6db3d802 100644
--- a/kig/misc/object_constructor.cpp
+++ b/kig/misc/object_constructor.cpp
@@ -101,7 +101,7 @@ void StandardConstructorBase::handlePrelim(
{
assert ( margsparser.check( os ) != ArgsParser::Invalid );
std::vector<ObjectCalcer*> args = margsparser.parse( os );
- p.setBrushStyle( Qt::NoBrush );
+ p.setBrushStyle( TQt::NoBrush );
p.setBrushColor( TQt::red );
p.setPen( TQPen ( TQt::red, 1) );
p.setWidth( -1 ); // -1 means the default width for the object being
@@ -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 )