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

9 files changed, 107 insertions, 112 deletions

diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp
index ed954d26..dc63b2dc 100644
--- a/kig/kig/kig.cpp
+++ b/kig/kig/kig.cpp
@@ -69,7 +69,7 @@ Kig::Kig()
       // now that the Part is loaded, we cast it to a Part to get
       // our hands on it
       m_part = static_cast<KParts::ReadWritePart*>
-               (factory->create(this, "kig_part", "KParts::ReadWritePart" ));
+               (factory->create(TQT_TQOBJECT(this), "kig_part", "KParts::ReadWritePart" ));
       if (m_part)
       {
 	  // tell the KParts::MainWindow that this is indeed the main widget
@@ -105,30 +105,30 @@ Kig::~Kig()
 
 void Kig::setupActions()
 {
-  KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
-  KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
-  KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+  KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection());
+  KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
+  KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
 
 #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES
-  m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection());
-  m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection());
+  m_toolbarAction = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowToolbar()), actionCollection());
+  m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection());
 #else
   createStandardStatusBarAction();
   setStandardToolBarMenuEnabled(true);
 #endif
 
   // FIXME: this (recent files) should be app-wide, not specific to each window...
-  m_recentFilesAction = KStdAction::openRecent(this, TQT_SLOT(openURL(const KURL&)), actionCollection());
+  m_recentFilesAction = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openURL(const KURL&)), actionCollection());
   m_recentFilesAction->loadEntries(config);
 
 #if KDE_IS_VERSION( 3, 2, 90 )
   KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() );
 #else
-  KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
+  KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
 #endif
-  KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+  KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
 
-  KStdAction::tipOfDay( this, TQT_SLOT( tipOfDay() ), actionCollection(), "help_tipofday" );
+  KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfDay() ), actionCollection(), "help_tipofday" );
 }
 
 void Kig::saveProperties(KConfig* config)
@@ -219,7 +219,7 @@ bool Kig::queryClose()
   switch( KMessageBox::warningYesNoCancel
 	  (
 	   widget(),
-	   i18n("Save changes to document %1?").arg(m_part->url().path()),
+	   i18n("Save changes to document %1?").tqarg(m_part->url().path()),
 	   i18n("Save Changes?"),KStdGuiItem::save(),KStdGuiItem::discard()
 	   ))
     {
@@ -272,7 +272,7 @@ void Kig::fileOpen()
   if (!file_name.isEmpty()) openURL(file_name);
 }
 
