diff options
Diffstat (limited to 'krootbacking')
| -rw-r--r-- | krootbacking/krootbacking.cpp | 24 | ||||
| -rw-r--r-- | krootbacking/krootbacking.h | 6 | ||||
| -rw-r--r-- | krootbacking/main.cpp | 2 |
3 files changed, 16 insertions, 16 deletions
diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp index 9d1ef9e32..71c6588d9 100644 --- a/krootbacking/krootbacking.cpp +++ b/krootbacking/krootbacking.cpp @@ -45,7 +45,7 @@ class KRootBackingData { public: TQWidget *toplevel; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWinModule *twin; #endif }; @@ -68,10 +68,10 @@ void KRootBacking::init() m_bInit = false; m_bActive = false; - connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int))); - connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(repaint())); -#ifdef Q_WS_X11 - connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); + connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int))); + connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(repaint())); +#ifdef TQ_WS_X11 + connect(m_pPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool))); d->twin = new KWinModule( this ); #endif @@ -88,7 +88,7 @@ KRootBacking::~KRootBacking() int KRootBacking::currentDesktop() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo rinfo( tqt_xdisplay(), NET::CurrentDesktop ); rinfo.activate(); return rinfo.currentDesktop(); @@ -107,7 +107,7 @@ void KRootBacking::start() // We should get a KIPC message when the shared pixmap is available... enableExports(); if (m_timeout < 50) { - TQTimer::singleShot( 100, this, SLOT(show()) ); // ...but it doesn't always work! + TQTimer::singleShot( 100, this, TQ_SLOT(show()) ); // ...but it doesn't always work! m_timeout++; return; } @@ -153,7 +153,7 @@ void KRootBacking::repaint(bool force) return; m_Rect = TQRect(p1, p2); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 m_Desk = currentDesktop(); // TDESharedPixmap will correctly generate a tile for us. @@ -172,7 +172,7 @@ void KRootBacking::repaint(bool force) bool KRootBacking::isAvailable() const { -// #ifdef Q_WS_X11 +// #ifdef TQ_WS_X11 // return m_pPixmap->isAvailable(pixmapName(m_Desk)); // #else return m_pPixmap->isNull(); @@ -181,7 +181,7 @@ bool KRootBacking::isAvailable() const TQString KRootBacking::pixmapName(int desk) { TQString pattern = TQString("DESKTOP%1"); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 int screen_number = DefaultScreen(tqt_xdisplay()); if (screen_number) { pattern = TQString("SCREEN%1-DESKTOP").arg(screen_number) + "%1"; @@ -193,7 +193,7 @@ TQString KRootBacking::pixmapName(int desk) { void KRootBacking::enableExports() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdDebug(270) << k_lineinfo << "activating background exports.\n"; DCOPClient *client = kapp->dcopClient(); if (!client->isAttached()) @@ -218,7 +218,7 @@ void KRootBacking::slotDone(bool success) { kdWarning(270) << k_lineinfo << "loading of desktop background failed.\n"; if (m_timeout < 50) { - TQTimer::singleShot( 100, this, SLOT(show()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(show()) ); m_timeout++; return; } diff --git a/krootbacking/krootbacking.h b/krootbacking/krootbacking.h index 731e64362..a430d3c45 100644 --- a/krootbacking/krootbacking.h +++ b/krootbacking/krootbacking.h @@ -27,7 +27,7 @@ #include <tqcolor.h> #include <tdelibs_export.h> -#ifndef Q_WS_QWS //FIXME +#ifndef TQ_WS_QWS //FIXME class TQRect; class TQWidget; @@ -42,7 +42,7 @@ class KRootBackingData; */ class KRootBacking: public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -174,6 +174,6 @@ private: void init(); }; -#endif // ! Q_WS_QWS +#endif // ! TQ_WS_QWS #endif // KROOTBACKING_H diff --git a/krootbacking/main.cpp b/krootbacking/main.cpp index 5691d736d..f29666d02 100644 --- a/krootbacking/main.cpp +++ b/krootbacking/main.cpp @@ -62,7 +62,7 @@ int main(int argc, char **argv) TQObject* mainWin = new KRootBacking(); TQTimer *timer = new TQTimer( mainWin ); - TQObject::connect( timer, SIGNAL(timeout()), mainWin, SLOT(start()) ); + TQObject::connect( timer, TQ_SIGNAL(timeout()), mainWin, TQ_SLOT(start()) ); timer->start( 100, TRUE ); // 100ms single shot timer app.exec(); |