From 8bd291c0e8a9d8b6eec6f5217e4d5c2f1fd06b96 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 2 Mar 2012 02:13:02 -0600
Subject: Rename additional global functions and variables for tqt3

---
 kcontrol/background/bgadvanced.cpp |  4 ++--
 kcontrol/background/bgrender.cpp   | 10 +++++-----
 kcontrol/background/bgsettings.cpp |  6 +++---
 kcontrol/background/main.cpp       |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'kcontrol/background')

diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index 0917bfe0f..da216aaf3 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -51,8 +51,8 @@
 static TQCString desktopConfigname()
 {
     int desktop=0;
-    if (qt_xdisplay())
-        desktop = DefaultScreen(qt_xdisplay());
+    if (tqt_xdisplay())
+        desktop = DefaultScreen(tqt_xdisplay());
     TQCString name;
     if (desktop == 0)
         name = "kdesktoprc";
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index 5842412e8..d65d9b038 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -192,7 +192,7 @@ int KBackgroundRenderer::doBackground(bool quit)
     // some dithering may be needed even with bpb==15/16, so don't use tileWidth==1
     // for them
     // with tileWidth>2, repainting the desktop causes nasty effect (XFree86 4.1.0 )
-        if( XQueryBestTile( qt_xdisplay(), qt_xrootwin(), tile_val, tile_val,
+        if( XQueryBestTile( tqt_xdisplay(), tqt_xrootwin(), tile_val, tile_val,
             &tileWidth, &tileHeight ) != Success )
             tileWidth = tileHeight = tile_val; // some defaults
     }
@@ -549,12 +549,12 @@ bool KBackgroundRenderer::canTile() const
     return m_TilingEnabled && optimize();
 }
 
-extern bool qt_use_xrender; // in Qt ( qapplication_x11.cpp )
+extern bool tqt_use_xrender; // in Qt ( qapplication_x11.cpp )
 
 void KBackgroundRenderer::wallpaperBlend()
 {
     if( !enabled() || wallpaperMode() == NoWallpaper
-        || (blendMode() == NoBlending && ( qt_use_xrender || !m_Wallpaper.hasAlphaBuffer()))) {
+        || (blendMode() == NoBlending && ( tqt_use_xrender || !m_Wallpaper.hasAlphaBuffer()))) {
         fastWallpaperBlend();
     }
     else {
@@ -1030,8 +1030,8 @@ KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config )
     // The following code is borrowed from KBackgroundSettings::KBackgroundSettings
     if (!config) {
         int screen_number = 0;
-        if (qt_xdisplay())
-            screen_number = DefaultScreen(qt_xdisplay());
+        if (tqt_xdisplay())
+            screen_number = DefaultScreen(tqt_xdisplay());
         TQCString configname;
         if (screen_number == 0)
             configname = "kdesktoprc";
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index 818a00f31..b89731c42 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -493,8 +493,8 @@ KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgrou
 
     if (!config) {
         int screen_number = 0;
-        if (qt_xdisplay())
-            screen_number = DefaultScreen(qt_xdisplay());
+        if (tqt_xdisplay())
+            screen_number = DefaultScreen(tqt_xdisplay());
         TQCString configname;
         if (screen_number == 0)
             configname = "kdesktoprc";
@@ -1215,7 +1215,7 @@ void KGlobalBackgroundSettings::readSettings()
     m_CacheSize = m_pConfig->readNumEntry("CacheSize", _defCacheSize);
     
     m_Names.clear();
-    NETRootInfo info( qt_xdisplay(), NET::DesktopNames | NET::NumberOfDesktops );
+    NETRootInfo info( tqt_xdisplay(), NET::DesktopNames | NET::NumberOfDesktops );
     m_bDrawBackgroundPerScreen.resize(info.numberOfDesktops());
     for ( int i = 0 ; i < info.numberOfDesktops() ; ++i )
         m_bDrawBackgroundPerScreen[i] = m_pConfig->readBoolEntry( TQString("DrawBackgroundPerScreen_%1").arg(i), _defDrawBackgroundPerScreen );
diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp
index 321eef90a..6d22d2384 100644
--- a/kcontrol/background/main.cpp
+++ b/kcontrol/background/main.cpp
@@ -45,8 +45,8 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList
     : KCModule(KBackGndFactory::instance(), parent, name)
 {
     int screen_number = 0;
-    if (qt_xdisplay())
-	screen_number = DefaultScreen(qt_xdisplay());
+    if (tqt_xdisplay())
+	screen_number = DefaultScreen(tqt_xdisplay());
     TQCString configname;
     if (screen_number == 0)
 	configname = "kdesktoprc";
@@ -105,8 +105,8 @@ void KBackground::save()
 	client->attach();
 
     int screen_number = 0;
-    if (qt_xdisplay())
-	screen_number = DefaultScreen(qt_xdisplay());
+    if (tqt_xdisplay())
+	screen_number = DefaultScreen(tqt_xdisplay());
     TQCString appname;
     if (screen_number == 0)
 	appname = "kdesktop";
-- 
cgit v1.2.1