summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-02 02:15:05 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-02 02:15:05 -0600
commitabfa1c9a02b064549c5e73af4a5779d1636d66fe (patch)
treeadb7257f16514301743396c5589ebee6b165c59c
parent96842585886a67c6ab4e2cf83bc69e6156ee2c11 (diff)
downloadtdemultimedia-abfa1c9a02b064549c5e73af4a5779d1636d66fe.tar.gz
tdemultimedia-abfa1c9a02b064549c5e73af4a5779d1636d66fe.zip
Rename additional global functions and variables for tqt3
-rw-r--r--juk/systemtray.cpp2
-rw-r--r--noatun/modules/kaiman/userinterface.cpp2
-rw-r--r--noatun/modules/systray/systray.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp
index 4b6587f7..b9a3fd0c 100644
--- a/juk/systemtray.cpp
+++ b/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);
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index 3d1791ec..7faecc3b 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/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 );
}
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index 4d008783..255dd6c9 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/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);