4 files changed, 14 insertions, 14 deletions
diff --git a/kig/scripting/newscriptwizard.cpp b/kig/scripting/newscriptwizard.cpp
index 9cb4d9e2..0268b67c 100644
--- a/kig/scripting/newscriptwizard.cpp
+++ b/kig/scripting/newscriptwizard.cpp
@@ -97,11 +97,11 @@ NewScriptWizard::NewScriptWizard( TQWidget* parent, ScriptModeBase* mode )
     TDEPopupMenu* pm = new TDEPopupMenu( editor );
     // creating the actions for the code editor...
     TDEActionCollection* ac = new TDEActionCollection( editor );
-    TDEAction* undoAction = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT( slotUndo() ), ac );
-    TDEAction* redoAction = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT( slotRedo() ), ac );
-    TDEAction* cutAction = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotCut() ), ac );
-    TDEAction* copyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), ac );
-    TDEAction* pasteAction = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), ac );
+    TDEAction* undoAction = KStdAction::undo( this, TQ_SLOT( slotUndo() ), ac );
+    TDEAction* redoAction = KStdAction::redo( this, TQ_SLOT( slotRedo() ), ac );
+    TDEAction* cutAction = KStdAction::cut( this, TQ_SLOT( slotCut() ), ac );
+    TDEAction* copyAction = KStdAction::copy( this, TQ_SLOT( slotCopy() ), ac );
+    TDEAction* pasteAction = KStdAction::paste( this, TQ_SLOT( slotPaste() ), ac );
     // ... and plugging them into the popup menu (to build it, of course :) )
     undoAction->plug( pm );
     redoAction->plug( pm );
@@ -114,7 +114,7 @@ NewScriptWizard::NewScriptWizard( TQWidget* parent, ScriptModeBase* mode )
     dynamic_cast<KTextEditor::PopupMenuInterface*>( editor )->installPopup( pm );
   }
 
-  connect( this, TQT_SIGNAL( helpClicked() ), this, TQT_SLOT( slotHelpClicked() ) );
+  connect( this, TQ_SIGNAL( helpClicked() ), this, TQ_SLOT( slotHelpClicked() ) );
 }
 
 void NewScriptWizard::back()
@@ -159,7 +159,7 @@ void NewScriptWizard::accept()
 
 void NewScriptWizard::slotHelpClicked()
 {
-  kapp->invokeHelp( TQString::fromLatin1( "scripting" ),
+  tdeApp->invokeHelp( TQString::fromLatin1( "scripting" ),
                     TQString::fromLatin1( "kig" ) );
 }
 
diff --git a/kig/scripting/newscriptwizard.h b/kig/scripting/newscriptwizard.h
index 6fa9d07f..ad0203d3 100644
--- a/kig/scripting/newscriptwizard.h
+++ b/kig/scripting/newscriptwizard.h
@@ -34,7 +34,7 @@ class ScriptModeBase;
 class NewScriptWizard
   : public NewScriptWizardBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   ScriptModeBase* mmode;
 public:
diff --git a/kig/scripting/python_scripter.cpp b/kig/scripting/python_scripter.cpp
index 00c7e162..f39d7121 100644
--- a/kig/scripting/python_scripter.cpp
+++ b/kig/scripting/python_scripter.cpp
@@ -495,9 +495,9 @@ ObjectImp* PythonScripter::calc( CompiledPythonScript& script, const Args& args
     };
     tuple argstup( argstuph );
 
-    handle<> reth( PyEval_CallObject( calcfunc.ptr(), argstup.ptr() ) );
+    handle<> reth( PyObject_CallObject( calcfunc.ptr(), argstup.ptr() ) );
 //    object resulto = calcfunc( argstup );
-//    handle<> reth( PyEval_CallObject( calcfunc.ptr(), args ) );
+//    handle<> reth( PyObject_CallObject( calcfunc.ptr(), args ) );
     object resulto( reth );
 
     extract<ObjectImp&> result( resulto );
diff --git a/kig/scripting/script_mode.cpp b/kig/scripting/script_mode.cpp
index 1fd88405..228ad739 100644
--- a/kig/scripting/script_mode.cpp
+++ b/kig/scripting/script_mode.cpp
@@ -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(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() );
+  KigPainter pter( w.screenInfo(), &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(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() );
+  KigPainter pter( w.screenInfo(), &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(), 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;
@@ -246,7 +246,7 @@ void ScriptModeBase::setScriptType( ScriptType::Type type )
 
 void ScriptModeBase::addArgs( const std::vector<ObjectHolder*>& obj, KigWidget& w )
 {
-  KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() );
+  KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() );
 
   std::copy( obj.begin(), obj.end(), std::inserter( margs, margs.begin() ) );
   pter.drawObjects( obj, true );