Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

13 files changed, 155 insertions, 155 deletions

diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp
index 8bce86b..8ff1e43 100644
--- a/klaptopdaemon/acpi.cpp
+++ b/klaptopdaemon/acpi.cpp
@@ -86,27 +86,27 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name)
     top_layout->addWidget( enableStandby );
     TQToolTip::add( enableStandby, i18n( "If checked this box enables transitions to the 'standby' state - a temporary powered down state" ) );
     enableStandby->setEnabled(can_enable);
-    connect( enableStandby, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) );
+    connect( enableStandby, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) );
 
     enableSuspend = new TQCheckBox( i18n("Enable &suspend"), this );
     top_layout->addWidget( enableSuspend );
     TQToolTip::add( enableSuspend, i18n( "If checked this box enables transitions to the 'suspend' state - a semi-powered down state, sometimes called 'suspend-to-ram'" ) );
     enableSuspend->setEnabled(can_enable);
-    connect( enableSuspend, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) );
+    connect( enableSuspend, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) );
 
     TQHBoxLayout *ll = new TQHBoxLayout();
     enableHibernate = new TQCheckBox( i18n("Enable &hibernate"), this );
     ll->addWidget( enableHibernate );
     TQToolTip::add( enableHibernate, i18n( "If checked this box enables transitions to the 'hibernate' state - a powered down state, sometimes called 'suspend-to-disk'" ) );
     enableHibernate->setEnabled(can_enable);
-    connect( enableHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) );
+    connect( enableHibernate, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) );
     if (laptop_portable::has_software_suspend()) {
 	ll->addStretch(1);
     	enableSoftwareSuspendHibernate = new TQCheckBox( i18n("Use software suspend for hibernate"), this );
     	ll->addWidget( enableSoftwareSuspendHibernate );
     	TQToolTip::add( enableSoftwareSuspendHibernate, i18n( "If checked this box enables transitions to the 'hibernate' state - a powered down state, sometimes called 'suspend-to-disk' - the kernel 'Software Suspend' mechanism will be used instead of using ACPI directly" ) );
     	enableSoftwareSuspendHibernate->setEnabled(laptop_portable::has_software_suspend(2));
-    	connect( enableSoftwareSuspendHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) );
+    	connect( enableSoftwareSuspendHibernate, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) );
     } else {
         enableSoftwareSuspendHibernate = 0;
     }
@@ -118,13 +118,13 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name)
     top_layout->addWidget( enablePerformance );
     TQToolTip::add( enablePerformance, i18n( "If checked this box enables access to ACPI performance profiles - usually OK in 2.4 and later" ) );
     enablePerformance->setEnabled(can_enable);
-    connect( enablePerformance, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) );
+    connect( enablePerformance, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) );
 
     enableThrottle = new TQCheckBox( i18n("Enable &CPU throttling"), this );
     top_layout->addWidget( enableThrottle );
     TQToolTip::add( enableThrottle, i18n( "If checked this box enables access to ACPI throttle speed changes - usually OK in 2.4 and later" ) );
     enableThrottle->setEnabled(can_enable);
-    connect( enableThrottle, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) );
+    connect( enableThrottle, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) );
 
     tmp_label = new TQLabel(i18n("If the above boxes are disabled then there is no 'helper' "
 				"application set up to help change ACPI states, there are two "
@@ -136,7 +136,7 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name)
     top_layout->addWidget( tmp_label );
     ll = new TQHBoxLayout();
     TQPushButton *setupButton = new TQPushButton(i18n("Setup Helper Application"), this);
-    connect( setupButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(setupHelper()) );
+    connect( setupButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(setupHelper()) );
     TQToolTip::add( setupButton, i18n( "This button can be used to enable the ACPI helper application" ) );
     ll->addStretch(2);
     ll->addWidget(setupButton);
diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp
index e2940d2..e02c2f1 100644
--- a/klaptopdaemon/apm.cpp
+++ b/klaptopdaemon/apm.cpp
@@ -84,13 +84,13 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
     top_layout->addWidget( enableStandby );
     TQToolTip::add( enableStandby, i18n( "If checked this box enables transitions to the 'standby' state - a temporary powered down state" ) );
     enableStandby->setEnabled(can_enable);
-    connect( enableStandby, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) );
+    connect( enableStandby, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) );
 
     enableSuspend = new TQCheckBox( i18n("Enable &suspend"), this );
     top_layout->addWidget( enableSuspend );
     TQToolTip::add( enableSuspend, i18n( "If checked this box enables transitions to the 'suspend' state - a semi-powered down state, sometimes called 'suspend-to-ram'" ) );
     enableSuspend->setEnabled(can_enable);
-    connect( enableSuspend, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) );
+    connect( enableSuspend, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) );
     apm_name = "/usr/bin/apm";
     if (::access(apm_name, F_OK) != 0 && ::access("/usr/sbin/apm", F_OK) == 0) 
 	    apm_name = "/usr/sbin/apm";
@@ -105,7 +105,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
     top_layout->addWidget( tmp_label );
     TQHBoxLayout *ll = new TQHBoxLayout(top_layout);
     TQPushButton *setupButton = new TQPushButton(i18n("Setup Helper Application"), this);
-    connect( setupButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(setupHelper()) );
+    connect( setupButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(setupHelper()) );
     TQToolTip::add( setupButton, i18n( "This button can be used to enable the APM helper application" ) );
     ll->addStretch(2);
     ll->addWidget(setupButton);
@@ -120,7 +120,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
     	top_layout->addWidget( enableSoftwareSuspendHibernate );
     	TQToolTip::add( enableSoftwareSuspendHibernate, i18n( "If checked this box enables transitions to the 'hibernate' state using the 'Software Suspend' mechanism" ) );
     	enableSoftwareSuspendHibernate->setEnabled(laptop_portable::has_software_suspend(2));
-    	connect( enableSoftwareSuspendHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) );
+    	connect( enableSoftwareSuspendHibernate, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) );
 	tmp_label = new TQLabel( i18n("If the above box is disabled then you need to be logged in "
 				"as root or need a helper application to invoke the Software "
 				"Suspend utility - TDE provides a utility to do this, if you "
@@ -130,7 +130,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
 	top_layout->addWidget( tmp_label );
         ll = new TQHBoxLayout(this);
         TQPushButton *setupSSButton = new TQPushButton(i18n("Setup SS Helper Application"), this);
-        connect( setupSSButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(setupHelper2()) );
+        connect( setupSSButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(setupHelper2()) );
         TQToolTip::add( setupSSButton, i18n( "This button can be used to enable the Software Suspend helper application" ) );
         ll->addStretch(2);
         ll->addWidget(setupSSButton);
diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp
index 9bf6be9..dcd03da 100644
--- a/klaptopdaemon/battery.cpp
+++ b/klaptopdaemon/battery.cpp
@@ -72,23 +72,23 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name)
     runMonitor = new TQCheckBox( i18n("&Show battery monitor"), this );
     top_layout->addWidget( runMonitor );
     TQToolTip::add( runMonitor, i18n( "This box enables the battery state icon in the panel" ) );
-    connect( runMonitor, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) );
-    connect( runMonitor, TQT_SIGNAL(clicked()), this, TQT_SLOT(runMonitorChanged()) );
+    connect( runMonitor, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) );
+    connect( runMonitor, TQ_SIGNAL(clicked()), this, TQ_SLOT(runMonitorChanged()) );
 
     // show also the battery level percentage
     showLevel = new TQCheckBox( i18n("Show battery level percentage"), this );
     top_layout->addWidget( showLevel );
     TQToolTip::add( showLevel, i18n( "This box enables a text message near the battery state icon containing battery level percentage" ) );
