1 files changed, 7 insertions, 7 deletions

diff --git a/kig/modes/macro.cpp b/kig/modes/macro.cpp
index 8fe16b4d..be69d80b 100644
--- a/kig/modes/macro.cpp
+++ b/kig/modes/macro.cpp
@@ -94,11 +94,11 @@ void DefineMacroMode::namePageEntered()
   std::vector<ObjectCalcer*> given;
   std::transform( mgiven.begin(), mgiven.end(),
                   std::back_inserter( given ),
-                  std::mem_fun( memfun ) );
+                  std::mem_fn( memfun ) );
   std::vector<ObjectCalcer*> final;
   std::transform( mfinal.begin(), mfinal.end(),
                   std::back_inserter( final ),
-                  std::mem_fun( memfun ) );
+                  std::mem_fn( memfun ) );
   ObjectHierarchy hier( given, final );
   if ( hier.resultDoesNotDependOnGiven() )
   {
@@ -132,11 +132,11 @@ void DefineMacroMode::finishPressed()
   std::vector<ObjectCalcer*> given;
   std::transform( mgiven.begin(), mgiven.end(),
                   std::back_inserter( given ),
-                  std::mem_fun( memfun ) );
+                  std::mem_fn( memfun ) );
   std::vector<ObjectCalcer*> final;
   std::transform( mfinal.begin(), mfinal.end(),
                   std::back_inserter( final ),
-                  std::mem_fun( memfun ) );
+                  std::mem_fn( memfun ) );
   ObjectHierarchy hier( given, final );
   MacroConstructor* ctor =
     new MacroConstructor( hier,
@@ -167,7 +167,7 @@ void DefineMacroMode::dragRect( const TQPoint& p, KigWidget& w )
   std::vector<ObjectHolder*>* objs = mwizard->currentPage() == mwizard->mpgiven ? &mgiven : &mfinal;
   DragRectMode dm( p, mdoc, w );
   mdoc.runMode( &dm );
-  KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() );
+  KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() );
   if ( ! dm.cancelled() )
   {
     std::vector<ObjectHolder*> ret = dm.ret();
@@ -196,7 +196,7 @@ void DefineMacroMode::leftClickedObject( ObjectHolder* o, const TQPoint&,
   if ( isselected ) objs->erase( iter );
   else objs->push_back( o );
 
-  KigPainter p( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() );
+  KigPainter p( w.screenInfo(), &w.stillPix, mdoc.document() );
   p.drawObject( o, !isselected );
   w.updateCurPix( p.overlay() );
   w.updateWidget();
@@ -224,7 +224,7 @@ void DefineMacroMode::mouseMoved( const std::vector<ObjectHolder*>& os, const TQ
 
     // statusbar text
     mdoc.emitStatusBarText( selectstat );
-    KigPainter p( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() );
+    KigPainter p( w.screenInfo(), &w.curPix, mdoc.document() );
 
     // set the text next to the arrow cursor
     TQPoint point = pt;