From 4304e8d9dab8e20513e38e71b0debdf6937b630c Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 16 Apr 2011 23:01:29 +0000 Subject: Finish TQt4 port of kpowersave This enables both Qt3 and Qt4 builds git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpowersave@1228282 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/screen.cpp | 72 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'src/screen.cpp') diff --git a/src/screen.cpp b/src/screen.cpp index 0f58d0f..ef62233 100644 --- a/src/screen.cpp +++ b/src/screen.cpp @@ -52,16 +52,16 @@ screen::screen() { xlock = NULL; got_XScreensaver = false; - checkDPMSStatus(); + checkDPMStqStatus(); check_xscreensaver_timer_runs = false; SCREENSAVER_STATUS = -1; screen_save_dcop_ref = DCOPRef( "kdesktop", "KScreensaverIface" ); - check_xscreensaver_timer = new QTimer( this ); - connect( check_xscreensaver_timer, SIGNAL(timeout()), this, SLOT(xscreensaver_ping() )); + check_xscreensaver_timer = new TQTimer( this ); + connect( check_xscreensaver_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(xscreensaver_ping() )); - SCREENSAVER_STATUS = checkScreenSaverStatus(); + SCREENSAVER_STATUS = checkScreenSavertqStatus(); kdDebugFuncOut(trace); } @@ -80,7 +80,7 @@ screen::~screen() { bool screen::setScreenSaver(bool enable){ kdDebugFuncIn(trace); - if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus(); + if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSavertqStatus(); if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){ screen_save_dcop_ref.send( "enable", enable); kdDebugFuncOut(trace); @@ -120,7 +120,7 @@ static int got_badwindow; /*! Errorhandler for all X-Server related operations */ static XErrorHandler defaultHandler; -//! to find/handle bad XWindows / XSetErrorHandler +//! to tqfind/handle bad XWindows / XSetErrorHandler /*! * This function is involved by the search for the window of the Xscreensaver. By this * function we seperate the BadWindow-error and set \ref got_badwindow if we get a BadWindow. @@ -150,7 +150,7 @@ static Window find_xscreensaver_window(Display * dpy) { kdDebugFuncIn(trace); Window root = RootWindowOfScreen(DefaultScreenOfDisplay(dpy)); - Window root2, parent, *kids; + Window root2, tqparent, *kids; Window retval = 0; Atom xs_version; unsigned int i; @@ -158,7 +158,7 @@ static Window find_xscreensaver_window(Display * dpy) { xs_version = XInternAtom(dpy, "_SCREENSAVER_VERSION", True); - if (!(xs_version != None && XQueryTree(dpy, root, &root2, &parent, &kids, &nkids) + if (!(xs_version != None && XQueryTree(dpy, root, &root2, &tqparent, &kids, &nkids) && kids && nkids)) { kdDebugFuncOut(trace); return 0; @@ -193,7 +193,7 @@ static Window find_xscreensaver_window(Display * dpy) { * This function is used to ping the XScreensaver. There is no direct way to stop * the XScreensaver without to kill/stop an restart or modify config-files of the * current user. \n \n -* We ping the xscreensaver as defined in the QTimer-interval \ref xScreenSaver_timer_interval . +* We ping the xscreensaver as defined in the TQTimer-interval \ref xScreenSaver_timer_interval . * The value of \ref xScreenSaver_timer_interval is 58 sec at the moment. The intervall must be * smaller then 1 minute (this is the smallest interval of Xscreensaver a.t.m.). */ @@ -243,7 +243,7 @@ void screen::xscreensaver_ping(){ * \retval 99 gnome-screensaver check is running * \retval -1 else */ -int screen::checkScreenSaverStatus() { +int screen::checkScreenSavertqStatus() { kdDebugFuncIn(trace); bool get_reply = false; @@ -284,7 +284,7 @@ int screen::checkScreenSaverStatus() { gnomeScreensaverCheck = new KProcess; *gnomeScreensaverCheck << "gnome-screensaver-command" << "--query"; - connect( gnomeScreensaverCheck , SIGNAL(processExited(KProcess *)),SLOT(getGSExited(KProcess *))); + connect( gnomeScreensaverCheck , TQT_SIGNAL(processExited(KProcess *)),TQT_SLOT(getGSExited(KProcess *))); if(!gnomeScreensaverCheck->start(KProcess::NotifyOnExit)) { @@ -299,7 +299,7 @@ int screen::checkScreenSaverStatus() { } /*! - * \b SLOT which called if the call of gnomescreensaver-command exited + * \b TQT_SLOT which called if the call of gnomescreensaver-command exited * \param gnomecheckcommand the KPocess which called this SLOT */ void screen::getGSExited (KProcess *gnomecheckcommand) { @@ -326,7 +326,7 @@ void screen::getGSExited (KProcess *gnomecheckcommand) { * \retval 0 if DMPS is disabled * \retval -1 if there is a error */ -int screen::checkDPMSStatus(){ +int screen::checkDPMStqStatus(){ kdDebugFuncIn(trace); CARD16 state; @@ -432,7 +432,7 @@ bool screen::lockScreen(){ kdDebugFuncIn(trace); // screensaver status known? - if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus(); + if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSavertqStatus(); // set lock for KScreensaver if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){ @@ -451,8 +451,8 @@ xscreensaver: xscreensaver_lock = new KProcess; *xscreensaver_lock << "xscreensaver-command" << "-lock"; - connect(xscreensaver_lock, SIGNAL(processExited(KProcess*)), - this, SLOT(cleanProcess(KProcess*))); + connect(xscreensaver_lock, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(cleanProcess(KProcess*))); bool status = xscreensaver_lock->start(KProcess::DontCare); if(!status) @@ -469,8 +469,8 @@ xscreensaver: gnomescreensaver_lock = new KProcess; *gnomescreensaver_lock << "gnome-screensaver-command" << "--lock"; - connect(gnomescreensaver_lock, SIGNAL(processExited(KProcess*)), - this, SLOT(cleanProcess(KProcess*))); + connect(gnomescreensaver_lock, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(cleanProcess(KProcess*))); bool status = gnomescreensaver_lock->start(KProcess::DontCare); if(!status) { @@ -487,8 +487,8 @@ xscreensaver: xlock = new KProcess; *xlock << "xlock"; //<< "-mode" << "blank"; - connect(xlock, SIGNAL(processExited(KProcess*)), - this, SLOT(cleanProcess(KProcess*))); + connect(xlock, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(cleanProcess(KProcess*))); bool status = xlock->start(KProcess::DontCare); if(!status) { @@ -502,14 +502,14 @@ xscreensaver: /*! * Use this function to lock the screen with a specified lock method. -* \param lock_withMethod a QString, which contain the alias for the lock +* \param lock_withMethod a TQString, which contain the alias for the lock * command. * \return boolean with the result of the operation * \retval true if the requested method worked * \retval false if there was a error * \todo check if we should also set blank only if the user would like!!! */ -bool screen::lockScreen( QString lock_withMethod ) { +bool screen::lockScreen( TQString lock_withMethod ) { kdDebugFuncIn(trace); if (lock_withMethod == "automatic") { @@ -521,8 +521,8 @@ bool screen::lockScreen( QString lock_withMethod ) { xlock = new KProcess; *xlock << "xlock"; - connect(xlock, SIGNAL(processExited(KProcess*)), - this, SLOT(cleanProcess(KProcess*))); + connect(xlock, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(cleanProcess(KProcess*))); bool status = xlock->start(KProcess::DontCare); if(!status) @@ -536,8 +536,8 @@ bool screen::lockScreen( QString lock_withMethod ) { else if (lock_withMethod == "gnomescreensaver") { gnomescreensaver_lock = new KProcess; *gnomescreensaver_lock << "gnome-screensaver-command" << "--lock"; - connect(gnomescreensaver_lock, SIGNAL(processExited(KProcess*)), - this, SLOT(cleanProcess(KProcess*))); + connect(gnomescreensaver_lock, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(cleanProcess(KProcess*))); bool status = gnomescreensaver_lock->start(KProcess::DontCare); if(!status) @@ -549,7 +549,7 @@ bool screen::lockScreen( QString lock_withMethod ) { } else { // screensaver status known? - SCREENSAVER_STATUS = checkScreenSaverStatus(); + SCREENSAVER_STATUS = checkScreenSavertqStatus(); if (lock_withMethod == "kscreensaver") { if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){ @@ -571,8 +571,8 @@ xscreensaver: xscreensaver_lock = new KProcess; *xscreensaver_lock << "xscreensaver-command" << "-lock"; - connect(xscreensaver_lock, SIGNAL(processExited(KProcess*)), - this, SLOT(cleanProcess(KProcess*))); + connect(xscreensaver_lock, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(cleanProcess(KProcess*))); bool status = xscreensaver_lock->start(KProcess::DontCare); if(!status) @@ -597,7 +597,7 @@ xscreensaver: void screen::blankOnlyScreen( bool blankonly ){ kdDebugFuncIn(trace); - if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus(); + if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSavertqStatus(); // set KScreensaver if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){ screen_save_dcop_ref.send("setBlankOnly", blankonly); @@ -620,7 +620,7 @@ bool screen::resetKDEScreensaver(){ kdDebugFuncIn(trace); if(SCREENSAVER_STATUS == -1) - SCREENSAVER_STATUS = checkScreenSaverStatus(); + SCREENSAVER_STATUS = checkScreenSavertqStatus(); // do this only if the screensaver is not running if(SCREENSAVER_STATUS == 0){ @@ -648,14 +648,14 @@ bool screen::resetKDEScreensaver(){ bool screen::resetXScreensaver(){ kdDebugFuncIn(trace); - if(checkScreenSaverStatus() == 11) { + if(checkScreenSavertqStatus() == 11) { delete xscreensaver_reset; xscreensaver_reset = new KProcess; *xscreensaver_reset << "xscreensaver-command" << "-restart"; - connect(xscreensaver_reset, SIGNAL(processExited(KProcess*)), - this, SLOT(cleanProcess(KProcess*))); + connect(xscreensaver_reset, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(cleanProcess(KProcess*))); bool status = xscreensaver_reset->start(KProcess::DontCare); if(!status) @@ -679,8 +679,8 @@ void screen::forceDPMSOff() { KProcess *xset = new KProcess; *xset << "xset" << "dpms" << "force" << "off"; - connect(xset, SIGNAL(processExited(KProcess*)), - this, SLOT(cleanProcess(KProcess*))); + connect(xset, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(cleanProcess(KProcess*))); if(!xset->start()) { delete xset; -- cgit v1.2.1