From 2bc1d72869b62af05ae4feafd878203b526da8c5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/libkopete/kopeteaway.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'kopete/libkopete/kopeteaway.cpp') diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp index 04ac9a03..035e12c2 100644 --- a/kopete/libkopete/kopeteaway.cpp +++ b/kopete/libkopete/kopeteaway.cpp @@ -74,7 +74,7 @@ struct KopeteAwayPrivate int mouse_x; int mouse_y; - unsigned int mouse_tqmask; + unsigned int mouse_mask; #ifdef TQ_WS_X11 Window root; /* root window the pointer is on */ Screen* screen; /* screen the pointer is on */ @@ -110,7 +110,7 @@ Kopete::Away::Away() : TQObject( kapp , "Kopete::Away") Display *dsp = qt_xdisplay(); #endif d->mouse_x = d->mouse_y=0; - d->mouse_tqmask = 0; + d->mouse_mask = 0; #ifdef TQ_WS_X11 d->root = DefaultRootWindow (dsp); d->screen = ScreenOfDisplay (dsp, DefaultScreen (dsp)); @@ -372,7 +372,7 @@ bool Kopete::Away::isActivity() Display *dsp = qt_xdisplay(); Window dummy_w; int dummy_c; - unsigned int tqmask; /* modifier tqmask */ + unsigned int mask; /* modifier mask */ int root_x; int root_y; @@ -388,7 +388,7 @@ bool Kopete::Away::isActivity() * we now call that periodically anyway? */ if (!XQueryPointer (dsp, d->root, &(d->root), &dummy_w, &root_x, &root_y, - &dummy_c, &dummy_c, &tqmask)) + &dummy_c, &dummy_c, &mask)) { /* * Pointer has moved to another screen, so let's find out which one. @@ -432,10 +432,10 @@ bool Kopete::Away::isActivity() // Only check idle time if we have some way of measuring it, otherwise if // we've neither Mit nor Xidle it'll still be zero and we'll always appear active. // FIXME: what problem does the 2000ms fudge solve? - if (root_x != d->mouse_x || root_y != d->mouse_y || tqmask != d->mouse_tqmask + if (root_x != d->mouse_x || root_y != d->mouse_y || mask != d->mouse_mask || ((d->useXidle || d->useMit) && xIdleTime < d->xIdleTime + 2000)) { - // -1 => just gone autoaway, ignore aptqparent activity this time round + // -1 => just gone autoaway, ignore apparent activity this time round // anything else => genuine activity // See setAutoAway(). if (d->mouse_x != -1) @@ -444,7 +444,7 @@ bool Kopete::Away::isActivity() } d->mouse_x = root_x; d->mouse_y = root_y; - d->mouse_tqmask = tqmask; + d->mouse_mask = mask; d->xIdleTime = xIdleTime; } #endif // TQ_WS_X11 @@ -484,7 +484,7 @@ void Kopete::Away::setActive() void Kopete::Away::setAutoAway() { // A value of -1 in mouse_x indicates to checkActivity() that next time it - // fires it should ignore any aptqparent idle/mouse/keyboard changes. + // fires it should ignore any apparent idle/mouse/keyboard changes. // I think the point of this is that if you manually start the screensaver // then there'll unavoidably be some residual mouse/keyboard activity // that should be ignored. -- cgit v1.2.1