-// ifdef's disabled, cause Qt moc doesn't handle ifdef's..
+// ifdef's disabled, cause TQt tqmoc doesn't handle ifdef's..
 // #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES
 void Kig::optionsShowToolbar()
 {
diff --git a/kig/kig/kig.h b/kig/kig/kig.h
index 51c236f2..71176db8 100644
--- a/kig/kig/kig.h
+++ b/kig/kig/kig.h
@@ -49,6 +49,7 @@ class KRecentFilesAction;
 class Kig : public KParts::MainWindow
 {
   Q_OBJECT
+  TQ_OBJECT
  public:
   /**
    * Default Constructor
@@ -114,7 +115,7 @@ class Kig : public KParts::MainWindow
  private slots:
   void fileNew();
   void fileOpen();
-  // Qt moc doesn't handle ifdef's, so i'm disabling it..
+  // TQt tqmoc doesn't handle ifdef's, so i'm disabling it..
 // #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES
   void optionsShowToolbar();
   void optionsShowStatusbar();
diff --git a/kig/kig/kig_commands.cpp b/kig/kig/kig_commands.cpp
index d4668f55..d6b79805 100644
--- a/kig/kig/kig_commands.cpp
+++ b/kig/kig/kig_commands.cpp
@@ -97,7 +97,7 @@ KigCommand* KigCommand::removeCommand( KigPart& doc, const std::vector<ObjectHol
   if ( os.size() == 1 )
     text = os.back()->imp()->type()->removeAStatement();
   else
-    text = i18n( "Remove %1 Objects" ).arg( os.size() );
+    text = i18n( "Remove %1 Objects" ).tqarg( os.size() );
   KigCommand* ret = new KigCommand( doc, text );
   ret->addTask( new RemoveObjectsTask( os ) );
   return ret;
@@ -109,7 +109,7 @@ KigCommand* KigCommand::addCommand( KigPart& doc, const std::vector<ObjectHolder
   if ( os.size() == 1 )
     text = os.back()->imp()->type()->addAStatement();
   else
-    text = i18n( "Add %1 Objects" ).arg( os.size() );
+    text = i18n( "Add %1 Objects" ).tqarg( os.size() );
   KigCommand* ret = new KigCommand( doc, text );
   ret->addTask( new AddObjectsTask( os ) );
   return ret;
@@ -181,11 +181,11 @@ void ChangeObjectConstCalcerTask::execute( KigPart& doc )
 {
   mnewimp = mcalcer->switchImp( mnewimp );
 
-  std::set<ObjectCalcer*> allchildren = getAllChildren( mcalcer.get() );
-  std::vector<ObjectCalcer*> allchildrenvect( allchildren.begin(), allchildren.end() );
-  allchildrenvect = calcPath( allchildrenvect );
-  for ( std::vector<ObjectCalcer*>::iterator i = allchildrenvect.begin();
-        i != allchildrenvect.end(); ++i )
+  std::set<ObjectCalcer*> alltqchildren = getAllChildren( mcalcer.get() );
+  std::vector<ObjectCalcer*> alltqchildrenvect( alltqchildren.begin(), alltqchildren.end() );
+  alltqchildrenvect = calcPath( alltqchildrenvect );
+  for ( std::vector<ObjectCalcer*>::iterator i = alltqchildrenvect.begin();
+        i != alltqchildrenvect.end(); ++i )
     ( *i )->calc( doc.document() );
 }
 
@@ -274,7 +274,7 @@ class ChangeParentsAndTypeTask::Private
 {
 public:
   ObjectTypeCalcer* o;
-  std::vector<ObjectCalcer::shared_ptr> newparents;
+  std::vector<ObjectCalcer::shared_ptr> newtqparents;
   const ObjectType* newtype;
 };
 
@@ -284,13 +284,13 @@ ChangeParentsAndTypeTask::~ChangeParentsAndTypeTask()
 }
 
 ChangeParentsAndTypeTask::ChangeParentsAndTypeTask(
-  ObjectTypeCalcer* o, const std::vector<ObjectCalcer*>& newparents,
+  ObjectTypeCalcer* o, const std::vector<ObjectCalcer*>& newtqparents,
   const ObjectType* newtype )
   : KigCommandTask(), d( new Private )
 {
   d->o = o;
-  std::copy( newparents.begin(), newparents.end(),
-             std::back_inserter( d->newparents ) );
+  std::copy( newtqparents.begin(), newtqparents.end(),
+             std::back_inserter( d->newtqparents ) );
   d->newtype = newtype;
 }
 
@@ -300,24 +300,24 @@ void ChangeParentsAndTypeTask::execute( KigPart& doc )
   d->o->setType( d->newtype );
   d->newtype = oldtype;
 
-  std::vector<ObjectCalcer*> oldparentso = d->o->parents();
-  std::vector<ObjectCalcer::shared_ptr> oldparents(
-    oldparentso.begin(), oldparentso.end() );
-  std::vector<ObjectCalcer*> newparents;
-  for ( std::vector<ObjectCalcer::shared_ptr>::iterator i = d->newparents.begin();
-        i != d->newparents.end(); ++i )
-    newparents.push_back( i->get() );
-  d->o->setParents( newparents );
-  d->newparents = oldparents;
-
-  for ( std::vector<ObjectCalcer*>::iterator i = newparents.begin(); i != newparents.end(); ++i )
+  std::vector<ObjectCalcer*> oldtqparentso = d->o->tqparents();
+  std::vector<ObjectCalcer::shared_ptr> oldtqparents(
+    oldtqparentso.begin(), oldtqparentso.end() );
+  std::vector<ObjectCalcer*> newtqparents;
+  for ( std::vector<ObjectCalcer::shared_ptr>::iterator i = d->newtqparents.begin();
+        i != d->newtqparents.end(); ++i )
+    newtqparents.push_back( i->get() );
+  d->o->setParents( newtqparents );
+  d->newtqparents = oldtqparents;
+
+  for ( std::vector<ObjectCalcer*>::iterator i = newtqparents.begin(); i != newtqparents.end(); ++i )
     ( *i )->calc( doc.document() );
   d->o->calc( doc.document() );
-  std::set<ObjectCalcer*> allchildren = getAllChildren( d->o );
-  std::vector<ObjectCalcer*> allchildrenvect( allchildren.begin(), allchildren.end() );
-  allchildrenvect = calcPath( allchildrenvect );
-  for ( std::vector<ObjectCalcer*>::iterator i = allchildrenvect.begin();
-        i != allchildrenvect.end(); ++i )
+  std::set<ObjectCalcer*> alltqchildren = getAllChildren( d->o );
+  std::vector<ObjectCalcer*> alltqchildrenvect( alltqchildren.begin(), alltqchildren.end() );
+  alltqchildrenvect = calcPath( alltqchildrenvect );
+  for ( std::vector<ObjectCalcer*>::iterator i = alltqchildrenvect.begin();
+        i != alltqchildrenvect.end(); ++i )
     ( *i )->calc( doc.document() );
 }
 
diff --git a/kig/kig/kig_commands.h b/kig/kig/kig_commands.h
index 0dd7c93a..e9df77c1 100644
--- a/kig/kig/kig_commands.h
+++ b/kig/kig/kig_commands.h
@@ -44,6 +44,7 @@ class KigCommand
   : public TQObject, public KNamedCommand
 {
   Q_OBJECT
+  TQ_OBJECT
   class Private;
   Private* d;
 public:
@@ -58,7 +59,7 @@ public:
   static KigCommand* addCommand( KigPart& doc, ObjectHolder* os );
   /**
    * make sure that when you delete something, you are also deleting
-   * its parents.  This class assumes you've done that.
+   * its tqparents.  This class assumes you've done that.
    * \ref KigDocument::delObjects() takes care of this for you.
    */
   static KigCommand* removeCommand( KigPart& doc, const std::vector<ObjectHolder*>& os );
@@ -123,7 +124,7 @@ protected:
  * this class monitors a set of DataObjects for changes and returns an
  * appropriate ChangeObjectImpsCommand if necessary..
  * E.g.  MovingMode wants to move certain objects, so it monitors all
- * the parents of the explicitly moving objects:
+ * the tqparents of the explicitly moving objects:
  * \code
  *   MonitorDataObjects mon( getAllParents( emo ) );
  * \endcode
@@ -180,7 +181,7 @@ class ChangeParentsAndTypeTask
   class Private;
   Private* d;
 public:
-  ChangeParentsAndTypeTask( ObjectTypeCalcer* o, const std::vector<ObjectCalcer*>& newparents,
+  ChangeParentsAndTypeTask( ObjectTypeCalcer* o, const std::vector<ObjectCalcer*>& newtqparents,
                             const ObjectType* newtype );
   ~ChangeParentsAndTypeTask();
 
diff --git a/kig/kig/kig_document.cc b/kig/kig/kig_document.cc
index 884b41c5..04f1e7fa 100644
--- a/kig/kig/kig_document.cc
+++ b/kig/kig/kig_document.cc
@@ -69,7 +69,7 @@ std::vector<ObjectHolder*> KigDocument::whatAmIOn( const Coordinate& p, const Ki
   for ( std::set<ObjectHolder*>::const_iterator i = mobjects.begin();
         i != mobjects.end(); ++i )
   {
-    if(!(*i)->contains(p, w, mnightvision)) continue;
+    if(!(*i)->tqcontains(p, w, mnightvision)) continue;
     if ( (*i)->imp()->inherits( PointImp::stype() ) ) ret.push_back( *i );
     else 
       if ( !(*i)->imp()->inherits( PolygonImp::stype() ) ) curves.push_back( *i );
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index 1f891bb9..137d0096 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -67,9 +67,7 @@
 #include <tqpaintdevicemetrics.h>
 #include <tqsizepolicy.h>
 #include <tqtimer.h>
-#if QT_VERSION >= 0x030100
 #include <tqeventloop.h>
-#endif
 
 using namespace std;
 
@@ -89,13 +87,13 @@ class SetCoordinateSystemAction
 {
   KigPart& md;
 public:
-  SetCoordinateSystemAction( KigPart& d, KActionCollection* parent );
+  SetCoordinateSystemAction( KigPart& d, KActionCollection* tqparent );
   void slotActivated( int index );
 };
 
 SetCoordinateSystemAction::SetCoordinateSystemAction(
-  KigPart& d, KActionCollection* parent )
-  : KSelectAction( i18n( "&Set Coordinate System" ), 0, parent, "settings_set_coordinate_system" ),
+  KigPart& d, KActionCollection* tqparent )
+  : KSelectAction( i18n( "&Set Coordinate System" ), 0, tqparent, "settings_set_coordinate_system" ),
     md( d )
 {
   setItems( CoordinateSystemFactory::names() );
@@ -114,7 +112,7 @@ class KigPrintDialogPage
   : public KPrintDialogPage
 {
 public:
-  KigPrintDialogPage( TQWidget* parent = 0, const char* name = 0 );
+  KigPrintDialogPage( TQWidget* tqparent = 0, const char* name = 0 );
   ~KigPrintDialogPage();
 
   void getOptions( TQMap<TQString,TQString>& opts, bool );
@@ -126,8 +124,8 @@ private:
   TQCheckBox *showaxes;
 };
 
-KigPrintDialogPage::KigPrintDialogPage( TQWidget* parent, const char* name )
- : KPrintDialogPage( parent, name )
+KigPrintDialogPage::KigPrintDialogPage( TQWidget* tqparent, const char* name )
+ : KPrintDialogPage( tqparent, name )
 {
   setTitle( i18n( "Kig Options" ) );
 
@@ -167,10 +165,10 @@ bool KigPrintDialogPage::isValid( TQString& )
   return true;
 }
 
-KigPart::KigPart( TQWidget *parentWidget, const char *,
-			  TQObject *parent, const char *name,
+KigPart::KigPart( TQWidget *tqparentWidget, const char *,
+			  TQObject *tqparent, const char *name,
 			  const TQStringList& )
-  : KParts::ReadWritePart( parent, name ),
+  : KParts::ReadWritePart( tqparent, name ),
     mMode( 0 ), mdocument( new KigDocument() )
 {
   // we need an instance
@@ -179,7 +177,7 @@ KigPart::KigPart( TQWidget *parentWidget, const char *,
   mMode = new NormalMode( *this );
 
   // we need a widget, to actually show the document
-  m_widget = new KigView(this, false, parentWidget, "kig_view");
+  m_widget = new KigView(this, false, tqparentWidget, "kig_view");
   // notify the part that this is our internal widget
   setWidget( m_widget );
 
@@ -260,17 +258,17 @@ void KigPart::setupActions()
   KigExportManager::instance()->addMenuAction( this, m_widget->realWidget(),
                                                actionCollection() );
 
-  KAction* a = KStdAction::zoomIn( m_widget, TQT_SLOT( slotZoomIn() ),
+  KAction* a = KStdAction::zoomIn( TQT_TQOBJECT(m_widget), TQT_SLOT( slotZoomIn() ),
                                    actionCollection() );
   a->setToolTip( i18n( "Zoom in on the document" ) );
   a->setWhatsThis( i18n( "Zoom in on the document" ) );
 
-  a = KStdAction::zoomOut( m_widget, TQT_SLOT( slotZoomOut() ),
+  a = KStdAction::zoomOut( TQT_TQOBJECT(m_widget), TQT_SLOT( slotZoomOut() ),
                            actionCollection() );
   a->setToolTip( i18n( "Zoom out of the document" ) );
   a->setWhatsThis( i18n( "Zoom out of the document" ) );
 
-  a = KStdAction::fitToPage( m_widget, TQT_SLOT( slotRecenterScreen() ),
+  a = KStdAction::fitToPage( TQT_TQOBJECT(m_widget), TQT_SLOT( slotRecenterScreen() ),
                              actionCollection() );
   // grr.. why isn't there an icon for this..
   a->setIconSet( TQIconSet( l->loadIcon( "view_fit_to_page", KIcon::Toolbar ) ) );
@@ -283,7 +281,7 @@ void KigPart::setupActions()
 #endif
 #endif
 #ifdef KIG_PART_CPP_STD_FULLSCREEN_ACTION
-  a = KStdAction::fullScreen( m_widget, TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" );
+  a = KStdAction::fullScreen( TQT_TQOBJECT(m_widget), TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->tqparent()),"fullscreen" );
 #else
   tmp = l->loadIcon( "window_fullscreen", KIcon::Toolbar );
   a = new KAction(
@@ -296,13 +294,13 @@ void KigPart::setupActions()
 
   // TODO: an icon for this..
   a = new KAction(
-    i18n( "&Select Shown Area" ), "viewmagfit", 0, m_widget, TQT_SLOT( zoomRect() ),
+    i18n( "&Select Shown Area" ), "viewmagfit", 0, TQT_TQOBJECT(m_widget), TQT_SLOT( zoomRect() ),
     actionCollection(), "view_select_shown_rect" );
   a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) );
   a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) );
 
   a = new KAction(
-    i18n( "S&elect Zoom Area" ), "viewmag", 0, m_widget, TQT_SLOT( zoomArea() ),
+    i18n( "S&elect Zoom Area" ), "viewmag", 0, TQT_TQOBJECT(m_widget), TQT_SLOT( zoomArea() ),
     actionCollection(), "view_zoom_area" );
 //  a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) );
 //  a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) );
@@ -371,7 +369,7 @@ bool KigPart::openFile()
   {
     KMessageBox::sorry( widget(),
                         i18n( "The file \"%1\" you tried to open does not exist. "
-                              "Please verify that you entered the correct path." ).arg( m_file ),
+                              "Please verify that you entered the correct path." ).tqarg( m_file ),
                         i18n( "File Not Found" ) );
     return false;
   };
@@ -380,7 +378,7 @@ bool KigPart::openFile()
   // findByURL...
   KMimeType::Ptr mimeType = KMimeType::findByPath ( m_file );
   kdDebug() << k_funcinfo << "mimetype: " << mimeType->name() << endl;
-  KigFilter* filter = KigFilters::instance()->find( mimeType->name() );
+  KigFilter* filter = KigFilters::instance()->tqfind( mimeType->name() );
   if ( !filter )
   {
     // we don't support this mime type...
@@ -392,7 +390,7 @@ bool KigPart::openFile()
               "question would be worth implementing support for, you can "
               "always ask us nicely on mailto:toscano.pino@tiscali.it "
               "or do the work yourself and send me a patch."
-          ).arg(mimeType->name()),
+          ).tqarg(mimeType->name()),
         i18n( "Format Not Supported" )
         );
     return false;
@@ -468,7 +466,7 @@ void KigPart::_addObject( ObjectHolder* o )
 
 void KigPart::delObject( ObjectHolder* o )
 {
-  // we delete all children and their children etc. too...
+  // we delete all tqchildren and their tqchildren etc. too...
   std::vector<ObjectHolder*> os;
   os.push_back( o );
   delObjects( os );
@@ -621,7 +619,7 @@ bool KigPart::internalSaveAs()
   {
     int ret = KMessageBox::warningContinueCancel( m_widget,
                                          i18n( "The file \"%1\" already exists. Do you wish to overwrite it?" )
-                                         .arg( file_name ), i18n( "Overwrite File?" ), i18n("Overwrite") );
+                                         .tqarg( file_name ), i18n( "Overwrite File?" ), i18n("Overwrite") );
     if ( ret != KMessageBox::Continue )
     {
       return false;
@@ -637,11 +635,7 @@ void KigPart::runMode( KigMode* m )
 
   setMode( m );
 
-#if QT_VERSION >= 0x030100
   (void) kapp->eventLoop()->enterLoop();
-#else
-  (void) kapp->enter_loop();
-#endif
 
   setMode( prev );
   redrawScreen();
@@ -652,11 +646,7 @@ void KigPart::doneMode( KigMode* d )
   assert( d == mMode );
   // pretend to use this var..
   (void)d;
-#if QT_VERSION >= 0x030100
   kapp->eventLoop()->exitLoop();
-#else
-  kapp->exit_loop();
-#endif
 }
 
 void KigPart::actionRemoved( GUIAction* a, GUIUpdateToken& t )
@@ -932,7 +922,7 @@ extern "C" int convertToNative( const KURL& url, const TQCString& outfile )
 
   KMimeType::Ptr mimeType = KMimeType::findByPath ( file );
   kdDebug() << k_funcinfo << "mimetype: " << mimeType->name() << endl;
-  KigFilter* filter = KigFilters::instance()->find( mimeType->name() );
+  KigFilter* filter = KigFilters::instance()->tqfind( mimeType->name() );
   if ( !filter )
   {
     kdError() << "The file \"" << file << "\" is of a filetype not currently supported by Kig." << endl;
@@ -952,7 +942,7 @@ extern "C" int convertToNative( const KURL& url, const TQCString& outfile )
   for ( std::vector<ObjectCalcer*>::iterator i = tmp.begin(); i != tmp.end(); ++i )
     ( *i )->calc( *doc );
 
-  TQString out = ( outfile == "-" ) ? TQString::null : outfile;
+  TQString out = ( outfile == "-" ) ? TQString() : outfile;
   bool success = KigFilters::instance()->save( *doc, out );
   if ( !success )
   {
diff --git a/kig/kig/kig_part.h b/kig/kig/kig_part.h
index 3245f38b..187f559e 100644
--- a/kig/kig/kig_part.h
+++ b/kig/kig/kig_part.h
@@ -61,12 +61,13 @@ class ScreenInfo;
 class KigPart : public KParts::ReadWritePart
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Default constructor
    */
-  KigPart( TQWidget* parentWidget, const char* widgetName,
-	       TQObject* parent = 0, const char* name = 0,
+  KigPart( TQWidget* tqparentWidget, const char* widgetName,
+	       TQObject* tqparent = 0, const char* name = 0,
 	       const TQStringList& = TQStringList()
 	       );
 
diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp
index fbf16517..9eda893b 100644
--- a/kig/kig/kig_view.cpp
+++ b/kig/kig/kig_view.cpp
@@ -55,10 +55,10 @@ kdbgstream& operator<< ( kdbgstream& s, const TQPoint& t )
 
 KigWidget::KigWidget( KigPart* part,
                       KigView* view,
-                      TQWidget* parent,
+                      TQWidget* tqparent,
                       const char* name,
                       bool fullscreen )
-  : TQWidget( parent, name,
+  : TQWidget( tqparent, name,
              fullscreen ? WStyle_Customize | WStyle_NoBorder : 0 ),
     mpart( part ),
     mview( view ),
@@ -69,8 +69,8 @@ KigWidget::KigWidget( KigPart* part,
 {
   part->addWidget(this);
 
-  setFocusPolicy(ClickFocus);
-  setBackgroundMode( Qt::NoBackground );
+  setFocusPolicy(TQ_ClickFocus);
+  setBackgroundMode( TQt::NoBackground );
   setMouseTracking(true);
 
   curPix.resize( size() );
@@ -123,7 +123,7 @@ void KigWidget::updateWidget( const std::vector<TQRect>& overlay )
 #undef SHOW_OVERLAY_RECTS
 #ifdef SHOW_OVERLAY_RECTS
   TQPainter debug (this, this);
-  debug.setPen(Qt::yellow);
+  debug.setPen(TQt::yellow);
 #endif // SHOW_OVERLAY_RECTS
   // we undo our old changes...
   for ( std::vector<TQRect>::const_iterator i = oldOverlay.begin(); i != oldOverlay.end(); ++i )
@@ -193,7 +193,7 @@ void KigWidget::recenterScreen()
 
 Rect KigWidget::matchScreenShape( const Rect& r ) const
 {
-  return r.matchShape( Rect::fromQRect( rect() ) );
+  return r.matchShape( Rect::fromTQRect( rect() ) );
 }
 
 void KigWidget::slotZoomIn()
@@ -231,7 +231,7 @@ void KigWidget::slotZoomOut()
 
 void KigWidget::clearStillPix()
 {
-  stillPix.fill(Qt::white);
+  stillPix.fill(TQt::white);
   oldOverlay.clear();
   oldOverlay.push_back ( TQRect( TQPoint(0,0), size() ) );
 }
@@ -245,7 +245,7 @@ void KigWidget::redrawScreen( const std::vector<ObjectHolder*>& selection, bool
 
   // update the screen...
   clearStillPix();
-  KigPainter p( msi, &stillPix, mpart->document() );
+  KigPainter p( msi, TQT_TQPAINTDEVICE(&stillPix), mpart->document() );
   p.drawGrid( mpart->document().coordinateSystem(), mpart->document().grid(),
               mpart->document().axes() );
   p.drawObjects( selection, true );
@@ -287,34 +287,34 @@ void KigWidget::updateScrollBars()
 
 KigView::KigView( KigPart* part,
                   bool fullscreen,
-                  TQWidget* parent,
+                  TQWidget* tqparent,
                   const char* name )
-  : TQWidget( parent, name ),
-    mlayout( 0 ), mrightscroll( 0 ), mbottomscroll( 0 ),
+  : TQWidget( tqparent, name ),
+    mtqlayout( 0 ), mrightscroll( 0 ), mbottomscroll( 0 ),
     mupdatingscrollbars( false ),
     mrealwidget( 0 ), mpart( part )
 {
   connect( part, TQT_SIGNAL( recenterScreen() ), this, TQT_SLOT( slotInternalRecenterScreen() ) );
 
-  mlayout = new TQGridLayout( this, 2, 2 );
-  mrightscroll = new TQScrollBar( Vertical, this, "Right Scrollbar" );
+  mtqlayout = new TQGridLayout( this, 2, 2 );
+  mrightscroll = new TQScrollBar(Qt::Vertical, this, "Right Scrollbar" );
   // TODO: make this configurable...
   mrightscroll->setTracking( true );
   connect( mrightscroll, TQT_SIGNAL( valueChanged( int ) ),
            this, TQT_SLOT( slotRightScrollValueChanged( int ) ) );
   connect( mrightscroll, TQT_SIGNAL( sliderReleased() ),
            this, TQT_SLOT( updateScrollBars() ) );
-  mbottomscroll = new TQScrollBar( Horizontal, this, "Bottom Scrollbar" );
+  mbottomscroll = new TQScrollBar(Qt::Horizontal, this, "Bottom Scrollbar" );
   connect( mbottomscroll, TQT_SIGNAL( valueChanged( int ) ),
            this, TQT_SLOT( slotBottomScrollValueChanged( int ) ) );
   connect( mbottomscroll, TQT_SIGNAL( sliderReleased() ),
            this, TQT_SLOT( updateScrollBars() ) );
   mrealwidget = new KigWidget( part, this, this, "Kig Widget", fullscreen );
-  mlayout->addWidget( mbottomscroll, 1, 0 );
-  mlayout->addWidget( mrealwidget, 0, 0 );
-  mlayout->addWidget( mrightscroll, 0, 1 );
+  mtqlayout->addWidget( mbottomscroll, 1, 0 );
+  mtqlayout->addWidget( mrealwidget, 0, 0 );
+  mtqlayout->addWidget( mrightscroll, 0, 1 );
 
-  resize( sizeHint() );
+  resize( tqsizeHint() );
   mrealwidget->recenterScreen();
   part->redrawScreen( mrealwidget );
   updateScrollBars();
@@ -336,7 +336,7 @@ void KigView::updateScrollBars()
   Rect er = mrealwidget->entireDocumentRect();
   Rect sr = mrealwidget->screenInfo().shownRect();
 
-  // we define the total rect to be the smallest rect that contains
+  // we define the total rect to be the smallest rect that tqcontains
   // both er and sr...
   er |= sr;
 
@@ -360,7 +360,7 @@ void KigView::updateScrollBars()
   mrightscroll->setLineStep( (int)( sr.height() / pw / 10 ) );
   mrightscroll->setPageStep( (int)( sr.height() / pw / 1.2 ) );
 
-  // note that since Qt has a coordinate system with the lowest y
+  // note that since TQt has a coordinate system with the lowest y
   // values at the top, and we have it the other way around ( i know i
   // shouldn't have done this.. :( ), we invert the value that the
   // scrollbar shows.  This is inverted again in
@@ -443,7 +443,7 @@ const KigDocument& KigWidget::document() const
   return mpart->document();
 }
 
-TQSize KigWidget::sizeHint() const
+TQSize KigWidget::tqsizeHint() const
 {
   return TQSize( 630, 450 );
 }
@@ -508,9 +508,9 @@ void KigView::toggleFullScreen()
 {
   mrealwidget->setFullScreen( ! mrealwidget->isFullScreen() );
   if ( mrealwidget->isFullScreen() )
-    topLevelWidget()->showFullScreen();
+    tqtopLevelWidget()->showFullScreen();
   else
-    topLevelWidget()->showNormal();
+    tqtopLevelWidget()->showNormal();
 }
 
 void KigWidget::setFullScreen( bool f )
@@ -545,7 +545,7 @@ void KigView::zoomRect()
 
 void KigWidget::setShowingRect( const Rect& r )
 {
-  msi.setShownRect( r.matchShape( Rect::fromQRect( rect() ) ) );
+  msi.setShownRect( r.matchShape( Rect::fromTQRect( rect() ) ) );
 }
 
 void KigView::slotRecenterScreen()
@@ -568,7 +568,7 @@ void KigWidget::zoomArea()
   KigInputDialog::getTwoCoordinates( i18n( "Select Zoom Area" ),
         i18n( "Select the zoom area by entering the coordinates of "
               "the upper left corner and the lower right corner." ) +
-        TQString::fromLatin1("<br>") +
+        TQString::tqfromLatin1("<br>") +
         mpart->document().coordinateSystem().coordinateFormatNoticeMarkup(),
         this, &ok, mpart->document(), &tl, &br );
   if ( ok )
diff --git a/kig/kig/kig_view.h b/kig/kig/kig_view.h
index a60e3ee5..4c167d7a 100644
--- a/kig/kig/kig_view.h
+++ b/kig/kig/kig_view.h
@@ -41,15 +41,16 @@ class KigView;
 
 /**
  * This class is the real widget showing the document.  The other is a
- * wrapper, that has the scrollbars...  I'm not using QScrollView
+ * wrapper, that has the scrollbars...  I'm not using TQScrollView
  * cause i've been having problems with that, and it's easier to do
  * the work myself...
  * Internally, this is basically a dumb class, which is manipulated by
  * KigMode's.  All events are forwarded to them.
  */
-class KigWidget : public QWidget
+class KigWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   KigPart* mpart;
   KigView* mview;
@@ -61,7 +62,7 @@ class KigWidget : public QWidget
   void paintEvent( TQPaintEvent* e );
   void wheelEvent( TQWheelEvent* e );
   void resizeEvent( TQResizeEvent* );
-  TQSize sizeHint() const;
+  TQSize tqsizeHint() const;
 
   /**
    * this is called to match a rect's dimensions to the dimensions of
@@ -104,7 +105,7 @@ public:
    */
   KigWidget( KigPart* doc,
              KigView* view,
-             TQWidget* parent = 0,
+             TQWidget* tqparent = 0,
              const char* name = 0,
              bool fullscreen = false
 	   );
@@ -224,16 +225,17 @@ public:
  * most of its functionality to KigWidget...
  */
 class KigView
-  : public QWidget
+  : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  TQGridLayout* mlayout;
+  TQGridLayout* mtqlayout;
   TQScrollBar* mrightscroll;
   TQScrollBar* mbottomscroll;
 
   /**
-   * apparently, TQScrollBar also emits its signals when you update it
+   * aptqparently, TQScrollBar also emits its signals when you update it
    * manually, so we ignore them while we're in \ref updateScrollBars()...
    */
   bool mupdatingscrollbars;
@@ -244,7 +246,7 @@ class KigView
 public:
   KigView( KigPart* part,
            bool fullscreen = false,
-	   TQWidget* parent = 0,
+	   TQWidget* tqparent = 0,
 	   const char* name = 0
 	   );
   ~KigView();