1 files changed, 19 insertions, 19 deletions

diff --git a/src/komposeglobal.cpp b/src/komposeglobal.cpp
index a03b1d4..f2a1a35 100644
--- a/src/komposeglobal.cpp
+++ b/src/komposeglobal.cpp
@@ -17,7 +17,7 @@
 #include "komposesettings.h"
 #include "komposesystray.h"
 
-#include <qtimer.h>
+#include <tqtimer.h>
 
 #include <kapplication.h>
 #include <kpopupmenu.h>
@@ -36,7 +36,7 @@
 
 #include <dcopclient.h>
 
-// #include those AFTER Qt-includes!
+// #include those AFTER TQt-includes!
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <Imlib2.h>
@@ -51,7 +51,7 @@
 static KomposeGlobal* globalInstance = 0;
 Display *disp;
 
-static QString wallpaperForDesktop(int desktop)
+static TQString wallpaperForDesktop(int desktop)
 {
   return DCOPRef("kdesktop", "KBackgroundIface").call("currentWallpaper", desktop);
 }
@@ -69,8 +69,8 @@ KomposeGlobal* KomposeGlobal::instance()
   return globalInstance;
 }
 
-KomposeGlobal::KomposeGlobal(QObject *parent, const char *name)
-    : QObject(parent, name),
+KomposeGlobal::KomposeGlobal(TQObject *parent, const char *name)
+    : TQObject(parent, name),
     aboutDialogOpen(0),
     hideSystray( false ),
     singleShot( false ),
@@ -151,7 +151,7 @@ void KomposeGlobal::initGui()
  */
 void KomposeGlobal::initActions()
 {
-  actionCollection = new KActionCollection( (QWidget*)0 );
+  actionCollection = new KActionCollection( (TQWidget*)0 );
 
   // Actions
   actQuit = KStdAction::quit( kapp, SLOT(quit()), actionCollection );
@@ -190,9 +190,9 @@ void KomposeGlobal::initSharedPixmaps()
   // When Kompose is started by session management the bg shared pixmap may not be available yet
   if (!desktopBgPixmap->isAvailable( pixmapName(1) ))
   {
-    qWarning("KomposeGlobal::initSharedPixmaps() - Pixmap not available");
+    tqWarning("KomposeGlobal::initSharedPixmaps() - Pixmap not available");
     //enablePixmapExports();
-    QTimer::singleShot( 1000, this, SLOT( initSharedPixmaps() ) );
+    TQTimer::singleShot( 1000, this, SLOT( initSharedPixmaps() ) );
     //initSharedPixmaps();
     //return;
   }
@@ -229,14 +229,14 @@ void KomposeGlobal::refreshSharedPixmaps()
   desktopBgPixmap->loadFromShared( pixmapName(currentDesktop) );
 }
 
-QString KomposeGlobal::pixmapName(int desk)
+TQString KomposeGlobal::pixmapName(int desk)
 {
   // To simplify things we take the background of the first desktop
-  QString pattern = QString("DESKTOP%1");
-  int screen_number = DefaultScreen(qt_xdisplay());
+  TQString pattern = TQString("DESKTOP%1");
+  int screen_number = DefaultScreen(tqt_xdisplay());
   if (screen_number)
   {
-    pattern = QString("SCREEN%1-DESKTOP").arg(screen_number) + "%1";
+    pattern = TQString("SCREEN%1-DESKTOP").arg(screen_number) + "%1";
   }
   return pattern.arg( desk );
 }
@@ -246,7 +246,7 @@ void KomposeGlobal::slotDone(bool success)
   if (!success)
   {
     kdDebug() << "KomposeGlobal::slotDone() - loading of desktop background failed.\n" << endl;
-    //QTimer::singleShot( 1000, this, SLOT( initSharedPixmaps() ) );
+    //TQTimer::singleShot( 1000, this, SLOT( initSharedPixmaps() ) );
   }
 }
 
@@ -257,12 +257,12 @@ void KomposeGlobal::enablePixmapExports()
   DCOPClient *client = kapp->dcopClient();
   if (!client->isAttached())
     client->attach();
-  QByteArray data;
-  QDataStream args( data, IO_WriteOnly );
+  TQByteArray data;
+  TQDataStream args( data, IO_WriteOnly );
   args << 1;
 
-  QCString appname( "kdesktop" );
-  int screen_number = DefaultScreen(qt_xdisplay());
+  TQCString appname( "kdesktop" );
+  int screen_number = DefaultScreen(tqt_xdisplay());
   if ( screen_number )
     appname.sprintf("kdesktop-screen-%d", screen_number );
 
@@ -301,7 +301,7 @@ void KomposeGlobal::initImlib()
   Visual *vis;
   Colormap cm;
   //int screen;
-  disp = QPaintDevice::x11AppDisplay();
+  disp = TQPaintDevice::x11AppDisplay();
   vis   = DefaultVisual(disp, DefaultScreen(disp));
   cm    = DefaultColormap(disp, DefaultScreen(disp));
   //     context = imlib_context_new();
@@ -328,7 +328,7 @@ void KomposeGlobal::initCompositeExt()
   xcomposite = false;
 #ifdef COMPOSITE
   // Check for XComposite
-  Display *dpy = QPaintDevice::x11AppDisplay();
+  Display *dpy = TQPaintDevice::x11AppDisplay();
 
   int event_base, error_base;
   if ( XCompositeQueryExtension( dpy, &event_base, &error_base ) )