Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

2 files changed, 18 insertions, 18 deletions

diff --git a/kicker-applets/ktimemon/confdlg.cpp b/kicker-applets/ktimemon/confdlg.cpp
index c2c9493..a186b88 100644
--- a/kicker-applets/ktimemon/confdlg.cpp
+++ b/kicker-applets/ktimemon/confdlg.cpp
@@ -65,7 +65,7 @@ KConfDialog::KConfDialog(KTimeMon *t)
     bl->addStretch();
 
     autoScaleBox = new TQCheckBox(i18n("&Automatic"), b);
-    connect(autoScaleBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggle(bool)));
+    connect(autoScaleBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(toggle(bool)));
 
     pageScaleEdit = new KIntNumInput(intervalEdit, 1000, b);
     pageScaleEdit->setRange(10, 10000, 10);
@@ -117,8 +117,8 @@ KConfDialog::KConfDialog(KTimeMon *t)
       cb = *cpuColourButtons[j] = new KColorButton(white, page);
       gl->addWidget(cb, 1, 3*j+2, AlignCenter);
       
-      connect(cb, TQT_SIGNAL(changed(const TQColor &)),
-              this, TQT_SLOT(updateSampleWidget(const TQColor &)));
+      connect(cb, TQ_SIGNAL(changed(const TQColor &)),
+              this, TQ_SLOT(updateSampleWidget(const TQColor &)));
     }
 
     KColorButton **memColourButtons[4] = { &mkernelCB, &usedCB, &buffersCB, &cachedCB };
@@ -132,8 +132,8 @@ KConfDialog::KConfDialog(KTimeMon *t)
       cb = *memColourButtons[j] = new KColorButton(white, page);
       gl->addWidget(cb, 5, 3*j+2, AlignCenter);
       
-      connect(cb, TQT_SIGNAL(changed(const TQColor &)),
-              this, TQT_SLOT(updateSampleWidget(const TQColor &)));
+      connect(cb, TQ_SIGNAL(changed(const TQColor &)),
+              this, TQ_SLOT(updateSampleWidget(const TQColor &)));
     }
 
     b = new TQGroupBox(i18n("Swap"), page);
@@ -145,8 +145,8 @@ KConfDialog::KConfDialog(KTimeMon *t)
     cb = swapCB = new KColorButton(red, page);
     gl->addWidget(cb, 9, 2);
 
-    connect(cb, TQT_SIGNAL(changed(const TQColor &)),
-            this, TQT_SLOT(updateSampleWidget(const TQColor &)));
+    connect(cb, TQ_SIGNAL(changed(const TQColor &)),
+            this, TQ_SLOT(updateSampleWidget(const TQColor &)));
 
     l = new TQLabel(i18n("Backgd:"), page);
     gl->addWidget(l, 9, 4, AlignVCenter | AlignRight);
@@ -154,8 +154,8 @@ KConfDialog::KConfDialog(KTimeMon *t)
     cb = bgCB = new KColorButton(blue, page);
     gl->addWidget(cb, 9, 5);
 
-  connect(cb, TQT_SIGNAL(changed(const TQColor &)),
-	  this, TQT_SLOT(updateSampleWidget(const TQColor &)));
+  connect(cb, TQ_SIGNAL(changed(const TQColor &)),
+	  this, TQ_SLOT(updateSampleWidget(const TQColor &)));
 
   //b = new TQGroupBox(i18n("Sample"), page);
   //gl->addMultiCellWidget(b, 8, 10, 7, 9);
@@ -197,8 +197,8 @@ KConfDialog::KConfDialog(KTimeMon *t)
     mouseC[i]->insertItem(i18n("Starts"), KTimeMon::COMMAND - 1);
     gl->addWidget(mouseC[i], i+1, 1);
 
-    connect( mouseC[ i ], TQT_SIGNAL( activated( int ) ), this,
-           TQT_SLOT( mouseCommandEnable() ) );
+    connect( mouseC[ i ], TQ_SIGNAL( activated( int ) ), this,
+           TQ_SLOT( mouseCommandEnable() ) );
 
     mouseLE[i] = new KURLRequester(b);
     mouseLE[i]->lineEdit()->setText(t->mouseActionCommand[i]);
@@ -209,8 +209,8 @@ KConfDialog::KConfDialog(KTimeMon *t)
 
   resize(380, 300);
 
-  connect(this, TQT_SIGNAL(applyClicked()), timemon, TQT_SLOT(apply()));
-  connect(this, TQT_SIGNAL(okClicked()), timemon, TQT_SLOT(apply()));
+  connect(this, TQ_SIGNAL(applyClicked()), timemon, TQ_SLOT(apply()));
+  connect(this, TQ_SIGNAL(okClicked()), timemon, TQ_SLOT(apply()));
 }
 
 // Adjust the colours of the sample widget in the configuration dialog.
diff --git a/kicker-applets/ktimemon/timemon.cpp b/kicker-applets/ktimemon/timemon.cpp
index 3d0d3da..3fe5372 100644
--- a/kicker-applets/ktimemon/timemon.cpp
+++ b/kicker-applets/ktimemon/timemon.cpp
@@ -230,7 +230,7 @@ KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions,
     vertical = conf->readBoolEntry("Vertical", true);
 
     timer = new TQTimer(this);
-    connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()));
+    connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()));
     timer->start(interval);
 
     sample = new KSample(this, autoScale, pageScale, swapScale, ctxScale);
@@ -249,8 +249,8 @@ KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions,
     menu->insertSeparator();
     menu->insertItem(SmallIcon( "help" ), i18n("Help"), hmenu->menu(), 1);
 
-    menu->connectItem(2, this, TQT_SLOT(configure()));
-    menu->connectItem(4, this, TQT_SLOT(orientation()));
+    menu->connectItem(2, this, TQ_SLOT(configure()));
+    menu->connectItem(4, this, TQ_SLOT(orientation()));
 
     menu->setCheckable(true);
 
@@ -413,8 +413,8 @@ void KTimeMon::runCommand(int index)
 
     bgProcess = new KShellProcess;
     *bgProcess << mouseActionCommand[index];
-    connect(bgProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-            this, TQT_SLOT(commandStderr(TDEProcess *, char *, int)));
+    connect(bgProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+            this, TQ_SLOT(commandStderr(TDEProcess *, char *, int)));
     bgProcess->start(TDEProcess::DontCare, TDEProcess::Stderr);
 }