Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 9b171f8e1773c29be3ceab2c5ae8b760d78a1b54)

1 files changed, 20 insertions, 20 deletions

diff --git a/src/screen.cpp b/src/screen.cpp
index ff298f1..da6f8dc 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -63,7 +63,7 @@ screen::screen() {
 	screen_save_dcop_ref = DCOPRef( "kdesktop", "KScreensaverIface" );
 	
 	check_xscreensaver_timer =  new TQTimer( this );
-	connect( check_xscreensaver_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(xscreensaver_ping() ));
+	connect( check_xscreensaver_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(xscreensaver_ping() ));
 
 	SCREENSAVER_STATUS = checkScreenSaverStatus();
 	kdDebugFuncOut(trace);
@@ -288,7 +288,7 @@ int screen::checkScreenSaverStatus() {
 		gnomeScreensaverCheck = new TDEProcess;
 		*gnomeScreensaverCheck << "gnome-screensaver-command" << "--query";
 
-		connect( gnomeScreensaverCheck , TQT_SIGNAL(processExited(TDEProcess *)),TQT_SLOT(getGSExited(TDEProcess *)));
+		connect( gnomeScreensaverCheck , TQ_SIGNAL(processExited(TDEProcess *)),TQ_SLOT(getGSExited(TDEProcess *)));
 		
 		if(!gnomeScreensaverCheck->start(TDEProcess::NotifyOnExit)) 
 		{
@@ -333,8 +333,8 @@ bool screen::checkScreenSaverActive()
 }
 
 /*!
- * \b TQT_SLOT which called if the call of gnomescreensaver-command exited
- * \param gnomecheckcommand the KPocess which called this SLOT
+ * \b Slot which called if the call of gnomescreensaver-command exited
+ * \param gnomecheckcommand the KProcess which called this slot
  */
 void screen::getGSExited (TDEProcess *gnomecheckcommand) {
 	kdDebugFuncIn(trace);
@@ -485,8 +485,8 @@ xscreensaver:
 
 		xscreensaver_lock = new TDEProcess;
 		*xscreensaver_lock << "xscreensaver-command" << "-lock";
-	        connect(xscreensaver_lock, TQT_SIGNAL(processExited(TDEProcess*)),
-	                this, TQT_SLOT(cleanProcess(TDEProcess*)));
+	        connect(xscreensaver_lock, TQ_SIGNAL(processExited(TDEProcess*)),
+	                this, TQ_SLOT(cleanProcess(TDEProcess*)));
 
 		bool status = xscreensaver_lock->start(TDEProcess::DontCare);
 		if(!status)
@@ -503,8 +503,8 @@ xscreensaver:
 		gnomescreensaver_lock = new TDEProcess;
 		*gnomescreensaver_lock << "gnome-screensaver-command" << "--lock";
 	
-	        connect(gnomescreensaver_lock, TQT_SIGNAL(processExited(TDEProcess*)),
-	                this, TQT_SLOT(cleanProcess(TDEProcess*)));	
+	        connect(gnomescreensaver_lock, TQ_SIGNAL(processExited(TDEProcess*)),
+	                this, TQ_SLOT(cleanProcess(TDEProcess*)));	
 		bool status = gnomescreensaver_lock->start(TDEProcess::DontCare);
 		if(!status)
 		{
@@ -521,8 +521,8 @@ xscreensaver:
 		
 		xlock = new TDEProcess;
 		*xlock << "xlock"; //<< "-mode" << "blank";
-                connect(xlock, TQT_SIGNAL(processExited(TDEProcess*)),
-                           this, TQT_SLOT(cleanProcess(TDEProcess*)));
+                connect(xlock, TQ_SIGNAL(processExited(TDEProcess*)),
+                           this, TQ_SLOT(cleanProcess(TDEProcess*)));
 		bool status = xlock->start(TDEProcess::DontCare);
 		if(!status)
 		{
@@ -555,8 +555,8 @@ bool screen::lockScreen( TQString lock_withMethod ) {
 		
 		xlock = new TDEProcess;
 		*xlock << "xlock";
-                connect(xlock, TQT_SIGNAL(processExited(TDEProcess*)),
-                           this, TQT_SLOT(cleanProcess(TDEProcess*)));
+                connect(xlock, TQ_SIGNAL(processExited(TDEProcess*)),
+                           this, TQ_SLOT(cleanProcess(TDEProcess*)));
 
                 bool status = xlock->start(TDEProcess::DontCare);
 		if(!status)
@@ -570,8 +570,8 @@ bool screen::lockScreen( TQString lock_withMethod ) {
 	else if (lock_withMethod == "gnomescreensaver") {
 		gnomescreensaver_lock = new TDEProcess;
 		*gnomescreensaver_lock << "gnome-screensaver-command" << "--lock";
-                connect(gnomescreensaver_lock, TQT_SIGNAL(processExited(TDEProcess*)),
-                                                this, TQT_SLOT(cleanProcess(TDEProcess*)));
+                connect(gnomescreensaver_lock, TQ_SIGNAL(processExited(TDEProcess*)),
+                                                this, TQ_SLOT(cleanProcess(TDEProcess*)));
 
 		bool status = gnomescreensaver_lock->start(TDEProcess::DontCare);
 		if(!status)
@@ -605,8 +605,8 @@ xscreensaver:
 				
 				xscreensaver_lock = new TDEProcess;
 				*xscreensaver_lock << "xscreensaver-command" << "-lock";
-		                connect(xscreensaver_lock, TQT_SIGNAL(processExited(TDEProcess*)),
-                                                this, TQT_SLOT(cleanProcess(TDEProcess*)));
+		                connect(xscreensaver_lock, TQ_SIGNAL(processExited(TDEProcess*)),
+                                                this, TQ_SLOT(cleanProcess(TDEProcess*)));
 
 				bool status = xscreensaver_lock->start(TDEProcess::DontCare);
 				if(!status)
@@ -688,8 +688,8 @@ bool screen::resetXScreensaver(){
 
 		xscreensaver_reset = new TDEProcess;
 		*xscreensaver_reset << "xscreensaver-command" << "-restart";
-	        connect(xscreensaver_reset, TQT_SIGNAL(processExited(TDEProcess*)),
-	                this, TQT_SLOT(cleanProcess(TDEProcess*)));
+	        connect(xscreensaver_reset, TQ_SIGNAL(processExited(TDEProcess*)),
+	                this, TQ_SLOT(cleanProcess(TDEProcess*)));
 
 		bool status = xscreensaver_reset->start(TDEProcess::DontCare);
 		if(!status)
@@ -713,8 +713,8 @@ void screen::forceDPMSOff() {
 	
 	TDEProcess *xset = new TDEProcess;
 	*xset << "xset" << "dpms" << "force" << "off";
-        connect(xset, TQT_SIGNAL(processExited(TDEProcess*)),
-                this, TQT_SLOT(cleanProcess(TDEProcess*)));
+        connect(xset, TQ_SIGNAL(processExited(TDEProcess*)),
+                this, TQ_SLOT(cleanProcess(TDEProcess*)));
 	if(!xset->start())
 	{
 		delete xset;