-    connect( showLevel, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) );
+    connect( showLevel, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) );
     
     notifyMe = new TQCheckBox( i18n("&Notify me whenever my battery becomes fully charged"), this );
     top_layout->addWidget( notifyMe );
     TQToolTip::add( notifyMe, i18n( "This box enables a dialog box that pops up when your battery becomes fully charged" ) );
-    connect( notifyMe, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) );
+    connect( notifyMe, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) );
 
     blankSaver = new TQCheckBox( i18n("&Use a blank screen saver when running on battery"), this );
     top_layout->addWidget( blankSaver );
-    connect( blankSaver, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) );
+    connect( blankSaver, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) );
 
     if (!apm) {
       top_layout->addWidget( laptop_portable::no_power_management_explanation(this) );
@@ -105,8 +105,8 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name)
       TQToolTip::add( editPoll, i18n( "Choose how responsive the laptop software will be when it checks the battery status" ) );
       editPoll->setSuffix( i18n("keep short, unit in spinbox", "sec") );
       poll_label->setBuddy( editPoll );
-      connect( editPoll, TQT_SIGNAL(valueChanged(int)),
-	       this, TQT_SLOT(configChanged()) );
+      connect( editPoll, TQ_SIGNAL(valueChanged(int)),
+	       this, TQ_SLOT(configChanged()) );
       TQWidget* spacer = new TQWidget( hb );
       hb->setStretchFactor( spacer, 1 );
 
@@ -128,9 +128,9 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name)
       buttonNoBattery->setIconType( TDEIcon::NoGroup, TDEIcon::Any, 1);
       buttonNoCharge->setIconType( TDEIcon::NoGroup, TDEIcon::Any, 1);
       buttonCharge->setIconType( TDEIcon::NoGroup, TDEIcon::Any, 1);
-      connect(buttonNoBattery, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(iconChanged()));
-      connect(buttonNoCharge, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(iconChanged()));
-      connect(buttonCharge, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(configChanged()));
+      connect(buttonNoBattery, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(iconChanged()));
+      connect(buttonNoCharge, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(iconChanged()));
+      connect(buttonCharge, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(configChanged()));
 
 
       int num_batteries;
@@ -178,7 +178,7 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name)
 
     top_layout->addStretch(1);
     startMonitor = new TQPushButton( i18n("&Start Battery Monitor"), this);
-    connect(startMonitor, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartMonitor()));
+    connect(startMonitor, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStartMonitor()));
     top_layout->addWidget( startMonitor, 0, TQt::AlignRight );
 
     load();
diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp
index 5c453de..cc27f5f 100644
--- a/klaptopdaemon/buttons.cpp
+++ b/klaptopdaemon/buttons.cpp
@@ -155,7 +155,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name)
 		lidValBrightness = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp);
 		lidValBrightness->setEnabled(0);
         	TQToolTip::add( lidValBrightness, i18n( "How bright the back panel will be set to" ) );
-		connect (lidValBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
+		connect (lidValBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
 		xl->addWidget(lidValBrightness);
 		xl->addWidget(new TQLabel("+", wp));
 		xl->addStretch(1);
@@ -170,7 +170,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name)
         	TQToolTip::add( lidValPerformance, i18n( "The performance profile to switch to" ) );
 		lidValPerformance->insertStringList(performance_list);
     		lidValPerformance->setEnabled(0);
-    		connect (lidValPerformance, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged()));
+    		connect (lidValPerformance, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged()));
 		xl->addWidget(lidValPerformance);
 		xl->addStretch(1);
       	} 
@@ -184,13 +184,13 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name)
         	TQToolTip::add( lidValThrottle, i18n( "How much to throttle back the CPU" ) );
 		lidValThrottle->insertStringList(throttle_list);
     		lidValThrottle->setEnabled(0);
-    		connect (lidValThrottle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged()));
+    		connect (lidValThrottle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged()));
 		xl->addWidget(lidValThrottle);
 		xl->addStretch(1);
 
 
       	} 
-        connect(lidBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(configChanged()));
+        connect(lidBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(configChanged()));
       }
 
       if (laptop_portable::has_button(laptop_portable::PowerButton)) {
@@ -231,7 +231,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name)
 		powerValBrightness = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp);
         	TQToolTip::add( powerValBrightness, i18n( "How bright the back panel will be set to" ) );
 		powerValBrightness->setEnabled(0);
-		connect (powerValBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
+		connect (powerValBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
 		xl->addWidget(powerValBrightness);
 		xl->addWidget(new TQLabel("+", wp));
 		xl->addStretch(1);
@@ -246,7 +246,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name)
         	TQToolTip::add( powerValPerformance, i18n( "The performance profile to switch to" ) );
 		powerValPerformance->insertStringList(performance_list);
     		powerValPerformance->setEnabled(0);
-    		connect (powerValPerformance, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged()));
+    		connect (powerValPerformance, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged()));
 		xl->addWidget(powerValPerformance);
 		xl->addStretch(1);
       	} 
@@ -260,11 +260,11 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name)
         	TQToolTip::add( powerValThrottle, i18n( "How much to throttle back the CPU" ) );
 		powerValThrottle->insertStringList(throttle_list);
     		powerValThrottle->setEnabled(0);
-    		connect (powerValThrottle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged()));
+    		connect (powerValThrottle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged()));
 		xl->addWidget(powerValThrottle);
 		xl->addStretch(1);
       	} 
-      	connect(powerBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(configChanged()));
+      	connect(powerBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(configChanged()));
       }
 
       hlay->addStretch(1);
diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp
index affe7b4..e2a388a 100644
--- a/klaptopdaemon/daemondock.cpp
+++ b/klaptopdaemon/daemondock.cpp
@@ -80,16 +80,16 @@ laptop_dock::SetupPopup()
     TQStringList throttle_list;
     int current_throttle;
     bool has_throttle = laptop_portable::get_system_throttling(0, current_throttle, throttle_list, active_list);
