6 files changed, 26 insertions, 26 deletions
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index e0bc1ab7..bb91a5b1 100644
--- a/korganizer/plugins/exchange/exchange.cpp
+++ b/korganizer/plugins/exchange/exchange.cpp
@@ -21,7 +21,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <kurl.h>
 #include <kdebug.h>
@@ -69,29 +69,29 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) :
 
   setXMLFile("plugins/exchangeui.rc");
 
-  new TDEAction(i18n("&Download..."), 0, this, TQT_SLOT(download()),
+  new TDEAction(i18n("&Download..."), 0, this, TQ_SLOT(download()),
               actionCollection(), "exchange_download");
 
-  TDEAction *action = new TDEAction(i18n("&Upload Event..."), 0, this, TQT_SLOT(upload()),
+  TDEAction *action = new TDEAction(i18n("&Upload Event..."), 0, this, TQ_SLOT(upload()),
                                 actionCollection(), "exchange_upload");
-  TQObject::connect(mainWindow()->view(),TQT_SIGNAL(incidenceSelected(Incidence *)),
-            this, TQT_SLOT(slotIncidenceSelected(Incidence *)));
+  TQObject::connect(mainWindow()->view(),TQ_SIGNAL(incidenceSelected(Incidence *)),
+            this, TQ_SLOT(slotIncidenceSelected(Incidence *)));
   action->setEnabled( false );
-  TQObject::connect(this,TQT_SIGNAL(enableIncidenceActions(bool)),
-          action,TQT_SLOT(setEnabled(bool)));
+  TQObject::connect(this,TQ_SIGNAL(enableIncidenceActions(bool)),
+          action,TQ_SLOT(setEnabled(bool)));
 
-  action = new TDEAction(i18n("De&lete Event"), 0, this, TQT_SLOT(remove()),
+  action = new TDEAction(i18n("De&lete Event"), 0, this, TQ_SLOT(remove()),
                                 actionCollection(), "exchange_delete");
-  TQObject::connect(this,TQT_SIGNAL(enableIncidenceActions(bool)),
-          action,TQT_SLOT(setEnabled(bool)));
+  TQObject::connect(this,TQ_SIGNAL(enableIncidenceActions(bool)),
+          action,TQ_SLOT(setEnabled(bool)));
   action->setEnabled( false );
 
-  new TDEAction(i18n("&Configure..."), 0, this, TQT_SLOT(configure()),
+  new TDEAction(i18n("&Configure..."), 0, this, TQ_SLOT(configure()),
               actionCollection(), "exchange_configure");
 
-  connect( this, TQT_SIGNAL( calendarChanged() ), mainWindow()->view(), TQT_SLOT( updateView() ) );
-  connect( this, TQT_SIGNAL( calendarChanged(const TQDate &, const TQDate &)),
-  mainWindow()->view(), TQT_SLOT(updateView(const TQDate &, const TQDate &)) );
+  connect( this, TQ_SIGNAL( calendarChanged() ), mainWindow()->view(), TQ_SLOT( updateView() ) );
+  connect( this, TQ_SIGNAL( calendarChanged(const TQDate &, const TQDate &)),
+  mainWindow()->view(), TQ_SLOT(updateView(const TQDate &, const TQDate &)) );
 }
 
 Exchange::~Exchange()
diff --git a/korganizer/plugins/exchange/exchange.h b/korganizer/plugins/exchange/exchange.h
index 8de777fe..26c5e8de 100644
--- a/korganizer/plugins/exchange/exchange.h
+++ b/korganizer/plugins/exchange/exchange.h
@@ -34,7 +34,7 @@
 using namespace KCal;
 
 class Exchange : public KOrg::Part {
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
     Exchange( KOrg::MainWindow *, const char *name );
diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp
index 106fc867..2c398560 100644
--- a/korganizer/plugins/exchange/exchangeconfig.cpp
+++ b/korganizer/plugins/exchange/exchangeconfig.cpp
@@ -53,7 +53,7 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent
   m_user = new KLineEdit( mAccount->account(), topFrame );
   topLayout->addWidget( new TQLabel( i18n( "User:" ), topFrame ), 2, 0 );
   topLayout->addWidget( m_user, 2, 1 );
-  connect( m_user, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUserChanged(const TQString&)) );
+  connect( m_user, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotUserChanged(const TQString&)) );
 
   m_password = new KLineEdit( mAccount->password(), topFrame );
   topLayout->addWidget( new TQLabel( i18n( "Password:" ), topFrame ), 3, 0 );
@@ -62,7 +62,7 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent
 
   m_autoMailbox = new TQCheckBox( i18n( "Determine mailbox automatically" ), topFrame );
   topLayout->addMultiCellWidget( m_autoMailbox, 4, 4, 0, 1 );
-  connect( m_autoMailbox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAuto(bool)) );
+  connect( m_autoMailbox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAuto(bool)) );
 
   m_mailbox= new KLineEdit( mAccount->mailbox(), topFrame );
   topLayout->addWidget( new TQLabel( i18n( "Mailbox URL:" ), topFrame ), 5, 0 );
