summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/html/canvas-example.html4
-rw-r--r--doc/html/dirview-example.html2
-rw-r--r--doc/html/emb-porting.html6
-rw-r--r--doc/html/fileiconview-example.html2
-rw-r--r--doc/html/mdi-example.html2
-rw-r--r--doc/html/ntqapplication.html2
-rw-r--r--doc/html/ntqlibrary.html2
-rw-r--r--doc/html/porting.html2
-rw-r--r--doc/html/qaccessible-h.html2
-rw-r--r--doc/html/qapplication-h.html30
-rw-r--r--doc/html/qclipboard-h.html2
-rw-r--r--doc/html/qcolor-h.html6
-rw-r--r--doc/html/qcursor-h.html12
-rw-r--r--doc/html/qdesktopwidget-h.html2
-rw-r--r--doc/html/qdirectpainter_qws-h.html2
-rw-r--r--doc/html/qdragobject-h.html2
-rw-r--r--doc/html/qeventloop-h.html6
-rw-r--r--doc/html/qfiledialog-h.html4
-rw-r--r--doc/html/qfont-h.html16
-rw-r--r--doc/html/qfontdatabase-h.html8
-rw-r--r--doc/html/qfontmetrics-h.html4
-rw-r--r--doc/html/qgl-h.html30
-rw-r--r--doc/html/qglobal-h.html27
-rw-r--r--doc/html/qimage-h.html4
-rw-r--r--doc/html/qmacstyle_mac-h.html4
-rw-r--r--doc/html/qmenubar-h.html4
-rw-r--r--doc/html/qmime-h.html6
-rw-r--r--doc/html/qmovie-h.html2
-rw-r--r--doc/html/qnamespace-h.html14
-rw-r--r--doc/html/qpaintdevice-h.html36
-rw-r--r--doc/html/qpainter-h.html24
-rw-r--r--doc/html/qpen-h.html2
-rw-r--r--doc/html/qpixmap-h.html34
-rw-r--r--doc/html/qpopupmenu-h.html2
-rw-r--r--doc/html/qprinter-h.html12
-rw-r--r--doc/html/qrect-h.html2
-rw-r--r--doc/html/qregion-h.html26
-rw-r--r--doc/html/qsessionmanager-h.html2
-rw-r--r--doc/html/qwidget-h.html52
-rw-r--r--doc/html/qwidgetplugin-h.html2
-rw-r--r--doc/html/qwindowdefs-h.html18
-rw-r--r--doc/html/splitter-example.html2
-rw-r--r--doc/html/winsystem.html8
-rw-r--r--doc/man/man3/tqapplication.3qt2
-rw-r--r--doc/man/man3/tqlibrary.3qt2
-rw-r--r--doc/porting3.doc2
-rw-r--r--doc/qws.doc6
-rw-r--r--doc/winsystem.doc8
48 files changed, 231 insertions, 220 deletions
diff --git a/doc/html/canvas-example.html b/doc/html/canvas-example.html
index 2856d6842..5ca4854b9 100644
--- a/doc/html/canvas-example.html
+++ b/doc/html/canvas-example.html
@@ -190,7 +190,7 @@ private:
{
<a name="x2935"></a><a name="x2932"></a> <a href="qcanvasrectangle.html#setSize">setSize</a>( image.<a href="ntqimage.html#width">width</a>(), image.<a href="ntqimage.html#height">height</a>() );
-#if !defined(Q_WS_QWS)
+#if !defined(TQ_WS_QWS)
<a name="x2943"></a> pixmap.<a href="ntqpixmap.html#convertFromImage">convertFromImage</a>(image, OrderedAlphaDither);
#endif
}
@@ -200,7 +200,7 @@ private:
{
// On TQt/Embedded, we can paint a TQImage as fast as a TQPixmap,
// but on other platforms, we need to use a TQPixmap.
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
<a name="x2941"></a> p.<a href="ntqpainter.html#drawImage">drawImage</a>( int(<a href="qcanvasitem.html#x">x</a>()), int(<a href="qcanvasitem.html#y">y</a>()), image, 0, 0, -1, -1, OrderedAlphaDither );
#else
p.<a href="ntqpainter.html#drawPixmap">drawPixmap</a>( int(<a href="qcanvasitem.html#x">x</a>()), int(<a href="qcanvasitem.html#y">y</a>()), pixmap );
diff --git a/doc/html/dirview-example.html b/doc/html/dirview-example.html
index 28a6db325..93386e7b0 100644
--- a/doc/html/dirview-example.html
+++ b/doc/html/dirview-example.html
@@ -600,7 +600,7 @@ TQString <a name="f481"></a>DirectoryView::fullPath(TQListViewItem* item)
else
fullpath = item-&gt;<a href="qlistviewitem.html#text">text</a>(0) + fullpath;
}
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
<a name="x1702"></a> if (fullpath.<a href="ntqstring.html#length">length</a>() &gt; 2 &amp;&amp; fullpath[1] != ':') {
<a href="ntqdir.html">TQDir</a> dir(fullpath);
<a name="x1665"></a> fullpath = dir.<a href="ntqdir.html#currentDirPath">currentDirPath</a>().left(2) + fullpath;
diff --git a/doc/html/emb-porting.html b/doc/html/emb-porting.html
index 05cc4b673..72caa313b 100644
--- a/doc/html/emb-porting.html
+++ b/doc/html/emb-porting.html
@@ -41,9 +41,9 @@ macros defined that can be used to enable/disable code for each platform
using <tt>#ifdef</tt> directives:
<p> <center><table cellpadding="4" cellspacing="2" border="0">
<tr bgcolor="#a2c511"> <th valign="top">Platform <th valign="top">Macro
-<tr bgcolor="#f0f0f0"> <td valign="top">TQt/X11 <td valign="top">Q_WS_X11
-<tr bgcolor="#d0d0d0"> <td valign="top">TQt/Windows <td valign="top">Q_WS_WIN
-<tr bgcolor="#f0f0f0"> <td valign="top">TQt/Embedded <td valign="top">Q_WS_QWS
+<tr bgcolor="#f0f0f0"> <td valign="top">TQt/X11 <td valign="top">TQ_WS_X11
+<tr bgcolor="#d0d0d0"> <td valign="top">TQt/Windows <td valign="top">TQ_WS_WIN
+<tr bgcolor="#f0f0f0"> <td valign="top">TQt/Embedded <td valign="top">TQ_WS_QWS
</table></center>
<p> TQt/Embedded also requires the following flags to be defined when compiling
applications:
diff --git a/doc/html/fileiconview-example.html b/doc/html/fileiconview-example.html
index 31f08c410..ca8f672ca 100644
--- a/doc/html/fileiconview-example.html
+++ b/doc/html/fileiconview-example.html
@@ -508,7 +508,7 @@ static void cleanup()
{
TQIconDrag::<a href="qicondrag.html#append">append</a>( item, pr, tr );
<a href="ntqstring.html">TQString</a> ourUrl = url;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
if (ourUrl.<a href="ntqstring.html#length">length</a>() &gt; 2 &amp;&amp; ourUrl[1] != ':') {
<a href="ntqdir.html">TQDir</a> dir(ourUrl);
<a name="x810"></a> ourUrl = dir.<a href="ntqdir.html#absPath">absPath</a>();
diff --git a/doc/html/mdi-example.html b/doc/html/mdi-example.html
index 40f8b098f..c9da97ae0 100644
--- a/doc/html/mdi-example.html
+++ b/doc/html/mdi-example.html
@@ -463,7 +463,7 @@ void <a name="f548"></a>MDIWindow::load( const <a href="ntqstring.html">TQString
<a name="x2079"></a> medit-&gt;<a href="ntqwidget.html#hide">hide</a>();
delete medit;
<a href="ntqmovie.html">TQMovie</a> * qm=new <a href="ntqmovie.html">TQMovie</a>(fn);
-#ifdef Q_WS_QWS // temporary speed-test hack
+#ifdef TQ_WS_QWS // temporary speed-test hack
<a name="x2039"></a> qm-&gt;setDisplayWidget(tmp);
#endif
<a name="x2082"></a> tmp-&gt;<a href="ntqwidget.html#setBackgroundMode">setBackgroundMode</a>(TQWidget::NoBackground);
diff --git a/doc/html/ntqapplication.html b/doc/html/ntqapplication.html
index 8542c952d..832037473 100644
--- a/doc/html/ntqapplication.html
+++ b/doc/html/ntqapplication.html
@@ -470,7 +470,7 @@ uses a graphical interface when available.
<pre>
int main( int argc, char **argv )
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
bool useGUI = getenv( "DISPLAY" ) != 0;
#else
bool useGUI = TRUE;
diff --git a/doc/html/ntqlibrary.html b/doc/html/ntqlibrary.html
index 6d5966ead..37ca1586f 100644
--- a/doc/html/ntqlibrary.html
+++ b/doc/html/ntqlibrary.html
@@ -207,7 +207,7 @@ compiler directive.
<p> with <tt>MY_EXPORT</tt> defined as
<p> <pre>
- #ifdef Q_WS_WIN
+ #ifdef TQ_WS_WIN
# define MY_EXPORT __declspec(dllexport)
#else
# define MY_EXPORT
diff --git a/doc/html/porting.html b/doc/html/porting.html
index af9783037..70696d120 100644
--- a/doc/html/porting.html
+++ b/doc/html/porting.html
@@ -227,7 +227,7 @@ previously disabled, please check these macro variables:
have been changed:
<p> <ul>
<li> <tt>_OS_*_</tt> becomes <tt>Q_OS_*</tt>
-<li> <tt>_WS_*_</tt> becomes <tt>Q_WS_*</tt>
+<li> <tt>_WS_*_</tt> becomes <tt>TQ_WS_*</tt>
<li> <tt>_CC_*_</tt> becomes <tt>Q_CC_*</tt>
</ul>
<p> <h2> Removed Properties
diff --git a/doc/html/qaccessible-h.html b/doc/html/qaccessible-h.html
index c23b44aff..81ea2c431 100644
--- a/doc/html/qaccessible-h.html
+++ b/doc/html/qaccessible-h.html
@@ -90,7 +90,7 @@ struct TQAccessibleInterface;
class TQ_EXPORT TQAccessible
{
private:
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
static TQMAC_PASCAL OSStatus globalEventProcessor(EventHandlerCallRef, EventRef, void *);
static TQObject *queryAccessibleObject(TQAccessibleInterface *);
#endif
diff --git a/doc/html/qapplication-h.html b/doc/html/qapplication-h.html
index 813a6693f..d2911b400 100644
--- a/doc/html/qapplication-h.html
+++ b/doc/html/qapplication-h.html
@@ -90,7 +90,7 @@ class TQSessionManager;
class TQStyle;
class TQTranslator;
class TQEventLoop;
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
class TQWSDecoration;
#endif
@@ -111,7 +111,7 @@ public:
TQApplication( int &amp;argc, char **argv, bool GUIenabled );
enum Type { Tty, GuiClient, GuiServer };
TQApplication( int &amp;argc, char **argv, Type );
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
TQApplication( Display* dpy, HANDLE visual = 0, HANDLE cmap = 0 );
TQApplication( Display *dpy, int argc, char **argv,
HANDLE visual = 0, HANDLE cmap= 0 );
@@ -266,18 +266,18 @@ public:
static bool isEffectEnabled( TQt::UIEffect );
static void setEffectEnabled( TQt::UIEffect, bool enable = TRUE );
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
virtual bool macEventFilter( EventHandlerCallRef, EventRef );
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
virtual bool winEventFilter( MSG * );
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
virtual bool x11EventFilter( XEvent * );
virtual int x11ClientMessage( TQWidget*, XEvent*, bool passive_only);
int x11ProcessEvent( XEvent* );
#endif
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
virtual bool qwsEventFilter( TQWSEvent * );
int qwsProcessEvent( TQWSEvent* );
void qwsSetCustomColors( TQRgb *colortable, int start, int numColors );
@@ -297,7 +297,7 @@ public:
#elif defined(Q_OS_MAC)
static MacintoshVersion macVersion();
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
void winFocus( TQWidget *, bool );
static void winMouseButtonUp();
#endif
@@ -310,7 +310,7 @@ public:
virtual void commitData( TQSessionManager&amp; sm );
virtual void saveState( TQSessionManager&amp; sm );
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
static void create_xim();
static void close_xim();
static bool x11_apply_settings();
@@ -333,7 +333,7 @@ public slots:
void closeAllWindows();
void aboutTQt();
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
protected:
void setArgs(int, char **);
#endif
@@ -347,12 +347,12 @@ private:
void init_precmdline();
void process_cmdline( int* argcptr, char ** argv );
bool internalNotify( TQObject *, TQEvent * );
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
static TQWidget *findChildWidget( const TQWidget *p, const TQPoint &amp;pos );
static TQWidget *findWidget( const TQObjectList&amp;, const TQPoint &amp;, bool rec );
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
bool do_mouse_down(Point *, bool *);
static TQMAC_PASCAL OSStatus globalEventProcessor(EventHandlerCallRef, EventRef, void *);
static TQMAC_PASCAL OSStatus globalAppleEventProcessor(const AppleEvent *, AppleEvent *, long);
@@ -416,7 +416,7 @@ private:
static TQString* session_key;
bool is_session_restored;
#endif
-#if defined(Q_WS_X11) &amp;&amp; !defined (TQT_NO_STYLE )
+#if defined(TQ_WS_X11) &amp;&amp; !defined (TQT_NO_STYLE )
static void x11_initialize_style();
#endif
@@ -444,10 +444,10 @@ private:
friend class TQTranslator;
friend class TQEventLoop;
friend TQ_EXPORT void tqt_ucm_initialize( TQApplication * );
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
friend bool qt_sendSpontaneousEvent( TQObject*, TQEvent* );
#endif
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
friend class TQInputContext;
#endif
private: // Disabled copy constructor and operator=
@@ -467,7 +467,7 @@ inline char **TQApplication::argv() const
return app_argv;
}
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
inline void TQApplication::setArgs(int c, char **v)
{
app_argc = c;
diff --git a/doc/html/qclipboard-h.html b/doc/html/qclipboard-h.html
index 188c110b1..933ad4f3a 100644
--- a/doc/html/qclipboard-h.html
+++ b/doc/html/qclipboard-h.html
@@ -153,7 +153,7 @@ protected:
friend class TQMimeSource;
private:
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
void loadScrap(bool convert);
void saveScrap();
#endif
diff --git a/doc/html/qcolor-h.html b/doc/html/qcolor-h.html
index d96b1e190..ba4c883f9 100644
--- a/doc/html/qcolor-h.html
+++ b/doc/html/qcolor-h.html
@@ -152,7 +152,7 @@ public:
uint alloc();
uint pixel() const;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
// ### in 4.0, make this take a default argument of -1 for default screen?
uint alloc( int screen );
uint pixel( int screen ) const;
@@ -166,7 +166,7 @@ public:
static int currentAllocContext();
static void destroyAllocContext( int );
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
static const TQRgb* palette( int* numEntries = 0 );
static int setPaletteEntries( const TQRgb* entries, int numEntries,
int base = -1 );
@@ -189,7 +189,7 @@ private:
static TQColor* globalColors();
static bool color_init;
static bool globals_init;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
static HPALETTE hpal;
#endif
static enum ColorModel { d8, d32 } colormodel;
diff --git a/doc/html/qcursor-h.html b/doc/html/qcursor-h.html
index 866dd140c..f48ae4e91 100644
--- a/doc/html/qcursor-h.html
+++ b/doc/html/qcursor-h.html
@@ -124,15 +124,15 @@ public:
const TQBitmap *mask() const;
TQPoint hotSpot() const;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
HCURSOR handle() const;
TQCursor( HCURSOR );
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
HANDLE handle() const;
TQCursor( HANDLE );
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
HANDLE handle() const;
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
HANDLE handle() const;
#endif
@@ -143,7 +143,7 @@ public:
static void initialize();
static void cleanup();
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
static int x11Screen();
#endif
private:
@@ -152,7 +152,7 @@ private:
void update() const;
TQCursorData *data;
TQCursor *find_cur(int);
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
friend void qt_mac_set_cursor(const TQCursor *c, const Point *p);
#endif
};
diff --git a/doc/html/qdesktopwidget-h.html b/doc/html/qdesktopwidget-h.html
index ab63f2878..386d3f460 100644
--- a/doc/html/qdesktopwidget-h.html
+++ b/doc/html/qdesktopwidget-h.html
@@ -129,7 +129,7 @@ private:
#endif
friend class TQApplication;
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
friend class TQWSDisplay;
#endif
};
diff --git a/doc/html/qdirectpainter_qws-h.html b/doc/html/qdirectpainter_qws-h.html
index 809773524..29b5568ed 100644
--- a/doc/html/qdirectpainter_qws-h.html
+++ b/doc/html/qdirectpainter_qws-h.html
@@ -79,7 +79,7 @@ body { background: #ffffff; color: black; }
#include "ntqpainter.h"
#endif // QT_H
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
#ifndef TQT_NO_DIRECTPAINTER
class TQ_EXPORT TQDirectPainter : public TQPainter {
public:
diff --git a/doc/html/qdragobject-h.html b/doc/html/qdragobject-h.html
index ecfdc9c9e..e2c6154aa 100644
--- a/doc/html/qdragobject-h.html
+++ b/doc/html/qdragobject-h.html
@@ -289,7 +289,7 @@ private:
TQDragObject * object;
void updateMode( ButtonState newstate );
void updateCursor();
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
void createCursors();
#endif
diff --git a/doc/html/qeventloop-h.html b/doc/html/qeventloop-h.html
index c766fecee..7ddf52e36 100644
--- a/doc/html/qeventloop-h.html
+++ b/doc/html/qeventloop-h.html
@@ -83,7 +83,7 @@ body { background: #ffffff; color: black; }
class TQEventLoopPrivate;
class TQSocketNotifier;
class TQTimer;
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
struct timeval; //stdc struct
struct TimerInfo; //internal structure (qeventloop_mac.cpp)
#endif
@@ -136,11 +136,11 @@ signals:
void aboutToBlock();
private:
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
friend TQMAC_PASCAL void qt_mac_select_timer_callbk(EventLoopTimerRef, void *);
int macHandleSelect(timeval *);
void macHandleTimer(TimerInfo *);
-#endif // Q_WS_MAC
+#endif // TQ_WS_MAC
// internal initialization/cleanup - implemented in various platform specific files
void init();
diff --git a/doc/html/qfiledialog-h.html b/doc/html/qfiledialog-h.html
index e0698e3db..ab99da2e3 100644
--- a/doc/html/qfiledialog-h.html
+++ b/doc/html/qfiledialog-h.html
@@ -333,7 +333,7 @@ private:
TQPushButton *okB;
TQPushButton *cancelB;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
static TQString winGetOpenFileName( const TQString &amp;initialSelection,
const TQString &amp;filter,
TQString* workingDirectory,
@@ -360,7 +360,7 @@ private:
const TQString&amp; caption = TQString::null);
static TQString resolveLinkFile( const TQString&amp; linkfile );
#endif
-#if defined(Q_WS_MACX) || defined(Q_WS_MAC9)
+#if defined(TQ_WS_MACX) || defined(TQ_WS_MAC9)
static TQString macGetSaveFileName( const TQString &amp;, const TQString &amp;,
TQString *, TQWidget *, const char*,
const TQString&amp;, TQString *);
diff --git a/doc/html/qfont-h.html b/doc/html/qfont-h.html
index 9bf038c80..812ff5b9d 100644
--- a/doc/html/qfont-h.html
+++ b/doc/html/qfont-h.html
@@ -201,11 +201,11 @@ public:
bool isCopyOf( const TQFont &amp; ) const;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
HFONT handle() const;
-#else // !Q_WS_WIN
+#else // !TQ_WS_WIN
TQt::HANDLE handle() const;
-#endif // Q_WS_WIN
+#endif // TQ_WS_WIN
// needed for X11
@@ -227,11 +227,11 @@ public:
#endif //TQT_NO_STRINGLIST
static void initialize();
static void cleanup();
-#ifndef Q_WS_QWS
+#ifndef TQ_WS_QWS
static void cacheStatistics();
#endif
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
void qwsRenderToDisk(bool all=TRUE);
#endif
@@ -356,9 +356,9 @@ private:
void detach();
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
void macSetFont(TQPaintDevice *);
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
void x11SetScreen( int screen = -1 );
int x11Screen() const;
#endif
@@ -373,7 +373,7 @@ private:
friend class TQTextLayout;
friend class TQTextItem;
friend class TQGLContext;
-#if defined(Q_WS_X11) &amp;&amp; !defined(TQT_NO_XFTFREETYPE)
+#if defined(TQ_WS_X11) &amp;&amp; !defined(TQT_NO_XFTFREETYPE)
friend TQt::HANDLE qt_xft_handle(const TQFont &amp;font);
#endif
#ifndef TQT_NO_DATASTREAM
diff --git a/doc/html/qfontdatabase-h.html b/doc/html/qfontdatabase-h.html
index 9fc00a254..f9ccb7d73 100644
--- a/doc/html/qfontdatabase-h.html
+++ b/doc/html/qfontdatabase-h.html
@@ -94,7 +94,7 @@ struct TQtFontFamily;
struct TQtFontFoundry;
struct TQFontDef;
class TQFontEngine;
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
class TQDiskFont;
#endif
@@ -128,7 +128,7 @@ public:
static TQString scriptName(TQFont::Script);
static TQString scriptSample(TQFont::Script);
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
static void qwsAddDiskFont( TQDiskFont *qdf );
#endif
@@ -154,10 +154,10 @@ public:
#endif // TQT_NO_COMPAT
private:
-#if defined(Q_WS_X11) || defined(Q_WS_WIN)
+#if defined(TQ_WS_X11) || defined(TQ_WS_WIN)
static TQFontEngine *findFont( TQFont::Script script, const TQFontPrivate *fp,
const TQFontDef &amp;request, int force_encoding_id = -1 );
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
static void createDatabase();
diff --git a/doc/html/qfontmetrics-h.html b/doc/html/qfontmetrics-h.html
index 9aaf526dc..f034b77f5 100644
--- a/doc/html/qfontmetrics-h.html
+++ b/doc/html/qfontmetrics-h.html
@@ -82,7 +82,7 @@ body { background: #ffffff; color: black; }
#include "ntqrect.h"
#endif // QT_H
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
class TQFontEngine;
#endif
@@ -140,7 +140,7 @@ private:
friend class TQWidget;
friend class TQPainter;
friend class TQTextFormat;
-#if defined( Q_WS_MAC )
+#if defined( TQ_WS_MAC )
friend class TQFontPrivate;
#endif
diff --git a/doc/html/qgl-h.html b/doc/html/qgl-h.html
index 5476f63f4..a3a391b73 100644
--- a/doc/html/qgl-h.html
+++ b/doc/html/qgl-h.html
@@ -97,11 +97,11 @@ TQM_EXPORT_OPENGL inline const char *qGLVersion() {
}
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
# include "qt_windows.h"
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
#if !defined( TQMAC_OPENGL_DOUBLEBUFFER )
/* This macro is different now. If the macro is not defined TQGLWidget will
* try to determine when you need double buffering. If set to 0 it will
@@ -119,12 +119,12 @@ TQM_EXPORT_OPENGL inline const char *qGLVersion() {
# include &lt;GL/glu.h&gt;
#endif
-#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
+#if defined(TQ_WS_WIN) || defined(TQ_WS_MAC)
class TQGLCmap;
#endif
class TQPixmap;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
class TQGLOverlayWidget;
#endif
@@ -238,14 +238,14 @@ protected:
virtual bool chooseContext( const TQGLContext* shareContext = 0 );
virtual void doneCurrent(); // ### 4.0: make this public - needed for multithreading stuff
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
virtual int choosePixelFormat( void* pfd, HDC pdc );
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
virtual void* tryVisual( const TQGLFormat&amp; f, int bufDepth = 1 );
virtual void* chooseVisual();
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
virtual void* chooseMacVisual(GDHandle);
#endif
@@ -261,16 +261,16 @@ protected:
void setDevice( TQPaintDevice *pDev );
protected:
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
HGLRC rc;
HDC dc;
WId win;
int pixelFormatId;
TQGLCmap* cmap;
-#elif defined(Q_WS_X11) || defined(Q_WS_MAC)
+#elif defined(TQ_WS_X11) || defined(TQ_WS_MAC)
void* vi;
void* cx;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
TQ_UINT32 gpm;
#endif
#endif
@@ -288,14 +288,14 @@ private:
bool crWin;
TQPaintDevice* paintDevice;
TQColor transpColor;
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
TQRect oldR;
#endif
};
Private* d;
friend class TQGLWidget;
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
void fixBufferRect();
#endif
@@ -395,9 +395,9 @@ private:
TQGLColormap cmap;
-#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
+#if defined(TQ_WS_WIN) || defined(TQ_WS_MAC)
TQGLContext* olcx;
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
TQGLOverlayWidget* olw;
friend class TQGLOverlayWidget;
#endif
@@ -408,7 +408,7 @@ private: // Disabled copy constructor and operator=
TQGLWidget&amp; operator=( const TQGLWidget&amp; );
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
private:
const TQGLContext *slcx;
uint pending_fix : 1,
diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html
index 0432bdf6a..bd41a2385 100644
--- a/doc/html/qglobal-h.html
+++ b/doc/html/qglobal-h.html
@@ -586,7 +586,7 @@ body { background: #ffffff; color: black; }
/*
- The window system, must be one of: (Q_WS_x)
+ The window system, must be one of: (TQ_WS_x)
MACX - Mac OS X
MAC9 - Mac OS 9
@@ -599,39 +599,50 @@ body { background: #ffffff; color: black; }
#if defined(Q_OS_MAC9)
# define Q_WS_MAC9
+# define TQ_WS_MAC9
#elif defined(Q_OS_MSDOS)
# define Q_WS_WIN16
+# define TQ_WS_WIN16
# error "TQt requires Win32 and does not work with Windows 3.x"
#elif defined(_WIN32_X11_)
# define Q_WS_X11
+# define TQ_WS_X11
#elif defined(Q_OS_WIN32)
# define Q_WS_WIN32
+# define TQ_WS_WIN32
# if defined(Q_OS_WIN64)
# define Q_WS_WIN64
+# define TQ_WS_WIN64
# endif
#elif defined(Q_OS_OS2)
# define Q_WS_PM
+# define TQ_WS_PM
# error "TQt does not work with OS/2 Presentation Manager or Workplace Shell"
#elif defined(Q_OS_UNIX)
# if defined(TQWS)
# define Q_WS_QWS
+# define TQ_WS_QWS
# define TQT_NO_QWS_IM
# elif defined(Q_OS_MACX)
# define Q_WS_MACX
+# define TQ_WS_MACX
# else
# define Q_WS_X11
+# define TQ_WS_X11
# endif
#endif
#if defined(Q_OS_MAC) &amp;&amp; !defined(TQMAC_PASCAL)
# define TQMAC_PASCAL
#endif
-#if defined(Q_WS_WIN16) || defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN16) || defined(TQ_WS_WIN32)
# define Q_WS_WIN
+# define TQ_WS_WIN
#endif
-#if (defined(Q_WS_MAC9) || defined(Q_WS_MACX)) &amp;&amp; !defined(Q_WS_QWS) &amp;&amp; !defined(Q_WS_X11)
+#if (defined(TQ_WS_MAC9) || defined(TQ_WS_MACX)) &amp;&amp; !defined(TQ_WS_QWS) &amp;&amp; !defined(TQ_WS_X11)
# define Q_WS_MAC
+# define TQ_WS_MAC
#endif
@@ -835,7 +846,7 @@ class TQDataStream;
# define TQT_NO_SQL
#endif
-#if defined(Q_WS_MAC9)
+#if defined(TQ_WS_MAC9)
//No need for menu merging
# ifndef TQMAC_QMENUBAR_NO_MERGE
# define TQMAC_QMENUBAR_NO_MERGE
@@ -848,7 +859,7 @@ class TQDataStream;
# define TQMAC_QMENUBAR_NO_EVENT
# endif
#endif
-#if defined(Q_WS_MACX) //for no nobody uses quartz, just putting in first level hooks
+#if defined(TQ_WS_MACX) //for no nobody uses quartz, just putting in first level hooks
# ifndef TQMAC_NO_QUARTZ
# define TQMAC_NO_QUARTZ
# endif
@@ -857,7 +868,7 @@ class TQDataStream;
# endif
#endif
-#if !defined(Q_WS_QWS) &amp;&amp; !defined(TQT_NO_COP)
+#if !defined(TQ_WS_QWS) &amp;&amp; !defined(TQT_NO_COP)
# define TQT_NO_COP
#endif
@@ -920,7 +931,7 @@ class TQDataStream;
// Some platform specific stuff
//
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
extern TQ_EXPORT bool qt_winunicode;
#endif
@@ -934,7 +945,7 @@ TQ_EXPORT bool tqSysInfo( int *wordSize, bool *bigEndian );
TQ_EXPORT bool tqSharedBuild();
#if defined(Q_OS_MAC)
int qMacVersion();
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
TQ_EXPORT int qWinVersion();
#if defined(UNICODE)
#define QT_WA( uni, ansi ) if ( qt_winunicode ) { uni } else { ansi }
diff --git a/doc/html/qimage-h.html b/doc/html/qimage-h.html
index b6b952c15..7a36f4890 100644
--- a/doc/html/qimage-h.html
+++ b/doc/html/qimage-h.html
@@ -119,7 +119,7 @@ public:
TQImage( uchar* data, int w, int h, int depth,
TQRgb* colortable, int numColors,
Endian bitOrder );
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
TQImage( uchar* data, int w, int h, int depth, int pbl,
TQRgb* colortable, int numColors,
Endian bitOrder );
@@ -165,7 +165,7 @@ public:
int numBytes() const;
int bytesPerLine() const;
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
TQGfx * graphicsContext();
#endif
diff --git a/doc/html/qmacstyle_mac-h.html b/doc/html/qmacstyle_mac-h.html
index 9b6bd5d98..c795d9e14 100644
--- a/doc/html/qmacstyle_mac-h.html
+++ b/doc/html/qmacstyle_mac-h.html
@@ -81,7 +81,7 @@ body { background: #ffffff; color: black; }
#include "ntqwindowsstyle.h"
#endif // QT_H
-#if defined( Q_WS_MAC ) &amp;&amp; !defined( TQT_NO_STYLE_MAC )
+#if defined( TQ_WS_MAC ) &amp;&amp; !defined( TQT_NO_STYLE_MAC )
class TQPalette;
@@ -180,7 +180,7 @@ protected:
TQMacStylePrivate *d;
};
-#endif // Q_WS_MAC
+#endif // TQ_WS_MAC
#endif // TQMACSTYLE_H
</pre>
diff --git a/doc/html/qmenubar-h.html b/doc/html/qmenubar-h.html
index c94555238..eba702aa7 100644
--- a/doc/html/qmenubar-h.html
+++ b/doc/html/qmenubar-h.html
@@ -122,7 +122,7 @@ public:
void activateItemAt( int index );
-#if defined(Q_WS_MAC) &amp;&amp; !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) &amp;&amp; !defined(TQMAC_QMENUBAR_NO_NATIVE)
static void initialize();
static void cleanup();
#endif
@@ -196,7 +196,7 @@ private:
friend class TQPopupMenu;
-#if defined(Q_WS_MAC) &amp;&amp; !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) &amp;&amp; !defined(TQMAC_QMENUBAR_NO_NATIVE)
friend class TQWidget;
friend class TQApplication;
friend void qt_mac_set_modal_state(bool, TQMenuBar *);
diff --git a/doc/html/qmime-h.html b/doc/html/qmime-h.html
index a00d9aa40..4cd89fa28 100644
--- a/doc/html/qmime-h.html
+++ b/doc/html/qmime-h.html
@@ -158,7 +158,7 @@ private:
TQMimeSourceFactoryData* d;
};
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
#ifndef QT_H
#include "ntqptrlist.h" // down here for GCC 2.7.* compatibility
@@ -194,7 +194,7 @@ public:
};
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
#ifndef QT_H
#include "ntqptrlist.h" // down here for GCC 2.7.* compatibility
@@ -229,7 +229,7 @@ public:
virtual TQValueList&lt;TQByteArray&gt; convertFromMime(TQByteArray data, const char* mime, int flav)=0;
};
-#endif // Q_WS_MAC
+#endif // TQ_WS_MAC
#endif // TQT_NO_MIME
diff --git a/doc/html/qmovie-h.html b/doc/html/qmovie-h.html
index e4634adce..925ff591d 100644
--- a/doc/html/qmovie-h.html
+++ b/doc/html/qmovie-h.html
@@ -132,7 +132,7 @@ public:
void connectUpdate(TQObject* receiver, const char *member);
void disconnectUpdate(TQObject* receiver, const char *member=0);
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
// Temporary hack
void setDisplayWidget(TQWidget * w);
#endif
diff --git a/doc/html/qnamespace-h.html b/doc/html/qnamespace-h.html
index 8205a989c..d8aece710 100644
--- a/doc/html/qnamespace-h.html
+++ b/doc/html/qnamespace-h.html
@@ -238,12 +238,12 @@ public:
WMouseNoMask = 0x00200000,
WStaticContents = 0x00400000,
WRepaintNoErase = 0x00800000, // OBSOLETE
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
WX11BypassWM = 0x01000000,
WWinOwnDC = 0x00000000,
WMacNoSheet = 0x00000000,
WMacDrawer = 0x00000000,
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
WX11BypassWM = 0x00000000,
WWinOwnDC = 0x00000000,
WMacNoSheet = 0x01000000,
@@ -258,7 +258,7 @@ public:
WShowModal = 0x04000000,
WNoMousePropagation = 0x08000000,
WSubWindow = 0x10000000,
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
WStyle_Splash = 0x20000000,
#else
WStyle_Splash = WStyle_NoBorder | WMacNoSheet | WStyle_Tool | WWinOwnDC,
@@ -930,13 +930,13 @@ public:
// "handle" type for system objects. Documented as \internal in
// qapplication.cpp
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
typedef void * HANDLE;
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
typedef void *HANDLE;
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
typedef unsigned long HANDLE;
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
typedef void * HANDLE;
#endif
};
diff --git a/doc/html/qpaintdevice-h.html b/doc/html/qpaintdevice-h.html
index 9fff8419c..6688b3016 100644
--- a/doc/html/qpaintdevice-h.html
+++ b/doc/html/qpaintdevice-h.html
@@ -82,7 +82,7 @@ body { background: #ffffff; color: black; }
#include "ntqrect.h"
#endif // QT_H
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
class TQWSDisplay;
class TQGfx;
#endif
@@ -92,7 +92,7 @@ class TQString;
class TQTextItem;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
struct TQPaintDeviceX11Data;
#endif
@@ -131,18 +131,18 @@ public:
// Windows: get device context
// X-Windows: get drawable
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
virtual HDC handle() const;
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
virtual TQt::HANDLE handle() const;
virtual TQt::HANDLE x11RenderHandle() const;
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
virtual TQt::HANDLE handle() const;
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
virtual TQt::HANDLE handle() const;
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
Display *x11Display() const;
int x11Screen() const;
int x11Depth() const;
@@ -182,7 +182,7 @@ public:
static void x11SetAppDpiY( int, int );
#endif
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
static TQWSDisplay *qwsDisplay();
virtual unsigned char * scanLine(int) const;
virtual int bytesPerLine() const;
@@ -249,9 +249,9 @@ public:
protected:
TQPaintDevice( uint devflags );
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
HDC hdc; // device context
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
TQt::HANDLE hd; // handle to drawable
TQt::HANDLE rendhd; // handle to RENDER pict
@@ -259,12 +259,12 @@ protected:
void cloneX11Data( const TQPaintDevice * );
virtual void setX11Data( const TQPaintDeviceX11Data* );
TQPaintDeviceX11Data* getX11Data( bool def=FALSE ) const;
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
#if !defined( TQMAC_NO_QUARTZ )
CGContextRef ctx;
#endif
void * hd;
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
TQt::HANDLE hd;
#endif
@@ -278,7 +278,7 @@ protected:
friend class TQPainter;
friend class TQPaintDeviceMetrics;
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
#ifndef TQMAC_NO_QUARTZ
virtual CGContextRef macCGContext(bool clipped=TRUE) const;
#endif
@@ -289,13 +289,13 @@ protected:
const TQPaintDevice *,
int, int, int, int, TQt::RasterOp, bool );
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
friend void tqt_init_internal( int *, char **, Display *, TQt::HANDLE, TQt::HANDLE );
friend void tqt_cleanup();
#endif
private:
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
static Display *x_appdisplay;
static int x_appscreen;
@@ -338,7 +338,7 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy,
int conversion_flags=0 );
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
struct TQ_EXPORT TQPaintDeviceX11Data : public TQShared {
Display* x_display;
@@ -366,7 +366,7 @@ inline bool TQPaintDevice::isExtDev() const
inline bool TQPaintDevice::paintingActive() const
{ return painters != 0; }
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
inline Display *TQPaintDevice::x11Display() const
{ return x11Data ? x11Data-&gt;x_display : x_appdisplay; }
@@ -439,7 +439,7 @@ inline void *TQPaintDevice::x11AppVisual()
inline bool TQPaintDevice::x11AppDefaultVisual()
{ return x_appdefvisual; }
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
TQ_EXPORT
diff --git a/doc/html/qpainter-h.html b/doc/html/qpainter-h.html
index 830386e08..5bc9742b8 100644
--- a/doc/html/qpainter-h.html
+++ b/doc/html/qpainter-h.html
@@ -94,12 +94,12 @@ class TQTextCodec;
class TQTextParag;
class TQPaintDevice;
class TQTextItem;
-#if defined( Q_WS_MAC )
+#if defined( TQ_WS_MAC )
class TQMacSavedPortInfo;
#endif
class TQPainterPrivate;
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
class TQScreen;
#endif
@@ -118,7 +118,7 @@ public:
bool end();
TQPaintDevice *device() const;
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
TQGfx * internalGfx();
#ifdef QT_QWS_EXPERIMENTAL_SCREENPAINTER
bool begin(TQScreen *screen);
@@ -322,9 +322,9 @@ public:
// Other functions
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
HDC handle() const;
-#elif defined(Q_WS_X11) || defined(Q_WS_MAC)
+#elif defined(TQ_WS_X11) || defined(TQ_WS_MAC)
HANDLE handle() const;
#endif
@@ -424,11 +424,11 @@ protected:
TQPoint internalCurrentPos;
uint old_pix; // ### All win platforms in 4.0
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
friend class TQFontEngineWin;
friend class TQFontEngineBox;
QT_WIN_PAINTER_MEMBERS
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
friend class TQFontEngineXLFD;
friend class TQFontEngineXft;
friend class TQFontEngineBox;
@@ -440,13 +440,13 @@ protected:
GC gc_brush; // graphics contect for brush
TQPoint curPt; // current point
uint clip_serial; // clipping serial number
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
TQt::HANDLE hd; // handle to drawable
void initPaintDevice(bool force=FALSE, TQPoint *off=NULL, TQRegion *rgn=NULL);
friend const TQRegion &amp;qt_mac_update_painter(TQPainter *, bool);
friend class TQFontEngineMac;
friend class TQMacPainter;
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
friend class TQFontEngine;
TQGfx * gfx;
friend void qwsUpdateActivePainters();
@@ -585,12 +585,12 @@ inline int *TQPainter::tabArray() const
return tabarray;
}
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
inline HDC TQPainter::handle() const
{
return hdc;
}
-#elif defined(Q_WS_X11) || defined(Q_WS_MAC)
+#elif defined(TQ_WS_X11) || defined(TQ_WS_MAC)
inline TQt::HANDLE TQPainter::handle() const
{
return hd;
@@ -747,7 +747,7 @@ inline TQRect TQPainter::boundingRect( int x, int y, int w, int h, int tf,
return boundingRect( r, tf, str, len, i );
}
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
inline TQGfx * TQPainter::internalGfx()
{
return gfx;
diff --git a/doc/html/qpen-h.html b/doc/html/qpen-h.html
index 5d538994d..72ef832c7 100644
--- a/doc/html/qpen-h.html
+++ b/doc/html/qpen-h.html
@@ -111,7 +111,7 @@ public:
private:
friend class TQPainter;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
friend class TQFontEngineWin;
#endif
diff --git a/doc/html/qpixmap-h.html b/doc/html/qpixmap-h.html
index b8f8654d9..54a4e3614 100644
--- a/doc/html/qpixmap-h.html
+++ b/doc/html/qpixmap-h.html
@@ -87,7 +87,7 @@ body { background: #ffffff; color: black; }
class TQGfx;
class TQPixmapPrivate;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
// Internal pixmap memory optimization class for Windows 9x
class TQMultiCellPixmap;
#endif
@@ -175,7 +175,7 @@ public:
bool save( TQIODevice* device, const char* format, int quality = -1 ) const;
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
HBITMAP hbm() const;
#endif
@@ -190,7 +190,7 @@ public:
bool isTQBitmap() const;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
// These functions are internal and used by Windows 9x only
bool isMultiCellPixmap() const;
HDC multiCellHandle() const;
@@ -200,13 +200,13 @@ public:
void freeCell( bool = FALSE );
#endif
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
virtual TQGfx * graphicsContext(bool clip_children=TRUE) const;
virtual unsigned char * scanLine(int) const;
virtual int bytesPerLine() const;
TQRgb * clut() const;
int numCols() const;
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
static int x11SetDefaultScreen( int screen );
void x11SetScreen( int screen );
#endif
@@ -219,7 +219,7 @@ protected:
TQPixmap( int w, int h, const uchar *data, bool isXbitmap );
int metric( int ) const;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
struct TQMCPI { // mem optim for win9x
TQMultiCellPixmap *mcp;
int offset;
@@ -232,12 +232,12 @@ protected:
uint uninit : 1;
uint bitmap : 1;
uint selfmask : 1;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
uint mcp : 1;
#endif
int ser_no;
TQBitmap *mask;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
TQPixmap *maskpm;
union {
HBITMAP hbm; // if mcp == FALSE
@@ -247,14 +247,14 @@ protected:
#ifdef Q_OS_TEMP
uchar* ppvBits; // Pointer to DIBSection bits
#endif
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
void *ximage;
void *maskgc;
TQPixmap *alphapm;
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
ColorTable *clut;
TQPixmap *alphapm;
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
int id; // ### should use TQPaintDevice::hd, since it is there
TQRgb * clut;
int numcols;
@@ -263,7 +263,7 @@ protected:
bool hasAlpha;
#endif
Optimization optim;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
HBITMAP old_hbm;
#endif
} *data;
@@ -275,7 +275,7 @@ private:
void init( int, int, int, bool, Optimization );
void deref();
TQPixmap copy( bool ignoreMask = FALSE ) const;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
void initAlphaPixmap( uchar *bytes, int length, struct tagBITMAPINFO *bmi );
void convertToAlphaPixmap( bool initAlpha=TRUE );
static void bitBltAlphaPixmap( TQPixmap *dst, int dx, int dy,
@@ -293,7 +293,7 @@ private:
const TQPixmap *src, int sx, int sy,
int sw, int sh );
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
friend void unclippedScaledBitBlt(TQPaintDevice *, int, int, int, int,
const TQPaintDevice *, int, int, int, int,
TQt::RasterOp, bool, bool);
@@ -331,7 +331,7 @@ inline bool TQPixmap::selfMask() const
return data-&gt;selfmask;
}
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
inline HBITMAP TQPixmap::hbm() const
{
return data-&gt;mcp ? 0 : data-&gt;hbm_or_mcpi.hbm;
@@ -353,7 +353,7 @@ inline bool TQPixmap::isTQBitmap() const
return data-&gt;bitmap;
}
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
inline bool TQPixmap::isMultiCellPixmap() const
{
return data-&gt;mcp;
@@ -377,7 +377,7 @@ TQ_EXPORT TQDataStream &amp;operator&gt;&gt;( TQDataStream &amp;, TQPixmap &amp;
#ifndef TQT_NO_PIXMAP_TRANSFORMATION
# define QT_XFORM_TYPE_MSBFIRST 0
# define QT_XFORM_TYPE_LSBFIRST 1
-# if defined(Q_WS_WIN)
+# if defined(TQ_WS_WIN)
# define QT_XFORM_TYPE_WINDOWSPIXMAP 2
# endif
bool qt_xForm_helper( const TQWMatrix&amp;, int, int, int, uchar*, int, int, int, uchar*, int, int, int );
diff --git a/doc/html/qpopupmenu-h.html b/doc/html/qpopupmenu-h.html
index cd6be761d..de99744f3 100644
--- a/doc/html/qpopupmenu-h.html
+++ b/doc/html/qpopupmenu-h.html
@@ -200,7 +200,7 @@ private:
TQAccel *autoaccel;
#endif
-#if defined(Q_WS_MAC) &amp;&amp; !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) &amp;&amp; !defined(TQMAC_QMENUBAR_NO_NATIVE)
bool macPopupMenu(const TQPoint &amp;, int);
uint mac_dirty_popup : 1;
#endif
diff --git a/doc/html/qprinter-h.html b/doc/html/qprinter-h.html
index 986c90f4c..7ea98f330 100644
--- a/doc/html/qprinter-h.html
+++ b/doc/html/qprinter-h.html
@@ -144,11 +144,11 @@ public:
virtual void setOrientation( Orientation );
PageSize pageSize() const;
virtual void setPageSize( PageSize );
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
void setWinPageSize( short winPageSize );
short winPageSize() const;
#endif
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
bool printSetup();
bool pageSetup();
#endif
@@ -201,17 +201,17 @@ protected:
bool cmd( int, TQPainter *, TQPDevCmdParam * );
int metric( int ) const;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
virtual void setActive();
virtual void setIdle();
#endif
private:
-#if defined(Q_WS_X11) || defined(Q_WS_QWS)
+#if defined(TQ_WS_X11) || defined(TQ_WS_QWS)
TQPaintDevice *pdrv;
int pid;
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
friend class TQPrinterPrivate;
PMPageFormat pformat;
PMPrintSettings psettings;
@@ -221,7 +221,7 @@ private:
void interpret(PMPrintSettings *);
void interpret(PMPageFormat *);
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
void readPdlg( void* );
void readPdlgA( void* );
void writeDevmode( TQt::HANDLE );
diff --git a/doc/html/qrect-h.html b/doc/html/qrect-h.html
index 3aabb89de..cf1fca5d1 100644
--- a/doc/html/qrect-h.html
+++ b/doc/html/qrect-h.html
@@ -171,7 +171,7 @@ public:
friend TQ_EXPORT bool operator!=( const TQRect &amp;, const TQRect &amp; );
private:
-#if defined(Q_WS_X11) || defined(Q_OS_TEMP)
+#if defined(TQ_WS_X11) || defined(Q_OS_TEMP)
friend void qt_setCoords( TQRect *r, int xp1, int yp1, int xp2, int yp2 );
#endif
#if defined(Q_OS_MAC)
diff --git a/doc/html/qregion-h.html b/doc/html/qregion-h.html
index a1e565420..930a1b569 100644
--- a/doc/html/qregion-h.html
+++ b/doc/html/qregion-h.html
@@ -82,7 +82,7 @@ body { background: #ffffff; color: black; }
#include "ntqrect.h"
#endif // QT_H
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
struct TQRegionPrivate;
#endif
@@ -132,13 +132,13 @@ public:
bool operator!=( const TQRegion &amp;r ) const
{ return !(operator==(r)); }
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
HRGN handle() const { return data-&gt;rgn; }
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
Region handle() const { if(!data-&gt;rgn) updateX11Region(); return data-&gt;rgn; }
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
RgnHandle handle(bool require_rgn=FALSE) const;
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
// TQGfx_QWS needs this for region drawing
void * handle() const { return data-&gt;rgn; }
#endif
@@ -151,37 +151,37 @@ private:
TQRegion( bool );
TQRegion copy() const;
void detach();
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
TQRegion winCombine( const TQRegion &amp;, int ) const;
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
void updateX11Region() const;
void *clipRectangles( int &amp;num ) const;
friend void *qt_getClipRects( const TQRegion &amp;, int &amp; );
#endif
void exec( const TQByteArray &amp;, int ver = 0 );
struct TQRegionData : public TQShared {
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
HRGN rgn;
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
Region rgn;
void *xrectangles;
TQRegionPrivate *region;
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
uint is_rect:1;
TQRect rect;
RgnHandle rgn;
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
void * rgn;
#endif
bool is_null;
} *data;
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
friend struct qt_mac_rgn_data_cache;
friend TQRegionData *qt_mac_get_rgn_data();
friend void qt_mac_free_rgn_data(TQRegionData *);
void rectifyRegion();
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
friend class TQETWidget;
#endif
diff --git a/doc/html/qsessionmanager-h.html b/doc/html/qsessionmanager-h.html
index 0722c9533..da65198ef 100644
--- a/doc/html/qsessionmanager-h.html
+++ b/doc/html/qsessionmanager-h.html
@@ -95,7 +95,7 @@ class TQ_EXPORT TQSessionManager : public TQObject
public:
TQString sessionId() const;
TQString sessionKey() const;
-#if defined(Q_WS_X11) || defined(Q_WS_MAC)
+#if defined(TQ_WS_X11) || defined(TQ_WS_MAC)
void* handle() const;
#endif
diff --git a/doc/html/qwidget-h.html b/doc/html/qwidget-h.html
index 966fd263c..e8e44a7b2 100644
--- a/doc/html/qwidget-h.html
+++ b/doc/html/qwidget-h.html
@@ -367,7 +367,7 @@ public:
bool isUpdatesEnabled() const;
-#if 0 //def Q_WS_QWS
+#if 0 //def TQ_WS_QWS
void repaintUnclipped( const TQRegion &amp;, bool erase = TRUE );
#endif
public slots:
@@ -493,10 +493,10 @@ public:
TQWidget *childAt( int x, int y, bool includeThis = FALSE ) const;
TQWidget *childAt( const TQPoint &amp;, bool includeThis = FALSE ) const;
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
virtual TQGfx * graphicsContext(bool clip_children=TRUE) const;
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
TQRegion clippedRegion(bool do_children=TRUE);
uint clippedSerial(bool do_children=TRUE);
#ifndef TQMAC_NO_QUARTZ
@@ -543,16 +543,16 @@ protected:
virtual void showEvent( TQShowEvent * );
virtual void hideEvent( TQHideEvent * );
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
virtual bool macEvent( MSG * );
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
virtual bool winEvent( MSG * );
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
virtual bool x11Event( XEvent * );
#endif
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
virtual bool qwsEvent( TQWSEvent * );
virtual unsigned char *scanLine( int ) const;
virtual int bytesPerLine() const;
@@ -596,7 +596,7 @@ protected:
virtual void setKeyCompression(bool);
virtual void setMicroFocusHint(int x, int y, int w, int h, bool text=TRUE, TQFont *f = 0);
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
void dirtyClippedRegion(bool);
bool isClippedRegionDirty();
virtual void setRegionDirty(bool);
@@ -608,12 +608,12 @@ private slots:
private:
void setFontSys( TQFont *f = 0 );
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
void createInputContext();
void destroyInputContext();
void focusInputContext();
void checkChildrenDnd();
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
uint own_id : 1, macDropEnabled : 1;
EventHandlerRef window_event;
//mac event functions
@@ -658,7 +658,7 @@ private:
void setBackgroundModeDirect( BackgroundMode );
void setBackgroundEmpty();
void updateFrameStrut() const;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
void setBackgroundX11Relative();
#endif
@@ -684,7 +684,7 @@ private:
TQLayout *lay_out;
#endif
TQWExtra *extra;
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
TQRegion req_region; // Requested region
mutable TQRegion paintable_region; // Paintable region
mutable bool paintable_region_dirty;// needs to be recalculated
@@ -957,10 +957,10 @@ inline bool TQWidget::isInputMethodEnabled() const
class TQFocusData;
class TQWSManager;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
class TQOleDropTarget;
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
class TQMacDndExtra;
#endif
@@ -975,12 +975,12 @@ struct TQ_EXPORT TQTLWExtra {
// frame strut
ulong fleft, fright, ftop, fbottom;
uint unused : 8; // not used at this point...
-#if defined( Q_WS_WIN ) || defined( Q_WS_MAC )
+#if defined( TQ_WS_WIN ) || defined( TQ_WS_MAC )
uint opacity : 8; // Stores opacity level on Windows/Mac OS X.
#endif
uint savedFlags; // Save widgetflags while showing fullscreen
short basew, baseh; // base sizes
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
WId parentWinId; // parent window Id (valid after reparenting)
uint embedded : 1; // window is embedded in another TQt application
uint spont_unmapped: 1; // window was spontaneously unmapped
@@ -990,20 +990,20 @@ struct TQ_EXPORT TQTLWExtra {
uint ussize : 1; // User defined size
void *xic; // XIM Input Context
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
WindowGroupRef group;
uint is_moved: 1;
uint resizer : 4;
#endif
-#if defined(Q_WS_QWS) &amp;&amp; !defined ( TQT_NO_QWS_MANAGER )
+#if defined(TQ_WS_QWS) &amp;&amp; !defined ( TQT_NO_QWS_MANAGER )
TQRegion decor_allocated_region; // decoration allocated region
TQWSManager *qwsManager;
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
HICON winIcon; // internal Windows icon
#endif
TQRect normalGeometry; // used by showMin/maximized/FullScreen
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
uint style, exstyle;
#endif
};
@@ -1022,13 +1022,13 @@ struct TQ_EXPORT TQWExtra {
TQCursor *curs;
#endif
TQTLWExtra *topextra; // only useful for TLWs
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
TQOleDropTarget *dropTarget; // drop target
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
WId xDndProxy; // XDND forwarding to embedded windows
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
TQRegion clip_saved, clip_sibs, clip_children;
TQMacDndExtra *macDndExtra;
TQRegion dirty_area;
@@ -1038,13 +1038,13 @@ struct TQ_EXPORT TQWExtra {
uint ctx_children_clipped:1;
#endif // TQMAC_NO_QUARTZ
uint has_dirty_area:1;
-#endif // Q_WS_MAC
+#endif // TQ_WS_MAC
uint bg_origin : 2;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
uint children_use_dnd : 1;
uint compress_events : 1;
#endif
-#if defined(Q_WS_QWS) || defined(Q_WS_MAC)
+#if defined(TQ_WS_QWS) || defined(TQ_WS_MAC)
TQRegion mask; // widget mask
#endif
char bg_mode; // background mode
diff --git a/doc/html/qwidgetplugin-h.html b/doc/html/qwidgetplugin-h.html
index 7d644e3b1..cf53b781f 100644
--- a/doc/html/qwidgetplugin-h.html
+++ b/doc/html/qwidgetplugin-h.html
@@ -84,7 +84,7 @@ body { background: #ffffff; color: black; }
#endif // QT_H
#ifndef TQT_NO_WIDGETPLUGIN
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#ifdef QT_PLUGIN
#define QT_WIDGET_PLUGIN_EXPORT __declspec(dllexport)
#else
diff --git a/doc/html/qwindowdefs-h.html b/doc/html/qwindowdefs-h.html
index 680b9a87a..1bf42631f 100644
--- a/doc/html/qwindowdefs-h.html
+++ b/doc/html/qwindowdefs-h.html
@@ -128,7 +128,7 @@ class TQWidgetListIt;
// Window system dependent definitions
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
#if QT_MACOSX_VERSION &lt; 0x1020
typedef struct OpaqueEventLoopTimerRef* EventLoopTimerRef;
typedef struct OpaqueMenuHandle *MenuRef;
@@ -137,7 +137,7 @@ typedef struct __EventLoopTimer* EventLoopTimerRef;
typedef struct OpaqueMenuRef* MenuRef;
#endif
-#ifndef Q_WS_MACX
+#ifndef TQ_WS_MACX
typedef struct CGContext *CGContextRef;
#endif
typedef struct OpaqueWindowGroupRef *WindowGroupRef;
@@ -164,18 +164,18 @@ typedef void * MSG;
typedef int WId;
typedef struct AEDesc AppleEvent;
-#endif // Q_WS_MAC
+#endif // TQ_WS_MAC
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
#include "qwindowdefs_win.h"
-#endif // Q_WS_WIN
+#endif // TQ_WS_WIN
#if defined(Q_OS_TEMP)
#include "qwinfunctions_wce.h"
#endif // Q_OS_TEMP
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
typedef struct _XDisplay Display;
typedef union _XEvent XEvent;
@@ -192,15 +192,15 @@ TQ_EXPORT GC tqt_xget_temp_gc( int scrn, bool monochrome );
TQ_EXPORT const char *tqAppClass(); // get application class
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
typedef unsigned long WId;
struct TQWSEvent;
class TQGfx;
-#endif // Q_WS_QWS
+#endif // TQ_WS_QWS
class TQApplication;
diff --git a/doc/html/splitter-example.html b/doc/html/splitter-example.html
index e7d51b5f7..efa3be1cc 100644
--- a/doc/html/splitter-example.html
+++ b/doc/html/splitter-example.html
@@ -123,7 +123,7 @@ int main( int argc, char ** argv )
t5-&gt;<a href="ntqwidget.html#setMinimumSize">setMinimumSize</a>( 80, 50 );
t5-&gt;<a href="ntqwidget.html#setBackgroundColor">setBackgroundColor</a>( TQt::yellow );
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
// TQt/Embedded XOR drawing not yet implemented.
<a name="x1300"></a> s1-&gt;<a href="ntqsplitter.html#setOpaqueResize">setOpaqueResize</a>( TRUE );
#endif
diff --git a/doc/html/winsystem.html b/doc/html/winsystem.html
index 0173293b9..73290f3cd 100644
--- a/doc/html/winsystem.html
+++ b/doc/html/winsystem.html
@@ -61,7 +61,7 @@ Notes</a>. For information on distributing TQt applications, see
<p> <a name="x11"></a>
<h2> TQt/X11
</h2>
-<a name="1"></a><p> When compiling for this platform, the macro <tt>Q_WS_X11</tt> is defined.
+<a name="1"></a><p> When compiling for this platform, the macro <tt>TQ_WS_X11</tt> is defined.
<p> <em>Not documented here. Please contact Trolltech Technical Support if you have queries.</em>
<p> <center><img src="dependencies.png" alt="TQt/X11 Dependencies"></center>
<p> Note: You must compile with <em>both</em> Xft and XRender support to get
@@ -70,7 +70,7 @@ XRender support only is not enough.
<p> <a name="win"></a>
<h2> TQt/Windows
</h2>
-<a name="2"></a><p> When compiling for this platform, the macro <tt>Q_WS_WIN</tt> is defined.
+<a name="2"></a><p> When compiling for this platform, the macro <tt>TQ_WS_WIN</tt> is defined.
<p> <em>Not documented here. Please contact Trolltech Technical Support if you have queries.</em>
<p> <h3> Microsoft Visual Studio 2005 Deployment Issues
</h3>
@@ -90,14 +90,14 @@ you can embed the manifest in the executable as a resource with the
<p> <a name="macosx"></a>
<h2> TQt/Mac OS X
</h2>
-<a name="3"></a><p> When compiling for this platform, the macro <tt>Q_WS_MACX</tt> is defined.
+<a name="3"></a><p> When compiling for this platform, the macro <tt>TQ_WS_MACX</tt> is defined.
<p> <ul>
<li> <a href="mac-differences.html">TQt/Mac issues</a>
</ul>
<p> <a name="qws"></a>
<h2> TQt/Embedded
</h2>
-<a name="4"></a><p> When compiling for this platform, the macro <tt>Q_WS_QWS</tt> is defined
+<a name="4"></a><p> When compiling for this platform, the macro <tt>TQ_WS_QWS</tt> is defined
(the window system is literally the TQt Window System).
<p> <ul>
<li> <a href="emb-install.html">Installation</a>
diff --git a/doc/man/man3/tqapplication.3qt b/doc/man/man3/tqapplication.3qt
index e2efca127..347998f9e 100644
--- a/doc/man/man3/tqapplication.3qt
+++ b/doc/man/man3/tqapplication.3qt
@@ -573,7 +573,7 @@ The following example shows how to create an application that uses a graphical i
.br
{
.br
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
.br
bool useGUI = getenv( "DISPLAY" ) != 0;
.br
diff --git a/doc/man/man3/tqlibrary.3qt b/doc/man/man3/tqlibrary.3qt
index eac7629de..c48d13ee8 100644
--- a/doc/man/man3/tqlibrary.3qt
+++ b/doc/man/man3/tqlibrary.3qt
@@ -187,7 +187,7 @@ with \fCMY_EXPORT\fR defined as
.PP
.nf
.br
- #ifdef Q_WS_WIN
+ #ifdef TQ_WS_WIN
.br
# define MY_EXPORT __declspec(dllexport)
.br
diff --git a/doc/porting3.doc b/doc/porting3.doc
index d5b105443..0d8352486 100644
--- a/doc/porting3.doc
+++ b/doc/porting3.doc
@@ -176,7 +176,7 @@ have been changed:
\list
\i \c _OS_*_ becomes \c Q_OS_*
-\i \c _WS_*_ becomes \c Q_WS_*
+\i \c _WS_*_ becomes \c TQ_WS_*
\i \c _CC_*_ becomes \c Q_CC_*
\endlist
diff --git a/doc/qws.doc b/doc/qws.doc
index 127552b6f..c397196f4 100644
--- a/doc/qws.doc
+++ b/doc/qws.doc
@@ -467,9 +467,9 @@ using \c #ifdef directives:
\table
\header \i Platform \i Macro
-\row \i Qt/X11 \i Q_WS_X11
-\row \i Qt/Windows \i Q_WS_WIN
-\row \i Qt/Embedded \i Q_WS_QWS
+\row \i Qt/X11 \i TQ_WS_X11
+\row \i Qt/Windows \i TQ_WS_WIN
+\row \i Qt/Embedded \i TQ_WS_QWS
\endtable
Qt/Embedded also requires the following flags to be defined when compiling
diff --git a/doc/winsystem.doc b/doc/winsystem.doc
index 342101a77..88f612aae 100644
--- a/doc/winsystem.doc
+++ b/doc/winsystem.doc
@@ -56,7 +56,7 @@ Notes\endlink. For information on distributing TQt applications, see
\target x11
\section1 Qt/X11
-When compiling for this platform, the macro \c{Q_WS_X11} is defined.
+When compiling for this platform, the macro \c{TQ_WS_X11} is defined.
\e{Not documented here. Please contact Trolltech Technical Support
if you have queries.}
@@ -70,7 +70,7 @@ XRender support only is not enough.
\target win
\section1 Qt/Windows
-When compiling for this platform, the macro \c{Q_WS_WIN} is defined.
+When compiling for this platform, the macro \c{TQ_WS_WIN} is defined.
\e{Not documented here. Please contact Trolltech Technical Support
if you have queries.}
@@ -97,7 +97,7 @@ If you have further problems, please see the MSDN document,
\target macosx
\section1 Qt/Mac OS X
-When compiling for this platform, the macro \c{Q_WS_MACX} is defined.
+When compiling for this platform, the macro \c{TQ_WS_MACX} is defined.
\list
\i \link mac-differences.html Qt/Mac issues\endlink
@@ -106,7 +106,7 @@ When compiling for this platform, the macro \c{Q_WS_MACX} is defined.
\target qws
\section1 Qt/Embedded
-When compiling for this platform, the macro \c{Q_WS_QWS} is defined
+When compiling for this platform, the macro \c{TQ_WS_QWS} is defined
(the window system is literally the TQt Window System).
\list