Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 12 insertions, 12 deletions

diff --git a/src/inactivity.cpp b/src/inactivity.cpp
index d22d7f8..ed35869 100644
--- a/src/inactivity.cpp
+++ b/src/inactivity.cpp
@@ -59,7 +59,7 @@ inactivity::inactivity(screen *disp) : display(disp),
 	has_XSC_Extension = XScreenSaverQueryExtension( tqt_xdisplay(), &dummy, &dummy );
 	
 	checkInactivity =  new TQTimer( this );
-	connect( checkInactivity, TQT_SIGNAL(timeout()), this, TQT_SLOT(check()));
+	connect( checkInactivity, TQ_SIGNAL(timeout()), this, TQ_SLOT(check()));
 
 	kdDebugFuncOut(trace);
 }
@@ -101,7 +101,7 @@ void inactivity::start( int timeToExpire, TQStringList blacked ) {
 }
 
 /*!
- * \b TQT_SLOT to call check as recheck inactivity if before a running PID
+ * \b Slot to call check as recheck inactivity if before a running PID
  * request was detected.
  */
 void inactivity::recheck() {
@@ -113,14 +113,14 @@ void inactivity::recheck() {
 }
 
 /*!
- * \b TQT_SLOT to call check without a recheck.
+ * \b Slot to call check without a recheck.
  */
 void inactivity::check() {
 	check(false);
 }
 
 /*!
- * \b TQT_SLOT to check the current idle-time of the X-Server and if there
+ * \b Slot to check the current idle-time of the X-Server and if there
  * are blacklisted programs are running. If the through \ref timeToInactivity 
  * defined time is expired, this function emit signal \ref inactivityTimeExpired() .
  * \param recheck   boolean which define if this is a recheck or not. 
@@ -151,7 +151,7 @@ void inactivity::check( bool recheck ) {
 			}
 			else {
 				//called if there is a getPIDs() is running
-				TQTimer::singleShot(500, this, TQT_SLOT(recheck()));
+				TQTimer::singleShot(500, this, TQ_SLOT(recheck()));
 			}
 		}
 		else checkInactivity->start(CHECK_for_INACTIVITY, true);
@@ -322,10 +322,10 @@ void inactivity::checkBlacklisted(){
 	proc = new TDEProcess;
 	*proc << "pidof" << blacklist;
 
-	connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this,
-		 TQT_SLOT(getPIDs(TDEProcess *, char *, int)));
-	connect( proc, TQT_SIGNAL(processExited(TDEProcess *)),
-		 TQT_SLOT(getPIDsExited(TDEProcess *)));
+	connect( proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this,
+		 TQ_SLOT(getPIDs(TDEProcess *, char *, int)));
+	connect( proc, TQ_SIGNAL(processExited(TDEProcess *)),
+		 TQ_SLOT(getPIDsExited(TDEProcess *)));
 	
 	if (!proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput))
 	{
@@ -343,7 +343,7 @@ void inactivity::checkBlacklisted(){
 
 
 /*!
- * \b TQT_SLOT to get the return of the command pidof and parse this to set
+ * \b Slot to get the return of the command pidof and parse this to set
  * \ref blacklisted_running .
  * \param *proc     pointer to the sending TDEProcess
  * \param *buffer   the char pointer to the output of the process to stdout
@@ -376,8 +376,8 @@ void inactivity::getPIDs(TDEProcess */*proc*/, char *buffer, int /*length*/) {
 
 
 /*!
- * \b TQT_SLOT which called if the call of pidof is exited
- * \param proc the KPocess which called this SLOT
+ * \b Slot which called if the call of pidof is exited
+ * \param proc the KProcess which called this slot
  */
 void inactivity::getPIDsExited(TDEProcess *proc){
 	kdDebugFuncIn(trace);