-    rightPopup->insertItem(SmallIcon("configure"), i18n("&Configure KLaptop..."), this, TQT_SLOT(invokeSetup()));
+    rightPopup->insertItem(SmallIcon("configure"), i18n("&Configure KLaptop..."), this, TQ_SLOT(invokeSetup()));
 
     if (has_brightness)
-	rightPopup->insertItem(i18n("Screen Brightness..."), this, TQT_SLOT(invokeBrightness()));
+	rightPopup->insertItem(i18n("Screen Brightness..."), this, TQ_SLOT(invokeBrightness()));
     if (has_performance) {
 	performance_popup = new TQPopupMenu(0, "performance");
 	performance_popup->setCheckable(1);
 	rightPopup->insertItem(i18n("Performance Profile..."), performance_popup);
-	connect( performance_popup, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( activate_performance( int ) ) );
-	connect( performance_popup, TQT_SIGNAL( aboutToShow() ),    this, TQT_SLOT( fill_performance() ) );
+	connect( performance_popup, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( activate_performance( int ) ) );
+	connect( performance_popup, TQ_SIGNAL( aboutToShow() ),    this, TQ_SLOT( fill_performance() ) );
     } else {
 	performance_popup = 0;
     }
@@ -97,24 +97,24 @@ laptop_dock::SetupPopup()
 	throttle_popup = new TQPopupMenu(0, "throttle");
 	throttle_popup->setCheckable(1);
 	rightPopup->insertItem(i18n("CPU Throttling..."), throttle_popup);
-	connect( throttle_popup, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( activate_throttle( int ) ) );
-	connect( throttle_popup, TQT_SIGNAL( aboutToShow() ),    this, TQT_SLOT( fill_throttle() ) );
+	connect( throttle_popup, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( activate_throttle( int ) ) );
+	connect( throttle_popup, TQ_SIGNAL( aboutToShow() ),    this, TQ_SLOT( fill_throttle() ) );
     } else {
 	throttle_popup = 0;
     }
 
     if (can_standby || can_suspend || can_hibernate) {
     	rightPopup->insertSeparator();
-    	if (can_standby) rightPopup->insertItem(i18n("Standby..."), this, TQT_SLOT(invokeStandby()));
-	//	if (can_suspend) rightPopup->insertItem(i18n("&Lock && Suspend..."), this, TQT_SLOT(invokeLockSuspend()));
-    	if (can_suspend) rightPopup->insertItem(i18n("&Suspend..."), this, TQT_SLOT(invokeLockSuspend()));
-	//        if (can_hibernate) rightPopup->insertItem(i18n("&Lock && Hibernate..."), this, TQT_SLOT(invokeLockHibernation()));
-	if (can_hibernate) rightPopup->insertItem(i18n("&Hibernate..."), this, TQT_SLOT(invokeLockHibernation()));
+    	if (can_standby) rightPopup->insertItem(i18n("Standby..."), this, TQ_SLOT(invokeStandby()));
+	//	if (can_suspend) rightPopup->insertItem(i18n("&Lock && Suspend..."), this, TQ_SLOT(invokeLockSuspend()));
+    	if (can_suspend) rightPopup->insertItem(i18n("&Suspend..."), this, TQ_SLOT(invokeLockSuspend()));
+	//        if (can_hibernate) rightPopup->insertItem(i18n("&Lock && Hibernate..."), this, TQ_SLOT(invokeLockHibernation()));
+	if (can_hibernate) rightPopup->insertItem(i18n("&Hibernate..."), this, TQ_SLOT(invokeLockHibernation()));
     }
 
     rightPopup->insertSeparator();
-    rightPopup->insertItem(i18n("&Hide Monitor"), this, TQT_SLOT(slotHide()));
-    rightPopup->insertItem(SmallIcon("system-log-out"), KStdGuiItem::quit().text(), this, TQT_SLOT(slotQuit()));
+    rightPopup->insertItem(i18n("&Hide Monitor"), this, TQ_SLOT(slotHide()));
+    rightPopup->insertItem(SmallIcon("system-log-out"), KStdGuiItem::quit().text(), this, TQ_SLOT(slotQuit()));
 }
 
 laptop_dock::~laptop_dock()
@@ -201,7 +201,7 @@ laptop_dock::invokeBrightness()
 		brightness_slider = new TQSlider(0, 255, 16, 255-brightness, TQt::Vertical, brightness_widget, 0);
 		brightness_slider->setMinimumHeight(40);
 		brightness_slider->setMinimumWidth(15);
-		connect(brightness_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(invokeBrightnessSlider(int)));
+		connect(brightness_slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(invokeBrightnessSlider(int)));
 		brightness_widget->resize(brightness_widget->sizeHint());
 	} else {
 		brightness_slider->setValue(255-brightness);
@@ -251,8 +251,8 @@ void laptop_dock::slotGoRoot(int /*id*/) {
 			*_rootProcess << "root";
 			//*_rootProcess << "--nonewdcop";
 			*_rootProcess << TDEStandardDirs::findExe("klaptopdaemon");
-			connect(_rootProcess, TQT_SIGNAL(processExited(TDEProcess*)),
-				this, TQT_SLOT(rootExited(TDEProcess*)));
+			connect(_rootProcess, TQ_SIGNAL(processExited(TDEProcess*)),
+				this, TQ_SLOT(rootExited(TDEProcess*)));
 			_rootProcess->start(TDEProcess::NotifyOnExit);
 			// We should disable this menu item here now.
 		}
@@ -419,30 +419,30 @@ void laptop_dock::mousePressEvent( TQMouseEvent *event )
                    _suspendActions.clear();
                    _resumeActions.clear();
                    _displayActions.clear();
-                   id = popup->insertItem(i18n("Card Slots..."), this, TQT_SLOT(slotDisplayAction(int)));
+                   id = popup->insertItem(i18n("Card Slots..."), this, TQ_SLOT(slotDisplayAction(int)));
                    _displayActions.insert(id, _pcmcia->getCard(0));
                    for (int i = 0; i < _pcmcia->getCardCount(); i++) {
                       KPCMCIACard *thiscard;
                       thiscard = _pcmcia->getCard(i);
                       if (thiscard && (thiscard->present())) {
                          TQPopupMenu *thisSub = new TQPopupMenu(popup, thiscard->name().latin1());
-                         id = thisSub->insertItem(i18n("Details..."), this, TQT_SLOT(slotDisplayAction(int)));
+                         id = thisSub->insertItem(i18n("Details..."), this, TQ_SLOT(slotDisplayAction(int)));
                          _displayActions.insert(id, thiscard);
 
                          // add the actions
                          TQPopupMenu *actionsSub = new TQPopupMenu(thisSub, "actions");
-                         id = actionsSub->insertItem(i18n("Eject"), this, TQT_SLOT(slotEjectAction(int)));
+                         id = actionsSub->insertItem(i18n("Eject"), this, TQ_SLOT(slotEjectAction(int)));
                          actionsSub->setItemEnabled(id, !(thiscard->status() & CARD_STATUS_BUSY));
                          _ejectActions.insert(id, thiscard);
-                         id = actionsSub->insertItem(i18n("Suspend"), this, TQT_SLOT(slotSuspendAction(int)));
+                         id = actionsSub->insertItem(i18n("Suspend"), this, TQ_SLOT(slotSuspendAction(int)));
                          actionsSub->setItemEnabled(id, !(thiscard->status() & (CARD_STATUS_SUSPEND|CARD_STATUS_BUSY)));
                          _suspendActions.insert(id, thiscard);
-                         id = actionsSub->insertItem(i18n("Resume"), this, TQT_SLOT(slotResumeAction(int)));
+                         id = actionsSub->insertItem(i18n("Resume"), this, TQ_SLOT(slotResumeAction(int)));
                          actionsSub->setItemEnabled(id, (thiscard->status() & CARD_STATUS_SUSPEND));
                          _resumeActions.insert(id, thiscard);
-                         id = actionsSub->insertItem(i18n("Reset"), this, TQT_SLOT(slotResetAction(int)));
+                         id = actionsSub->insertItem(i18n("Reset"), this, TQ_SLOT(slotResetAction(int)));
                          _resetActions.insert(id, thiscard);
-                         id = actionsSub->insertItem(i18n("Insert"), this, TQT_SLOT(slotInsertAction(int)));
+                         id = actionsSub->insertItem(i18n("Insert"), this, TQ_SLOT(slotInsertAction(int)));
                          _insertActions.insert(id, thiscard);
                          actionsSub->setItemEnabled(id, !(thiscard->status() & (CARD_STATUS_READY|CARD_STATUS_SUSPEND)));
                          thisSub->insertItem(i18n("Actions"), actionsSub);
diff --git a/klaptopdaemon/kpcmcia.cpp b/klaptopdaemon/kpcmcia.cpp
index 941f739..1311997 100644
--- a/klaptopdaemon/kpcmcia.cpp
+++ b/klaptopdaemon/kpcmcia.cpp
@@ -367,7 +367,7 @@ _refreshSpeed = 750;
 
 _haveCardServices = false;
 _timer = new TQTimer(this);
-connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateCardInfo()));
+connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateCardInfo()));
 _cards = new TQMemArray<KPCMCIACard *>(_maxSlots+1);
 _cardCnt = 0;
 
