Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 23 insertions, 23 deletions

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);