Replace Q_WS_* defines with TQ_WS_* equivalents

Signed-off-by: Michele Calgaro <[email protected]>

23 files changed, 44 insertions, 44 deletions

diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index ee4bd087a..aa5703fbb 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -35,7 +35,7 @@
 #include <kstandarddirs.h>
 #include <tdeaboutdata.h>
 
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_QTONLY
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #endif
@@ -396,7 +396,7 @@ void KColorScheme::save()
         flags |= KRdbExportColors;
     else
     {
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_QTONLY
         // Undo the property xrdb has placed on the root window (if any),
         // i.e. remove all entries, including ours
         XDeleteProperty( tqt_xdisplay(), tqt_xrootwin(), XA_RESOURCE_MANAGER );
diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp
index a7412438b..8c6c06931 100644
--- a/kcontrol/filetypes/keditfiletype.cpp
+++ b/kcontrol/filetypes/keditfiletype.cpp
@@ -29,7 +29,7 @@
 #include <tdesycoca.h>
 #include <kstandarddirs.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #endif
@@ -159,7 +159,7 @@ int main(int argc, char ** argv)
   }
 
   FileTypeDialog dlg( mime, createType );
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
   if( args->isSet( "parent" )) {
     bool ok;
     long id = args->getOption("parent").toLong(&ok);
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index ed0dfbc01..6e92d8ffe 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -18,7 +18,7 @@
 #include <tdelocale.h>
 #include <knuminput.h>
 
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_QTONLY
 #include <X11/Xlib.h>
 #endif
 
diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp
index 33fc33a7a..8b3b40f4f 100644
--- a/kcontrol/konqhtml/jsopts.cpp
+++ b/kcontrol/konqhtml/jsopts.cpp
@@ -19,7 +19,7 @@
 #include <kdebug.h>
 #include <kurlrequester.h>
 
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_QTONLY
 #include <X11/Xlib.h>
 #endif
 
diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h
index 99d30a7bd..d78ebebc3 100644
--- a/kdesktop/bgmanager.h
+++ b/kdesktop/bgmanager.h
@@ -16,7 +16,7 @@
 #include <tqdatetime.h>
 #include <KBackgroundIface.h>
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
diff --git a/kdesktop/kdesktopapp.h b/kdesktop/kdesktopapp.h
index 465598a3d..1f45ec0a3 100644
--- a/kdesktop/kdesktopapp.h
+++ b/kdesktop/kdesktopapp.h
@@ -23,7 +23,7 @@
 #include <config.h>
 #include <kuniqueapplication.h>
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
diff --git a/kdesktop/lock/main.cpp b/kdesktop/lock/main.cpp
index f1407070c..f80f406a1 100644
--- a/kdesktop/lock/main.cpp
+++ b/kdesktop/lock/main.cpp
@@ -40,7 +40,7 @@
 
 #include <stdlib.h>
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
diff --git a/kdesktop/lockeng.cpp b/kdesktop/lockeng.cpp
index e22fc4c7a..e121daaa1 100644
--- a/kdesktop/lockeng.cpp
+++ b/kdesktop/lockeng.cpp
@@ -445,7 +445,7 @@ bool SaverEngine::isBlanked()
 
 void SaverEngine::enableExports()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	kdDebug(270) << k_lineinfo << "activating background exports.\n";
 	DCOPClient *client = kapp->dcopClient();
 	if (!client->isAttached()) {
diff --git a/kdesktop/main.cpp b/kdesktop/main.cpp
index 8892778da..7435acd62 100644
--- a/kdesktop/main.cpp
+++ b/kdesktop/main.cpp
@@ -43,7 +43,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp
index c7bfc26f3..47320d0b0 100644
--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@@ -48,7 +48,7 @@
 #include <kicondialog.h>
 #include <kdirselectdialog.h>
 
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <netwm.h>
 #endif
 
@@ -56,9 +56,9 @@
 
 using namespace std;
 
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
 extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); }
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 static TDECmdLineOptions options[] =
 {
@@ -128,7 +128,7 @@ bool WinIdEmbedder::eventFilter(TQObject *o, TQEvent *e)
         TQWidget *w = static_cast<TQWidget*>(o);
         if (print)
             cout << "winId: " << w->winId() << endl;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
         if (id)
             XSetTransientForHint(w->x11Display(), w->winId(), id);
 #endif
@@ -305,7 +305,7 @@ static int directCommand(TDECmdLineArgs *args)
 	TQObject::connect( popup, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) );
 	timer->start( duration, TRUE );
 
-#ifdef Q_WS_X11	
+#ifdef TQ_WS_X11	
 	if ( ! kapp->geometryArgument().isEmpty()) {
 	    int x, y;
 	    int w, h;
@@ -525,7 +525,7 @@ static int directCommand(TDECmdLineArgs *args)
         TQString startDir;
         startDir = TQString::fromLocal8Bit(args->getOption("getexistingdirectory"));
 	TQString result;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 	result = TQFileDialog::getExistingDirectory(startDir, 0, "getExistingDirectory",
 							   title, true, true);
 #else
diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp
index f68acfe4f..126eeec22 100644
--- a/kdialog/widgets.cpp
+++ b/kdialog/widgets.cpp
@@ -35,13 +35,13 @@
 #include <tqvbox.h>
 #include <tqfile.h>
 
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <netwm.h>
 #endif
 
 void Widgets::handleXGeometry(TQWidget * dlg)
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if ( ! kapp->geometryArgument().isEmpty()) {
 	int x, y;
 	int w, h;
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index 3eba42cd1..5a8464cd5 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kiconloader.h>
 #include <kimageeffect.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <netwm.h>
 #include <fixx11h.h>
@@ -1665,7 +1665,7 @@ void TaskContainer::updateFilteredTaskList()
             (!READ_MERGED_TASKBAR_SETTING(showOnlyIconified) || t->isIconified()))
         {
             pid_t pid = 0;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
             Atom type_ret;
             int format_ret;
             unsigned long nitems_ret = 0, unused = 0;
diff --git a/klipper/main.cpp b/klipper/main.cpp
index 6d0b5e9e2..4fc686f67 100644
--- a/klipper/main.cpp
+++ b/klipper/main.cpp
@@ -29,7 +29,7 @@
 #include "toplevel.h"
 #include "version.h"
 
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 #include <qxembed.h> // schroder
 #endif
 
@@ -51,7 +51,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char *argv[])
 
   // Make Klipper conform to freedesktop system tray standard, see
   // http://bugs.kde.org/show_bug.cgi?id=69119
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
   QXEmbed::initialize();
 #endif
 
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index 4039362e3..76db9e9cc 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -46,7 +46,7 @@
 
 #include "konsole.h"
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp
index 73efa6abb..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
 };
@@ -70,7 +70,7 @@ void KRootBacking::init()
 
     connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)));
     connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(repaint()));
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     connect(m_pPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool)));
 
     d->twin = new KWinModule( this );
@@ -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();
@@ -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())
diff --git a/krootbacking/krootbacking.h b/krootbacking/krootbacking.h
index 860fe7e85..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;
@@ -174,6 +174,6 @@ private:
     void init();
 };
 