diff --git a/klaptopdaemon/kpcmciainfo.cpp b/klaptopdaemon/kpcmciainfo.cpp
index e2e70d5..738b1e3 100644
--- a/klaptopdaemon/kpcmciainfo.cpp
+++ b/klaptopdaemon/kpcmciainfo.cpp
@@ -60,7 +60,7 @@ KPCMCIAInfo::KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent, const char *name)
   _mainTab->resize(KDialog::sizeHint());
   resize(KDialog::sizeHint());
 
-  connect(_pcmcia, TQT_SIGNAL(cardUpdated(int)), this, TQT_SLOT(updateCard(int)));
+  connect(_pcmcia, TQ_SIGNAL(cardUpdated(int)), this, TQ_SLOT(updateCard(int)));
 
   _sb = new KStatusBar(this);
   _sb->insertItem(i18n("Ready."), 0, 1, true);
@@ -70,10 +70,10 @@ KPCMCIAInfo::KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent, const char *name)
 
   _updateButton = new TQPushButton(i18n("&Update"), this);
   _mainGrid->addWidget(_updateButton, 7, 3);
-  connect(_updateButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(update()));
+  connect(_updateButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(update()));
   _closeButton = new KPushButton(KStdGuiItem::close(), this);
   _mainGrid->addWidget(_closeButton, 7, 4);
-  connect(_closeButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClose()));
+  connect(_closeButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotClose()));
   _mainGrid->setRowStretch(7, 0);
 
   show();
@@ -99,7 +99,7 @@ void KPCMCIAInfo::slotResetStatus() {
 void KPCMCIAInfo::statusNotice(const TQString& text, int life) {
    _sb->changeItem(text, 0);
    if (life > 0)
-      TQTimer::singleShot(life, this, TQT_SLOT(slotResetStatus()));
+      TQTimer::singleShot(life, this, TQ_SLOT(slotResetStatus()));
 }
 
 
@@ -133,8 +133,8 @@ void KPCMCIAInfo::prepareCards() {
   for (int i = 0; i < _pcmcia->getCardCount(); i++) {
      TQString tabname = i18n("Card Slot %1");
      KPCMCIAInfoPage *tp = new KPCMCIAInfoPage(_pcmcia->getCard(i), _mainTab);
-     connect(this, TQT_SIGNAL(updateNow()), tp, TQT_SLOT(update()));
-     connect(tp, TQT_SIGNAL(setStatusBar(const TQString&)), this, TQT_SLOT(slotTabSetStatus(const TQString&)));
+     connect(this, TQ_SIGNAL(updateNow()), tp, TQ_SLOT(update()));
+     connect(tp, TQ_SIGNAL(setStatusBar(const TQString&)), this, TQ_SLOT(slotTabSetStatus(const TQString&)));
      tp->resize(_mainTab->sizeHint());
      _mainTab->addTab(tp, tabname.arg(i+1));
      _pages.insert(i, tp);
@@ -182,9 +182,9 @@ KPCMCIAInfoPage::KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *parent, const char
       _mainGrid->addWidget(_card_ej_ins, 9, 5);
       _mainGrid->addWidget(_card_sus_res, 9, 6);
       _mainGrid->addWidget(_card_reset, 9, 7);
-      connect(_card_reset, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotResetCard()));
-      connect(_card_sus_res, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotSuspendResume()));
-      connect(_card_ej_ins, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotInsertEject()));
+      connect(_card_reset, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotResetCard()));
+      connect(_card_sus_res, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotSuspendResume()));
+      connect(_card_ej_ins, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotInsertEject()));
 
       update();
   }
diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp
index 97e70ba..4a7545d 100644
--- a/klaptopdaemon/laptop_daemon.cpp
+++ b/klaptopdaemon/laptop_daemon.cpp
@@ -100,7 +100,7 @@ laptop_daemon::laptop_daemon(const TQCString& obj): KDEDModule(obj)
 	sony_notifier = 0;
 	knownFullyCharged = 0;
 	sony_disp = 0;
-        connect(this, TQT_SIGNAL(signal_checkBattery()), TQT_SLOT(checkBatteryNow()));
+        connect(this, TQ_SIGNAL(signal_checkBattery()), TQ_SLOT(checkBatteryNow()));
 
 	//hasAudio = (audioServer.serverStatus() == 0) ? true : false;
 
@@ -113,8 +113,8 @@ laptop_daemon::laptop_daemon(const TQCString& obj): KDEDModule(obj)
 	else _pcmcia = NULL;
 
 	if (_pcmcia)
