Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit af0b8f5d1e5e00b1f3b48658d89876c2df28e71c)

7 files changed, 32 insertions, 32 deletions

diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp
index b1f00c1..b46425c 100644
--- a/kmilo/generic/generic_monitor.cpp
+++ b/kmilo/generic/generic_monitor.cpp
@@ -52,27 +52,27 @@ struct ShortcutInfo
 
 static const ShortcutInfo shortcuts[] =
 {
-	{ "Search", TDEShortcut("XF86Search"), TQT_SLOT(launchSearch()) },
-	{ "Home Folder", TDEShortcut("XF86MyComputer"), TQT_SLOT(launchHomeFolder()) },
-	{ "Mail", TDEShortcut("XF86Mail"), TQT_SLOT(launchMail()) },
-	{ "Audio Media", TDEShortcut("XF86AudioMedia"), TQT_SLOT(launchMusic()) },
-	{ "Music", TDEShortcut("XF86Music"), TQT_SLOT(launchMusic()) },
-	{ "Browser", TDEShortcut("XF86WWW"), TQT_SLOT(launchBrowser()) },
-	{ "Calculator", TDEShortcut("XF86Calculator"), TQT_SLOT(launchCalculator()) },
-	{ "Terminal", TDEShortcut("XF86Terminal"), TQT_SLOT(launchTerminal()) },
-	{ "Eject", TDEShortcut("XF86Eject"), TQT_SLOT(eject()) },
-	{ "Help", TDEShortcut("XF86Launch0"), TQT_SLOT(launchHelp()) },
-	{ "Light Bulb", TDEShortcut("XF86LightBulb"), TQT_SLOT(lightBulb()) },
-	{ "Battery", TDEShortcut("XF86LaunchB"), TQT_SLOT(pmBattery()) },
-	{ "FastVolumeUp", TQt::Key_VolumeUp, TQT_SLOT(fastVolumeUp()) },
-	{ "FastVolumeDown", TQt::Key_VolumeDown, TQT_SLOT(fastVolumeDown()) },
-	{ "SlowVolumeUp", TQt::CTRL+TQt::Key_VolumeUp, TQT_SLOT(slowVolumeUp()) },
-	{ "SlowVolumeDown", TQt::CTRL+TQt::Key_VolumeDown, TQT_SLOT(slowVolumeDown()) },
-	{ "Mute", TDEShortcut("XF86AudioMute"), TQT_SLOT(toggleMute()) },
-	{ "BrightnessUp", TDEShortcut("XF86MonBrightnessUp"), TQT_SLOT(brightnessUp()) },
-	{ "BrightnessDown", TDEShortcut("XF86MonBrightnessDown"), TQT_SLOT(brightnessDown()) },
-	{ "BrightnessSlowUp", TDEShortcut("Ctrl+XF86MonBrightnessUp"), TQT_SLOT(brightnessSlowUp()) },
-	{ "BrightnessSlowDown", TDEShortcut("Ctrl+XF86MonBrightnessDown"), TQT_SLOT(brightnessSlowDown()) }
+	{ "Search", TDEShortcut("XF86Search"), TQ_SLOT(launchSearch()) },
+	{ "Home Folder", TDEShortcut("XF86MyComputer"), TQ_SLOT(launchHomeFolder()) },
+	{ "Mail", TDEShortcut("XF86Mail"), TQ_SLOT(launchMail()) },
+	{ "Audio Media", TDEShortcut("XF86AudioMedia"), TQ_SLOT(launchMusic()) },
+	{ "Music", TDEShortcut("XF86Music"), TQ_SLOT(launchMusic()) },
+	{ "Browser", TDEShortcut("XF86WWW"), TQ_SLOT(launchBrowser()) },
+	{ "Calculator", TDEShortcut("XF86Calculator"), TQ_SLOT(launchCalculator()) },
+	{ "Terminal", TDEShortcut("XF86Terminal"), TQ_SLOT(launchTerminal()) },
+	{ "Eject", TDEShortcut("XF86Eject"), TQ_SLOT(eject()) },
+	{ "Help", TDEShortcut("XF86Launch0"), TQ_SLOT(launchHelp()) },
+	{ "Light Bulb", TDEShortcut("XF86LightBulb"), TQ_SLOT(lightBulb()) },
+	{ "Battery", TDEShortcut("XF86LaunchB"), TQ_SLOT(pmBattery()) },
+	{ "FastVolumeUp", TQt::Key_VolumeUp, TQ_SLOT(fastVolumeUp()) },
+	{ "FastVolumeDown", TQt::Key_VolumeDown, TQ_SLOT(fastVolumeDown()) },
+	{ "SlowVolumeUp", TQt::CTRL+TQt::Key_VolumeUp, TQ_SLOT(slowVolumeUp()) },
+	{ "SlowVolumeDown", TQt::CTRL+TQt::Key_VolumeDown, TQ_SLOT(slowVolumeDown()) },
+	{ "Mute", TDEShortcut("XF86AudioMute"), TQ_SLOT(toggleMute()) },
+	{ "BrightnessUp", TDEShortcut("XF86MonBrightnessUp"), TQ_SLOT(brightnessUp()) },
+	{ "BrightnessDown", TDEShortcut("XF86MonBrightnessDown"), TQ_SLOT(brightnessDown()) },
+	{ "BrightnessSlowUp", TDEShortcut("Ctrl+XF86MonBrightnessUp"), TQ_SLOT(brightnessSlowUp()) },
+	{ "BrightnessSlowDown", TDEShortcut("Ctrl+XF86MonBrightnessDown"), TQ_SLOT(brightnessSlowDown()) }
 };
 
 GenericMonitor::GenericMonitor(TQObject *parent, const char *name, const TQStringList& args)
