Rename additional global functions and variables for tqt3

src/inactivity.cpp

@@ -51,7 +51,7 @@ inactivity::inactivity() {
 	blacklisted_running = false;
 	
 	int dummy = 0;
-	has_XSC_Extension = XScreenSaverQueryExtension( qt_xdisplay(), &dummy, &dummy );
+	has_XSC_Extension = XScreenSaverQueryExtension( tqt_xdisplay(), &dummy, &dummy );
 	
 	checkInactivity =  new TQTimer( this );
 	connect( checkInactivity, TQT_SIGNAL(timeout()), this, TQT_SLOT(check()));
@@ -196,7 +196,7 @@ unsigned long inactivity::getXInactivity(){
 	if(has_XSC_Extension) {
 		static XScreenSaverInfo* mitInfo = 0;
 		if (!mitInfo) mitInfo = XScreenSaverAllocInfo ();
-		XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo);
+		XScreenSaverQueryInfo (tqt_xdisplay(), DefaultRootWindow (tqt_xdisplay()), mitInfo);
 		kdDebugFuncOut(trace);
 		return workaroundCreepyXServer(mitInfo->idle);
 	}
@@ -231,7 +231,7 @@ unsigned long inactivity::workaroundCreepyXServer( unsigned long _idleTime ){
 	CARD16 state;
 	BOOL onoff;
 
-	Display *dpy = qt_xdisplay();
+	Display *dpy = tqt_xdisplay();
 
 	kdDebug() << "Current idleTime: " << _idleTime << endl;
 

src/screen.cpp

@@ -201,7 +201,7 @@ void screen::xscreensaver_ping(){
 	kdDebugFuncIn(trace);
 
 	if(!got_XScreensaver) {
-		mDisplay = qt_xdisplay();
+		mDisplay = tqt_xdisplay();
 		xs_windowid = find_xscreensaver_window(mDisplay);
 		
 		Atom deactivate = XInternAtom(mDisplay, "DEACTIVATE", False);
@@ -264,7 +264,7 @@ int screen::checkScreenSaverStatus() {
 	// check for XScreensaver
 	if (got_XScreensaver) return 11;
 	else if(!got_XScreensaver) {
-		Display *dpy = qt_xdisplay();
+		Display *dpy = tqt_xdisplay();
 		Window windowid = find_xscreensaver_window(dpy);
 		if(windowid == 0) {
 			//Xscreensaver not detected
@@ -333,7 +333,7 @@ int screen::checkDPMSStatus(){
 	BOOL onoff;
 	int dummy;
 	
-	Display *dpy = qt_xdisplay();
+	Display *dpy = tqt_xdisplay();
 	
 	if (!DPMSQueryExtension(dpy, &dummy, &dummy) || !DPMSCapable(dpy)){
 		has_DPMS = false;
@@ -368,7 +368,7 @@ bool screen::setDPMS( bool enable ){
 
 	defaultHandler = XSetErrorHandler(badwindow_handler);
 
-	Display *dpy = qt_xdisplay();
+	Display *dpy = tqt_xdisplay();
 	
 	int dummy;
 	if (!DPMSQueryExtension(dpy, &dummy, &dummy) || !DPMSCapable(dpy)){
@@ -403,7 +403,7 @@ bool screen::setDPMSTimeouts( int standby_timeout, int suspend_timeout, int off_
 	//XErrFunc defaultHandler;
 	defaultHandler = XSetErrorHandler(badwindow_handler);
 
-	Display *dpy = qt_xdisplay();
+	Display *dpy = tqt_xdisplay();
 	
 	int dummy;
 	if (!DPMSQueryExtension(dpy, &dummy, &dummy) || !DPMSCapable(dpy)){
@@ -705,7 +705,7 @@ void screen::cleanProcess(KProcess* proc)
 void screen::fakeShiftKeyEvent() {
 	kdDebugFuncIn(trace);
 
-	Display *dpy = qt_xdisplay();
+	Display *dpy = tqt_xdisplay();
 
 	if (dpy) {
 		XTestFakeKeyEvent(dpy, 62, 1, 0);