-	        connect(_pcmcia, TQT_SIGNAL(cardUpdated(int)), this, TQT_SLOT(updatePCMCIA(int)));
-	connect( &autoLock, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) );
+	        connect(_pcmcia, TQ_SIGNAL(cardUpdated(int)), this, TQ_SLOT(updatePCMCIA(int)));
+	connect( &autoLock, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerDone()) );
 
 }
 
@@ -297,8 +297,8 @@ void laptop_daemon::restart()
 		if (sony_notifier == 0) {
 			sony_notifier = new TQSocketNotifier( sony_fd, TQSocketNotifier::Read, this );
 			if (sony_notifier)
-				TQObject::connect( sony_notifier, TQT_SIGNAL(activated(int)),
-						                          this, TQT_SLOT(sonyDataReceived()) );
+				TQObject::connect( sony_notifier, TQ_SIGNAL(activated(int)),
+						                          this, TQ_SLOT(sonyDataReceived()) );
 		}
 	} else {
 		if (sony_notifier) {
@@ -388,13 +388,13 @@ void laptop_daemon::timerDone()
 		wakepos.setY(TQCursor::pos().y());
 		if (!wake_timer) {
 			wake_timer = new TQTimer(this);
-        		connect(wake_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(WakeCheck()));
+        		connect(wake_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(WakeCheck()));
 			wake_timer->start(1*1000, 1);
 		}
 	} else {
 		if (!backoffTimer) {
 			backoffTimer = new TQTimer(this);
-        		connect(backoffTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(BackoffRestart()));
+        		connect(backoffTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(BackoffRestart()));
 			backoffTimer->start(60*1000, 1);
 		}
 	}
diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp
index 5068a4e..258f833 100644
--- a/klaptopdaemon/main.cpp
+++ b/klaptopdaemon/main.cpp
@@ -153,19 +153,19 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *)
 
   battery = new BatteryConfig(parent, "kcmlaptop");
   tab->addTab(battery, i18n("&Battery"));
