18 files changed, 56 insertions, 47 deletions
diff --git a/libkdepim/komposer/core/attachment.cpp b/libkdepim/komposer/core/attachment.cpp
index f8240380e..df803de60 100644
--- a/libkdepim/komposer/core/attachment.cpp
+++ b/libkdepim/komposer/core/attachment.cpp
@@ -61,50 +61,50 @@ Attachment::~Attachment()
   delete d; d = 0;
 }
 
-QString
+TQString
 Attachment::name() const
 {
   return d->name;
 }
 
-QCString
+TQCString
 Attachment::cte() const
 {
   return d->cte;
 }
 
-QByteArray
+TQByteArray
 Attachment::data() const
 {
   return d->data;
 }
 
-QCString
+TQCString
 Attachment::type() const
 {
   return d->type;
 }
 
 
-QCString
+TQCString
 Attachment::subType() const
 {
   return d->subType;
 }
 
-QCString
+TQCString
 Attachment::paramAttr() const
 {
   return d->paramAttr;
 }
 
-QString
+TQString
 Attachment::paramValue() const
 {
   return d->paramValue;
 }
 
-QCString
+TQCString
 Attachment::contentDisposition() const
 {
   return d->contDisp;
diff --git a/libkdepim/komposer/core/core.cpp b/libkdepim/komposer/core/core.cpp
index f93e59cc9..bffae60ed 100644
--- a/libkdepim/komposer/core/core.cpp
+++ b/libkdepim/komposer/core/core.cpp
@@ -53,9 +53,9 @@
 
 using namespace Komposer;
 
-Core::Core( TQWidget *parent, const char *name )
+Core::Core( TQWidget *tqparent, const char *name )
   : KomposerIface( "KomposerIface" ),
-    KMainWindow( parent, name ), m_currentEditor( 0 )
+    KMainWindow( tqparent, name ), m_currentEditor( 0 )
 {
   initWidgets();
   initCore();
@@ -158,7 +158,7 @@ Core::selectEditor( Komposer::Editor *editor )
 
   TQPtrList<KParts::Part> *partList = const_cast<TQPtrList<KParts::Part>*>(
                                                    m_partManager->parts() );
-  if ( partList->find( part ) == -1 )
+  if ( partList->tqfind( part ) == -1 )
     addPart( part );
 
   m_partManager->setActivePart( part );
diff --git a/libkdepim/komposer/core/core.h b/libkdepim/komposer/core/core.h
index 91ef133e9..871d67a05 100644
--- a/libkdepim/komposer/core/core.h
+++ b/libkdepim/komposer/core/core.h
@@ -45,6 +45,7 @@ namespace Komposer
   class Core : public KMainWindow, virtual public KomposerIface
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
     Core( TQWidget *tqparentWidget = 0, const char *name = 0 );
     virtual ~Core();
diff --git a/libkdepim/komposer/core/corewidget.cpp b/libkdepim/komposer/core/corewidget.cpp
index c65893766..53e8abd2c 100644
--- a/libkdepim/komposer/core/corewidget.cpp
+++ b/libkdepim/komposer/core/corewidget.cpp
@@ -24,8 +24,8 @@
 
 using namespace Komposer;
 
-CoreWidget::CoreWidget( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+CoreWidget::CoreWidget( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
 }
 
diff --git a/libkdepim/komposer/core/corewidget.h b/libkdepim/komposer/core/corewidget.h
index 8b07a0a7a..8c67e77d0 100644
--- a/libkdepim/komposer/core/corewidget.h
+++ b/libkdepim/komposer/core/corewidget.h
@@ -29,11 +29,12 @@
 namespace Komposer
 {
 
-  class CoreWidget : public QWidget
+  class CoreWidget : public TQWidget
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    CoreWidget( TQWidget *parent, const char *name=0 );
+    CoreWidget( TQWidget *tqparent, const char *name=0 );
 
     virtual TQString subject() const =0;
     virtual TQStringList to()  const =0;
diff --git a/libkdepim/komposer/core/editor.cpp b/libkdepim/komposer/core/editor.cpp
index 5dada393f..d9ecbd56e 100644
--- a/libkdepim/komposer/core/editor.cpp
+++ b/libkdepim/komposer/core/editor.cpp
@@ -30,8 +30,8 @@ public:
   TQString id;
 };
 
-Editor::Editor( TQObject *parent, const char *name, const TQStringList &args )
-  : Plugin( parent, name, args ), d( new Private )
+Editor::Editor( TQObject *tqparent, const char *name, const TQStringList &args )
+  : Plugin( tqparent, name, args ), d( new Private )
 {
 }
 
diff --git a/libkdepim/komposer/core/editor.h b/libkdepim/komposer/core/editor.h
index a5b78915d..9cc9336dd 100644
--- a/libkdepim/komposer/core/editor.h
+++ b/libkdepim/komposer/core/editor.h
@@ -38,6 +38,7 @@ namespace Komposer {
   class Editor : public Plugin
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
     enum TextType {
       Plain    = 1 << 0,
@@ -92,7 +93,7 @@ namespace Komposer {
     virtual void changeSignature( const TQString &txt ) =0;
 
   protected:
-    Editor( TQObject *parent, const char *name, const TQStringList &args );
+    Editor( TQObject *tqparent, const char *name, const TQStringList &args );
 
   private:
     class Private;
diff --git a/libkdepim/komposer/core/plugin.cpp b/libkdepim/komposer/core/plugin.cpp
index 41af47cd9..dbadaff59 100644
--- a/libkdepim/komposer/core/plugin.cpp
+++ b/libkdepim/komposer/core/plugin.cpp
@@ -35,8 +35,8 @@ public:
   //Core* core;
 };
 
-Plugin::Plugin( TQObject *parent, const char *name, const TQStringList & )
-    : TQObject( parent, name ), d( new Private )
+Plugin::Plugin( TQObject *tqparent, const char *name, const TQStringList & )
+    : TQObject( tqparent, name ), d( new Private )
 {
   //d->core = core;
 }
diff --git a/libkdepim/komposer/core/plugin.h b/libkdepim/komposer/core/plugin.h
index 2dddd09f4..bb62f3224 100644
--- a/libkdepim/komposer/core/plugin.h
+++ b/libkdepim/komposer/core/plugin.h
@@ -33,6 +33,7 @@ namespace Komposer
                  virtual public KXMLGUIClient
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
     virtual ~Plugin();
 
@@ -63,7 +64,7 @@ namespace Komposer
     Core *core() const;
   protected:
     friend class PluginManager;
-    Plugin( TQObject *parent, const char *name, const TQStringList& args = TQStringList() );
+    Plugin( TQObject *tqparent, const char *name, const TQStringList& args = TQStringList() );
 
   private:
     class Private;
diff --git a/libkdepim/komposer/core/pluginmanager.cpp b/libkdepim/komposer/core/pluginmanager.cpp
index d4fd5acc8..d46d471b2 100644
--- a/libkdepim/komposer/core/pluginmanager.cpp
+++ b/libkdepim/komposer/core/pluginmanager.cpp
@@ -66,8 +66,8 @@ public:
   TQValueStack<TQString> pluginsToLoad;
 };
 
-PluginManager::PluginManager( TQObject *parent )
-  : TQObject( parent )
+PluginManager::PluginManager( TQObject *tqparent )
+  : TQObject( tqparent )
 {
   d = new Private;
 
@@ -414,7 +414,7 @@ PluginManager::plugin( const TQString &pluginId ) const
     return 0;
 }
 
-QString
+TQString
 PluginManager::pluginName( const Plugin *plugin ) const
 {
   TQMap<KPluginInfo*, Plugin*>::ConstIterator it;
@@ -427,7 +427,7 @@ PluginManager::pluginName( const Plugin *plugin ) const
   return TQString::tqfromLatin1( "Unknown" );
 }
 
-QString
+TQString
 PluginManager::pluginId( const Plugin *plugin ) const
 {
   TQMap<KPluginInfo*, Plugin*>::ConstIterator it;
@@ -440,7 +440,7 @@ PluginManager::pluginId( const Plugin *plugin ) const
   return TQString::tqfromLatin1( "unknown" );
 }
 
-QString
+TQString
 PluginManager::pluginIcon( const Plugin *plugin ) const
 {
   TQMap<KPluginInfo*, Plugin*>::ConstIterator it;
diff --git a/libkdepim/komposer/core/pluginmanager.h b/libkdepim/komposer/core/pluginmanager.h
index 179cf48de..34cc6b9c5 100644
--- a/libkdepim/komposer/core/pluginmanager.h
+++ b/libkdepim/komposer/core/pluginmanager.h
@@ -37,9 +37,10 @@ namespace Komposer
 
   class Plugin;
 
-  class PluginManager : public QObject
+  class PluginManager : public TQObject
   {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     PluginManager( TQObject * );
@@ -57,7 +58,7 @@ namespace Komposer
      * interface.
      */
     TQValueList<KPluginInfo*> availablePlugins( const TQString &category
-                                               = TQString::null ) const;
+                                               = TQString() ) const;
 
     /**
      * Returns a list of all plugins that are actually loaded.
@@ -65,7 +66,7 @@ namespace Komposer
      * See also @ref availablePlugins().
      */
     TQMap<KPluginInfo*, Plugin*> loadedPlugins( const TQString &category
-                                               = TQString::null ) const;
+                                               = TQString() ) const;
 
     /**
      * @brief Search by plugin name. This is the key used as X-KDE-PluginInfo-Name
diff --git a/libkdepim/komposer/core/prefsmodule.cpp b/libkdepim/komposer/core/prefsmodule.cpp
index 3536ebb8e..1c088e9e8 100644
--- a/libkdepim/komposer/core/prefsmodule.cpp
+++ b/libkdepim/komposer/core/prefsmodule.cpp
@@ -35,14 +35,14 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_komposerconfig( TQWidget *parent, const char * ) {
-    return new Komposer::PrefsModule( parent, "komposerprefs" );
+  KDE_EXPORT KCModule *create_komposerconfig( TQWidget *tqparent, const char * ) {
+    return new Komposer::PrefsModule( tqparent, "komposerprefs" );
   }
 }
 using namespace Komposer;
 
-PrefsModule::PrefsModule( TQWidget *parent, const char *name )
-  : KPrefsModule( Komposer::Prefs::self(), parent, name )
+PrefsModule::PrefsModule( TQWidget *tqparent, const char *name )
+  : KPrefsModule( Komposer::Prefs::self(), tqparent, name )
 {
   TQVBoxLayout *topLayout = new TQVBoxLayout( this );
 
@@ -71,12 +71,12 @@ PrefsModule::aboutData() const
 
 
 EditorSelection::EditorSelection( const TQString &text, TQString &reference,
-                                  TQWidget *parent )
+                                  TQWidget *tqparent )
   : m_reference( reference )
 {
-  m_box = new TQGroupBox( 0, Qt::Vertical, text, parent );
+  m_box = new TQGroupBox( 0, TQt::Vertical, text, tqparent );
   TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->tqlayout() );
-  boxLayout->tqsetAlignment( Qt::AlignTop );
+  boxLayout->tqsetAlignment( TQt::AlignTop );
 
   m_editorsCombo = new KComboBox( m_box );
   boxLayout->addWidget( m_editorsCombo );
diff --git a/libkdepim/komposer/core/prefsmodule.h b/libkdepim/komposer/core/prefsmodule.h
index b213258ba..ab1744044 100644
--- a/libkdepim/komposer/core/prefsmodule.h
+++ b/libkdepim/komposer/core/prefsmodule.h
@@ -35,17 +35,19 @@ namespace Komposer {
   class PrefsModule : public KPrefsModule
   {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    PrefsModule( TQWidget *parent=0, const char *name=0 );
+    PrefsModule( TQWidget *tqparent=0, const char *name=0 );
     virtual const KAboutData *aboutData() const;
   };
 
   class EditorSelection : public KPrefsWid
   {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
-    EditorSelection( const TQString &text, TQString &reference, TQWidget *parent );
+    EditorSelection( const TQString &text, TQString &reference, TQWidget *tqparent );
     ~EditorSelection();
 
     void readConfig();
diff --git a/libkdepim/komposer/core/tests/managertest.cpp b/libkdepim/komposer/core/tests/managertest.cpp
index 487a84c59..4224a2e24 100644
--- a/libkdepim/komposer/core/tests/managertest.cpp
+++ b/libkdepim/komposer/core/tests/managertest.cpp
@@ -23,8 +23,8 @@
 #include "pluginmanager.h"
 using namespace Komposer;
 
-ManagerTest::ManagerTest( TQObject* parent )
-    : TQObject( parent )
+ManagerTest::ManagerTest( TQObject* tqparent )
+    : TQObject( tqparent )
 {
     m_manager = new PluginManager( this );
 }
diff --git a/libkdepim/komposer/core/tests/managertest.h b/libkdepim/komposer/core/tests/managertest.h
index 397bfaf01..c0351b39f 100644
--- a/libkdepim/komposer/core/tests/managertest.h
+++ b/libkdepim/komposer/core/tests/managertest.h
@@ -32,8 +32,9 @@ class ManagerTest : public TQObject,
                     public Tester
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ManagerTest( TQObject* parent = 0 );
+    ManagerTest( TQObject* tqparent = 0 );
 
 public slots:
     void allTests();
diff --git a/libkdepim/komposer/core/tests/tester.cpp b/libkdepim/komposer/core/tests/tester.cpp
index b32c89644..2a0c84618 100644
--- a/libkdepim/komposer/core/tests/tester.cpp
+++ b/libkdepim/komposer/core/tests/tester.cpp
@@ -21,8 +21,8 @@
 #include "tester.h"
 
 
-Tester::Tester( TQObject* parent )
-    : TQObject( parent )
+Tester::Tester( TQObject* tqparent )
+    : TQObject( tqparent )
 {
 }
 
diff --git a/libkdepim/komposer/core/tests/testmanager.cpp b/libkdepim/komposer/core/tests/testmanager.cpp
index 0fcba16b9..893b35b81 100644
--- a/libkdepim/komposer/core/tests/testmanager.cpp
+++ b/libkdepim/komposer/core/tests/testmanager.cpp
@@ -11,8 +11,8 @@
 
 using namespace Komposer;
 
-TestManager::TestManager( TQObject *parent )
-  : TQObject( parent )
+TestManager::TestManager( TQObject *tqparent )
+  : TQObject( tqparent )
 {
   m_manager = new PluginManager( this );
   connect( m_manager, TQT_SIGNAL(pluginLoaded(Plugin*)),
diff --git a/libkdepim/komposer/core/tests/testmanager.h b/libkdepim/komposer/core/tests/testmanager.h
index c5ff8517d..b574bc871 100644
--- a/libkdepim/komposer/core/tests/testmanager.h
+++ b/libkdepim/komposer/core/tests/testmanager.h
@@ -9,11 +9,12 @@ namespace Komposer {
 }
 using Komposer::Plugin;
 
-class TestManager : public QObject
+class TestManager : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  TestManager( TQObject *parent );
+  TestManager( TQObject *tqparent );
 
 public slots:
   void slotPluginLoaded( Plugin *plugin );