TQt4 port kdeedu

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 8 insertions, 8 deletions

diff --git a/kig/scripting/script_mode.cc b/kig/scripting/script_mode.cc
index adbcc857..2c6f4d80 100644
--- a/kig/scripting/script_mode.cc
+++ b/kig/scripting/script_mode.cc
@@ -45,7 +45,7 @@ void ScriptModeBase::dragRect( const TQPoint& p, KigWidget& w )
   mdoc.runMode( &dm );
   std::vector<ObjectHolder*> ret = dm.ret();
 
-  KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() );
+  KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() );
   if ( dm.needClear() )
   {
     std::vector<ObjectHolder*> tmp( margs.begin(), margs.begin() );
@@ -67,7 +67,7 @@ void ScriptModeBase::leftClickedObject( ObjectHolder* o, const TQPoint&,
 
   if ( mwawd != SelectingArgs ) return;
 
-  KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() );
+  KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() );
 
   if ( (dup_o = std::find( margs.begin(), margs.end(), o )) != margs.end() )
   {
@@ -105,7 +105,7 @@ void ScriptModeBase::mouseMoved( const std::vector<ObjectHolder*>& os,
 
     // statusbar text
     mdoc.emitStatusBarText( selectstat );
-    KigPainter p( w.screenInfo(), &w.curPix, mdoc.document() );
+    KigPainter p( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() );
 
     // set the text next to the arrow cursor
     TQPoint point = pt;
@@ -204,7 +204,7 @@ bool ScriptCreationMode::queryFinish()
       KMessageBox::detailedSorry(
         mwizard, i18n( "The Python interpreter caught an error during the execution of your "
                        "script. Please fix the script and click the Finish button again." ),
-        i18n( "The Python Interpreter generated the following error output:\n%1").arg( errtrace ) );
+        i18n( "The Python Interpreter generated the following error output:\n%1").tqarg( errtrace.data() ) );
     }
     else
     {
@@ -246,7 +246,7 @@ void ScriptModeBase::setScriptType( ScriptType::Type type )
 
 void ScriptModeBase::addArgs( const std::vector<ObjectHolder*>& obj, KigWidget& w )
 {
-  KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() );
+  KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() );
 
   std::copy( obj.begin(), obj.end(), std::inserter( margs, margs.begin() ) );
   pter.drawObjects( obj, true );
@@ -275,10 +275,10 @@ ScriptEditMode::ScriptEditMode( ObjectTypeCalcer* exec_calc, KigPart& doc )
 {
   mwawd = EnteringCode;
 
-  mexecargs = mexecuted->parents();
+  mexecargs = mexecuted->tqparents();
   assert( mexecargs.size() >= 1 );
 
-  mcompiledargs = mexecargs[0]->parents();
+  mcompiledargs = mexecargs[0]->tqparents();
   assert( mcompiledargs.size() == 1 );
 
   const ObjectImp* imp = static_cast<ObjectConstCalcer*>( mcompiledargs[0] )->imp();
@@ -322,7 +322,7 @@ bool ScriptEditMode::queryFinish()
       KMessageBox::detailedSorry(
         mpart.widget(), i18n( "The Python interpreter caught an error during the execution of your "
                               "script. Please fix the script." ),
-        i18n( "The Python Interpreter generated the following error output:\n%1").arg( errtrace ) );
+        i18n( "The Python Interpreter generated the following error output:\n%1").tqarg( errtrace.data() ) );
     }
     else
     {