-  connect(battery, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(battery, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   power = new PowerConfig(parent, "kcmlaptop");
   tab->addTab(power, i18n("&Power Control"));
-  connect(power, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(power, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   warning = new WarningConfig(0, parent, "kcmlaptop");
   tab->addTab(warning, i18n("Low Battery &Warning"));
-  connect(warning, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(warning, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   critical = new WarningConfig(1, parent, "kcmlaptop");
   tab->addTab(critical, i18n("Low Battery &Critical"));
-  connect(critical, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(critical, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
     TQStringList profile_list;
     int current_profile;
@@ -177,28 +177,28 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *)
   if (laptop_portable::has_brightness() || has_profile || has_throttling) {
   	profile = new ProfileConfig(parent, "kcmlaptop");
   	tab->addTab(profile, i18n("Default Power Profiles"));
-  	connect(profile, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  	connect(profile, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
   } else {
 	profile = 0;
   }
   if (laptop_portable::has_button(laptop_portable::LidButton) || laptop_portable::has_button(laptop_portable::PowerButton)) {
   	buttons = new ButtonsConfig(parent, "kcmlaptop");
   	tab->addTab(buttons, i18n("Button Actions"));
-  	connect(buttons, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  	connect(buttons, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
   } else {
         buttons = 0;
   }
   if (laptop_portable::has_acpi()) {
   	acpi = new AcpiConfig(parent, "kcmlaptop");
   	tab->addTab(acpi, i18n("&ACPI Config"));
-  	connect(acpi, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  	connect(acpi, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
   } else {
         acpi = 0;
   }
   if (laptop_portable::has_apm()) {
   	apm = new ApmConfig(parent, "kcmlaptop");
   	tab->addTab(apm, i18n("&APM Config"));
-  	connect(apm, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  	connect(apm, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
   } else {
         apm = 0;
   }
@@ -215,7 +215,7 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *)
 	if (do_sony) {
   		sony = new SonyConfig(parent, "kcmlaptop");
   		tab->addTab(sony, i18n("&Sony Laptop Config"));
-  		connect(sony, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  		connect(sony, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 	} else {
 		sony = 0;
 	}
diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp
index 89c25dc..cf132c9 100644
--- a/klaptopdaemon/power.cpp
+++ b/klaptopdaemon/power.cpp
@@ -148,8 +148,8 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name)
 		nopowerValBrightness = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp);
         	TQToolTip::add( nopowerValBrightness, i18n( "How bright to change the back panel" ) );
 		nopowerValBrightness->setEnabled(0);
-		connect(nopowerValBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-		connect(nopowerBrightness, TQT_SIGNAL(toggled(bool)), nopowerValBrightness, TQT_SLOT(setEnabled(bool)));
+		connect(nopowerValBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+		connect(nopowerBrightness, TQ_SIGNAL(toggled(bool)), nopowerValBrightness, TQ_SLOT(setEnabled(bool)));
 		xl->addWidget(nopowerValBrightness);
 		xl->addWidget(new TQLabel("+", wp));
 		xl->addStretch(1);
@@ -164,8 +164,8 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name)
         	TQToolTip::add( nopowerValPerformance, i18n( "Which profile to change it to" ) );
 		nopowerValPerformance->insertStringList(performance_list);
     		nopowerValPerformance->setEnabled(0);
-		connect(nopowerValPerformance, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()));
-		connect(nopowerPerformance, TQT_SIGNAL(toggled(bool)), nopowerValPerformance, TQT_SLOT(setEnabled(bool)));
+		connect(nopowerValPerformance, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()));
+		connect(nopowerPerformance, TQ_SIGNAL(toggled(bool)), nopowerValPerformance, TQ_SLOT(setEnabled(bool)));
 		xl->addWidget(nopowerValPerformance);
 		xl->addStretch(1);
       } 
@@ -179,25 +179,25 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name)
         	TQToolTip::add( nopowerValThrottle, i18n( "How much to throttle the laptop's CPU" ) );
 		nopowerValThrottle->insertStringList(throttle_list);
     		nopowerValThrottle->setEnabled(0);
-		connect(nopowerValThrottle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()));
-		connect(nopowerThrottle, TQT_SIGNAL(toggled(bool)), nopowerValThrottle, TQT_SLOT(setEnabled(bool)));
+		connect(nopowerValThrottle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()));
+		connect(nopowerThrottle, TQ_SIGNAL(toggled(bool)), nopowerValThrottle, TQ_SLOT(setEnabled(bool)));
 		xl->addWidget(nopowerValThrottle);
 		xl->addStretch(1);
       } 
 
 
-      connect(nopowerBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed()));
+      connect(nopowerBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(changed()));
 
       bool can_lav = laptop_portable::has_lav();
       TQHBox *hbox;
       if (can_lav) {
       	  hbox = new TQHBox( nopowerBox );
           noenablelav = new TQCheckBox(i18n("Don't act if LAV is >"), hbox);
-          connect(noenablelav, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+          connect(noenablelav, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
           noeditlav = new KDoubleSpinBox(0.0, 10.0, 0.0, 0.1, 1, hbox);
           TQToolTip::add( noeditlav, i18n( "If enabled and the system load average is greater than this value none of the above options will be applied" ) );
-          connect(noeditlav, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(changed()));
-          connect(noenablelav, TQT_SIGNAL(toggled(bool)), noeditlav, TQT_SLOT(setEnabled(bool)));
+          connect(noeditlav, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(changed()));
+          connect(noenablelav, TQ_SIGNAL(toggled(bool)), noeditlav, TQ_SLOT(setEnabled(bool)));
       }
 
       hbox = new TQHBox( nopowerBox );
@@ -207,7 +207,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name)
       noeditwait->setSuffix( i18n("keep short, unit in spinbox", "min") );
       noedlabel->setBuddy( noeditwait );
       hbox->setStretchFactor( noeditwait, 1 );
-      connect( noeditwait, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
+      connect( noeditwait, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
 
 
 	///////////////////////////////////////////////////////////////
@@ -241,8 +241,8 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name)
 		powerValBrightness = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp);
         	TQToolTip::add( powerValBrightness, i18n( "How bright to change the back panel" ) );
 		powerValBrightness->setEnabled(0);
-		connect(powerValBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-		connect(powerBrightness, TQT_SIGNAL(toggled(bool)), powerValBrightness, TQT_SLOT(setEnabled(bool)));
+		connect(powerValBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+		connect(powerBrightness, TQ_SIGNAL(toggled(bool)), powerValBrightness, TQ_SLOT(setEnabled(bool)));
 		xl->addWidget(powerValBrightness);
 		xl->addWidget(new TQLabel("+", wp));
 		xl->addStretch(1);
@@ -257,8 +257,8 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name)
         	TQToolTip::add( powerValPerformance, i18n( "Which profile to change it to" ) );
 		powerValPerformance->insertStringList(performance_list);
     		powerValPerformance->setEnabled(0);
-		connect(powerValPerformance, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()));
-		connect(powerPerformance, TQT_SIGNAL(toggled(bool)), powerValPerformance, TQT_SLOT(setEnabled(bool)));
+		connect(powerValPerformance, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()));
+		connect(powerPerformance, TQ_SIGNAL(toggled(bool)), powerValPerformance, TQ_SLOT(setEnabled(bool)));
 		xl->addWidget(powerValPerformance);
 		xl->addStretch(1);
       } 
@@ -272,22 +272,22 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name)
         	TQToolTip::add( powerValThrottle, i18n( "How much to throttle the laptop's CPU" ) );
 		powerValThrottle->insertStringList(throttle_list);
     		powerValThrottle->setEnabled(0);
-		connect(powerValThrottle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()));
-		connect(powerThrottle, TQT_SIGNAL(toggled(bool)), powerValThrottle, TQT_SLOT(setEnabled(bool)));
+		connect(powerValThrottle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()));
+		connect(powerThrottle, TQ_SIGNAL(toggled(bool)), powerValThrottle, TQ_SLOT(setEnabled(bool)));
 		xl->addWidget(powerValThrottle);
 		xl->addStretch(1);
       } 
 
-      connect(powerBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed()));
+      connect(powerBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(changed()));
 
       if (can_lav) {
           hbox = new TQHBox( powerBox );
           enablelav = new TQCheckBox(i18n("Don't act if LAV is >"), hbox);
-          connect( enablelav, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+          connect( enablelav, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
           editlav = new KDoubleSpinBox(0.0, 10.0, 0.0, 0.1, 1, hbox);
           TQToolTip::add( editlav, i18n( "If enabled and the system load average is greater than this value none of the above options will be applied" ) );
-          connect( editlav, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(changed()));
-          connect( enablelav, TQT_SIGNAL(toggled(bool)), editlav, TQT_SLOT(setEnabled(bool)) );
+          connect( editlav, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(changed()));
+          connect( enablelav, TQ_SIGNAL(toggled(bool)), editlav, TQ_SLOT(setEnabled(bool)) );
       }
 
       hbox = new TQHBox( powerBox );
@@ -297,7 +297,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name)
       editwait->setSuffix( i18n("keep short, unit in spinbox", "min") );
       edlabel->setBuddy( editwait );
       hbox->setStretchFactor( editwait, 1 );
-      connect( editwait, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
+      connect( editwait, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
 
       hlay->addStretch(1);
 
diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp
index 492b136..24f6228 100644
--- a/klaptopdaemon/profile.cpp
+++ b/klaptopdaemon/profile.cpp
@@ -81,13 +81,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name)
     	poff = new TQCheckBox(i18n("Back panel brightness"), wp);
         TQToolTip::add( poff, i18n( "Enables the changing of the back panel brightness" ) );
 	xl->addWidget(poff);
-    	connect (poff, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(poff_changed(bool)));
+    	connect (poff, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(poff_changed(bool)));
 
     	xl->addWidget(new TQLabel("-", wp));
     	soff = new TQSlider(0, 255, 16, 160, TQt::Horizontal, wp);
     	soff->setEnabled(0);
         TQToolTip::add( soff, i18n( "How bright it should be when it is changed" ) );
-    	connect (soff, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
+    	connect (soff, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
     	xl->addWidget(soff);
     	xl->addWidget(new TQLabel("+", wp));
     	xl->addStretch(1);
@@ -102,13 +102,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name)
     	performance_off = new TQCheckBox(i18n("System performance"), wp);
         TQToolTip::add( performance_off, i18n( "Enables the changing of the system performance profile" ) );
 	xl->addWidget(performance_off);
-    	connect (performance_off, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(performance_off_changed(bool)));
+    	connect (performance_off, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(performance_off_changed(bool)));
 
     	performance_val_off = new KComboBox(0, wp);
         TQToolTip::add( performance_val_off, i18n( "The new system performance profile to change to" ) );
 	performance_val_off->insertStringList(performance_list);
     	performance_val_off->setEnabled(0);
-    	connect (performance_val_off, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged()));
+    	connect (performance_val_off, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged()));
     	xl->addWidget(performance_val_off);
     	xl->addStretch(1);
     } else {
@@ -121,13 +121,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name)
     	throttle_off = new TQCheckBox(i18n("CPU throttling"), wp);
         TQToolTip::add( throttle_off, i18n( "Enables the throttling of the CPU performance" ) );
 	xl->addWidget(throttle_off);
-    	connect (throttle_off, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(throttle_off_changed(bool)));
+    	connect (throttle_off, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(throttle_off_changed(bool)));
 
     	throttle_val_off = new KComboBox(0, wp);
 	throttle_val_off->insertStringList(throttle_list);
     	throttle_val_off->setEnabled(0);
         TQToolTip::add( throttle_val_off, i18n( "How much to throttle the CPU by" ) );
-    	connect (throttle_val_off, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged()));
+    	connect (throttle_val_off, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged()));
     	xl->addWidget(throttle_val_off);
     	xl->addStretch(1);
     } else {
@@ -145,13 +145,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name)
     	pon = new TQCheckBox(i18n("Back panel brightness"), wp);
         TQToolTip::add( pon, i18n( "Enables the changing of the back panel brightness" ) );
 	xl->addWidget(pon);
