From abfa1c9a02b064549c5e73af4a5779d1636d66fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 2 Mar 2012 02:15:05 -0600 Subject: Rename additional global functions and variables for tqt3 --- juk/systemtray.cpp | 2 +- noatun/modules/kaiman/userinterface.cpp | 2 +- noatun/modules/systray/systray.cpp | 2 +- 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); -- cgit v1.2.1