Rename additional global functions and variables for tqt3

juk/systemtray.cpp

@@ -412,7 +412,7 @@ bool SystemTray::buttonsToLeft() const
 {
     // The following code was nicked from kpassivepopup.cpp
 
-    NETWinInfo ni(qt_xdisplay(), winId(), qt_xrootwin(), 
+    NETWinInfo ni(tqt_xdisplay(), winId(), tqt_xrootwin(), 
                   NET::WMIconGeometry | NET::WMKDESystemTrayWinFor);
     NETRect frame, win;
     ni.kdeGeometry(frame, win);

noatun/modules/kaiman/userinterface.cpp

@@ -160,7 +160,7 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc )
 	if ( _style->Mask() != 0 )
 	{
 		// Set the shaped window form
-		XShapeCombineMask( qt_xdisplay(), winId(), ShapeBounding, 0,0,
+		XShapeCombineMask( tqt_xdisplay(), winId(), ShapeBounding, 0,0,
 		                   _style->Mask()->handle(), ShapeSet );
 	}
 

noatun/modules/systray/systray.cpp

@@ -389,7 +389,7 @@ void NoatunSystray::showPassivePopup()
 		box->setSpacing(8);
 
 		// Algorithm for determining popup location from kpassivepopup.cpp via JuK
-		NETWinInfo ni(qt_xdisplay(), mTray->winId(), qt_xrootwin(),
+		NETWinInfo ni(tqt_xdisplay(), mTray->winId(), tqt_xrootwin(),
 			NET::WMIconGeometry | NET::WMKDESystemTrayWinFor);
 		NETRect frame, win;
 		ni.kdeGeometry(frame, win);