From 068b77312fca935db07146e348eaf57969d9f059 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 2 Mar 2012 02:09:46 -0600
Subject: [PATCH] Rename additional global functions and variables for tqt3

---
 kipi-plugins/acquireimages/screenshotdialog.cpp | 8 ++++----
 kipi-plugins/slideshow/screenproperties.cpp     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kipi-plugins/acquireimages/screenshotdialog.cpp b/kipi-plugins/acquireimages/screenshotdialog.cpp
index 725f721..5ade146 100644
--- a/kipi-plugins/acquireimages/screenshotdialog.cpp
+++ b/kipi-plugins/acquireimages/screenshotdialog.cpp
@@ -240,7 +240,7 @@ void ScreenGrabDialog::slotPerformGrab()
         Window child;
         uint mask;
         int rootX, rootY, winX, winY;
-        XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child,
+        XQueryPointer( tqt_xdisplay(), tqt_xrootwin(), &root, &child,
                        &rootX, &rootY, &winX, &winY,
                        &mask);
 
@@ -248,13 +248,13 @@ void ScreenGrabDialog::slotPerformGrab()
         unsigned int w, h;
         unsigned int border;
         unsigned int depth;
-        XGetGeometry( qt_xdisplay(), child, &root, &x, &y,
+        XGetGeometry( tqt_xdisplay(), child, &root, &x, &y,
                       &w, &h, &border, &depth );
 
-        m_snapshot = TQPixmap::grabWindow( qt_xrootwin(), x, y, w, h );
+        m_snapshot = TQPixmap::grabWindow( tqt_xrootwin(), x, y, w, h );
     }
     else
-        m_snapshot = TQPixmap::grabWindow( qt_xrootwin() );
+        m_snapshot = TQPixmap::grabWindow( tqt_xrootwin() );
 
     if (m_snapshot.isNull())
     {
diff --git a/kipi-plugins/slideshow/screenproperties.cpp b/kipi-plugins/slideshow/screenproperties.cpp
index aa6e92d..5c321a4 100644
--- a/kipi-plugins/slideshow/screenproperties.cpp
+++ b/kipi-plugins/slideshow/screenproperties.cpp
@@ -47,7 +47,7 @@ namespace KIPISlideShowPlugin
   unsigned ScreenProperties::suggestFrameRate() {
   
       int eventBase, errorBase;
-      if ( !XRRQueryExtension(qt_xdisplay(), &eventBase, &errorBase)) {
+      if ( !XRRQueryExtension(tqt_xdisplay(), &eventBase, &errorBase)) {
           // No information, make a lucky guess on based on that ;)
           return 25;
       }
@@ -56,7 +56,7 @@ namespace KIPISlideShowPlugin
       XRRScreenConfiguration* config;
       int screenRate;
   
-      config        = XRRGetScreenInfo(qt_xdisplay(), RootWindow(qt_xdisplay(),
+      config        = XRRGetScreenInfo(tqt_xdisplay(), RootWindow(tqt_xdisplay(),
                                       activeScreen));
       screenRate    = XRRConfigCurrentRate(config);
       XRRFreeScreenConfigInfo(config);