6 files changed, 28 insertions, 28 deletions
diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp
index a492c9deb..6ff8505b5 100644
--- a/kcontrol/clock/dtime.cpp
+++ b/kcontrol/clock/dtime.cpp
@@ -34,7 +34,7 @@
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdemessagebox.h>
 #include <kdialog.h>
 #include <tdeconfig.h>
@@ -70,14 +70,14 @@ Dtime::Dtime(TQWidget * parent, const char *name)
 
   setDateTimeAuto = new TQCheckBox( privateLayoutWidget, "setDateTimeAuto" );
   setDateTimeAuto->setText(i18n("Set date and time &automatically:"));
-  connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(serverTimeCheck()));
-  connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()));
+  connect(setDateTimeAuto, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(serverTimeCheck()));
+  connect(setDateTimeAuto, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged()));
   layout1->addWidget( setDateTimeAuto );
 
   timeServerList = new TQComboBox( false, privateLayoutWidget, "timeServerList" );
-  connect(timeServerList, TQT_SIGNAL(activated(int)), TQT_SLOT(configChanged()));
-  connect(timeServerList, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(configChanged()));
-  connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), timeServerList, TQT_SLOT(setEnabled(bool)));
+  connect(timeServerList, TQ_SIGNAL(activated(int)), TQ_SLOT(configChanged()));
+  connect(timeServerList, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(configChanged()));
+  connect(setDateTimeAuto, TQ_SIGNAL(toggled(bool)), timeServerList, TQ_SLOT(setEnabled(bool)));
   timeServerList->setEnabled(false);
   timeServerList->setEditable(true);
   layout1->addWidget( timeServerList );
@@ -164,12 +164,12 @@ Dtime::Dtime(TQWidget * parent, const char *name)
   // End Dialog
   // *************************************************************
 
-  connect( hour, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) );
-  connect( minute, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) );
-  connect( second, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) );
-  connect( cal, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(changeDate(TQDate)));
+  connect( hour, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(set_time()) );
+  connect( minute, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(set_time()) );
+  connect( second, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(set_time()) );
+  connect( cal, TQ_SIGNAL(dateChanged(TQDate)), TQ_SLOT(changeDate(TQDate)));
 
-  connect( &internalTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()) );
+  connect( &internalTimer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) );
 
   load();
 
@@ -225,17 +225,17 @@ void Dtime::set_time()
   time.setHMS( hour->value(), minute->value(), second->value() );
   kclock->setTime( time );
 
-  emit timeChanged( TRUE );
+  emit timeChanged( true );
 }
 
 void Dtime::changeDate(TQDate d)
 {
   date = d;
-  emit timeChanged( TRUE );
+  emit timeChanged( true );
 }
 
 void Dtime::configChanged(){
-  emit timeChanged( TRUE );
+  emit timeChanged( true );
 }
 
 void Dtime::load()
@@ -347,11 +347,11 @@ void Dtime::timeout()
   // get current time
   time = TQTime::currentTime();
 
-  ontimeout = TRUE;
+  ontimeout = true;
   second->setValue(time.second());
   minute->setValue(time.minute());
   hour->setValue(time.hour());
-  ontimeout = FALSE;
+  ontimeout = false;
 
   kclock->setTime( time );
 }
