1 files changed, 16 insertions, 16 deletions

diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp
index 6be62d157..ac54511f4 100644
--- a/tdeui/krootpixmap.cpp
+++ b/tdeui/krootpixmap.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  *
  * This file is part of the KDE project, module tdeui.
@@ -37,7 +37,7 @@ class KRootPixmapData
 {
 public:
     TQWidget *toplevel;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWinModule *twin;
 #endif
 };
@@ -67,14 +67,14 @@ void KRootPixmap::init()
     m_bActive = false;
     m_bCustomPaint = 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(tdeApp, 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 );
-    connect(d->twin, TQT_SIGNAL(windowChanged(WId, unsigned int)), TQT_SLOT(desktopChanged(WId, unsigned int)));
-    connect(d->twin, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(desktopChanged(int)));
+    connect(d->twin, TQ_SIGNAL(windowChanged(WId, unsigned int)), TQ_SLOT(desktopChanged(WId, unsigned int)));
+    connect(d->twin, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(desktopChanged(int)));
 #endif
 
     d->toplevel = m_pWidget->topLevelWidget();
@@ -91,7 +91,7 @@ KRootPixmap::~KRootPixmap()
 
 int KRootPixmap::currentDesktop() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETRootInfo rinfo( tqt_xdisplay(), NET::CurrentDesktop );
     rinfo.activate();
     return rinfo.currentDesktop();
@@ -187,7 +187,7 @@ void KRootPixmap::desktopChanged(int desktop)
 	!wallpaperForDesktop(m_Desk).isNull())
 	return;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if (KWin::windowInfo(m_pWidget->topLevelWidget()->winId()).desktop() == NET::OnAllDesktops &&
 	pixmapName(m_Desk) != pixmapName(desktop))
 #endif
@@ -196,7 +196,7 @@ void KRootPixmap::desktopChanged(int desktop)
 
 void KRootPixmap::desktopChanged( WId window, unsigned int properties )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( !(properties & NET::WMDesktop) ||
 	(window != m_pWidget->topLevelWidget()->winId()))
 	return;
@@ -232,7 +232,7 @@ void KRootPixmap::repaint(bool force)
 	return;
     }
     m_Rect = TQRect(p1, p2);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     m_Desk = KWin::windowInfo(m_pWidget->topLevelWidget()->winId()).desktop();
     if ((m_Desk == NET::OnAllDesktops) || (m_Desk == 0)) {
 	m_Desk = currentDesktop();
@@ -254,7 +254,7 @@ void KRootPixmap::repaint(bool force)
 
 bool KRootPixmap::isAvailable() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     return m_pPixmap->isAvailable(pixmapName(m_Desk));
 #else
     return m_pPixmap->isNull();
@@ -263,7 +263,7 @@ bool KRootPixmap::isAvailable() const
 
 TQString KRootPixmap::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";
@@ -275,9 +275,9 @@ TQString KRootPixmap::pixmapName(int desk) {
 
 void KRootPixmap::enableExports()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdDebug(270) << k_lineinfo << "activating background exports.\n";
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if (!client->isAttached())
 	client->attach();
     TQByteArray data;