Replace Q_WS_* defines with TQ_WS_* equivalents

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 03aa7238b34bb438632b6d572b008e32960f0895)

27 files changed, 61 insertions, 61 deletions

diff --git a/tdeio/kpasswdserver/kpasswdserver.cpp b/tdeio/kpasswdserver/kpasswdserver.cpp
index f9340368a..8e16290a5 100644
--- a/tdeio/kpasswdserver/kpasswdserver.cpp
+++ b/tdeio/kpasswdserver/kpasswdserver.cpp
@@ -37,7 +37,7 @@
 #include <tdewallet.h>
 
 #include "config.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #endif
@@ -386,7 +386,7 @@ KPasswdServer::processRequest()
             if (hasWalletData)
                 dlg.setKeepPassword( true );
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
             XSetTransientForHint( tqt_xdisplay(), dlg.winId(), request->windowId);
 #endif
 
diff --git a/tdeio/kssl/kopenssl.h b/tdeio/kssl/kopenssl.h
index 312aef2c8..18255034c 100644
--- a/tdeio/kssl/kopenssl.h
+++ b/tdeio/kssl/kopenssl.h
@@ -27,7 +27,7 @@ class KOpenSSLProxyPrivate;
 
 #include <klibloader.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include "ksslconfig_win.h"
 #else
 #include "ksslconfig.h"
diff --git a/tdeio/kssl/ksslcertificate.h b/tdeio/kssl/ksslcertificate.h
index 67f6a808d..cce931867 100644
--- a/tdeio/kssl/ksslcertificate.h
+++ b/tdeio/kssl/ksslcertificate.h
@@ -49,7 +49,7 @@ class KSSLX509V3;
 
 #include <tdelibs_export.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include "ksslconfig_win.h"
 #else
 #include "ksslconfig.h"
