Replace Q_WS_* defines with TQ_WS_* equivalents

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

11 files changed, 24 insertions, 24 deletions

diff --git a/dcop/KDE-ICE/ICElibint.h b/dcop/KDE-ICE/ICElibint.h
index f36ab7acc..268b664db 100644
--- a/dcop/KDE-ICE/ICElibint.h
+++ b/dcop/KDE-ICE/ICElibint.h
@@ -27,7 +27,7 @@ Author: Ralph Mor, X Consortium
 #define _ICELIBINT_H_
 
 #include "config.h"
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <X11/Xos.h>
 #include <X11/Xfuncs.h>
 #include <X11/Xmd.h> //schroder
diff --git a/dcop/KDE-ICE/ICEproto.h b/dcop/KDE-ICE/ICEproto.h
index f66b86ac0..471b80314 100644
--- a/dcop/KDE-ICE/ICEproto.h
+++ b/dcop/KDE-ICE/ICEproto.h
@@ -27,7 +27,7 @@ Author: Ralph Mor, X Consortium
 #define _ICEPROTO_H_
 
 #include "config.h"
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <X11/Xmd.h>
 #else
 #if defined(__alpha__) || defined(__ia64__) || defined(__s390x__)
diff --git a/dcop/KDE-ICE/Xtrans.h b/dcop/KDE-ICE/Xtrans.h
index 95c817fa1..08d28966f 100644
--- a/dcop/KDE-ICE/Xtrans.h
+++ b/dcop/KDE-ICE/Xtrans.h
@@ -51,7 +51,7 @@ from The Open Group.
 #define _XTRANS_H_
 
 #include "config.h"
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <X11/Xfuncproto.h>
 #include <X11/Xos.h>
 #else
diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp
index a07f6a41a..6a395c222 100644
--- a/dcop/client/dcop.cpp
+++ b/dcop/client/dcop.cpp
@@ -47,7 +47,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "marshall.cpp"
 
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #endif
@@ -429,7 +429,7 @@ TQStringList dcopSessionList( const TQString &user, const TQString &home )
 
 void sendUserTime( const char* app )
 {
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
     static unsigned long time = 0;
     if( time == 0 )
     {
diff --git a/dcop/dcopc.c b/dcop/dcopc.c
index 5f1818cae..0d34c7f4b 100644
--- a/dcop/dcopc.c
+++ b/dcop/dcopc.c
@@ -24,7 +24,7 @@
 
 #include "config.h"
 #include <tqglobal.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/X.h>
 #include <X11/Xproto.h>
diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp
index d309014ee..8965b6062 100644
--- a/dcop/dcopclient.cpp
+++ b/dcop/dcopclient.cpp
@@ -68,7 +68,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dcopclient.h>
 #include <dcopobject.h>
 
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <X11/Xmd.h> 
 #endif
 extern "C" {
@@ -215,7 +215,7 @@ TQCString DCOPClient::iceauthPath()
 {
 #if defined(ICEAUTH_PATH)
     if (
-#       if defined(Q_WS_WIN)
+#       if defined(TQ_WS_WIN)
         access(ICEAUTH_PATH, 0) == 0
 #       else
         access(ICEAUTH_PATH, X_OK) == 0
@@ -266,9 +266,9 @@ static TQCString dcopServerFile(const TQCString &hostname, bool old)
         fprintf(stderr, "Aborting. $HOME is not set.\n");
         exit(1);
     }
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     TQCString disp = getenv("DISPLAY");
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
     TQCString disp = getenv("QWS_DISPLAY");
 #else
     TQCString disp;
@@ -700,7 +700,7 @@ void DCOPClient::bindToApp()
 
 void DCOPClient::suspend()
 {
-#ifdef Q_WS_WIN //TODO: remove (win32 ports sometimes do not create notifiers)
+#ifdef TQ_WS_WIN //TODO: remove (win32 ports sometimes do not create notifiers)
     if (!d->notifier)
         return;
 #endif
@@ -710,7 +710,7 @@ void DCOPClient::suspend()
 
 void DCOPClient::resume()
 {
-#ifdef Q_WS_WIN //TODO: remove
+#ifdef TQ_WS_WIN //TODO: remove
     if (!d->notifier)
         return;
 #endif
@@ -720,7 +720,7 @@ void DCOPClient::resume()
 
 bool DCOPClient::isSuspended() const
 {
-#if defined(Q_WS_WIN) || defined(Q_WS_MAC) //TODO: REMOVE
+#if defined(TQ_WS_WIN) || defined(TQ_WS_MAC) //TODO: REMOVE
     if (!d->notifier)
         return false;
 #endif
diff --git a/dcop/dcopglobal.h b/dcop/dcopglobal.h
index 7a684533e..f8bf78789 100644
--- a/dcop/dcopglobal.h
+++ b/dcop/dcopglobal.h
@@ -37,7 +37,7 @@
 #define DCOPReplyDelayed 6
 #define DCOPFind 7
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <X11/Xmd.h>
 #endif
diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus
index 768bf6b9c..706559f08 100644
--- a/dcop/dcopidlng/kalyptus
+++ b/dcop/dcopidlng/kalyptus
@@ -109,10 +109,10 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
     QM_EXPORT_WORKSPACE => '',
     TQT_NO_REMOTE => 'TQT_NO_REMOTE',
     QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT',
-    Q_WS_X11 => 'Q_WS_X11',
+    TQ_WS_X11 => 'TQ_WS_X11',
     TQ_DISABLE_COPY => 'TQ_DISABLE_COPY',
-    Q_WS_QWS => 'undef',
-    Q_WS_MAC => 'undef',
+    TQ_WS_QWS => 'undef',
+    TQ_WS_MAC => 'undef',
     TQ_OBJECT => <<'CODE',
 public:
     virtual QMetaObject *metaObject() const;
@@ -451,8 +451,8 @@ LOOP:
 			else {
 				# Skip platform-specific stuff, or #if 0 stuff
 				# or #else of something we parsed (e.g. for QKeySequence)
-				if ( $p =~ m/^#\s*ifdef\s*Q_WS_/ or
-				     $p =~ m/^#\s*if\s+defined\(Q_WS_/ or
+				if ( $p =~ m/^#\s*ifdef\s*TQ_WS_/ or
+				     $p =~ m/^#\s*if\s+defined\(TQ_WS_/ or
 				     $p =~ m/^#\s*if\s+defined\(Q_OS_/ or
 				     $p =~ m/^#\s*if\s+defined\(Q_CC_/ or
 				     $p =~ m/^#\s*if\s+defined\(TQT_THREAD_SUPPORT/ or
diff --git a/dcop/dcopserver.h b/dcop/dcopserver.h
index 017326376..e17ee4ef1 100644
--- a/dcop/dcopserver.h
+++ b/dcop/dcopserver.h
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqintdict.h>
 #include <tqapplication.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <X11/Xmd.h>
 #endif
diff --git a/dcop/dcopserver_shutdown.c b/dcop/dcopserver_shutdown.c
index af75c6d5a..8b1ee2884 100644
--- a/dcop/dcopserver_shutdown.c
+++ b/dcop/dcopserver_shutdown.c
@@ -54,9 +54,9 @@ static char *getDisplay()
 /*
  don't test for a value from tqglobal.h but instead distinguish
  Qt/X11 from Qt/Embedded by the fact that Qt/E apps have -DQWS
- on the commandline (which in tqglobal.h however triggers Q_WS_QWS,
+ on the commandline (which in tqglobal.h however triggers TQ_WS_QWS,
  but we don't want to include that here) (Simon)
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
  */
 #if !defined(QWS)
    display = getenv("DISPLAY");
diff --git a/dcop/dcopserver_shutdown_win.cpp b/dcop/dcopserver_shutdown_win.cpp
index 384bd6f36..af38c66f8 100644
--- a/dcop/dcopserver_shutdown_win.cpp
+++ b/dcop/dcopserver_shutdown_win.cpp
@@ -64,9 +64,9 @@ static char *getDisplay()
 /*
  don't test for a value from tqglobal.h but instead distinguish
  Qt/X11 from Qt/Embedded by the fact that Qt/E apps have -DQWS
- on the commandline (which in tqglobal.h however triggers Q_WS_QWS,
+ on the commandline (which in tqglobal.h however triggers TQ_WS_QWS,
  but we don't want to include that here) (Simon)
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
  */
 #if !defined(QWS)
    display = getenv("DISPLAY");