diff --git a/kcontrol/clock/dtime.h b/kcontrol/clock/dtime.h
index 74680d579..ed8819502 100644
--- a/kcontrol/clock/dtime.h
+++ b/kcontrol/clock/dtime.h
@@ -39,7 +39,7 @@ class Kclock;
 
 class HMSTimeWidget : public KIntSpinBox
 {
-  Q_OBJECT
+  TQ_OBJECT
  public:
   HMSTimeWidget(TQWidget *parent=0, const char *name=0);
  protected:
@@ -48,7 +48,7 @@ class HMSTimeWidget : public KIntSpinBox
 
 class Dtime : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
  public:
   Dtime( TQWidget *parent=0, const char* name=0 );
 
@@ -97,7 +97,7 @@ private:
 
 class Kclock : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   Kclock( TQWidget *parent=0, const char *name=0 ) 
@@ -118,7 +118,7 @@ class KStrictIntValidator : public TQIntValidator
 public:
   KStrictIntValidator(int bottom, int top, TQWidget * parent,
 		      const char * name = 0 )
-    : TQIntValidator(bottom, top, TQT_TQOBJECT(parent), name) {};
+    : TQIntValidator(bottom, top, parent, name) {};
   
   TQValidator::State validate( TQString & input, int & d ) const; 
 };
diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp
index a59599b71..e7dcf872f 100644
--- a/kcontrol/clock/main.cpp
+++ b/kcontrol/clock/main.cpp
@@ -63,11 +63,11 @@ KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringLis
 
   dtime = new Dtime(this);
   layout->addWidget(dtime);
-  connect(dtime, TQT_SIGNAL(timeChanged(bool)), this, TQT_SIGNAL(changed(bool)));
+  connect(dtime, TQ_SIGNAL(timeChanged(bool)), this, TQ_SIGNAL(changed(bool)));
 
   tzone = new Tzone(this);
   layout->addWidget(tzone);
-  connect(tzone, TQT_SIGNAL(zoneChanged(bool)), this, TQT_SIGNAL(changed(bool)));
+  connect(tzone, TQ_SIGNAL(zoneChanged(bool)), this, TQ_SIGNAL(changed(bool)));
 
   layout->addStretch();
 
@@ -89,7 +89,7 @@ void KclockModule::save()
 #endif
 
   // Tell the clock applet about the change so that it can update its timezone
-  kapp->dcopClient()->send( "kicker", "ClockApplet", "reconfigure()", TQByteArray() );
+  tdeApp->dcopClient()->send( "kicker", "ClockApplet", "reconfigure()", TQByteArray() );
 }
 
 void KclockModule::load()
diff --git a/kcontrol/clock/main.h b/kcontrol/clock/main.h
index 7754da34f..01c846f92 100644
--- a/kcontrol/clock/main.h
+++ b/kcontrol/clock/main.h
@@ -30,7 +30,7 @@ class TQTabWidget;
 
 class KclockModule : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KclockModule(TQWidget *parent, const char *name, const TQStringList &);
diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp
index 518c6663d..17e80f26d 100644
--- a/kcontrol/clock/tzone.cpp
+++ b/kcontrol/clock/tzone.cpp
@@ -40,7 +40,7 @@
 
 #if defined(USE_SOLARIS)
 #include <tdetempfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -52,7 +52,7 @@ Tzone::Tzone(TQWidget * parent, const char *name)
     setTitle(i18n("To change the timezone, select your area from the list below"));
 
     tzonelist = new KTimezoneWidget(this, "ComboBox_1", &m_zoneDb);
-    connect( tzonelist, TQT_SIGNAL(selectionChanged()), TQT_SLOT(handleZoneChange()) );
+    connect( tzonelist, TQ_SIGNAL(selectionChanged()), TQ_SLOT(handleZoneChange()) );
 
     m_local = new TQLabel(this);
 
diff --git a/kcontrol/clock/tzone.h b/kcontrol/clock/tzone.h
index 1ecfc225e..5887628e9 100644
--- a/kcontrol/clock/tzone.h
+++ b/kcontrol/clock/tzone.h
@@ -31,7 +31,7 @@ class TQLabel;
 
 class Tzone : public TQVGroupBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   Tzone( TQWidget *parent=0, const char* name=0 );
@@ -43,7 +43,7 @@ signals:
 	void zoneChanged(bool);
 
 protected slots:
-  void handleZoneChange() {emit zoneChanged( TRUE );}
+  void handleZoneChange() {emit zoneChanged( true );}
 
 private:
   void currentZone();