diff --git a/tdeio/kssl/ksslcertificatehome.cpp b/tdeio/kssl/ksslcertificatehome.cpp
index 39470c5ab..9316bd221 100644
--- a/tdeio/kssl/ksslcertificatehome.cpp
+++ b/tdeio/kssl/ksslcertificatehome.cpp
@@ -44,7 +44,7 @@ return list;
 void KSSLCertificateHome::setDefaultCertificate(TQString name, TQString host, bool send, bool prompt) {
 KSimpleConfig cfg("ksslauthmap", false);
 
-#ifdef Q_WS_WIN //temporary 
+#ifdef TQ_WS_WIN //temporary 
    cfg.setGroup(host);
 #else
    cfg.setGroup(KResolver::domainToAscii(host));
@@ -156,7 +156,7 @@ KSSLPKCS12* KSSLCertificateHome::getCertificateByHost(TQString host, TQString pa
 TQString KSSLCertificateHome::getDefaultCertificateName(TQString host, KSSLAuthAction *aa) {
 KSimpleConfig cfg("ksslauthmap", false);
 
-#ifdef Q_WS_WIN //temporary 
+#ifdef TQ_WS_WIN //temporary 
    if (!cfg.hasGroup(host)) {
 #else
    if (!cfg.hasGroup(KResolver::domainToAscii(host))) {
@@ -164,7 +164,7 @@ KSimpleConfig cfg("ksslauthmap", false);
       if (aa) *aa = AuthNone;
       return TQString::null;
    } else {
-#ifdef Q_WS_WIN //temporary 
+#ifdef TQ_WS_WIN //temporary 
       cfg.setGroup(host);
 #else
       cfg.setGroup(KResolver::domainToAscii(host));
diff --git a/tdeio/kssl/ksslcsessioncache.cpp b/tdeio/kssl/ksslcsessioncache.cpp
index fc7ed0145..710ce8f21 100644
--- a/tdeio/kssl/ksslcsessioncache.cpp
+++ b/tdeio/kssl/ksslcsessioncache.cpp
@@ -26,7 +26,7 @@
 #include <kstaticdeleter.h>
 #include <kurl.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include "ksslconfig_win.h"
 #else
 #include "ksslconfig.h"
diff --git a/tdeio/kssl/kssldefs.h b/tdeio/kssl/kssldefs.h
index c33664b14..d981bf136 100644
--- a/tdeio/kssl/kssldefs.h
+++ b/tdeio/kssl/kssldefs.h
@@ -20,7 +20,7 @@
 #ifndef __kssldefs_h
 #define __kssldefs_h
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include "ksslconfig_win.h"
 #else
 #include "ksslconfig.h"
diff --git a/tdeio/kssl/ksslpeerinfo.cpp b/tdeio/kssl/ksslpeerinfo.cpp
index d1c2d00fc..8e265cdb9 100644
--- a/tdeio/kssl/ksslpeerinfo.cpp
+++ b/tdeio/kssl/ksslpeerinfo.cpp
@@ -30,7 +30,7 @@
 #include <ksockaddr.h>
 #include <kextsock.h>
 #include <netsupp.h>
-#ifndef Q_WS_WIN //TODO kresolver not ported
+#ifndef TQ_WS_WIN //TODO kresolver not ported
 #include "kresolver.h"
 #endif
 
@@ -62,7 +62,7 @@ void KSSLPeerInfo::setPeerHost(TQString realHost) {
 	while(d->peerHost.endsWith("."))
 		d->peerHost.truncate(d->peerHost.length()-1);
 
-#ifdef Q_WS_WIN //TODO kresolver not ported
+#ifdef TQ_WS_WIN //TODO kresolver not ported
 	d->peerHost = d->peerHost.lower();
 #else	
 	d->peerHost = TQString::fromLatin1(KNetwork::KResolver::domainToAscii(d->peerHost));
diff --git a/tdeio/kssl/ksslpkcs12.h b/tdeio/kssl/ksslpkcs12.h
index c9dff0d82..14eb23376 100644
--- a/tdeio/kssl/ksslpkcs12.h
+++ b/tdeio/kssl/ksslpkcs12.h
@@ -21,7 +21,7 @@
 #ifndef _KSSLPKCS12_H
 #define _KSSLPKCS12_H
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include "ksslconfig_win.h"
 #else
 #include "ksslconfig.h"
diff --git a/tdeio/kssl/ksslpkcs7.h b/tdeio/kssl/ksslpkcs7.h
index c94b7bc7a..3a88cb647 100644
--- a/tdeio/kssl/ksslpkcs7.h
+++ b/tdeio/kssl/ksslpkcs7.h
@@ -21,7 +21,7 @@
 #ifndef _KSSLPKCS7_H
 #define _KSSLPKCS7_H
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include "ksslconfig_win.h"
 #else
 #include "ksslconfig.h"
diff --git a/tdeio/kssl/ksslutils.h b/tdeio/kssl/ksslutils.h
index d709401fa..33cec9503 100644
--- a/tdeio/kssl/ksslutils.h
+++ b/tdeio/kssl/ksslutils.h
@@ -22,7 +22,7 @@
 
 #include <kdemacros.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include "ksslconfig_win.h"
 #else
 #include "ksslconfig.h"
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index e8309ea4c..b2d02615d 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -1205,7 +1205,7 @@ void UIServer::showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &met
                   meta["ssl_cipher_bits"].toInt(),
                   KSSLCertificate::KSSLValidation(meta["ssl_cert_state"].toInt()));
       kdDebug(7024) << "Showing SSL Info dialog" << endl;
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
       if( mainwindow != 0 )
           KWin::setMainWindow( kid, mainwindow );
 #endif
@@ -1233,7 +1233,7 @@ KSSLCertDlgRet UIServer::showSSLCertDialog(const TQString& host, const TQStringL
       kcd->setupDialog(certList);
       kcd->setHost(host);
       kdDebug(7024) << "Showing SSL certificate dialog" << endl;
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
       if( mainwindow != 0 )
           KWin::setMainWindow( kcd, mainwindow );
 #endif
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index e226996e3..2457f4a69 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -135,7 +135,7 @@ extern "C" {
 
 #include "kpropertiesdialog.h"
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 # include <win32_utils.h>
 #endif
 
@@ -289,7 +289,7 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _tempUrl, const KURL& _current
 bool KPropertiesDialog::showDialog(KFileItem* item, TQWidget* parent,
                                    const char* name, bool modal)
 {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
   TQString localPath = item->localPath();
   if (!localPath.isEmpty())
     return showWin32FilePropertyDialog(localPath);
@@ -301,7 +301,7 @@ bool KPropertiesDialog::showDialog(KFileItem* item, TQWidget* parent,
 bool KPropertiesDialog::showDialog(const KURL& _url, TQWidget* parent,
                                    const char* name, bool modal)
 {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
   if (_url.isLocalFile())
     return showWin32FilePropertyDialog( _url.path() );
 #endif
@@ -956,7 +956,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
     box->setSpacing(20);
     l = new TQLabel(mimeComment, box );
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     //TODO: wrap for win32 or mac?
     TQPushButton *button = new TQPushButton(box);
 
@@ -1142,7 +1142,7 @@ void KFilePropsPlugin::setFileNameReadOnly( bool ro )
 
 void KFilePropsPlugin::slotEditFileType()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   TQString mime;
   if ( d->mimeType == KMimeType::defaultMimeType() ) {
     int pos = d->oldFileName.findRev( '.' );
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index e5cb4c3e4..cf5d97692 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -88,7 +88,7 @@
 #include <tdefilespeedbar.h>
 #include <tdefilebookmarkhandler.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <fixx11h.h>
 #endif
@@ -1338,7 +1338,7 @@ TQString KFileDialog::getOpenFileNameWId(const TQString& startDir,
 {
     TQWidget* parent = TQWidget::find( parent_id );
     KFileDialog dlg(startDir, filter, parent, "filedialog", true);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id != 0 )
         XSetTransientForHint( tqt_xdisplay(), dlg.winId(), parent_id );
 #else
@@ -1413,7 +1413,7 @@ TQString KFileDialog::getExistingDirectory(const TQString& startDir,
                                           TQWidget *parent,
                                           const TQString& caption)
 {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
     return TQFileDialog::getExistingDirectory(startDir, parent, "getExistingDirectory",
                                              caption, true, true);
 #else
@@ -1620,7 +1620,7 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi
     bool specialDir = dir.at(0) == ':';
     TQWidget* parent = TQWidget::find( parent_id );
     KFileDialog dlg( specialDir ? dir : TQString::null, filter, parent, "filedialog", true);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id != 0 )
         XSetTransientForHint(tqt_xdisplay(), dlg.winId(), parent_id);
 #else
diff --git a/tdeio/tdeio/defaultprogress.cpp b/tdeio/tdeio/defaultprogress.cpp
index 063d3e1c8..2944cd6aa 100644
--- a/tdeio/tdeio/defaultprogress.cpp
+++ b/tdeio/tdeio/defaultprogress.cpp
@@ -35,7 +35,7 @@
 #include <kstdguiitem.h>
 #include <klineedit.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <twin.h>
 #endif
 
@@ -86,7 +86,7 @@ void DefaultProgress::init()
 {
   d = new DefaultProgressPrivate;
 
-#ifdef Q_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS
+#ifdef TQ_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS
   // Set a useful icon for this window!
   KWin::setIcons( winId(),
           TDEGlobal::iconLoader()->loadIcon( "document-save", TDEIcon::NoGroup, 32 ),
diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp
index 3418da6bc..5943ae402 100644
--- a/tdeio/tdeio/job.cpp
+++ b/tdeio/tdeio/job.cpp
@@ -73,7 +73,7 @@ extern "C" {
 #ifdef Q_OS_UNIX
 #include <utime.h>
 #endif
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 #include <netwm.h>
 #include <fixx11h.h>
 #endif
@@ -391,7 +391,7 @@ TQWidget *Job::window() const
 
 void Job::updateUserTimestamp( unsigned long time )
 {
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
   if( d->m_userTimestamp == 0 || NET::timestampCompare( time, d->m_userTimestamp ) > 0 )
       d->m_userTimestamp = time;
 #endif
@@ -4695,7 +4695,7 @@ TQString CacheInfo::cachedFileName()
 
 TQFile *CacheInfo::cachedFile()
 {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
    const char *mode = (readWrite ? "rb+" : "rb");
 #else
    const char *mode = (readWrite ? "r+" : "r");
diff --git a/tdeio/tdeio/kdirwatch.cpp b/tdeio/tdeio/kdirwatch.cpp
index 680b18cab..857e50703 100644
--- a/tdeio/tdeio/kdirwatch.cpp
+++ b/tdeio/tdeio/kdirwatch.cpp
@@ -1249,7 +1249,7 @@ void KDirWatchPrivate::emitEvent(Entry* e, int event, const KURL &fileName)
     else
 #ifdef Q_OS_UNIX
       path += "/" + fileName.path();
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
       //current drive is passed instead of /
       path += TQDir::currentDirPath().left(2) + "/" + fileName.path();
 #endif
diff --git a/tdeio/tdeio/kfilterbase.h b/tdeio/tdeio/kfilterbase.h
index 203eb581d..f2c4f1225 100644
--- a/tdeio/tdeio/kfilterbase.h
+++ b/tdeio/tdeio/kfilterbase.h
@@ -24,7 +24,7 @@
 
 #include <tdelibs_export.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #undef ERROR //avoid conflicts
 #endif
 
diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp
index 8e4eb9769..67ac7f7ea 100644
--- a/tdeio/tdeio/kmimetype.cpp
+++ b/tdeio/tdeio/kmimetype.cpp
@@ -855,7 +855,7 @@ pid_t KDEDesktopMimeType::runFSDevice( const KURL& _url, const KSimpleConfig &cf
     if ( fstype == "Default" ) // KDE-1 thing
       fstype = TQString::null;
     TQString point = cfg.readEntry( "MountPoint" );
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
     (void) new KAutoMount( ro, fstype, dev, point, _url.path() );
 #endif
     retval = -1; // we don't want to return 0, but we don't want to return a pid
@@ -1138,7 +1138,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT
       if ( fstype == "Default" ) // KDE-1 thing
           fstype = TQString::null;
       TQString point = cfg.readEntry( "MountPoint" );
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
       (void)new KAutoMount( ro, fstype, dev, point, path, false );
 #endif
     }
@@ -1148,7 +1148,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT
       if ( mp.isEmpty() )
         return;
 
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
       (void)new KAutoUnmount( mp, path );
 #endif
     }
diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp
index 909594c1e..99584b5ac 100644
--- a/tdeio/tdeio/krun.cpp
+++ b/tdeio/tdeio/krun.cpp
@@ -61,7 +61,7 @@
 #include <kde_file.h>
 #include <kstringhandler.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <twin.h>
 #endif
 
@@ -562,7 +562,7 @@ static pid_t runCommandInternal( TDEProcess* proc, const KService* service, cons
      return 0;
   }
   TQString bin = KRun::binaryName( binName, true );
-#ifdef Q_WS_X11 // Startup notification doesn't work with QT/E, service isn't needed without Startup notification
+#ifdef TQ_WS_X11 // Startup notification doesn't work with QT/E, service isn't needed without Startup notification
   bool silent;
   TQCString wmclass;
   TDEStartupInfoId id;
@@ -1471,7 +1471,7 @@ TDEProcessRunner::run(TDEProcess * p, const TQString & binName)
   return (new TDEProcessRunner(p, binName))->pid();
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 pid_t
 TDEProcessRunner::run(TDEProcess * p, const TQString & binName, const TDEStartupInfoId& id )
 {
@@ -1493,7 +1493,7 @@ TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName )
       slotProcessExited( process_ );
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName, const TDEStartupInfoId& id )
   : TQObject(),
     process_(p),
@@ -1545,7 +1545,7 @@ TDEProcessRunner::slotProcessExited(TDEProcess * p)
       kapp->deref();
     }
   }
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   if( !id_.none())
   {
       TDEStartupInfoData data;
diff --git a/tdeio/tdeio/krun.h b/tdeio/tdeio/krun.h
index e6c8a23ca..62a1a5d91 100644
--- a/tdeio/tdeio/krun.h
+++ b/tdeio/tdeio/krun.h
@@ -482,7 +482,7 @@ class TDEIO_EXPORT TDEProcessRunner : public TQObject
   public:
 
     static pid_t run(TDEProcess *, const TQString & binName);
-#ifdef Q_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded
+#ifdef TQ_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded
     static pid_t run(TDEProcess *, const TQString & binName, const TDEStartupInfoId& id );
 #endif
 
@@ -497,14 +497,14 @@ class TDEIO_EXPORT TDEProcessRunner : public TQObject
   private:
 
     TDEProcessRunner(TDEProcess *, const TQString & binName);
-#ifdef Q_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded
+#ifdef TQ_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded
     TDEProcessRunner(TDEProcess *, const TQString & binName, const TDEStartupInfoId& id );
 #endif
     TDEProcessRunner();
 
     TDEProcess * process_;
     TQString binName;
-#ifdef Q_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded
+#ifdef TQ_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded
     TDEStartupInfoId id_;
 #endif
 };
diff --git a/tdeio/tdeio/kservicetypefactory.cpp b/tdeio/tdeio/kservicetypefactory.cpp
index 682a87d6b..77cda4059 100644
--- a/tdeio/tdeio/kservicetypefactory.cpp
+++ b/tdeio/tdeio/kservicetypefactory.cpp
@@ -234,7 +234,7 @@ KServiceType::List KServiceTypeFactory::allServiceTypes()
         it != list.end();
         ++it)
    {
-#ifndef Q_WS_QWS
+#ifndef TQ_WS_QWS
       KServiceType *newServiceType = dynamic_cast<KServiceType *>((*it).data());
 #else //FIXME
       KServiceType *newServiceType = (KServiceType*)(*it).data();
diff --git a/tdeio/tdeio/renamedlg.cpp b/tdeio/tdeio/renamedlg.cpp
index 37e8ba385..ce2ae5323 100644
--- a/tdeio/tdeio/renamedlg.cpp
+++ b/tdeio/tdeio/renamedlg.cpp
@@ -48,7 +48,7 @@
 #include <kguiitem.h>
 #include <ksqueezedtextlabel.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <twin.h>
 #endif
 
@@ -99,7 +99,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
     // Set "StaysOnTop", because this dialog is typically used in tdeio_uiserver,
     // i.e. in a separate process.
     // ####### This isn't the case anymore - remove?
-#if !defined(Q_WS_QWS) && !defined(Q_WS_WIN) //FIXME(E): Implement for QT Embedded & win32
+#if !defined(TQ_WS_QWS) && !defined(TQ_WS_WIN) //FIXME(E): Implement for QT Embedded & win32
     if (d->modal)
         KWin::setState( winId(), NET::StaysOnTop );
 #endif
diff --git a/tdeio/tdeio/skipdlg.cpp b/tdeio/tdeio/skipdlg.cpp
index 84dfaefa5..ffc09d559 100644
--- a/tdeio/tdeio/skipdlg.cpp
+++ b/tdeio/tdeio/skipdlg.cpp
@@ -32,7 +32,7 @@
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
-#ifdef Q_WS_X11 
+#ifdef TQ_WS_X11 
 #include <twin.h>
 #endif
 
@@ -46,7 +46,7 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo
 
   // Set "StaysOnTop", because this dialog is typically used in tdeio_uiserver,
   // i.e. in a separate process.
-#ifdef Q_WS_X11 //FIXME(E): Implement for QT Embedded, mac & win32
+#ifdef TQ_WS_X11 //FIXME(E): Implement for QT Embedded, mac & win32
   if (modal)
     KWin::setState( winId(), NET::StaysOnTop );
 #endif
diff --git a/tdeio/tdeio/slave.cpp b/tdeio/tdeio/slave.cpp
index 56d45a315..5ced7acf8 100644
--- a/tdeio/tdeio/slave.cpp
+++ b/tdeio/tdeio/slave.cpp
@@ -89,7 +89,7 @@ namespace TDEIO {
 
 void Slave::accept(TDESocket *socket)
 {
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
     slaveconn.init(socket);
 #endif
     delete serv;
@@ -151,7 +151,7 @@ Slave::Slave(TDEServerSocket *socket, const TQString &protocol, const TQString &
     idle_since = contact_started;
     m_pid = 0;
     m_port = 0;
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
     connect(serv, TQ_SIGNAL(accepted( TDESocket* )),
 	    TQ_SLOT(accept(TDESocket*) ) );
 #endif
@@ -173,7 +173,7 @@ Slave::Slave(bool /*derived*/, TDEServerSocket *socket, const TQString &protocol
     m_pid = 0;
     m_port = 0;
     if (serv != 0) {
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
       connect(serv, TQ_SIGNAL(accepted( TDESocket* )),
         TQ_SLOT(accept(TDESocket*) ) );
 #endif
@@ -376,7 +376,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
    socketfile.close();
 #endif
     
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
     TDEServerSocket *kss = new TDEServerSocket(TQFile::encodeName(socketfile.name()).data());
 
     Slave *slave = new Slave(kss, protocol, socketfile.name());
@@ -418,7 +418,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
 
        proc.start(TDEProcess::DontCare);
 
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
        slave->setPID(proc.pid());
        TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQ_SLOT(timeout()));
 #endif
@@ -450,7 +450,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
         delete slave;
         return 0;
     }
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
     slave->setPID(pid);
     TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQ_SLOT(timeout()));
 #endif
@@ -478,7 +478,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url )
    socketfile.unlink();
 #endif
 
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
     TDEServerSocket *kss = new TDEServerSocket(TQFile::encodeName(socketfile.name()).data());
 
     Slave *slave = new Slave(kss, protocol, socketfile.name());
@@ -505,7 +505,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url )
         delete slave;
         return 0;
     }
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
     slave->setPID(pid);
     TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQ_SLOT(timeout()));
 #endif
diff --git a/tdeio/tdeio/tcpslavebase.cpp b/tdeio/tdeio/tcpslavebase.cpp
index 0237c9fd5..d75e8804f 100644
--- a/tdeio/tdeio/tcpslavebase.cpp
+++ b/tdeio/tdeio/tcpslavebase.cpp
@@ -44,7 +44,7 @@
 #include <ksslall.h>
 #include <ksslcertdlg.h>
 #include <tdemessagebox.h>
-#ifndef Q_WS_WIN //temporary
+#ifndef TQ_WS_WIN //temporary
 #include <kresolver.h>
 #endif
 
@@ -762,7 +762,7 @@ int TCPSlaveBase::verifyCertificate()
 
    _IPmatchesCN = d->kssl->peerInfo().certMatchesAddress();
    if (!_IPmatchesCN) {
-#ifndef Q_WS_WIN //temporary
+#ifndef TQ_WS_WIN //temporary
       KNetwork::KResolverResults res = KNetwork::KResolver::resolve(d->kssl->peerInfo().peerHost(), "80", KNetwork::KResolver::CanonName);
       if (!res.isEmpty()) {
          TQString old = d->kssl->peerInfo().peerHost();
diff --git a/tdeio/tdeio/tdefileitem.cpp b/tdeio/tdeio/tdefileitem.cpp
index 577a8a0d7..aa4d1f873 100644
--- a/tdeio/tdeio/tdefileitem.cpp
+++ b/tdeio/tdeio/tdefileitem.cpp
@@ -965,7 +965,7 @@ TQString KFileItem::getToolTipText(int maxcount)
   if(!timeStr.isEmpty())
     tip += start + i18n("Modified:") + mid +
            timeStr + end;
-#ifndef Q_WS_WIN //TODO: show win32-specific permissions
+#ifndef TQ_WS_WIN //TODO: show win32-specific permissions
   TQString userStr = user();
   TQString groupStr = group();
   if(!userStr.isEmpty() || !groupStr.isEmpty())
diff --git a/tdeio/tdeioexec/main.cpp b/tdeio/tdeioexec/main.cpp
index 071c4649c..2245fcfac 100644
--- a/tdeio/tdeioexec/main.cpp
+++ b/tdeio/tdeioexec/main.cpp
@@ -204,7 +204,7 @@ void KIOExec::slotRunApp()
 
     kdDebug() << "EXEC " << KShell::joinArgs( params ) << endl;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     // propagate the startup indentification to the started process
     TDEStartupInfoId id;
     id.initId( kapp->startupId());
@@ -215,7 +215,7 @@ void KIOExec::slotRunApp()
     proc << params;
     proc.start( TDEProcess::Block );
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     TDEStartupInfo::resetStartupEnv();
 #endif