Replace Q_WS_* defines with TQ_WS_* equivalents

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

30 files changed, 105 insertions, 105 deletions

diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp
index 4c05522eb..8296c8319 100644
--- a/tdeui/kcolordialog.cpp
+++ b/tdeui/kcolordialog.cpp
@@ -68,7 +68,7 @@
 #include "config.h"
 #endif
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h> 
 
 // defined in qapplication_x11.cpp
@@ -930,7 +930,7 @@ public:
     TQCheckBox *cbDefaultColor;
     KColor defaultColor;
     KColor selColor;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     QX11EventFilter oldfilter;
 #endif
 };
@@ -944,7 +944,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   d = new KColorDialogPrivate;
   d->bRecursion = true;
   d->bColorPicking = false;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   d->oldfilter = 0;
 #endif
   d->cbDefaultColor = 0L;
@@ -1177,7 +1177,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
 
 KColorDialog::~KColorDialog()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if (d->bColorPicking)
         tqt_set_x11_event_filter(d->oldfilter);
 #endif
@@ -1486,7 +1486,7 @@ void KColorDialog::showColor( const KColor &color, const TQString &name )
 
 static TQWidget *kde_color_dlg_widget = 0;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 static int kde_color_dlg_handler(XEvent *event)
 {
     if (event->type == ButtonRelease)
@@ -1503,7 +1503,7 @@ void
 KColorDialog::slotColorPicker()
 {
     d->bColorPicking = true;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     d->oldfilter = tqt_set_x11_event_filter(kde_color_dlg_handler);
 #endif
     kde_color_dlg_widget = this;
@@ -1517,7 +1517,7 @@ KColorDialog::mouseReleaseEvent( TQMouseEvent *e )
   if (d->bColorPicking)
   {
      d->bColorPicking = false;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
      tqt_set_x11_event_filter(d->oldfilter);
      d->oldfilter = 0;
 #endif
@@ -1546,7 +1546,7 @@ KColorDialog::keyPressEvent( TQKeyEvent *e )
      if (e->key() == Key_Escape)
      {
         d->bColorPicking = false;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
         tqt_set_x11_event_filter(d->oldfilter);
         d->oldfilter = 0;
 #endif
diff --git a/tdeui/kcolordialog.h b/tdeui/kcolordialog.h
index 248a582b9..a2ea4b52f 100644
--- a/tdeui/kcolordialog.h
+++ b/tdeui/kcolordialog.h
@@ -25,7 +25,7 @@
 #ifndef KDELIBS_KCOLORDIALOG_H
 #define KDELIBS_KCOLORDIALOG_H
 
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
 // FIXME(E): Do we need the KColorDialog extra functionality in Qt Embedded?
 #include <tqcolordialog.h>
 #define KColorDialog QColorDialog
@@ -491,6 +491,6 @@ class TDEUI_EXPORT KColorDialog : public KDialogBase
     KColorDialogPrivate *d;
 };
 
-#endif		// !Q_WS_QWS
+#endif		// !TQ_WS_QWS
 #endif		// KDELIBS_KCOLORDIALOG_H
 
diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp
index a04786da7..ae0a83935 100644
--- a/tdeui/kcursor.cpp
+++ b/tdeui/kcursor.cpp
@@ -49,7 +49,7 @@ TQCursor KCursor::handCursor()
                 TDEConfig *config = TDEGlobal::config();
                 TDEConfigGroupSaver saver( config, "General" );
 
-#ifndef Q_WS_WIN // this mask doesn't work too well on win32
+#ifndef TQ_WS_WIN // this mask doesn't work too well on win32
                 if ( config->readEntry("handCursorStyle", "Windows") == "Windows" )
                 {
                         static const unsigned char HAND_BITS[] = {
@@ -74,7 +74,7 @@ TQCursor KCursor::handCursor()
                         hand_cursor->handle();
                 }
                 else
-#endif //! Q_WS_WIN
+#endif //! TQ_WS_WIN
                         hand_cursor = new TQCursor(PointingHandCursor);
         }
 
diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp
index a88640efe..68471847d 100644
--- a/tdeui/kdialog.cpp
+++ b/tdeui/kdialog.cpp
@@ -41,7 +41,7 @@
 #include <tqpushbutton.h>
 
 #include "config.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <netwm.h>
 #endif
 
@@ -130,7 +130,7 @@ void KDialog::setPlainCaption( const TQString &caption )
 {
   TQDialog::setCaption( caption );
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   NETWinInfo info( tqt_xdisplay(), winId(), tqt_xrootwin(), 0 );
   info.setName( caption.utf8().data() );
 #endif
diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp
index 645b8214d..8e8b924c2 100644
--- a/tdeui/kdockwidget.cpp
+++ b/tdeui/kdockwidget.cpp
@@ -43,7 +43,7 @@
 #include <tdeglobalsettings.h>
 
 #include "config.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #endif
@@ -818,7 +818,7 @@ void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
     move(p);
 
 #ifndef NO_KDE2
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if (d->transient && d->_parent)
       XSetTransientForHint( tqt_xdisplay(), winId(), d->_parent->winId() );
 
@@ -828,7 +828,7 @@ void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
 #else
     KWin::setType( winId(), d->windowType );
 #endif // BORDERLESS_WINDOW
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 #endif
 
   }
diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp
index ad923b90e..a274ec737 100644
--- a/tdeui/khelpmenu.cpp
+++ b/tdeui/khelpmenu.cpp
@@ -308,7 +308,7 @@ void KHelpMenu::contextHelpActivated()
   TQWidget* w = TQApplication::widgetAt( TQCursor::pos(), true );
   while ( w && !w->isTopLevel() && !w->inherits("QXEmbed")  )
       w = w->parentWidget();
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
    if ( w && w->inherits("QXEmbed") )
 	  (( QXEmbed*) w )->enterWhatsThisMode();
 #endif
diff --git a/tdeui/kkeybutton.cpp b/tdeui/kkeybutton.cpp
index 08ba14342..201ade557 100644
--- a/tdeui/kkeybutton.cpp
+++ b/tdeui/kkeybutton.cpp
@@ -30,7 +30,7 @@
 #include <tdelocale.h>
 
 #include "config.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #define XK_XKB_KEYS
 #define XK_MISCELLANY
 #include <X11/Xlib.h>	// For x11Event() 
@@ -46,7 +46,7 @@ const int XKeyRelease = KeyRelease;
 #undef FocusOut
 #undef FocusIn
 #endif // KeyPress
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 //static const char* psTemp[] = { 
 //  I18N_NOOP("Primary"), I18N_NOOP("Alternate"), I18N_NOOP("Multi-Key") 
diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp
index 04f17821f..052710d89 100644
--- a/tdeui/kkeydialog.cpp
+++ b/tdeui/kkeydialog.cpp
@@ -54,7 +54,7 @@
 #include <tdeaboutdata.h>
 #include <kstaticdeleter.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #define XK_XKB_KEYS
 #define XK_MISCELLANY
 #include <X11/Xlib.h>	// For x11Event()
diff --git a/tdeui/kpassivepopup.cpp b/tdeui/kpassivepopup.cpp
index 9da2a67ab..eb626a767 100644
--- a/tdeui/kpassivepopup.cpp
+++ b/tdeui/kpassivepopup.cpp
@@ -25,7 +25,7 @@
 #include <tdeglobalsettings.h>
 
 #include "config.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <netwm.h>
 #endif
 
@@ -143,7 +143,7 @@ TQVBox * KPassivePopup::standardView(const TQString& caption,
 	TQString sizedCaption = caption;
 	TQString sizedText = text;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	int max_width;
 
 	NETRootInfo info( tqt_xdisplay(),
@@ -172,7 +172,7 @@ TQVBox * KPassivePopup::standardView(const TQString& caption,
 	if ( !sizedCaption.isEmpty() ) {
 		ttl = new TQLabel( sizedCaption, hb ? hb : vb, "title_label" );
 		TQFont fnt = ttl->font();
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 		truncateStringToFit(sizedCaption, fnt, max_width);
 		ttl->setText(sizedCaption);
 #endif
@@ -186,7 +186,7 @@ TQVBox * KPassivePopup::standardView(const TQString& caption,
 
 	if ( !sizedText.isEmpty() ) {
 		msg = new TQLabel( sizedText, vb, "msg_label" );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 		TQStringList textLines = TQStringList::split("\n", sizedText, true);
 		for (TQStringList::Iterator it = textLines.begin(); it != textLines.end(); ++it) {
 			truncateStringToFit(*it, msg->font(), max_width);
@@ -295,7 +295,7 @@ void KPassivePopup::hideEvent( TQHideEvent * )
 
 TQRect KPassivePopup::defaultArea() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETRootInfo info( tqt_xdisplay(),
                       NET::NumberOfDesktops |
                       NET::CurrentDesktop |
@@ -317,7 +317,7 @@ void KPassivePopup::positionSelf()
 {
     TQRect target;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if ( !window ) {
         target = defaultArea();
     }
diff --git a/tdeui/kpixmapio.cpp b/tdeui/kpixmapio.cpp
index c9047c2f6..74d3c64b1 100644
--- a/tdeui/kpixmapio.cpp
+++ b/tdeui/kpixmapio.cpp
@@ -28,7 +28,7 @@
 #include <sys/shm.h>
 #endif
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/X.h> 
 #include <X11/Xlib.h> 
 #include <X11/Xutil.h> 
@@ -51,7 +51,7 @@ struct KPixmapIOPrivate
     int threshold;
     int bpp;
     int byteorder;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     XImage *ximage;
 #ifdef HAVE_MITSHM
     XShmSegmentInfo *shminfo;
diff --git a/tdeui/kprogress.cpp b/tdeui/kprogress.cpp
index 1d259d820..701b1f7f7 100644
--- a/tdeui/kprogress.cpp
+++ b/tdeui/kprogress.cpp
@@ -179,7 +179,7 @@ KProgressDialog::KProgressDialog(TQWidget* parent, const char* name,
       mMinDuration(2000),
       d(new KProgressDialogPrivate)
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
 #endif
     mShowTimer = new TQTimer(this);
diff --git a/tdeui/kprogressbox.cpp b/tdeui/kprogressbox.cpp
index 12ddba0a4..02b60afe4 100644
--- a/tdeui/kprogressbox.cpp
+++ b/tdeui/kprogressbox.cpp
@@ -67,7 +67,7 @@ KProgressBoxDialog::KProgressBoxDialog(TQWidget* parent, const char* name,
       mMinDuration(2000),
       d(new KProgressBoxDialogPrivate)
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
 #endif
     mShowTimer = new TQTimer(this);
diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp
index 93cb1f456..5a0923566 100644
--- a/tdeui/krootpixmap.cpp
+++ b/tdeui/krootpixmap.cpp
@@ -37,7 +37,7 @@ class KRootPixmapData
 {
 public:
     TQWidget *toplevel;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWinModule *twin;
 #endif
 };
@@ -69,7 +69,7 @@ void KRootPixmap::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 );
@@ -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,7 +275,7 @@ 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();
     if (!client->isAttached())
diff --git a/tdeui/krootpixmap.h b/tdeui/krootpixmap.h
index fd882372b..485580fbb 100644
--- a/tdeui/krootpixmap.h
+++ b/tdeui/krootpixmap.h
@@ -15,7 +15,7 @@
 #include <tqcolor.h>
 #include <tdelibs_export.h>
 
-#ifndef Q_WS_QWS //FIXME
+#ifndef TQ_WS_QWS //FIXME
 
 class TQRect;
 class TQWidget;
@@ -235,6 +235,6 @@ private:
     void init();
 };
 
-#endif // ! Q_WS_QWS
+#endif // ! TQ_WS_QWS
 #endif // __KRootPixmap_h_Included__
 
diff --git a/tdeui/ksharedpixmap.cpp b/tdeui/ksharedpixmap.cpp
index d4d830d57..a6d965dd0 100644
--- a/tdeui/ksharedpixmap.cpp
+++ b/tdeui/ksharedpixmap.cpp
@@ -20,7 +20,7 @@
 #include <tqwindowdefs.h>
 #include <tqwidget.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 #include <tdeapplication.h>
 #include <krootprop.h>
diff --git a/tdeui/ksharedpixmap.h b/tdeui/ksharedpixmap.h
index cd3d53ad4..a77e40683 100644
--- a/tdeui/ksharedpixmap.h
+++ b/tdeui/ksharedpixmap.h
@@ -16,7 +16,7 @@
 
 #include <kpixmap.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 #include <tqstring.h>
 #include <tqpixmap.h>
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp
index 295842f3f..096d9637c 100644
--- a/tdeui/ksystemtray.cpp
+++ b/tdeui/ksystemtray.cpp
@@ -28,7 +28,7 @@
 #include "tdelocale.h"
 #include "tdeaboutdata.h"
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <twin.h>
 #include <twinmodule.h>
 #include <qxembed.h>
@@ -61,14 +61,14 @@ public:
 KSystemTray::KSystemTray( TQWidget* parent, const char* name )
     : TQLabel( parent, name, (WFlags)WType_TopLevel )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     QXEmbed::initialize();
 #endif
 
     d = new KSystemTrayPrivate;
     d->actionCollection = new TDEActionCollection(this);
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWin::setSystemTrayWindowFor( winId(), parent?parent->topLevelWidget()->winId(): tqt_xrootwin() );
 #endif
     setBackgroundMode(X11ParentRelative);
@@ -84,7 +84,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name )
         new TDEAction(i18n("Minimize"), "view-restore", TDEShortcut(),
                     this, TQ_SLOT( minimizeRestoreAction() ),
                     d->actionCollection, "minimizeRestore");
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId() );
 	d->on_all_desktops = info.onAllDesktops();
 #else
@@ -244,7 +244,7 @@ void KSystemTray::activateOrHide()
     if ( !pw )
 	return;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWin::WindowInfo info1 = KWin::windowInfo( pw->winId(), NET::XAWMState | NET::WMState );
     // mapped = visible (but possibly obscured)
     bool mapped = (info1.mappingState() == NET::Visible) && !info1.isMinimized();
@@ -288,7 +288,7 @@ void KSystemTray::minimizeRestore( bool restore )
     TQWidget* pw = parentWidget();
     if( !pw )
 	return;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWin::WindowInfo info = KWin::windowInfo( pw->winId(), NET::WMGeometry | NET::WMDesktop );
     if ( restore )
     {
@@ -333,7 +333,7 @@ void KSystemTray::setPixmap( const TQPixmap& p )
 		iconPixmapToSet.convertFromImage(correctedImage);
 	}
 	TQLabel::setPixmap( iconPixmapToSet );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	KWin::setIcons( winId(), iconPixmapToSet, TQPixmap());
 #endif
 }
diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp
index 9480bf6ac..2c8a8ef08 100644
--- a/tdeui/ktip.cpp
+++ b/tdeui/ktip.cpp
@@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kiconeffect.h>
 #include <tdeglobalsettings.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <twin.h>
 #endif
 
@@ -204,7 +204,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
     mDatabase = db;
 
     setCaption(i18n("Tip of the Day"));
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWin::setIcons( winId(),
                     TDEGlobal::iconLoader()->loadIcon( "idea", TDEIcon::NoGroup, 32 ),
                     TDEGlobal::iconLoader()->loadIcon( "idea", TDEIcon::NoGroup, 16 ) );
diff --git a/tdeui/qxembed.cpp b/tdeui/qxembed.cpp
index d1c3b004e..23076e38d 100644
--- a/tdeui/qxembed.cpp
+++ b/tdeui/qxembed.cpp
@@ -54,7 +54,7 @@
 #include <tqfocusdata.h>
 
 // L0001: QXEmbed works only under X windows.
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 # include <X11/X.h>
 # include <X11/Xlib.h>
@@ -1399,4 +1399,4 @@ void QXEmbed::reparent( TQWidget * parent, WFlags f, const TQPoint & p, bool sho
 
 // for KDE
 #include "qxembed.moc"
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
diff --git a/tdeui/qxembed.h b/tdeui/qxembed.h
index 019e3ba4f..c21b96eac 100644
--- a/tdeui/qxembed.h
+++ b/tdeui/qxembed.h
@@ -25,7 +25,7 @@
 #include <tqwidget.h>
 #include <tdelibs_export.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 class QXEmbedData;
 
diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp
index 2a112f196..817c14423 100644
--- a/tdeui/tdemainwindow.cpp
+++ b/tdeui/tdemainwindow.cpp
@@ -49,7 +49,7 @@
 #include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 #include <netwm.h>
 #endif
 
@@ -290,7 +290,7 @@ void TDEMainWindow::parseGeometry(bool parsewidth)
     assert ( !kapp->geometryArgument().isNull() );
     assert ( d->care_about_geometry );
 
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
     int x, y;
     int w, h;
     int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
@@ -600,7 +600,7 @@ void TDEMainWindow::setCaption( const TQString &caption, bool modified )
 void TDEMainWindow::setPlainCaption( const TQString &caption )
 {
     TQMainWindow::setCaption( caption );
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
     NETWinInfo info( tqt_xdisplay(), winId(), tqt_xrootwin(), 0 );
     info.setName( caption.utf8().data() );
 #endif
@@ -913,7 +913,7 @@ void TDEMainWindow::saveWindowSize( TDEConfig * config ) const
   int scnum = TQApplication::desktop()->screenNumber(parentWidget());
   TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
   int w, h;
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
   // save maximalization as desktop size + 1 in that direction
   KWin::WindowInfo info = KWin::windowInfo( winId(), NET::WMState );
   w = info.state() & NET::MaxHoriz ? desk.width() + 1 : width();
@@ -963,7 +963,7 @@ void TDEMainWindow::restoreWindowSize( TDEConfig * config )
             }
         }
         if ( !size.isEmpty() ) {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
             int state = 0;
             if (size.width() > desk.width()) {
                 state = state | NET::MaxHoriz;
@@ -1244,7 +1244,7 @@ TQSize TDEMainWindow::sizeForCentralWidgetSize(TQSize size)
 void TDEMainWindow::setIcon( const TQPixmap& p )
 {
     TQMainWindow::setIcon( p );
-#ifdef Q_WS_X11 
+#ifdef TQ_WS_X11 
     // Qt3 doesn't support _NET_WM_ICON, but TDEApplication::setTopWidget(), which
     // is used by TDEMainWindow, sets it
     KWin::setIcons( winId(), p, TQPixmap());
diff --git a/tdeui/tdemenubar.cpp b/tdeui/tdemenubar.cpp
index eba259b28..e7c901d56 100644
--- a/tdeui/tdemenubar.cpp
+++ b/tdeui/tdemenubar.cpp
@@ -40,7 +40,7 @@
 #include <kdebug.h>
 #include <kmanagerselection.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <twin.h> 
 #include <twinmodule.h> 
 #include <qxembed.h> 
@@ -74,7 +74,7 @@ public:
 	:   forcedTopLevel( false ),
 	    topLevel( false ),
 	    wasTopLevel( false ),
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	    selection( NULL ),
 #endif
             min_size( 0, 0 )
@@ -82,7 +82,7 @@ public:
 	}
     ~KMenuBarPrivate()
         {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
         delete selection;
 #endif
         }
@@ -93,7 +93,7 @@ public:
     int lineWidth;  // dtto
     int margin;     // dtto
     bool fallback_mode; // dtto
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     TDESelectionWatcher* selection;
 #endif
     TQTimer selection_timer;
@@ -101,7 +101,7 @@ public:
     static Atom makeSelectionAtom();
 };
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 static Atom selection_atom = None;
 static Atom msg_type_atom = None;
 
@@ -121,7 +121,7 @@ void initAtoms()
 
 Atom KMenuBar::KMenuBarPrivate::makeSelectionAtom()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( selection_atom == None )
 	initAtoms();
     return selection_atom;
@@ -133,7 +133,7 @@ Atom KMenuBar::KMenuBarPrivate::makeSelectionAtom()
 KMenuBar::KMenuBar(TQWidget *parent, const char *name)
   : TQMenuBar(parent, name)
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     QXEmbed::initialize();
 #endif
     d = new KMenuBarPrivate;
@@ -176,7 +176,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
   d->topLevel = top_level;
   if ( isTopLevelMenu() )
   {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
       d->selection = new TDESelectionWatcher( KMenuBarPrivate::makeSelectionAtom(),
           DefaultScreen( tqt_xdisplay()));
       connect( d->selection, TQ_SIGNAL( newOwner( Window )),
@@ -190,7 +190,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
       d->fallback_mode = false;
       bool wasShown = !isHidden();
       reparent( parentWidget(), (WFlags)(WType_TopLevel | WStyle_Tool | WStyle_Customize | WStyle_NoBorder), TQPoint(0,0), false );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
       KWin::setType( winId(), NET::TopMenu );
       if( parentWidget())
           XSetTransientForHint( tqt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
@@ -206,7 +206,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
           show();
   } else
   {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
       delete d->selection;
       d->selection = NULL;
 #endif
@@ -259,7 +259,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
         }
         if( parentWidget() && obj == parentWidget() && ev->type() == TQEvent::Reparent )
             {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
             XSetTransientForHint( tqt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
 #else
             //TODO: WIN32?
@@ -270,7 +270,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
         { // if the parent is not toplevel, KMenuBar needs to match its visibility status
             if( ev->type() == TQEvent::Show )
                 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
                 XSetTransientForHint( tqt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
 #else
                 //TODO: WIN32?
@@ -303,7 +303,7 @@ void KMenuBar::updateFallbackSize()
 {
     if( !d->topLevel )
 	return;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( d->selection->owner() != None )
 #endif
     { // somebody is managing us, don't mess anything, undo changes
@@ -340,7 +340,7 @@ void KMenuBar::selectionTimeout()
         int margin = 0;
 	move(area.left() - margin, area.top() - margin); 
         setFixedSize(area.width() + 2* margin , heightForWidth( area.width() + 2 * margin ) );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
         int strut_height = height() - margin;
         if( strut_height < 0 )
             strut_height = 0;
@@ -426,7 +426,7 @@ TQSize KMenuBar::sizeHint() const
     return TQSize( w, h );
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 bool KMenuBar::x11Event( XEvent* ev )
 {
     if( ev->type == ClientMessage && ev->xclient.message_type == msg_type_atom
diff --git a/tdeui/tdemenubar.h b/tdeui/tdemenubar.h
index d7f8e1780..07345978d 100644
--- a/tdeui/tdemenubar.h
+++ b/tdeui/tdemenubar.h
@@ -91,7 +91,7 @@ protected:
     virtual void showEvent( TQShowEvent* );
     virtual void resizeEvent( TQResizeEvent* );
     virtual bool eventFilter(TQObject *, TQEvent *);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     virtual bool x11Event( XEvent* );
 #endif
     virtual void closeEvent( TQCloseEvent* );
diff --git a/tdeui/tdemessagebox.cpp b/tdeui/tdemessagebox.cpp
index 53c51d271..49648a74d 100644
--- a/tdeui/tdemessagebox.cpp
+++ b/tdeui/tdemessagebox.cpp
@@ -45,7 +45,7 @@
 #include <kiconloader.h>
 #include <tdeglobalsettings.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #endif
 
@@ -432,7 +432,7 @@ KMessageBox::questionYesNoListWId(WId parent_id, const TQString &text,
                        buttonYes, buttonNo);
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
@@ -483,7 +483,7 @@ KMessageBox::questionYesNoCancelWId(WId parent_id,
                        buttonYes, buttonNo);
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
@@ -565,7 +565,7 @@ KMessageBox::warningYesNoListWId(WId parent_id, const TQString &text,
                        buttonYes, buttonNo);
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
@@ -637,7 +637,7 @@ KMessageBox::warningContinueCancelListWId(WId parent_id, const TQString &text,
                        buttonContinue, KStdGuiItem::cancel() );
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
@@ -713,7 +713,7 @@ KMessageBox::warningYesNoCancelListWId(WId parent_id, const TQString &text,
                        buttonYes, buttonNo);
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
@@ -764,7 +764,7 @@ KMessageBox::errorListWId(WId parent_id,  const TQString &text, const TQStringLi
                        KStdGuiItem::ok() );
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
@@ -794,7 +794,7 @@ KMessageBox::detailedErrorWId(WId parent_id,  const TQString &text,
                        KStdGuiItem::ok() );
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
@@ -841,7 +841,7 @@ KMessageBox::sorryWId(WId parent_id, const TQString &text,
                        KStdGuiItem::ok() );
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
@@ -871,7 +871,7 @@ KMessageBox::detailedSorryWId(WId parent_id, const TQString &text,
                        KStdGuiItem::ok() );
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
@@ -917,7 +917,7 @@ KMessageBox::informationListWId(WId parent_id,const TQString &text, const TQStri
                        KStdGuiItem::ok() );
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
diff --git a/tdeui/tdeshortcutdialog.cpp b/tdeui/tdeshortcutdialog.cpp
index 5436e3b17..be0386dea 100644
--- a/tdeui/tdeshortcutdialog.cpp
+++ b/tdeui/tdeshortcutdialog.cpp
@@ -21,7 +21,7 @@
 
 #include <tqvariant.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	#define XK_XKB_KEYS
 	#define XK_MISCELLANY
 	#include <X11/Xlib.h>	// For x11Event()
@@ -37,7 +37,7 @@
 		#undef FocusOut
 		#undef FocusIn
 	#endif
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
 # include <kkeyserver.h>
 #endif
 
@@ -121,7 +121,7 @@ TDEShortcutDialog::TDEShortcutDialog( const TDEShortcut& shortcut, bool bQtShort
 	s_showMore = TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("ShowAlternativeShortcutConfig", s_showMore);
 	updateDetails();
 
-	#ifdef Q_WS_X11
+	#ifdef TQ_WS_X11
 	kapp->installX11EventFilter( this );	// Allow button to capture X Key Events.
 	#endif
 }
@@ -276,7 +276,7 @@ void TDEShortcutDialog::slotMultiKeyMode( bool bOn )
 	}
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 /* we don't use the generic Qt code on X11 because it allows us 
  to grab the keyboard so that all keypresses are seen
  */
@@ -387,7 +387,7 @@ void TDEShortcutDialog::x11KeyReleaseEvent( XEvent* pEvent )
 		updateShortcutDisplay();
 	}
 }
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
 void TDEShortcutDialog::keyPressEvent( TQKeyEvent * e )
 {
 	kdDebug() << e->text() << " " << (int)e->text()[0].latin1()<<  " " << (int)e->ascii() << endl;
diff --git a/tdeui/tdeshortcutdialog.h b/tdeui/tdeshortcutdialog.h
index f041783a8..348996878 100644
--- a/tdeui/tdeshortcutdialog.h
+++ b/tdeui/tdeshortcutdialog.h
@@ -67,13 +67,13 @@ private:
 	void keyPressed( KKey key );
 	void updateDetails();
 
-	#ifdef Q_WS_X11
+	#ifdef TQ_WS_X11
 	virtual bool x11Event( XEvent *pEvent );
 	//void x11EventKeyPress( XEvent *pEvent );
 	void x11KeyPressEvent( XEvent* pEvent );
 	void x11KeyReleaseEvent( XEvent* pEvent );
 	#endif
-	#ifdef Q_WS_WIN
+	#ifdef TQ_WS_WIN
 	virtual void keyPressEvent( TQKeyEvent * e );
 	virtual bool event(TQEvent * e);
 	#endif
diff --git a/tdeui/tdespell.cpp b/tdeui/tdespell.cpp
index 05f5c09d4..d2326412b 100644
--- a/tdeui/tdespell.cpp
+++ b/tdeui/tdespell.cpp
@@ -380,7 +380,7 @@ KSpell::setUpDialog( bool reallyuseprogressbar )
   connect( this, TQ_SIGNAL(progress(unsigned int)),
 	   ksdlg, TQ_SLOT(slotProgress(unsigned int)) );
 
-#ifdef Q_WS_X11 // FIXME(E): Implement for Qt/Embedded
+#ifdef TQ_WS_X11 // FIXME(E): Implement for Qt/Embedded
   KWin::setIcons( ksdlg->winId(), kapp->icon(), kapp->miniIcon() );
 #endif
   if ( modaldlg )
diff --git a/tdeui/twindowinfo.cpp b/tdeui/twindowinfo.cpp
index d687efaac..ec1a448c5 100644
--- a/tdeui/twindowinfo.cpp
+++ b/tdeui/twindowinfo.cpp
@@ -72,7 +72,7 @@ void KWindowInfo::message( const TQString &text, const TQPixmap &pix, int timeou
 
 void KWindowInfo::permanent( const TQString &text )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     oldMiniIcon = KWin::icon( win->winId(), 16, 16, true );
     oldIcon = KWin::icon( win->winId(), 34, 34, false );
     if ( oldIcon.isNull() )
@@ -117,7 +117,7 @@ void KWindowInfo::display( const TQString &text, const TQPixmap &pix )
 
     win->setCaption( text );
     win->setIcon( icon );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWin::setIcons( win->winId(), icon, icon );
 #endif
 }
@@ -135,7 +135,7 @@ void KWindowInfo::save()
     }
 
     oldText = win->caption();
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     oldMiniIcon = KWin::icon( win->winId(), 16, 16, true );
     oldIcon = KWin::icon( win->winId(), 34, 34, false );
     if ( oldIcon.isNull() )
@@ -162,7 +162,7 @@ void KWindowInfo::restore()
     }
 
     win->setIcon( oldIcon );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWin::setIcons( win->winId(), oldIcon, oldMiniIcon );
 #endif
     win->setCaption( oldText );
diff --git a/tdeui/twindowlistmenu.cpp b/tdeui/twindowlistmenu.cpp
index fee6c2c05..0e070f79b 100644
--- a/tdeui/twindowlistmenu.cpp
+++ b/tdeui/twindowlistmenu.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqglobal.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 #include "config.h"
 #include <tqpainter.h>
@@ -253,5 +253,5 @@ void KWindowListMenu::slotCascadeWindows()
 void KWindowListMenu::virtual_hook( int id, void* data )
 { TDEPopupMenu::virtual_hook( id, data ); }
 
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
diff --git a/tdeui/twindowlistmenu.h b/tdeui/twindowlistmenu.h
index cd9f7cd21..0e7884e39 100644
--- a/tdeui/twindowlistmenu.h
+++ b/tdeui/twindowlistmenu.h
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdepopupmenu.h>
 #include <tqmap.h>
 
-#ifdef Q_WS_X11 // not yet available for non-X11
+#ifdef TQ_WS_X11 // not yet available for non-X11
 
 class KWinModule;
 class KWindowListMenuPrivate;
@@ -65,6 +65,6 @@ private:
     KWindowListMenuPrivate *d;
 };
 
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 #endif