Rename additional global functions and variables for tqt3

2 files changed, 11 insertions, 11 deletions

diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp
index f42498aab..439e5f676 100644
--- a/kcontrol/input/main.cpp
+++ b/kcontrol/input/main.cpp
@@ -62,23 +62,23 @@ extern "C"
 
     // use a default value for theme only if it's not configured at all, not even in X resources
     if( theme.isEmpty()
-        && TQCString( XGetDefault( qt_xdisplay(), "Xcursor", "theme" )).isEmpty()
-        && TQCString( XcursorGetTheme( qt_xdisplay())).isEmpty())
+        && TQCString( XGetDefault( tqt_xdisplay(), "Xcursor", "theme" )).isEmpty()
+        && TQCString( XcursorGetTheme( tqt_xdisplay())).isEmpty())
     {
         theme = "default";
     }
 
      // Apply the KDE cursor theme to ourselves
     if( !theme.isEmpty())
-        XcursorSetTheme(qt_xdisplay(), theme.data());
+        XcursorSetTheme(tqt_xdisplay(), theme.data());
 
     if (!size.isEmpty())
-    	XcursorSetDefaultSize(qt_xdisplay(), size.toUInt());
+    	XcursorSetDefaultSize(tqt_xdisplay(), size.toUInt());
 
     // Load the default cursor from the theme and apply it to the root window.
-    Cursor handle = XcursorLibraryLoadCursor(qt_xdisplay(), "left_ptr");
-    XDefineCursor(qt_xdisplay(), qt_xrootwin(), handle);
-    XFreeCursor(qt_xdisplay(), handle); // Don't leak the cursor
+    Cursor handle = XcursorLibraryLoadCursor(tqt_xdisplay(), "left_ptr");
+    XDefineCursor(tqt_xdisplay(), tqt_xrootwin(), handle);
+    XFreeCursor(tqt_xdisplay(), handle); // Don't leak the cursor
 
     // Tell klauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment
     // variables when launching applications.
diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp
index ceb399648..326178a7a 100644
--- a/kcontrol/input/xcursor/previewwidget.cpp
+++ b/kcontrol/input/xcursor/previewwidget.cpp
@@ -34,8 +34,8 @@
 #include "previewwidget.h"
 
 
-extern bool qt_has_xft;
-extern bool qt_use_xrender;
+extern bool tqt_has_xft;
+extern bool tqt_use_xrender;
 
 
 namespace {
@@ -314,7 +314,7 @@ void PreviewWidget::paintEvent( TQPaintEvent * )
 	p.fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) );
 	Picture dest;
 
-	if ( !qt_has_xft || !qt_use_xrender ) {
+	if ( !tqt_has_xft || !tqt_use_xrender ) {
 		XRenderPictFormat *fmt = XRenderFindVisualFormat( x11Display(), (Visual*)buffer.x11Visual() );
 		dest = XRenderCreatePicture( x11Display(), buffer.handle(), fmt, 0, NULL );
 	} else
@@ -334,7 +334,7 @@ void PreviewWidget::paintEvent( TQPaintEvent * )
 
 	bitBlt( this, 0, 0, &buffer );
 
-	if ( !qt_has_xft || !qt_use_xrender )
+	if ( !tqt_has_xft || !tqt_use_xrender )
 		XRenderFreePicture( x11Display(), dest );
 }