TDE
/
basket
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/basket
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename additional global functions and variables for tqt3

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent c3bdfdc930
commit bcf4e9197f
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

10
src/keyboard.cpp
Unescape View File

@ -37,7 +37,7 @@ void Keyboard::pressedKeys(bool &shiftPressed, bool &controlPressed)
Window child; Window child;
int root_x, root_y, win_x, win_y; int root_x, root_y, win_x, win_y;
uint keybstate; uint keybstate;
XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child, XQueryPointer( tqt_xdisplay(), tqt_xrootwin(), &root, &child,
&root_x, &root_y, &win_x, &win_y, &keybstate ); &root_x, &root_y, &win_x, &win_y, &keybstate );
shiftPressed = keybstate & ShiftMask; shiftPressed = keybstate & ShiftMask;
@ -54,7 +54,7 @@ bool Keyboard::shiftPressed()
Window child; Window child;
int root_x, root_y, win_x, win_y; int root_x, root_y, win_x, win_y;
uint keybstate; uint keybstate;
XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child, XQueryPointer( tqt_xdisplay(), tqt_xrootwin(), &root, &child,
&root_x, &root_y, &win_x, &win_y, &keybstate ); &root_x, &root_y, &win_x, &win_y, &keybstate );
return (keybstate & ShiftMask) != 0; return (keybstate & ShiftMask) != 0;
@ -72,7 +72,7 @@ bool Keyboard::controlPressed()
Window child; Window child;
int root_x, root_y, win_x, win_y; int root_x, root_y, win_x, win_y;
uint keybstate; uint keybstate;
XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child, XQueryPointer( tqt_xdisplay(), tqt_xrootwin(), &root, &child,
&root_x, &root_y, &win_x, &win_y, &keybstate ); &root_x, &root_y, &win_x, &win_y, &keybstate );
return (keybstate & ControlMask) != 0; return (keybstate & ControlMask) != 0;
@ -90,7 +90,7 @@ bool Keyboard::altPressed()
Window child; Window child;
int root_x, root_y, win_x, win_y; int root_x, root_y, win_x, win_y;
uint keybstate; uint keybstate;
XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child, XQueryPointer( tqt_xdisplay(), tqt_xrootwin(), &root, &child,
&root_x, &root_y, &win_x, &win_y, &keybstate ); &root_x, &root_y, &win_x, &win_y, &keybstate );
return (keybstate & Mod1Mask) != 0; return (keybstate & Mod1Mask) != 0;
@ -120,7 +120,7 @@ uint KApplication::keyboardModifiers()
Window child; Window child;
int root_x, root_y, win_x, win_y; int root_x, root_y, win_x, win_y;
uint keybstate; uint keybstate;
XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child, XQueryPointer( tqt_xdisplay(), tqt_xrootwin(), &root, &child,
&root_x, &root_y, &win_x, &win_y, &keybstate ); &root_x, &root_y, &win_x, &win_y, &keybstate );
return keybstate & 0x00ff; return keybstate & 0x00ff;
} }

4
src/regiongrabber.cpp
Unescape View File

@ -88,7 +88,7 @@ RegionGrabber::~RegionGrabber()
void RegionGrabber::initGrabber() void RegionGrabber::initGrabber()
{ {
pixmap = TQPixmap::grabWindow( qt_xrootwin() ); pixmap = TQPixmap::grabWindow( tqt_xrootwin() );
setPaletteBackgroundPixmap( pixmap ); setPaletteBackgroundPixmap( pixmap );
TQDesktopWidget desktopWidget; TQDesktopWidget desktopWidget;
@ -96,7 +96,7 @@ void RegionGrabber::initGrabber()
if ( desktopWidget.isVirtualDesktop() ) if ( desktopWidget.isVirtualDesktop() )
desktopSize = desktopWidget.geometry(); desktopSize = desktopWidget.geometry();
else else
desktopSize = desktopWidget.screenGeometry( qt_xrootwin() ); desktopSize = desktopWidget.screenGeometry( tqt_xrootwin() );
setGeometry( desktopSize ); setGeometry( desktopSize );
showFullScreen(); showFullScreen();

4
src/systemtray.cpp
Unescape View File

@ -95,7 +95,7 @@ void KSystemTray2::displayCloseMessage(TQString fileMenu)
// 1. Determine if the user use a system tray area or not: // 1. Determine if the user use a system tray area or not:
TQCString screenstr; TQCString screenstr;
screenstr.setNum(qt_xscreen()); screenstr.setNum(tqt_xscreen());
TQCString trayatom = "_NET_SYSTEM_TRAY_S" + screenstr; TQCString trayatom = "_NET_SYSTEM_TRAY_S" + screenstr;
bool useSystray = (KSelectionWatcher(trayatom.data()).owner() != 0L); bool useSystray = (KSelectionWatcher(trayatom.data()).owner() != 0L);
@ -153,7 +153,7 @@ void KSystemTray2::displayCloseMessage(TQString fileMenu)
if (y + h > desktopHeight) y = desktopHeight - h; if (y + h > desktopHeight) y = desktopHeight - h;
// Grab the desktop and draw a circle arround the icon: // Grab the desktop and draw a circle arround the icon:
TQPixmap shot = TQPixmap::grabWindow(qt_xrootwin(), x, y, w, h); TQPixmap shot = TQPixmap::grabWindow(tqt_xrootwin(), x, y, w, h);
TQPainter painter(&shot); TQPainter painter(&shot);
const int CIRCLE_MARGINS = 6; const int CIRCLE_MARGINS = 6;
const int CIRCLE_WIDTH = 3; const int CIRCLE_WIDTH = 3;

Write Preview
Loading…
Cancel
Save