@@ -70,10 +70,10 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent
 
   m_tryFindMailbox = new TQPushButton( "&Find", topFrame );
   topLayout->addWidget( m_tryFindMailbox, 5, 2 );
-  connect( m_tryFindMailbox, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFindClicked()) );
+  connect( m_tryFindMailbox, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFindClicked()) );
 
-  kapp->config()->setGroup( "Calendar/Exchange Plugin" );
-  bool autoChecked = kapp->config()->readBoolEntry( "auto-mailbox", true );
+  tdeApp->config()->setGroup( "Calendar/Exchange Plugin" );
+  bool autoChecked = tdeApp->config()->readBoolEntry( "auto-mailbox", true );
   m_autoMailbox->setChecked( autoChecked );
 }
 
@@ -116,8 +116,8 @@ void ExchangeConfig::slotOk()
   mAccount->setAccount( m_user->text() );
   mAccount->setPassword( m_password->text() );
 
-  kapp->config()->setGroup( "Calendar/Exchange Plugin" );
-  kapp->config()->writeEntry( "auto-mailbox", m_autoMailbox->isChecked() );
+  tdeApp->config()->setGroup( "Calendar/Exchange Plugin" );
+  tdeApp->config()->writeEntry( "auto-mailbox", m_autoMailbox->isChecked() );
   
   accept();
 }
diff --git a/korganizer/plugins/exchange/exchangeconfig.h b/korganizer/plugins/exchange/exchangeconfig.h
index a7aa3285..dc46da9b 100644
--- a/korganizer/plugins/exchange/exchangeconfig.h
+++ b/korganizer/plugins/exchange/exchangeconfig.h
@@ -29,7 +29,7 @@
 
 class ExchangeConfig : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
     ExchangeConfig(KPIM::ExchangeAccount* account, TQWidget *parent=0);
diff --git a/korganizer/plugins/exchange/exchangedialog.cpp b/korganizer/plugins/exchange/exchangedialog.cpp
index e457de38..b4dc2dc7 100644
--- a/korganizer/plugins/exchange/exchangedialog.cpp
+++ b/korganizer/plugins/exchange/exchangedialog.cpp
@@ -25,8 +25,8 @@
 #include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdestandarddirs.h>
+#include <tdesimpleconfig.h>
 
 #include "exchangedialog.h"
 
diff --git a/korganizer/plugins/exchange/exchangedialog.h b/korganizer/plugins/exchange/exchangedialog.h
index 8c525f2b..fc102072 100644
--- a/korganizer/plugins/exchange/exchangedialog.h
+++ b/korganizer/plugins/exchange/exchangedialog.h
@@ -26,7 +26,7 @@ class TQComboBox;
 
 class ExchangeDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
     ExchangeDialog( const TQDate &start, const TQDate &end, TQWidget *parent=0);