-    	connect (pon, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(pon_changed(bool)));
+    	connect (pon, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(pon_changed(bool)));
 
     	xl->addWidget(new TQLabel("-", wp));
     	son = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp);
     	son->setEnabled(0);
         TQToolTip::add( son, i18n( "How bright it should be when it is changed" ) );
-    	connect (son, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
+    	connect (son, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
     	xl->addWidget(son);
     	xl->addWidget(new TQLabel("+", wp));
     	xl->addStretch(1);
@@ -165,13 +165,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name)
     	performance_on = new TQCheckBox(i18n("System performance"), wp);
         TQToolTip::add( performance_on, i18n( "Enables the changing of the system performance profile" ) );
 	xl->addWidget(performance_on);
-    	connect (performance_on, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(performance_on_changed(bool)));
+    	connect (performance_on, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(performance_on_changed(bool)));
 
     	performance_val_on = new KComboBox(0, wp);
 	performance_val_on->insertStringList(performance_list);
     	performance_val_on->setEnabled(0);
         TQToolTip::add( performance_val_on, i18n( "The new system performance profile to change to" ) );
-    	connect (performance_val_on, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged()));
+    	connect (performance_val_on, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged()));
     	xl->addWidget(performance_val_on);
     	xl->addStretch(1);
     } else {
@@ -184,13 +184,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name)
     	throttle_on = new TQCheckBox(i18n("CPU throttle"), wp);
         TQToolTip::add( throttle_on, i18n( "Enables the throttling of the CPU performance" ) );
 	xl->addWidget(throttle_on);
-    	connect (throttle_on, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(throttle_on_changed(bool)));
+    	connect (throttle_on, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(throttle_on_changed(bool)));
 
     	throttle_val_on = new KComboBox(0, wp);
 	throttle_val_on->insertStringList(throttle_list);
     	throttle_val_on->setEnabled(0);
         TQToolTip::add( throttle_val_on, i18n( "How much to throttle the CPU by" ) );
-    	connect (throttle_val_on, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged()));
+    	connect (throttle_val_on, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged()));
     	xl->addWidget(throttle_val_on);
     	xl->addStretch(1);
     } else {
diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp
index 02b941a..b252876 100644
--- a/klaptopdaemon/sony.cpp
+++ b/klaptopdaemon/sony.cpp
@@ -73,12 +73,12 @@ SonyConfig::SonyConfig(TQWidget * parent, const char *name)
     enableScrollBar = new TQCheckBox( i18n("Enable &scroll bar"), this );
     TQToolTip::add( enableScrollBar, i18n( "When checked this box enables the scrollbar so that it works under TDE" ) );
     top_layout->addWidget( enableScrollBar );
-    connect( enableScrollBar, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) );
+    connect( enableScrollBar, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) );
 
     enableMiddleEmulation = new TQCheckBox( i18n("&Emulate middle mouse button with scroll bar press"), this );
     TQToolTip::add( enableMiddleEmulation, i18n( "When checked this box enables pressing the scroll bar to act in the same way as pressing the middle button on a 3 button mouse" ) );
     top_layout->addWidget( enableMiddleEmulation );
-    connect( enableMiddleEmulation, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) );
+    connect( enableMiddleEmulation, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) );
 
     if (::access("/dev/sonypi", R_OK) != 0) {
 	enableMiddleEmulation->setEnabled(0);
@@ -89,7 +89,7 @@ SonyConfig::SonyConfig(TQWidget * parent, const char *name)
 					      "protections need to be changed. Clicking on the button below will change them\n").replace("\n", " "), this));
         TQHBoxLayout *ll = new TQHBoxLayout();
         TQPushButton *setupButton = new TQPushButton(i18n("Setup /dev/sonypi"), this);
-        connect( setupButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(setupHelper()) );
+        connect( setupButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(setupHelper()) );
         TQToolTip::add( setupButton, i18n( "This button can be used to enable the sony specific features" ) );
         ll->addStretch(2);
         ll->addWidget(setupButton);
diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp
index bc129a4..ab3edc1 100644
--- a/klaptopdaemon/warning.cpp
+++ b/klaptopdaemon/warning.cpp
@@ -88,12 +88,12 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
         grid->addWidget(checkCriticalPercent, curRow, 0);
         grid->addWidget(editCriticalPercent, curRow++, TQt::AlignLeft);
 
