4 files changed, 10 insertions, 10 deletions
diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp
index 2e712ae8..0752a836 100644
--- a/kontact/plugins/test/test_part.cpp
+++ b/kontact/plugins/test/test_part.cpp
@@ -48,19 +48,19 @@ TestPart::TestPart(TQObject *parent, const char *name) // ## parentWidget
   m_edit = new TQTextEdit;
   setWidget(m_edit);
   setXMLFile("testpartui.rc");
-  new TDEAction( "new contact (test)", 0, this, TQT_SLOT( newContact() ), actionCollection(), "test_deleteevent" );
+  new TDEAction( "new contact (test)", 0, this, TQ_SLOT( newContact() ), actionCollection(), "test_deleteevent" );
   m_kab_stub = 0L;
 
   new KParts::SideBarExtension(new TQComboBox(this), this, "sbe");
 
-  kapp->dcopClient()->setNotifications( true );
-  connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString&)),
-           this, TQT_SLOT( unregisteredFromDCOP( const TQCString& )) );
+  tdeApp->dcopClient()->setNotifications( true );
+  connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString&)),
+           this, TQ_SLOT( unregisteredFromDCOP( const TQCString& )) );
 }
 
 TestPart::~TestPart()
 {
-  kapp->dcopClient()->setNotifications( false );
+  tdeApp->dcopClient()->setNotifications( false );
   delete m_kab_stub;
 }
 
@@ -92,7 +92,7 @@ bool TestPart::connectToAddressBook()
     }
     // TODO document the required named for the dcop interfaces e.g. "CalendarIface".
     TQCString dcopObjectId = "KAddressBookIface";
-    m_kab_stub = new KAddressBookIface_stub(kapp->dcopClient(), dcopService, dcopObjectId);
+    m_kab_stub = new KAddressBookIface_stub(tdeApp->dcopClient(), dcopService, dcopObjectId);
   }
   return m_kab_stub != 0L;
 }
diff --git a/kontact/plugins/test/test_part.h b/kontact/plugins/test/test_part.h
index af7da8f8..10f9ced9 100644
--- a/kontact/plugins/test/test_part.h
+++ b/kontact/plugins/test/test_part.h
@@ -33,7 +33,7 @@ class KAddressBookIface_stub;
 
 class TestPart : public KParts::ReadOnlyPart
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/kontact/plugins/test/test_plugin.cpp b/kontact/plugins/test/test_plugin.cpp
index 631d91cb..e98cd4f2 100644
--- a/kontact/plugins/test/test_plugin.cpp
+++ b/kontact/plugins/test/test_plugin.cpp
@@ -35,11 +35,11 @@ typedef KGenericFactory< TestPlugin, Kontact::Core > TestPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libkptestplugin, TestPluginFactory( "kptestplugin" ) )
 
 TestPlugin::TestPlugin(Kontact::Core *_core, const char *name, const TQStringList &)
-  : Kontact::Plugin(_core, TQT_TQOBJECT(_core), name)
+  : Kontact::Plugin(_core, _core, name)
 {
   setInstance(TestPluginFactory::instance());
 
-  insertNewAction(new TDEAction("Test", 0, this, TQT_SLOT(slotTestMenu()), actionCollection(), "edit_test"));
+  insertNewAction(new TDEAction("Test", 0, this, TQ_SLOT(slotTestMenu()), actionCollection(), "edit_test"));
 
   setXMLFile("kptestplugin.rc");
 }
diff --git a/kontact/plugins/test/test_plugin.h b/kontact/plugins/test/test_plugin.h
index 2a541c84..ad9f081d 100644
--- a/kontact/plugins/test/test_plugin.h
+++ b/kontact/plugins/test/test_plugin.h
@@ -33,7 +33,7 @@ class TestPart;
 
 class TestPlugin : public Kontact::Plugin
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public: