diff --git a/doc/html/canvas-example.html b/doc/html/canvas-example.html
index 2856d684..5ca4854b 100644
--- a/doc/html/canvas-example.html
+++ b/doc/html/canvas-example.html
@@ -190,7 +190,7 @@ private:
{
setSize( image.width(), image.height() );
-#if !defined(Q_WS_QWS)
+#if !defined(TQ_WS_QWS)
pixmap.convertFromImage(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)
p.drawImage( int(x()), int(y()), image, 0, 0, -1, -1, OrderedAlphaDither );
#else
p.drawPixmap( int(x()), int(y()), pixmap );
diff --git a/doc/html/dirview-example.html b/doc/html/dirview-example.html
index 28a6db32..93386e7b 100644
--- a/doc/html/dirview-example.html
+++ b/doc/html/dirview-example.html
@@ -600,7 +600,7 @@ TQString DirectoryView::fullPath(TQListViewItem* item)
else
fullpath = item->text(0) + fullpath;
}
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
if (fullpath.length() > 2 && fullpath[1] != ':') {
TQDir dir(fullpath);
fullpath = dir.currentDirPath().left(2) + fullpath;
diff --git a/doc/html/emb-porting.html b/doc/html/emb-porting.html
index 05cc4b67..72caa313 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 #ifdef directives:
| Platform | Macro
- |
| TQt/X11 | Q_WS_X11
- |
| TQt/Windows | Q_WS_WIN
- |
| TQt/Embedded | Q_WS_QWS
+ |
| TQt/X11 | TQ_WS_X11
+ |
| TQt/Windows | TQ_WS_WIN
+ |
| TQt/Embedded | TQ_WS_QWS
|
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 31f08c41..ca8f672c 100644
--- a/doc/html/fileiconview-example.html
+++ b/doc/html/fileiconview-example.html
@@ -508,7 +508,7 @@ static void cleanup()
{
TQIconDrag::append( item, pr, tr );
TQString ourUrl = url;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
if (ourUrl.length() > 2 && ourUrl[1] != ':') {
TQDir dir(ourUrl);
ourUrl = dir.absPath();
diff --git a/doc/html/mdi-example.html b/doc/html/mdi-example.html
index 40f8b098..c9da97ae 100644
--- a/doc/html/mdi-example.html
+++ b/doc/html/mdi-example.html
@@ -463,7 +463,7 @@ void MDIWindow::load( const TQString
medit->hide();
delete medit;
TQMovie * qm=new TQMovie(fn);
-#ifdef Q_WS_QWS // temporary speed-test hack
+#ifdef TQ_WS_QWS // temporary speed-test hack
qm->setDisplayWidget(tmp);
#endif
tmp->setBackgroundMode(TQWidget::NoBackground);
diff --git a/doc/html/ntqapplication.html b/doc/html/ntqapplication.html
index 8542c952..83203747 100644
--- a/doc/html/ntqapplication.html
+++ b/doc/html/ntqapplication.html
@@ -470,7 +470,7 @@ uses a graphical interface when available.
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 6d5966ea..37ca1586 100644
--- a/doc/html/ntqlibrary.html
+++ b/doc/html/ntqlibrary.html
@@ -207,7 +207,7 @@ compiler directive.
with MY_EXPORT defined as
- #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 af978303..70696d12 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:
- _OS_*_ becomes Q_OS_*
-
- _WS_*_ becomes Q_WS_*
+
- _WS_*_ becomes TQ_WS_*
- _CC_*_ becomes Q_CC_*
Removed Properties
diff --git a/doc/html/qaccessible-h.html b/doc/html/qaccessible-h.html
index c23b44af..81ea2c43 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 813a6693..d2911b40 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 &argc, char **argv, bool GUIenabled );
enum Type { Tty, GuiClient, GuiServer };
TQApplication( int &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& sm );
virtual void saveState( TQSessionManager& 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 &pos );
static TQWidget *findWidget( const TQObjectList&, const TQPoint &, 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) && !defined (TQT_NO_STYLE )
+#if defined(TQ_WS_X11) && !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 188c110b..933ad4f3 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 d96b1e19..ba4c883f 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 866dd140..f48ae4e9 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 ab63f287..386d3f46 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 80977352..29b5568e 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 ecfdc9c9..e2c6154a 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 c766fece..7ddf52e3 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 e0698e3d..ab99da2e 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 &initialSelection,
const TQString &filter,
TQString* workingDirectory,
@@ -360,7 +360,7 @@ private:
const TQString& caption = TQString::null);
static TQString resolveLinkFile( const TQString& 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 &, const TQString &,
TQString *, TQWidget *, const char*,
const TQString&, TQString *);
diff --git a/doc/html/qfont-h.html b/doc/html/qfont-h.html
index 9bf038c8..812ff5b9 100644
--- a/doc/html/qfont-h.html
+++ b/doc/html/qfont-h.html
@@ -201,11 +201,11 @@ public:
bool isCopyOf( const TQFont & ) 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) && !defined(TQT_NO_XFTFREETYPE)
+#if defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
friend TQt::HANDLE qt_xft_handle(const TQFont &font);
#endif
#ifndef TQT_NO_DATASTREAM
diff --git a/doc/html/qfontdatabase-h.html b/doc/html/qfontdatabase-h.html
index 9fc00a25..f9ccb7d7 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 &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 9aaf526d..f034b77f 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 5476f63f..a3a391b7 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 <GL/glu.h>
#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& 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& operator=( const TQGLWidget& );
#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 0432bdf6..bd41a238 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) && !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)) && !defined(Q_WS_QWS) && !defined(Q_WS_X11)
+#if (defined(TQ_WS_MAC9) || defined(TQ_WS_MACX)) && !defined(TQ_WS_QWS) && !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) && !defined(TQT_NO_COP)
+#if !defined(TQ_WS_QWS) && !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 b6b952c1..7a36f489 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 9b6bd5d9..c795d9e1 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 ) && !defined( TQT_NO_STYLE_MAC )
+#if defined( TQ_WS_MAC ) && !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
diff --git a/doc/html/qmenubar-h.html b/doc/html/qmenubar-h.html
index c9455523..eba702aa 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) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !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) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !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 a00d9aa4..4cd89fa2 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<TQByteArray> 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 e4634adc..925ff591 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 8205a989..d8aece71 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 9fff8419..6688b301 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->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 830386e0..5bc9742b 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 &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 5d538994..72ef832c 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 b8f8654d..54a4e361 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->selfmask;
}
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
inline HBITMAP TQPixmap::hbm() const
{
return data->mcp ? 0 : data->hbm_or_mcpi.hbm;
@@ -353,7 +353,7 @@ inline bool TQPixmap::isTQBitmap() const
return data->bitmap;
}
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
inline bool TQPixmap::isMultiCellPixmap() const
{
return data->mcp;
@@ -377,7 +377,7 @@ TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQPixmap &
#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&, 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 cd6be761..de99744f 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) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
bool macPopupMenu(const TQPoint &, int);
uint mac_dirty_popup : 1;
#endif
diff --git a/doc/html/qprinter-h.html b/doc/html/qprinter-h.html
index 986c90f4..7ea98f33 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 3aabb89d..cf1fca5d 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 &, const TQRect & );
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 a1e56542..930a1b56 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 &r ) const
{ return !(operator==(r)); }
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
HRGN handle() const { return data->rgn; }
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
Region handle() const { if(!data->rgn) updateX11Region(); return data->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->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 &, int ) const;
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
void updateX11Region() const;
void *clipRectangles( int &num ) const;
friend void *qt_getClipRects( const TQRegion &, int & );
#endif
void exec( const TQByteArray &, 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 0722c953..da65198e 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 966fd263..e8e44a7b 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 &, 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 &, 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) && !defined ( TQT_NO_QWS_MANAGER )
+#if defined(TQ_WS_QWS) && !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 7d644e3b..cf53b781 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 680b9a87..1bf42631 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 < 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 e7d51b5f..efa3be1c 100644
--- a/doc/html/splitter-example.html
+++ b/doc/html/splitter-example.html
@@ -123,7 +123,7 @@ int main( int argc, char ** argv )
t5->setMinimumSize( 80, 50 );
t5->setBackgroundColor( TQt::yellow );
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
// TQt/Embedded XOR drawing not yet implemented.
s1->setOpaqueResize( TRUE );
#endif
diff --git a/doc/html/winsystem.html b/doc/html/winsystem.html
index 0173293b..73290f3c 100644
--- a/doc/html/winsystem.html
+++ b/doc/html/winsystem.html
@@ -61,7 +61,7 @@ Notes. For information on distributing TQt applications, see
TQt/X11
- When compiling for this platform, the macro Q_WS_X11 is defined.
+
When compiling for this platform, the macro TQ_WS_X11 is defined.
Not documented here. Please contact Trolltech Technical Support if you have queries.
Note: You must compile with both Xft and XRender support to get
@@ -70,7 +70,7 @@ XRender support only is not enough.
TQt/Windows
- When compiling for this platform, the macro Q_WS_WIN is defined.
+
When compiling for this platform, the macro TQ_WS_WIN is defined.
Not documented here. Please contact Trolltech Technical Support if you have queries.
Microsoft Visual Studio 2005 Deployment Issues
@@ -90,14 +90,14 @@ you can embed the manifest in the executable as a resource with the
TQt/Mac OS X
- When compiling for this platform, the macro Q_WS_MACX is defined.
+
When compiling for this platform, the macro TQ_WS_MACX is defined.
TQt/Embedded
- When compiling for this platform, the macro Q_WS_QWS is defined
+
When compiling for this platform, the macro TQ_WS_QWS is defined
(the window system is literally the TQt Window System).
- Installation
diff --git a/doc/man/man3/tqapplication.3qt b/doc/man/man3/tqapplication.3qt
index e2efca12..347998f9 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 eac7629d..c48d13ee 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 d5b10544..0d835248 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 127552b6..c397196f 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 342101a7..88f612aa 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
diff --git a/examples/canvas/canvas.cpp b/examples/canvas/canvas.cpp
index 24744693..3e3e4cd0 100644
--- a/examples/canvas/canvas.cpp
+++ b/examples/canvas/canvas.cpp
@@ -55,7 +55,7 @@ ImageItem::ImageItem( TQImage img, TQCanvas *canvas )
{
setSize( image.width(), image.height() );
-#if !defined(Q_WS_QWS)
+#if !defined(TQ_WS_QWS)
pixmap.convertFromImage(image, OrderedAlphaDither);
#endif
}
@@ -65,7 +65,7 @@ void ImageItem::drawShape( TQPainter &p )
{
// 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)
p.drawImage( int(x()), int(y()), image, 0, 0, -1, -1, OrderedAlphaDither );
#else
p.drawPixmap( int(x()), int(y()), pixmap );
diff --git a/examples/dirview/dirview.cpp b/examples/dirview/dirview.cpp
index 0e12751e..7bd26d3f 100644
--- a/examples/dirview/dirview.cpp
+++ b/examples/dirview/dirview.cpp
@@ -440,7 +440,7 @@ TQString DirectoryView::fullPath(TQListViewItem* item)
else
fullpath = item->text(0) + fullpath;
}
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
if (fullpath.length() > 2 && fullpath[1] != ':') {
TQDir dir(fullpath);
fullpath = dir.currentDirPath().left(2) + fullpath;
diff --git a/examples/fileiconview/qfileiconview.cpp b/examples/fileiconview/qfileiconview.cpp
index ed636bd1..e684b90b 100644
--- a/examples/fileiconview/qfileiconview.cpp
+++ b/examples/fileiconview/qfileiconview.cpp
@@ -290,7 +290,7 @@ void TQtFileIconDrag::append( const TQIconDragItem &item, const TQRect &pr,
{
TQIconDrag::append( item, pr, tr );
TQString ourUrl = url;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
if (ourUrl.length() > 2 && ourUrl[1] != ':') {
TQDir dir(ourUrl);
ourUrl = dir.absPath();
diff --git a/examples/mdi/application.cpp b/examples/mdi/application.cpp
index 138ffa53..5b91bdb5 100644
--- a/examples/mdi/application.cpp
+++ b/examples/mdi/application.cpp
@@ -337,7 +337,7 @@ void MDIWindow::load( const TQString& fn )
medit->hide();
delete medit;
TQMovie * qm=new TQMovie(fn);
-#ifdef Q_WS_QWS // temporary speed-test hack
+#ifdef TQ_WS_QWS // temporary speed-test hack
qm->setDisplayWidget(tmp);
#endif
tmp->setBackgroundMode(TQWidget::NoBackground);
diff --git a/examples/opengl/overlay_x11/gearwidget.cpp b/examples/opengl/overlay_x11/gearwidget.cpp
index e9a00c0a..9a1f4dd9 100644
--- a/examples/opengl/overlay_x11/gearwidget.cpp
+++ b/examples/opengl/overlay_x11/gearwidget.cpp
@@ -15,7 +15,7 @@
#include "gearwidget.h"
#include
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
#include
#endif
diff --git a/examples/opengl/overlay_x11/main.cpp b/examples/opengl/overlay_x11/main.cpp
index c8a5dfba..dce8ffec 100644
--- a/examples/opengl/overlay_x11/main.cpp
+++ b/examples/opengl/overlay_x11/main.cpp
@@ -14,7 +14,7 @@
#include "gearwidget.h"
#include "rubberbandwidget.h"
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
#include
#endif
@@ -22,7 +22,7 @@ TQColor findOverlayTransparentColor()
{
TQColor invalidColor;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
Display* appDisplay;
Visual* appVisual;
@@ -83,7 +83,7 @@ TQColor findOverlayTransparentColor()
tqWarning( "Default visual is not in overlay plane" );
return invalidColor;
-#else // defined(Q_WS_X11)
+#else // defined(TQ_WS_X11)
tqWarning( "Wrong window system - Only X11 has overlay support." );
return invalidColor;
#endif
diff --git a/examples/splitter/splitter.cpp b/examples/splitter/splitter.cpp
index 523ef0d6..7439800c 100644
--- a/examples/splitter/splitter.cpp
+++ b/examples/splitter/splitter.cpp
@@ -83,7 +83,7 @@ int main( int argc, char ** argv )
t5->setMinimumSize( 80, 50 );
t5->setBackgroundColor( TQt::yellow );
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
// TQt/Embedded XOR drawing not yet implemented.
s1->setOpaqueResize( TRUE );
#endif
diff --git a/extensions/nsplugin/src/qnp.cpp b/extensions/nsplugin/src/qnp.cpp
index ebd652cb..cbabe5f3 100644
--- a/extensions/nsplugin/src/qnp.cpp
+++ b/extensions/nsplugin/src/qnp.cpp
@@ -39,7 +39,7 @@
**********************************************************************/
-// Remaining Q_WS_X11 considerations:
+// Remaining TQ_WS_X11 considerations:
// - What if !piApp upon NPP_NewStream? Are we safe?
// - Yes, but users need to know of this: that no GUI can be
// done until after setWindow is called.
@@ -48,7 +48,7 @@
// untrap them and retransmit them and set a timer to retrap them
// after N seconds.
-// Remaining Q_WS_WIN considerations:
+// Remaining TQ_WS_WIN considerations:
// - we need to activateZeroTimers() at some time.
// - we need to call winEventFilter on events
// - timers:
@@ -85,7 +85,7 @@
#include
#include
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include
class TQNPXtPrivate;
@@ -123,18 +123,18 @@ extern "C" {
//
// Netscape plugin API
//
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#ifndef _WINDOWS
#define _WINDOWS
#endif
#endif
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#define XP_UNIX
#endif
// This is to allow mingw support on windows without altering the sun header files
-#if defined(Q_CC_GNU) && defined(Q_WS_WIN) && !defined(_MSC_VER)
+#if defined(Q_CC_GNU) && defined(TQ_WS_WIN) && !defined(_MSC_VER)
#define _MSC_VER 1
#include "npapi.h"
#undef _MSC_VER
@@ -142,7 +142,7 @@ extern "C" {
#include "npapi.h"
#endif
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#undef XP_UNIX
#include "npunix.c"
#endif
@@ -150,7 +150,7 @@ extern "C" {
//
// Stuff for the NPP_SetWindow function:
//
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include
#include
#include // for XtCreateWindow
@@ -160,12 +160,12 @@ extern "C" {
#include
//#include
#endif
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#include
#endif
}
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#include "npwin.cpp"
#endif
@@ -176,13 +176,13 @@ struct _NPInstance
{
uint16 fMode;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
HWND window;
#endif
NPP npp;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
Window window;
Display *display;
#endif
@@ -210,7 +210,7 @@ static _NPInstance* next_pi=0;
// To avoid looping when browser OR plugin can delete streams
static int qnps_no_call_back = 0;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
// defined in qapplication_win.cpp
TQ_EXPORT extern bool qt_win_use_simple_timers;
TQ_EXPORT void qWinProcessConfigRequests();
@@ -229,7 +229,7 @@ LRESULT CALLBACK FilterProc( int nCode, WPARAM wParam, LPARAM lParam )
#endif
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
static int (*original_x_errhandler)( Display *dpy, XErrorEvent * ) = 0;
static int dummy_x_errhandler( Display *, XErrorEvent * )
{
@@ -244,7 +244,7 @@ static int dummy_x_errhandler( Display *, XErrorEvent * )
// Instance state information about the plugin.
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
extern "C" char*
NPP_GetMIMEDescription(void)
@@ -279,7 +279,7 @@ NPP_GetValue(void * /*future*/, NPPVariable variable, void *value)
extern "C" NPError
NPP_Initialize(void)
{
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
qt_win_use_simple_timers = TRUE;
// Nothing more - we do it in DLLMain
#endif
@@ -322,12 +322,12 @@ NPP_Shutdown(void)
qNP = 0;
}
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if ( original_x_errhandler )
XSetErrorHandler( original_x_errhandler );
#endif
if ( tqApp) {
-#ifdef Q_WS_WIN32
+#ifdef TQ_WS_WIN32
if ( hhook )
UnhookWindowsHookEx( hhook );
hhook = 0;
@@ -434,10 +434,10 @@ NPP_SetWindow(NPP instance, NPWindow* window)
// take a shortcut if all that was changed is the geometry
if ( This->widget && window
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
&& This->window == (Window) window->window
#endif
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
&& This->window == (HWND) window->window
#endif
) {
@@ -454,12 +454,12 @@ NPP_SetWindow(NPP instance, NPWindow* window)
if ( !window )
return result;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
This->window = (Window) window->window;
This->display =
((NPSetWindowCallbackStruct *)window->ws_info)->display;
#endif
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
This->window = (HWND) window->window;
#endif
@@ -470,12 +470,12 @@ NPP_SetWindow(NPP instance, NPWindow* window)
if (!tqApp) {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
// We are the first TQt-based plugin to arrive
event_loop = new TQNPXt( "qnp", XtDisplayToApplicationContext(This->display) );
application = new TQApplication(This->display);
#endif
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
static int argc=0;
static char **argv={ 0 };
application = new TQApplication( argc, argv );
@@ -488,7 +488,7 @@ NPP_SetWindow(NPP instance, NPWindow* window)
#endif
}
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if ( !original_x_errhandler )
original_x_errhandler = XSetErrorHandler( dummy_x_errhandler );
#endif
@@ -501,12 +501,12 @@ NPP_SetWindow(NPP instance, NPWindow* window)
if ( !This->widget )
return result;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
This->widget->resize( This->width, This->height );
XReparentWindow( This->widget->x11Display(), This->widget->winId(), This->window, 0, 0 );
XSync( This->widget->x11Display(), False );
#endif
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
LONG oldLong = GetWindowLong(This->window, GWL_STYLE);
::SetWindowLong(This->window, GWL_STYLE, oldLong | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
::SetWindowLong( This->widget->winId(), GWL_STYLE, WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS );
@@ -647,7 +647,7 @@ typedef struct
FILE* fp;
} NPPrintCallbackStruct;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
class TQNPPrinter : public TQPrinter {
TQFile file;
@@ -681,7 +681,7 @@ NPP_Print(NPP instance, NPPrint* printInfo)
printInfo->print.fullPrint.pluginPrinted =
This->instance->printFullPage();
} else if (printInfo->mode == NP_EMBED) {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
void* platformPrint =
printInfo->print.embedPrint.platformPrint;
FILE* outfile = ((NPPrintCallbackStruct*)platformPrint)->fp;
@@ -697,7 +697,7 @@ NPP_Print(NPP instance, NPPrint* printInfo)
// Why does the browser make spurious NPP_Print calls?
}
#endif
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
NPWindow* printWindow =
&(printInfo->print.embedPrint.window);
void* platformPrint =
@@ -737,7 +737,7 @@ NPP_URLNotify(NPP instance,
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
BOOL WINAPI DllMain (HANDLE hInst,
ULONG ul_reason_for_call,
@@ -805,7 +805,7 @@ TQNPWidget::TQNPWidget() :
next_pi->widget = this;
next_pi = 0;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
clearWFlags( WStyle_NormalBorder | WStyle_Title | WStyle_MinMax | WStyle_SysMenu );
topData()->ftop = 0;
topData()->fright = 0;
@@ -823,7 +823,7 @@ TQNPWidget::TQNPWidget() :
*/
TQNPWidget::~TQNPWidget()
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
destroy( FALSE, FALSE ); // X has destroyed all windows
#endif
}
@@ -1093,7 +1093,7 @@ void TQNPInstance::postURL(const char* url, const char* window,
*/
void TQNPInstance::getURLNotify(const char* url, const char* window, void*data)
{
-#ifdef Q_WS_WIN // Only on Windows?
+#ifdef TQ_WS_WIN // Only on Windows?
NPN_GetURLNotify( pi->npp, url, window, data );
#else
Q_UNUSED( url );
@@ -1575,7 +1575,7 @@ void* TQNPlugin::getJavaEnv() const
return NPN_GetJavaEnv();
}
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include
#include
@@ -2068,4 +2068,4 @@ bool TQNPXt::processEvents( ProcessEventsFlags flags )
}
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
index 4ff19772..13ecf811 100644
--- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
+++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
@@ -90,12 +90,12 @@ TQString TQMultiInputContext::language()
}
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
bool TQMultiInputContext::x11FilterEvent( TQWidget *keywidget, XEvent *event )
{
return ( slave() ) ? slave()->x11FilterEvent( keywidget, event ) : FALSE;
}
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
bool TQMultiInputContext::filterEvent( const TQEvent *event )
@@ -189,7 +189,7 @@ void TQMultiInputContext::postIMEvent( TQObject *receiver, TQIMEvent *event )
}
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
TQWidget *TQMultiInputContext::focusWidget() const
{
return ( slave() ) ? slave()->focusWidget() : 0;
diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
index fd10891f..d64b5444 100644
--- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
+++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
@@ -63,9 +63,9 @@ public:
TQString identifierName();
TQString language();
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
bool x11FilterEvent( TQWidget *keywidget, XEvent *event );
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
bool filterEvent( const TQEvent *event );
void reset();
@@ -81,7 +81,7 @@ public:
TQPtrList *menus();
TQPopupMenu *createImSelPopup();
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
TQWidget *focusWidget() const;
TQWidget *holderWidget() const;
diff --git a/plugins/src/inputmethods/xim/qximinputcontext.h b/plugins/src/inputmethods/xim/qximinputcontext.h
index 24382735..d8b56a0b 100644
--- a/plugins/src/inputmethods/xim/qximinputcontext.h
+++ b/plugins/src/inputmethods/xim/qximinputcontext.h
@@ -62,7 +62,7 @@ class TQFont;
class TQString;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include "ntqmemarray.h"
#include "ntqwindowdefs.h"
#include
@@ -72,7 +72,7 @@ class TQXIMInputContext : public TQInputContext
{
TQ_OBJECT
public:
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
TQXIMInputContext();
~TQXIMInputContext();
@@ -121,7 +121,7 @@ private:
int lookupString(XKeyEvent *, TQCString &, KeySym *, Status *) const;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
};
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index d1124372..f31c7e08 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -648,7 +648,7 @@ MakefileGenerator::initOutPaths()
for(int x = 0; dirs[x] != TQString::null; x++) {
if ( !v[dirs[x]].isEmpty() ) {
TQString orig_path = v[dirs[x]].first();
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
// We don't want to add a separator for DLLDESTDIR on Windows
if (!(dirs[x] == "DLLDESTDIR"))
#endif
@@ -671,7 +671,7 @@ MakefileGenerator::initOutPaths()
d.cd(Option::dir_sep);
path = path.right(path.length() - 1);
}
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
bool driveExists = TRUE;
if ( !TQDir::isRelativePath( path ) ) {
if ( TQFile::exists( path.left( 3 ) ) ) {
@@ -698,7 +698,7 @@ MakefileGenerator::initOutPaths()
}
}
}
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
}
#endif
}
@@ -1885,7 +1885,7 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs)
if(!uninst.isEmpty())
uninst.append("\n\t");
uninst.append(
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
TQString("-$(DEL_FILE)")
#else
TQString("-$(DEL_FILE) -r")
@@ -1902,7 +1902,7 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs)
if(!uninst.isEmpty())
uninst.append("\n\t");
uninst.append(
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
TQString("-$(DEL_FILE)")
#else
TQString("-$(DEL_FILE) -r")
@@ -1946,7 +1946,7 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs)
const TQStringList &dirs = project->variables()[pvar];
for(TQStringList::ConstIterator pit = dirs.begin(); pit != dirs.end(); ++pit) {
TQString tmp_dst = fileFixify((*pit));
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
if(tmp_dst.right(1) != Option::dir_sep)
tmp_dst += Option::dir_sep;
#endif
diff --git a/qmake/main.cpp b/qmake/main.cpp
index 379f949b..2371db7a 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -57,13 +57,13 @@
bool tqt_resolve_symlinks = FALSE;
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
extern TQ_EXPORT int qt_ntfs_permission_lookup;
#endif
int main(int argc, char **argv)
{
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
// Workaround for TQFileInfo::isReadable() failing for certain users. See task: 54320
qt_ntfs_permission_lookup = 0;
#endif
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
TQDir sunworkshop42workaround = TQDir::current();
TQString oldpwd = sunworkshop42workaround.currentDirPath();
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
if(!(oldpwd.length() == 3 && oldpwd[0].isLetter() && oldpwd.endsWith(":/") ) )
#endif
{
diff --git a/src/canvas/qcanvas.cpp b/src/canvas/qcanvas.cpp
index 88c0c796..11f8a53a 100644
--- a/src/canvas/qcanvas.cpp
+++ b/src/canvas/qcanvas.cpp
@@ -1109,7 +1109,7 @@ void TQCanvas::drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& vr,
if ( dbuf ) {
offscr = TQPixmap(vr.size().expandedTo(TQSize(1, 1)));
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
offscr.x11SetScreen(p->device()->x11Screen());
#endif
TQPainter dbp(&offscr);
@@ -1415,7 +1415,7 @@ void TQCanvas::drawCanvasArea(const TQRect& inarea, TQPainter* p, bool double_bu
if ( double_buffer ) {
offscr = TQPixmap(area.size().expandedTo(TQSize(1, 1)));
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if (p)
offscr.x11SetScreen(p->device()->x11Screen());
#endif
diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp
index c37a7cb1..1c6df695 100644
--- a/src/codecs/qtextcodec.cpp
+++ b/src/codecs/qtextcodec.cpp
@@ -71,7 +71,7 @@
#include "ntqstring.h"
#include "../tools/qlocale_p.h"
-#if !defined(TQT_NO_CODECS) && !defined(TQT_NO_BIG_CODECS) && defined(Q_WS_X11)
+#if !defined(TQT_NO_CODECS) && !defined(TQT_NO_BIG_CODECS) && defined(TQ_WS_X11)
# include "qfontcodecs_p.h"
#endif
@@ -1666,12 +1666,12 @@ private:
void buildReverseMap();
int forwardIndex;
-#ifndef Q_WS_QWS
+#ifndef TQ_WS_QWS
TQMemArray *reverseMap;
#endif
};
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
static const TQSimpleTextCodec * reverseOwner = 0;
static TQMemArray * reverseMap = 0;
#endif
@@ -2244,7 +2244,7 @@ static const struct {
TQSimpleTextCodec::TQSimpleTextCodec( int i )
: TQTextCodec(), forwardIndex( i )
{
-#ifndef Q_WS_QWS
+#ifndef TQ_WS_QWS
reverseMap = 0;
#endif
}
@@ -2252,7 +2252,7 @@ TQSimpleTextCodec::TQSimpleTextCodec( int i )
TQSimpleTextCodec::~TQSimpleTextCodec()
{
-#ifndef Q_WS_QWS
+#ifndef TQ_WS_QWS
delete reverseMap;
#else
if ( reverseOwner == this ) {
@@ -2265,7 +2265,7 @@ TQSimpleTextCodec::~TQSimpleTextCodec()
void TQSimpleTextCodec::buildReverseMap()
{
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
if ( reverseOwner != this ) {
int m = 0;
int i = 0;
@@ -2347,7 +2347,7 @@ TQString TQSimpleTextCodec::toUnicode(const char* chars, int len) const
TQCString TQSimpleTextCodec::fromUnicode(const TQString& uc, int& len ) const
{
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
if ( this != reverseOwner )
#else
if ( !reverseMap )
@@ -2377,7 +2377,7 @@ TQCString TQSimpleTextCodec::fromUnicode(const TQString& uc, int& len ) const
void TQSimpleTextCodec::fromUnicode( const TQChar *in, unsigned short *out, int length ) const
{
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
if ( this != reverseOwner )
#else
if ( !reverseMap )
@@ -2396,7 +2396,7 @@ void TQSimpleTextCodec::fromUnicode( const TQChar *in, unsigned short *out, int
unsigned short TQSimpleTextCodec::characterFromUnicode(const TQString &str, int pos) const
{
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
if ( this != reverseOwner )
#else
if ( !reverseMap )
@@ -2411,7 +2411,7 @@ unsigned short TQSimpleTextCodec::characterFromUnicode(const TQString &str, int
bool TQSimpleTextCodec::canEncode( TQChar ch ) const
{
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
if ( this != reverseOwner )
#else
if ( !reverseMap )
@@ -2982,7 +2982,7 @@ void TQTextCodec::fromUnicodeInternal( const TQChar *in, unsigned short *out, in
((TQSimpleTextCodec *)this)->fromUnicode( in, out, length );
break;
-#if !defined(TQT_NO_BIG_CODECS) && defined(Q_WS_X11)
+#if !defined(TQT_NO_BIG_CODECS) && defined(TQ_WS_X11)
// the TQFont*Codecs are only used on X11
case 15:
diff --git a/src/dialogs/ntqfiledialog.h b/src/dialogs/ntqfiledialog.h
index a2eb6324..be3cdf4a 100644
--- a/src/dialogs/ntqfiledialog.h
+++ b/src/dialogs/ntqfiledialog.h
@@ -297,7 +297,7 @@ private:
TQPushButton *okB;
TQPushButton *cancelB;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
static TQString winGetOpenFileName( const TQString &initialSelection,
const TQString &filter,
TQString* workingDirectory,
@@ -324,7 +324,7 @@ private:
const TQString& caption = TQString::null);
static TQString resolveLinkFile( const TQString& 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 &, const TQString &,
TQString *, TQWidget *, const char*,
const TQString&, TQString *);
diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp
index addbd1bf..df042437 100644
--- a/src/dialogs/qcolordialog.cpp
+++ b/src/dialogs/qcolordialog.cpp
@@ -58,12 +58,12 @@
#include "ntqsettings.h"
#include "ntqpopupmenu.h"
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
TQRgb macGetRgba( TQRgb initial, bool *ok, TQWidget *parent, const char* name );
TQColor macGetColor( const TQColor& initial, TQWidget *parent, const char *name );
#endif
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include "private/tqttdeintegration_x11_p.h"
#endif
@@ -1485,10 +1485,10 @@ TQColorDialog::TQColorDialog(TQWidget* parent, const char* name, bool modal) :
TQColor TQColorDialog::getColor( const TQColor& initial, TQWidget *parent,
const char *name )
{
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if( TQTDEIntegration::enabled())
return TQTDEIntegration::getColor( initial, parent, name );
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
return macGetColor(initial, parent, name);
#endif
@@ -1525,14 +1525,14 @@ TQColor TQColorDialog::getColor( const TQColor& initial, TQWidget *parent,
TQRgb TQColorDialog::getRgba( TQRgb initial, bool *ok,
TQWidget *parent, const char* name )
{
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
if( TQTDEIntegration::enabled()) {
TQColor color = TQTDEIntegration::getColor( TQColor( initial ), parent, name );
if( ok )
*ok = color.isValid();
return color.rgba();
}
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
return macGetRgba(initial, ok, parent, name);
#endif
diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp
index 7df3bbea..f8067b54 100644
--- a/src/dialogs/qdialog.cpp
+++ b/src/dialogs/qdialog.cpp
@@ -671,14 +671,14 @@ bool TQDialog::event( TQEvent *e )
Geometry management.
*****************************************************************************/
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); }
#include
#undef FocusIn
// defined in qapplication_x11.cpp
extern Atom qt_net_wm_full_placement;
extern bool qt_net_supports(Atom atom);
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
/*!
Shows the dialog as a \link #modeless modeless \endlink dialog.
@@ -710,14 +710,14 @@ void TQDialog::show()
if (windowState() != state)
setWindowState(state);
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if (!parentWidget() && testWFlags(WShowModal)
&& tqApp->mainWidget() && tqApp->mainWidget()->isVisible()
&& !tqApp->mainWidget()->isMinimized()) {
// make sure the transient for hint is set properly for modal dialogs
x11SetWindowTransient( tqApp->mainWidget());
}
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
#ifdef Q_OS_TEMP
hideSpecial();
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp
index e323f111..b3dc48e7 100644
--- a/src/dialogs/qfiledialog.cpp
+++ b/src/dialogs/qfiledialog.cpp
@@ -94,15 +94,15 @@
#include "ntqvbox.h"
#include "ntqwidgetstack.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include "private/tqttdeintegration_x11_p.h"
#endif
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#ifdef TQT_THREAD_SUPPORT
# include
#endif // TQT_THREAD_SUPPORT
-#endif // Q_WS_WIN
+#endif // TQ_WS_WIN
#if !defined(Q_OS_TEMP)
#include
@@ -113,7 +113,7 @@
#include
#include
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
#include "qt_mac.h"
extern TQString qt_mac_precomposeFileName(const TQString &); // qglobal.cpp
#undef check
@@ -515,7 +515,7 @@ static void updateLastSize( TQFileDialog *that )
// resolving the W methods manually is needed, because Windows 95 doesn't include
// these methods in Shell32.lib (not even stubs!), so you'd get an unresolved symbol
// when TQt calls getEsistingDirectory(), etc.
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
typedef UINT (WINAPI *PtrExtractIconEx)(LPCTSTR,int,HICON*,HICON*,UINT);
static PtrExtractIconEx ptrExtractIconEx = 0;
@@ -613,7 +613,7 @@ static void makeVariables() {
bShowHiddenFiles = FALSE;
sortFilesBy = (int)TQDir::Name;
detailViewMode = FALSE;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( !fileIconProvider )
fileIconProvider = new TQWindowsIconProvider( tqApp );
#endif
@@ -1075,7 +1075,7 @@ public:
TQString newStr;
TQCString cName = fName.utf8();
const TQCString sChars(
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
"#%"
#else
"<>#@\"&%$:,;?={}|^~[]\'`\\*"
@@ -1122,7 +1122,7 @@ public:
#ifndef Q_NO_CURSOR
bool cursorOverride; // Remember if the cursor was overridden or not.
#endif
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
int oldPermissionLookup;
#endif
};
@@ -2444,7 +2444,7 @@ TQFileDialog::TQFileDialog( const TQString& dirName, const TQString & filter,
}
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
extern int qt_ntfs_permission_lookup;
#endif
@@ -2472,7 +2472,7 @@ void TQFileDialog::init()
d->pendingItems.setAutoDelete( FALSE );
d->mimeTypeTimer = new TQTimer( this );
d->cursorOverride = FALSE;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
d->oldPermissionLookup = qt_ntfs_permission_lookup;
#endif
connect( d->mimeTypeTimer, TQ_SIGNAL( timeout() ),
@@ -2661,7 +2661,7 @@ void TQFileDialog::init()
d->modeButtons->insert( d->previewInfo );
d->previewContents = new TQToolButton( this, "preview info view" );
-#if defined(Q_WS_WIN) && !defined(Q_OS_TEMP)
+#if defined(TQ_WS_WIN) && !defined(Q_OS_TEMP)
if ( (qt_winver & WV_NT_based) > TQt::WV_NT )
#else
if ( !qstrcmp(style().className(), "TQWindowsStyle") )
@@ -3486,15 +3486,15 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith,
if ( workingDirectory->isNull() )
*workingDirectory = ::toRootIfNotExists( TQDir::currentDirPath() );
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name,
caption, selectedFilter, false ).first();
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle )
return winGetOpenFileName( initialSelection, filter, workingDirectory,
parent, name, caption, selectedFilter );
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
if (tqt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE)
|| tqApp->style().inherits("TQMacStyle")))
return qt_mac_precomposeFileName(macGetOpenFileNames(filter,
@@ -3611,15 +3611,15 @@ TQString TQFileDialog::getSaveFileName( const TQString & startWith,
if ( workingDirectory->isNull() )
*workingDirectory = ::toRootIfNotExists( TQDir::currentDirPath() );
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::getSaveFileName( initialSelection, filter, workingDirectory,
parent, name, caption, selectedFilter );
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle )
return winGetSaveFileName( initialSelection, filter, workingDirectory,
parent, name, caption, selectedFilter );
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
if (tqt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE)
|| tqApp->style().inherits("TQMacStyle")))
return qt_mac_precomposeFileName(macGetSaveFileName(initialSelection, filter,
@@ -3666,7 +3666,7 @@ void TQFileDialog::okClicked()
{
TQString fn( nameEdit->text() );
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
TQFileInfo fi( d->url.path() + fn );
if ( fi.isSymLink() ) {
nameEdit->setText( fi.readLink() );
@@ -4128,7 +4128,7 @@ void TQFileDialog::selectDirectoryOrFile( TQListViewItem * newItem )
if ( d->url.isLocalFile() ) {
TQFileInfo fi( d->url.path() + newItem->text(0) );
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( fi.isSymLink() ) {
nameEdit->setText( fi.readLink() );
okClicked();
@@ -4505,7 +4505,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir,
if ( workingDirectory )
wd = *workingDirectory;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
TQString initialDir;
if ( !dir.isEmpty() ) {
TQUrlOperator u( dir );
@@ -4515,7 +4515,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir,
initialDir = TQString::null;
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::getExistingDirectory( initialDir, parent, name, caption );
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
TQString initialDir;
if ( !dir.isEmpty() ) {
TQUrlOperator u( dir );
@@ -4526,7 +4526,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir,
if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle && dirOnly )
return winGetExistingDirectory( initialDir, parent, name, caption );
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
TQString *initialDir = 0;
if (!dir.isEmpty()) {
TQUrlOperator u(dir);
@@ -5049,7 +5049,7 @@ TQFileIconProvider * TQFileDialog::iconProvider()
}
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
// ### FIXME: this code is duplicated in qdns.cpp
static TQString getWindowsRegString( HKEY key, const TQString &subKey )
@@ -5442,7 +5442,7 @@ bool TQFileDialog::eventFilter( TQObject * o, TQEvent * e )
} else if ( o == nameEdit && e->type() == TQEvent::KeyPress && d->mode != AnyFile ) {
if ( ( nameEdit->cursorPosition() == (int)nameEdit->text().length() || nameEdit->hasSelectedText() ) &&
isprint(((TQKeyEvent *)e)->ascii()) ) {
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
TQString nt( nameEdit->text().lower() );
#else
TQString nt( nameEdit->text() );
@@ -5450,7 +5450,7 @@ bool TQFileDialog::eventFilter( TQObject * o, TQEvent * e )
nt.truncate( nameEdit->cursorPosition() );
nt += (char)(((TQKeyEvent *)e)->ascii());
TQListViewItem * i = files->firstChild();
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
while( i && i->text( 0 ).left(nt.length()).lower() != nt )
#else
while( i && i->text( 0 ).left(nt.length()) != nt )
@@ -5679,13 +5679,13 @@ TQStringList TQFileDialog::getOpenFileNames( const TQString & filter,
}
}
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter, true );
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle )
return winGetOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter );
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
if (tqt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE)
|| tqApp->style().inherits("TQMacStyle"))) {
TQStringList sl = macGetOpenFileNames(filter, dir.isEmpty() ? 0 : workingDirectory, parent,
@@ -5786,7 +5786,7 @@ void TQFileDialog::urlStart( TQNetworkOperation *op )
if ( !op )
return;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
qt_ntfs_permission_lookup--;
#endif
if ( op->operation() == TQNetworkProtocol::OpListChildren ) {
@@ -5812,7 +5812,7 @@ void TQFileDialog::urlStart( TQNetworkOperation *op )
TQString s = d->url.toString( FALSE, FALSE );
bool found = FALSE;
for ( int i = 0; i < d->paths->count(); ++i ) {
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( d->paths->text( i ).lower() == s.lower() ) {
#else
if ( d->paths->text( i ) == s ) {
@@ -5879,7 +5879,7 @@ void TQFileDialog::urlFinished( TQNetworkOperation *op )
op == d->currListChildren ) {
if ( !d->hadDotDot && !isRoot( d->url ) ) {
bool ok = TRUE;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( d->url.path().left( 2 ) == "//" )
ok = FALSE;
#endif
@@ -5907,7 +5907,7 @@ void TQFileDialog::urlFinished( TQNetworkOperation *op )
d->progressDia = 0;
}
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if (d->oldPermissionLookup != qt_ntfs_permission_lookup)
qt_ntfs_permission_lookup++;
#endif
@@ -5968,14 +5968,14 @@ void TQFileDialog::insertEntry( const TQValueList &lst, TQNetworkOper
d->hadDotDot = TRUE;
if ( isRoot( d->url ) )
continue;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( d->url.path().left( 2 ) == "//" )
continue;
#endif
} else if ( inf.name() == "." )
continue;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
// Workaround a Windows bug, '..' is apparantly hidden in directories
// that are one level away from root
if ( !bShowHiddenFiles && inf.name() != ".." ) {
diff --git a/src/dialogs/qfontdialog.cpp b/src/dialogs/qfontdialog.cpp
index 3f713d9e..d81c0147 100644
--- a/src/dialogs/qfontdialog.cpp
+++ b/src/dialogs/qfontdialog.cpp
@@ -59,7 +59,7 @@
#include
#include
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include "private/tqttdeintegration_x11_p.h"
#endif
@@ -396,7 +396,7 @@ extern bool tqt_use_native_dialogs;
TQFont TQFontDialog::getFont( bool *ok, const TQFont *def,
TQWidget *parent, const char* name)
{
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::getFont( ok, def, parent, name );
#endif
@@ -465,7 +465,7 @@ bool TQFontDialog::eventFilter( TQObject * o , TQEvent * e )
return TQDialog::eventFilter( o, e );
}
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
// #define SHOW_FONTS_IN_FAMILIES
#endif
diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp
index a17fad13..929be411 100644
--- a/src/dialogs/qmessagebox.cpp
+++ b/src/dialogs/qmessagebox.cpp
@@ -53,7 +53,7 @@
#include "ntqaccessible.h"
#endif
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include "private/tqttdeintegration_x11_p.h"
#endif
@@ -949,7 +949,7 @@ void TQMessageBox::adjustSize()
w = screen.width();
resize( w, h );
setMinimumSize( size() );
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
setMaximumSize(size());
#endif
}
@@ -1112,7 +1112,7 @@ int TQMessageBox::information( TQWidget *parent,
const TQString& caption, const TQString& text,
int button0, int button1, int button2 )
{
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::information( parent, caption, text, button0, button1, button2 );
#endif
@@ -1163,7 +1163,7 @@ int TQMessageBox::question( TQWidget *parent,
const TQString& caption, const TQString& text,
int button0, int button1, int button2 )
{
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::question( parent, caption, text, button0, button1, button2 );
#endif
@@ -1215,7 +1215,7 @@ int TQMessageBox::warning( TQWidget *parent,
const TQString& caption, const TQString& text,
int button0, int button1, int button2 )
{
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::warning( parent, caption, text, button0, button1, button2 );
#endif
@@ -1267,7 +1267,7 @@ int TQMessageBox::critical( TQWidget *parent,
const TQString& caption, const TQString& text,
int button0, int button1, int button2 )
{
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::critical( parent, caption, text, button0, button1, button2 );
#endif
@@ -1418,7 +1418,7 @@ int TQMessageBox::information( TQWidget *parent, const TQString &caption,
int defaultButtonNumber,
int escapeButtonNumber )
{
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::information( parent, caption, text,
button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );
@@ -1465,7 +1465,7 @@ int TQMessageBox::question( TQWidget *parent, const TQString &caption,
int defaultButtonNumber,
int escapeButtonNumber )
{
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::question( parent, caption, text,
button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );
@@ -1514,7 +1514,7 @@ int TQMessageBox::warning( TQWidget *parent, const TQString &caption,
int defaultButtonNumber,
int escapeButtonNumber )
{
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::warning( parent, caption, text,
button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );
@@ -1559,7 +1559,7 @@ int TQMessageBox::critical( TQWidget *parent, const TQString &caption,
int defaultButtonNumber,
int escapeButtonNumber )
{
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::critical( parent, caption, text,
button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );
diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp
index 10586217..764c480f 100644
--- a/src/dialogs/qprintdialog.cpp
+++ b/src/dialogs/qprintdialog.cpp
@@ -1416,7 +1416,7 @@ void TQPrintDialog::printerOrFileSelected( int id )
cur += '/';
if ( cur.left( home.length() ) != home )
cur = home;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
cur += "print.ps";
#endif
d->fileName->setText( cur );
diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/qprogressdialog.cpp
index 6e18f2d7..e139ad3b 100644
--- a/src/dialogs/qprogressdialog.cpp
+++ b/src/dialogs/qprogressdialog.cpp
@@ -617,7 +617,7 @@ void TQProgressDialog::setProgress( int progress )
d->shown_once = TRUE;
}
}
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
TQApplication::flush();
#endif
}
diff --git a/src/inputmethod/qinputcontextfactory.cpp b/src/inputmethod/qinputcontextfactory.cpp
index ded0be5b..a54d2d24 100644
--- a/src/inputmethod/qinputcontextfactory.cpp
+++ b/src/inputmethod/qinputcontextfactory.cpp
@@ -101,7 +101,7 @@ TQInputContext *TQInputContextFactory::create( const TQString& key, TQWidget *wi
if ( iface ) {
ret = iface->create( inputcontext );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if ( ret )
ret->setHolderWidget( widget );
#endif
diff --git a/src/kernel/ntqaccessible.h b/src/kernel/ntqaccessible.h
index fb826d4f..61baf31b 100644
--- a/src/kernel/ntqaccessible.h
+++ b/src/kernel/ntqaccessible.h
@@ -54,7 +54,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/src/kernel/ntqapplication.h b/src/kernel/ntqapplication.h
index d657e264..4696b290 100644
--- a/src/kernel/ntqapplication.h
+++ b/src/kernel/ntqapplication.h
@@ -54,10 +54,10 @@ class TQSessionManager;
class TQStyle;
class TQTranslator;
class TQEventLoop;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
class TQIMEvent;
#endif
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
class TQWSDecoration;
#endif
@@ -80,7 +80,7 @@ public:
TQApplication( int &argc, char **argv, bool GUIenabled, bool SMenabled );
enum Type { Tty, GuiClient, GuiServer };
TQApplication( int &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 );
@@ -236,18 +236,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 );
@@ -267,7 +267,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
@@ -280,7 +280,7 @@ public:
virtual void commitData( TQSessionManager& sm );
virtual void saveState( TQSessionManager& sm );
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
#if !defined(TQT_NO_IM_EXTENSIONS)
virtual TQWidget *locateICHolderWidget( TQWidget *w );
virtual TQWidgetList *icHolderWidgets();
@@ -314,7 +314,7 @@ public slots:
void closeAllWindows();
void aboutTQt();
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
protected:
void setArgs(int, char **);
#endif
@@ -328,12 +328,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 &pos );
static TQWidget *findWidget( const TQObjectList&, const TQPoint &, 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);
@@ -348,7 +348,7 @@ private:
friend void tqt_init(int *, char **, TQApplication::Type);
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
private slots:
void postIMEvent( TQObject *receiver, TQIMEvent *event );
#endif
@@ -406,7 +406,7 @@ private:
static TQString* session_key;
bool is_session_restored;
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
#if !defined (TQT_NO_STYLE)
static void x11_initialize_style();
#endif
@@ -442,10 +442,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=
@@ -475,7 +475,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/src/kernel/ntqclipboard.h b/src/kernel/ntqclipboard.h
index 39050888..706115f3 100644
--- a/src/kernel/ntqclipboard.h
+++ b/src/kernel/ntqclipboard.h
@@ -117,7 +117,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/src/kernel/ntqcolor.h b/src/kernel/ntqcolor.h
index d45dd4f5..5c32307e 100644
--- a/src/kernel/ntqcolor.h
+++ b/src/kernel/ntqcolor.h
@@ -116,7 +116,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;
@@ -130,7 +130,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 );
@@ -153,7 +153,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/src/kernel/ntqcursor.h b/src/kernel/ntqcursor.h
index 8e7b10ce..d67ed55e 100644
--- a/src/kernel/ntqcursor.h
+++ b/src/kernel/ntqcursor.h
@@ -88,15 +88,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
@@ -107,7 +107,7 @@ public:
static void initialize();
static void cleanup();
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
static int x11Screen();
#endif
private:
@@ -116,7 +116,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/src/kernel/ntqdesktopwidget.h b/src/kernel/ntqdesktopwidget.h
index 51fbc823..de199f31 100644
--- a/src/kernel/ntqdesktopwidget.h
+++ b/src/kernel/ntqdesktopwidget.h
@@ -95,7 +95,7 @@ private:
#endif
friend class TQApplication;
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
friend class TQWSDisplay;
#endif
};
diff --git a/src/kernel/ntqdragobject.h b/src/kernel/ntqdragobject.h
index bc63a07d..069e8297 100644
--- a/src/kernel/ntqdragobject.h
+++ b/src/kernel/ntqdragobject.h
@@ -254,7 +254,7 @@ private:
TQDragObject * object;
bool updateMode( ButtonState newstate );
void updateCursor();
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
void createCursors();
#endif
diff --git a/src/kernel/ntqeventloop.h b/src/kernel/ntqeventloop.h
index 9f802dbd..deca8d06 100644
--- a/src/kernel/ntqeventloop.h
+++ b/src/kernel/ntqeventloop.h
@@ -54,7 +54,7 @@
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
@@ -109,11 +109,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/src/kernel/ntqfont.h b/src/kernel/ntqfont.h
index 6f347e41..d2a45c98 100644
--- a/src/kernel/ntqfont.h
+++ b/src/kernel/ntqfont.h
@@ -165,11 +165,11 @@ public:
bool isCopyOf( const TQFont & ) 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
@@ -191,11 +191,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
@@ -320,9 +320,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
@@ -337,7 +337,7 @@ private:
friend class TQTextLayout;
friend class TQTextItem;
friend class TQGLContext;
-#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
+#if defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
friend TQt::HANDLE qt_xft_handle(const TQFont &font);
#endif
#ifndef TQT_NO_DATASTREAM
diff --git a/src/kernel/ntqfontdatabase.h b/src/kernel/ntqfontdatabase.h
index fd19761c..0f2a913a 100644
--- a/src/kernel/ntqfontdatabase.h
+++ b/src/kernel/ntqfontdatabase.h
@@ -58,7 +58,7 @@ struct TQtFontFamily;
struct TQtFontFoundry;
struct TQFontDef;
class TQFontEngine;
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
class TQDiskFont;
#endif
@@ -92,7 +92,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
@@ -118,10 +118,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 &request, int force_encoding_id = -1 );
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
static void createDatabase();
diff --git a/src/kernel/ntqfontmetrics.h b/src/kernel/ntqfontmetrics.h
index e5a64975..a182a598 100644
--- a/src/kernel/ntqfontmetrics.h
+++ b/src/kernel/ntqfontmetrics.h
@@ -46,7 +46,7 @@
#include "ntqrect.h"
#endif // QT_H
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
class TQFontEngine;
#endif
@@ -104,7 +104,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/src/kernel/ntqgplugin.h b/src/kernel/ntqgplugin.h
index 71f3e00d..1b743145 100644
--- a/src/kernel/ntqgplugin.h
+++ b/src/kernel/ntqgplugin.h
@@ -93,7 +93,7 @@
return i->iface(); \
}
-#if defined(Q_WS_WIN) && defined(Q_CC_BOR)
+#if defined(TQ_WS_WIN) && defined(Q_CC_BOR)
# define Q_STDCALL __stdcall
#else
# define Q_STDCALL
diff --git a/src/kernel/ntqimage.h b/src/kernel/ntqimage.h
index d571aae0..32f20b23 100644
--- a/src/kernel/ntqimage.h
+++ b/src/kernel/ntqimage.h
@@ -83,7 +83,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 );
@@ -129,7 +129,7 @@ public:
int numBytes() const;
int bytesPerLine() const;
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
TQGfx * graphicsContext();
#endif
diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/ntqinputcontext.h
index 0b1dfe90..24bbca76 100644
--- a/src/kernel/ntqinputcontext.h
+++ b/src/kernel/ntqinputcontext.h
@@ -72,9 +72,9 @@ public:
virtual TQString identifierName();
virtual TQString language();
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
virtual bool x11FilterEvent( TQWidget *keywidget, XEvent *event );
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
virtual bool filterEvent( const TQEvent *event );
virtual void reset();
@@ -90,7 +90,7 @@ public:
virtual TQPtrList *menus();
void addMenusTo( TQPopupMenu *popup, TQInputContextMenu::Action action = TQInputContextMenu::InsertSeparator );
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
// these functions are not recommended for ordinary use
virtual TQWidget *focusWidget() const;
virtual TQWidget *holderWidget() const;
diff --git a/src/kernel/ntqmime.h b/src/kernel/ntqmime.h
index 719f83b0..5b541510 100644
--- a/src/kernel/ntqmime.h
+++ b/src/kernel/ntqmime.h
@@ -122,7 +122,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
@@ -158,7 +158,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
@@ -193,7 +193,7 @@ public:
virtual TQValueList convertFromMime(TQByteArray data, const char* mime, int flav)=0;
};
-#endif // Q_WS_MAC
+#endif // TQ_WS_MAC
#endif // TQT_NO_MIME
diff --git a/src/kernel/ntqmovie.h b/src/kernel/ntqmovie.h
index 939f10c9..9c8d3bf0 100644
--- a/src/kernel/ntqmovie.h
+++ b/src/kernel/ntqmovie.h
@@ -96,7 +96,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/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h
index a8261be2..21852934 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -175,7 +175,7 @@ public:
// documented in qwidget.cpp
enum NETWMFlags {
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
WX11DisableMove = 0x00000001,
WX11DisableClose = 0x00000002,
WX11DisableResize = 0x00000004,
@@ -226,12 +226,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,
@@ -246,7 +246,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,
@@ -1007,13 +1007,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/src/kernel/ntqpaintdevice.h b/src/kernel/ntqpaintdevice.h
index 114cf8b1..8ce90f06 100644
--- a/src/kernel/ntqpaintdevice.h
+++ b/src/kernel/ntqpaintdevice.h
@@ -46,7 +46,7 @@
#include "ntqrect.h"
#endif // QT_H
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
class TQWSDisplay;
class TQGfx;
#endif
@@ -56,7 +56,7 @@ class TQString;
class TQTextItem;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
struct TQPaintDeviceX11Data;
#endif
@@ -95,18 +95,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;
@@ -146,7 +146,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;
@@ -215,9 +215,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
@@ -225,12 +225,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
@@ -244,7 +244,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
@@ -255,13 +255,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;
@@ -304,7 +304,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;
@@ -332,7 +332,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->x_display : x_appdisplay; }
@@ -405,7 +405,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/src/kernel/ntqpainter.h b/src/kernel/ntqpainter.h
index 96b5c13c..77e3d183 100644
--- a/src/kernel/ntqpainter.h
+++ b/src/kernel/ntqpainter.h
@@ -58,12 +58,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
@@ -82,7 +82,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);
@@ -286,9 +286,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
@@ -388,11 +388,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;
@@ -404,13 +404,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 &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();
@@ -549,12 +549,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;
@@ -711,7 +711,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/src/kernel/ntqpen.h b/src/kernel/ntqpen.h
index 248fdc6c..226ff1cf 100644
--- a/src/kernel/ntqpen.h
+++ b/src/kernel/ntqpen.h
@@ -75,7 +75,7 @@ public:
private:
friend class TQPainter;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
friend class TQFontEngineWin;
#endif
diff --git a/src/kernel/ntqpixmap.h b/src/kernel/ntqpixmap.h
index 94d92362..e6e5e529 100644
--- a/src/kernel/ntqpixmap.h
+++ b/src/kernel/ntqpixmap.h
@@ -51,7 +51,7 @@
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
@@ -139,7 +139,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
@@ -154,7 +154,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;
@@ -164,13 +164,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
@@ -183,7 +183,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;
@@ -196,12 +196,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
@@ -211,14 +211,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;
@@ -227,7 +227,7 @@ protected:
bool hasAlpha;
#endif
Optimization optim;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
HBITMAP old_hbm;
#endif
} *data;
@@ -239,7 +239,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,
@@ -257,7 +257,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);
@@ -295,7 +295,7 @@ inline bool TQPixmap::selfMask() const
return data->selfmask;
}
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
inline HBITMAP TQPixmap::hbm() const
{
return data->mcp ? 0 : data->hbm_or_mcpi.hbm;
@@ -317,7 +317,7 @@ inline bool TQPixmap::isTQBitmap() const
return data->bitmap;
}
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
inline bool TQPixmap::isMultiCellPixmap() const
{
return data->mcp;
@@ -341,7 +341,7 @@ TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQPixmap & );
#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&, int, int, int, uchar*, int, int, int, uchar*, int, int, int );
diff --git a/src/kernel/ntqprinter.h b/src/kernel/ntqprinter.h
index 1e57c330..f7175bb5 100644
--- a/src/kernel/ntqprinter.h
+++ b/src/kernel/ntqprinter.h
@@ -108,11 +108,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
@@ -165,17 +165,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;
@@ -185,7 +185,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/src/kernel/ntqrect.h b/src/kernel/ntqrect.h
index c56d637d..aa1c1ce3 100644
--- a/src/kernel/ntqrect.h
+++ b/src/kernel/ntqrect.h
@@ -135,7 +135,7 @@ public:
friend TQ_EXPORT bool operator!=( const TQRect &, const TQRect & );
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/src/kernel/ntqregion.h b/src/kernel/ntqregion.h
index 934dd981..8de535fa 100644
--- a/src/kernel/ntqregion.h
+++ b/src/kernel/ntqregion.h
@@ -46,7 +46,7 @@
#include "ntqrect.h"
#endif // QT_H
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
struct TQRegionPrivate;
#endif
@@ -96,13 +96,13 @@ public:
bool operator!=( const TQRegion &r ) const
{ return !(operator==(r)); }
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
HRGN handle() const { return data->rgn; }
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
Region handle() const { if(!data->rgn) updateX11Region(); return data->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->rgn; }
#endif
@@ -115,37 +115,37 @@ private:
TQRegion( bool );
TQRegion copy() const;
void detach();
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
TQRegion winCombine( const TQRegion &, int ) const;
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
void updateX11Region() const;
void *clipRectangles( int &num ) const;
friend void *qt_getClipRects( const TQRegion &, int & );
#endif
void exec( const TQByteArray &, 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/src/kernel/ntqsessionmanager.h b/src/kernel/ntqsessionmanager.h
index b70559ee..f87fb3b1 100644
--- a/src/kernel/ntqsessionmanager.h
+++ b/src/kernel/ntqsessionmanager.h
@@ -59,7 +59,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/src/kernel/ntqt.h b/src/kernel/ntqt.h
index d1676377..95cb2c67 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -311,20 +311,20 @@
#endif // Private headers
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include "private/tqttdeintegration_x11_p.h"
#endif
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
#include
#include
-#endif // Q_WS_MAC
+#endif // TQ_WS_MAC
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#include
#endif
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
#include
#include "qfontmanager_qws.h"
#include
@@ -363,11 +363,11 @@
#include "qwsevent_qws.h"
#include
#include
-#endif // Q_WS_QWS
+#endif // TQ_WS_QWS
-#ifdef Q_WS_WCE
+#ifdef TQ_WS_WCE
#include
-#endif // Q_WS_WCE
+#endif // TQ_WS_WCE
#endif // QT_H
diff --git a/src/kernel/ntqwidget.h b/src/kernel/ntqwidget.h
index 3a9f32eb..aec9c6d2 100644
--- a/src/kernel/ntqwidget.h
+++ b/src/kernel/ntqwidget.h
@@ -52,7 +52,7 @@
#include "ntqsizepolicy.h"
#endif // QT_H
-#if defined(Q_WS_X11) && !defined(TQT_NO_IM)
+#if defined(TQ_WS_X11) && !defined(TQT_NO_IM)
class TQInputContext;
#endif
@@ -336,7 +336,7 @@ public:
bool isUpdatesEnabled() const;
-#if 0 //def Q_WS_QWS
+#if 0 //def TQ_WS_QWS
void repaintUnclipped( const TQRegion &, bool erase = TRUE );
#endif
public slots:
@@ -466,17 +466,17 @@ public:
TQWidget *childAt( int x, int y, bool includeThis = FALSE ) const;
TQWidget *childAt( const TQPoint &, 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
CGContextRef macCGContext(bool clipped=TRUE) const;
#endif
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
enum X11WindowType {
X11WindowTypeSelect,
X11WindowTypeCombo,
@@ -528,16 +528,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;
@@ -559,7 +559,7 @@ protected:
int metric( int ) const;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
#if !defined(TQT_NO_IM_EXTENSIONS)
virtual TQWidget *icHolderWidget();
#else
@@ -593,7 +593,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);
@@ -602,13 +602,13 @@ protected:
private slots:
void focusProxyDestroyed();
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
void destroyInputContext();
#endif
private:
void setFontSys( TQFont *f = 0 );
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
void createInputContext();
void focusInputContext();
void unfocusInputContext();
@@ -621,7 +621,7 @@ private:
void handleSyncRequest( void* ev );
#endif
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
uint own_id : 1, macDropEnabled : 1;
EventHandlerRef window_event;
//mac event functions
@@ -666,7 +666,7 @@ private:
void setBackgroundModeDirect( BackgroundMode );
void setBackgroundEmpty();
void updateFrameStrut() const;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
void setBackgroundX11Relative();
#endif
@@ -696,11 +696,11 @@ private:
#ifndef TQT_NO_LAYOUT
TQLayout *lay_out;
#endif
-#if defined(Q_WS_X11) && !defined(TQT_NO_IM) && !defined(TQT_NO_IM_EXTENSIONS)
+#if defined(TQ_WS_X11) && !defined(TQT_NO_IM) && !defined(TQT_NO_IM_EXTENSIONS)
TQInputContext *ic; // Input Context
#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
@@ -984,10 +984,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
@@ -1002,12 +1002,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
@@ -1023,20 +1023,20 @@ struct TQ_EXPORT TQTLWExtra {
uint syncRequestValue[2];
#endif
#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) && !defined ( TQT_NO_QWS_MANAGER )
+#if defined(TQ_WS_QWS) && !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
};
@@ -1055,13 +1055,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;
@@ -1071,13 +1071,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/src/kernel/ntqwindowdefs.h b/src/kernel/ntqwindowdefs.h
index 6ec8f779..4af074cc 100644
--- a/src/kernel/ntqwindowdefs.h
+++ b/src/kernel/ntqwindowdefs.h
@@ -92,7 +92,7 @@ class TQWidgetListIt;
// Window system dependent definitions
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
#if QT_MACOSX_VERSION < 0x1020
typedef struct OpaqueEventLoopTimerRef* EventLoopTimerRef;
typedef struct OpaqueMenuHandle *MenuRef;
@@ -101,7 +101,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;
@@ -128,18 +128,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;
@@ -156,15 +156,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/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp
index 76181cca..c52f090f 100644
--- a/src/kernel/qaccel.cpp
+++ b/src/kernel/qaccel.cpp
@@ -205,7 +205,7 @@ bool TQ_EXPORT tqt_tryComposeUnicode( TQWidget* w, TQKeyEvent* e){
return TQAccelManager::self()->tryComposeUnicode( w, e );
}
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
static bool qt_accel_no_shortcuts = TRUE;
#else
static bool qt_accel_no_shortcuts = FALSE;
diff --git a/src/kernel/qaccessible.cpp b/src/kernel/qaccessible.cpp
index f9954359..8306faa0 100644
--- a/src/kernel/qaccessible.cpp
+++ b/src/kernel/qaccessible.cpp
@@ -327,7 +327,7 @@ static void qAccessibleCleanup()
qAccessibleManager = 0;
}
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
TQObject *TQAccessible::queryAccessibleObject(TQAccessibleInterface *o)
{
if(qAccessibleInterface) {
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 68e81d0f..4b2684f1 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -60,7 +60,7 @@
#include "ntqmessagebox.h"
#include "ntqdir.h"
#include "ntqfileinfo.h"
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#include "qinputcontext_p.h"
#endif
#include "qfontdata_p.h"
@@ -319,7 +319,7 @@
void tqt_init( int *, char **, TQApplication::Type );
void tqt_cleanup();
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
void tqt_init( Display* dpy, TQt::HANDLE, TQt::HANDLE );
void tqt_init( int *, char **, Display* dpy, TQt::HANDLE, TQt::HANDLE );
#endif
@@ -705,7 +705,7 @@ void TQApplication::process_cmdline( int* argcptr, char ** argv )
}
if(j < argc) {
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
static char* empty = "\0";
argv[j] = empty;
#else
@@ -816,7 +816,7 @@ TQApplication::TQApplication( int &argc, char **argv )
\code
int main( int argc, char **argv )
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
bool useGUI = getenv( "DISPLAY" ) != 0;
#else
bool useGUI = TRUE;
@@ -864,7 +864,7 @@ TQApplication::TQApplication( int &argc, char **argv, bool GUIenabled )
\code
int main( int argc, char **argv )
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
bool useGUI = getenv( "DISPLAY" ) != 0;
#else
bool useGUI = TRUE;
@@ -943,7 +943,7 @@ TQApplication::Type TQApplication::type() const
return tqt_appType;
}
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
/*!
Create an application, given an already open display \a dpy. If \a
visual and \a colormap are non-zero, the application will use those as
@@ -1033,7 +1033,7 @@ TQApplication::TQApplication(Display *dpy, int argc, char **argv,
}
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
#ifdef TQT_THREAD_SUPPORT
TQThread* TQApplication::guiThread() {
@@ -1366,7 +1366,7 @@ TQStyle& TQApplication::style()
if ( !tqt_is_gui_used )
tqFatal( "No style available in non-gui applications!" );
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if(!qt_style_override)
x11_initialize_style(); // run-time search for default style
#endif
@@ -1379,22 +1379,22 @@ TQStyle& TQApplication::style()
delete qt_style_override;
qt_style_override = 0;
} else {
-# if defined(Q_WS_WIN) && defined(Q_OS_TEMP)
+# if defined(TQ_WS_WIN) && defined(Q_OS_TEMP)
style = "PocketPC";
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
if ( qWinVersion() >= TQt::WV_XP && qWinVersion() < TQt::WV_NT_based )
style = "WindowsXP";
else
style = "Windows"; // default styles for Windows
-#elif defined(Q_WS_X11) && defined(Q_OS_SOLARIS)
+#elif defined(TQ_WS_X11) && defined(Q_OS_SOLARIS)
style = "CDE"; // default style for X11 on Solaris
-#elif defined(Q_WS_X11) && defined(Q_OS_IRIX)
+#elif defined(TQ_WS_X11) && defined(Q_OS_IRIX)
style = "SGI"; // default style for X11 on IRIX
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
style = "Motif"; // default style for X11
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
style = "Macintosh"; // default style for all Mac's
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
style = "Compact"; // default style for small devices
#endif
}
@@ -1454,9 +1454,9 @@ void TQApplication::setStyle( TQStyle *style )
{
TQStyle* old = app_style;
app_style = style;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
tqt_explicit_app_style = TRUE;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
if ( startingUp() ) {
delete old;
@@ -1530,9 +1530,9 @@ void TQApplication::setStyle( TQStyle *style )
*/
TQStyle* TQApplication::setStyle( const TQString& style )
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
tqt_explicit_app_style = TRUE;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
if ( startingUp() ) {
if(qt_style_override)
@@ -1695,12 +1695,12 @@ void TQApplication::setGlobalStrut( const TQSize& strut )
app_strut = strut;
}
-#if defined( Q_WS_WIN ) || defined( Q_WS_MAC )
+#if defined( TQ_WS_WIN ) || defined( TQ_WS_MAC )
extern const char *tqAppFileName();
#endif
#ifndef TQT_NO_DIR
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
static TQString resolveSymlinks( const TQString& path, int depth = 0 )
{
bool foundLink = FALSE;
@@ -1744,7 +1744,7 @@ static TQString resolveSymlinks( const TQString& path, int depth = 0 )
return path;
}
}
-#endif // Q_WS_WIN
+#endif // TQ_WS_WIN
/*!
Returns the directory that contains the application executable.
@@ -1783,7 +1783,7 @@ TQString TQApplication::applicationDirPath()
*/
TQString TQApplication::applicationFilePath()
{
-#if defined( Q_WS_WIN )
+#if defined( TQ_WS_WIN )
TQFileInfo filePath;
QT_WA({
WCHAR module_name[256];
@@ -1796,7 +1796,7 @@ TQString TQApplication::applicationFilePath()
});
return filePath.filePath();
-#elif defined( Q_WS_MAC )
+#elif defined( TQ_WS_MAC )
return TQDir::cleanDirPath( TQFile::decodeName( tqAppFileName() ) );
#else
TQString argv0 = TQFile::decodeName( argv()[0] );
@@ -1875,7 +1875,7 @@ TQStringList TQApplication::libraryPaths()
app_libpaths = new TQStringList;
TQString installPathPlugins = TQString::fromLocal8Bit(tqInstallPathPlugins());
if ( TQFile::exists(installPathPlugins) ) {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
installPathPlugins.replace('\\', '/');
#endif
app_libpaths->append(installPathPlugins);
@@ -1884,7 +1884,7 @@ TQStringList TQApplication::libraryPaths()
TQString app_location;
if (tqApp)
app_location = tqApp->applicationFilePath();
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
else {
app_location = TQString(tqAppFileName());
app_location.replace('\\', '/');
@@ -3105,7 +3105,7 @@ bool TQApplication::hasPendingEvents()
return eventLoop()->hasPendingEvents();
}
-#if !defined(Q_WS_X11)
+#if !defined(TQ_WS_X11)
// The doc and X implementation of these functions is in qapplication_x11.cpp
@@ -3908,9 +3908,9 @@ void TQApplication::setActiveWindow( TQWidget* act )
TQFocusEvent out( TQEvent::FocusOut );
TQWidget *tmp = focus_widget;
focus_widget = 0;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
TQInputContext::accept( tmp );
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
tmp->unfocusInputContext();
#endif
TQApplication::sendSpontaneousEvent( tmp, &out );
@@ -4011,7 +4011,7 @@ TQ_EXPORT void tqt_dispatchEnterLeave( TQWidget* enter, TQWidget* leave ) {
}
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
extern TQWidget *tqt_tryModalHelperMac( TQWidget * top ); //qapplication_mac.cpp
#endif
@@ -4028,7 +4028,7 @@ TQ_EXPORT bool tqt_tryModalHelper( TQWidget *widget, TQWidget **rettop ) {
if ( tqApp->activePopupWidget() )
return TRUE;
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
top = tqt_tryModalHelperMac( top );
if ( rettop ) *rettop = top;
#endif
@@ -4808,7 +4808,7 @@ void MyApplication::commitData( TQSessionManager& sm ) {
Stubbed session management support
*****************************************************************************/
#ifndef TQT_NO_SESSIONMANAGER
-#if defined( TQT_NO_SM_SUPPORT ) || defined( Q_WS_WIN ) || defined( Q_WS_MAC ) || defined( Q_WS_QWS )
+#if defined( TQT_NO_SM_SUPPORT ) || defined( TQ_WS_WIN ) || defined( TQ_WS_MAC ) || defined( TQ_WS_QWS )
class TQSessionManagerData
{
@@ -4826,7 +4826,7 @@ TQSessionManager::TQSessionManager( TQApplication * app, TQString &id, TQString
{
qt_session_manager_self = this;
d = new TQSessionManagerData;
-#if defined(Q_WS_WIN) && !defined(Q_OS_TEMP)
+#if defined(TQ_WS_WIN) && !defined(Q_OS_TEMP)
wchar_t guidstr[40];
GUID guid;
CoCreateGuid( &guid );
@@ -4858,14 +4858,14 @@ TQString TQSessionManager::sessionKey() const
}
-#if defined(Q_WS_X11) || defined(Q_WS_MAC)
+#if defined(TQ_WS_X11) || defined(TQ_WS_MAC)
void* TQSessionManager::handle() const
{
return 0;
}
#endif
-#if !defined(Q_WS_WIN)
+#if !defined(TQ_WS_WIN)
bool TQSessionManager::allowsInteraction()
{
return TRUE;
diff --git a/src/kernel/qapplication_p.h b/src/kernel/qapplication_p.h
index abeceee6..5093dcfc 100644
--- a/src/kernel/qapplication_p.h
+++ b/src/kernel/qapplication_p.h
@@ -84,7 +84,7 @@ const int QT_TABLET_NPACKETQSIZE = 128;
extern TQt::MacintoshVersion qt_macver;
#endif
-#if defined (Q_WS_X11)
+#if defined (TQ_WS_X11)
extern int qt_ncols_option;
#endif
diff --git a/src/kernel/qclipboard.cpp b/src/kernel/qclipboard.cpp
index ae532880..0008f9a3 100644
--- a/src/kernel/qclipboard.cpp
+++ b/src/kernel/qclipboard.cpp
@@ -157,7 +157,7 @@ TQClipboard::TQClipboard( TQObject *parent, const char *name )
// nothing
}
-#ifndef Q_WS_WIN32
+#ifndef TQ_WS_WIN32
/*!
\internal
diff --git a/src/kernel/qcolor.cpp b/src/kernel/qcolor.cpp
index 1b0895ba..6278730f 100644
--- a/src/kernel/qcolor.cpp
+++ b/src/kernel/qcolor.cpp
@@ -165,7 +165,7 @@
Global colors
*****************************************************************************/
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
#define COLOR0_PIX 0x00ffffff
#define COLOR1_PIX 0
#else
@@ -255,7 +255,7 @@ void TQColor::initGlobalColors()
{
globals_init = TRUE;
- #ifdef Q_WS_X11
+ #ifdef TQ_WS_X11
// HACK: we need a way to recognize color0 and color1 uniquely, so
// that we can use color0 and color1 with fixed pixel values on
// all screens
@@ -264,7 +264,7 @@ void TQColor::initGlobalColors()
#else
stdcol[ 0].d.argb = tqRgb(255,255,255);
stdcol[ 1].d.argb = 0;
- #endif // Q_WS_X11
+ #endif // TQ_WS_X11
stdcol[ 0].setPixel( COLOR0_PIX );
stdcol[ 1].setPixel( COLOR1_PIX );
@@ -901,7 +901,7 @@ uint TQColor::pixel() const
if ( isDirty() )
return ((TQColor*)this)->alloc();
else if ( colormodel == d8 )
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
// since d.d8.pix is uchar we have to use the PALETTEINDEX
// macro to get the respective palette entry index.
return (0x01000000 | (int)(short)(d.d8.pix));
diff --git a/src/kernel/qdragobject.cpp b/src/kernel/qdragobject.cpp
index efc08616..c9d4e8f1 100644
--- a/src/kernel/qdragobject.cpp
+++ b/src/kernel/qdragobject.cpp
@@ -109,7 +109,7 @@ public:
static const char * const move_xpm[] = {
"11 20 3 1",
". c None",
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
"a c #000000",
"X c #FFFFFF", // Windows cursor is traditionally white
#else
@@ -143,7 +143,7 @@ static const char * const copy_xpm[] = {
". c None",
"a c #000000",
"X c #FFFFFF",
-#if defined(Q_WS_WIN) // Windows cursor is traditionally white
+#if defined(TQ_WS_WIN) // Windows cursor is traditionally white
"aa......................",
"aXa.....................",
"aXXa....................",
@@ -203,7 +203,7 @@ static const char * const link_xpm[] = {
". c None",
"a c #000000",
"X c #FFFFFF",
-#if defined(Q_WS_WIN) // Windows cursor is traditionally white
+#if defined(TQ_WS_WIN) // Windows cursor is traditionally white
"aa......................",
"aXa.....................",
"aXXa....................",
@@ -271,7 +271,7 @@ TQDragManager::TQDragManager()
pm_cursor[0] = TQPixmap((const char **)move_xpm);
pm_cursor[1] = TQPixmap((const char **)copy_xpm);
pm_cursor[2] = TQPixmap((const char **)link_xpm);
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
createCursors(); // Xcursors cache can hold only 8 bitmaps (4 cursors)
#endif
object = 0;
@@ -840,7 +840,7 @@ TQByteArray TQTextDrag::encodedData(const char* mime) const
if ( !codec )
return r;
TQString text( d->txt );
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
int index = text.find( TQString::fromLatin1("\r\n"), 0 );
while ( index != -1 ) {
text.replace( index, 2, TQChar('\n') );
@@ -850,7 +850,7 @@ TQByteArray TQTextDrag::encodedData(const char* mime) const
r = codec->fromUnicode(text);
if (!codec || codec->mibEnum() != 1000) {
// Don't include NUL in size (TQCString::resize() adds NUL)
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
// This is needed to ensure the \0 isn't lost on Windows 95
if ( qWinVersion() & TQt::WV_DOS_based )
((TQByteArray&)r).resize(r.length()+1);
@@ -1508,7 +1508,7 @@ TQCString TQUriDrag::localFileToUri(const TQString& filename)
if (TQDir::isRelativePath(r))
return TQCString();
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
bool hasHost = FALSE;
@@ -1529,7 +1529,7 @@ TQCString TQUriDrag::localFileToUri(const TQString& filename)
r.insert(0,'/');
#endif
-#if defined ( Q_WS_X11 ) && 0
+#if defined ( TQ_WS_X11 ) && 0
// URL without the hostname is considered to be errorneous by XDnD.
// See: http://www.newplanetsoftware.com/xdnd/dragging_files.html
// This feature is not active because this would break dnd between old and new qt apps.
@@ -1594,7 +1594,7 @@ TQString TQUriDrag::uriToLocalFile(const char* uri)
return file;
bool local = uri[0] != '/' || ( uri[0] != '\0' && uri[1] == '/' );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
// do we have a hostname?
if ( !local && uri[0] == '/' && uri[2] != '/' ) {
// then move the pointer to after the 'hostname/' part of the uri
@@ -1618,7 +1618,7 @@ TQString TQUriDrag::uriToLocalFile(const char* uri)
} else {
file.insert(0,'/');
}
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
if ( file.length() > 2 && file[0] == '/' && file[2] == '|' ) {
file[2] = ':';
file.remove(0,1);
@@ -1628,7 +1628,7 @@ TQString TQUriDrag::uriToLocalFile(const char* uri)
// Leave slash as slashes.
#endif
}
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
else {
file = uriToUnicodeUri(uri);
// convert to network path
diff --git a/src/kernel/qeventloop.cpp b/src/kernel/qeventloop.cpp
index 94018fa5..2aa96de6 100644
--- a/src/kernel/qeventloop.cpp
+++ b/src/kernel/qeventloop.cpp
@@ -415,7 +415,7 @@ void TQEventLoop::processEvents( ProcessEventsFlags flags, int maxTime )
\sa awake()
*/
-#if !defined(Q_WS_X11)
+#if !defined(TQ_WS_X11)
void TQEventLoop::appStartingUp(){}
void TQEventLoop::appClosingDown(){}
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
diff --git a/src/kernel/qeventloop_glib_p.h b/src/kernel/qeventloop_glib_p.h
index dc19986a..6c5fbbbb 100644
--- a/src/kernel/qeventloop_glib_p.h
+++ b/src/kernel/qeventloop_glib_p.h
@@ -95,10 +95,10 @@ public:
unsigned int exitloop : 1;
unsigned int shortcut : 1;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
int xfd;
GPollFD x_gPollFD;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
int thread_pipe[2];
GPollFD threadPipe_gPollFD;
diff --git a/src/kernel/qeventloop_p.h b/src/kernel/qeventloop_p.h
index 35a0ae95..d0e00f66 100644
--- a/src/kernel/qeventloop_p.h
+++ b/src/kernel/qeventloop_p.h
@@ -69,9 +69,9 @@ class TQSocketNotifier;
class TQMacSockNotPrivate;
#endif
-#if defined(Q_OS_UNIX) || defined (Q_WS_WIN)
+#if defined(Q_OS_UNIX) || defined (TQ_WS_WIN)
#include "ntqptrlist.h"
-#endif // Q_OS_UNIX || Q_WS_WIN
+#endif // Q_OS_UNIX || TQ_WS_WIN
#if defined(Q_OS_UNIX)
struct TQSockNot
@@ -95,12 +95,12 @@ public:
};
#endif // Q_OS_UNIX
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
struct TQSockNot {
TQSocketNotifier *obj;
int fd;
};
-#endif // Q_WS_WIN
+#endif // TQ_WS_WIN
class TQEventLoopPrivate
{
@@ -124,14 +124,14 @@ public:
unsigned int exitloop : 1;
unsigned int shortcut : 1;
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
uchar next_select_timer;
EventLoopTimerRef select_timer;
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
int xfd;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
#if defined(Q_OS_UNIX)
int thread_pipe[2];
@@ -144,10 +144,10 @@ public:
TQSockNotType sn_vec[3];
#endif
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
// pending socket notifiers list
TQPtrList sn_pending_list;
-#endif // Q_WS_WIN
+#endif // TQ_WS_WIN
};
diff --git a/src/kernel/qeventloop_unix_glib.cpp b/src/kernel/qeventloop_unix_glib.cpp
index d1e6c3ad..f8433965 100644
--- a/src/kernel/qeventloop_unix_glib.cpp
+++ b/src/kernel/qeventloop_unix_glib.cpp
@@ -433,12 +433,12 @@ bool qKillTimer( TQObject *obj )
TQEventLoopPrivate::TQEventLoopPrivate() {
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
xfd = -1;
x_gPollFD.fd = -1;
x_gPollFD.events = 0;
x_gPollFD.revents = 0;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
singletoolkit = TRUE;
ctx = 0;
ctx_is_default = false;
diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp
index 45594112..44168a1f 100644
--- a/src/kernel/qfont.cpp
+++ b/src/kernel/qfont.cpp
@@ -51,7 +51,7 @@
#include "ntqapplication.h"
#include "ntqcleanuphandler.h"
#include "ntqstringlist.h"
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
#include "ntqpaintdevicemetrics.h"
#endif
@@ -121,9 +121,9 @@ bool TQFontDef::operator==( const TQFontDef &other ) const
&& (this_foundry.isEmpty()
|| other_foundry.isEmpty()
|| this_foundry == other_foundry)
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
&& addStyle == other.addStyle
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
);
}
@@ -135,11 +135,11 @@ TQFontPrivate::TQFontPrivate()
rawMode( FALSE ), underline( FALSE ), overline( FALSE ), strikeOut( FALSE ),
mask( 0 )
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
screen = TQPaintDevice::x11AppScreen();
#else
screen = 0;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
}
TQFontPrivate::TQFontPrivate( const TQFontPrivate &other )
@@ -208,19 +208,19 @@ void TQFontPrivate::resolve( const TQFontPrivate *other )
TQFontEngineData::TQFontEngineData()
: lineWidth( 1 )
{
-#if defined(Q_WS_X11) || defined(Q_WS_WIN)
+#if defined(TQ_WS_X11) || defined(TQ_WS_WIN)
memset( engines, 0, TQFont::LastPrivateScript * sizeof( TQFontEngine * ) );
#else
engine = 0;
-#endif // Q_WS_X11 || Q_WS_WIN
-#ifndef Q_WS_MAC
+#endif // TQ_WS_X11 || TQ_WS_WIN
+#ifndef TQ_WS_MAC
memset( widthCache, 0, widthCacheSize*sizeof( uchar ) );
#endif
}
TQFontEngineData::~TQFontEngineData()
{
-#if defined(Q_WS_X11) || defined(Q_WS_WIN)
+#if defined(TQ_WS_X11) || defined(TQ_WS_WIN)
for ( int i = 0; i < TQFont::LastPrivateScript; i++ ) {
if ( engines[i] )
engines[i]->deref();
@@ -230,7 +230,7 @@ TQFontEngineData::~TQFontEngineData()
if ( engine )
engine->deref();
engine = 0;
-#endif // Q_WS_X11 || Q_WS_WIN
+#endif // TQ_WS_X11 || TQ_WS_WIN
}
@@ -691,9 +691,9 @@ void TQFont::setFamily( const TQString &family )
detach();
d->request.family = family;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
d->request.addStyle = TQString::null;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
d->mask |= TQFontPrivate::Family;
}
@@ -1130,9 +1130,9 @@ void TQFont::setStyleHint( StyleHint hint, StyleStrategy strategy )
d->mask |= TQFontPrivate::StyleHint;
d->mask |= TQFontPrivate::StyleStrategy;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
d->request.addStyle = TQString::null;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
}
/*!
@@ -1386,11 +1386,11 @@ static void initFontSubst()
// default substitutions
static const char *initTbl[] = {
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
"arial", "helvetica",
"helv", "helvetica",
"tms rmn", "times",
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
"times", "Times New Roman",
"courier", "Courier New",
"helvetica", "Arial",
@@ -1691,7 +1691,7 @@ bool TQFont::fromString(const TQString &descrip)
return TRUE;
}
-#if !defined( Q_WS_QWS )
+#if !defined( TQ_WS_QWS )
/*! \internal
Internal function that dumps font cache statistics.
@@ -1701,7 +1701,7 @@ void TQFont::cacheStatistics()
}
-#endif // !Q_WS_QWS
+#endif // !TQ_WS_QWS
@@ -1730,7 +1730,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQFont &font )
if ( s.version() <= 3 ) {
TQ_INT16 pointSize = (TQ_INT16) font.d->request.pointSize;
if ( pointSize == -1 ) {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
pointSize = (TQ_INT16)(font.d->request.pixelSize*720/TQPaintDevice::x11AppDpiY());
#else
pointSize = (TQ_INT16)TQFontInfo( font ).pointSize() * 10;
@@ -1926,7 +1926,7 @@ TQFontMetrics::TQFontMetrics( const TQPainter *p )
d = painter->pfont ? painter->pfont->d : painter->cfont.d;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( d->screen != p->scrn ) {
TQFontPrivate *new_d = new TQFontPrivate( *d );
TQ_CHECK_PTR( new_d );
@@ -1934,7 +1934,7 @@ TQFontMetrics::TQFontMetrics( const TQPainter *p )
d->screen = p->scrn;
d->count = 1;
} else
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
d->ref();
}
@@ -2170,7 +2170,7 @@ bool TQFontMetrics::inFont(TQChar ch) const
\sa rightBearing(), minLeftBearing(), width()
*/
-#if !defined(Q_WS_WIN) && !defined(Q_WS_QWS)
+#if !defined(TQ_WS_WIN) && !defined(TQ_WS_QWS)
int TQFontMetrics::leftBearing(TQChar ch) const
{
TQFont::Script script;
@@ -2190,7 +2190,7 @@ int TQFontMetrics::leftBearing(TQChar ch) const
glyph_metrics_t gi = engine->boundingBox( glyphs[0] );
return gi.x;
}
-#endif // !Q_WS_WIN
+#endif // !TQ_WS_WIN
/*! \fn int TQFontMetrics::rightBearing(TQChar ch) const
Returns the right bearing of character \a ch in the font.
@@ -2204,7 +2204,7 @@ int TQFontMetrics::leftBearing(TQChar ch) const
\sa leftBearing(), minRightBearing(), width()
*/
-#if !defined(Q_WS_WIN) && !defined(Q_WS_QWS)
+#if !defined(TQ_WS_WIN) && !defined(TQ_WS_QWS)
int TQFontMetrics::rightBearing(TQChar ch) const
{
TQFont::Script script;
@@ -2224,10 +2224,10 @@ int TQFontMetrics::rightBearing(TQChar ch) const
glyph_metrics_t gi = engine->boundingBox( glyphs[0] );
return gi.xoff - gi.x - gi.width;
}
-#endif // !Q_WS_WIN
+#endif // !TQ_WS_WIN
-#ifndef Q_WS_QWS
+#ifndef TQ_WS_QWS
/*!
Returns the width in pixels of the first \a len characters of \a
str. If \a len is negative (the default), the entire string is
@@ -2249,7 +2249,7 @@ int TQFontMetrics::width( const TQString &str, int len ) const
int pos = 0;
int width = 0;
-#ifndef Q_WS_MAC
+#ifndef TQ_WS_MAC
const TQChar *ch = str.unicode();
while (pos < len) {
@@ -2287,7 +2287,7 @@ int TQFontMetrics::width( const TQString &str, int len ) const
TQTextEngine layout( str, d );
layout.itemize( TQTextEngine::WidthOnly );
width += layout.width( pos, len-pos );
-#ifndef Q_WS_MAC
+#ifndef TQ_WS_MAC
}
#endif
return width;
@@ -2339,7 +2339,7 @@ int TQFontMetrics::width( const TQString &str, int len ) const
account.
*/
-#ifndef Q_WS_QWS
+#ifndef TQ_WS_QWS
/*!
Returns the bounding rectangle of the first \a len characters of
\a str, which is the set of pixels the text would cover if drawn
@@ -2986,7 +2986,7 @@ TQFontCache::~TQFontCache()
instance = 0;
}
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
void TQFontCache::clear()
{
{
@@ -3107,7 +3107,7 @@ void TQFontCache::decreaseCost( uint cost )
cost, total_cost, max_cost );
}
-#if defined(Q_WS_WIN ) || defined (Q_WS_QWS)
+#if defined(TQ_WS_WIN ) || defined (TQ_WS_QWS)
void TQFontCache::cleanupPrinterFonts()
{
FC_DEBUG( "TQFontCache::cleanupPrinterFonts" );
@@ -3125,7 +3125,7 @@ void TQFontCache::cleanupPrinterFonts()
}
if( it.data()->count > 0 ) {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
for(int i = 0; i < TQFont::LastPrivateScript; ++i) {
if( it.data()->engines[i] ) {
it.data()->engines[i]->deref();
@@ -3209,13 +3209,13 @@ void TQFontCache::timerEvent( TQTimerEvent * )
#ifdef TQFONTCACHE_DEBUG
FC_DEBUG( " %p: ref %2d", it.data(), it.data()->count );
-# if defined(Q_WS_X11) || defined(Q_WS_WIN)
+# if defined(TQ_WS_X11) || defined(TQ_WS_WIN)
// print out all engines
for ( int i = 0; i < TQFont::LastPrivateScript; ++i ) {
if ( ! it.data()->engines[i] ) continue;
FC_DEBUG( " contains %p", it.data()->engines[i] );
}
-# endif // Q_WS_X11 || Q_WS_WIN
+# endif // TQ_WS_X11 || TQ_WS_WIN
#endif // TQFONTCACHE_DEBUG
if ( it.data()->count > 0 )
diff --git a/src/kernel/qfontdata_p.h b/src/kernel/qfontdata_p.h
index fc073448..9c21dfe6 100644
--- a/src/kernel/qfontdata_p.h
+++ b/src/kernel/qfontdata_p.h
@@ -69,7 +69,7 @@ struct TQFontDef
styleHint( TQFont::AnyStyle ), styleStrategy( TQFont::PreferDefault ),
weight( 50 ), italic( FALSE ), fixedPitch( FALSE ), stretch( 100 ),
ignorePitch(TRUE)
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
,fixedPitchComputed(FALSE)
#endif
{
@@ -77,9 +77,9 @@ struct TQFontDef
TQString family;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
TQString addStyle;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
int pointSize;
int pixelSize;
@@ -107,9 +107,9 @@ struct TQFontDef
if ( styleStrategy != other.styleStrategy ) return styleStrategy < other.styleStrategy;
if ( family != other.family ) return family < other.family;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if ( addStyle != other.addStyle ) return addStyle < other.addStyle;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
return FALSE;
}
@@ -123,12 +123,12 @@ public:
uint lineWidth;
-#if defined(Q_WS_X11) || defined(Q_WS_WIN)
+#if defined(TQ_WS_X11) || defined(TQ_WS_WIN)
TQFontEngine *engines[TQFont::LastPrivateScript];
#else
TQFontEngine *engine;
-#endif // Q_WS_X11 || Q_WS_WIN
-#ifndef Q_WS_MAC
+#endif // TQ_WS_X11 || TQ_WS_WIN
+#ifndef TQ_WS_MAC
enum { widthCacheSize = 0x500 };
uchar widthCache[widthCacheSize];
#endif
@@ -139,9 +139,9 @@ class TQFontPrivate : public TQShared
{
public:
static TQFont::Script defaultScript;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
static int defaultEncodingID;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
TQFontPrivate();
TQFontPrivate( const TQFontPrivate &other );
@@ -151,7 +151,7 @@ public:
TQFontEngine *engineForScript( TQFont::Script script ) const {
if ( script == TQFont::NoScript )
script = TQFontPrivate::defaultScript;
-#if defined(Q_WS_X11) || defined(Q_WS_WIN)
+#if defined(TQ_WS_X11) || defined(TQ_WS_WIN)
if ( ! engineData || ! engineData->engines[script] )
((TQFontPrivate *) this)->load( script );
return engineData->engines[script];
@@ -159,7 +159,7 @@ public:
if ( ! engineData || ! engineData->engine )
((TQFontPrivate *) this)->load( script );
return engineData->engine;
-#endif // Q_WS_X11 || Q_WS_WIN
+#endif // TQ_WS_X11 || TQ_WS_WIN
}
TQFontDef request;
@@ -201,7 +201,7 @@ public:
TQFontCache();
~TQFontCache();
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
void clear();
#endif
// universal key structure. TQFontEngineDatas and TQFontEngines are cached using
@@ -211,7 +211,7 @@ public:
Key( const TQFontDef &d, TQFont::Script c, int s, TQPaintDevice *pdev )
: script(c), screen(s) {
def = d;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
dpi = pdev ? TQPaintDeviceMetrics(pdev).logicalDpiY() : 0;
#else
Q_UNUSED(pdev);
@@ -259,7 +259,7 @@ public:
TQFontEngine *findEngine( const Key &key );
void insertEngine( const Key &key, TQFontEngine *engine );
-#if defined(Q_WS_WIN) || defined(Q_WS_QWS)
+#if defined(TQ_WS_WIN) || defined(TQ_WS_QWS)
void cleanupPrinterFonts();
#endif
diff --git a/src/kernel/qfontdatabase.cpp b/src/kernel/qfontdatabase.cpp
index fd57e179..152b6f25 100644
--- a/src/kernel/qfontdatabase.cpp
+++ b/src/kernel/qfontdatabase.cpp
@@ -50,7 +50,7 @@
#include
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include
#endif
#include
@@ -123,7 +123,7 @@ static int getFontWeight( const TQString &weightString )
return (int) TQFont::Normal;
}
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
struct TQtFontEncoding
{
signed int encoding : 16;
@@ -134,22 +134,22 @@ struct TQtFontEncoding
uint avgwidth : 16;
uchar pitch : 8;
};
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
struct TQtFontSize
{
unsigned short pixelSize;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
int count;
TQtFontEncoding *encodings;
TQtFontEncoding *encodingID( int id, uint xpoint = 0, uint xres = 0,
uint yres = 0, uint avgwidth = 0, bool add = FALSE);
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
};
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
TQtFontEncoding *TQtFontSize::encodingID( int id, uint xpoint, uint xres,
uint yres, uint avgwidth, bool add )
{
@@ -173,7 +173,7 @@ TQtFontEncoding *TQtFontSize::encodingID( int id, uint xpoint, uint xres,
encodings[count].pitch = '*';
return encodings + count++;
}
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
struct TQtFontStyle
{
@@ -208,13 +208,13 @@ struct TQtFontStyle
: key( k ), bitmapScalable( FALSE ), smoothScalable( FALSE ),
fakeOblique( FALSE ), count( 0 ), pixelSizes( 0 )
{
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
weightName = setwidthName = 0;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
}
~TQtFontStyle() {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
delete [] weightName;
delete [] setwidthName;
while ( count-- )
@@ -230,10 +230,10 @@ struct TQtFontStyle
int count : 29;
TQtFontSize *pixelSizes;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
const char *weightName;
const char *setwidthName;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
TQtFontSize *pixelSize( unsigned short size, bool = FALSE );
};
@@ -263,7 +263,7 @@ TQtFontSize *TQtFontStyle::pixelSize( unsigned short size, bool add )
realloc( pixelSizes,
(((count+8) >> 3 ) << 3) * sizeof(TQtFontSize) );
pixelSizes[count].pixelSize = size;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
pixelSizes[count].count = 0;
pixelSizes[count].encodings = 0;
#endif
@@ -326,12 +326,12 @@ struct TQtFontFamily
TQtFontFamily(const TQString &n )
:
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
fixedPitch( TRUE ), hasXft( FALSE ), xftScriptCheck( FALSE ), xlfdLoaded( FALSE ), synthetic(FALSE),
#else
fixedPitch( FALSE ),
#endif
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
scriptCheck( FALSE ),
#endif
#if defined(Q_OS_MAC) && !defined(TQWS)
@@ -348,13 +348,13 @@ struct TQtFontFamily
}
bool fixedPitch : 1;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
bool hasXft : 1;
bool xftScriptCheck : 1;
bool xlfdLoaded : 1;
bool synthetic : 1;
#endif
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
bool scriptCheck : 1;
#endif
#if defined(Q_OS_MAC) && !defined(TQWS)
@@ -363,14 +363,14 @@ struct TQtFontFamily
bool fullyLoaded : 1;
TQString name;
TQString rawName;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
TQCString fontFilename;
int fontFileIndex;
#endif
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
FMFontFamily macFamily;
#endif
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
TQString english_name;
#endif
int count;
@@ -454,7 +454,7 @@ TQtFontFamily *TQFontDatabasePrivate::family( const TQString &f, bool create )
-#if defined(Q_WS_X11) || defined(Q_WS_WIN)
+#if defined(TQ_WS_X11) || defined(TQ_WS_WIN)
static const unsigned short sample_chars[TQFont::LastPrivateScript][14] =
{
// European Alphabetic Scripts
@@ -601,7 +601,7 @@ static const unsigned short sample_chars[TQFont::LastPrivateScript][14] =
// Taiwan would be 0x201C, 0x3002, 0x4E00, 0x9F98, 0xFFE5
};
-#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
+#if defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
static inline bool requiresOpenType(TQFont::Script s)
{
return (s >= TQFont::Syriac && s <= TQFont::Sinhala)
@@ -631,7 +631,7 @@ static inline bool canRender( TQFontEngine *fe, TQFont::Script script )
}
++i;
}
-#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
+#if defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
if (hasChar && requiresOpenType(script)) {
TQOpenType *ot = fe->openType();
if (!ot || !ot->supportsScript(script))
@@ -641,20 +641,20 @@ static inline bool canRender( TQFontEngine *fe, TQFont::Script script )
return hasChar;
}
-#endif // Q_WS_X11 || Q_WS_WIN
+#endif // TQ_WS_X11 || TQ_WS_WIN
static TQSingleCleanupHandler qfontdatabase_cleanup;
static TQFontDatabasePrivate *db=0;
#define SMOOTH_SCALABLE 0xffff
-#if defined( Q_WS_X11 )
+#if defined( TQ_WS_X11 )
# include "qfontdatabase_x11.cpp"
-#elif defined( Q_WS_MAC )
+#elif defined( TQ_WS_MAC )
# include "qfontdatabase_mac.cpp"
-#elif defined( Q_WS_WIN )
+#elif defined( TQ_WS_WIN )
# include "qfontdatabase_win.cpp"
-#elif defined( Q_WS_QWS )
+#elif defined( TQ_WS_QWS )
# include "qfontdatabase_qws.cpp"
#endif
@@ -696,7 +696,7 @@ static TQtFontStyle *bestStyle(TQtFontFoundry *foundry, const TQtFontStyle::Key
return foundry->styles[best];
}
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
static TQtFontEncoding *findEncoding(TQFont::Script script, int styleStrategy,
TQtFontSize *size, int force_encoding_id)
{
@@ -733,17 +733,17 @@ static TQtFontEncoding *findEncoding(TQFont::Script script, int styleStrategy,
return encoding;
}
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
-#if defined(Q_WS_X11) || defined(Q_WS_WIN)
+#if defined(TQ_WS_X11) || defined(TQ_WS_WIN)
static
unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleStrategy,
const TQtFontFamily *family, const TQString &foundry_name,
TQtFontStyle::Key styleKey, int pixelSize, char pitch,
TQtFontFoundry **best_foundry, TQtFontStyle **best_style,
TQtFontSize **best_size
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
, TQtFontEncoding **best_encoding, int force_encoding_id
#endif
)
@@ -799,7 +799,7 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt
}
}
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
TQtFontEncoding *encoding = 0;
#endif
@@ -807,7 +807,7 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt
if (! size) {
unsigned int distance = ~0u;
for (int x = 0; x < style->count; ++x) {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
encoding =
findEncoding(script, styleStrategy, style->pixelSizes + x, force_encoding_id);
if (!encoding) {
@@ -841,7 +841,7 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt
}
}
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if (size) {
encoding = findEncoding(script, styleStrategy, size, force_encoding_id);
if (!encoding) size = 0;
@@ -850,7 +850,7 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt
FM_DEBUG( " foundry doesn't support the script we want" );
continue;
}
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
unsigned int this_score = 0x0000;
enum {
@@ -861,7 +861,7 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt
XLFDPenalty = 0x0001
};
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if ( encoding->encoding != -1 ) {
this_score += XLFDPenalty;
if ( encoding->encoding != TQFontPrivate::defaultEncodingID )
@@ -896,9 +896,9 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt
*best_foundry = foundry;
*best_style = style;
*best_size = size;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
*best_encoding = encoding;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
} else {
FM_DEBUG( " score %x no better than best %x", this_score, score);
}
@@ -914,7 +914,7 @@ TQFontEngine *
TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
const TQFontDef &request, int force_encoding_id )
{
-#ifndef Q_WS_X11
+#ifndef TQ_WS_X11
Q_UNUSED( force_encoding_id );
#endif
@@ -925,7 +925,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
if ( fp ) {
if ( fp->rawMode ) {
fe = loadEngine( script, fp, request, 0, 0, 0
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
, 0, 0, FALSE
#endif
);
@@ -936,7 +936,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
}
TQFontCache::Key key( request, script,
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
(int)fp->paintdevice,
#else
fp->screen,
@@ -947,7 +947,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
if ( fe ) return fe;
}
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
if (request.styleStrategy & TQFont::PreferDevice) {
TQFontEngine *fe = loadEngine(script, fp, request, 0, 0, 0);
if(fe)
@@ -964,7 +964,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
parseFontName( request.family, foundry_name, family_name );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if (script == TQFont::Han) {
// modify script according to locale
static TQFont::Script defaultHan;
@@ -1013,9 +1013,9 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
TQtFontFoundry *best_foundry = 0;
TQtFontStyle *best_style = 0;
TQtFontSize *best_size = 0;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
TQtFontEncoding *best_encoding = 0;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
unsigned int score = ~0;
@@ -1023,14 +1023,14 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
for ( int x = 0; x < db->count; ++x ) {
TQtFontFamily *try_family = db->families[x];
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if (try_family->synthetic) // skip generated fontconfig fonts
continue;
#endif
if ( !family_name.isEmpty() &&
ucstricmp( try_family->name, family_name ) != 0
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
&& ucstricmp( try_family->english_name, family_name ) != 0
#endif
)
@@ -1044,7 +1044,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
if ( ! ( try_family->scripts[script] & TQtFontFamily::Supported )
&& script != TQFont::Unicode) {
// family not supported in the script we want
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if (script >= TQFont::Han_Japanese && script <= TQFont::Han_Korean
&& try_family->scripts[TQFont::Han] == TQtFontFamily::Supported) {
// try with the han script instead, give it a penalty
@@ -1081,9 +1081,9 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
TQtFontFoundry *try_foundry = 0;
TQtFontStyle *try_style = 0;
TQtFontSize *try_size = 0;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
TQtFontEncoding *try_encoding = 0;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
// as we know the script is supported, we can be sure
// to find a matching font here.
@@ -1091,7 +1091,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
bestFoundry( override_script, score, request.styleStrategy,
try_family, foundry_name, styleKey, request.pixelSize, pitch,
&try_foundry, &try_style, &try_size
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
, &try_encoding, force_encoding_id
#endif
);
@@ -1101,7 +1101,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
newscore = bestFoundry( override_script, score, request.styleStrategy, try_family,
TQString::null, styleKey, request.pixelSize,
pitch, &try_foundry, &try_style, &try_size
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
, &try_encoding, force_encoding_id
#endif
);
@@ -1114,16 +1114,16 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
best_foundry = try_foundry;
best_style = try_style;
best_size = try_size;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
best_encoding = try_encoding;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
}
if ( newscore < 10 ) // xlfd instead of xft... just accept it
break;
}
if ( best_family != 0 && best_foundry != 0 && best_style != 0
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
&& best_size != 0 && best_encoding != 0
#endif
) {
@@ -1138,7 +1138,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
best_foundry->name.isEmpty() ? "-- none --" : best_foundry->name.latin1(),
best_style->key.weight, best_style->key.italic, best_style->key.oblique,
best_style->key.stretch, best_size ? best_size->pixelSize : 0xffff,
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
best_encoding->pitch, best_encoding->encoding
#else
'p', 0
@@ -1146,7 +1146,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
);
fe = loadEngine( script, fp, request, best_family, best_foundry, best_style
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
, best_size, best_encoding, ( force_encoding_id >= 0 )
#endif
);
@@ -1191,7 +1191,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
def.family = def.family.left(def.family.find(','));
}
TQFontCache::Key key( def, script,
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
(int)fp->paintdevice,
#else
fp->screen,
@@ -1224,7 +1224,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
if ( fp ) {
TQFontCache::Key key( request, script,
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
(int)fp->paintdevice,
#else
fp->screen,
@@ -1236,10 +1236,10 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
}
if ( fp ) {
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
fe->fontDef.pointSize =
tqRound(10. * qt_pointSize(fe->fontDef.pixelSize, fp->paintdevice, fp->screen));
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
fe->fontDef.pointSize = int( double( fe->fontDef.pixelSize ) * 720.0 /
GetDeviceCaps(shared_dc,LOGPIXELSY) );
#else
@@ -1252,7 +1252,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
return fe;
}
-#endif // Q_WS_X11 || Q_WS_WIN
+#endif // TQ_WS_X11 || TQ_WS_WIN
@@ -1692,7 +1692,7 @@ bool TQFontDatabase::isScalable( const TQString &family,
TQValueList TQFontDatabase::pointSizes( const TQString &family,
const TQString &style)
{
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
// windows and macosx are always smoothly scalable
Q_UNUSED( family );
Q_UNUSED( style );
@@ -1725,7 +1725,7 @@ TQValueList TQFontDatabase::pointSizes( const TQString &family,
const TQtFontSize *size = style->pixelSizes + l;
if (size->pixelSize != 0 && size->pixelSize != USHRT_MAX) {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
const uint pointSize = tqRound(qt_pointSize(size->pixelSize, 0, -1));
#else
const uint pointSize = size->pixelSize; // embedded uses 72dpi
@@ -1792,7 +1792,7 @@ TQFont TQFontDatabase::font( const TQString &family, const TQString &style,
TQValueList TQFontDatabase::smoothSizes( const TQString &family,
const TQString &style)
{
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
Q_UNUSED( family );
Q_UNUSED( style );
return TQFontDatabase::standardSizes();
@@ -1826,7 +1826,7 @@ TQValueList TQFontDatabase::smoothSizes( const TQString &family,
const TQtFontSize *size = style->pixelSizes + l;
if ( size->pixelSize != 0 && size->pixelSize != USHRT_MAX ) {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
const uint pointSize = tqRound(qt_pointSize(size->pixelSize, 0, -1));
#else
const uint pointSize = size->pixelSize; // embedded uses 72dpi
diff --git a/src/kernel/qfontengine_p.h b/src/kernel/qfontengine_p.h
index 499a5598..e1fc5854 100644
--- a/src/kernel/qfontengine_p.h
+++ b/src/kernel/qfontengine_p.h
@@ -41,7 +41,7 @@
#include "ntqglobal.h"
#endif // QT_H
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#include "qt_windows.h"
#include "ntqptrdict.h"
#endif
@@ -58,7 +58,7 @@ typedef int advance_t;
class TQOpenType;
struct TransformedFont;
-#if defined( Q_WS_X11 ) || defined( Q_WS_WIN) || defined( Q_WS_MAC )
+#if defined( TQ_WS_X11 ) || defined( TQ_WS_WIN) || defined( TQ_WS_MAC )
class TQFontEngine : public TQShared
{
public:
@@ -87,7 +87,7 @@ public:
TQFontEngine() {
count = 0; cache_count = 0;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
transformed_fonts = 0;
#endif
}
@@ -97,7 +97,7 @@ public:
virtual Error stringToCMap( const TQChar *str, int len, glyph_t *glyphs,
advance_t *advances, int *nglyphs, bool mirrored ) const = 0;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
virtual int cmap() const { return -1; }
virtual TQOpenType *openType() const { return 0; }
#endif
@@ -133,7 +133,7 @@ public:
uint cache_cost; // amount of mem used in kb by the font
int cache_count;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
HDC dc() const;
void getGlyphIndexes( const TQChar *ch, int numChars, glyph_t *glyphs, bool mirrored ) const;
void getCMap();
@@ -157,12 +157,12 @@ public:
static TQPtrDict cacheDict;
short lbearing;
short rbearing;
-#endif // Q_WS_WIN
-#ifdef Q_WS_X11
+#endif // TQ_WS_WIN
+#ifdef TQ_WS_X11
TransformedFont *transformed_fonts;
#endif
};
-#elif defined( Q_WS_QWS )
+#elif defined( TQ_WS_QWS )
class TQGfx;
class TQFontEngine : public TQShared
@@ -248,7 +248,7 @@ enum IndicFeatures {
HalantFeature
};
-#if defined(Q_WS_X11) || defined(Q_WS_WIN)
+#if defined(TQ_WS_X11) || defined(TQ_WS_WIN)
class TQFontEngineBox : public TQFontEngine
{
public:
@@ -270,7 +270,7 @@ public:
int minLeftBearing() const { return 0; }
int minRightBearing() const { return 0; }
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
int cmap() const;
#endif
const char *name() const;
@@ -286,7 +286,7 @@ private:
};
#endif
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include "qt_x11_p.h"
@@ -527,7 +527,7 @@ private:
#endif // TQT_NO_XFTFREETYPE
-#elif defined( Q_WS_MAC )
+#elif defined( TQ_WS_MAC )
#include "qt_mac.h"
#include
#include
@@ -584,7 +584,7 @@ public:
TQPaintDevice *dev=NULL, const TQRegion *rgn=NULL) const;
};
-#elif defined( Q_WS_WIN )
+#elif defined( TQ_WS_WIN )
class TQFontEngineWin : public TQFontEngine
{
@@ -627,6 +627,6 @@ public:
};
#endif
-#endif // Q_WS_WIN
+#endif // TQ_WS_WIN
#endif
diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp
index a736afa6..65ab1581 100644
--- a/src/kernel/qfontengine_x11.cpp
+++ b/src/kernel/qfontengine_x11.cpp
@@ -2610,14 +2610,14 @@ bool TQOpenType::shape(TQShaperItem *item, const unsigned int *properties)
bool TQOpenType::positionAndAdd(TQShaperItem *item, bool doLogClusters)
{
if (gpos) {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
Q_ASSERT(fontEngine->type() == TQFontEngine::Xft);
face = lockFTFace(static_cast(fontEngine)->font());
#endif
memset(otl_buffer->positions, 0, otl_buffer->in_length*sizeof(OTL_PositionRec));
// #### check that passing "FALSE,FALSE" is correct
TT_GPOS_Apply_String(face, gpos, loadFlags, otl_buffer, FALSE, FALSE);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
unlockFTFace(static_cast(fontEngine)->font());
#endif
}
diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp
index 1c1d84b2..ce95f1cb 100644
--- a/src/kernel/qimage.cpp
+++ b/src/kernel/qimage.cpp
@@ -59,12 +59,12 @@
#include
#include
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
#include "qgfx_qws.h"
#endif
// 16bpp images on supported on TQt/Embedded
-#if !defined( Q_WS_QWS ) && !defined(TQT_NO_IMAGE_16_BIT)
+#if !defined( TQ_WS_QWS ) && !defined(TQT_NO_IMAGE_16_BIT)
#define TQT_NO_IMAGE_16_BIT
#endif
@@ -510,7 +510,7 @@ TQImage::TQImage( uchar* yourdata, int w, int h, int depth,
data->bitordr = bitOrder;
}
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
/*!
Constructs an image that uses an existing memory buffer. The
@@ -559,7 +559,7 @@ TQImage::TQImage( uchar* yourdata, int w, int h, int depth,
data->bits = jt;
data->bitordr = bitOrder;
}
-#endif // Q_WS_QWS
+#endif // TQ_WS_QWS
/*!
Destroys the image and cleans up.
@@ -666,7 +666,7 @@ TQImage TQImage::copy() const
} else {
TQImage image;
image.create( width(), height(), depth(), numColors(), bitOrder() );
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
// TQt/Embedded can create images with non-default bpl
// make sure we don't crash.
if ( image.numBytes() != numBytes() )
@@ -1098,7 +1098,7 @@ TQImage::Endian TQImage::systemByteOrder()
}
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
#include // needed for systemBitOrder
#include
#include
@@ -1129,7 +1129,7 @@ TQImage::Endian TQImage::systemByteOrder()
TQImage::Endian TQImage::systemBitOrder()
{
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
return BitmapBitOrder(tqt_xdisplay()) == MSBFirst ? BigEndian :LittleEndian;
#else
return BigEndian;
@@ -1279,7 +1279,7 @@ bool TQImage::create( int width, int height, int depth, int numColors,
return FALSE;
}
// TQt/Embedded doesn't waste memory on unnecessary padding.
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
const int bpl = (width*depth+7)/8; // bytes per scanline
const int pad = 0;
#else
@@ -4745,7 +4745,7 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image )
d->at( startpos + offset ); // start of image data
int bpl = image.bytesPerLine();
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
//
// Guess the number of bytes-per-line if we don't know how much
// image data is in the file (bogus image ?).
@@ -4761,7 +4761,7 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image )
while ( --h >= 0 ) {
if ( d->readBlock((char*)line[h],bpl) != bpl )
break;
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
if ( pad > 0 )
d->at(d->at()+pad);
#endif
@@ -4911,7 +4911,7 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image )
while ( --h >= 0 ) {
if ( d->readBlock((char *)line[h],bpl) != bpl )
break;
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
if ( pad > 0 )
d->at(d->at()+pad);
#endif
@@ -4989,7 +4989,7 @@ bool qt_write_dib( TQDataStream& s, TQImage image )
} else if ( image.depth() == 32 ) {
bpl_bmp = ((image.width()*24+31)/32)*4;
nbits = 24;
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
} else if ( image.depth() == 1 || image.depth() == 8 ) {
// TQt/E doesn't word align.
bpl_bmp = ((image.width()*image.depth()+31)/32)*4;
@@ -5035,14 +5035,14 @@ bool qt_write_dib( TQDataStream& s, TQImage image )
int y;
if ( nbits == 1 || nbits == 8 ) { // direct output
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
// TQt/E doesn't word align.
int pad = bpl_bmp - bpl;
char padding[4];
#endif
for ( y=image.height()-1; y>=0; y-- ) {
d->writeBlock( (char*)image.scanLine(y), bpl );
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
d->writeBlock( padding, pad );
#endif
}
@@ -6500,7 +6500,7 @@ void TQImage::setText(const char* key, const char* lang, const TQString& s)
#endif // TQT_NO_IMAGE_TEXT
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
/*!
\internal
*/
diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp
index 24050fe8..0149304e 100644
--- a/src/kernel/qinputcontext.cpp
+++ b/src/kernel/qinputcontext.cpp
@@ -313,7 +313,7 @@ TQInputContext::~TQInputContext()
delete d;
}
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
/*!
\internal
Returns the owner of this input context. Ordinary input methods
@@ -416,7 +416,7 @@ void TQInputContext::releaseComposingWidget( TQWidget *w )
d->hasFocus = FALSE;
}
}
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
/*!
\internal
@@ -518,9 +518,9 @@ void TQInputContext::sendIMEventInternal( TQEvent::Type type,
TQObject *receiver = 0;
TQIMEvent *event = 0;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
receiver = d->composingWidget;
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
// just a placeholder
#endif
if ( ! receiver )
@@ -597,7 +597,7 @@ void TQInputContext::sendIMEventInternal( TQEvent::Type type,
void TQInputContext::sendIMEvent( TQEvent::Type type, const TQString &text,
int cursorPosition, int selLength )
{
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( !focusWidget() )
return;
#endif
diff --git a/src/kernel/qinputcontext_p.h b/src/kernel/qinputcontext_p.h
index 0ab3a088..88cff048 100644
--- a/src/kernel/qinputcontext_p.h
+++ b/src/kernel/qinputcontext_p.h
@@ -60,24 +60,24 @@ class TQFont;
class TQString;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include "ntqmemarray.h"
#include "ntqwindowdefs.h"
#include "qt_x11_p.h"
#endif
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#include "qt_windows.h"
#endif
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
class TQWSIMEvent;
#endif
class TQInputContext
{
public:
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
TQInputContext(TQWidget *); // should be a toplevel widget
~TQInputContext();
@@ -96,17 +96,17 @@ public:
TQFont font;
XFontSet fontset;
TQMemArray selectedChars;
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
static void translateIMEvent( TQWSIMEvent *, TQWidget * );
static void reset();
private:
static TQWidget* focusWidget;
static TQString* composition;
-#endif //Q_WS_QWS
+#endif //TQ_WS_QWS
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
static void init();
static void shutdown();
diff --git a/src/kernel/qinternal.cpp b/src/kernel/qinternal.cpp
index 8281e70b..e99c95f7 100644
--- a/src/kernel/qinternal.cpp
+++ b/src/kernel/qinternal.cpp
@@ -55,7 +55,7 @@ static TQSharedDoubleBuffer* qdb_owner = 0;
TQCleanupHandler qdb_pixmap_cleanup;
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
bool TQSharedDoubleBuffer::dblbufr = FALSE;
#else
bool TQSharedDoubleBuffer::dblbufr = TRUE;
@@ -74,7 +74,7 @@ bool TQSharedDoubleBuffer::dblbufr = TRUE;
*/
static const int hardLimitWidth = -1;
static const int hardLimitHeight = -1;
-#if defined( Q_WS_QWS ) || defined( Q_WS_MAC9 )
+#if defined( TQ_WS_QWS ) || defined( TQ_WS_MAC9 )
// Small in TQt/Embedded / Mac9 - 5K on 32bpp
static const int sharedLimitWidth = 64;
static const int sharedLimitHeight = 20;
@@ -354,11 +354,11 @@ bool TQSharedDoubleBuffer::begin( TQPainter* painter, int x, int y, int w, int h
rh = h;
if ( ( pix = getPixmap() ) ) {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if ( painter->device()->x11Screen() != pix->x11Screen() )
pix->x11SetScreen( painter->device()->x11Screen() );
TQPixmap::x11SetDefaultScreen( pix->x11Screen() );
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
state |= BufferActive;
p = new TQPainter( pix );
@@ -405,11 +405,11 @@ bool TQSharedDoubleBuffer::begin( TQWidget* widget, int x, int y, int w, int h )
rh = h <= 0 ? wid->height() : h;
if ( ( pix = getPixmap() ) ) {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if ( wid->x11Screen() != pix->x11Screen() )
pix->x11SetScreen( wid->x11Screen() );
TQPixmap::x11SetDefaultScreen( pix->x11Screen() );
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
state |= BufferActive;
if ( flags & InitBG ) {
diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp
index c679bb52..42a95591 100644
--- a/src/kernel/qkeysequence.cpp
+++ b/src/kernel/qkeysequence.cpp
@@ -49,7 +49,7 @@
# include "ntqregexp.h"
#endif
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
#define TQMAC_CTRL (TQString(TQChar(0x2318)))
#define TQMAC_META (TQString(TQChar(0x2303)))
#define TQMAC_ALT (TQString(TQChar(0x2325)))
diff --git a/src/kernel/qmime.cpp b/src/kernel/qmime.cpp
index 1c860637..e1dd27d6 100644
--- a/src/kernel/qmime.cpp
+++ b/src/kernel/qmime.cpp
@@ -363,7 +363,7 @@ const TQMimeSource* TQMimeSourceFactory::data(const TQString& abs_name) const
TQMimeSource* r = 0;
TQStringList::Iterator it;
if ( abs_name[0] == '/'
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
|| ( abs_name[0] && abs_name[1] == ':' ) || abs_name.startsWith("\\\\")
#endif
)
@@ -463,7 +463,7 @@ TQString TQMimeSourceFactory::makeAbsolute(const TQString& abs_or_rel_name, cons
{
if ( context.isNull() ||
!(context[0] == '/'
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
|| ( context[0] && context[1] == ':')
#endif
))
diff --git a/src/kernel/qmovie.cpp b/src/kernel/qmovie.cpp
index 79218bad..6833762e 100644
--- a/src/kernel/qmovie.cpp
+++ b/src/kernel/qmovie.cpp
@@ -52,7 +52,7 @@
#ifndef TQT_NO_MOVIE
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
#include "qgfx_qws.h"
#endif
@@ -397,7 +397,7 @@ void TQMoviePrivate::updatePixmapFromImage(const TQPoint& off,
&lines, off.x(), off.y(), area.width(), area.height() );
}
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
if(display_widget) {
TQGfx * mygfx=display_widget->graphicsContext();
if(mygfx) {
@@ -679,7 +679,7 @@ void TQMovie::pushData(const uchar* data, int length)
d->receive(data,length);
}
-#ifdef Q_WS_QWS // ##### Temporary performance experiment
+#ifdef TQ_WS_QWS // ##### Temporary performance experiment
/*!
\internal
*/
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index d408a3df..4868ffb0 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -51,7 +51,7 @@
#include "qrichtext_p.h"
#include "ntqregexp.h"
#include "ntqcleanuphandler.h"
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
#include "qgfx_qws.h"
#endif
#include
@@ -1633,13 +1633,13 @@ void TQPainter::updateXForm()
txop = TxTranslate;
} else {
txop = TxScale;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
setf(DirtyFont);
#endif
}
} else {
txop = TxRotShear;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
setf(DirtyFont);
#endif
}
@@ -2253,7 +2253,7 @@ TQRegion TQPainter::clipRegion( CoordinateMode m ) const
*/
-#if !defined(Q_WS_X11) && !defined(Q_WS_QWS) && !defined(Q_WS_MAC)
+#if !defined(TQ_WS_X11) && !defined(TQ_WS_QWS) && !defined(TQ_WS_MAC)
// The doc and X implementation of this functions is in qpainter_x11.cpp
void TQPainter::drawWinFocusRect( int, int, int, int,
bool, const TQColor & )
@@ -2340,13 +2340,13 @@ void TQPainter::drawPixmap( const TQRect &r, const TQPixmap &pm )
TQPDevCmdParam param[2];
param[0].rect = &r;
param[1].pixmap = ±
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( !pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ) || !hdc )
return;
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param );
return;
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
if ( !pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ) || !pdev->handle())
return;
#else
@@ -2417,7 +2417,7 @@ void TQPainter::drawImage( int x, int y, const TQImage & image,
int sx, int sy, int sw, int sh,
int conversionFlags )
{
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
//### Hackish
# ifndef TQT_NO_TRANSFORMATIONS
if ( !image.isNull() && gfx &&
@@ -2488,13 +2488,13 @@ void TQPainter::drawImage( int x, int y, const TQImage & image,
TQRect r( x, y, subimage.width(), subimage.height() );
param[0].rect = &r;
param[1].image = &subimage;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !hdc )
return;
-#elif defined (Q_WS_QWS)
+#elif defined (TQ_WS_QWS)
pdev->cmd( TQPaintDevice::PdcDrawImage, this, param );
return;
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
if(!pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !pdev->handle() )
return;
#else
@@ -2547,13 +2547,13 @@ void TQPainter::drawImage( const TQRect &r, const TQImage &i )
TQPDevCmdParam param[2];
param[0].rect = &r;
param[1].image = &i;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !hdc )
return;
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
pdev->cmd( TQPaintDevice::PdcDrawImage, this, param );
return;
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !pdev->handle() )
return;
#else
@@ -2786,15 +2786,15 @@ void TQPainter::drawText( const TQRect &r, int tf,
param[1].ival = tf;
param[2].str = &newstr;
if ( pdev->devType() != TQInternal::Printer ) {
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( !pdev->cmd( TQPaintDevice::PdcDrawText2Formatted,
this, param) ||
!hdc )
return; // TQPrinter wants PdcDrawText2
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
pdev->cmd( TQPaintDevice::PdcDrawText2Formatted, this, param);
return;
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
if ( !pdev->cmd( TQPaintDevice::PdcDrawText2Formatted, this, param) ||
!pdev->handle())
return; // TQPrinter wants PdcDrawText2
@@ -3045,7 +3045,7 @@ void qt_format_text( const TQFont& font, const TQRect &_r,
textFlags |= TQt::Underline;
cUlChar++;
}
-#if defined(Q_WS_X11) || defined(Q_WS_QWS)
+#if defined(TQ_WS_X11) || defined(TQ_WS_QWS)
if ( painter->bg_mode == TQt::OpaqueMode ) {
int h = ti.ascent() + ti.descent() + 1;
if (ti.y() + h < height)
diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp
index 6d802cfd..b11530f6 100644
--- a/src/kernel/qpixmap.cpp
+++ b/src/kernel/qpixmap.cpp
@@ -367,13 +367,13 @@ TQPixmap::TQPixmap( const TQPixmap &pixmap )
data = pixmap.data;
data->ref();
devFlags = pixmap.devFlags; // copy TQPaintDevice flags
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
hdc = pixmap.hdc; // copy Windows device context
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
hd = pixmap.hd; // copy X11 drawable
rendhd = pixmap.rendhd;
copyX11Data( &pixmap ); // copy x11Data
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
hd = pixmap.hd;
#endif
}
@@ -425,16 +425,16 @@ TQPixmap TQPixmap::fromMimeSource( const TQString &abs_name )
TQPixmap TQPixmap::copy( bool ignoreMask ) const
{
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
int old = x11SetDefaultScreen( x11Screen() );
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
TQPixmap pm( data->w, data->h, data->d, data->bitmap, data->optim );
if ( !pm.isNull() ) { // copy the bitmap
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
pm.cloneX11Data( this );
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
if ( ignoreMask )
bitBlt( &pm, 0, 0, this, 0, 0, data->w, data->h, TQt::CopyROP, TRUE );
@@ -442,9 +442,9 @@ TQPixmap TQPixmap::copy( bool ignoreMask ) const
copyBlt( &pm, 0, 0, this, 0, 0, data->w, data->h );
}
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
x11SetDefaultScreen( old );
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
return pm;
}
@@ -475,13 +475,13 @@ TQPixmap &TQPixmap::operator=( const TQPixmap &pixmap )
} else {
data = pixmap.data;
devFlags = pixmap.devFlags; // copy TQPaintDevice flags
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
hdc = pixmap.hdc;
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
hd = pixmap.hd; // copy TQPaintDevice drawable
rendhd = pixmap.rendhd;
copyX11Data( &pixmap ); // copy x11Data
-#elif defined(Q_WS_MACX) || defined(Q_OS_MAC9)
+#elif defined(TQ_WS_MACX) || defined(Q_OS_MAC9)
hd = pixmap.hd;
#endif
}
@@ -660,22 +660,22 @@ void TQPixmap::resize( int w, int h )
d = isTQBitmap() ? 1 : -1;
// Create new pixmap
TQPixmap pm( w, h, d, data->bitmap, data->optim );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
pm.x11SetScreen( x11Screen() );
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
if ( !data->uninit && !isNull() ) // has existing pixmap
bitBlt( &pm, 0, 0, this, 0, 0, // copy old pixmap
TQMIN(width(), w),
TQMIN(height(),h), CopyROP, TRUE );
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
if(data->alphapm) {
data->alphapm->resize(w, h);
} else
-#elif defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
+#elif defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
if (data->alphapm)
tqWarning("TQPixmap::resize: TODO: resize alpha data");
else
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
if ( data->mask ) { // resize mask as well
if ( data->selfmask ) { // preserve self-mask
pm.setMask( *((TQBitmap*)&pm) );
@@ -751,11 +751,11 @@ void TQPixmap::setMask( const TQBitmap &newmask )
#endif
return;
}
-#if defined(Q_WS_MAC) || (defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE))
+#if defined(TQ_WS_MAC) || (defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE))
// when setting the mask, we get rid of the alpha channel completely
delete data->alphapm;
data->alphapm = 0;
-#endif // Q_WS_X11 && !TQT_NO_XFTFREETYPE
+#endif // TQ_WS_X11 && !TQT_NO_XFTFREETYPE
delete data->mask;
TQBitmap* newmaskcopy;
@@ -763,7 +763,7 @@ void TQPixmap::setMask( const TQBitmap &newmask )
newmaskcopy = (TQBitmap*)new TQPixmap( tmp->copy( TRUE ) );
else
newmaskcopy = new TQBitmap( newmask );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
newmaskcopy->x11SetScreen( x11Screen() );
#endif
data->mask = newmaskcopy;
@@ -1481,7 +1481,7 @@ bool qt_xForm_helper( const TQWMatrix &trueMat, int xoffset,
dptr++;
}
break;
-# if defined(Q_WS_WIN)
+# if defined(TQ_WS_WIN)
case QT_XFORM_TYPE_WINDOWSPIXMAP:
while ( dptr < maxp ) {
IWX_PIX(128);
diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp
index 6f350620..c30e5b9d 100644
--- a/src/kernel/qpixmapcache.cpp
+++ b/src/kernel/qpixmapcache.cpp
@@ -95,7 +95,7 @@
static const int cache_size = 149; // size of internal hash array
-#ifdef Q_WS_MAC9
+#ifdef TQ_WS_MAC9
static int cache_limit = 256; // 256 KB cache limit
#else
static int cache_limit = 1024; // 1024 KB cache limit
@@ -305,7 +305,7 @@ int TQPixmapCache::cacheLimit()
void TQPixmapCache::setCacheLimit( int n )
{
-#ifdef Q_WS_MAC9
+#ifdef TQ_WS_MAC9
if(n > 256)
tqWarning("TQPixmapCache::setCacheLimit: Setting cache limits high is harmfull to mac9's health");
#endif
diff --git a/src/kernel/qprinter.cpp b/src/kernel/qprinter.cpp
index 2c89b6ad..37ef9af8 100644
--- a/src/kernel/qprinter.cpp
+++ b/src/kernel/qprinter.cpp
@@ -518,7 +518,7 @@ void TQPrinter::setCreator( const TQString &creator )
void TQPrinter::setOrientation( Orientation orientation )
{
orient = orientation;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
reinit();
#endif
}
@@ -555,7 +555,7 @@ void TQPrinter::setPageSize( PageSize newPageSize )
return;
}
page_size = newPageSize;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
reinit();
#endif
}
@@ -577,7 +577,7 @@ void TQPrinter::setPageSize( PageSize newPageSize )
void TQPrinter::setPageOrder( PageOrder newPageOrder )
{
page_order = newPageOrder;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
reinit();
#endif
}
@@ -608,7 +608,7 @@ TQPrinter::PageOrder TQPrinter::pageOrder() const
void TQPrinter::setColorMode( ColorMode newColorMode )
{
color_mode = newColorMode;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
reinit();
#endif
}
@@ -818,7 +818,7 @@ void TQPrinter::setCollateCopies(bool on)
void TQPrinter::setNumCopies( int numCopies )
{
ncopies = numCopies;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
reinit();
#endif
}
@@ -948,7 +948,7 @@ int TQPrinter::resolution() const
void TQPrinter::setPaperSource( PaperSource source )
{
paper_source = source;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
reinit();
#endif
}
diff --git a/src/kernel/qprinter_unix.cpp b/src/kernel/qprinter_unix.cpp
index 5141f7b1..3fed326c 100644
--- a/src/kernel/qprinter_unix.cpp
+++ b/src/kernel/qprinter_unix.cpp
@@ -126,7 +126,7 @@ TQPrinter::TQPrinter( PrinterMode m )
paper_source = OnlyOne;
switch ( m ) {
case ScreenResolution:
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
res = 72;
#else
res = TQPaintDevice::x11AppDpiY();
diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp
index d8bb1d46..d1678fa3 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/qpsprinter.cpp
@@ -85,7 +85,7 @@
#include
#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)
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp
index 43935513..ecc30407 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
@@ -74,7 +74,7 @@ class TQTextFormatCollection;
const int border_tolerance = 2;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#include "qt_windows.h"
#endif
@@ -91,18 +91,18 @@ static inline int scale( int value, TQPainter *painter )
{
if ( is_printer( painter ) ) {
TQPaintDeviceMetrics metrics( painter->device() );
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
value = value * metrics.logicalDpiY() /
TQPaintDevice::x11AppDpiY( painter->device()->x11Screen() );
-#elif defined (Q_WS_WIN)
+#elif defined (TQ_WS_WIN)
HDC hdc = GetDC( 0 );
int gdc = GetDeviceCaps( hdc, LOGPIXELSY );
if ( gdc )
value = value * metrics.logicalDpiY() / gdc;
ReleaseDC( 0, hdc );
-#elif defined (Q_WS_MAC)
+#elif defined (TQ_WS_MAC)
value = value * metrics.logicalDpiY() / 75; // ##### FIXME
-#elif defined (Q_WS_QWS)
+#elif defined (TQ_WS_QWS)
value = value * metrics.logicalDpiY() / 75;
#endif
}
@@ -519,7 +519,7 @@ void TQTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArrayrect().y() ) {
pos.setY( s->rect().y() );
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
pos.setX( s->rect().x() );
#endif
}
@@ -684,7 +684,7 @@ bool TQTextCursor::place( const TQPoint &p, TQTextParagraph *s, bool link, bool
if ( pos.y() >= r.y() && pos.y() <= r.y() + r.height() )
break;
if ( loosePlacing == TRUE && !s->next() ) {
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
pos.setX( s->rect().x() + s->rect().width() );
#endif
break;
@@ -4020,7 +4020,7 @@ int TQTextString::width( int idx ) const
{
int r = c->c.row();
if(r < 0x06
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
// Uniscribe's handling of Asian makes the condition below fail.
|| (r > 0x1f && !(r > 0xd7 && r < 0xe0))
#endif
@@ -4731,7 +4731,7 @@ void TQTextParagraph::setColorForSelection( TQColor &color, TQPainter &painter,
document()->selectionColor( selection ) :
cg.color( TQColorGroup::Highlight );
if ( selection == TQTextDocument::IMCompositionText ) {
-#ifndef Q_WS_MACX
+#ifndef TQ_WS_MACX
int h1, s1, v1, h2, s2, v2;
cg.color( TQColorGroup::Base ).hsv( &h1, &s1, &v1 );
cg.color( TQColorGroup::Background ).hsv( &h2, &s2, &v2 );
@@ -6063,7 +6063,7 @@ void TQTextFormatCollection::setPaintDevice( TQPaintDevice *pd )
{
paintdevice = pd;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
int scr = ( paintdevice ) ? paintdevice->x11Screen() : TQPaintDevice::x11AppScreen();
defFormat->fn.x11SetScreen( scr );
@@ -6076,7 +6076,7 @@ void TQTextFormatCollection::setPaintDevice( TQPaintDevice *pd )
format->fn.x11SetScreen( scr );
format->update();
}
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
}
TQTextFormat *TQTextFormatCollection::format( TQTextFormat *f )
@@ -6695,7 +6695,7 @@ void TQTextImage::adjustToPainter( TQPainter* p )
height = scale( tmpheight, p );
}
-#if !defined(Q_WS_X11)
+#if !defined(TQ_WS_X11)
#include
#include
static TQPixmap *qrt_selection = 0;
@@ -6744,7 +6744,7 @@ void TQTextImage::draw( TQPainter* p, int x, int y, int cx, int cy, int cw, int
p->drawPixmap( cx , cy, pm, cx - x, cy - y, cw, ch );
if ( selected && placement() == PlaceInline && is_printer( p ) ) {
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
p->fillRect( TQRect( TQPoint( x, y ), pm.size() ), TQBrush( cg.highlight(), TQBrush::Dense4Pattern) );
#else // in WIN32 Dense4Pattern doesn't work correctly (transparency problem), so work around it
if ( !qrt_selection )
diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/qscriptengine.cpp
index 7cb8848f..19ca36e9 100644
--- a/src/kernel/qscriptengine.cpp
+++ b/src/kernel/qscriptengine.cpp
@@ -404,7 +404,7 @@ static bool basic_shape(TQShaperItem *item)
enum {
CcmpProperty = 0x1
};
-#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
+#if defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
static const TQOpenType::Features hebrew_features[] = {
{ FT_MAKE_TAG('c', 'c', 'm', 'p'), CcmpProperty },
{0, 0}
@@ -419,7 +419,7 @@ static bool hebrew_shape(TQShaperItem *item)
{
Q_ASSERT(item->script == TQFont::Hebrew);
-#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
+#if defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
TQOpenType *openType = item->font->openType();
if (openType && openType->supportsScript(item->script)) {
@@ -1460,7 +1460,7 @@ static void shapedString(const TQString *uc, int from, int len, TQChar *shapeBuf
*shapedLength = data - shapeBuffer;
}
-#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
+#if defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
enum {
InitProperty = 0x2,
@@ -1582,7 +1582,7 @@ static bool arabic_shape(TQShaperItem *item)
{
Q_ASSERT(item->script == TQFont::Arabic);
-#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
+#if defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
TQOpenType *openType = item->font->openType();
if (openType && openType->supportsScript(TQFont::Arabic)) {
@@ -1613,12 +1613,12 @@ static bool arabic_shape(TQShaperItem *item)
return TRUE;
}
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
# include "qscriptengine_x11.cpp"
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
# include "qscriptengine_win.cpp"
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
# include "qscriptengine_mac.cpp"
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
# include "qscriptengine_qws.cpp"
#endif
diff --git a/src/kernel/qsizegrip.cpp b/src/kernel/qsizegrip.cpp
index 5dbaaa32..7b8140c6 100644
--- a/src/kernel/qsizegrip.cpp
+++ b/src/kernel/qsizegrip.cpp
@@ -46,13 +46,13 @@
#include "ntqapplication.h"
#include "ntqstyle.h"
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
#include "qt_x11_p.h"
extern Atom qt_sizegrip; // defined in qapplication_x11.cpp
-#elif defined (Q_WS_WIN )
+#elif defined (TQ_WS_WIN )
#include "ntqobjectlist.h"
#include "qt_windows.h"
-#elif defined(Q_WS_MAC)
+#elif defined(TQ_WS_MAC)
bool qt_mac_update_sizer(TQWidget *, int); //qwidget_mac.cpp
#endif
@@ -112,7 +112,7 @@ TQSizeGrip::TQSizeGrip( TQWidget * parent, const char* name )
: TQWidget( parent, name )
{
#ifndef TQT_NO_CURSOR
-#ifndef Q_WS_MAC
+#ifndef TQ_WS_MAC
if ( TQApplication::reverseLayout() )
setCursor( sizeBDiagCursor );
else
@@ -120,7 +120,7 @@ TQSizeGrip::TQSizeGrip( TQWidget * parent, const char* name )
#endif
#endif
setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( !qt_sizegrip_workspace( this ) ) {
WId id = winId();
XChangeProperty(tqt_xdisplay(), topLevelWidget()->winId(),
@@ -140,7 +140,7 @@ TQSizeGrip::TQSizeGrip( TQWidget * parent, const char* name )
*/
TQSizeGrip::~TQSizeGrip()
{
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( !TQApplication::closingDown() && parentWidget() ) {
WId id = None;
XChangeProperty(tqt_xdisplay(), topLevelWidget()->winId(),
@@ -232,7 +232,7 @@ void TQSizeGrip::mouseMoveEvent( TQMouseEvent * e )
} else {
tlw->resize( w, h );
}
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
MSG msg;
while( PeekMessage( &msg, winId(), WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE ) )
;
@@ -250,7 +250,7 @@ bool TQSizeGrip::eventFilter( TQObject *o, TQEvent *e )
{
if ( o == tlw ) {
switch ( e->type() ) {
-#ifndef Q_WS_MAC
+#ifndef TQ_WS_MAC
/* The size grip goes no where on Mac OS X when you maximize! --Sam */
case TQEvent::ShowMaximized:
#endif
@@ -264,7 +264,7 @@ bool TQSizeGrip::eventFilter( TQObject *o, TQEvent *e )
break;
}
} else if(o == this) {
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
switch(e->type()) {
case TQEvent::Hide:
case TQEvent::Show:
diff --git a/src/kernel/qtextengine.cpp b/src/kernel/qtextengine.cpp
index d23f21e9..48839b5c 100644
--- a/src/kernel/qtextengine.cpp
+++ b/src/kernel/qtextengine.cpp
@@ -875,11 +875,11 @@ static void calcLineBreaks(const TQString &str, TQCharAttributes *charAttributes
}
}
-#if defined( Q_WS_X11 ) || defined ( Q_WS_QWS )
+#if defined( TQ_WS_X11 ) || defined ( TQ_WS_QWS )
# include "qtextengine_unix.cpp"
-#elif defined( Q_WS_WIN )
+#elif defined( TQ_WS_WIN )
# include "qtextengine_win.cpp"
-#elif defined( Q_WS_MAC )
+#elif defined( TQ_WS_MAC )
# include "qtextengine_mac.cpp"
#endif
@@ -888,7 +888,7 @@ static void calcLineBreaks(const TQString &str, TQCharAttributes *charAttributes
TQTextEngine::TQTextEngine( const TQString &str, TQFontPrivate *f )
: string( str ), fnt( f ), direction( TQChar::DirON ), haveCharAttributes( FALSE ), widthOnly( FALSE )
{
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
if ( !resolvedUsp10 )
resolveUsp10();
#endif
@@ -983,7 +983,7 @@ const TQCharAttributes *TQTextEngine::attributes()
for ( int i = 0; i < items.size(); i++ ) {
TQScriptItem &si = items[i];
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
int script = uspScriptForItem(this, i);
#else
int script = si.analysis.script;
diff --git a/src/kernel/qtextengine_p.h b/src/kernel/qtextengine_p.h
index 04faa33b..751cdf04 100644
--- a/src/kernel/qtextengine_p.h
+++ b/src/kernel/qtextengine_p.h
@@ -86,7 +86,7 @@ struct glyph_metrics_t
int yoff;
};
-#if defined( Q_WS_X11 ) || defined ( Q_WS_QWS )
+#if defined( TQ_WS_X11 ) || defined ( TQ_WS_QWS )
typedef unsigned short glyph_t;
struct qoffset_t {
@@ -112,7 +112,7 @@ struct TQScriptAnalysis
};
-#elif defined( Q_WS_MAC )
+#elif defined( TQ_WS_MAC )
typedef unsigned short glyph_t;
@@ -139,7 +139,7 @@ struct TQScriptAnalysis
};
-#elif defined( Q_WS_WIN )
+#elif defined( TQ_WS_WIN )
// do not change the definitions below unless you know what you are doing!
// it is designed to be compatible with the types found in uniscribe.
diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp
index 7439cba4..99d47585 100644
--- a/src/kernel/qtranslator.cpp
+++ b/src/kernel/qtranslator.cpp
@@ -210,7 +210,7 @@ public:
#ifndef TQT_NO_TRANSLATION_BUILDER
TQMap * messages;
#endif
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
int oldPermissionLookup;
#endif
};
@@ -340,7 +340,7 @@ public:
explicitly documented as such.
*/
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
extern int qt_ntfs_permission_lookup;
#endif
@@ -353,7 +353,7 @@ TQTranslator::TQTranslator( TQObject * parent, const char * name )
: TQObject( parent, name )
{
d = new TQTranslatorPrivate;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
d->oldPermissionLookup = qt_ntfs_permission_lookup;
#endif
}
@@ -419,7 +419,7 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory,
TQString prefix;
if ( filename[0] == '/'
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
|| (filename[0] && filename[1] == ':') || filename[0] == '\\'
#endif
)
@@ -438,7 +438,7 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory,
delims = search_delimiters.isNull() ?
TQString::fromLatin1( "_." ) : search_delimiters;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
qt_ntfs_permission_lookup--;
#endif
for ( ;; ) {
@@ -463,7 +463,7 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory,
// no truncations? fail
if ( rightmost == 0 ) {
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if (d->oldPermissionLookup != qt_ntfs_permission_lookup)
qt_ntfs_permission_lookup++;
#endif
@@ -472,7 +472,7 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory,
fname.truncate( rightmost );
}
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if (d->oldPermissionLookup != qt_ntfs_permission_lookup)
qt_ntfs_permission_lookup++;
#endif
diff --git a/src/kernel/qurl.cpp b/src/kernel/qurl.cpp
index f097eac2..827e6875 100644
--- a/src/kernel/qurl.cpp
+++ b/src/kernel/qurl.cpp
@@ -78,7 +78,7 @@ static void slashify( TQString& s, bool allowMultiple = TRUE )
}
if ( s[ i ] == '\\' )
s[ i ] = '/';
-#if defined (Q_WS_MAC9)
+#if defined (TQ_WS_MAC9)
if ( s[ i ] == ':' && (i == (int)s.length()-1 || s[ i + 1 ] != '/' ) ) //mac colon's go away, unless after a protocol
s[ i ] = '/';
#endif
@@ -1106,7 +1106,7 @@ bool TQUrl::isLocalFile() const
TQString TQUrl::fileName() const
{
if ( d->path.isEmpty() || d->path.endsWith( "/" )
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
|| d->path.endsWith( "\\" )
#endif
)
diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp
index 0e9c606a..1af274c6 100644
--- a/src/kernel/qwidget.cpp
+++ b/src/kernel/qwidget.cpp
@@ -62,11 +62,11 @@
#if defined(QT_ACCESSIBILITY_SUPPORT)
#include "ntqaccessible.h"
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
#include "qt_windows.h"
#include "qinputcontext_p.h"
#endif
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
#include "qwsmanager_qws.h"
#endif
#include "qfontdata_p.h"
@@ -455,7 +455,7 @@
in the file qapp_xxx.cpp.
*****************************************************************************/
-#if defined(Q_WS_QWS) || defined(Q_OS_TEMP)
+#if defined(TQ_WS_QWS) || defined(Q_OS_TEMP)
static const int WDictSize = 163; // plenty for small devices
#else
static const int WDictSize = 1123; // plenty for 5 big complex windows
@@ -558,7 +558,7 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) {
s.setWidth( TQMAX( s.width(), 200 ) );
if ( exp & TQSizePolicy::Vertically )
s.setHeight( TQMAX( s.height(), 150 ) );
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
TQRect screen = TQApplication::desktop()->screenGeometry( w->x11Screen() );
#else // all others
TQRect screen = TQApplication::desktop()->screenGeometry( w->pos() );
@@ -883,7 +883,7 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) {
TQWidget::TQWidget( TQWidget *parent, const char *name, WFlags f, NFlags n )
: TQObject( parent, name ), TQPaintDevice( TQInternal::Widget )
{
-#if defined(QT_CHECK_STATE) && !defined(Q_WS_WIN)
+#if defined(QT_CHECK_STATE) && !defined(TQ_WS_WIN)
if ( tqApp->type() == TQApplication::Tty ) {
tqWarning( "TQWidget: Cannot create a TQWidget when no GUI "
"is being used" );
@@ -924,9 +924,9 @@ TQWidget::TQWidget( TQWidget *parent, const char *name, WFlags f, NFlags n )
#endif
if ( ! isTopLevel() )
fnt = parentWidget()->font();
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
fnt.x11SetScreen( x11Screen() );
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
if ( !isDesktop() )
setBackgroundFromMode(); //### parts of this are done in create but not all (see reparent(...) )
@@ -1100,7 +1100,7 @@ void TQWidget::setWinId( WId id ) // set widget identifier
if ( winid )
mapper->remove( winid );
winid = id;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
hd = id; // X11: hd == ident
#endif
if ( id )
@@ -1139,7 +1139,7 @@ void TQWidget::createTLExtra()
createExtra();
if ( !extra->topextra ) {
TQTLWExtra* x = extra->topextra = new TQTLWExtra;
-#if defined( Q_WS_WIN ) || defined( Q_WS_MAC )
+#if defined( TQ_WS_WIN ) || defined( TQ_WS_MAC )
x->opacity = 255;
#endif
#ifndef TQT_NO_WIDGET_TOPEXTRA
@@ -1150,7 +1150,7 @@ void TQWidget::createTLExtra()
x->incw = x->inch = 0;
x->basew = x->baseh = 0;
x->normalGeometry = TQRect(0,0,-1,-1);
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
x->embedded = 0;
x->parentWinId = 0;
x->spont_unmapped = 0;
@@ -1159,7 +1159,7 @@ void TQWidget::createTLExtra()
x->ussize = 0;
#endif
x->savedFlags = 0;
-#if defined(Q_WS_QWS) && !defined(TQT_NO_QWS_MANAGER)
+#if defined(TQ_WS_QWS) && !defined(TQT_NO_QWS_MANAGER)
x->decor_allocated_region = TQRegion();
x->qwsManager = 0;
#endif
@@ -1221,7 +1221,7 @@ void TQWidget::deleteExtra()
delete extra->topextra->icon;
#endif
delete extra->topextra->focusData;
-#if defined(Q_WS_QWS) && !defined(TQT_NO_QWS_MANAGER)
+#if defined(TQ_WS_QWS) && !defined(TQT_NO_QWS_MANAGER)
delete extra->topextra->qwsManager;
#endif
delete extra->topextra;
@@ -1246,7 +1246,7 @@ void TQWidget::deactivateWidgetCleanup()
if ( this == TQApplication::active_window )
tqApp->setActiveWindow( 0 );
// If the is the active mouse press widget, reset it
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
extern TQGuardedPtr qt_button_down;
#else
extern TQWidget *qt_button_down;
@@ -1768,7 +1768,7 @@ void TQWidget::setEnabled( bool enable )
}
}
}
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( testWState( WState_OwnCursor ) ) {
// enforce the windows behavior of clearing the cursor on
// disabled widgets
@@ -1777,7 +1777,7 @@ void TQWidget::setEnabled( bool enable )
tqt_x11_enforce_cursor( this );
}
#endif
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
TQInputContext::enable( this, im_enabled & !((bool)testWState(WState_Disabled)) );
#endif
}
@@ -2549,7 +2549,7 @@ void TQWidget::setBackgroundFromMode()
r = TQColorGroup::ButtonText;
break;
case X11ParentRelative:
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
setBackgroundX11Relative();
#endif
return;
@@ -3000,7 +3000,7 @@ void TQWidget::setFont( const TQFont &font )
return;
TQFont old = fnt;
fnt = font.resolve( qt_naturalWidgetFont( this ) );
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
// make sure the font set on this widget is associated with the correct screen
fnt.x11SetScreen( x11Screen() );
#endif
@@ -3298,7 +3298,7 @@ void TQWidget::setFocus()
TQFocusData * f = focusData( TRUE );
if ( f->it.current() == this && tqApp->focusWidget() == this
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
&& GetFocus() == winId()
#endif
)
@@ -3318,7 +3318,7 @@ void TQWidget::setFocus()
if ( isActiveWindow() ) {
TQWidget * prev = tqApp->focus_widget;
if ( prev ) {
- // This part is never executed when Q_WS_X11? Preceding XFocusOut
+ // This part is never executed when TQ_WS_X11? Preceding XFocusOut
// had already reset focus_widget when received XFocusIn
// Don't reset input context explicitly here. Whether reset or not
@@ -3337,7 +3337,7 @@ void TQWidget::setFocus()
#endif
}
}
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
else {
TQInputContext::endComposition();
}
@@ -3346,7 +3346,7 @@ void TQWidget::setFocus()
if( isInputMethodEnabled() )
focusInputContext();
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( !topLevelWidget()->isPopup() )
SetFocus( winId() );
else {
@@ -3354,7 +3354,7 @@ void TQWidget::setFocus()
#if defined(QT_ACCESSIBILITY_SUPPORT)
TQAccessible::updateAccessibility( this, 0, TQAccessible::Focus );
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
}
#endif
@@ -3392,7 +3392,7 @@ void TQWidget::clearFocus()
focusProxy()->clearFocus();
return;
} else if ( hasFocus() ) {
-#if !defined(Q_WS_X11)
+#if !defined(TQ_WS_X11)
resetInputContext();
#else
unfocusInputContext();
@@ -3402,7 +3402,7 @@ void TQWidget::clearFocus()
tqApp->focus_widget = 0;
TQFocusEvent out( TQEvent::FocusOut );
TQApplication::sendEvent( w, &out );
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( !isPopup() && GetFocus() == winId() )
SetFocus( 0 );
else {
@@ -3410,7 +3410,7 @@ void TQWidget::clearFocus()
#if defined(QT_ACCESSIBILITY_SUPPORT)
TQAccessible::updateAccessibility( this, 0, TQAccessible::Focus );
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
}
#endif
}
@@ -3540,7 +3540,7 @@ TQFocusData * TQWidget::focusData( bool create )
void TQWidget::setInputMethodEnabled( bool b )
{
im_enabled = b;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
TQInputContext::enable( this, im_enabled & !((bool)testWState(WState_Disabled)) );
#endif
}
@@ -3629,7 +3629,7 @@ bool TQWidget::isActiveWindow() const
}
}
#endif
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
HWND parent = tlw->winId();
HWND topparent = GetActiveWindow();
while ( parent ) {
@@ -4056,7 +4056,7 @@ void TQWidget::show()
// On Windows, show the popup now so that our own focus handling
// stores the correct old focus widget even if it's stolen in the showevent
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( testWFlags(WType_Popup) )
tqApp->openPopup( this );
#endif
@@ -4077,7 +4077,7 @@ void TQWidget::show()
else
showWindow();
-#if !defined(Q_WS_WIN)
+#if !defined(TQ_WS_WIN)
if ( testWFlags(WType_Popup) )
tqApp->openPopup( this );
#endif
@@ -4119,7 +4119,7 @@ void TQWidget::hide()
if ( testWFlags(WShowModal) )
tqt_leave_modal( this );
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( isTopLevel() && !isPopup() && parentWidget() && isActiveWindow() )
parentWidget()->setActiveWindow(); // Activate parent
#endif
@@ -4543,7 +4543,7 @@ void TQWidget::adjustSize()
if ( isTopLevel() ) {
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
TQRect screen = TQApplication::desktop()->screenGeometry( x11Screen() );
#else // all others
TQRect screen = TQApplication::desktop()->screenGeometry( pos() );
@@ -4923,7 +4923,7 @@ bool TQWidget::event( TQEvent *e )
case TQEvent::ApplicationPaletteChange:
if ( !own_palette && !isDesktop() )
unsetPalette();
-# if defined(Q_WS_QWS) && !defined (TQT_NO_QWS_MANAGER)
+# if defined(TQ_WS_QWS) && !defined (TQT_NO_QWS_MANAGER)
if ( isTopLevel() && topData()->qwsManager ) {
TQRegion r( topData()->qwsManager->region() );
TQApplication::postEvent(topData()->qwsManager, new TQPaintEvent(r, FALSE) );
@@ -5568,7 +5568,7 @@ void TQWidget::hideEvent( TQHideEvent * )
*/
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
/*!
This special event handler can be reimplemented in a subclass to
@@ -5590,7 +5590,7 @@ bool TQWidget::macEvent( MSG * )
}
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
/*!
This special event handler can be reimplemented in a subclass to
@@ -5611,7 +5611,7 @@ bool TQWidget::winEvent( MSG * )
}
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
/*!
This special event handler can be reimplemented in a subclass to
@@ -5632,7 +5632,7 @@ bool TQWidget::x11Event( XEvent * )
}
#endif
-#if defined(Q_WS_QWS)
+#if defined(TQ_WS_QWS)
/*!
This special event handler can be reimplemented in a subclass to
diff --git a/src/kernel/qwidget_p.h b/src/kernel/qwidget_p.h
index 4308f95a..b56b4960 100644
--- a/src/kernel/qwidget_p.h
+++ b/src/kernel/qwidget_p.h
@@ -57,7 +57,7 @@
#ifndef QT_H
#endif // QT_H
-#if defined (Q_WS_X11) || defined (Q_WS_QWS)
+#if defined (TQ_WS_X11) || defined (TQ_WS_QWS)
extern int qt_widget_tlw_gravity;
#endif
diff --git a/src/kernel/qwmatrix.cpp b/src/kernel/qwmatrix.cpp
index eb8324f3..dae4bc74 100644
--- a/src/kernel/qwmatrix.cpp
+++ b/src/kernel/qwmatrix.cpp
@@ -41,7 +41,7 @@
#include "ntqwmatrix.h"
#include "ntqdatastream.h"
#include "ntqregion.h"
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
double qsincos( double, bool calcCos ); // defined in qpainter_x11.cpp
#else
#include
@@ -851,7 +851,7 @@ const double deg2rad = 0.017453292519943295769; // pi/180
TQWMatrix &TQWMatrix::rotate( double a )
{
double b = deg2rad*a; // convert to radians
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
double sina = qsincos(b,FALSE); // fast and convenient
double cosa = qsincos(b,TRUE);
#else
diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp
index 797392cc..7a23afbf 100644
--- a/src/network/qftp.cpp
+++ b/src/network/qftp.cpp
@@ -515,7 +515,7 @@ bool TQFtpDTP::parseDir( const TQString &buffer, const TQString &userName, TQUrl
void TQFtpDTP::socketConnected()
{
-#if !defined (Q_WS_QWS)
+#if !defined (TQ_WS_QWS)
// Use a large send buffer to reduce the number
// of writeBlocks when download and uploading files.
// The actual size used here (128k) is default on most
diff --git a/src/opengl/ntqgl.h b/src/opengl/ntqgl.h
index 4b065716..858a9649 100644
--- a/src/opengl/ntqgl.h
+++ b/src/opengl/ntqgl.h
@@ -61,11 +61,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
@@ -83,12 +83,12 @@ TQM_EXPORT_OPENGL inline const char *qGLVersion() {
# include
#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
@@ -202,14 +202,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& f, int bufDepth = 1 );
virtual void* chooseVisual();
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
virtual void* chooseMacVisual(GDHandle);
#endif
@@ -225,16 +225,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
@@ -252,14 +252,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
@@ -359,9 +359,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
@@ -372,7 +372,7 @@ private: // Disabled copy constructor and operator=
TQGLWidget& operator=( const TQGLWidget& );
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
private:
const TQGLContext *slcx;
uint pending_fix : 1,
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 0732bca0..83b27a0c 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -48,7 +48,7 @@
static TQGLFormat* qgl_default_format = 0;
static TQGLFormat* qgl_default_overlay_format = 0;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
#include "private/qt_x11_p.h"
#define INT32 dummy_INT32
#define INT8 dummy_INT8
@@ -886,18 +886,18 @@ void TQGLContext::init( TQPaintDevice *dev )
{
d = new Private;
d->valid = FALSE;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
qt_resolve_gl_symbols();
gpm = 0;
#endif
setDevice( dev );
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
dc = 0;
win = 0;
pixelFormatId = 0;
cmap = 0;
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
d->oldR = TQRect(1, 1, 1, 1);
#endif
d->crWin = FALSE;
@@ -1408,7 +1408,7 @@ TQGLWidget::~TQGLWidget()
if ( doRelease )
glXReleaseBuffersMESA( x11Display(), winId() );
#endif
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
if(gl_pix) {
delete gl_pix;
gl_pix = NULL;
@@ -1500,7 +1500,7 @@ bool TQGLWidget::isSharing() const
void TQGLWidget::makeCurrent()
{
-#if defined( Q_WS_MAC )
+#if defined( TQ_WS_MAC )
macInternalDoubleBuffer(); //make sure the correct context is used
#endif
glcx->makeCurrent();
@@ -1535,7 +1535,7 @@ void TQGLWidget::doneCurrent()
void TQGLWidget::swapBuffers()
{
glcx->swapBuffers();
-#if defined(Q_WS_MAC)
+#if defined(TQ_WS_MAC)
if(macInternalDoubleBuffer() && gl_pix)
bitBlt(this, 0, 0, gl_pix);
#endif
@@ -1824,7 +1824,7 @@ TQPixmap TQGLWidget::renderPixmap( int w, int h, bool useContext )
if ( (w > 0) && (h > 0) )
sz = TQSize( w, h );
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
TQPixmap pm( sz.width(), sz.height(), x11Depth() );
bool needConversion = x11Visual() != TQPaintDevice::x11AppVisual();
@@ -1869,7 +1869,7 @@ TQPixmap TQGLWidget::renderPixmap( int w, int h, bool useContext )
ocx->makeCurrent();
if ( success ) {
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
if ( needConversion ) {
TQImage image = pm.convertToImage();
TQPixmap p;
@@ -1894,7 +1894,7 @@ TQPixmap TQGLWidget::renderPixmap( int w, int h, bool useContext )
*/
TQImage TQGLWidget::grabFrameBuffer( bool withAlpha )
{
-#if defined( Q_WS_MAC )
+#if defined( TQ_WS_MAC )
if(dblbuf == macInternalDoubleBuffer(FALSE) && gl_pix) //why not optimize?
return ((TQPixmap*)gl_pix)->convertToImage();
#endif
@@ -1928,7 +1928,7 @@ TQImage TQGLWidget::grabFrameBuffer( bool withAlpha )
res.setAlphaBuffer( withAlpha && format().alpha() );
}
else {
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
res = TQImage( w, h, 8 );
glReadPixels( 0, 0, w, h, GL_COLOR_INDEX, GL_UNSIGNED_BYTE,
res.bits() );
@@ -1987,7 +1987,7 @@ void TQGLWidget::glDraw()
swapBuffers();
} else {
glFlush();
-#if defined( Q_WS_MAC )
+#if defined( TQ_WS_MAC )
if(dblbuf && gl_pix)
bitBlt(this, 0, 0, gl_pix);
#endif
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index 6a74127d..51daa176 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -40,7 +40,7 @@
#include "ntqgl.h"
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
#include "ntqmap.h"
#include "ntqpixmap.h"
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 3bedbb8c..e4141f27 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -1535,7 +1535,7 @@ void TQODBCDriver::cleanup()
// as two byte unicode characters
void TQODBCPrivate::checkUnicode()
{
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( !qt_winunicode ) {
unicode = FALSE;
return;
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp
index b7b7aa5e..110eccfc 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp
@@ -18,7 +18,7 @@
#include
#include
#include
-#if !defined Q_WS_WIN32
+#if !defined TQ_WS_WIN32
# include
#endif
#include
@@ -160,7 +160,7 @@ bool TQSQLiteResultPrivate::fetchNext(TQtSqlCachedResult::RowCache* row)
// keep trying while busy, wish I could implement this better.
while ((res = sqlite_step(currentMachine, &colNum, &fvals, &cnames)) == SQLITE_BUSY) {
// sleep instead requesting result again immidiately.
-#if defined Q_WS_WIN32
+#if defined TQ_WS_WIN32
Sleep(1000);
#else
sleep(1);
diff --git a/src/sql/drivers/sqlite3/qsql_sqlite3.cpp b/src/sql/drivers/sqlite3/qsql_sqlite3.cpp
index a0d9ac55..763c648a 100644
--- a/src/sql/drivers/sqlite3/qsql_sqlite3.cpp
+++ b/src/sql/drivers/sqlite3/qsql_sqlite3.cpp
@@ -20,7 +20,7 @@
#include
#include
#include
-#if !defined Q_WS_WIN32
+#if !defined TQ_WS_WIN32
# include
#endif
diff --git a/src/styles/qstylefactory.cpp b/src/styles/qstylefactory.cpp
index 576104cd..cf494018 100644
--- a/src/styles/qstylefactory.cpp
+++ b/src/styles/qstylefactory.cpp
@@ -61,7 +61,7 @@
#include "qpocketpcstyle_wce.h"
#endif
-#if !defined( TQT_NO_STYLE_MAC ) && defined( Q_WS_MAC )
+#if !defined( TQT_NO_STYLE_MAC ) && defined( TQ_WS_MAC )
TQString p2qstring(const unsigned char *c); //qglobal.cpp
#include "qt_mac.h"
#include "qmacstyle_mac.h"
@@ -172,7 +172,7 @@ TQStyle *TQStyleFactory::create( const TQString& key )
if ( style == "pocketpc" )
ret = new TQPocketPCStyle;
#endif
-#if !defined( TQT_NO_STYLE_MAC ) && defined( Q_WS_MAC )
+#if !defined( TQT_NO_STYLE_MAC ) && defined( TQ_WS_MAC )
if( style.left(9) == "macintosh" )
ret = new TQMacStyle;
#endif
@@ -247,7 +247,7 @@ TQStringList TQStyleFactory::keys()
if ( !list.contains( "Aqua" ) )
list << "Aqua";
#endif
-#if !defined( TQT_NO_STYLE_MAC ) && defined( Q_WS_MAC )
+#if !defined( TQT_NO_STYLE_MAC ) && defined( TQ_WS_MAC )
TQString mstyle = "Macintosh";
Collection c = NewCollection();
if (c) {
diff --git a/src/table/qtable.cpp b/src/table/qtable.cpp
index 1d07d514..c6ba6ddb 100644
--- a/src/table/qtable.cpp
+++ b/src/table/qtable.cpp
@@ -2911,7 +2911,7 @@ void TQTable::paintCell( TQPainter* p, int row, int col,
{
if ( cr.width() == 0 || cr.height() == 0 )
return;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
const TQColorGroup &cg = ( !drawActiveSelection && style().styleHint( TQStyle::SH_ItemView_ChangeHighlightOnFocus ) ? palette().inactive() : colorGroup() );
#else
const TQColorGroup &cg = colorGroup();
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index f249b705..edd27d43 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -552,7 +552,7 @@
/*
- 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
@@ -565,39 +565,50 @@
#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) && !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)) && !defined(Q_WS_QWS) && !defined(Q_WS_X11)
+#if (defined(TQ_WS_MAC9) || defined(TQ_WS_MACX)) && !defined(TQ_WS_QWS) && !defined(TQ_WS_X11)
# define Q_WS_MAC
+# define TQ_WS_MAC
#endif
@@ -802,7 +813,7 @@ class TQString;
# 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
@@ -815,7 +826,7 @@ class TQString;
# 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
@@ -824,7 +835,7 @@ class TQString;
# endif
#endif
-#if !defined(Q_WS_QWS) && !defined(TQT_NO_COP)
+#if !defined(TQ_WS_QWS) && !defined(TQT_NO_COP)
# define TQT_NO_COP
#endif
@@ -891,7 +902,7 @@ class TQString;
// Some platform specific stuff
//
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
extern TQ_EXPORT bool qt_winunicode;
#endif
@@ -905,7 +916,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/src/tools/qcom_p.h b/src/tools/qcom_p.h
index ab390e7f..e11d63f2 100644
--- a/src/tools/qcom_p.h
+++ b/src/tools/qcom_p.h
@@ -311,7 +311,7 @@ public: \
return iface;
#endif // Q_CREATE_INSTANCE
-# ifdef Q_WS_WIN
+# ifdef TQ_WS_WIN
# ifdef Q_CC_BOR
# define Q_EXPORT_COMPONENT() \
Q_UCM_VERIFICATION_DATA \
diff --git a/src/tools/qcriticalsection_p.h b/src/tools/qcriticalsection_p.h
index 6fda0f3a..330e141e 100644
--- a/src/tools/qcriticalsection_p.h
+++ b/src/tools/qcriticalsection_p.h
@@ -56,7 +56,7 @@
#if defined(TQT_THREAD_SUPPORT)
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
/*
TQCriticalSection
diff --git a/src/tools/qdatetime.cpp b/src/tools/qdatetime.cpp
index e30f3e75..51f0e51d 100644
--- a/src/tools/qdatetime.cpp
+++ b/src/tools/qdatetime.cpp
@@ -517,7 +517,7 @@ TQString TQDate::shortMonthName( int month )
month = 1;
}
#endif
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
char buffer[255];
tm tt;
memset( &tt, 0, sizeof( tm ) );
@@ -563,7 +563,7 @@ TQString TQDate::longMonthName( int month )
month = 1;
}
#endif
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
char buffer[255];
tm tt;
memset( &tt, 0, sizeof( tm ) );
@@ -617,7 +617,7 @@ TQString TQDate::shortDayName( int weekday )
weekday = 1;
}
#endif
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
char buffer[255];
tm tt;
memset( &tt, 0, sizeof( tm ) );
@@ -665,7 +665,7 @@ TQString TQDate::longDayName( int weekday )
weekday = 1;
}
#endif
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
char buffer[255];
tm tt;
memset( &tt, 0, sizeof( tm ) );
@@ -731,7 +731,7 @@ TQString TQDate::toString( TQt::DateFormat f ) const
switch ( f ) {
case TQt::LocalDate:
{
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
tm tt;
memset( &tt, 0, sizeof( tm ) );
char buf[255];
@@ -1397,7 +1397,7 @@ TQString TQTime::toString( TQt::DateFormat f ) const
switch ( f ) {
case TQt::LocalDate:
{
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
tm tt;
memset( &tt, 0, sizeof( tm ) );
char buf[255];
@@ -2112,7 +2112,7 @@ TQString TQDateTime::toString( TQt::DateFormat f ) const
}
#ifndef TQT_NO_TEXTDATE
else if ( f == TQt::TextDate ) {
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
TQString buf = d.shortDayName( d.dayOfWeek() );
buf += ' ';
buf += d.shortMonthName( d.month() );
diff --git a/src/tools/qdir.cpp b/src/tools/qdir.cpp
index 5b0c4c67..9c22ff39 100644
--- a/src/tools/qdir.cpp
+++ b/src/tools/qdir.cpp
@@ -1097,7 +1097,7 @@ char TQDir::separator()
{
#if defined(Q_OS_UNIX)
return '/';
-#elif defined (Q_FS_FAT) || defined(Q_WS_WIN)
+#elif defined (Q_FS_FAT) || defined(TQ_WS_WIN)
return '\\';
#elif defined (Q_OS_MAC)
return ':';
diff --git a/src/tools/qfile.cpp b/src/tools/qfile.cpp
index cf9b1a5c..709d175b 100644
--- a/src/tools/qfile.cpp
+++ b/src/tools/qfile.cpp
@@ -625,7 +625,7 @@ void TQFile::setEncodingFunction( EncoderFn f )
static
TQString locale_decoder( const TQCString &localFileName )
{
-#ifndef Q_WS_MAC
+#ifndef TQ_WS_MAC
return TQString::fromLocal8Bit(localFileName);
#else
extern TQString qt_mac_precomposeFileName(const TQString &); // qglobal.cpp
diff --git a/src/tools/qfiledefs_p.h b/src/tools/qfiledefs_p.h
index 52b4c7d5..62d55583 100644
--- a/src/tools/qfiledefs_p.h
+++ b/src/tools/qfiledefs_p.h
@@ -56,7 +56,7 @@
// Be sure to include qplatformdefs.h first!
struct TQFileInfoCache
{
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
QT_STATBUF st;
#else
struct stat st;
diff --git a/src/tools/qfileinfo.cpp b/src/tools/qfileinfo.cpp
index 466e62cc..9ef1462c 100644
--- a/src/tools/qfileinfo.cpp
+++ b/src/tools/qfileinfo.cpp
@@ -497,7 +497,7 @@ TQDir TQFileInfo::dir( bool absPath ) const
bool TQFileInfo::isReadable() const
{
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
return qt_file_access( fn, R_OK ) && permission( ReadUser );
#else
return qt_file_access( fn, R_OK );
@@ -512,7 +512,7 @@ bool TQFileInfo::isReadable() const
bool TQFileInfo::isWritable() const
{
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
return qt_file_access( fn, W_OK ) && permission( WriteUser );
#else
return qt_file_access( fn, W_OK );
@@ -527,7 +527,7 @@ bool TQFileInfo::isWritable() const
bool TQFileInfo::isExecutable() const
{
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#if defined(_MSC_VER) && _MSC_VER >= 1400
return permission( ExeUser );
#else
@@ -538,7 +538,7 @@ bool TQFileInfo::isExecutable() const
#endif
}
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
bool TQFileInfo::isHidden() const
{
return fileName()[ 0 ] == TQChar( '.' );
diff --git a/src/tools/qgarray.cpp b/src/tools/qgarray.cpp
index a69be13d..ff1f7b08 100644
--- a/src/tools/qgarray.cpp
+++ b/src/tools/qgarray.cpp
@@ -42,7 +42,7 @@
#if defined(Q_CC_BOR)
// needed for qsort() because of a std namespace problem on Borland
# include "qplatformdefs.h"
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
// needed for bsearch on some platforms
# include "qt_windows.h"
#endif
diff --git a/src/tools/qlibrary.cpp b/src/tools/qlibrary.cpp
index 2181f7fc..2773f066 100644
--- a/src/tools/qlibrary.cpp
+++ b/src/tools/qlibrary.cpp
@@ -56,7 +56,7 @@
# endif
#endif
-#if (defined(Q_WS_WIN) && !defined(QT_MAKEDLL)) \
+#if (defined(TQ_WS_WIN) && !defined(QT_MAKEDLL)) \
|| (defined(Q_OS_FREEBSD) && defined(Q_CC_INTEL)) \
|| (defined(Q_OS_IRIX) && defined(Q_CC_GNU))
#define TQT_NO_LIBRARY_UNLOAD
@@ -192,7 +192,7 @@ TQLibrary::~TQLibrary()
with \c MY_EXPORT defined as
\code
- #ifdef Q_WS_WIN
+ #ifdef TQ_WS_WIN
# define MY_EXPORT __declspec(dllexport)
#else
# define MY_EXPORT
@@ -398,7 +398,7 @@ TQString TQLibrary::library() const
TQString filename = libfile;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( filename.findRev( '.' ) <= filename.findRev( '/' ) )
filename += ".dll";
#else
diff --git a/src/tools/qlibrary_p.h b/src/tools/qlibrary_p.h
index c494f16a..0a687b1c 100644
--- a/src/tools/qlibrary_p.h
+++ b/src/tools/qlibrary_p.h
@@ -66,7 +66,7 @@ class TQLibraryPrivate
public:
TQLibraryPrivate( TQLibrary *lib );
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
HINSTANCE pHnd;
#else
void *pHnd;
diff --git a/src/tools/qlocale.cpp b/src/tools/qlocale.cpp
index 1da01c74..0714dbb8 100644
--- a/src/tools/qlocale.cpp
+++ b/src/tools/qlocale.cpp
@@ -1858,7 +1858,7 @@ const char* TQLocalePrivate::systemLocaleName()
lang = mac_ret;
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( !lang.isEmpty() ) {
long id = 0;
bool ok = false;
diff --git a/src/tools/qsettings.cpp b/src/tools/qsettings.cpp
index fa44ff05..6ac18bcc 100644
--- a/src/tools/qsettings.cpp
+++ b/src/tools/qsettings.cpp
@@ -339,7 +339,7 @@ void TQSettingsHeading::read(const TQString &filename)
if (! TQFileInfo(filename).exists())
return;
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
HANDLE lockfd = openlock( filename, Q_LOCKREAD );
#endif
@@ -362,7 +362,7 @@ void TQSettingsHeading::read(const TQString &filename)
file.close();
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
closelock( lockfd );
#endif
}
@@ -446,7 +446,7 @@ void TQSettingsHeading::parseLine(TQTextStream &stream)
}
}
-#ifdef Q_WS_WIN // for homedirpath reading from registry
+#ifdef TQ_WS_WIN // for homedirpath reading from registry
#include "qt_windows.h"
#include "ntqlibrary.h"
@@ -462,7 +462,7 @@ void TQSettingsHeading::parseLine(TQTextStream &stream)
TQSettingsPrivate::TQSettingsPrivate( TQSettings::Format format )
: groupDirty( TRUE ), modified(FALSE), globalScope(TRUE)
{
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( format != TQSettings::Ini )
return;
#else
@@ -483,7 +483,7 @@ TQSettingsPrivate::TQSettingsPrivate( TQSettings::Format format )
TQString appSettings(home);
TQString defPath;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#ifdef Q_OS_TEMP
TCHAR path[MAX_PATH];
SHGetSpecialFolderPath( 0, path, CSIDL_APPDATA, FALSE );
@@ -809,14 +809,14 @@ static TQString groupKey( const TQString &group, const TQString &key )
*/
void TQSettings::insertSearchPath( System s, const TQString &path)
{
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd ) {
d->sysInsertSearchPath( s, path );
return;
}
#endif
-#if !defined(Q_WS_WIN)
+#if !defined(TQ_WS_WIN)
if ( s == Windows )
return;
#endif
@@ -832,7 +832,7 @@ void TQSettings::insertSearchPath( System s, const TQString &path)
return;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd && s != Unix ) {
#else
if ( s != Unix ) {
@@ -844,7 +844,7 @@ void TQSettings::insertSearchPath( System s, const TQString &path)
}
TQString realPath = path;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
TQString defPath = d->globalScope ? d->searchPaths.first() : d->searchPaths.last();
realPath = defPath + path;
#endif
@@ -872,13 +872,13 @@ void TQSettings::removeSearchPath( System s, const TQString &path)
return;
}
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
if ( d->sysd ) {
d->sysRemoveSearchPath( s, path );
return;
}
#endif
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd && s != Unix ) {
#else
if ( s != Unix ) {
@@ -907,7 +907,7 @@ TQSettings::TQSettings()
d = new TQSettingsPrivate( Native );
TQ_CHECK_PTR(d);
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
d->sysd = 0;
d->sysInit();
#endif
@@ -927,7 +927,7 @@ TQSettings::TQSettings( Format format )
d = new TQSettingsPrivate( format );
TQ_CHECK_PTR(d);
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
d->sysd = 0;
if ( format == Native )
d->sysInit();
@@ -945,7 +945,7 @@ TQSettings::~TQSettings()
{
sync();
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
d->sysClear();
#endif
@@ -960,7 +960,7 @@ TQSettings::~TQSettings()
*/
bool TQSettings::sync()
{
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysSync();
#endif
@@ -992,7 +992,7 @@ bool TQSettings::sync()
if ((fi.exists() && fi.isFile() && fi.isWritable()) ||
(! fi.exists() && di.isDir()
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
&& di.isWritable()
#else
&& ((qWinVersion()&TQt::WV_NT_based) > TQt::WV_2000 || di.isWritable())
@@ -1015,7 +1015,7 @@ bool TQSettings::sync()
continue;
}
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
HANDLE lockfd = openlock( filename, Q_LOCKWRITE );
#endif
@@ -1089,7 +1089,7 @@ bool TQSettings::sync()
// remove temporary file
file.remove();
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
closelock( lockfd );
#endif
}
@@ -1127,7 +1127,7 @@ bool TQSettings::readBoolEntry(const TQString &key, bool def, bool *ok )
return def;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysReadBoolEntry( grp_key, def, ok );
#endif
@@ -1179,7 +1179,7 @@ double TQSettings::readDoubleEntry(const TQString &key, double def, bool *ok )
return def;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysReadDoubleEntry( grp_key, def, ok );
#endif
@@ -1224,7 +1224,7 @@ int TQSettings::readNumEntry(const TQString &key, int def, bool *ok )
return def;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysReadNumEntry( grp_key, def, ok );
#endif
@@ -1270,7 +1270,7 @@ TQString TQSettings::readEntry(const TQString &key, const TQString &def, bool *o
return def;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysReadEntry( grp_key, def, ok );
#endif
@@ -1349,7 +1349,7 @@ bool TQSettings::writeEntry(const TQString &key, bool value)
return FALSE;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysWriteEntry( grp_key, value );
#endif
@@ -1380,7 +1380,7 @@ bool TQSettings::writeEntry(const TQString &key, double value)
return FALSE;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysWriteEntry( grp_key, value );
#endif
@@ -1410,7 +1410,7 @@ bool TQSettings::writeEntry(const TQString &key, int value)
return FALSE;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysWriteEntry( grp_key, value );
#endif
@@ -1463,7 +1463,7 @@ bool TQSettings::writeEntry(const TQString &key, const TQString &value)
return FALSE;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysWriteEntry( grp_key, value );
#endif
@@ -1526,7 +1526,7 @@ bool TQSettings::removeEntry(const TQString &key)
return FALSE;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysRemoveEntry( grp_key );
#endif
@@ -1606,7 +1606,7 @@ TQStringList TQSettings::entryList(const TQString &key) const
return TQStringList();
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysEntryList( grp_key );
#endif
@@ -1714,7 +1714,7 @@ TQStringList TQSettings::subkeyList(const TQString &key) const
return TQStringList();
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysSubkeyList( grp_key );
#endif
@@ -1809,7 +1809,7 @@ TQDateTime TQSettings::lastModificationTime( const TQString &key )
return TQDateTime();
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return TQDateTime();
#endif
@@ -2038,7 +2038,7 @@ void TQSettings::setPath( const TQString &domain, const TQString &product, Scope
TQString actualSearchPath;
int lastDot = domain.findRev( '.' );
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
actualSearchPath = "/" + domain.mid( 0, lastDot ) + "/" + product;
insertSearchPath( Windows, actualSearchPath );
#elif !defined(TQWS) && defined(Q_OS_MAC)
diff --git a/src/tools/qsettings_p.h b/src/tools/qsettings_p.h
index 7ea1ac8d..6dcd1a03 100644
--- a/src/tools/qsettings_p.h
+++ b/src/tools/qsettings_p.h
@@ -108,7 +108,7 @@ public:
bool modified :1;
bool globalScope :1;
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
// system dependent implementations to use the
// system specific setting database (ie. registry on Windows)
diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp
index 01d90c1f..938ff313 100644
--- a/src/tools/qstring.cpp
+++ b/src/tools/qstring.cpp
@@ -68,7 +68,7 @@
#ifndef Q_OS_TEMP
#include
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
#include "qt_windows.h"
#endif
#if defined(Q_OS_LINUX)
@@ -6261,23 +6261,23 @@ TQCString TQString::local8Bit() const
*d->cString = TQCString(latin1());
return *d->cString;
#else
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
TQTextCodec* codec = TQTextCodec::codecForLocale();
*d->cString = codec ? codec->fromUnicode(*this) : TQCString(latin1());
return *d->cString;
#endif
-#if defined( Q_WS_MACX )
+#if defined( TQ_WS_MACX )
return utf8();
#endif
-#if defined( Q_WS_MAC9 )
+#if defined( TQ_WS_MAC9 )
*d->cString = TQCString(latin1()); //I'm evil..
return *d->cString;
#endif
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
*d->cString = isNull() ? TQCString("") : qt_winTQString2MB( *this );
return *d->cString;
#endif
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
return utf8(); // ### if there is any 8 bit format supported?
#endif
#endif
@@ -6307,7 +6307,7 @@ TQString TQString::fromLocal8Bit( const char* local8Bit, int len )
if ( !local8Bit )
return TQString::null;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
TQTextCodec* codec = TQTextCodec::codecForLocale();
if ( len < 0 )
len = strlen( local8Bit );
@@ -6315,18 +6315,18 @@ TQString TQString::fromLocal8Bit( const char* local8Bit, int len )
? codec->toUnicode( local8Bit, len )
: fromLatin1( local8Bit, len );
#endif
-#if defined( Q_WS_MAC )
+#if defined( TQ_WS_MAC )
return fromUtf8(local8Bit,len);
#endif
// Should this be OS_WIN32?
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
if ( len >= 0 ) {
TQCString s(local8Bit,len+1);
return qt_winMB2TQString(s);
}
return qt_winMB2TQString( local8Bit );
#endif
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
return fromUtf8(local8Bit,len);
#endif
#endif // TQT_NO_TEXTCODEC
@@ -6757,7 +6757,7 @@ int TQString::localeAwareCompare( const TQString& s ) const
if ( isEmpty() || s.isEmpty() )
return compare( s );
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
int res;
QT_WA( {
const TCHAR* s1 = (TCHAR*)ucs2();
@@ -6777,7 +6777,7 @@ int TQString::localeAwareCompare( const TQString& s ) const
default:
return 0;
}
-#elif defined(Q_WS_MACX)
+#elif defined(TQ_WS_MACX)
int delta = 0;
#if !defined(TQT_NO_TEXTCODEC)
TQTextCodec *codec = TQTextCodec::codecForLocale();
@@ -6787,7 +6787,7 @@ int TQString::localeAwareCompare( const TQString& s ) const
#endif
delta = ucstrcmp(*this, s);
return delta;
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
// declared in
int delta = strcoll( local8Bit(), s.local8Bit() );
if ( delta == 0 )
diff --git a/src/tools/qunicodetables_p.h b/src/tools/qunicodetables_p.h
index 8d893642..ab6d2e1c 100644
--- a/src/tools/qunicodetables_p.h
+++ b/src/tools/qunicodetables_p.h
@@ -248,7 +248,7 @@ inline int scriptForChar( ushort uc )
return script;
}
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#define SCRIPT_FOR_CHAR( script, c ) \
do { \
unsigned short _uc = (c).unicode(); \
diff --git a/src/widgets/ntqmenubar.h b/src/widgets/ntqmenubar.h
index 5212ca52..01b5c184 100644
--- a/src/widgets/ntqmenubar.h
+++ b/src/widgets/ntqmenubar.h
@@ -86,7 +86,7 @@ public:
void activateItemAt( int index );
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
static void initialize();
static void cleanup();
#endif
@@ -160,7 +160,7 @@ private:
friend class TQPopupMenu;
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
friend class TQWidget;
friend class TQApplication;
friend void qt_mac_set_modal_state(bool, TQMenuBar *);
diff --git a/src/widgets/ntqpopupmenu.h b/src/widgets/ntqpopupmenu.h
index 04ae7db8..5e1a396d 100644
--- a/src/widgets/ntqpopupmenu.h
+++ b/src/widgets/ntqpopupmenu.h
@@ -165,7 +165,7 @@ private:
TQAccel *autoaccel;
#endif
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
bool macPopupMenu(const TQPoint &, int);
uint mac_dirty_popup : 1;
#endif
diff --git a/src/widgets/ntqwidgetplugin.h b/src/widgets/ntqwidgetplugin.h
index 16c24eb2..cd40860d 100644
--- a/src/widgets/ntqwidgetplugin.h
+++ b/src/widgets/ntqwidgetplugin.h
@@ -48,7 +48,7 @@
#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/src/widgets/qcheckbox.cpp b/src/widgets/qcheckbox.cpp
index 0d6fdfa4..970ed578 100644
--- a/src/widgets/qcheckbox.cpp
+++ b/src/widgets/qcheckbox.cpp
@@ -193,7 +193,7 @@ void TQCheckBox::drawButton( TQPainter *paint )
TQRect irect = TQStyle::visualRect( style().subRect(TQStyle::SR_CheckBoxIndicator, this), this );
const TQColorGroup &cg = colorGroup();
-#if !defined( TQT_NO_TEXTSTREAM ) && !defined( Q_WS_MACX )
+#if !defined( TQT_NO_TEXTSTREAM ) && !defined( TQ_WS_MACX )
# define SAVE_CHECKBOX_PIXMAPS
#endif
#if defined(SAVE_CHECKBOX_PIXMAPS)
diff --git a/src/widgets/qcombobox.cpp b/src/widgets/qcombobox.cpp
index b75d23ed..213ba4b9 100644
--- a/src/widgets/qcombobox.cpp
+++ b/src/widgets/qcombobox.cpp
@@ -444,7 +444,7 @@ void TQComboBoxData::setListBox( TQListBox *l )
lBox = l;
usingLBox = TRUE;
l->setMouseTracking( TRUE );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
l->x11SetWindowType( TQWidget::X11WindowTypeCombo );
l->x11SetWindowTransient( combo->topLevelWidget());
#endif
@@ -455,7 +455,7 @@ void TQComboBoxData::setPopupMenu( TQComboBoxPopup * pm, bool isPopup )
pop = pm;
if(isPopup)
usingLBox = FALSE;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if( pm ) {
pm->x11SetWindowType( TQWidget::X11WindowTypeCombo );
pm->x11SetWindowTransient( combo->topLevelWidget());
diff --git a/src/widgets/qdatetimeedit.cpp b/src/widgets/qdatetimeedit.cpp
index 6454bdf4..0084be77 100644
--- a/src/widgets/qdatetimeedit.cpp
+++ b/src/widgets/qdatetimeedit.cpp
@@ -52,7 +52,7 @@
#include "ntqstring.h"
#include "ntqstyle.h"
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
#include "qt_windows.h"
#endif
@@ -111,7 +111,7 @@ static void readLocaleSettings()
lDateSep = new TQString();
lTimeSep = new TQString();
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
QT_WA( {
TCHAR data[10];
GetLocaleInfo( LOCALE_USER_DEFAULT, LOCALE_SDATE, data, 10 );
@@ -170,7 +170,7 @@ static void readLocaleSettings()
// this code needs to change if new formats are added
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
TQString sep = d.mid( TQMIN( dpos, mpos ) + 2, TQABS( dpos - mpos ) - 2 );
if ( d.contains( sep ) == 2 ) {
*lDateSep = sep;
@@ -178,7 +178,7 @@ static void readLocaleSettings()
#endif
}
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
TQString t = TQTime( 11, 22, 33 ).toString( TQt::LocalDate );
dpos = t.find( "11" );
mpos = t.find( "22" );
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp
index 93823706..e889e5a4 100644
--- a/src/widgets/qdockwindow.cpp
+++ b/src/widgets/qdockwindow.cpp
@@ -57,10 +57,10 @@
#include "ntqcursor.h"
#include "ntqstyle.h"
-#if defined(Q_WS_MAC9)
+#if defined(TQ_WS_MAC9)
#define MAC_DRAG_HACK
#endif
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
static bool default_opaque = TRUE;
#else
static bool default_opaque = FALSE;
@@ -393,7 +393,7 @@ TQDockWindowHandle::TQDockWindowHandle( TQDockWindow *dw )
ctrlDown = FALSE;
timer = new TQTimer( this );
connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( minimize() ) );
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
setCursor( SizeAllCursor );
#endif
}
@@ -476,7 +476,7 @@ void TQDockWindowHandle::mouseReleaseEvent( TQMouseEvent *e )
return;
dockWindow->endRectDraw( !opaque );
mousePressed = FALSE;
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
releaseMouse();
#endif
if ( !hadDblClick && offset == e->pos() ) {
@@ -613,7 +613,7 @@ void TQDockWindowTitleBar::mousePressEvent( TQMouseEvent *e )
oldFocus = tqApp->focusWidget();
// setFocus activates the window, which deactivates the main window
// not what we want, and not required anyway on Windows
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
setFocus();
#endif
@@ -631,7 +631,7 @@ void TQDockWindowTitleBar::mousePressEvent( TQMouseEvent *e )
dockWindow->startRectDraw( mapToGlobal( e->pos() ), !opaque );
// grabMouse resets the Windows mouse press count, so we never receive a double click on Windows
// not required on Windows, and did work on X11, too, but no problem there in the first place
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
if(!oldPressed && dockWindow->opaqueMoving())
grabMouse();
#else
@@ -1271,7 +1271,7 @@ void TQDockWindow::updateGui()
verHandle->show();
else
verHandle->hide();
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
if(horHandle->mousePressed) {
horHandle->mousePressed = FALSE;
verHandle->mousePressed = TRUE;
@@ -1285,7 +1285,7 @@ void TQDockWindow::updateGui()
else
horHandle->hide();
horHandle->updateGui();
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
if(verHandle->mousePressed) {
verHandle->mousePressed = FALSE;
horHandle->mousePressed = TRUE;
diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp
index d1416483..ddf0dd70 100644
--- a/src/widgets/qeffects.cpp
+++ b/src/widgets/qeffects.cpp
@@ -109,7 +109,7 @@ TQAlphaWidget::TQAlphaWidget( TQWidget* w, WFlags f )
: TQWidget( TQApplication::desktop()->screen(TQApplication::desktop()->screenNumber(w)),
"qt internal alpha effect widget", f )
{
-#if 1 //ndef Q_WS_WIN
+#if 1 //ndef TQ_WS_WIN
setEnabled( FALSE );
#endif
@@ -255,7 +255,7 @@ void TQAlphaWidget::render()
if ( widget ) {
if ( !showWidget ) {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
setEnabled(TRUE);
setFocus();
#endif
@@ -381,7 +381,7 @@ TQRollEffect::TQRollEffect( TQWidget* w, WFlags f, DirFlags orient )
: TQWidget( TQApplication::desktop()->screen(TQApplication::desktop()->screenNumber(w)),
"qt internal roll effect widget", f ), orientation(orient)
{
-#if 1 //ndef Q_WS_WIN
+#if 1 //ndef TQ_WS_WIN
setEnabled( FALSE );
#endif
widget = (TQAccessWidget*) w;
@@ -584,7 +584,7 @@ void TQRollEffect::scroll()
tqApp->removeEventFilter( this );
if ( widget ) {
if ( !showWidget ) {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
setEnabled(TRUE);
setFocus();
#endif
@@ -635,7 +635,7 @@ void qScrollEffect( TQWidget* w, TQEffects::DirFlags orient, int time )
tqApp->sendPostedEvents( w, TQEvent::Move );
tqApp->sendPostedEvents( w, TQEvent::Resize );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
uint flags = TQt::WStyle_Customize | TQt::WNoAutoErase | TQt::WStyle_StaysOnTop
| (w->isPopup() ? TQt::WType_Popup : (TQt::WX11BypassWM | TQt::WStyle_Tool));
#else
@@ -660,7 +660,7 @@ void qFadeEffect( TQWidget* w, int time )
tqApp->sendPostedEvents( w, TQEvent::Move );
tqApp->sendPostedEvents( w, TQEvent::Resize );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
uint flags = TQt::WStyle_Customize | TQt::WNoAutoErase | TQt::WStyle_StaysOnTop
| (w->isPopup() ? TQt::WType_Popup : (TQt::WX11BypassWM | TQt::WStyle_Tool));
#else
diff --git a/src/widgets/qiconview.cpp b/src/widgets/qiconview.cpp
index ce41f05b..154702ea 100644
--- a/src/widgets/qiconview.cpp
+++ b/src/widgets/qiconview.cpp
@@ -125,14 +125,14 @@ static const char * const unknown_xpm[] = {
static TQPixmap *unknown_icon = 0;
static TQPixmap *qiv_buffer_pixmap = 0;
-#if !defined(Q_WS_X11)
+#if !defined(TQ_WS_X11)
static TQPixmap *qiv_selection = 0;
#endif
static bool optimize_layout = FALSE;
static TQCleanupHandler qiv_cleanup_pixmap;
-#if !defined(Q_WS_X11)
+#if !defined(TQ_WS_X11)
static void createSelectionPixmap( const TQColorGroup &cg )
{
TQBitmap m( 2, 2 );
@@ -2022,7 +2022,7 @@ void TQIconViewItem::paintItem( TQPainter *p, const TQColorGroup &cg )
p2.end();
buffer->setMask( mask );
p2.begin( buffer );
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
p2.fillRect( pix->rect(), TQBrush( cg.highlight(), TQBrush::Dense4Pattern) );
#else // in WIN32 Dense4Pattern doesn't work correctly (transparency problem), so work around it
if ( iconView()->d->drawActiveSelection ) {
@@ -2832,7 +2832,7 @@ void TQIconView::styleChange( TQStyle& old )
item->calcRect();
}
-#if !defined(Q_WS_X11)
+#if !defined(TQ_WS_X11)
delete qiv_selection;
qiv_selection = 0;
#endif
diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp
index 41ad0135..68048abc 100644
--- a/src/widgets/qlineedit.cpp
+++ b/src/widgets/qlineedit.cpp
@@ -1407,7 +1407,7 @@ bool TQLineEdit::event( TQEvent * e )
case Key_Z:
case Key_Left:
case Key_Right:
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
case Key_Insert:
case Key_Delete:
#endif
@@ -1591,7 +1591,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
if ( !t.isEmpty() && (!e->ascii() || e->ascii()>=32) &&
e->key() != Key_Delete &&
e->key() != Key_Backspace ) {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
extern bool tqt_hebrew_keyboard_hack;
if ( tqt_hebrew_keyboard_hack ) {
// the X11 keyboard layout is broken and does not reverse
@@ -1616,7 +1616,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
if ( e->state() & ControlButton ) {
switch ( e->key() ) {
case Key_A:
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
home( e->state() & ShiftButton );
#else
selectAll();
@@ -1655,7 +1655,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
d->finishChange( priorState );
}
break;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
case Key_U:
if ( !d->readOnly )
clear();
@@ -1672,7 +1672,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
del();
}
break;
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
case Key_Insert:
copy();
break;
@@ -1736,20 +1736,20 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
}
break;
case Key_Home:
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
case Key_Up:
#endif
home( e->state() & ShiftButton );
break;
case Key_End:
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
case Key_Down:
#endif
end( e->state() & ShiftButton );
break;
case Key_Delete:
if ( !d->readOnly ) {
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
if ( e->state() & ShiftButton ) {
cut();
break;
@@ -1758,7 +1758,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
del();
}
break;
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
case Key_Insert:
if ( !d->readOnly && e->state() & ShiftButton )
paste();
@@ -2242,7 +2242,7 @@ TQPopupMenu *TQLineEdit::createPopupMenu()
popup->insertItem( tr( "Clear" ) );
popup->insertSeparator();
popup->insertItem( tr( "Select All" )
-#ifndef Q_WS_X11
+#ifndef TQ_WS_X11
+ ACCEL_KEY( A )
#endif
);
diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp
index ab9beba9..69f4c16a 100644
--- a/src/widgets/qmainwindow.cpp
+++ b/src/widgets/qmainwindow.cpp
@@ -62,7 +62,7 @@
#include "ntqdockarea.h"
#include "ntqstringlist.h"
#include "ntqstyle.h"
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
# include "qt_mac.h"
#endif
@@ -893,7 +893,7 @@ TQMainWindow::TQMainWindow( TQWidget * parent, const char * name, WFlags f )
: TQWidget( parent, name, f )
{
d = new TQMainWindowPrivate;
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
d->opaque = TRUE;
#else
d->opaque = FALSE;
@@ -1239,7 +1239,7 @@ bool TQMainWindow::isDockEnabled( TQDockWindow *tb, Dock dock ) const
void TQMainWindow::addDockWindow( TQDockWindow *dockWindow,
Dock edge, bool newLine )
{
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
if(isTopLevel() && edge == DockTop)
ChangeWindowAttributes((WindowPtr)handle(), kWindowToolbarButtonAttribute, 0);
#endif
@@ -1407,7 +1407,7 @@ void TQMainWindow::moveDockWindow( TQDockWindow * dockWindow, Dock edge, bool nl
void TQMainWindow::removeDockWindow( TQDockWindow * dockWindow )
{
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
if(isTopLevel() && dockWindow->area() == topDock() && !dockWindows( DockTop ).count())
ChangeWindowAttributes((WindowPtr)handle(), 0, kWindowToolbarButtonAttribute);
#endif
diff --git a/src/widgets/qmenubar.cpp b/src/widgets/qmenubar.cpp
index c0051ef6..ae31bfe8 100644
--- a/src/widgets/qmenubar.cpp
+++ b/src/widgets/qmenubar.cpp
@@ -71,7 +71,7 @@ public:
static bool inMenu = FALSE;
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
extern int qt_xfocusout_grab_counter; // defined in qapplication_x11.cpp
#endif
@@ -265,7 +265,7 @@ static const int gtkItemVMargin = 8;
TQMenuBar::TQMenuBar( TQWidget *parent, const char *name )
: TQFrame( parent, name, WNoAutoErase )
{
-#if defined( Q_WS_MAC ) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined( TQ_WS_MAC ) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
mac_eaten_menubar = FALSE;
mac_d = 0;
macCreateNativeMenubar();
@@ -334,7 +334,7 @@ TQMenuBar::~TQMenuBar()
#ifndef TQT_NO_ACCEL
delete autoaccel;
#endif
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
macRemoveNativeMenubar();
#endif
if ( irects ) // Avoid purify complaint.
@@ -354,7 +354,7 @@ void TQMenuBar::updateItem( int id )
repaint( irects[i], FALSE );
}
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
static bool fromFrameChange = FALSE;
#endif
@@ -436,7 +436,7 @@ void TQMenuBar::performDelayedStateChanged()
void TQMenuBar::performDelayedChanges()
{
-#if defined(Q_WS_MAC) && !defined(TQMAC_MENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_MENUBAR_NO_NATIVE)
// I must do this here as the values change in the function below.
bool needMacUpdate = (pendingDelayedContentsChanges || pendingDelayedStateChanges);
#endif
@@ -444,7 +444,7 @@ void TQMenuBar::performDelayedChanges()
performDelayedContentsChanged();
if( pendingDelayedStateChanges )
performDelayedStateChanged();
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
if(mac_eaten_menubar && needMacUpdate) {
macDirtyNativeMenubar();
@@ -485,11 +485,11 @@ void TQMenuBar::menuDelPopup( TQPopupMenu *popup )
void TQMenuBar::frameChanged()
{
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
fromFrameChange = TRUE;
#endif
menuContentsChanged();
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
fromFrameChange = FALSE;
#endif
}
@@ -580,7 +580,7 @@ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event )
// Start waiting for Alt release on focus widget
} else if ( ke->stateAfter() == AltButton ) {
waitforalt = 1;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
TQMenuData::d->aInt = qt_xfocusout_grab_counter;
#endif
if ( f && f != object )
@@ -606,7 +606,7 @@ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event )
(object->parent() == 0 && ((TQWidget*)object)->focusWidget() == 0) ) {
if ( waitforalt && event->type() == TQEvent::KeyRelease &&
( ke->key() == Key_Alt || ke->key() == Key_Meta )
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
&& TQMenuData::d->aInt == qt_xfocusout_grab_counter
#endif
) {
@@ -664,7 +664,7 @@ void TQMenuBar::subHighlighted( int id )
#ifndef TQT_NO_ACCEL
void TQMenuBar::accelActivated( int id )
{
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
if(mac_eaten_menubar)
return;
#endif
@@ -823,7 +823,7 @@ void TQMenuBar::show()
performDelayedChanges();
calculateRects();
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
if(mac_eaten_menubar) {
//If all elements are invisible no reason for me to be visible either
bool all_hidden = TRUE;
@@ -942,7 +942,7 @@ int TQMenuBar::calculateRects( int max_width )
int w=0, h=0;
if ( !mi->isVisible()
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
|| (mac_eaten_menubar && !mi->custom() && !mi->widget() )
#endif
) {
@@ -978,14 +978,14 @@ int TQMenuBar::calculateRects( int max_width )
separator = i; //### only motif?
}
if ( !mi->isSeparator() || mi->widget() ) {
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
if ( !mac_eaten_menubar ) {
#endif
if ( gs == MotifStyle && mi->isVisible() ) {
w += 2*motifItemFrame;
h += 2*motifItemFrame;
}
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
}
#endif
@@ -1189,7 +1189,7 @@ void TQMenuBar::drawContents( TQPainter *p )
style().drawControl(TQStyle::CE_MenuBarEmptyArea, p, this, contentsRect(), g);
p->restore();
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
if ( !mac_eaten_menubar )
#endif
{
diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp
index 5e327d20..ec93e3a2 100644
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
@@ -303,7 +303,7 @@ TQPopupMenu::TQPopupMenu( TQWidget *parent, const char *name )
connectModalRecursionSafety = 0;
setFocusPolicy( StrongFocus );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
x11SetWindowType( X11WindowTypePopup );
#endif
}
@@ -373,7 +373,7 @@ void TQPopupMenu::menuContentsChanged()
// here the part that can't be delayed
TQMenuData::menuContentsChanged();
badSize = TRUE; // might change the size
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
mac_dirty_popup = 1;
#endif
if( pendingDelayedContentsChanges )
@@ -404,7 +404,7 @@ void TQPopupMenu::performDelayedContentsChanged()
p->updateSize(TRUE);
p->update();
}
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
mac_dirty_popup = 1;
#endif
}
@@ -468,7 +468,7 @@ void TQPopupMenu::frameChanged()
TQRect TQPopupMenu::screenRect( const TQPoint& pos )
{
int screen_num = TQApplication::desktop()->screenNumber( pos );
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
return TQApplication::desktop()->availableGeometry( screen_num );
#else
return TQApplication::desktop()->screenGeometry( screen_num );
@@ -497,7 +497,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint )
if ( isVisible() || !isEnabled() )
return;
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
if( macPopupMenu(pos, indexAtPoint ))
return;
#endif
@@ -553,7 +553,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint )
if ( y < sy )
y = sy;
}
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#ifndef TQT_NO_MENUBAR
TQMenuData *top = this; // find top level
while ( top->parentMenu )
@@ -2746,7 +2746,7 @@ void TQPopupMenu::toggleTearOff()
geometry().topLeft(), FALSE );
p->mitems->setAutoDelete( FALSE );
p->tornOff = TRUE;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
p->x11SetWindowType( X11WindowTypeMenu );
#endif
for ( TQMenuItemListIt it( *mitems ); it.current(); ++it ) {
diff --git a/src/widgets/qradiobutton.cpp b/src/widgets/qradiobutton.cpp
index 4d98e8a6..f6e48df6 100644
--- a/src/widgets/qradiobutton.cpp
+++ b/src/widgets/qradiobutton.cpp
@@ -197,7 +197,7 @@ void TQRadioButton::drawButton( TQPainter *paint )
TQRect irect = TQStyle::visualRect( style().subRect(TQStyle::SR_RadioButtonIndicator, this), this );
const TQColorGroup &cg = colorGroup();
-#if !defined( TQT_NO_TEXTSTREAM ) && !defined( Q_WS_MACX )
+#if !defined( TQT_NO_TEXTSTREAM ) && !defined( TQ_WS_MACX )
# define SAVE_RADIOBUTTON_PIXMAPS
#endif
#if defined(SAVE_RADIOBUTTON_PIXMAPS)
diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp
index c4986c80..493b88f8 100644
--- a/src/widgets/qscrollview.cpp
+++ b/src/widgets/qscrollview.cpp
@@ -52,7 +52,7 @@
#include "ntqtimer.h"
#include "ntqstyle.h"
#include "ntqlistview.h"
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
# include "qt_mac.h"
#endif
@@ -892,7 +892,7 @@ void TQScrollView::updateScrollBars()
else
showv = needv;
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
bool mac_need_scroll = FALSE;
if(!parentWidget()) {
mac_need_scroll = TRUE;
diff --git a/src/widgets/qsplashscreen.cpp b/src/widgets/qsplashscreen.cpp
index a62fe745..6468a250 100644
--- a/src/widgets/qsplashscreen.cpp
+++ b/src/widgets/qsplashscreen.cpp
@@ -213,7 +213,7 @@ void TQSplashScreen::clear()
void TQSplashScreen::finish( TQWidget *mainWin )
{
if ( mainWin ) {
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
extern void tqt_wait_for_window_manager( TQWidget *mainWin );
tqt_wait_for_window_manager( mainWin );
#endif
diff --git a/src/widgets/qtabbar.cpp b/src/widgets/qtabbar.cpp
index 33a19d82..1573e4e8 100644
--- a/src/widgets/qtabbar.cpp
+++ b/src/widgets/qtabbar.cpp
@@ -52,7 +52,7 @@
#include "ntqaccessible.h"
#endif
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
#include
#endif
@@ -618,7 +618,7 @@ void TQTabBar::paint( TQPainter * p, TQTab * t, bool selected ) const
int w = iw + fw + 4;
int h = TQMAX(fm.height() + 4, ih );
int offset = 3;
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
if (::tqt_cast(&style())) {
offset = 0;
}
@@ -920,7 +920,7 @@ void TQTabBar::setCurrentTab( TQTab * tab )
if ( tab->r.intersects( r ) ) {
repaint( r.unite( tab->r ), FALSE );
} else {
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
update();
#else
repaint( r, FALSE );
diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp
index 1205f46f..88a727f6 100644
--- a/src/widgets/qtextedit.cpp
+++ b/src/widgets/qtextedit.cpp
@@ -1179,7 +1179,7 @@ bool TQTextEdit::event( TQEvent *e )
case Key_Down:
case Key_Home:
case Key_End:
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
case Key_Insert:
case Key_Delete:
#endif
@@ -1191,7 +1191,7 @@ bool TQTextEdit::event( TQEvent *e )
default:
switch ( ke->key() ) {
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
case Key_Insert:
ke->accept();
#endif
@@ -1296,7 +1296,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
}
break;
case Key_Delete:
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
if ( e->state() & ShiftButton ) {
cut();
break;
@@ -1314,7 +1314,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
case Key_Insert:
if ( e->state() & ShiftButton )
paste();
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
else if ( e->state() & ControlButton )
copy();
#endif
@@ -1322,7 +1322,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
setOverwriteMode( !isOverwriteMode() );
break;
case Key_Backspace:
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
if ( e->state() & AltButton ) {
if (e->state() & ControlButton ) {
break;
@@ -1450,7 +1450,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
clearUndoRedoInfo = FALSE;
}
TQString t = e->text();
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
extern bool tqt_hebrew_keyboard_hack;
if ( tqt_hebrew_keyboard_hack ) {
// the X11 keyboard layout is broken and does not reverse
@@ -1486,7 +1486,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
indent();
break;
case Key_A:
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
moveCursor( MoveLineStart, e->state() & ShiftButton );
#else
selectAll( TRUE );
@@ -1539,7 +1539,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
case Key_K:
doKeyboardAction( ActionKill );
break;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
case Key_Insert:
copy();
break;
@@ -1942,7 +1942,7 @@ void TQTextEdit::removeSelectedText( int selNum )
ensureCursorVisible();
drawCursor( TRUE );
clearUndoRedo();
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
// there seems to be a problem with repainting or erasing the area
// of the scrollview which is not the contents on windows
if ( contentsHeight() < visibleHeight() )
@@ -1977,7 +1977,7 @@ void TQTextEdit::moveCursor( CursorAction action, bool select )
if ( d->optimMode )
return;
#endif
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
TQTextCursor c1 = *cursor;
TQTextCursor c2;
#endif
@@ -1986,7 +1986,7 @@ void TQTextEdit::moveCursor( CursorAction action, bool select )
if ( !doc->hasSelection( TQTextDocument::Standard ) )
doc->setSelectionStart( TQTextDocument::Standard, *cursor );
moveCursor( action );
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
c2 = *cursor;
if (c1 == c2)
if (action == MoveDown || action == MovePgDown)
@@ -2004,7 +2004,7 @@ void TQTextEdit::moveCursor( CursorAction action, bool select )
emit selectionChanged();
emit copyAvailable( doc->hasSelection( TQTextDocument::Standard ) );
} else {
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
TQTextCursor cStart = doc->selectionStartCursor( TQTextDocument::Standard );
TQTextCursor cEnd = doc->selectionEndCursor( TQTextDocument::Standard );
bool redraw = doc->removeSelection( TQTextDocument::Standard );
@@ -4932,7 +4932,7 @@ bool TQTextEdit::handleReadOnlyKeyEvent( TQKeyEvent *e )
case Key_C: case Key_F16: // Copy key on Sun keyboards
copy();
break;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
case Key_Insert:
copy();
break;
@@ -5655,7 +5655,7 @@ TQPopupMenu *TQTextEdit::createPopupMenu( const TQPoint& pos )
d->id[ IdClear ] = popup->insertItem( tr( "Clear" ) );
popup->insertSeparator();
}
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
d->id[ IdSelectAll ] = popup->insertItem( tr( "Select All" ) );
#else
d->id[ IdSelectAll ] = popup->insertItem( tr( "Select All" ) + ACCEL_KEY( A ) );
diff --git a/src/widgets/qtitlebar.cpp b/src/widgets/qtitlebar.cpp
index d06e3dab..97b2288e 100644
--- a/src/widgets/qtitlebar.cpp
+++ b/src/widgets/qtitlebar.cpp
@@ -58,7 +58,7 @@
#ifndef TQT_NO_WORKSPACE
#include "ntqworkspace.h"
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
#include "qt_windows.h"
#endif
@@ -191,7 +191,7 @@ TQTitleBar::~TQTitleBar()
d = 0;
}
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
extern TQRgb qt_colorref2qrgb(COLORREF col);
#endif
@@ -201,7 +201,7 @@ void TQTitleBar::readColors()
bool colorsInitialized = FALSE;
-#ifdef Q_WS_WIN // ask system properties on windows
+#ifdef TQ_WS_WIN // ask system properties on windows
#ifndef SPI_GETGRADIENTCAPTIONS
#define SPI_GETGRADIENTCAPTIONS 0x1008
#endif
@@ -233,7 +233,7 @@ void TQTitleBar::readColors()
}
}
}
-#endif // Q_WS_WIN
+#endif // TQ_WS_WIN
if ( !colorsInitialized ) {
pal.setColor( TQPalette::Active, TQColorGroup::Highlight, palette().active().highlight() );
pal.setColor( TQPalette::Active, TQColorGroup::Base, palette().active().highlight() );
diff --git a/src/widgets/qtooltip.cpp b/src/widgets/qtooltip.cpp
index 118c0da6..d576d203 100644
--- a/src/widgets/qtooltip.cpp
+++ b/src/widgets/qtooltip.cpp
@@ -475,7 +475,7 @@ bool TQTipManager::eventFilter( TQObject *obj, TQEvent *e )
void TQTipManager::showTip()
{
if ( !widget || !globally_enabled
-#ifndef Q_WS_X11
+#ifndef TQ_WS_X11
|| !widget->isActiveWindow()
#endif
)
@@ -505,7 +505,7 @@ void TQTipManager::showTip()
scr = TQApplication::desktop()->screenNumber( widget );
if ( label
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
&& label->x11Screen() == widget->x11Screen()
#endif
) {
@@ -533,11 +533,11 @@ void TQTipManager::showTip()
if (!widget)
return;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
label->x11SetWindowTransient( widget->topLevelWidget());
#endif
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
TQRect screen = TQApplication::desktop()->availableGeometry( scr );
#else
TQRect screen = TQApplication::desktop()->screenGeometry( scr );
@@ -545,7 +545,7 @@ void TQTipManager::showTip()
TQPoint p;
if ( t->geometry == TQRect( -1, -1, -1, -1 ) ) {
p = widget->mapToGlobal( pos ) +
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
TQPoint( 2, 24 );
#else
TQPoint( 2, 16 );
diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp
index de2b19c1..086c3f0c 100644
--- a/src/widgets/qwhatsthis.cpp
+++ b/src/widgets/qwhatsthis.cpp
@@ -54,7 +54,7 @@
#if defined(QT_ACCESSIBILITY_SUPPORT)
#include "ntqaccessible.h"
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
#include "qt_windows.h"
#ifndef SPI_GETDROPSHADOW
#define SPI_GETDROPSHADOW 0x1024
@@ -277,7 +277,7 @@ TQWhatsThat::TQWhatsThat( TQWidget* w, const TQString& txt, TQWidget* parent, co
AlignAuto + AlignTop + WordBreak + ExpandTabs,
text );
}
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( (qWinVersion()&WV_NT_based) > WV_2000 ) {
BOOL shadow;
SystemParametersInfo( SPI_GETDROPSHADOW, 0, &shadow, 0 );
@@ -365,13 +365,13 @@ void TQWhatsThat::keyPressEvent( TQKeyEvent* )
void TQWhatsThat::paintEvent( TQPaintEvent* )
{
bool drawShadow = TRUE;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( (qWinVersion()&WV_NT_based) > WV_2000 ) {
BOOL shadow;
SystemParametersInfo( SPI_GETDROPSHADOW, 0, &shadow, 0 );
drawShadow = !shadow;
}
-#elif defined(Q_WS_MACX)
+#elif defined(TQ_WS_MACX)
drawShadow = FALSE; //never draw it on OS X we get it for free
#endif
@@ -657,7 +657,7 @@ void TQWhatsThisPrivate::say( TQWidget * widget, const TQString &text, const TQP
delete whatsThat;
whatsThat = new TQWhatsThat(
widget, text,
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
TQApplication::desktop()->screen( widget ?
widget->x11Screen() :
TQCursor::x11Screen() ),
@@ -671,11 +671,11 @@ void TQWhatsThisPrivate::say( TQWidget * widget, const TQString &text, const TQP
int scr = ( widget ?
TQApplication::desktop()->screenNumber( widget ) :
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
TQCursor::x11Screen()
#else
TQApplication::desktop()->screenNumber( ppos )
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
);
TQRect screen = TQApplication::desktop()->screenGeometry( scr );
diff --git a/src/widgets/qwidgetresizehandler.cpp b/src/widgets/qwidgetresizehandler.cpp
index f1bc7362..bcddde86 100644
--- a/src/widgets/qwidgetresizehandler.cpp
+++ b/src/widgets/qwidgetresizehandler.cpp
@@ -45,7 +45,7 @@
#include "ntqapplication.h"
#include "ntqcursor.h"
#include "ntqsizegrip.h"
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
#include "qt_windows.h"
#endif
@@ -299,7 +299,7 @@ void TQWidgetResizeHandler::mouseMoveEvent( TQMouseEvent *e )
widget->setGeometry( geom );
}
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
MSG msg;
QT_WA( {
while(PeekMessageW( &msg, widget->winId(), WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE ))
diff --git a/src/workspace/qworkspace.cpp b/src/workspace/qworkspace.cpp
index 2ce255c3..ff8e3d03 100644
--- a/src/workspace/qworkspace.cpp
+++ b/src/workspace/qworkspace.cpp
@@ -297,13 +297,13 @@ TQWorkspace::init()
d->px = 0;
d->py = 0;
d->becomeActive = 0;
-#if defined( QT_WORKSPACE_WINDOWMODE ) && defined( Q_WS_MAC )
+#if defined( QT_WORKSPACE_WINDOWMODE ) && defined( TQ_WS_MAC )
d->wmode = AutoDetect;
#else
d->wmode = MDI;
#endif
d->mainwindow = 0;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
d->popup = new TQPopupMenu( this, "qt_internal_mdi_popup" );
d->toolPopup = new TQPopupMenu( this, "qt_internal_mdi_popup" );
#else
diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index b0e558d8..a75573f3 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -323,7 +323,7 @@ void HelpDialog::loadIndexFile()
if (!indexFile.open(IO_ReadOnly)) {
TQMessageBox::warning(help, tr("TQt Assistant"), tr("Failed to load keyword index file\n"
"Assistant will not work!"));
-#if defined Q_WS_WIN || defined Q_WS_MACX
+#if defined TQ_WS_WIN || defined TQ_WS_MACX
startTimer(50);
#endif
return;
diff --git a/tools/assistant/lib/qassistantclient.cpp b/tools/assistant/lib/qassistantclient.cpp
index 0e0ba4b0..56eda22e 100644
--- a/tools/assistant/lib/qassistantclient.cpp
+++ b/tools/assistant/lib/qassistantclient.cpp
@@ -146,7 +146,7 @@ TQAssistantClient::TQAssistantClient( const TQString &path, TQObject *parent, co
#if defined(Q_OS_MACX)
assistantCommand += ".app/Contents/MacOS/assistant";
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
if (!assistantCommand.endsWith(".exe"))
assistantCommand += ".exe";
#endif
diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp
index b2e2a62d..4f7d21b9 100644
--- a/tools/assistant/main.cpp
+++ b/tools/assistant/main.cpp
@@ -48,7 +48,7 @@
#include
#include
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#define INDEX_CHECK( text ) if( i+1 >= argc ) { TQMessageBox::information( 0, "TQt Assistant", text ); return 1; }
#else
#define INDEX_CHECK( text ) if( i+1 >= argc ) { fprintf( stderr, text "\n" ); return 1; }
@@ -148,7 +148,7 @@ int main( int argc, char ** argv )
arg = arg.lower();
if ( arg == "-addcontentfile"
|| arg == "-removecontentfile"
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
|| arg == "-help"
#endif
)
@@ -267,7 +267,7 @@ int main( int argc, char ** argv )
" -resourceDir assistant will load translations from\n"
" this directory.\n"
" -help shows this help.");
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
TQMessageBox::information( 0, "TQt Assistant", "
" + helpText + "
" );
#else
printf( "%s\n", helpText.latin1() );
diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h
index 0afab0aa..480ba728 100644
--- a/tools/assistant/mainwindow.ui.h
+++ b/tools/assistant/mainwindow.ui.h
@@ -46,13 +46,13 @@
TQPtrList *MainWindow::windows = 0;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
extern TQ_EXPORT int qt_ntfs_permission_lookup;
#endif
void MainWindow::init()
{
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
// Workaround for TQMimeSourceFactory failing in TQFileInfo::isReadable() for
// certain user configs. See task: 34372
qt_ntfs_permission_lookup = 0;
@@ -679,7 +679,7 @@ void MainWindow::forwardAvailable( bool enable )
void MainWindow::updateProfileSettings()
{
Config *config = Config::configuration();
-#ifndef Q_WS_MACX
+#ifndef TQ_WS_MACX
setIcon( config->applicationIcon() );
#endif
helpMenu->clear();
diff --git a/tools/designer/app/main.cpp b/tools/designer/app/main.cpp
index 23009764..6d7a90c4 100644
--- a/tools/designer/app/main.cpp
+++ b/tools/designer/app/main.cpp
@@ -57,7 +57,7 @@
# undef raise
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
#include
#include
#endif
diff --git a/tools/designer/designer/designerapp.cpp b/tools/designer/designer/designerapp.cpp
index caa4b0b3..370558d7 100644
--- a/tools/designer/designer/designerapp.cpp
+++ b/tools/designer/designer/designerapp.cpp
@@ -41,7 +41,7 @@
#include
#include
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#include
#include
#endif
@@ -61,7 +61,7 @@ void set_splash_status( const TQString &txt )
TQ_EXPORT DesignerApplication::DesignerApplication( int &argc, char **argv )
: TQApplication( argc, argv )
{
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( winVersion() & TQt::WV_NT_based )
DESIGNER_OPENFILE = RegisterWindowMessage((TCHAR*)"QT_DESIGNER_OPEN_FILE");
else
@@ -136,7 +136,7 @@ void DesignerApplication::setSettingsKey( const TQString &key )
*settings_key = key;
}
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
bool DesignerApplication::winEventFilter( MSG *msg )
{
if ( msg->message == DESIGNER_OPENFILE ) {
diff --git a/tools/designer/designer/designerapp.h b/tools/designer/designer/designerapp.h
index 703443f9..296572e5 100644
--- a/tools/designer/designer/designerapp.h
+++ b/tools/designer/designer/designerapp.h
@@ -55,7 +55,7 @@ public:
protected:
TQDateTime lastMod;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
bool winEventFilter( MSG *msg );
uint DESIGNER_OPENFILE;
#endif
diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp
index 9e02b2b1..caf9d003 100644
--- a/tools/designer/designer/formwindow.cpp
+++ b/tools/designer/designer/formwindow.cpp
@@ -111,7 +111,7 @@ static void restoreCursors( TQWidget *start, FormWindow *fw )
}
}
-#if defined(Q_WS_WIN32) // #### needed for the workaround for repaint problem on windows
+#if defined(TQ_WS_WIN32) // #### needed for the workaround for repaint problem on windows
#include
static void flickerfree_update( TQWidget *w )
{
@@ -844,7 +844,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
sizePreviewLabel->setGeometry( lg );
sizePreviewLabel->raise();
sizePreviewLabel->show();
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
windowsRepaintWorkaroundTimer->start( 100, TRUE );
#endif
} else { // if we don't need to move, do some indication
@@ -1605,14 +1605,14 @@ void FormWindow::resizeEvent( TQResizeEvent *e )
if ( isVisible() )
formFile()->setModified( TRUE, FormFile::WFormWindow );
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
windowsRepaintWorkaroundTimer->start( 100, TRUE );
#endif
}
void FormWindow::windowsRepaintWorkaroundTimerTimeout()
{
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
TQObjectList *l = queryList( "TQWidget" );
for ( TQObject *o = l->first(); o; o = l->next() ) {
flickerfree_update( (TQWidget*)o );
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index 93d0eeac..ba2dfb9e 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -187,7 +187,7 @@ TQ_EXPORT MainWindow::MainWindow( bool asClient, bool single, const TQString &pl
if ( !single )
tqApp->setMainWidget( this );
TQWidgetFactory::addWidgetFactory( new CustomWidgetFactory );
-#ifndef Q_WS_MACX
+#ifndef TQ_WS_MACX
setIcon( TQPixmap::fromMimeSource( "designer_appicon.png" ) );
#endif
@@ -2400,7 +2400,7 @@ void MainWindow::readConfig()
if ( !restoreConfig )
return;
-#ifndef Q_WS_MAC
+#ifndef TQ_WS_MAC
/* I'm sorry to make this not happen on the Mac, but it seems to hang somewhere deep
in TQLayout, it gets into a very large loop - and seems it has to do with clever
things the designer does ###Sam */
diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp
index b9418913..d7699dca 100644
--- a/tools/designer/designer/mainwindowactions.cpp
+++ b/tools/designer/designer/mainwindowactions.cpp
@@ -159,7 +159,7 @@ void MainWindow::setupEditActions()
actionEditDelete->setWhatsThis( whatsThisFrom( "Edit|Delete" ) );
connect( actionEditDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) );
actionEditDelete->setEnabled( FALSE );
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
TQAction *macDelete = new TQAction( tr( "Delete" ), TQPixmap(), tr( "&Delete" ), Key_Backspace, this, 0 );
connect( macDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) );
#endif
diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp
index 02899830..024d9a18 100644
--- a/tools/designer/designer/project.cpp
+++ b/tools/designer/designer/project.cpp
@@ -588,7 +588,7 @@ TQString Project::makeRelative( const TQString &f )
return f;
TQString p = TQFileInfo( filename ).dirPath( TRUE );
TQString f2 = f;
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
if ( p.endsWith("/") )
p = p.left( p.length() - 1 );
if ( f2.left( p.length() ).lower() == p.lower() )
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 5058a361..78bb88b7 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -95,7 +95,7 @@
static TQFontDatabase *fontDataBase = 0;
TQString assistantPath();
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
#include
static void setupStyle(TQWidget *w)
{
@@ -443,7 +443,7 @@ void PropertyItem::placeEditor( TQWidget *w )
TQRect r = listview->itemRect( this );
if ( !r.size().isValid() ) {
listview->ensureItemVisible( this );
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
listview->repaintContents( FALSE );
#endif
r = listview->itemRect( this );
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index 9818bd28..f683d3ec 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -108,7 +108,7 @@ static TQString entitize( const TQString &s, bool attribute = FALSE )
return s2;
}
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
static struct {
int key;
const char* name;
@@ -205,7 +205,7 @@ static struct {
#endif
static TQString platformNeutralKeySequence(const TQKeySequence &ks)
{
-#ifndef Q_WS_MACX
+#ifndef TQ_WS_MACX
return TQString(ks);
#else
uint k;
diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp
index 2a7f194f..be050bce 100644
--- a/tools/designer/designer/workspace.cpp
+++ b/tools/designer/designer/workspace.cpp
@@ -286,7 +286,7 @@ Workspace::Workspace( TQWidget *parent, MainWindow *mw )
header()->hide();
setSorting( 0 );
setResizePolicy( TQScrollView::Manual );
-#ifndef Q_WS_MAC
+#ifndef TQ_WS_MAC
TQPalette p( palette() );
p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) );
(void)*selectedBack; // hack
diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp
index b4618618..5a272e33 100644
--- a/tools/designer/uic/embed.cpp
+++ b/tools/designer/uic/embed.cpp
@@ -43,7 +43,7 @@
// on embedded, we do not compress image data. Rationale: by mapping
// the ready-only data directly into memory we are both faster and
// more memory efficient
-#if defined(Q_WS_QWS) && !defined(TQT_NO_IMAGE_COLLECTION_COMPRESSION)
+#if defined(TQ_WS_QWS) && !defined(TQT_NO_IMAGE_COLLECTION_COMPRESSION)
#define TQT_NO_IMAGE_COLLECTION_COMPRESSION
#endif
diff --git a/tools/linguist/linguist/trwindow.cpp b/tools/linguist/linguist/trwindow.cpp
index f94cf8b2..7b3ce988 100644
--- a/tools/linguist/linguist/trwindow.cpp
+++ b/tools/linguist/linguist/trwindow.cpp
@@ -231,7 +231,7 @@ TrWindow::TrWindow()
: TQMainWindow( 0, "translation window", WType_TopLevel | WDestructiveClose )
{
-#ifndef Q_WS_MACX
+#ifndef TQ_WS_MACX
setIcon( TQPixmap::fromMimeSource( "appicon.png" ) );
#endif
diff --git a/tools/maketqpf/main.cpp b/tools/maketqpf/main.cpp
index d105a168..94dc2e14 100644
--- a/tools/maketqpf/main.cpp
+++ b/tools/maketqpf/main.cpp
@@ -43,7 +43,7 @@
#include
#include
#include
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
#include
#endif
@@ -67,7 +67,7 @@ public:
void renderAndSave()
{
font = TQFont(family,pointSize,weight,italic);
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
memorymanager->savePrerenderedFont((TQMemoryManager::FontID)font.handle());
#endif
setHeight(TQFontMetrics(font).lineSpacing());
@@ -77,7 +77,7 @@ public:
void render(int from, int to)
{
font = TQFont(family,pointSize,weight,italic);
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
for (int i=from; i<=to; i++) {
if ( memorymanager->inFont((TQMemoryManager::FontID)font.handle(),TQChar(i))) {
memorymanager->lockGlyph((TQMemoryManager::FontID)font.handle(),TQChar(i));
@@ -90,7 +90,7 @@ public:
void save()
{
font = TQFont(family,pointSize,weight,italic);
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
memorymanager->savePrerenderedFont((TQMemoryManager::FontID)font.handle(),FALSE);
#endif
setHeight(TQFontMetrics(font).lineSpacing());
diff --git a/tools/qembed/qembed.cpp b/tools/qembed/qembed.cpp
index 9a3336e4..d13cf46a 100644
--- a/tools/qembed/qembed.cpp
+++ b/tools/qembed/qembed.cpp
@@ -77,7 +77,7 @@ int main( int argc, char **argv )
TQStringList args;
for ( int i = 1; i < argc; ++i ) {
TQString file( argv[i] );
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
// Since wildcards are not expanded automatically for us on Windows, we need to do
// it ourselves
if ( file.contains( '*' ) || file.contains( '?' ) ) {
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index 6b116a48..b01b0dba 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -375,14 +375,14 @@ MainWindow::MainWindow()
rtlExtensions->setChecked( settings.readBoolEntry( "/qt/useRtlExtensions", FALSE ) );
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
inputStyle->setCurrentText( settings.readEntry( "/qt/XIMInputStyle", trUtf8( "On The Spot" ) ) );
#else
inputStyle->hide();
inputStyleLabel->hide();
#endif
-#if defined(Q_WS_X11) && !defined(TQT_NO_IM_EXTENSIONS)
+#if defined(TQ_WS_X11) && !defined(TQT_NO_IM_EXTENSIONS)
/*
This code makes it possible to set up default input method.
@@ -508,7 +508,7 @@ void MainWindow::fileSave()
settings.writeEntry("/qt/useRtlExtensions", rtlExtensions->isChecked() );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
TQString style = inputStyle->currentText();
TQString str = "On The Spot";
if ( style == trUtf8( "Over The Spot" ) )
@@ -561,9 +561,9 @@ void MainWindow::fileSave()
}
}
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
TQApplication::x11_apply_settings();
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
setModified(FALSE);
statusBar()->message("Saved changes.");
diff --git a/tools/tqvfb/skin.cpp b/tools/tqvfb/skin.cpp
index ccee4fd8..02a65b65 100644
--- a/tools/tqvfb/skin.cpp
+++ b/tools/tqvfb/skin.cpp
@@ -40,7 +40,7 @@
#include
#include
#include
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
# include
#endif
@@ -97,7 +97,7 @@ void Skin::setView( TQVFbView *v )
{
view = v;
view->move( viewX1, viewY1 );
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
TQMacSavedPortInfo::setAlphaTransparancy(view, transparancy);
#endif
}
diff --git a/tools/tqvfb/tqvfb.cpp b/tools/tqvfb/tqvfb.cpp
index 1fb8ade0..5a549743 100644
--- a/tools/tqvfb/tqvfb.cpp
+++ b/tools/tqvfb/tqvfb.cpp
@@ -229,10 +229,10 @@ void TQVFb::changeRate()
void TQVFb::about()
{
-#if defined( Q_WS_MAC )
+#if defined( TQ_WS_MAC )
TQString platform("Mac OS X");
TQString qt("Mac");
-#elif defined( Q_WS_WIN )
+#elif defined( TQ_WS_WIN )
TQString platform("Windows");
TQString qt("Windows");
#else
diff --git a/tools/tqvfb/tqvfbview.cpp b/tools/tqvfb/tqvfbview.cpp
index d3ce8460..b7639a6c 100644
--- a/tools/tqvfb/tqvfbview.cpp
+++ b/tools/tqvfb/tqvfbview.cpp
@@ -32,7 +32,7 @@
**********************************************************************/
#include "ntqglobal.h"
-#if !defined( Q_WS_QWS ) || defined( TQT_NO_QWS_MULTIPROCESS )
+#if !defined( TQ_WS_QWS ) || defined( TQT_NO_QWS_MULTIPROCESS )
#define TQLock TQWSSemaphore
#undef TQT_NO_QWS_MULTIPROCESS
#include "../../src/kernel/qlock.cpp"
@@ -269,7 +269,7 @@ void TQVFbView::setRate( int r )
timer->start( 1000/r );
}
-#ifndef Q_WS_QWS
+#ifndef TQ_WS_QWS
// Get the name of the directory where TQt/Embedded temporary data should
// live.
static TQString qws_dataDir()