6 files changed, 16 insertions, 13 deletions
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index 8455d61b..f2aaa33e 100644
--- a/korganizer/plugins/exchange/exchange.cpp
+++ b/korganizer/plugins/exchange/exchange.cpp
@@ -46,18 +46,18 @@ using namespace KCal; // Needed for connecting slots
 
 class ExchangeFactory : public KOrg::PartFactory {
   public:
-    KOrg::Part *create(KOrg::MainWindow *parent, const char *name)
+    KOrg::Part *create(KOrg::MainWindow *tqparent, const char *name)
     {
       kdDebug(5850) << "Registering Exchange Plugin...\n";
       KGlobal::locale()->insertCatalogue("libkpimexchange");
-      return new Exchange(parent,name);
+      return new Exchange(tqparent,name);
     }
 };
 
 K_EXPORT_COMPONENT_FACTORY( libkorg_exchange, ExchangeFactory )
 
-Exchange::Exchange(KOrg::MainWindow *parent, const char *name) :
-  KOrg::Part(parent,name)
+Exchange::Exchange(KOrg::MainWindow *tqparent, const char *name) :
+  KOrg::Part(tqparent,name)
 {
   setInstance( new KInstance( "korganizer" ) );
 
@@ -65,7 +65,7 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) :
 
   mAccount = new KPIM::ExchangeAccount( "Calendar/Exchange Plugin" );
   mClient = new KPIM::ExchangeClient( mAccount );
-  mClient->setWindow( parent->tqtopLevelWidget() );
+  mClient->setWindow( tqparent->tqtopLevelWidget() );
 
   setXMLFile("plugins/exchangeui.rc");
 
@@ -187,7 +187,7 @@ void Exchange::configure()
     mAccount->save( "Calendar/Exchange Plugin" );
 }
 
-void Exchange::showError( int error, const TQString& moreInfo /* = TQString::null */ )
+void Exchange::showError( int error, const TQString& moreInfo /* = TQString() */ )
 {
   TQString errorText;
   switch( error ) {
diff --git a/korganizer/plugins/exchange/exchange.h b/korganizer/plugins/exchange/exchange.h
index 22a15f1c..8f021004 100644
--- a/korganizer/plugins/exchange/exchange.h
+++ b/korganizer/plugins/exchange/exchange.h
@@ -35,6 +35,7 @@ using namespace KCal;
 
 class Exchange : public KOrg::Part {
     Q_OBJECT
+  TQ_OBJECT
   public:
     Exchange( KOrg::MainWindow *, const char *name );
     ~Exchange();
@@ -58,7 +59,7 @@ class Exchange : public KOrg::Part {
 
   private:
     void test2();
-    void showError( int error, const TQString& moreInfo = TQString::null );
+    void showError( int error, const TQString& moreInfo = TQString() );
 
     KPIM::ExchangeClient *mClient;
     KPIM::ExchangeAccount* mAccount;
diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp
index fe01324a..76e6abe7 100644
--- a/korganizer/plugins/exchange/exchangeconfig.cpp
+++ b/korganizer/plugins/exchange/exchangeconfig.cpp
@@ -31,8 +31,8 @@
 
 #include "exchangeconfig.h"
 
-ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent )
-  : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,parent)
+ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* tqparent )
+  : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,tqparent)
 {
   mAccount = account;
 
diff --git a/korganizer/plugins/exchange/exchangeconfig.h b/korganizer/plugins/exchange/exchangeconfig.h
index 0e18bfe2..095f73cd 100644
--- a/korganizer/plugins/exchange/exchangeconfig.h
+++ b/korganizer/plugins/exchange/exchangeconfig.h
@@ -30,8 +30,9 @@
 class ExchangeConfig : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ExchangeConfig(KPIM::ExchangeAccount* account, TQWidget *parent=0);
+    ExchangeConfig(KPIM::ExchangeAccount* account, TQWidget *tqparent=0);
     virtual ~ExchangeConfig();
 
 //  protected:
diff --git a/korganizer/plugins/exchange/exchangedialog.cpp b/korganizer/plugins/exchange/exchangedialog.cpp
index de56a3a1..8c5cb74f 100644
--- a/korganizer/plugins/exchange/exchangedialog.cpp
+++ b/korganizer/plugins/exchange/exchangedialog.cpp
@@ -30,8 +30,8 @@
 
 #include "exchangedialog.h"
 
-ExchangeDialog::ExchangeDialog( const TQDate &_start, const TQDate &_end, TQWidget *parent)
-  : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,parent)
+ExchangeDialog::ExchangeDialog( const TQDate &_start, const TQDate &_end, TQWidget *tqparent)
+  : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,tqparent)
 {
   TQFrame *topFrame = plainPage();
   TQGridLayout *topLayout = new TQGridLayout( topFrame, 2, 2, 3 );
diff --git a/korganizer/plugins/exchange/exchangedialog.h b/korganizer/plugins/exchange/exchangedialog.h
index b2635f7a..1aa17c38 100644
--- a/korganizer/plugins/exchange/exchangedialog.h
+++ b/korganizer/plugins/exchange/exchangedialog.h
@@ -27,8 +27,9 @@ class TQComboBox;
 class ExchangeDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ExchangeDialog( const TQDate &start, const TQDate &end, TQWidget *parent=0);
+    ExchangeDialog( const TQDate &start, const TQDate &end, TQWidget *tqparent=0);
     virtual ~ExchangeDialog();
 
   protected slots: