Rename additional global functions and variables for tqt3

6 files changed, 24 insertions, 24 deletions

diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index 82aa51c87..daec7a98f 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -143,7 +143,7 @@ int Lockout::heightForWidth( int width ) const
 void Lockout::lock()
 {
     TQCString appname( "kdesktop" );
-    int kicker_screen_number = qt_xscreen();
+    int kicker_screen_number = tqt_xscreen();
     if ( kicker_screen_number )
         appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
     kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index 0798c84b3..2b864e33a 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -107,7 +107,7 @@ Applet::~Applet()
 
 void Applet::windowAdded( WId w_P )
     {
-    NETWinInfo info( qt_xdisplay(), w_P, qt_xrootwin(), NET::WMWindowType );
+    NETWinInfo info( tqt_xdisplay(), w_P, tqt_xrootwin(), NET::WMWindowType );
     if( info.windowType( SUPPORTED_WINDOW_TYPES ) != NET::TopMenu )
 	return;
 //    kdDebug() << "embedding:" << w_P << endl;
@@ -115,7 +115,7 @@ void Applet::windowAdded( WId w_P )
     if( transient_for == None )
 	return;
     MenuEmbed* embed;
-    if( transient_for == qt_xrootwin())
+    if( transient_for == tqt_xrootwin())
     {
         embed = new MenuEmbed( transient_for, true, this );
     }
@@ -224,7 +224,7 @@ WId Applet::tryTransientFor( WId w_P )
     if( info.state() & NET::Modal )
 	return None;
     WId ret = KWin::transientFor( w_P );
-    if( ret == qt_xrootwin())
+    if( ret == tqt_xrootwin())
         ret = None;
     return ret;
     }
@@ -292,7 +292,7 @@ void Applet::setBackground()
 void Applet::claimSelection()
     {
     assert( selection == NULL );
-    selection = new KSelectionOwner( makeSelectionAtom(), DefaultScreen( qt_xdisplay()));
+    selection = new KSelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
 // force taking the selection, but don't kill previous owner
     if( selection->claim( true, false ))
 	{
@@ -327,7 +327,7 @@ void Applet::lostSelection()
     active_menu = NULL;
     if( selection_watcher == NULL )
         {
-        selection_watcher = new KSelectionWatcher( makeSelectionAtom(), DefaultScreen( qt_xdisplay()));
+        selection_watcher = new KSelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
         connect( selection_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( claimSelection()));
         }
     delete module;
@@ -378,11 +378,11 @@ static
 void initAtoms()
     {
     char nm[ 100 ];
-    sprintf( nm, "_KDE_TOPMENU_OWNER_S%d", DefaultScreen( qt_xdisplay()));
+    sprintf( nm, "_KDE_TOPMENU_OWNER_S%d", DefaultScreen( tqt_xdisplay()));
     char nm2[] = "_KDE_TOPMENU_MINSIZE";
     char* names[ 2 ] = { nm, nm2 };
     Atom atoms[ 2 ];
-    XInternAtoms( qt_xdisplay(), names, 2, False, atoms );
+    XInternAtoms( tqt_xdisplay(), names, 2, False, atoms );
     selection_atom = atoms[ 0 ];
     msg_type_atom = atoms[ 1 ];
     }
@@ -432,7 +432,7 @@ bool MenuEmbed::x11Event( XEvent* ev_P )
 //        int x, y;
 //        unsigned int w, h, d, b;
 //        Window root;
-//        XGetGeometry( qt_xdisplay(), embeddedWinId(), &root, &x, &y, &w, &h, &b, &d );
+//        XGetGeometry( tqt_xdisplay(), embeddedWinId(), &root, &x, &y, &w, &h, &b, &d );
 //        kdDebug() << "RES3:" << width() << ":" << height() << ":" << w << ":" << h << endl;
 	return true;
 	}
@@ -446,7 +446,7 @@ void MenuEmbed::sendSyntheticConfigureNotifyEvent()
         XConfigureEvent c;
         memset(&c, 0, sizeof(c));
         c.type = ConfigureNotify;
-        c.display = qt_xdisplay();
+        c.display = tqt_xdisplay();
         c.send_event = True;
         c.event = embeddedWinId();
         c.window = winId();
@@ -457,7 +457,7 @@ void MenuEmbed::sendSyntheticConfigureNotifyEvent()
         c.border_width = 0;
         c.above = None;
         c.override_redirect = 0;
-        XSendEvent(qt_xdisplay(), c.event, true, StructureNotifyMask, (XEvent*)&c);
+        XSendEvent(tqt_xdisplay(), c.event, true, StructureNotifyMask, (XEvent*)&c);
     }
 }
 
