From 3135cedc0fbef3925e705caba54416374cf22143 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:12:54 -0600
Subject: Rename old tq methods that no longer need a unique name (cherry
 picked from commit a6a8ad44b48bdfff1a1a3123097a84f23105f64b)

---
 src/screen.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/screen.cpp')

diff --git a/src/screen.cpp b/src/screen.cpp
index 877583a..8caf48b 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -52,7 +52,7 @@ screen::screen() {
 	xlock = NULL;
 
 	got_XScreensaver = false;
-	checkDPMStqStatus();
+	checkDPMSStatus();
 	check_xscreensaver_timer_runs = false;
 	
 	SCREENSAVER_STATUS = -1;
@@ -61,7 +61,7 @@ screen::screen() {
 	check_xscreensaver_timer =  new TQTimer( this );
 	connect( check_xscreensaver_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(xscreensaver_ping() ));
 
-	SCREENSAVER_STATUS = checkScreenSavertqStatus();
+	SCREENSAVER_STATUS = checkScreenSaverStatus();
 	kdDebugFuncOut(trace);
 }
 
@@ -80,7 +80,7 @@ screen::~screen() {
 bool screen::setScreenSaver(bool enable){
 	kdDebugFuncIn(trace);
 
-	if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSavertqStatus();
+	if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus();
 	if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){	
 		screen_save_dcop_ref.send( "enable", enable);
 		kdDebugFuncOut(trace);
@@ -243,7 +243,7 @@ void screen::xscreensaver_ping(){
 * \retval 99 gnome-screensaver check is running
 * \retval -1 else
 */
-int screen::checkScreenSavertqStatus() {
+int screen::checkScreenSaverStatus() {
 	kdDebugFuncIn(trace);
 	
 	bool get_reply = false;	
@@ -326,7 +326,7 @@ void screen::getGSExited (KProcess *gnomecheckcommand) {
 * \retval 0 if DMPS is disabled
 * \retval -1 if there is a error
 */
-int screen::checkDPMStqStatus(){
+int screen::checkDPMSStatus(){
 	kdDebugFuncIn(trace);
 
 	CARD16 state;
@@ -432,7 +432,7 @@ bool screen::lockScreen(){
 	kdDebugFuncIn(trace);
 
 	// screensaver status known?
-	if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSavertqStatus();
+	if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus();
 
 	// set lock for KScreensaver
 	if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){	
@@ -549,7 +549,7 @@ bool screen::lockScreen( TQString lock_withMethod ) {
 	}
 	else {
 		// screensaver status known?
-		SCREENSAVER_STATUS = checkScreenSavertqStatus();
+		SCREENSAVER_STATUS = checkScreenSaverStatus();
 		
 		if (lock_withMethod == "kscreensaver") {
 			if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){	
@@ -597,7 +597,7 @@ xscreensaver:
 void screen::blankOnlyScreen( bool blankonly ){
 	kdDebugFuncIn(trace);
 
-	if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSavertqStatus();
+	if(SCREENSAVER_STATUS == -1) SCREENSAVER_STATUS = checkScreenSaverStatus();
 	// 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 = checkScreenSavertqStatus();
+		SCREENSAVER_STATUS = checkScreenSaverStatus();
 
 	// do this only if the screensaver is not running
 	if(SCREENSAVER_STATUS == 0){	
@@ -648,7 +648,7 @@ bool screen::resetKDEScreensaver(){
 bool screen::resetXScreensaver(){
 	kdDebugFuncIn(trace);
 
-	if(checkScreenSavertqStatus() == 11) {
+	if(checkScreenSaverStatus() == 11) {
 		
 		delete xscreensaver_reset;		
 
-- 
cgit v1.2.1