Replace Q_WS_* defines with TQ_WS_* equivalents

This is the first part of the replacement process.
Usage of Q_WS_* has been replaced with the equivalent TQ_WS_*.
Definition of Q_WS_* has been mirrored into TQ_WS_* defines, to allow
TDE code to continue building till replacement is carried over to all
other modules.
Once that is completed, the original Q_WS_* defines will
be removed.

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

1 files changed, 10 insertions, 10 deletions

diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp
index d8bb1d46e..d1678fa38 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/qpsprinter.cpp
@@ -85,7 +85,7 @@
 #include <stdlib.h>
 #endif
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include "qt_x11_p.h"
 #ifdef None
 #undef None
@@ -95,7 +95,7 @@
 #endif
 #endif
 
-#if defined( Q_WS_X11 ) || defined (Q_WS_QWS)
+#if defined( TQ_WS_X11 ) || defined (TQ_WS_QWS)
 #include "qfontdata_p.h"
 #include "qfontengine_p.h"
 #include "qtextlayout_p.h"
@@ -2433,13 +2433,13 @@ void TQPSPrinterFontTTF::drawText( TQTextStream &stream, const TQPoint &p, TQTex
     glyph_t *glyphs = engine->glyphs( &si );
     advance_t *advances = engine->advances( &si );
     qoffset_t *offsets = engine->offsets( &si );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     int type = si.fontEngine->type();
     bool glyphIndices = (type == TQFontEngine::Xft);
     // This helps us get arabic for XLFD fonts working. In that case we have a Unicode
     // cmap (== 0), and the glyphs array contains the shaped string.
     bool useGlyphAsUnicode = (type == TQFontEngine::XLFD && si.fontEngine->cmap() == 0);
-#else // Q_WS_QWS
+#else // TQ_WS_QWS
     const bool glyphIndices = FALSE;
     const bool useGlyphAsUnicode = TRUE;
 #endif
@@ -4919,7 +4919,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate
     // ### implement similar code for TQWS and WIN
     xfontname = makePSFontName( engine );
 
-#if defined( Q_WS_X11 )
+#if defined( TQ_WS_X11 )
     bool xlfd = FALSE;
     //tqDebug("engine = %p name=%s, script=%d", engine, engine ? engine->name() : "(null)", script);
 
@@ -4951,7 +4951,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate
             xlfd = TRUE;
         }
     }
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 #ifndef TQT_NO_TEXTCODEC
     // map some scripts to something more useful
     if ( script == TQFont::Han ) {
@@ -4989,7 +4989,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate
 #endif
 
     TQString searchname = xfontname;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
     // we need an extension here due to the fact that we use different
     // fonts for different scripts
     if ( xlfd && script >= TQFont::Han && script <= TQFont::Bopomofo )
@@ -5001,7 +5001,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate
     if ( p )
 	return;
 
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
     if ( xlfd ) {
 
 	for (TQStringList::Iterator it=priv->fontpath.begin(); it!=priv->fontpath.end() && fontfilename.isEmpty(); ++it) {
@@ -5158,7 +5158,7 @@ TQPSPrinterPrivate::TQPSPrinterPrivate( TQPrinter *prt, int filedes )
     scale = 1.;
     scriptUsed = -1;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     // append qsettings fontpath
     TQSettings settings;
     embedFonts = settings.readBoolEntry( "/qt/embedFonts", TRUE );
@@ -6165,7 +6165,7 @@ void TQPSPrinterPrivate::flushPage( bool last )
     if ( buffer &&
 //         ( last || pagesInBuffer++ > -1 ||
 //           ( pagesInBuffer > 4 && buffer->size() > 262144 ) ) )
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
          (last || buffer->size() > 2000000) // embedded is usually limited in memory
 #else
          (last || buffer->size() > 50000000)