-        connect(editCriticalTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
-        connect(editCriticalPercent, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
-        connect(checkCriticalTime, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(configChanged()));
-        connect(checkCriticalPercent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(configChanged()));
-        connect(checkCriticalTime, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(checkCriticalTimeChanged(bool)));
-        connect(checkCriticalPercent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(checkCriticalPercentChanged(bool)));
+        connect(editCriticalTime, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
+        connect(editCriticalPercent, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
+        connect(checkCriticalTime, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(configChanged()));
+        connect(checkCriticalPercent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(configChanged()));
+        connect(checkCriticalTime, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(checkCriticalTimeChanged(bool)));
+        connect(checkCriticalPercent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(checkCriticalPercentChanged(bool)));
     } else {
         checkLowTime = new TQCheckBox( i18n("Low &trigger:"), this );
         checkLowPercent = new TQCheckBox( i18n("Low &trigger:"), this );        
@@ -108,12 +108,12 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
         grid->addWidget(checkLowPercent, curRow, 0);
         grid->addWidget(editLowPercent, curRow++, TQt::AlignLeft);
         
-        connect(editLowTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
-        connect(editLowPercent, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
-        connect(checkLowTime, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(configChanged()));
-        connect(checkLowPercent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(configChanged()));
-        connect(checkLowTime, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(checkLowTimeChanged(bool)));
-        connect(checkLowPercent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(checkLowPercentChanged(bool)));
+        connect(editLowTime, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
+        connect(editLowPercent, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
+        connect(checkLowTime, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(configChanged()));
+        connect(checkLowPercent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(configChanged()));
+        connect(checkLowTime, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(checkLowTimeChanged(bool)));
+        connect(checkLowPercent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(checkLowPercentChanged(bool)));
     }
 
     
@@ -123,12 +123,12 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
 
     editRunCommand = new KURLRequester( this );
     editRunCommand->setEnabled(false);
-    connect( checkRunCommand, TQT_SIGNAL(toggled(bool)),
-	     editRunCommand,  TQT_SLOT(setEnabled(bool)) );
-    connect( checkRunCommand, TQT_SIGNAL(clicked()),
-	     this, TQT_SLOT(configChanged()) );
-    connect( editRunCommand, TQT_SIGNAL(textChanged(const TQString&)),
-	     this, TQT_SLOT(configChanged()) );
+    connect( checkRunCommand, TQ_SIGNAL(toggled(bool)),
+	     editRunCommand,  TQ_SLOT(setEnabled(bool)) );
+    connect( checkRunCommand, TQ_SIGNAL(clicked()),
+	     this, TQ_SLOT(configChanged()) );
+    connect( editRunCommand, TQ_SIGNAL(textChanged(const TQString&)),
+	     this, TQ_SLOT(configChanged()) );
     grid->addWidget(editRunCommand, curRow++, 1);
     TQToolTip::add( editRunCommand, i18n( "This command will be run when the battery gets low" ) );
 
@@ -138,24 +138,24 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
 
     editPlaySound = new KURLRequester( this );
     editPlaySound->setEnabled(false);
-    connect( checkPlaySound, TQT_SIGNAL(toggled(bool)),
-	     editPlaySound,  TQT_SLOT(setEnabled(bool)) );
-    connect( checkPlaySound, TQT_SIGNAL(clicked()),
-	     this, TQT_SLOT(configChanged()) );
-    connect( editPlaySound, TQT_SIGNAL(textChanged(const TQString&)),
-	     this, TQT_SLOT(configChanged()) );
+    connect( checkPlaySound, TQ_SIGNAL(toggled(bool)),
+	     editPlaySound,  TQ_SLOT(setEnabled(bool)) );
+    connect( checkPlaySound, TQ_SIGNAL(clicked()),
+	     this, TQ_SLOT(configChanged()) );
+    connect( editPlaySound, TQ_SIGNAL(textChanged(const TQString&)),
+	     this, TQ_SLOT(configChanged()) );
     grid->addWidget(editPlaySound, curRow++, 1);
     TQToolTip::add( editPlaySound, i18n( "This sound will play when the battery gets low" ) );
 
     // setup the System Sound stuff
     checkBeep = new TQCheckBox(i18n("System &beep"), this);
     grid->addWidget(checkBeep, curRow++, 0);
-    connect(checkBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+    connect(checkBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
     TQToolTip::add( checkBeep, i18n( "The system will beep if this is enabled" ) );
 
     checkNotify = new TQCheckBox(i18n("&Notify"), this);
     grid->addWidget(checkNotify, curRow++, 0);
-    connect(checkNotify, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+    connect(checkNotify, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
 
     int can_suspend = laptop_portable::has_suspend();
     int can_standby = laptop_portable::has_standby();
@@ -167,7 +167,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
       checkBrightness->setMinimumSize(checkBrightness->sizeHint());
       TQToolTip::add( checkBrightness, i18n( "If enabled the back panel brightness will change" ) );
       grid->addWidget(checkBrightness, curRow, 0);
-      connect(checkBrightness, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(brightness_changed(bool)));
+      connect(checkBrightness, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(brightness_changed(bool)));
       TQHBoxLayout *v = new TQHBoxLayout();
       v->addWidget(new TQLabel("-", this));
       valueBrightness = new TQSlider(0, 255, 16, 160, TQt::Horizontal, this);
@@ -178,7 +178,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
       v->addStretch(1);
       grid->addLayout(v, curRow, 1);
       valueBrightness->setEnabled(0);
-      connect(valueBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
+      connect(valueBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
       ++curRow;
     } else {
       checkBrightness = 0;
@@ -192,13 +192,13 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
     	performance = new TQCheckBox(i18n("System performance"), this);
         TQToolTip::add( performance, i18n( "If enabled the laptop's power performance profile will change" ) );
         grid->addWidget(performance, curRow, 0);
-    	connect (performance, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(performance_changed(bool)));
+    	connect (performance, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(performance_changed(bool)));
 
         TQHBoxLayout *v = new TQHBoxLayout();
     	performance_val = new KComboBox(0, this);
 	performance_val->insertStringList(performance_list);
     	performance_val->setEnabled(0);
-    	connect (performance_val, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged()));
+    	connect (performance_val, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged()));
         TQToolTip::add( performance_val, i18n( "The performance profile to change to" ) );
 	v->addWidget(performance_val);
 	v->addStretch(1);
@@ -215,13 +215,13 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
     	throttle = new TQCheckBox(i18n("CPU throttling"), this);
         TQToolTip::add( throttle, i18n( "If enabled the CPU performance will be throttled" ) );
         grid->addWidget(throttle, curRow, 0);
-    	connect (throttle, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(throttle_changed(bool)));
+    	connect (throttle, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(throttle_changed(bool)));
 
         TQHBoxLayout *v = new TQHBoxLayout();
     	throttle_val = new KComboBox(0, this);
 	throttle_val->insertStringList(throttle_list);
     	throttle_val->setEnabled(0);
-    	connect (throttle_val, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged()));
+    	connect (throttle_val, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged()));
         TQToolTip::add( throttle_val, i18n( "How much to throttle the CPU performance by" ) );
 	v->addWidget(throttle_val);
 	v->addStretch(1);
@@ -241,30 +241,30 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
       checkStandby = new TQRadioButton(i18n("Standb&y"), b);
       TQToolTip::add( checkStandby, i18n( "Move the system into the standby state - a temporary lower power state" ) );
       checkStandby->setMinimumSize(checkStandby->sizeHint());
-      connect(checkStandby, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+      connect(checkStandby, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
     }
     if (can_suspend) {
       checkSuspend = new TQRadioButton(i18n("&Suspend"), b);
       TQToolTip::add( checkSuspend, i18n( "Move the system into the suspend state - also known as 'save-to-ram'" ) );
       checkSuspend->setMinimumSize(checkSuspend->sizeHint());
-      connect(checkSuspend, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+      connect(checkSuspend, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
     }
     if (can_hibernate) {
       checkHibernate = new TQRadioButton(i18n("H&ibernate"), b);
       TQToolTip::add( checkHibernate, i18n( "Move the system into the hibernate state - also known as 'save-to-disk'" ) );
       checkHibernate->setMinimumSize(checkHibernate->sizeHint());
-      connect(checkHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+      connect(checkHibernate, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
     }
     // setup the logout option
     checkLogout = new TQRadioButton(i18n("&Logout"), b);
-    connect(checkLogout, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+    connect(checkLogout, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
     // setup the shutdown option
     checkShutdown = new TQRadioButton(i18n("System power off"), b);
     TQToolTip::add( checkShutdown, i18n( "Power the laptop off" ) );
-    connect(checkShutdown, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+    connect(checkShutdown, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
     
     checkNone = new TQRadioButton(i18n("&None"), b);
-    connect(checkNone, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+    connect(checkNone, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
 
     grid->addMultiCellWidget(b, curRow, curRow, 0, 1, TQt::AlignLeft|TQt::AlignTop);
     curRow++;