summaryrefslogtreecommitdiffstats
path: root/kscreensaver
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-02 02:12:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-02 02:12:21 -0600
commitf909dc7bca320a184c870c3502a8b081392903e8 (patch)
tree59f66ac1388929dfa9720bcfbb4527ffea36635f /kscreensaver
parentfcd2154ede47d527ad893548e3f35e7bdc79dee2 (diff)
downloadtdeartwork-f909dc7bca320a184c870c3502a8b081392903e8.tar.gz
tdeartwork-f909dc7bca320a184c870c3502a8b081392903e8.zip
Rename additional global functions and variables for tqt3
Diffstat (limited to 'kscreensaver')
-rw-r--r--kscreensaver/kdesavers/science.cpp20
-rw-r--r--kscreensaver/kxsconfig/kxsconfig.cpp4
-rw-r--r--kscreensaver/xsavers/saver.cpp6
-rw-r--r--kscreensaver/xsavers/swarm.cpp4
-rw-r--r--kscreensaver/xsavers/xlock.cpp4
5 files changed, 19 insertions, 19 deletions
diff --git a/kscreensaver/kdesavers/science.cpp b/kscreensaver/kdesavers/science.cpp
index f0f61ffe..e8de784e 100644
--- a/kscreensaver/kdesavers/science.cpp
+++ b/kscreensaver/kdesavers/science.cpp
@@ -131,7 +131,7 @@ KScienceSaver::KScienceSaver( WId id, bool s, bool gP )
: KScreenSaver( id )
{
d = new KScienceData;
- d->gc = XCreateGC(qt_xdisplay(), id, 0, 0);
+ d->gc = XCreateGC(tqt_xdisplay(), id, 0, 0);
d->xRootWin = 0;
d->buffer = 0;
@@ -159,7 +159,7 @@ KScienceSaver::~KScienceSaver()
releaseLens();
if ( d->xRootWin )
XDestroyImage( d->xRootWin );
- XFreeGC(qt_xdisplay(), d->gc );
+ XFreeGC(tqt_xdisplay(), d->gc );
delete d;
}
@@ -592,14 +592,14 @@ void KScienceSaver::do_refresh( const TQRect & rect )
if( hideBG[mode] )
{
- XSetWindowBackground( qt_xdisplay(), winId(), black.pixel() );
- XClearArea( qt_xdisplay(), winId(), rect.left(), rect.top(),
+ XSetWindowBackground( tqt_xdisplay(), winId(), black.pixel() );
+ XClearArea( tqt_xdisplay(), winId(), rect.left(), rect.top(),
rect.width(), rect.height(), false );
}
else
{
myAssert( d->xRootWin != 0, "root window not grabbed" );
- XPutImage( qt_xdisplay(), winId(), d->gc, d->xRootWin,
+ XPutImage( tqt_xdisplay(), winId(), d->gc, d->xRootWin,
rect.left(), rect.top(),
rect.left(), rect.top(),
rect.width(), rect.height() );
@@ -700,15 +700,15 @@ void KScienceSaver::slotTimeout()
if( hideBG[mode] )
blackPixel( xcoord, ycoord );
(this->*applyLens)(xs, ys, xd, yd, w, h);
- XPutImage( qt_xdisplay(), winId(), d->gc, d->buffer, 0, 0, xd, yd, w, h );
+ XPutImage( tqt_xdisplay(), winId(), d->gc, d->buffer, 0, 0, xd, yd, w, h );
if( hideBG[mode] )
blackPixelUndo( xcoord, ycoord );
}
void KScienceSaver::grabRootWindow()
{
- Display *dsp = qt_xdisplay();
- Window rootwin = RootWindow( dsp, qt_xscreen() );
+ Display *dsp = tqt_xdisplay();
+ Window rootwin = RootWindow( dsp, tqt_xscreen() );
// grab contents of root window
if( d->xRootWin )
@@ -729,7 +729,7 @@ void KScienceSaver::grabPreviewWidget()
if( d->xRootWin )
XDestroyImage( d->xRootWin );
- Display *dsp = qt_xdisplay();
+ Display *dsp = tqt_xdisplay();
d->xRootWin = XGetImage( dsp, winId(), 0, 0, width(), height(), AllPlanes, ZPixmap);
myAssert( d->xRootWin, "unable to grab preview window\n" );
@@ -739,7 +739,7 @@ void KScienceSaver::grabPreviewWidget()
void KScienceSaver::blackPixel( int x, int y )
{
- unsigned char black = (char) BlackPixel( qt_xdisplay(), qt_xscreen() );
+ unsigned char black = (char) BlackPixel( tqt_xdisplay(), tqt_xscreen() );
unsigned int adr = x*bpp + y*imgnext;
for(int i=0; i<bpp; i++) {
diff --git a/kscreensaver/kxsconfig/kxsconfig.cpp b/kscreensaver/kxsconfig/kxsconfig.cpp
index a8a67d51..36928f79 100644
--- a/kscreensaver/kxsconfig/kxsconfig.cpp
+++ b/kscreensaver/kxsconfig/kxsconfig.cpp
@@ -181,7 +181,7 @@ bool KXSConfigDialog::create()
show();
// So that hacks can XSelectInput ButtonPressMask
- XSelectInput(qt_xdisplay(), mPreview->winId(), widgetEventMask );
+ XSelectInput(tqt_xdisplay(), mPreview->winId(), widgetEventMask );
slotPreviewExited(0);
return true;
@@ -357,7 +357,7 @@ int main(int argc, char *argv[])
// Teach Xt to use the Display that TQt has already opened.
XtToolkitInitialize ();
XtAppContext xtApp = XtCreateApplicationContext ();
- Display *dpy = qt_xdisplay();
+ Display *dpy = tqt_xdisplay();
XtAppSetFallbackResources (xtApp, const_cast<char**>(defaults));
XtDisplayInitialize (xtApp, dpy, progname, progclass, 0, 0,
&dummyargc,
diff --git a/kscreensaver/xsavers/saver.cpp b/kscreensaver/xsavers/saver.cpp
index 9af37da0..1c11fd73 100644
--- a/kscreensaver/xsavers/saver.cpp
+++ b/kscreensaver/xsavers/saver.cpp
@@ -16,14 +16,14 @@ kScreenSaver::kScreenSaver(Drawable drawable) : TQObject()
unsigned int au;
mDrawable = drawable;
- mGc = XCreateGC(qt_xdisplay(), mDrawable, 0, 0);
- XGetGeometry(qt_xdisplay(), mDrawable, &root, &ai, &ai,
+ mGc = XCreateGC(tqt_xdisplay(), mDrawable, 0, 0);
+ XGetGeometry(tqt_xdisplay(), mDrawable, &root, &ai, &ai,
&mWidth, &mHeight, &au, &au);
}
kScreenSaver::~kScreenSaver()
{
- XFreeGC(qt_xdisplay(), mGc);
+ XFreeGC(tqt_xdisplay(), mGc);
}
//-----------------------------------------------------------------------------
diff --git a/kscreensaver/xsavers/swarm.cpp b/kscreensaver/xsavers/swarm.cpp
index 76ba08db..57968ec8 100644
--- a/kscreensaver/xsavers/swarm.cpp
+++ b/kscreensaver/xsavers/swarm.cpp
@@ -261,8 +261,8 @@ kSwarmSaver::kSwarmSaver( Drawable drawable ) : kScreenSaver( drawable )
readSettings();
// Clear to background colour when exposed
- XSetWindowBackground(qt_xdisplay(), mDrawable,
- BlackPixel(qt_xdisplay(), qt_xscreen()));
+ XSetWindowBackground(tqt_xdisplay(), mDrawable,
+ BlackPixel(tqt_xdisplay(), tqt_xscreen()));
colorContext = TQColor::enterAllocContext();
diff --git a/kscreensaver/xsavers/xlock.cpp b/kscreensaver/xsavers/xlock.cpp
index aaf1cea7..7b826158 100644
--- a/kscreensaver/xsavers/xlock.cpp
+++ b/kscreensaver/xsavers/xlock.cpp
@@ -62,8 +62,8 @@ void initXLock( GC gc )
{
SetRNG( time(NULL) );
- dsp = qt_xdisplay();
- screen = qt_xscreen();
+ dsp = tqt_xdisplay();
+ screen = tqt_xscreen();
Screen *scr = ScreenOfDisplay(dsp, screen);