@@ -289,7 +289,7 @@ void GenericMonitor::brightnessChange(int direction, int step)
 	{
 		tdepowersave->call("do_brightnessDown", step);
 	}
-	TQTimer::singleShot(250, this, TQT_SLOT(brightnessValueUpdate()));
+	TQTimer::singleShot(250, this, TQ_SLOT(brightnessValueUpdate()));
 }
 
 void GenericMonitor::brightnessValueUpdate()
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
index d6e7f11..ea24905 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
+++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
@@ -82,10 +82,10 @@ KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList
         // mKVaioGeneral->frameMain->setEnabled (true);
     }
 
-    connect(mKVaioGeneral, TQT_SIGNAL(changed()),
-            TQT_SLOT(changed()));
-    connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()));
-    connect(mDriver, TQT_SIGNAL (vaioEvent(int)), TQT_SLOT (vaioEvent(int) ) );
+    connect(mKVaioGeneral, TQ_SIGNAL(changed()),
+            TQ_SLOT(changed()));
+    connect(mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()));
+    connect(mDriver, TQ_SIGNAL (vaioEvent(int)), TQ_SLOT (vaioEvent(int) ) );
 }
 
 void KVaioModule::save()
diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp
index 63f50da..004f15e 100644
--- a/kmilo/kmilo_kvaio/kvaio.cpp
+++ b/kmilo/kmilo_kvaio/kvaio.cpp
@@ -69,8 +69,8 @@ KVaio::KVaio(KMiloKVaio *parent, const char* name)
         kdDebug() << "KVaio: Cannot connect to driver." << endl;
     } else {
         kdDebug() << "KVaio: Connected to SonyPI driver." << endl;
-        connect(mDriver, TQT_SIGNAL(vaioEvent(int)), TQT_SLOT(slotVaioEvent(int)));
-	connect (mTimer, TQT_SIGNAL (timeout ()), TQT_SLOT (slotTimeout() ) );
+        connect(mDriver, TQ_SIGNAL(vaioEvent(int)), TQ_SLOT(slotVaioEvent(int)));
+	connect (mTimer, TQ_SIGNAL (timeout ()), TQ_SLOT (slotTimeout() ) );
 	mTimer->start (10000, true);
     }
 
diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
index eb8c5e4..e8e8541 100644
--- a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
+++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
@@ -97,7 +97,7 @@ bool KVaioDriverInterface::connectToDriver(bool listen)
     if(listen)
         {
             mNotifier = new TQSocketNotifier(mFd,  TQSocketNotifier::Read, this);
-            connect(mNotifier, TQT_SIGNAL(activated(int)), TQT_SLOT(socketActivated(int)));
+            connect(mNotifier, TQ_SIGNAL(activated(int)), TQ_SLOT(socketActivated(int)));
         }
     return true;
 }
diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp
index bcf6a9f..156f2ac 100644
--- a/kmilo/kmilod/defaultskin.cpp
+++ b/kmilo/kmilod/defaultskin.cpp
@@ -38,7 +38,7 @@
 
 
 DefaultSkin::DefaultSkin() {
-	connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()));
+	connect(&_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()));
 
 	_widget = new DefaultWidget(0, "Screen Indicator", TQt::WX11BypassWM);
 	_widget->setFocusPolicy(TQWidget::NoFocus);
diff --git a/kmilo/kmilod/kmilod.cpp b/kmilo/kmilod/kmilod.cpp
index 07d72aa..187b848 100644
--- a/kmilo/kmilod/kmilod.cpp
+++ b/kmilo/kmilod/kmilod.cpp
@@ -79,7 +79,7 @@ KMiloD::KMiloD(const TQCString &name) : KDEDModule(name), _interval(100)
 	}
 
 	// Start the timer
-	TQObject::connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doTimer()));
+	TQObject::connect(&_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doTimer()));
 	if (shouldPoll) {
 		_timer.start(_interval);
 	}
diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp
index 9113f36..fd893d6 100644
--- a/kmilo/thinkpad/kcmthinkpad/main.cpp
+++ b/kmilo/thinkpad/kcmthinkpad/main.cpp
@@ -122,7 +122,7 @@ KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const T
 		m_KCMThinkpadGeneral->tlOff->setText(i18n("Thinkpad Buttons KMilo Plugin Ready For Configuration"));
 	}
 
-	connect( m_KCMThinkpadGeneral, TQT_SIGNAL(changed()), TQT_SLOT(changed()));
+	connect( m_KCMThinkpadGeneral, TQ_SIGNAL(changed()), TQ_SLOT(changed()));
 
 }