@@ -470,7 +470,7 @@ void MenuEmbed::setMinimumSize( int w, int h )
         {
 //        kdDebug() << "RES2:" << width() << ":" << height() << ":" << minimumWidth() << ":" << minimumHeight() << endl;
         XEvent ev;
-        ev.xclient.display = qt_xdisplay();
+        ev.xclient.display = tqt_xdisplay();
         ev.xclient.type = ClientMessage;
         ev.xclient.window = embeddedWinId();
         assert( msg_type_atom != None );
@@ -481,7 +481,7 @@ void MenuEmbed::setMinimumSize( int w, int h )
         ev.xclient.data.l[2] = minimumHeight();
         ev.xclient.data.l[3] = 0;
         ev.xclient.data.l[4] = 0;
-        XSendEvent( qt_xdisplay(), embeddedWinId(), False, NoEventMask, &ev );
+        XSendEvent( tqt_xdisplay(), embeddedWinId(), False, NoEventMask, &ev );
         }
 }
 
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index f60f87f64..4379da6c0 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -364,7 +364,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
         y = 0;
     if( m_desktopLayoutOwner == NULL )
     { // must own manager selection before setting global desktop layout
-        int screen = DefaultScreen( qt_xdisplay());
+        int screen = DefaultScreen( tqt_xdisplay());
         m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(),
             screen, TQT_TQOBJECT(this) );
         if( !m_desktopLayoutOwner->claim( false ))
@@ -375,7 +375,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
         }
     }
     NET::Orientation orient = o == Qt::Horizontal ? NET::OrientationHorizontal : NET::OrientationVertical;
-    NETRootInfo i( qt_xdisplay(), 0 );
+    NETRootInfo i( tqt_xdisplay(), 0 );
     i.setDesktopLayout( orient, x, y, NET::DesktopLayoutCornerTopLeft );
 }
 
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index 1c1663366..b7a1590c5 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -220,7 +220,7 @@ void KMiniPagerButton::loadBgPixmap()
     }
 
     TQCString kdesktop_name;
-    int screen_number = DefaultScreen(qt_xdisplay());
+    int screen_number = DefaultScreen(tqt_xdisplay());
     if (screen_number == 0)
         kdesktop_name = "kdesktop";
     else
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp
index 03be831e3..21a36f35b 100644
--- a/kicker/applets/swallow/swallow.cpp
+++ b/kicker/applets/swallow/swallow.cpp
@@ -307,7 +307,7 @@ void SwallowApp::windowAdded(WId win)
 {
     // determine title of newly mapped window
     XTextProperty nameProp;
-    XGetWMName(qt_xdisplay(), win, &nameProp);
+    XGetWMName(tqt_xdisplay(), win, &nameProp);
     char **names;
     int count;
     XTextPropertyToStringList(&nameProp, &names, &count);
@@ -328,7 +328,7 @@ void SwallowApp::windowAdded(WId win)
 	resize( r.width(), r.height() );
 
 	embed(win);
-	XReparentWindow(qt_xdisplay(), win, winId(), 0, 0);
+	XReparentWindow(tqt_xdisplay(), win, winId(), 0, 0);
 
 	disconnect(SwallowApplet::winModule(), TQT_SIGNAL(windowAdded(WId)),
 		   this, TQT_SLOT(windowAdded(WId)));
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 3303135b3..0079ee9f4 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -145,10 +145,10 @@ void SystemTrayApplet::initialize()
              this, TQT_SLOT( updateTrayWindows() ) );
 
     TQCString screenstr;
-    screenstr.setNum(qt_xscreen());
+    screenstr.setNum(tqt_xscreen());
     TQCString trayatom = "_NET_SYSTEM_TRAY_S" + screenstr;
 
-    Display *display = qt_xdisplay();
+    Display *display = tqt_xdisplay();
 
     net_system_tray_selection = XInternAtom(display, trayatom, false);
     net_system_tray_opcode = XInternAtom(display, "_NET_SYSTEM_TRAY_OPCODE", false);
@@ -159,7 +159,7 @@ void SystemTrayApplet::initialize()
                        winId(),
                        CurrentTime);
 
-    WId root = qt_xrootwin();
+    WId root = tqt_xrootwin();
 
     if (XGetSelectionOwner (display, net_system_tray_selection) == winId())
     {
@@ -531,10 +531,10 @@ void SystemTrayApplet::embedWindow( WId w, bool kde_tray )
 
     if (kde_tray)
     {
-        static Atom hack_atom = XInternAtom( qt_xdisplay(), "_KDE_SYSTEM_TRAY_EMBEDDING", False );
-        XChangeProperty( qt_xdisplay(), w, hack_atom, hack_atom, 32, PropModeReplace, NULL, 0 );
+        static Atom hack_atom = XInternAtom( tqt_xdisplay(), "_KDE_SYSTEM_TRAY_EMBEDDING", False );
+        XChangeProperty( tqt_xdisplay(), w, hack_atom, hack_atom, 32, PropModeReplace, NULL, 0 );
         emb->embed(w);
-        XDeleteProperty( qt_xdisplay(), w, hack_atom );
+        XDeleteProperty( tqt_xdisplay(), w, hack_atom );
     }
     else
     {