-#endif // ! Q_WS_QWS
+#endif // ! TQ_WS_QWS
 
 #endif // KROOTBACKING_H
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index 62eea0d05..64bf4a407 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -577,7 +577,7 @@ void KSMShutdownIPFeedback::showNow()
 
 void KSMShutdownIPFeedback::enableExports()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	kdDebug(270) << k_lineinfo << "activating background exports.\n";
 	DCOPClient *client = kapp->dcopClient();
 	if (!client->isAttached()) {
diff --git a/ktip/ktipwindow.cpp b/ktip/ktipwindow.cpp
index f15b20309..c4cfb2383 100644
--- a/ktip/ktipwindow.cpp
+++ b/ktip/ktipwindow.cpp
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 
 	KTipDialog *tipDialog = new KTipDialog(new KTipDatabase(locate("data", TQString("tdewizard/tips"))));
 	TQ_CHECK_PTR(tipDialog);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	KWin::setState(tipDialog->winId(), NET::StaysOnTop);
 #endif
 	tipDialog->setCaption(i18n("Useful Tips"));
diff --git a/libkonq/libkonq_export.h b/libkonq/libkonq_export.h
index 4e10a4ec0..7f489e84f 100644
--- a/libkonq/libkonq_export.h
+++ b/libkonq/libkonq_export.h
@@ -27,7 +27,7 @@
 /* needed, because e.g. Q_OS_UNIX is so frequently used */
 #include <tqglobal.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 
 #else /* Q_OS_UNIX */
 
diff --git a/tdeioslave/sftp/tdeio_sftp.cpp b/tdeioslave/sftp/tdeio_sftp.cpp
index d62e7e062..8b74023c0 100644
--- a/tdeioslave/sftp/tdeio_sftp.cpp
+++ b/tdeioslave/sftp/tdeio_sftp.cpp
@@ -447,7 +447,7 @@ TQString sftpProtocol::canonicalizePath(const TQString &path) {
 sftpProtocol::sftpProtocol(const TQCString &pool_socket, const TQCString &app_socket)
              : SlaveBase("tdeio_sftp", pool_socket, app_socket),
                   mConnected(false), mPort(-1), mSession(NULL), mSftp(NULL) {
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
   kdDebug(TDEIO_SFTP_DB) << "pid = " << getpid() << endl;
 
   kdDebug(TDEIO_SFTP_DB) << "debug = " << getenv("TDEIO_SFTP_LOG_VERBOSITY") << endl;
@@ -470,7 +470,7 @@ sftpProtocol::sftpProtocol(const TQCString &pool_socket, const TQCString &app_so
 }
 
 sftpProtocol::~sftpProtocol() {
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
   kdDebug(TDEIO_SFTP_DB) << "pid = " << getpid() << endl;
 #endif
   closeConnection();
diff --git a/tdmlib/dmctl.cpp b/tdmlib/dmctl.cpp
index 00c3cb489..6cd6f7e93 100644
--- a/tdmlib/dmctl.cpp
+++ b/tdmlib/dmctl.cpp
@@ -19,7 +19,7 @@
 
 #include "dmctl.h"
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 #include <tdelocale.h>
 #include <dcopclient.h>
@@ -531,4 +531,4 @@ DM::type()
 	return DMType;
 }
 
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
diff --git a/tdmlib/dmctl.h b/tdmlib/dmctl.h
index e0cdc966c..40ea95f26 100644
--- a/tdmlib/dmctl.h
+++ b/tdmlib/dmctl.h
@@ -32,7 +32,7 @@ struct SessEnt {
 typedef TQValueList<SessEnt> SessList;
 
 class DM {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 public:
 
@@ -77,7 +77,7 @@ private:
 
 	void GDMAuthenticate();
 
-#else // Q_WS_X11
+#else // TQ_WS_X11
 
 public:
 	DM() {}
@@ -100,7 +100,7 @@ public:
 
 	int type() { return NoDM }
 
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 }; // class DM
 
diff --git a/twin/lib/kdecoration.cpp b/twin/lib/kdecoration.cpp
index 622362e9e..b9a8e7a36 100644
--- a/twin/lib/kdecoration.cpp
+++ b/twin/lib/kdecoration.cpp
@@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE.
 #include <tqapplication.h>
 #include <tdeglobal.h>
 #include <assert.h>
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <X11/Xlib.h>
 #include <fixx11h.h>
 #endif