Replace Q_WS_* defines with TQ_WS_* equivalents

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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/102/head
Michele Calgaro 3 months ago
parent fb401a891f
commit 67bff2edca
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -190,7 +190,7 @@ private:
{ {
<a name="x2935"></a><a name="x2932"></a> <a href="qcanvasrectangle.html#setSize">setSize</a>( image.<a href="ntqimage.html#width">width</a>(), image.<a href="ntqimage.html#height">height</a>() ); <a name="x2935"></a><a name="x2932"></a> <a href="qcanvasrectangle.html#setSize">setSize</a>( image.<a href="ntqimage.html#width">width</a>(), image.<a href="ntqimage.html#height">height</a>() );
#if !defined(Q_WS_QWS) #if !defined(TQ_WS_QWS)
<a name="x2943"></a> pixmap.<a href="ntqpixmap.html#convertFromImage">convertFromImage</a>(image, OrderedAlphaDither); <a name="x2943"></a> pixmap.<a href="ntqpixmap.html#convertFromImage">convertFromImage</a>(image, OrderedAlphaDither);
#endif #endif
} }
@ -200,7 +200,7 @@ private:
{ {
// On TQt/Embedded, we can paint a TQImage as fast as a TQPixmap, // On TQt/Embedded, we can paint a TQImage as fast as a TQPixmap,
// but on other platforms, we need to use a TQPixmap. // but on other platforms, we need to use a TQPixmap.
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
<a name="x2941"></a> p.<a href="ntqpainter.html#drawImage">drawImage</a>( int(<a href="qcanvasitem.html#x">x</a>()), int(<a href="qcanvasitem.html#y">y</a>()), image, 0, 0, -1, -1, OrderedAlphaDither ); <a name="x2941"></a> p.<a href="ntqpainter.html#drawImage">drawImage</a>( int(<a href="qcanvasitem.html#x">x</a>()), int(<a href="qcanvasitem.html#y">y</a>()), image, 0, 0, -1, -1, OrderedAlphaDither );
#else #else
p.<a href="ntqpainter.html#drawPixmap">drawPixmap</a>( int(<a href="qcanvasitem.html#x">x</a>()), int(<a href="qcanvasitem.html#y">y</a>()), pixmap ); p.<a href="ntqpainter.html#drawPixmap">drawPixmap</a>( int(<a href="qcanvasitem.html#x">x</a>()), int(<a href="qcanvasitem.html#y">y</a>()), pixmap );

@ -600,7 +600,7 @@ TQString <a name="f481"></a>DirectoryView::fullPath(TQListViewItem* item)
else else
fullpath = item-&gt;<a href="qlistviewitem.html#text">text</a>(0) + fullpath; fullpath = item-&gt;<a href="qlistviewitem.html#text">text</a>(0) + fullpath;
} }
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
<a name="x1702"></a> if (fullpath.<a href="ntqstring.html#length">length</a>() &gt; 2 &amp;&amp; fullpath[1] != ':') { <a name="x1702"></a> if (fullpath.<a href="ntqstring.html#length">length</a>() &gt; 2 &amp;&amp; fullpath[1] != ':') {
<a href="ntqdir.html">TQDir</a> dir(fullpath); <a href="ntqdir.html">TQDir</a> dir(fullpath);
<a name="x1665"></a> fullpath = dir.<a href="ntqdir.html#currentDirPath">currentDirPath</a>().left(2) + fullpath; <a name="x1665"></a> fullpath = dir.<a href="ntqdir.html#currentDirPath">currentDirPath</a>().left(2) + fullpath;

@ -41,9 +41,9 @@ macros defined that can be used to enable/disable code for each platform
using <tt>#ifdef</tt> directives: using <tt>#ifdef</tt> directives:
<p> <center><table cellpadding="4" cellspacing="2" border="0"> <p> <center><table cellpadding="4" cellspacing="2" border="0">
<tr bgcolor="#a2c511"> <th valign="top">Platform <th valign="top">Macro <tr bgcolor="#a2c511"> <th valign="top">Platform <th valign="top">Macro
<tr bgcolor="#f0f0f0"> <td valign="top">TQt/X11 <td valign="top">Q_WS_X11 <tr bgcolor="#f0f0f0"> <td valign="top">TQt/X11 <td valign="top">TQ_WS_X11
<tr bgcolor="#d0d0d0"> <td valign="top">TQt/Windows <td valign="top">Q_WS_WIN <tr bgcolor="#d0d0d0"> <td valign="top">TQt/Windows <td valign="top">TQ_WS_WIN
<tr bgcolor="#f0f0f0"> <td valign="top">TQt/Embedded <td valign="top">Q_WS_QWS <tr bgcolor="#f0f0f0"> <td valign="top">TQt/Embedded <td valign="top">TQ_WS_QWS
</table></center> </table></center>
<p> TQt/Embedded also requires the following flags to be defined when compiling <p> TQt/Embedded also requires the following flags to be defined when compiling
applications: applications:

@ -508,7 +508,7 @@ static void cleanup()
{ {
TQIconDrag::<a href="qicondrag.html#append">append</a>( item, pr, tr ); TQIconDrag::<a href="qicondrag.html#append">append</a>( item, pr, tr );
<a href="ntqstring.html">TQString</a> ourUrl = url; <a href="ntqstring.html">TQString</a> ourUrl = url;
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
if (ourUrl.<a href="ntqstring.html#length">length</a>() &gt; 2 &amp;&amp; ourUrl[1] != ':') { if (ourUrl.<a href="ntqstring.html#length">length</a>() &gt; 2 &amp;&amp; ourUrl[1] != ':') {
<a href="ntqdir.html">TQDir</a> dir(ourUrl); <a href="ntqdir.html">TQDir</a> dir(ourUrl);
<a name="x810"></a> ourUrl = dir.<a href="ntqdir.html#absPath">absPath</a>(); <a name="x810"></a> ourUrl = dir.<a href="ntqdir.html#absPath">absPath</a>();

@ -463,7 +463,7 @@ void <a name="f548"></a>MDIWindow::load( const <a href="ntqstring.html">TQString
<a name="x2079"></a> medit-&gt;<a href="ntqwidget.html#hide">hide</a>(); <a name="x2079"></a> medit-&gt;<a href="ntqwidget.html#hide">hide</a>();
delete medit; delete medit;
<a href="ntqmovie.html">TQMovie</a> * qm=new <a href="ntqmovie.html">TQMovie</a>(fn); <a href="ntqmovie.html">TQMovie</a> * qm=new <a href="ntqmovie.html">TQMovie</a>(fn);
#ifdef Q_WS_QWS // temporary speed-test hack #ifdef TQ_WS_QWS // temporary speed-test hack
<a name="x2039"></a> qm-&gt;setDisplayWidget(tmp); <a name="x2039"></a> qm-&gt;setDisplayWidget(tmp);
#endif #endif
<a name="x2082"></a> tmp-&gt;<a href="ntqwidget.html#setBackgroundMode">setBackgroundMode</a>(TQWidget::NoBackground); <a name="x2082"></a> tmp-&gt;<a href="ntqwidget.html#setBackgroundMode">setBackgroundMode</a>(TQWidget::NoBackground);

@ -470,7 +470,7 @@ uses a graphical interface when available.
<pre> <pre>
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
bool useGUI = getenv( "DISPLAY" ) != 0; bool useGUI = getenv( "DISPLAY" ) != 0;
#else #else
bool useGUI = TRUE; bool useGUI = TRUE;

@ -207,7 +207,7 @@ compiler directive.
<p> with <tt>MY_EXPORT</tt> defined as <p> with <tt>MY_EXPORT</tt> defined as
<p> <pre> <p> <pre>
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
# define MY_EXPORT __declspec(dllexport) # define MY_EXPORT __declspec(dllexport)
#else #else
# define MY_EXPORT # define MY_EXPORT

@ -227,7 +227,7 @@ previously disabled, please check these macro variables:
have been changed: have been changed:
<p> <ul> <p> <ul>
<li> <tt>_OS_*_</tt> becomes <tt>Q_OS_*</tt> <li> <tt>_OS_*_</tt> becomes <tt>Q_OS_*</tt>
<li> <tt>_WS_*_</tt> becomes <tt>Q_WS_*</tt> <li> <tt>_WS_*_</tt> becomes <tt>TQ_WS_*</tt>
<li> <tt>_CC_*_</tt> becomes <tt>Q_CC_*</tt> <li> <tt>_CC_*_</tt> becomes <tt>Q_CC_*</tt>
</ul> </ul>
<p> <h2> Removed Properties <p> <h2> Removed Properties

@ -90,7 +90,7 @@ struct TQAccessibleInterface;
class TQ_EXPORT TQAccessible class TQ_EXPORT TQAccessible
{ {
private: private:
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
static TQMAC_PASCAL OSStatus globalEventProcessor(EventHandlerCallRef, EventRef, void *); static TQMAC_PASCAL OSStatus globalEventProcessor(EventHandlerCallRef, EventRef, void *);
static TQObject *queryAccessibleObject(TQAccessibleInterface *); static TQObject *queryAccessibleObject(TQAccessibleInterface *);
#endif #endif

@ -90,7 +90,7 @@ class TQSessionManager;
class TQStyle; class TQStyle;
class TQTranslator; class TQTranslator;
class TQEventLoop; class TQEventLoop;
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
class TQWSDecoration; class TQWSDecoration;
#endif #endif
@ -111,7 +111,7 @@ public:
TQApplication( int &amp;argc, char **argv, bool GUIenabled ); TQApplication( int &amp;argc, char **argv, bool GUIenabled );
enum Type { Tty, GuiClient, GuiServer }; enum Type { Tty, GuiClient, GuiServer };
TQApplication( int &amp;argc, char **argv, Type ); TQApplication( int &amp;argc, char **argv, Type );
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
TQApplication( Display* dpy, HANDLE visual = 0, HANDLE cmap = 0 ); TQApplication( Display* dpy, HANDLE visual = 0, HANDLE cmap = 0 );
TQApplication( Display *dpy, int argc, char **argv, TQApplication( Display *dpy, int argc, char **argv,
HANDLE visual = 0, HANDLE cmap= 0 ); HANDLE visual = 0, HANDLE cmap= 0 );
@ -266,18 +266,18 @@ public:
static bool isEffectEnabled( TQt::UIEffect ); static bool isEffectEnabled( TQt::UIEffect );
static void setEffectEnabled( TQt::UIEffect, bool enable = TRUE ); static void setEffectEnabled( TQt::UIEffect, bool enable = TRUE );
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
virtual bool macEventFilter( EventHandlerCallRef, EventRef ); virtual bool macEventFilter( EventHandlerCallRef, EventRef );
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
virtual bool winEventFilter( MSG * ); virtual bool winEventFilter( MSG * );
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
virtual bool x11EventFilter( XEvent * ); virtual bool x11EventFilter( XEvent * );
virtual int x11ClientMessage( TQWidget*, XEvent*, bool passive_only); virtual int x11ClientMessage( TQWidget*, XEvent*, bool passive_only);
int x11ProcessEvent( XEvent* ); int x11ProcessEvent( XEvent* );
#endif #endif
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
virtual bool qwsEventFilter( TQWSEvent * ); virtual bool qwsEventFilter( TQWSEvent * );
int qwsProcessEvent( TQWSEvent* ); int qwsProcessEvent( TQWSEvent* );
void qwsSetCustomColors( TQRgb *colortable, int start, int numColors ); void qwsSetCustomColors( TQRgb *colortable, int start, int numColors );
@ -297,7 +297,7 @@ public:
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)
static MacintoshVersion macVersion(); static MacintoshVersion macVersion();
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
void winFocus( TQWidget *, bool ); void winFocus( TQWidget *, bool );
static void winMouseButtonUp(); static void winMouseButtonUp();
#endif #endif
@ -310,7 +310,7 @@ public:
virtual void commitData( TQSessionManager&amp; sm ); virtual void commitData( TQSessionManager&amp; sm );
virtual void saveState( TQSessionManager&amp; sm ); virtual void saveState( TQSessionManager&amp; sm );
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
static void create_xim(); static void create_xim();
static void close_xim(); static void close_xim();
static bool x11_apply_settings(); static bool x11_apply_settings();
@ -333,7 +333,7 @@ public slots:
void closeAllWindows(); void closeAllWindows();
void aboutTQt(); void aboutTQt();
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
protected: protected:
void setArgs(int, char **); void setArgs(int, char **);
#endif #endif
@ -347,12 +347,12 @@ private:
void init_precmdline(); void init_precmdline();
void process_cmdline( int* argcptr, char ** argv ); void process_cmdline( int* argcptr, char ** argv );
bool internalNotify( TQObject *, TQEvent * ); bool internalNotify( TQObject *, TQEvent * );
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
static TQWidget *findChildWidget( const TQWidget *p, const TQPoint &amp;pos ); static TQWidget *findChildWidget( const TQWidget *p, const TQPoint &amp;pos );
static TQWidget *findWidget( const TQObjectList&amp;, const TQPoint &amp;, bool rec ); static TQWidget *findWidget( const TQObjectList&amp;, const TQPoint &amp;, bool rec );
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
bool do_mouse_down(Point *, bool *); bool do_mouse_down(Point *, bool *);
static TQMAC_PASCAL OSStatus globalEventProcessor(EventHandlerCallRef, EventRef, void *); static TQMAC_PASCAL OSStatus globalEventProcessor(EventHandlerCallRef, EventRef, void *);
static TQMAC_PASCAL OSStatus globalAppleEventProcessor(const AppleEvent *, AppleEvent *, long); static TQMAC_PASCAL OSStatus globalAppleEventProcessor(const AppleEvent *, AppleEvent *, long);
@ -416,7 +416,7 @@ private:
static TQString* session_key; static TQString* session_key;
bool is_session_restored; bool is_session_restored;
#endif #endif
#if defined(Q_WS_X11) &amp;&amp; !defined (TQT_NO_STYLE ) #if defined(TQ_WS_X11) &amp;&amp; !defined (TQT_NO_STYLE )
static void x11_initialize_style(); static void x11_initialize_style();
#endif #endif
@ -444,10 +444,10 @@ private:
friend class TQTranslator; friend class TQTranslator;
friend class TQEventLoop; friend class TQEventLoop;
friend TQ_EXPORT void tqt_ucm_initialize( TQApplication * ); friend TQ_EXPORT void tqt_ucm_initialize( TQApplication * );
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
friend bool qt_sendSpontaneousEvent( TQObject*, TQEvent* ); friend bool qt_sendSpontaneousEvent( TQObject*, TQEvent* );
#endif #endif
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
friend class TQInputContext; friend class TQInputContext;
#endif #endif
private: // Disabled copy constructor and operator= private: // Disabled copy constructor and operator=
@ -467,7 +467,7 @@ inline char **TQApplication::argv() const
return app_argv; return app_argv;
} }
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
inline void TQApplication::setArgs(int c, char **v) inline void TQApplication::setArgs(int c, char **v)
{ {
app_argc = c; app_argc = c;

@ -153,7 +153,7 @@ protected:
friend class TQMimeSource; friend class TQMimeSource;
private: private:
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
void loadScrap(bool convert); void loadScrap(bool convert);
void saveScrap(); void saveScrap();
#endif #endif

@ -152,7 +152,7 @@ public:
uint alloc(); uint alloc();
uint pixel() const; 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? // ### in 4.0, make this take a default argument of -1 for default screen?
uint alloc( int screen ); uint alloc( int screen );
uint pixel( int screen ) const; uint pixel( int screen ) const;
@ -166,7 +166,7 @@ public:
static int currentAllocContext(); static int currentAllocContext();
static void destroyAllocContext( int ); static void destroyAllocContext( int );
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
static const TQRgb* palette( int* numEntries = 0 ); static const TQRgb* palette( int* numEntries = 0 );
static int setPaletteEntries( const TQRgb* entries, int numEntries, static int setPaletteEntries( const TQRgb* entries, int numEntries,
int base = -1 ); int base = -1 );
@ -189,7 +189,7 @@ private:
static TQColor* globalColors(); static TQColor* globalColors();
static bool color_init; static bool color_init;
static bool globals_init; static bool globals_init;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
static HPALETTE hpal; static HPALETTE hpal;
#endif #endif
static enum ColorModel { d8, d32 } colormodel; static enum ColorModel { d8, d32 } colormodel;

@ -124,15 +124,15 @@ public:
const TQBitmap *mask() const; const TQBitmap *mask() const;
TQPoint hotSpot() const; TQPoint hotSpot() const;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
HCURSOR handle() const; HCURSOR handle() const;
TQCursor( HCURSOR ); TQCursor( HCURSOR );
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
HANDLE handle() const; HANDLE handle() const;
TQCursor( HANDLE ); TQCursor( HANDLE );
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
HANDLE handle() const; HANDLE handle() const;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
HANDLE handle() const; HANDLE handle() const;
#endif #endif
@ -143,7 +143,7 @@ public:
static void initialize(); static void initialize();
static void cleanup(); static void cleanup();
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
static int x11Screen(); static int x11Screen();
#endif #endif
private: private:
@ -152,7 +152,7 @@ private:
void update() const; void update() const;
TQCursorData *data; TQCursorData *data;
TQCursor *find_cur(int); 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); friend void qt_mac_set_cursor(const TQCursor *c, const Point *p);
#endif #endif
}; };

@ -129,7 +129,7 @@ private:
#endif #endif
friend class TQApplication; friend class TQApplication;
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
friend class TQWSDisplay; friend class TQWSDisplay;
#endif #endif
}; };

@ -79,7 +79,7 @@ body { background: #ffffff; color: black; }
#include "ntqpainter.h" #include "ntqpainter.h"
#endif // QT_H #endif // QT_H
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
#ifndef TQT_NO_DIRECTPAINTER #ifndef TQT_NO_DIRECTPAINTER
class TQ_EXPORT TQDirectPainter : public TQPainter { class TQ_EXPORT TQDirectPainter : public TQPainter {
public: public:

@ -289,7 +289,7 @@ private:
TQDragObject * object; TQDragObject * object;
void updateMode( ButtonState newstate ); void updateMode( ButtonState newstate );
void updateCursor(); void updateCursor();
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
void createCursors(); void createCursors();
#endif #endif

@ -83,7 +83,7 @@ body { background: #ffffff; color: black; }
class TQEventLoopPrivate; class TQEventLoopPrivate;
class TQSocketNotifier; class TQSocketNotifier;
class TQTimer; class TQTimer;
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
struct timeval; //stdc struct struct timeval; //stdc struct
struct TimerInfo; //internal structure (qeventloop_mac.cpp) struct TimerInfo; //internal structure (qeventloop_mac.cpp)
#endif #endif
@ -136,11 +136,11 @@ signals:
void aboutToBlock(); void aboutToBlock();
private: private:
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
friend TQMAC_PASCAL void qt_mac_select_timer_callbk(EventLoopTimerRef, void *); friend TQMAC_PASCAL void qt_mac_select_timer_callbk(EventLoopTimerRef, void *);
int macHandleSelect(timeval *); int macHandleSelect(timeval *);
void macHandleTimer(TimerInfo *); void macHandleTimer(TimerInfo *);
#endif // Q_WS_MAC #endif // TQ_WS_MAC
// internal initialization/cleanup - implemented in various platform specific files // internal initialization/cleanup - implemented in various platform specific files
void init(); void init();

@ -333,7 +333,7 @@ private:
TQPushButton *okB; TQPushButton *okB;
TQPushButton *cancelB; TQPushButton *cancelB;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
static TQString winGetOpenFileName( const TQString &amp;initialSelection, static TQString winGetOpenFileName( const TQString &amp;initialSelection,
const TQString &amp;filter, const TQString &amp;filter,
TQString* workingDirectory, TQString* workingDirectory,
@ -360,7 +360,7 @@ private:
const TQString&amp; caption = TQString::null); const TQString&amp; caption = TQString::null);
static TQString resolveLinkFile( const TQString&amp; linkfile ); static TQString resolveLinkFile( const TQString&amp; linkfile );
#endif #endif
#if defined(Q_WS_MACX) || defined(Q_WS_MAC9) #if defined(TQ_WS_MACX) || defined(TQ_WS_MAC9)
static TQString macGetSaveFileName( const TQString &amp;, const TQString &amp;, static TQString macGetSaveFileName( const TQString &amp;, const TQString &amp;,
TQString *, TQWidget *, const char*, TQString *, TQWidget *, const char*,
const TQString&amp;, TQString *); const TQString&amp;, TQString *);

@ -201,11 +201,11 @@ public:
bool isCopyOf( const TQFont &amp; ) const; bool isCopyOf( const TQFont &amp; ) const;
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
HFONT handle() const; HFONT handle() const;
#else // !Q_WS_WIN #else // !TQ_WS_WIN
TQt::HANDLE handle() const; TQt::HANDLE handle() const;
#endif // Q_WS_WIN #endif // TQ_WS_WIN
// needed for X11 // needed for X11
@ -227,11 +227,11 @@ public:
#endif //TQT_NO_STRINGLIST #endif //TQT_NO_STRINGLIST
static void initialize(); static void initialize();
static void cleanup(); static void cleanup();
#ifndef Q_WS_QWS #ifndef TQ_WS_QWS
static void cacheStatistics(); static void cacheStatistics();
#endif #endif
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
void qwsRenderToDisk(bool all=TRUE); void qwsRenderToDisk(bool all=TRUE);
#endif #endif
@ -356,9 +356,9 @@ private:
void detach(); void detach();
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
void macSetFont(TQPaintDevice *); void macSetFont(TQPaintDevice *);
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
void x11SetScreen( int screen = -1 ); void x11SetScreen( int screen = -1 );
int x11Screen() const; int x11Screen() const;
#endif #endif
@ -373,7 +373,7 @@ private:
friend class TQTextLayout; friend class TQTextLayout;
friend class TQTextItem; friend class TQTextItem;
friend class TQGLContext; friend class TQGLContext;
#if defined(Q_WS_X11) &amp;&amp; !defined(TQT_NO_XFTFREETYPE) #if defined(TQ_WS_X11) &amp;&amp; !defined(TQT_NO_XFTFREETYPE)
friend TQt::HANDLE qt_xft_handle(const TQFont &amp;font); friend TQt::HANDLE qt_xft_handle(const TQFont &amp;font);
#endif #endif
#ifndef TQT_NO_DATASTREAM #ifndef TQT_NO_DATASTREAM

@ -94,7 +94,7 @@ struct TQtFontFamily;
struct TQtFontFoundry; struct TQtFontFoundry;
struct TQFontDef; struct TQFontDef;
class TQFontEngine; class TQFontEngine;
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
class TQDiskFont; class TQDiskFont;
#endif #endif
@ -128,7 +128,7 @@ public:
static TQString scriptName(TQFont::Script); static TQString scriptName(TQFont::Script);
static TQString scriptSample(TQFont::Script); static TQString scriptSample(TQFont::Script);
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
static void qwsAddDiskFont( TQDiskFont *qdf ); static void qwsAddDiskFont( TQDiskFont *qdf );
#endif #endif
@ -154,10 +154,10 @@ public:
#endif // TQT_NO_COMPAT #endif // TQT_NO_COMPAT
private: 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, static TQFontEngine *findFont( TQFont::Script script, const TQFontPrivate *fp,
const TQFontDef &amp;request, int force_encoding_id = -1 ); const TQFontDef &amp;request, int force_encoding_id = -1 );
#endif // Q_WS_X11 #endif // TQ_WS_X11
static void createDatabase(); static void createDatabase();

@ -82,7 +82,7 @@ body { background: #ffffff; color: black; }
#include "ntqrect.h" #include "ntqrect.h"
#endif // QT_H #endif // QT_H
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
class TQFontEngine; class TQFontEngine;
#endif #endif
@ -140,7 +140,7 @@ private:
friend class TQWidget; friend class TQWidget;
friend class TQPainter; friend class TQPainter;
friend class TQTextFormat; friend class TQTextFormat;
#if defined( Q_WS_MAC ) #if defined( TQ_WS_MAC )
friend class TQFontPrivate; friend class TQFontPrivate;
#endif #endif

@ -97,11 +97,11 @@ TQM_EXPORT_OPENGL inline const char *qGLVersion() {
} }
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
# include "qt_windows.h" # include "qt_windows.h"
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
#if !defined( TQMAC_OPENGL_DOUBLEBUFFER ) #if !defined( TQMAC_OPENGL_DOUBLEBUFFER )
/* This macro is different now. If the macro is not defined TQGLWidget will /* 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 * try to determine when you need double buffering. If set to 0 it will
@ -119,12 +119,12 @@ TQM_EXPORT_OPENGL inline const char *qGLVersion() {
# include &lt;GL/glu.h&gt; # include &lt;GL/glu.h&gt;
#endif #endif
#if defined(Q_WS_WIN) || defined(Q_WS_MAC) #if defined(TQ_WS_WIN) || defined(TQ_WS_MAC)
class TQGLCmap; class TQGLCmap;
#endif #endif
class TQPixmap; class TQPixmap;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
class TQGLOverlayWidget; class TQGLOverlayWidget;
#endif #endif
@ -238,14 +238,14 @@ protected:
virtual bool chooseContext( const TQGLContext* shareContext = 0 ); virtual bool chooseContext( const TQGLContext* shareContext = 0 );
virtual void doneCurrent(); // ### 4.0: make this public - needed for multithreading stuff 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 ); virtual int choosePixelFormat( void* pfd, HDC pdc );
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
virtual void* tryVisual( const TQGLFormat&amp; f, int bufDepth = 1 ); virtual void* tryVisual( const TQGLFormat&amp; f, int bufDepth = 1 );
virtual void* chooseVisual(); virtual void* chooseVisual();
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
virtual void* chooseMacVisual(GDHandle); virtual void* chooseMacVisual(GDHandle);
#endif #endif
@ -261,16 +261,16 @@ protected:
void setDevice( TQPaintDevice *pDev ); void setDevice( TQPaintDevice *pDev );
protected: protected:
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
HGLRC rc; HGLRC rc;
HDC dc; HDC dc;
WId win; WId win;
int pixelFormatId; int pixelFormatId;
TQGLCmap* cmap; TQGLCmap* cmap;
#elif defined(Q_WS_X11) || defined(Q_WS_MAC) #elif defined(TQ_WS_X11) || defined(TQ_WS_MAC)
void* vi; void* vi;
void* cx; void* cx;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
TQ_UINT32 gpm; TQ_UINT32 gpm;
#endif #endif
#endif #endif
@ -288,14 +288,14 @@ private:
bool crWin; bool crWin;
TQPaintDevice* paintDevice; TQPaintDevice* paintDevice;
TQColor transpColor; TQColor transpColor;
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
TQRect oldR; TQRect oldR;
#endif #endif
}; };
Private* d; Private* d;
friend class TQGLWidget; friend class TQGLWidget;
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
void fixBufferRect(); void fixBufferRect();
#endif #endif
@ -395,9 +395,9 @@ private:
TQGLColormap cmap; TQGLColormap cmap;
#if defined(Q_WS_WIN) || defined(Q_WS_MAC) #if defined(TQ_WS_WIN) || defined(TQ_WS_MAC)
TQGLContext* olcx; TQGLContext* olcx;
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
TQGLOverlayWidget* olw; TQGLOverlayWidget* olw;
friend class TQGLOverlayWidget; friend class TQGLOverlayWidget;
#endif #endif
@ -408,7 +408,7 @@ private: // Disabled copy constructor and operator=
TQGLWidget&amp; operator=( const TQGLWidget&amp; ); TQGLWidget&amp; operator=( const TQGLWidget&amp; );
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
private: private:
const TQGLContext *slcx; const TQGLContext *slcx;
uint pending_fix : 1, uint pending_fix : 1,

@ -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 MACX - Mac OS X
MAC9 - Mac OS 9 MAC9 - Mac OS 9
@ -599,39 +599,50 @@ body { background: #ffffff; color: black; }
#if defined(Q_OS_MAC9) #if defined(Q_OS_MAC9)
# define Q_WS_MAC9 # define Q_WS_MAC9
# define TQ_WS_MAC9
#elif defined(Q_OS_MSDOS) #elif defined(Q_OS_MSDOS)
# define Q_WS_WIN16 # define Q_WS_WIN16
# define TQ_WS_WIN16
# error "TQt requires Win32 and does not work with Windows 3.x" # error "TQt requires Win32 and does not work with Windows 3.x"
#elif defined(_WIN32_X11_) #elif defined(_WIN32_X11_)
# define Q_WS_X11 # define Q_WS_X11
# define TQ_WS_X11
#elif defined(Q_OS_WIN32) #elif defined(Q_OS_WIN32)
# define Q_WS_WIN32 # define Q_WS_WIN32
# define TQ_WS_WIN32
# if defined(Q_OS_WIN64) # if defined(Q_OS_WIN64)
# define Q_WS_WIN64 # define Q_WS_WIN64
# define TQ_WS_WIN64
# endif # endif
#elif defined(Q_OS_OS2) #elif defined(Q_OS_OS2)
# define Q_WS_PM # define Q_WS_PM
# define TQ_WS_PM
# error "TQt does not work with OS/2 Presentation Manager or Workplace Shell" # error "TQt does not work with OS/2 Presentation Manager or Workplace Shell"
#elif defined(Q_OS_UNIX) #elif defined(Q_OS_UNIX)
# if defined(TQWS) # if defined(TQWS)
# define Q_WS_QWS # define Q_WS_QWS
# define TQ_WS_QWS
# define TQT_NO_QWS_IM # define TQT_NO_QWS_IM
# elif defined(Q_OS_MACX) # elif defined(Q_OS_MACX)
# define Q_WS_MACX # define Q_WS_MACX
# define TQ_WS_MACX
# else # else
# define Q_WS_X11 # define Q_WS_X11
# define TQ_WS_X11
# endif # endif
#endif #endif
#if defined(Q_OS_MAC) &amp;&amp; !defined(TQMAC_PASCAL) #if defined(Q_OS_MAC) &amp;&amp; !defined(TQMAC_PASCAL)
# define TQMAC_PASCAL # define TQMAC_PASCAL
#endif #endif
#if defined(Q_WS_WIN16) || defined(Q_WS_WIN32) #if defined(TQ_WS_WIN16) || defined(TQ_WS_WIN32)
# define Q_WS_WIN # define Q_WS_WIN
# define TQ_WS_WIN
#endif #endif
#if (defined(Q_WS_MAC9) || defined(Q_WS_MACX)) &amp;&amp; !defined(Q_WS_QWS) &amp;&amp; !defined(Q_WS_X11) #if (defined(TQ_WS_MAC9) || defined(TQ_WS_MACX)) &amp;&amp; !defined(TQ_WS_QWS) &amp;&amp; !defined(TQ_WS_X11)
# define Q_WS_MAC # define Q_WS_MAC
# define TQ_WS_MAC
#endif #endif
@ -835,7 +846,7 @@ class TQDataStream;
# define TQT_NO_SQL # define TQT_NO_SQL
#endif #endif
#if defined(Q_WS_MAC9) #if defined(TQ_WS_MAC9)
//No need for menu merging //No need for menu merging
# ifndef TQMAC_QMENUBAR_NO_MERGE # ifndef TQMAC_QMENUBAR_NO_MERGE
# define TQMAC_QMENUBAR_NO_MERGE # define TQMAC_QMENUBAR_NO_MERGE
@ -848,7 +859,7 @@ class TQDataStream;
# define TQMAC_QMENUBAR_NO_EVENT # define TQMAC_QMENUBAR_NO_EVENT
# endif # endif
#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 # ifndef TQMAC_NO_QUARTZ
# define TQMAC_NO_QUARTZ # define TQMAC_NO_QUARTZ
# endif # endif
@ -857,7 +868,7 @@ class TQDataStream;
# endif # endif
#endif #endif
#if !defined(Q_WS_QWS) &amp;&amp; !defined(TQT_NO_COP) #if !defined(TQ_WS_QWS) &amp;&amp; !defined(TQT_NO_COP)
# define TQT_NO_COP # define TQT_NO_COP
#endif #endif
@ -920,7 +931,7 @@ class TQDataStream;
// Some platform specific stuff // Some platform specific stuff
// //
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
extern TQ_EXPORT bool qt_winunicode; extern TQ_EXPORT bool qt_winunicode;
#endif #endif
@ -934,7 +945,7 @@ TQ_EXPORT bool tqSysInfo( int *wordSize, bool *bigEndian );
TQ_EXPORT bool tqSharedBuild(); TQ_EXPORT bool tqSharedBuild();
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
int qMacVersion(); int qMacVersion();
#elif defined(Q_WS_WIN) #elif defined(TQ_WS_WIN)
TQ_EXPORT int qWinVersion(); TQ_EXPORT int qWinVersion();
#if defined(UNICODE) #if defined(UNICODE)
#define QT_WA( uni, ansi ) if ( qt_winunicode ) { uni } else { ansi } #define QT_WA( uni, ansi ) if ( qt_winunicode ) { uni } else { ansi }

@ -119,7 +119,7 @@ public:
TQImage( uchar* data, int w, int h, int depth, TQImage( uchar* data, int w, int h, int depth,
TQRgb* colortable, int numColors, TQRgb* colortable, int numColors,
Endian bitOrder ); Endian bitOrder );
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
TQImage( uchar* data, int w, int h, int depth, int pbl, TQImage( uchar* data, int w, int h, int depth, int pbl,
TQRgb* colortable, int numColors, TQRgb* colortable, int numColors,
Endian bitOrder ); Endian bitOrder );
@ -165,7 +165,7 @@ public:
int numBytes() const; int numBytes() const;
int bytesPerLine() const; int bytesPerLine() const;
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
TQGfx * graphicsContext(); TQGfx * graphicsContext();
#endif #endif

@ -81,7 +81,7 @@ body { background: #ffffff; color: black; }
#include "ntqwindowsstyle.h" #include "ntqwindowsstyle.h"
#endif // QT_H #endif // QT_H
#if defined( Q_WS_MAC ) &amp;&amp; !defined( TQT_NO_STYLE_MAC ) #if defined( TQ_WS_MAC ) &amp;&amp; !defined( TQT_NO_STYLE_MAC )
class TQPalette; class TQPalette;
@ -180,7 +180,7 @@ protected:
TQMacStylePrivate *d; TQMacStylePrivate *d;
}; };
#endif // Q_WS_MAC #endif // TQ_WS_MAC
#endif // TQMACSTYLE_H #endif // TQMACSTYLE_H
</pre> </pre>

@ -122,7 +122,7 @@ public:
void activateItemAt( int index ); void activateItemAt( int index );
#if defined(Q_WS_MAC) &amp;&amp; !defined(TQMAC_QMENUBAR_NO_NATIVE) #if defined(TQ_WS_MAC) &amp;&amp; !defined(TQMAC_QMENUBAR_NO_NATIVE)
static void initialize(); static void initialize();
static void cleanup(); static void cleanup();
#endif #endif
@ -196,7 +196,7 @@ private:
friend class TQPopupMenu; friend class TQPopupMenu;
#if defined(Q_WS_MAC) &amp;&amp; !defined(TQMAC_QMENUBAR_NO_NATIVE) #if defined(TQ_WS_MAC) &amp;&amp; !defined(TQMAC_QMENUBAR_NO_NATIVE)
friend class TQWidget; friend class TQWidget;
friend class TQApplication; friend class TQApplication;
friend void qt_mac_set_modal_state(bool, TQMenuBar *); friend void qt_mac_set_modal_state(bool, TQMenuBar *);

@ -158,7 +158,7 @@ private:
TQMimeSourceFactoryData* d; TQMimeSourceFactoryData* d;
}; };
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
#ifndef QT_H #ifndef QT_H
#include "ntqptrlist.h" // down here for GCC 2.7.* compatibility #include "ntqptrlist.h" // down here for GCC 2.7.* compatibility
@ -194,7 +194,7 @@ public:
}; };
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
#ifndef QT_H #ifndef QT_H
#include "ntqptrlist.h" // down here for GCC 2.7.* compatibility #include "ntqptrlist.h" // down here for GCC 2.7.* compatibility
@ -229,7 +229,7 @@ public:
virtual TQValueList&lt;TQByteArray&gt; convertFromMime(TQByteArray data, const char* mime, int flav)=0; virtual TQValueList&lt;TQByteArray&gt; convertFromMime(TQByteArray data, const char* mime, int flav)=0;
}; };
#endif // Q_WS_MAC #endif // TQ_WS_MAC
#endif // TQT_NO_MIME #endif // TQT_NO_MIME

@ -132,7 +132,7 @@ public:
void connectUpdate(TQObject* receiver, const char *member); void connectUpdate(TQObject* receiver, const char *member);
void disconnectUpdate(TQObject* receiver, const char *member=0); void disconnectUpdate(TQObject* receiver, const char *member=0);
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
// Temporary hack // Temporary hack
void setDisplayWidget(TQWidget * w); void setDisplayWidget(TQWidget * w);
#endif #endif

@ -238,12 +238,12 @@ public:
WMouseNoMask = 0x00200000, WMouseNoMask = 0x00200000,
WStaticContents = 0x00400000, WStaticContents = 0x00400000,
WRepaintNoErase = 0x00800000, // OBSOLETE WRepaintNoErase = 0x00800000, // OBSOLETE
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
WX11BypassWM = 0x01000000, WX11BypassWM = 0x01000000,
WWinOwnDC = 0x00000000, WWinOwnDC = 0x00000000,
WMacNoSheet = 0x00000000, WMacNoSheet = 0x00000000,
WMacDrawer = 0x00000000, WMacDrawer = 0x00000000,
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
WX11BypassWM = 0x00000000, WX11BypassWM = 0x00000000,
WWinOwnDC = 0x00000000, WWinOwnDC = 0x00000000,
WMacNoSheet = 0x01000000, WMacNoSheet = 0x01000000,
@ -258,7 +258,7 @@ public:
WShowModal = 0x04000000, WShowModal = 0x04000000,
WNoMousePropagation = 0x08000000, WNoMousePropagation = 0x08000000,
WSubWindow = 0x10000000, WSubWindow = 0x10000000,
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
WStyle_Splash = 0x20000000, WStyle_Splash = 0x20000000,
#else #else
WStyle_Splash = WStyle_NoBorder | WMacNoSheet | WStyle_Tool | WWinOwnDC, WStyle_Splash = WStyle_NoBorder | WMacNoSheet | WStyle_Tool | WWinOwnDC,
@ -930,13 +930,13 @@ public:
// "handle" type for system objects. Documented as \internal in // "handle" type for system objects. Documented as \internal in
// qapplication.cpp // qapplication.cpp
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
typedef void * HANDLE; typedef void * HANDLE;
#elif defined(Q_WS_WIN) #elif defined(TQ_WS_WIN)
typedef void *HANDLE; typedef void *HANDLE;
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
typedef unsigned long HANDLE; typedef unsigned long HANDLE;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
typedef void * HANDLE; typedef void * HANDLE;
#endif #endif
}; };

@ -82,7 +82,7 @@ body { background: #ffffff; color: black; }
#include "ntqrect.h" #include "ntqrect.h"
#endif // QT_H #endif // QT_H
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
class TQWSDisplay; class TQWSDisplay;
class TQGfx; class TQGfx;
#endif #endif
@ -92,7 +92,7 @@ class TQString;
class TQTextItem; class TQTextItem;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
struct TQPaintDeviceX11Data; struct TQPaintDeviceX11Data;
#endif #endif
@ -131,18 +131,18 @@ public:
// Windows: get device context // Windows: get device context
// X-Windows: get drawable // X-Windows: get drawable
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
virtual HDC handle() const; virtual HDC handle() const;
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
virtual TQt::HANDLE handle() const; virtual TQt::HANDLE handle() const;
virtual TQt::HANDLE x11RenderHandle() const; virtual TQt::HANDLE x11RenderHandle() const;
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
virtual TQt::HANDLE handle() const; virtual TQt::HANDLE handle() const;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
virtual TQt::HANDLE handle() const; virtual TQt::HANDLE handle() const;
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
Display *x11Display() const; Display *x11Display() const;
int x11Screen() const; int x11Screen() const;
int x11Depth() const; int x11Depth() const;
@ -182,7 +182,7 @@ public:
static void x11SetAppDpiY( int, int ); static void x11SetAppDpiY( int, int );
#endif #endif
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
static TQWSDisplay *qwsDisplay(); static TQWSDisplay *qwsDisplay();
virtual unsigned char * scanLine(int) const; virtual unsigned char * scanLine(int) const;
virtual int bytesPerLine() const; virtual int bytesPerLine() const;
@ -249,9 +249,9 @@ public:
protected: protected:
TQPaintDevice( uint devflags ); TQPaintDevice( uint devflags );
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
HDC hdc; // device context HDC hdc; // device context
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
TQt::HANDLE hd; // handle to drawable TQt::HANDLE hd; // handle to drawable
TQt::HANDLE rendhd; // handle to RENDER pict TQt::HANDLE rendhd; // handle to RENDER pict
@ -259,12 +259,12 @@ protected:
void cloneX11Data( const TQPaintDevice * ); void cloneX11Data( const TQPaintDevice * );
virtual void setX11Data( const TQPaintDeviceX11Data* ); virtual void setX11Data( const TQPaintDeviceX11Data* );
TQPaintDeviceX11Data* getX11Data( bool def=FALSE ) const; TQPaintDeviceX11Data* getX11Data( bool def=FALSE ) const;
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
#if !defined( TQMAC_NO_QUARTZ ) #if !defined( TQMAC_NO_QUARTZ )
CGContextRef ctx; CGContextRef ctx;
#endif #endif
void * hd; void * hd;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
TQt::HANDLE hd; TQt::HANDLE hd;
#endif #endif
@ -278,7 +278,7 @@ protected:
friend class TQPainter; friend class TQPainter;
friend class TQPaintDeviceMetrics; friend class TQPaintDeviceMetrics;
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
#ifndef TQMAC_NO_QUARTZ #ifndef TQMAC_NO_QUARTZ
virtual CGContextRef macCGContext(bool clipped=TRUE) const; virtual CGContextRef macCGContext(bool clipped=TRUE) const;
#endif #endif
@ -289,13 +289,13 @@ protected:
const TQPaintDevice *, const TQPaintDevice *,
int, int, int, int, TQt::RasterOp, bool ); int, int, int, int, TQt::RasterOp, bool );
#endif #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_init_internal( int *, char **, Display *, TQt::HANDLE, TQt::HANDLE );
friend void tqt_cleanup(); friend void tqt_cleanup();
#endif #endif
private: private:
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
static Display *x_appdisplay; static Display *x_appdisplay;
static int x_appscreen; static int x_appscreen;
@ -338,7 +338,7 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy,
int conversion_flags=0 ); int conversion_flags=0 );
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
struct TQ_EXPORT TQPaintDeviceX11Data : public TQShared { struct TQ_EXPORT TQPaintDeviceX11Data : public TQShared {
Display* x_display; Display* x_display;
@ -366,7 +366,7 @@ inline bool TQPaintDevice::isExtDev() const
inline bool TQPaintDevice::paintingActive() const inline bool TQPaintDevice::paintingActive() const
{ return painters != 0; } { return painters != 0; }
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
inline Display *TQPaintDevice::x11Display() const inline Display *TQPaintDevice::x11Display() const
{ return x11Data ? x11Data-&gt;x_display : x_appdisplay; } { return x11Data ? x11Data-&gt;x_display : x_appdisplay; }
@ -439,7 +439,7 @@ inline void *TQPaintDevice::x11AppVisual()
inline bool TQPaintDevice::x11AppDefaultVisual() inline bool TQPaintDevice::x11AppDefaultVisual()
{ return x_appdefvisual; } { return x_appdefvisual; }
#endif // Q_WS_X11 #endif // TQ_WS_X11
TQ_EXPORT TQ_EXPORT

@ -94,12 +94,12 @@ class TQTextCodec;
class TQTextParag; class TQTextParag;
class TQPaintDevice; class TQPaintDevice;
class TQTextItem; class TQTextItem;
#if defined( Q_WS_MAC ) #if defined( TQ_WS_MAC )
class TQMacSavedPortInfo; class TQMacSavedPortInfo;
#endif #endif
class TQPainterPrivate; class TQPainterPrivate;
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
class TQScreen; class TQScreen;
#endif #endif
@ -118,7 +118,7 @@ public:
bool end(); bool end();
TQPaintDevice *device() const; TQPaintDevice *device() const;
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
TQGfx * internalGfx(); TQGfx * internalGfx();
#ifdef QT_QWS_EXPERIMENTAL_SCREENPAINTER #ifdef QT_QWS_EXPERIMENTAL_SCREENPAINTER
bool begin(TQScreen *screen); bool begin(TQScreen *screen);
@ -322,9 +322,9 @@ public:
// Other functions // Other functions
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
HDC handle() const; HDC handle() const;
#elif defined(Q_WS_X11) || defined(Q_WS_MAC) #elif defined(TQ_WS_X11) || defined(TQ_WS_MAC)
HANDLE handle() const; HANDLE handle() const;
#endif #endif
@ -424,11 +424,11 @@ protected:
TQPoint internalCurrentPos; TQPoint internalCurrentPos;
uint old_pix; // ### All win platforms in 4.0 uint old_pix; // ### All win platforms in 4.0
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
friend class TQFontEngineWin; friend class TQFontEngineWin;
friend class TQFontEngineBox; friend class TQFontEngineBox;
QT_WIN_PAINTER_MEMBERS QT_WIN_PAINTER_MEMBERS
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
friend class TQFontEngineXLFD; friend class TQFontEngineXLFD;
friend class TQFontEngineXft; friend class TQFontEngineXft;
friend class TQFontEngineBox; friend class TQFontEngineBox;
@ -440,13 +440,13 @@ protected:
GC gc_brush; // graphics contect for brush GC gc_brush; // graphics contect for brush
TQPoint curPt; // current point TQPoint curPt; // current point
uint clip_serial; // clipping serial number uint clip_serial; // clipping serial number
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
TQt::HANDLE hd; // handle to drawable TQt::HANDLE hd; // handle to drawable
void initPaintDevice(bool force=FALSE, TQPoint *off=NULL, TQRegion *rgn=NULL); void initPaintDevice(bool force=FALSE, TQPoint *off=NULL, TQRegion *rgn=NULL);
friend const TQRegion &amp;qt_mac_update_painter(TQPainter *, bool); friend const TQRegion &amp;qt_mac_update_painter(TQPainter *, bool);
friend class TQFontEngineMac; friend class TQFontEngineMac;
friend class TQMacPainter; friend class TQMacPainter;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
friend class TQFontEngine; friend class TQFontEngine;
TQGfx * gfx; TQGfx * gfx;
friend void qwsUpdateActivePainters(); friend void qwsUpdateActivePainters();
@ -585,12 +585,12 @@ inline int *TQPainter::tabArray() const
return tabarray; return tabarray;
} }
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
inline HDC TQPainter::handle() const inline HDC TQPainter::handle() const
{ {
return hdc; 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 inline TQt::HANDLE TQPainter::handle() const
{ {
return hd; 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 ); return boundingRect( r, tf, str, len, i );
} }
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
inline TQGfx * TQPainter::internalGfx() inline TQGfx * TQPainter::internalGfx()
{ {
return gfx; return gfx;

@ -111,7 +111,7 @@ public:
private: private:
friend class TQPainter; friend class TQPainter;
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
friend class TQFontEngineWin; friend class TQFontEngineWin;
#endif #endif

@ -87,7 +87,7 @@ body { background: #ffffff; color: black; }
class TQGfx; class TQGfx;
class TQPixmapPrivate; class TQPixmapPrivate;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
// Internal pixmap memory optimization class for Windows 9x // Internal pixmap memory optimization class for Windows 9x
class TQMultiCellPixmap; class TQMultiCellPixmap;
#endif #endif
@ -175,7 +175,7 @@ public:
bool save( TQIODevice* device, const char* format, int quality = -1 ) const; bool save( TQIODevice* device, const char* format, int quality = -1 ) const;
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
HBITMAP hbm() const; HBITMAP hbm() const;
#endif #endif
@ -190,7 +190,7 @@ public:
bool isTQBitmap() const; bool isTQBitmap() const;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
// These functions are internal and used by Windows 9x only // These functions are internal and used by Windows 9x only
bool isMultiCellPixmap() const; bool isMultiCellPixmap() const;
HDC multiCellHandle() const; HDC multiCellHandle() const;
@ -200,13 +200,13 @@ public:
void freeCell( bool = FALSE ); void freeCell( bool = FALSE );
#endif #endif
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
virtual TQGfx * graphicsContext(bool clip_children=TRUE) const; virtual TQGfx * graphicsContext(bool clip_children=TRUE) const;
virtual unsigned char * scanLine(int) const; virtual unsigned char * scanLine(int) const;
virtual int bytesPerLine() const; virtual int bytesPerLine() const;
TQRgb * clut() const; TQRgb * clut() const;
int numCols() const; int numCols() const;
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
static int x11SetDefaultScreen( int screen ); static int x11SetDefaultScreen( int screen );
void x11SetScreen( int screen ); void x11SetScreen( int screen );
#endif #endif
@ -219,7 +219,7 @@ protected:
TQPixmap( int w, int h, const uchar *data, bool isXbitmap ); TQPixmap( int w, int h, const uchar *data, bool isXbitmap );
int metric( int ) const; int metric( int ) const;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
struct TQMCPI { // mem optim for win9x struct TQMCPI { // mem optim for win9x
TQMultiCellPixmap *mcp; TQMultiCellPixmap *mcp;
int offset; int offset;
@ -232,12 +232,12 @@ protected:
uint uninit : 1; uint uninit : 1;
uint bitmap : 1; uint bitmap : 1;
uint selfmask : 1; uint selfmask : 1;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
uint mcp : 1; uint mcp : 1;
#endif #endif
int ser_no; int ser_no;
TQBitmap *mask; TQBitmap *mask;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
TQPixmap *maskpm; TQPixmap *maskpm;
union { union {
HBITMAP hbm; // if mcp == FALSE HBITMAP hbm; // if mcp == FALSE
@ -247,14 +247,14 @@ protected:
#ifdef Q_OS_TEMP #ifdef Q_OS_TEMP
uchar* ppvBits; // Pointer to DIBSection bits uchar* ppvBits; // Pointer to DIBSection bits
#endif #endif
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
void *ximage; void *ximage;
void *maskgc; void *maskgc;
TQPixmap *alphapm; TQPixmap *alphapm;
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
ColorTable *clut; ColorTable *clut;
TQPixmap *alphapm; TQPixmap *alphapm;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
int id; // ### should use TQPaintDevice::hd, since it is there int id; // ### should use TQPaintDevice::hd, since it is there
TQRgb * clut; TQRgb * clut;
int numcols; int numcols;
@ -263,7 +263,7 @@ protected:
bool hasAlpha; bool hasAlpha;
#endif #endif
Optimization optim; Optimization optim;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
HBITMAP old_hbm; HBITMAP old_hbm;
#endif #endif
} *data; } *data;
@ -275,7 +275,7 @@ private:
void init( int, int, int, bool, Optimization ); void init( int, int, int, bool, Optimization );
void deref(); void deref();
TQPixmap copy( bool ignoreMask = FALSE ) const; 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 initAlphaPixmap( uchar *bytes, int length, struct tagBITMAPINFO *bmi );
void convertToAlphaPixmap( bool initAlpha=TRUE ); void convertToAlphaPixmap( bool initAlpha=TRUE );
static void bitBltAlphaPixmap( TQPixmap *dst, int dx, int dy, static void bitBltAlphaPixmap( TQPixmap *dst, int dx, int dy,
@ -293,7 +293,7 @@ private:
const TQPixmap *src, int sx, int sy, const TQPixmap *src, int sx, int sy,
int sw, int sh ); int sw, int sh );
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
friend void unclippedScaledBitBlt(TQPaintDevice *, int, int, int, int, friend void unclippedScaledBitBlt(TQPaintDevice *, int, int, int, int,
const TQPaintDevice *, int, int, int, int, const TQPaintDevice *, int, int, int, int,
TQt::RasterOp, bool, bool); TQt::RasterOp, bool, bool);
@ -331,7 +331,7 @@ inline bool TQPixmap::selfMask() const
return data-&gt;selfmask; return data-&gt;selfmask;
} }
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
inline HBITMAP TQPixmap::hbm() const inline HBITMAP TQPixmap::hbm() const
{ {
return data-&gt;mcp ? 0 : data-&gt;hbm_or_mcpi.hbm; return data-&gt;mcp ? 0 : data-&gt;hbm_or_mcpi.hbm;
@ -353,7 +353,7 @@ inline bool TQPixmap::isTQBitmap() const
return data-&gt;bitmap; return data-&gt;bitmap;
} }
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
inline bool TQPixmap::isMultiCellPixmap() const inline bool TQPixmap::isMultiCellPixmap() const
{ {
return data-&gt;mcp; return data-&gt;mcp;
@ -377,7 +377,7 @@ TQ_EXPORT TQDataStream &amp;operator&gt;&gt;( TQDataStream &amp;, TQPixmap &amp;
#ifndef TQT_NO_PIXMAP_TRANSFORMATION #ifndef TQT_NO_PIXMAP_TRANSFORMATION
# define QT_XFORM_TYPE_MSBFIRST 0 # define QT_XFORM_TYPE_MSBFIRST 0
# define QT_XFORM_TYPE_LSBFIRST 1 # define QT_XFORM_TYPE_LSBFIRST 1
# if defined(Q_WS_WIN) # if defined(TQ_WS_WIN)
# define QT_XFORM_TYPE_WINDOWSPIXMAP 2 # define QT_XFORM_TYPE_WINDOWSPIXMAP 2
# endif # endif
bool qt_xForm_helper( const TQWMatrix&amp;, int, int, int, uchar*, int, int, int, uchar*, int, int, int ); bool qt_xForm_helper( const TQWMatrix&amp;, int, int, int, uchar*, int, int, int, uchar*, int, int, int );

@ -200,7 +200,7 @@ private:
TQAccel *autoaccel; TQAccel *autoaccel;
#endif #endif
#if defined(Q_WS_MAC) &amp;&amp; !defined(TQMAC_QMENUBAR_NO_NATIVE) #if defined(TQ_WS_MAC) &amp;&amp; !defined(TQMAC_QMENUBAR_NO_NATIVE)
bool macPopupMenu(const TQPoint &amp;, int); bool macPopupMenu(const TQPoint &amp;, int);
uint mac_dirty_popup : 1; uint mac_dirty_popup : 1;
#endif #endif

@ -144,11 +144,11 @@ public:
virtual void setOrientation( Orientation ); virtual void setOrientation( Orientation );
PageSize pageSize() const; PageSize pageSize() const;
virtual void setPageSize( PageSize ); virtual void setPageSize( PageSize );
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
void setWinPageSize( short winPageSize ); void setWinPageSize( short winPageSize );
short winPageSize() const; short winPageSize() const;
#endif #endif
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
bool printSetup(); bool printSetup();
bool pageSetup(); bool pageSetup();
#endif #endif
@ -201,17 +201,17 @@ protected:
bool cmd( int, TQPainter *, TQPDevCmdParam * ); bool cmd( int, TQPainter *, TQPDevCmdParam * );
int metric( int ) const; int metric( int ) const;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
virtual void setActive(); virtual void setActive();
virtual void setIdle(); virtual void setIdle();
#endif #endif
private: private:
#if defined(Q_WS_X11) || defined(Q_WS_QWS) #if defined(TQ_WS_X11) || defined(TQ_WS_QWS)
TQPaintDevice *pdrv; TQPaintDevice *pdrv;
int pid; int pid;
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
friend class TQPrinterPrivate; friend class TQPrinterPrivate;
PMPageFormat pformat; PMPageFormat pformat;
PMPrintSettings psettings; PMPrintSettings psettings;
@ -221,7 +221,7 @@ private:
void interpret(PMPrintSettings *); void interpret(PMPrintSettings *);
void interpret(PMPageFormat *); void interpret(PMPageFormat *);
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
void readPdlg( void* ); void readPdlg( void* );
void readPdlgA( void* ); void readPdlgA( void* );
void writeDevmode( TQt::HANDLE ); void writeDevmode( TQt::HANDLE );

@ -171,7 +171,7 @@ public:
friend TQ_EXPORT bool operator!=( const TQRect &amp;, const TQRect &amp; ); friend TQ_EXPORT bool operator!=( const TQRect &amp;, const TQRect &amp; );
private: 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 ); friend void qt_setCoords( TQRect *r, int xp1, int yp1, int xp2, int yp2 );
#endif #endif
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)

@ -82,7 +82,7 @@ body { background: #ffffff; color: black; }
#include "ntqrect.h" #include "ntqrect.h"
#endif // QT_H #endif // QT_H
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
struct TQRegionPrivate; struct TQRegionPrivate;
#endif #endif
@ -132,13 +132,13 @@ public:
bool operator!=( const TQRegion &amp;r ) const bool operator!=( const TQRegion &amp;r ) const
{ return !(operator==(r)); } { return !(operator==(r)); }
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
HRGN handle() const { return data-&gt;rgn; } HRGN handle() const { return data-&gt;rgn; }
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
Region handle() const { if(!data-&gt;rgn) updateX11Region(); return data-&gt;rgn; } Region handle() const { if(!data-&gt;rgn) updateX11Region(); return data-&gt;rgn; }
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
RgnHandle handle(bool require_rgn=FALSE) const; RgnHandle handle(bool require_rgn=FALSE) const;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
// TQGfx_QWS needs this for region drawing // TQGfx_QWS needs this for region drawing
void * handle() const { return data-&gt;rgn; } void * handle() const { return data-&gt;rgn; }
#endif #endif
@ -151,37 +151,37 @@ private:
TQRegion( bool ); TQRegion( bool );
TQRegion copy() const; TQRegion copy() const;
void detach(); void detach();
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
TQRegion winCombine( const TQRegion &amp;, int ) const; TQRegion winCombine( const TQRegion &amp;, int ) const;
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
void updateX11Region() const; void updateX11Region() const;
void *clipRectangles( int &amp;num ) const; void *clipRectangles( int &amp;num ) const;
friend void *qt_getClipRects( const TQRegion &amp;, int &amp; ); friend void *qt_getClipRects( const TQRegion &amp;, int &amp; );
#endif #endif
void exec( const TQByteArray &amp;, int ver = 0 ); void exec( const TQByteArray &amp;, int ver = 0 );
struct TQRegionData : public TQShared { struct TQRegionData : public TQShared {
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
HRGN rgn; HRGN rgn;
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
Region rgn; Region rgn;
void *xrectangles; void *xrectangles;
TQRegionPrivate *region; TQRegionPrivate *region;
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
uint is_rect:1; uint is_rect:1;
TQRect rect; TQRect rect;
RgnHandle rgn; RgnHandle rgn;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
void * rgn; void * rgn;
#endif #endif
bool is_null; bool is_null;
} *data; } *data;
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
friend struct qt_mac_rgn_data_cache; friend struct qt_mac_rgn_data_cache;
friend TQRegionData *qt_mac_get_rgn_data(); friend TQRegionData *qt_mac_get_rgn_data();
friend void qt_mac_free_rgn_data(TQRegionData *); friend void qt_mac_free_rgn_data(TQRegionData *);
void rectifyRegion(); void rectifyRegion();
#elif defined(Q_WS_WIN) #elif defined(TQ_WS_WIN)
friend class TQETWidget; friend class TQETWidget;
#endif #endif

@ -95,7 +95,7 @@ class TQ_EXPORT TQSessionManager : public TQObject
public: public:
TQString sessionId() const; TQString sessionId() const;
TQString sessionKey() 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; void* handle() const;
#endif #endif

@ -367,7 +367,7 @@ public:
bool isUpdatesEnabled() const; bool isUpdatesEnabled() const;
#if 0 //def Q_WS_QWS #if 0 //def TQ_WS_QWS
void repaintUnclipped( const TQRegion &amp;, bool erase = TRUE ); void repaintUnclipped( const TQRegion &amp;, bool erase = TRUE );
#endif #endif
public slots: public slots:
@ -493,10 +493,10 @@ public:
TQWidget *childAt( int x, int y, bool includeThis = FALSE ) const; TQWidget *childAt( int x, int y, bool includeThis = FALSE ) const;
TQWidget *childAt( const TQPoint &amp;, bool includeThis = FALSE ) const; TQWidget *childAt( const TQPoint &amp;, bool includeThis = FALSE ) const;
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
virtual TQGfx * graphicsContext(bool clip_children=TRUE) const; virtual TQGfx * graphicsContext(bool clip_children=TRUE) const;
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
TQRegion clippedRegion(bool do_children=TRUE); TQRegion clippedRegion(bool do_children=TRUE);
uint clippedSerial(bool do_children=TRUE); uint clippedSerial(bool do_children=TRUE);
#ifndef TQMAC_NO_QUARTZ #ifndef TQMAC_NO_QUARTZ
@ -543,16 +543,16 @@ protected:
virtual void showEvent( TQShowEvent * ); virtual void showEvent( TQShowEvent * );
virtual void hideEvent( TQHideEvent * ); virtual void hideEvent( TQHideEvent * );
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
virtual bool macEvent( MSG * ); virtual bool macEvent( MSG * );
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
virtual bool winEvent( MSG * ); virtual bool winEvent( MSG * );
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
virtual bool x11Event( XEvent * ); virtual bool x11Event( XEvent * );
#endif #endif
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
virtual bool qwsEvent( TQWSEvent * ); virtual bool qwsEvent( TQWSEvent * );
virtual unsigned char *scanLine( int ) const; virtual unsigned char *scanLine( int ) const;
virtual int bytesPerLine() const; virtual int bytesPerLine() const;
@ -596,7 +596,7 @@ protected:
virtual void setKeyCompression(bool); virtual void setKeyCompression(bool);
virtual void setMicroFocusHint(int x, int y, int w, int h, bool text=TRUE, TQFont *f = 0); 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); void dirtyClippedRegion(bool);
bool isClippedRegionDirty(); bool isClippedRegionDirty();
virtual void setRegionDirty(bool); virtual void setRegionDirty(bool);
@ -608,12 +608,12 @@ private slots:
private: private:
void setFontSys( TQFont *f = 0 ); void setFontSys( TQFont *f = 0 );
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
void createInputContext(); void createInputContext();
void destroyInputContext(); void destroyInputContext();
void focusInputContext(); void focusInputContext();
void checkChildrenDnd(); void checkChildrenDnd();
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
uint own_id : 1, macDropEnabled : 1; uint own_id : 1, macDropEnabled : 1;
EventHandlerRef window_event; EventHandlerRef window_event;
//mac event functions //mac event functions
@ -658,7 +658,7 @@ private:
void setBackgroundModeDirect( BackgroundMode ); void setBackgroundModeDirect( BackgroundMode );
void setBackgroundEmpty(); void setBackgroundEmpty();
void updateFrameStrut() const; void updateFrameStrut() const;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
void setBackgroundX11Relative(); void setBackgroundX11Relative();
#endif #endif
@ -684,7 +684,7 @@ private:
TQLayout *lay_out; TQLayout *lay_out;
#endif #endif
TQWExtra *extra; TQWExtra *extra;
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
TQRegion req_region; // Requested region TQRegion req_region; // Requested region
mutable TQRegion paintable_region; // Paintable region mutable TQRegion paintable_region; // Paintable region
mutable bool paintable_region_dirty;// needs to be recalculated mutable bool paintable_region_dirty;// needs to be recalculated
@ -957,10 +957,10 @@ inline bool TQWidget::isInputMethodEnabled() const
class TQFocusData; class TQFocusData;
class TQWSManager; class TQWSManager;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
class TQOleDropTarget; class TQOleDropTarget;
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
class TQMacDndExtra; class TQMacDndExtra;
#endif #endif
@ -975,12 +975,12 @@ struct TQ_EXPORT TQTLWExtra {
// frame strut // frame strut
ulong fleft, fright, ftop, fbottom; ulong fleft, fright, ftop, fbottom;
uint unused : 8; // not used at this point... 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. uint opacity : 8; // Stores opacity level on Windows/Mac OS X.
#endif #endif
uint savedFlags; // Save widgetflags while showing fullscreen uint savedFlags; // Save widgetflags while showing fullscreen
short basew, baseh; // base sizes short basew, baseh; // base sizes
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
WId parentWinId; // parent window Id (valid after reparenting) WId parentWinId; // parent window Id (valid after reparenting)
uint embedded : 1; // window is embedded in another TQt application uint embedded : 1; // window is embedded in another TQt application
uint spont_unmapped: 1; // window was spontaneously unmapped uint spont_unmapped: 1; // window was spontaneously unmapped
@ -990,20 +990,20 @@ struct TQ_EXPORT TQTLWExtra {
uint ussize : 1; // User defined size uint ussize : 1; // User defined size
void *xic; // XIM Input Context void *xic; // XIM Input Context
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
WindowGroupRef group; WindowGroupRef group;
uint is_moved: 1; uint is_moved: 1;
uint resizer : 4; uint resizer : 4;
#endif #endif
#if defined(Q_WS_QWS) &amp;&amp; !defined ( TQT_NO_QWS_MANAGER ) #if defined(TQ_WS_QWS) &amp;&amp; !defined ( TQT_NO_QWS_MANAGER )
TQRegion decor_allocated_region; // decoration allocated region TQRegion decor_allocated_region; // decoration allocated region
TQWSManager *qwsManager; TQWSManager *qwsManager;
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
HICON winIcon; // internal Windows icon HICON winIcon; // internal Windows icon
#endif #endif
TQRect normalGeometry; // used by showMin/maximized/FullScreen TQRect normalGeometry; // used by showMin/maximized/FullScreen
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
uint style, exstyle; uint style, exstyle;
#endif #endif
}; };
@ -1022,13 +1022,13 @@ struct TQ_EXPORT TQWExtra {
TQCursor *curs; TQCursor *curs;
#endif #endif
TQTLWExtra *topextra; // only useful for TLWs TQTLWExtra *topextra; // only useful for TLWs
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
TQOleDropTarget *dropTarget; // drop target TQOleDropTarget *dropTarget; // drop target
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
WId xDndProxy; // XDND forwarding to embedded windows WId xDndProxy; // XDND forwarding to embedded windows
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
TQRegion clip_saved, clip_sibs, clip_children; TQRegion clip_saved, clip_sibs, clip_children;
TQMacDndExtra *macDndExtra; TQMacDndExtra *macDndExtra;
TQRegion dirty_area; TQRegion dirty_area;
@ -1038,13 +1038,13 @@ struct TQ_EXPORT TQWExtra {
uint ctx_children_clipped:1; uint ctx_children_clipped:1;
#endif // TQMAC_NO_QUARTZ #endif // TQMAC_NO_QUARTZ
uint has_dirty_area:1; uint has_dirty_area:1;
#endif // Q_WS_MAC #endif // TQ_WS_MAC
uint bg_origin : 2; uint bg_origin : 2;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
uint children_use_dnd : 1; uint children_use_dnd : 1;
uint compress_events : 1; uint compress_events : 1;
#endif #endif
#if defined(Q_WS_QWS) || defined(Q_WS_MAC) #if defined(TQ_WS_QWS) || defined(TQ_WS_MAC)
TQRegion mask; // widget mask TQRegion mask; // widget mask
#endif #endif
char bg_mode; // background mode char bg_mode; // background mode

@ -84,7 +84,7 @@ body { background: #ffffff; color: black; }
#endif // QT_H #endif // QT_H
#ifndef TQT_NO_WIDGETPLUGIN #ifndef TQT_NO_WIDGETPLUGIN
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
#ifdef QT_PLUGIN #ifdef QT_PLUGIN
#define QT_WIDGET_PLUGIN_EXPORT __declspec(dllexport) #define QT_WIDGET_PLUGIN_EXPORT __declspec(dllexport)
#else #else

@ -128,7 +128,7 @@ class TQWidgetListIt;
// Window system dependent definitions // Window system dependent definitions
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
#if QT_MACOSX_VERSION &lt; 0x1020 #if QT_MACOSX_VERSION &lt; 0x1020
typedef struct OpaqueEventLoopTimerRef* EventLoopTimerRef; typedef struct OpaqueEventLoopTimerRef* EventLoopTimerRef;
typedef struct OpaqueMenuHandle *MenuRef; typedef struct OpaqueMenuHandle *MenuRef;
@ -137,7 +137,7 @@ typedef struct __EventLoopTimer* EventLoopTimerRef;
typedef struct OpaqueMenuRef* MenuRef; typedef struct OpaqueMenuRef* MenuRef;
#endif #endif
#ifndef Q_WS_MACX #ifndef TQ_WS_MACX
typedef struct CGContext *CGContextRef; typedef struct CGContext *CGContextRef;
#endif #endif
typedef struct OpaqueWindowGroupRef *WindowGroupRef; typedef struct OpaqueWindowGroupRef *WindowGroupRef;
@ -164,18 +164,18 @@ typedef void * MSG;
typedef int WId; typedef int WId;
typedef struct AEDesc AppleEvent; 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" #include "qwindowdefs_win.h"
#endif // Q_WS_WIN #endif // TQ_WS_WIN
#if defined(Q_OS_TEMP) #if defined(Q_OS_TEMP)
#include "qwinfunctions_wce.h" #include "qwinfunctions_wce.h"
#endif // Q_OS_TEMP #endif // Q_OS_TEMP
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
typedef struct _XDisplay Display; typedef struct _XDisplay Display;
typedef union _XEvent XEvent; 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 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; typedef unsigned long WId;
struct TQWSEvent; struct TQWSEvent;
class TQGfx; class TQGfx;
#endif // Q_WS_QWS #endif // TQ_WS_QWS
class TQApplication; class TQApplication;

@ -123,7 +123,7 @@ int main( int argc, char ** argv )
t5-&gt;<a href="ntqwidget.html#setMinimumSize">setMinimumSize</a>( 80, 50 ); t5-&gt;<a href="ntqwidget.html#setMinimumSize">setMinimumSize</a>( 80, 50 );
t5-&gt;<a href="ntqwidget.html#setBackgroundColor">setBackgroundColor</a>( TQt::yellow ); t5-&gt;<a href="ntqwidget.html#setBackgroundColor">setBackgroundColor</a>( TQt::yellow );
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
// TQt/Embedded XOR drawing not yet implemented. // TQt/Embedded XOR drawing not yet implemented.
<a name="x1300"></a> s1-&gt;<a href="ntqsplitter.html#setOpaqueResize">setOpaqueResize</a>( TRUE ); <a name="x1300"></a> s1-&gt;<a href="ntqsplitter.html#setOpaqueResize">setOpaqueResize</a>( TRUE );
#endif #endif

@ -61,7 +61,7 @@ Notes</a>. For information on distributing TQt applications, see
<p> <a name="x11"></a> <p> <a name="x11"></a>
<h2> TQt/X11 <h2> TQt/X11
</h2> </h2>
<a name="1"></a><p> When compiling for this platform, the macro <tt>Q_WS_X11</tt> is defined. <a name="1"></a><p> When compiling for this platform, the macro <tt>TQ_WS_X11</tt> is defined.
<p> <em>Not documented here. Please contact Trolltech Technical Support if you have queries.</em> <p> <em>Not documented here. Please contact Trolltech Technical Support if you have queries.</em>
<p> <center><img src="dependencies.png" alt="TQt/X11 Dependencies"></center> <p> <center><img src="dependencies.png" alt="TQt/X11 Dependencies"></center>
<p> Note: You must compile with <em>both</em> Xft and XRender support to get <p> Note: You must compile with <em>both</em> Xft and XRender support to get
@ -70,7 +70,7 @@ XRender support only is not enough.
<p> <a name="win"></a> <p> <a name="win"></a>
<h2> TQt/Windows <h2> TQt/Windows
</h2> </h2>
<a name="2"></a><p> When compiling for this platform, the macro <tt>Q_WS_WIN</tt> is defined. <a name="2"></a><p> When compiling for this platform, the macro <tt>TQ_WS_WIN</tt> is defined.
<p> <em>Not documented here. Please contact Trolltech Technical Support if you have queries.</em> <p> <em>Not documented here. Please contact Trolltech Technical Support if you have queries.</em>
<p> <h3> Microsoft Visual Studio 2005 Deployment Issues <p> <h3> Microsoft Visual Studio 2005 Deployment Issues
</h3> </h3>
@ -90,14 +90,14 @@ you can embed the manifest in the executable as a resource with the
<p> <a name="macosx"></a> <p> <a name="macosx"></a>
<h2> TQt/Mac OS X <h2> TQt/Mac OS X
</h2> </h2>
<a name="3"></a><p> When compiling for this platform, the macro <tt>Q_WS_MACX</tt> is defined. <a name="3"></a><p> When compiling for this platform, the macro <tt>TQ_WS_MACX</tt> is defined.
<p> <ul> <p> <ul>
<li> <a href="mac-differences.html">TQt/Mac issues</a> <li> <a href="mac-differences.html">TQt/Mac issues</a>
</ul> </ul>
<p> <a name="qws"></a> <p> <a name="qws"></a>
<h2> TQt/Embedded <h2> TQt/Embedded
</h2> </h2>
<a name="4"></a><p> When compiling for this platform, the macro <tt>Q_WS_QWS</tt> is defined <a name="4"></a><p> When compiling for this platform, the macro <tt>TQ_WS_QWS</tt> is defined
(the window system is literally the TQt Window System). (the window system is literally the TQt Window System).
<p> <ul> <p> <ul>
<li> <a href="emb-install.html">Installation</a> <li> <a href="emb-install.html">Installation</a>

@ -573,7 +573,7 @@ The following example shows how to create an application that uses a graphical i
.br .br
{ {
.br .br
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
.br .br
bool useGUI = getenv( "DISPLAY" ) != 0; bool useGUI = getenv( "DISPLAY" ) != 0;
.br .br

@ -187,7 +187,7 @@ with \fCMY_EXPORT\fR defined as
.PP .PP
.nf .nf
.br .br
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
.br .br
# define MY_EXPORT __declspec(dllexport) # define MY_EXPORT __declspec(dllexport)
.br .br

@ -176,7 +176,7 @@ have been changed:
\list \list
\i \c _OS_*_ becomes \c Q_OS_* \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_* \i \c _CC_*_ becomes \c Q_CC_*
\endlist \endlist

@ -467,9 +467,9 @@ using \c #ifdef directives:
\table \table
\header \i Platform \i Macro \header \i Platform \i Macro
\row \i Qt/X11 \i Q_WS_X11 \row \i Qt/X11 \i TQ_WS_X11
\row \i Qt/Windows \i Q_WS_WIN \row \i Qt/Windows \i TQ_WS_WIN
\row \i Qt/Embedded \i Q_WS_QWS \row \i Qt/Embedded \i TQ_WS_QWS
\endtable \endtable
Qt/Embedded also requires the following flags to be defined when compiling Qt/Embedded also requires the following flags to be defined when compiling

@ -56,7 +56,7 @@ Notes\endlink. For information on distributing TQt applications, see
\target x11 \target x11
\section1 Qt/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 \e{Not documented here. Please contact Trolltech Technical Support
if you have queries.} if you have queries.}
@ -70,7 +70,7 @@ XRender support only is not enough.
\target win \target win
\section1 Qt/Windows \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 \e{Not documented here. Please contact Trolltech Technical Support
if you have queries.} if you have queries.}
@ -97,7 +97,7 @@ If you have further problems, please see the MSDN document,
\target macosx \target macosx
\section1 Qt/Mac OS X \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 \list
\i \link mac-differences.html Qt/Mac issues\endlink \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 \target qws
\section1 Qt/Embedded \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). (the window system is literally the TQt Window System).
\list \list

@ -55,7 +55,7 @@ ImageItem::ImageItem( TQImage img, TQCanvas *canvas )
{ {
setSize( image.width(), image.height() ); setSize( image.width(), image.height() );
#if !defined(Q_WS_QWS) #if !defined(TQ_WS_QWS)
pixmap.convertFromImage(image, OrderedAlphaDither); pixmap.convertFromImage(image, OrderedAlphaDither);
#endif #endif
} }
@ -65,7 +65,7 @@ void ImageItem::drawShape( TQPainter &p )
{ {
// On TQt/Embedded, we can paint a TQImage as fast as a TQPixmap, // On TQt/Embedded, we can paint a TQImage as fast as a TQPixmap,
// but on other platforms, we need to use 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 ); p.drawImage( int(x()), int(y()), image, 0, 0, -1, -1, OrderedAlphaDither );
#else #else
p.drawPixmap( int(x()), int(y()), pixmap ); p.drawPixmap( int(x()), int(y()), pixmap );

@ -440,7 +440,7 @@ TQString DirectoryView::fullPath(TQListViewItem* item)
else else
fullpath = item->text(0) + fullpath; fullpath = item->text(0) + fullpath;
} }
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
if (fullpath.length() > 2 && fullpath[1] != ':') { if (fullpath.length() > 2 && fullpath[1] != ':') {
TQDir dir(fullpath); TQDir dir(fullpath);
fullpath = dir.currentDirPath().left(2) + fullpath; fullpath = dir.currentDirPath().left(2) + fullpath;

@ -290,7 +290,7 @@ void TQtFileIconDrag::append( const TQIconDragItem &item, const TQRect &pr,
{ {
TQIconDrag::append( item, pr, tr ); TQIconDrag::append( item, pr, tr );
TQString ourUrl = url; TQString ourUrl = url;
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
if (ourUrl.length() > 2 && ourUrl[1] != ':') { if (ourUrl.length() > 2 && ourUrl[1] != ':') {
TQDir dir(ourUrl); TQDir dir(ourUrl);
ourUrl = dir.absPath(); ourUrl = dir.absPath();

@ -337,7 +337,7 @@ void MDIWindow::load( const TQString& fn )
medit->hide(); medit->hide();
delete medit; delete medit;
TQMovie * qm=new TQMovie(fn); TQMovie * qm=new TQMovie(fn);
#ifdef Q_WS_QWS // temporary speed-test hack #ifdef TQ_WS_QWS // temporary speed-test hack
qm->setDisplayWidget(tmp); qm->setDisplayWidget(tmp);
#endif #endif
tmp->setBackgroundMode(TQWidget::NoBackground); tmp->setBackgroundMode(TQWidget::NoBackground);

@ -15,7 +15,7 @@
#include "gearwidget.h" #include "gearwidget.h"
#include <math.h> #include <math.h>
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
#include <X11/Xlib.h> #include <X11/Xlib.h>
#endif #endif

@ -14,7 +14,7 @@
#include "gearwidget.h" #include "gearwidget.h"
#include "rubberbandwidget.h" #include "rubberbandwidget.h"
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
#include <X11/Xlib.h> #include <X11/Xlib.h>
#endif #endif
@ -22,7 +22,7 @@ TQColor findOverlayTransparentColor()
{ {
TQColor invalidColor; TQColor invalidColor;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
Display* appDisplay; Display* appDisplay;
Visual* appVisual; Visual* appVisual;
@ -83,7 +83,7 @@ TQColor findOverlayTransparentColor()
tqWarning( "Default visual is not in overlay plane" ); tqWarning( "Default visual is not in overlay plane" );
return invalidColor; return invalidColor;
#else // defined(Q_WS_X11) #else // defined(TQ_WS_X11)
tqWarning( "Wrong window system - Only X11 has overlay support." ); tqWarning( "Wrong window system - Only X11 has overlay support." );
return invalidColor; return invalidColor;
#endif #endif

@ -83,7 +83,7 @@ int main( int argc, char ** argv )
t5->setMinimumSize( 80, 50 ); t5->setMinimumSize( 80, 50 );
t5->setBackgroundColor( TQt::yellow ); t5->setBackgroundColor( TQt::yellow );
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
// TQt/Embedded XOR drawing not yet implemented. // TQt/Embedded XOR drawing not yet implemented.
s1->setOpaqueResize( TRUE ); s1->setOpaqueResize( TRUE );
#endif #endif

@ -39,7 +39,7 @@
**********************************************************************/ **********************************************************************/
// Remaining Q_WS_X11 considerations: // Remaining TQ_WS_X11 considerations:
// - What if !piApp upon NPP_NewStream? Are we safe? // - What if !piApp upon NPP_NewStream? Are we safe?
// - Yes, but users need to know of this: that no GUI can be // - Yes, but users need to know of this: that no GUI can be
// done until after setWindow is called. // done until after setWindow is called.
@ -48,7 +48,7 @@
// untrap them and retransmit them and set a timer to retrap them // untrap them and retransmit them and set a timer to retrap them
// after N seconds. // after N seconds.
// Remaining Q_WS_WIN considerations: // Remaining TQ_WS_WIN considerations:
// - we need to activateZeroTimers() at some time. // - we need to activateZeroTimers() at some time.
// - we need to call winEventFilter on events // - we need to call winEventFilter on events
// - timers: // - timers:
@ -85,7 +85,7 @@
#include <time.h> #include <time.h>
#include <limits.h> #include <limits.h>
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
class TQNPXtPrivate; class TQNPXtPrivate;
@ -123,18 +123,18 @@ extern "C" {
// //
// Netscape plugin API // Netscape plugin API
// //
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
#ifndef _WINDOWS #ifndef _WINDOWS
#define _WINDOWS #define _WINDOWS
#endif #endif
#endif #endif
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#define XP_UNIX #define XP_UNIX
#endif #endif
// This is to allow mingw support on windows without altering the sun header files // 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 #define _MSC_VER 1
#include "npapi.h" #include "npapi.h"
#undef _MSC_VER #undef _MSC_VER
@ -142,7 +142,7 @@ extern "C" {
#include "npapi.h" #include "npapi.h"
#endif #endif
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#undef XP_UNIX #undef XP_UNIX
#include "npunix.c" #include "npunix.c"
#endif #endif
@ -150,7 +150,7 @@ extern "C" {
// //
// Stuff for the NPP_SetWindow function: // Stuff for the NPP_SetWindow function:
// //
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
#include <X11/IntrinsicP.h> // for XtCreateWindow #include <X11/IntrinsicP.h> // for XtCreateWindow
@ -160,12 +160,12 @@ extern "C" {
#include <X11/Xos.h> #include <X11/Xos.h>
//#include <dlfcn.h> //#include <dlfcn.h>
#endif #endif
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
#include <windows.h> #include <windows.h>
#endif #endif
} }
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
#include "npwin.cpp" #include "npwin.cpp"
#endif #endif
@ -176,13 +176,13 @@ struct _NPInstance
{ {
uint16 fMode; uint16 fMode;
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
HWND window; HWND window;
#endif #endif
NPP npp; NPP npp;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
Window window; Window window;
Display *display; Display *display;
#endif #endif
@ -210,7 +210,7 @@ static _NPInstance* next_pi=0;
// To avoid looping when browser OR plugin can delete streams // To avoid looping when browser OR plugin can delete streams
static int qnps_no_call_back = 0; static int qnps_no_call_back = 0;
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
// defined in qapplication_win.cpp // defined in qapplication_win.cpp
TQ_EXPORT extern bool qt_win_use_simple_timers; TQ_EXPORT extern bool qt_win_use_simple_timers;
TQ_EXPORT void qWinProcessConfigRequests(); TQ_EXPORT void qWinProcessConfigRequests();
@ -229,7 +229,7 @@ LRESULT CALLBACK FilterProc( int nCode, WPARAM wParam, LPARAM lParam )
#endif #endif
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
static int (*original_x_errhandler)( Display *dpy, XErrorEvent * ) = 0; static int (*original_x_errhandler)( Display *dpy, XErrorEvent * ) = 0;
static int dummy_x_errhandler( Display *, XErrorEvent * ) static int dummy_x_errhandler( Display *, XErrorEvent * )
{ {
@ -244,7 +244,7 @@ static int dummy_x_errhandler( Display *, XErrorEvent * )
// Instance state information about the plugin. // Instance state information about the plugin.
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
extern "C" char* extern "C" char*
NPP_GetMIMEDescription(void) NPP_GetMIMEDescription(void)
@ -279,7 +279,7 @@ NPP_GetValue(void * /*future*/, NPPVariable variable, void *value)
extern "C" NPError extern "C" NPError
NPP_Initialize(void) NPP_Initialize(void)
{ {
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
qt_win_use_simple_timers = TRUE; qt_win_use_simple_timers = TRUE;
// Nothing more - we do it in DLLMain // Nothing more - we do it in DLLMain
#endif #endif
@ -322,12 +322,12 @@ NPP_Shutdown(void)
qNP = 0; qNP = 0;
} }
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
if ( original_x_errhandler ) if ( original_x_errhandler )
XSetErrorHandler( original_x_errhandler ); XSetErrorHandler( original_x_errhandler );
#endif #endif
if ( tqApp) { if ( tqApp) {
#ifdef Q_WS_WIN32 #ifdef TQ_WS_WIN32
if ( hhook ) if ( hhook )
UnhookWindowsHookEx( hhook ); UnhookWindowsHookEx( hhook );
hhook = 0; hhook = 0;
@ -434,10 +434,10 @@ NPP_SetWindow(NPP instance, NPWindow* window)
// take a shortcut if all that was changed is the geometry // take a shortcut if all that was changed is the geometry
if ( This->widget && window if ( This->widget && window
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
&& This->window == (Window) window->window && This->window == (Window) window->window
#endif #endif
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
&& This->window == (HWND) window->window && This->window == (HWND) window->window
#endif #endif
) { ) {
@ -454,12 +454,12 @@ NPP_SetWindow(NPP instance, NPWindow* window)
if ( !window ) if ( !window )
return result; return result;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
This->window = (Window) window->window; This->window = (Window) window->window;
This->display = This->display =
((NPSetWindowCallbackStruct *)window->ws_info)->display; ((NPSetWindowCallbackStruct *)window->ws_info)->display;
#endif #endif
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
This->window = (HWND) window->window; This->window = (HWND) window->window;
#endif #endif
@ -470,12 +470,12 @@ NPP_SetWindow(NPP instance, NPWindow* window)
if (!tqApp) { if (!tqApp) {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
// We are the first TQt-based plugin to arrive // We are the first TQt-based plugin to arrive
event_loop = new TQNPXt( "qnp", XtDisplayToApplicationContext(This->display) ); event_loop = new TQNPXt( "qnp", XtDisplayToApplicationContext(This->display) );
application = new TQApplication(This->display); application = new TQApplication(This->display);
#endif #endif
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
static int argc=0; static int argc=0;
static char **argv={ 0 }; static char **argv={ 0 };
application = new TQApplication( argc, argv ); application = new TQApplication( argc, argv );
@ -488,7 +488,7 @@ NPP_SetWindow(NPP instance, NPWindow* window)
#endif #endif
} }
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
if ( !original_x_errhandler ) if ( !original_x_errhandler )
original_x_errhandler = XSetErrorHandler( dummy_x_errhandler ); original_x_errhandler = XSetErrorHandler( dummy_x_errhandler );
#endif #endif
@ -501,12 +501,12 @@ NPP_SetWindow(NPP instance, NPWindow* window)
if ( !This->widget ) if ( !This->widget )
return result; return result;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
This->widget->resize( This->width, This->height ); This->widget->resize( This->width, This->height );
XReparentWindow( This->widget->x11Display(), This->widget->winId(), This->window, 0, 0 ); XReparentWindow( This->widget->x11Display(), This->widget->winId(), This->window, 0, 0 );
XSync( This->widget->x11Display(), False ); XSync( This->widget->x11Display(), False );
#endif #endif
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
LONG oldLong = GetWindowLong(This->window, GWL_STYLE); LONG oldLong = GetWindowLong(This->window, GWL_STYLE);
::SetWindowLong(This->window, GWL_STYLE, oldLong | WS_CLIPCHILDREN | WS_CLIPSIBLINGS); ::SetWindowLong(This->window, GWL_STYLE, oldLong | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
::SetWindowLong( This->widget->winId(), GWL_STYLE, WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS ); ::SetWindowLong( This->widget->winId(), GWL_STYLE, WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS );
@ -647,7 +647,7 @@ typedef struct
FILE* fp; FILE* fp;
} NPPrintCallbackStruct; } NPPrintCallbackStruct;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
class TQNPPrinter : public TQPrinter { class TQNPPrinter : public TQPrinter {
TQFile file; TQFile file;
@ -681,7 +681,7 @@ NPP_Print(NPP instance, NPPrint* printInfo)
printInfo->print.fullPrint.pluginPrinted = printInfo->print.fullPrint.pluginPrinted =
This->instance->printFullPage(); This->instance->printFullPage();
} else if (printInfo->mode == NP_EMBED) { } else if (printInfo->mode == NP_EMBED) {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
void* platformPrint = void* platformPrint =
printInfo->print.embedPrint.platformPrint; printInfo->print.embedPrint.platformPrint;
FILE* outfile = ((NPPrintCallbackStruct*)platformPrint)->fp; FILE* outfile = ((NPPrintCallbackStruct*)platformPrint)->fp;
@ -697,7 +697,7 @@ NPP_Print(NPP instance, NPPrint* printInfo)
// Why does the browser make spurious NPP_Print calls? // Why does the browser make spurious NPP_Print calls?
} }
#endif #endif
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
NPWindow* printWindow = NPWindow* printWindow =
&(printInfo->print.embedPrint.window); &(printInfo->print.embedPrint.window);
void* platformPrint = void* platformPrint =
@ -737,7 +737,7 @@ NPP_URLNotify(NPP instance,
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
BOOL WINAPI DllMain (HANDLE hInst, BOOL WINAPI DllMain (HANDLE hInst,
ULONG ul_reason_for_call, ULONG ul_reason_for_call,
@ -805,7 +805,7 @@ TQNPWidget::TQNPWidget() :
next_pi->widget = this; next_pi->widget = this;
next_pi = 0; next_pi = 0;
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
clearWFlags( WStyle_NormalBorder | WStyle_Title | WStyle_MinMax | WStyle_SysMenu ); clearWFlags( WStyle_NormalBorder | WStyle_Title | WStyle_MinMax | WStyle_SysMenu );
topData()->ftop = 0; topData()->ftop = 0;
topData()->fright = 0; topData()->fright = 0;
@ -823,7 +823,7 @@ TQNPWidget::TQNPWidget() :
*/ */
TQNPWidget::~TQNPWidget() TQNPWidget::~TQNPWidget()
{ {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
destroy( FALSE, FALSE ); // X has destroyed all windows destroy( FALSE, FALSE ); // X has destroyed all windows
#endif #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) 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 ); NPN_GetURLNotify( pi->npp, url, window, data );
#else #else
Q_UNUSED( url ); Q_UNUSED( url );
@ -1575,7 +1575,7 @@ void* TQNPlugin::getJavaEnv() const
return NPN_GetJavaEnv(); return NPN_GetJavaEnv();
} }
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#include <ntqapplication.h> #include <ntqapplication.h>
#include <ntqwidgetintdict.h> #include <ntqwidgetintdict.h>
@ -2068,4 +2068,4 @@ bool TQNPXt::processEvents( ProcessEventsFlags flags )
} }
#endif // Q_WS_X11 #endif // TQ_WS_X11

@ -90,12 +90,12 @@ TQString TQMultiInputContext::language()
} }
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
bool TQMultiInputContext::x11FilterEvent( TQWidget *keywidget, XEvent *event ) bool TQMultiInputContext::x11FilterEvent( TQWidget *keywidget, XEvent *event )
{ {
return ( slave() ) ? slave()->x11FilterEvent( keywidget, event ) : FALSE; return ( slave() ) ? slave()->x11FilterEvent( keywidget, event ) : FALSE;
} }
#endif // Q_WS_X11 #endif // TQ_WS_X11
bool TQMultiInputContext::filterEvent( const TQEvent *event ) 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 TQWidget *TQMultiInputContext::focusWidget() const
{ {
return ( slave() ) ? slave()->focusWidget() : 0; return ( slave() ) ? slave()->focusWidget() : 0;

@ -63,9 +63,9 @@ public:
TQString identifierName(); TQString identifierName();
TQString language(); TQString language();
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
bool x11FilterEvent( TQWidget *keywidget, XEvent *event ); bool x11FilterEvent( TQWidget *keywidget, XEvent *event );
#endif // Q_WS_X11 #endif // TQ_WS_X11
bool filterEvent( const TQEvent *event ); bool filterEvent( const TQEvent *event );
void reset(); void reset();
@ -81,7 +81,7 @@ public:
TQPtrList<TQInputContextMenu> *menus(); TQPtrList<TQInputContextMenu> *menus();
TQPopupMenu *createImSelPopup(); TQPopupMenu *createImSelPopup();
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
TQWidget *focusWidget() const; TQWidget *focusWidget() const;
TQWidget *holderWidget() const; TQWidget *holderWidget() const;

@ -62,7 +62,7 @@ class TQFont;
class TQString; class TQString;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#include "ntqmemarray.h" #include "ntqmemarray.h"
#include "ntqwindowdefs.h" #include "ntqwindowdefs.h"
#include <private/qt_x11_p.h> #include <private/qt_x11_p.h>
@ -72,7 +72,7 @@ class TQXIMInputContext : public TQInputContext
{ {
TQ_OBJECT TQ_OBJECT
public: public:
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
TQXIMInputContext(); TQXIMInputContext();
~TQXIMInputContext(); ~TQXIMInputContext();
@ -121,7 +121,7 @@ private:
int lookupString(XKeyEvent *, TQCString &, KeySym *, Status *) const; int lookupString(XKeyEvent *, TQCString &, KeySym *, Status *) const;
#endif // Q_WS_X11 #endif // TQ_WS_X11
}; };

@ -648,7 +648,7 @@ MakefileGenerator::initOutPaths()
for(int x = 0; dirs[x] != TQString::null; x++) { for(int x = 0; dirs[x] != TQString::null; x++) {
if ( !v[dirs[x]].isEmpty() ) { if ( !v[dirs[x]].isEmpty() ) {
TQString orig_path = v[dirs[x]].first(); 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 // We don't want to add a separator for DLLDESTDIR on Windows
if (!(dirs[x] == "DLLDESTDIR")) if (!(dirs[x] == "DLLDESTDIR"))
#endif #endif
@ -671,7 +671,7 @@ MakefileGenerator::initOutPaths()
d.cd(Option::dir_sep); d.cd(Option::dir_sep);
path = path.right(path.length() - 1); path = path.right(path.length() - 1);
} }
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
bool driveExists = TRUE; bool driveExists = TRUE;
if ( !TQDir::isRelativePath( path ) ) { if ( !TQDir::isRelativePath( path ) ) {
if ( TQFile::exists( path.left( 3 ) ) ) { if ( TQFile::exists( path.left( 3 ) ) ) {
@ -698,7 +698,7 @@ MakefileGenerator::initOutPaths()
} }
} }
} }
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
} }
#endif #endif
} }
@ -1885,7 +1885,7 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs)
if(!uninst.isEmpty()) if(!uninst.isEmpty())
uninst.append("\n\t"); uninst.append("\n\t");
uninst.append( uninst.append(
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
TQString("-$(DEL_FILE)") TQString("-$(DEL_FILE)")
#else #else
TQString("-$(DEL_FILE) -r") TQString("-$(DEL_FILE) -r")
@ -1902,7 +1902,7 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs)
if(!uninst.isEmpty()) if(!uninst.isEmpty())
uninst.append("\n\t"); uninst.append("\n\t");
uninst.append( uninst.append(
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
TQString("-$(DEL_FILE)") TQString("-$(DEL_FILE)")
#else #else
TQString("-$(DEL_FILE) -r") TQString("-$(DEL_FILE) -r")
@ -1946,7 +1946,7 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs)
const TQStringList &dirs = project->variables()[pvar]; const TQStringList &dirs = project->variables()[pvar];
for(TQStringList::ConstIterator pit = dirs.begin(); pit != dirs.end(); ++pit) { for(TQStringList::ConstIterator pit = dirs.begin(); pit != dirs.end(); ++pit) {
TQString tmp_dst = fileFixify((*pit)); TQString tmp_dst = fileFixify((*pit));
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
if(tmp_dst.right(1) != Option::dir_sep) if(tmp_dst.right(1) != Option::dir_sep)
tmp_dst += Option::dir_sep; tmp_dst += Option::dir_sep;
#endif #endif

@ -57,13 +57,13 @@
bool tqt_resolve_symlinks = FALSE; bool tqt_resolve_symlinks = FALSE;
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
extern TQ_EXPORT int qt_ntfs_permission_lookup; extern TQ_EXPORT int qt_ntfs_permission_lookup;
#endif #endif
int main(int argc, char **argv) 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 // Workaround for TQFileInfo::isReadable() failing for certain users. See task: 54320
qt_ntfs_permission_lookup = 0; qt_ntfs_permission_lookup = 0;
#endif #endif
@ -74,7 +74,7 @@ int main(int argc, char **argv)
TQDir sunworkshop42workaround = TQDir::current(); TQDir sunworkshop42workaround = TQDir::current();
TQString oldpwd = sunworkshop42workaround.currentDirPath(); TQString oldpwd = sunworkshop42workaround.currentDirPath();
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
if(!(oldpwd.length() == 3 && oldpwd[0].isLetter() && oldpwd.endsWith(":/") ) ) if(!(oldpwd.length() == 3 && oldpwd[0].isLetter() && oldpwd.endsWith(":/") ) )
#endif #endif
{ {

@ -1109,7 +1109,7 @@ void TQCanvas::drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& vr,
if ( dbuf ) { if ( dbuf ) {
offscr = TQPixmap(vr.size().expandedTo(TQSize(1, 1))); offscr = TQPixmap(vr.size().expandedTo(TQSize(1, 1)));
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
offscr.x11SetScreen(p->device()->x11Screen()); offscr.x11SetScreen(p->device()->x11Screen());
#endif #endif
TQPainter dbp(&offscr); TQPainter dbp(&offscr);
@ -1415,7 +1415,7 @@ void TQCanvas::drawCanvasArea(const TQRect& inarea, TQPainter* p, bool double_bu
if ( double_buffer ) { if ( double_buffer ) {
offscr = TQPixmap(area.size().expandedTo(TQSize(1, 1))); offscr = TQPixmap(area.size().expandedTo(TQSize(1, 1)));
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
if (p) if (p)
offscr.x11SetScreen(p->device()->x11Screen()); offscr.x11SetScreen(p->device()->x11Screen());
#endif #endif

@ -71,7 +71,7 @@
#include "ntqstring.h" #include "ntqstring.h"
#include "../tools/qlocale_p.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" # include "qfontcodecs_p.h"
#endif #endif
@ -1666,12 +1666,12 @@ private:
void buildReverseMap(); void buildReverseMap();
int forwardIndex; int forwardIndex;
#ifndef Q_WS_QWS #ifndef TQ_WS_QWS
TQMemArray<unsigned char> *reverseMap; TQMemArray<unsigned char> *reverseMap;
#endif #endif
}; };
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
static const TQSimpleTextCodec * reverseOwner = 0; static const TQSimpleTextCodec * reverseOwner = 0;
static TQMemArray<unsigned char> * reverseMap = 0; static TQMemArray<unsigned char> * reverseMap = 0;
#endif #endif
@ -2244,7 +2244,7 @@ static const struct {
TQSimpleTextCodec::TQSimpleTextCodec( int i ) TQSimpleTextCodec::TQSimpleTextCodec( int i )
: TQTextCodec(), forwardIndex( i ) : TQTextCodec(), forwardIndex( i )
{ {
#ifndef Q_WS_QWS #ifndef TQ_WS_QWS
reverseMap = 0; reverseMap = 0;
#endif #endif
} }
@ -2252,7 +2252,7 @@ TQSimpleTextCodec::TQSimpleTextCodec( int i )
TQSimpleTextCodec::~TQSimpleTextCodec() TQSimpleTextCodec::~TQSimpleTextCodec()
{ {
#ifndef Q_WS_QWS #ifndef TQ_WS_QWS
delete reverseMap; delete reverseMap;
#else #else
if ( reverseOwner == this ) { if ( reverseOwner == this ) {
@ -2265,7 +2265,7 @@ TQSimpleTextCodec::~TQSimpleTextCodec()
void TQSimpleTextCodec::buildReverseMap() void TQSimpleTextCodec::buildReverseMap()
{ {
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
if ( reverseOwner != this ) { if ( reverseOwner != this ) {
int m = 0; int m = 0;
int i = 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 TQCString TQSimpleTextCodec::fromUnicode(const TQString& uc, int& len ) const
{ {
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
if ( this != reverseOwner ) if ( this != reverseOwner )
#else #else
if ( !reverseMap ) 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 void TQSimpleTextCodec::fromUnicode( const TQChar *in, unsigned short *out, int length ) const
{ {
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
if ( this != reverseOwner ) if ( this != reverseOwner )
#else #else
if ( !reverseMap ) 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 unsigned short TQSimpleTextCodec::characterFromUnicode(const TQString &str, int pos) const
{ {
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
if ( this != reverseOwner ) if ( this != reverseOwner )
#else #else
if ( !reverseMap ) if ( !reverseMap )
@ -2411,7 +2411,7 @@ unsigned short TQSimpleTextCodec::characterFromUnicode(const TQString &str, int
bool TQSimpleTextCodec::canEncode( TQChar ch ) const bool TQSimpleTextCodec::canEncode( TQChar ch ) const
{ {
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
if ( this != reverseOwner ) if ( this != reverseOwner )
#else #else
if ( !reverseMap ) if ( !reverseMap )
@ -2982,7 +2982,7 @@ void TQTextCodec::fromUnicodeInternal( const TQChar *in, unsigned short *out, in
((TQSimpleTextCodec *)this)->fromUnicode( in, out, length ); ((TQSimpleTextCodec *)this)->fromUnicode( in, out, length );
break; 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 // the TQFont*Codecs are only used on X11
case 15: case 15:

@ -297,7 +297,7 @@ private:
TQPushButton *okB; TQPushButton *okB;
TQPushButton *cancelB; TQPushButton *cancelB;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
static TQString winGetOpenFileName( const TQString &initialSelection, static TQString winGetOpenFileName( const TQString &initialSelection,
const TQString &filter, const TQString &filter,
TQString* workingDirectory, TQString* workingDirectory,
@ -324,7 +324,7 @@ private:
const TQString& caption = TQString::null); const TQString& caption = TQString::null);
static TQString resolveLinkFile( const TQString& linkfile ); static TQString resolveLinkFile( const TQString& linkfile );
#endif #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 &, static TQString macGetSaveFileName( const TQString &, const TQString &,
TQString *, TQWidget *, const char*, TQString *, TQWidget *, const char*,
const TQString&, TQString *); const TQString&, TQString *);

@ -58,12 +58,12 @@
#include "ntqsettings.h" #include "ntqsettings.h"
#include "ntqpopupmenu.h" #include "ntqpopupmenu.h"
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
TQRgb macGetRgba( TQRgb initial, bool *ok, TQWidget *parent, const char* name ); TQRgb macGetRgba( TQRgb initial, bool *ok, TQWidget *parent, const char* name );
TQColor macGetColor( const TQColor& initial, TQWidget *parent, const char *name ); TQColor macGetColor( const TQColor& initial, TQWidget *parent, const char *name );
#endif #endif
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#include "private/tqttdeintegration_x11_p.h" #include "private/tqttdeintegration_x11_p.h"
#endif #endif
@ -1485,10 +1485,10 @@ TQColorDialog::TQColorDialog(TQWidget* parent, const char* name, bool modal) :
TQColor TQColorDialog::getColor( const TQColor& initial, TQWidget *parent, TQColor TQColorDialog::getColor( const TQColor& initial, TQWidget *parent,
const char *name ) const char *name )
{ {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if( TQTDEIntegration::enabled()) if( TQTDEIntegration::enabled())
return TQTDEIntegration::getColor( initial, parent, name ); return TQTDEIntegration::getColor( initial, parent, name );
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
return macGetColor(initial, parent, name); return macGetColor(initial, parent, name);
#endif #endif
@ -1525,14 +1525,14 @@ TQColor TQColorDialog::getColor( const TQColor& initial, TQWidget *parent,
TQRgb TQColorDialog::getRgba( TQRgb initial, bool *ok, TQRgb TQColorDialog::getRgba( TQRgb initial, bool *ok,
TQWidget *parent, const char* name ) TQWidget *parent, const char* name )
{ {
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
if( TQTDEIntegration::enabled()) { if( TQTDEIntegration::enabled()) {
TQColor color = TQTDEIntegration::getColor( TQColor( initial ), parent, name ); TQColor color = TQTDEIntegration::getColor( TQColor( initial ), parent, name );
if( ok ) if( ok )
*ok = color.isValid(); *ok = color.isValid();
return color.rgba(); return color.rgba();
} }
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
return macGetRgba(initial, ok, parent, name); return macGetRgba(initial, ok, parent, name);
#endif #endif

@ -671,14 +671,14 @@ bool TQDialog::event( TQEvent *e )
Geometry management. Geometry management.
*****************************************************************************/ *****************************************************************************/
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); } extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); }
#include <private/qt_x11_p.h> #include <private/qt_x11_p.h>
#undef FocusIn #undef FocusIn
// defined in qapplication_x11.cpp // defined in qapplication_x11.cpp
extern Atom qt_net_wm_full_placement; extern Atom qt_net_wm_full_placement;
extern bool qt_net_supports(Atom atom); 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. Shows the dialog as a \link #modeless modeless \endlink dialog.
@ -710,14 +710,14 @@ void TQDialog::show()
if (windowState() != state) if (windowState() != state)
setWindowState(state); setWindowState(state);
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if (!parentWidget() && testWFlags(WShowModal) if (!parentWidget() && testWFlags(WShowModal)
&& tqApp->mainWidget() && tqApp->mainWidget()->isVisible() && tqApp->mainWidget() && tqApp->mainWidget()->isVisible()
&& !tqApp->mainWidget()->isMinimized()) { && !tqApp->mainWidget()->isMinimized()) {
// make sure the transient for hint is set properly for modal dialogs // make sure the transient for hint is set properly for modal dialogs
x11SetWindowTransient( tqApp->mainWidget()); x11SetWindowTransient( tqApp->mainWidget());
} }
#endif // Q_WS_X11 #endif // TQ_WS_X11
#ifdef Q_OS_TEMP #ifdef Q_OS_TEMP
hideSpecial(); hideSpecial();

@ -94,15 +94,15 @@
#include "ntqvbox.h" #include "ntqvbox.h"
#include "ntqwidgetstack.h" #include "ntqwidgetstack.h"
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#include "private/tqttdeintegration_x11_p.h" #include "private/tqttdeintegration_x11_p.h"
#endif #endif
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
#ifdef TQT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
# include <private/qmutexpool_p.h> # include <private/qmutexpool_p.h>
#endif // TQT_THREAD_SUPPORT #endif // TQT_THREAD_SUPPORT
#endif // Q_WS_WIN #endif // TQ_WS_WIN
#if !defined(Q_OS_TEMP) #if !defined(Q_OS_TEMP)
#include <time.h> #include <time.h>
@ -113,7 +113,7 @@
#include <limits.h> #include <limits.h>
#include <ctype.h> #include <ctype.h>
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
#include "qt_mac.h" #include "qt_mac.h"
extern TQString qt_mac_precomposeFileName(const TQString &); // qglobal.cpp extern TQString qt_mac_precomposeFileName(const TQString &); // qglobal.cpp
#undef check #undef check
@ -515,7 +515,7 @@ static void updateLastSize( TQFileDialog *that )
// resolving the W methods manually is needed, because Windows 95 doesn't include // 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 // these methods in Shell32.lib (not even stubs!), so you'd get an unresolved symbol
// when TQt calls getEsistingDirectory(), etc. // when TQt calls getEsistingDirectory(), etc.
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
typedef UINT (WINAPI *PtrExtractIconEx)(LPCTSTR,int,HICON*,HICON*,UINT); typedef UINT (WINAPI *PtrExtractIconEx)(LPCTSTR,int,HICON*,HICON*,UINT);
static PtrExtractIconEx ptrExtractIconEx = 0; static PtrExtractIconEx ptrExtractIconEx = 0;
@ -613,7 +613,7 @@ static void makeVariables() {
bShowHiddenFiles = FALSE; bShowHiddenFiles = FALSE;
sortFilesBy = (int)TQDir::Name; sortFilesBy = (int)TQDir::Name;
detailViewMode = FALSE; detailViewMode = FALSE;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if ( !fileIconProvider ) if ( !fileIconProvider )
fileIconProvider = new TQWindowsIconProvider( tqApp ); fileIconProvider = new TQWindowsIconProvider( tqApp );
#endif #endif
@ -1075,7 +1075,7 @@ public:
TQString newStr; TQString newStr;
TQCString cName = fName.utf8(); TQCString cName = fName.utf8();
const TQCString sChars( const TQCString sChars(
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
"#%" "#%"
#else #else
"<>#@\"&%$:,;?={}|^~[]\'`\\*" "<>#@\"&%$:,;?={}|^~[]\'`\\*"
@ -1122,7 +1122,7 @@ public:
#ifndef Q_NO_CURSOR #ifndef Q_NO_CURSOR
bool cursorOverride; // Remember if the cursor was overridden or not. bool cursorOverride; // Remember if the cursor was overridden or not.
#endif #endif
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
int oldPermissionLookup; int oldPermissionLookup;
#endif #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; extern int qt_ntfs_permission_lookup;
#endif #endif
@ -2472,7 +2472,7 @@ void TQFileDialog::init()
d->pendingItems.setAutoDelete( FALSE ); d->pendingItems.setAutoDelete( FALSE );
d->mimeTypeTimer = new TQTimer( this ); d->mimeTypeTimer = new TQTimer( this );
d->cursorOverride = FALSE; d->cursorOverride = FALSE;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
d->oldPermissionLookup = qt_ntfs_permission_lookup; d->oldPermissionLookup = qt_ntfs_permission_lookup;
#endif #endif
connect( d->mimeTypeTimer, TQ_SIGNAL( timeout() ), connect( d->mimeTypeTimer, TQ_SIGNAL( timeout() ),
@ -2661,7 +2661,7 @@ void TQFileDialog::init()
d->modeButtons->insert( d->previewInfo ); d->modeButtons->insert( d->previewInfo );
d->previewContents = new TQToolButton( this, "preview info view" ); 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 ) if ( (qt_winver & WV_NT_based) > TQt::WV_NT )
#else #else
if ( !qstrcmp(style().className(), "TQWindowsStyle") ) if ( !qstrcmp(style().className(), "TQWindowsStyle") )
@ -3486,15 +3486,15 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith,
if ( workingDirectory->isNull() ) if ( workingDirectory->isNull() )
*workingDirectory = ::toRootIfNotExists( TQDir::currentDirPath() ); *workingDirectory = ::toRootIfNotExists( TQDir::currentDirPath() );
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled()) if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name, return TQTDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name,
caption, selectedFilter, false ).first(); 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 ) if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle )
return winGetOpenFileName( initialSelection, filter, workingDirectory, return winGetOpenFileName( initialSelection, filter, workingDirectory,
parent, name, caption, selectedFilter ); 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) if (tqt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE)
|| tqApp->style().inherits("TQMacStyle"))) || tqApp->style().inherits("TQMacStyle")))
return qt_mac_precomposeFileName(macGetOpenFileNames(filter, return qt_mac_precomposeFileName(macGetOpenFileNames(filter,
@ -3611,15 +3611,15 @@ TQString TQFileDialog::getSaveFileName( const TQString & startWith,
if ( workingDirectory->isNull() ) if ( workingDirectory->isNull() )
*workingDirectory = ::toRootIfNotExists( TQDir::currentDirPath() ); *workingDirectory = ::toRootIfNotExists( TQDir::currentDirPath() );
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled()) if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::getSaveFileName( initialSelection, filter, workingDirectory, return TQTDEIntegration::getSaveFileName( initialSelection, filter, workingDirectory,
parent, name, caption, selectedFilter ); 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 ) if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle )
return winGetSaveFileName( initialSelection, filter, workingDirectory, return winGetSaveFileName( initialSelection, filter, workingDirectory,
parent, name, caption, selectedFilter ); 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) if (tqt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE)
|| tqApp->style().inherits("TQMacStyle"))) || tqApp->style().inherits("TQMacStyle")))
return qt_mac_precomposeFileName(macGetSaveFileName(initialSelection, filter, return qt_mac_precomposeFileName(macGetSaveFileName(initialSelection, filter,
@ -3666,7 +3666,7 @@ void TQFileDialog::okClicked()
{ {
TQString fn( nameEdit->text() ); TQString fn( nameEdit->text() );
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
TQFileInfo fi( d->url.path() + fn ); TQFileInfo fi( d->url.path() + fn );
if ( fi.isSymLink() ) { if ( fi.isSymLink() ) {
nameEdit->setText( fi.readLink() ); nameEdit->setText( fi.readLink() );
@ -4128,7 +4128,7 @@ void TQFileDialog::selectDirectoryOrFile( TQListViewItem * newItem )
if ( d->url.isLocalFile() ) { if ( d->url.isLocalFile() ) {
TQFileInfo fi( d->url.path() + newItem->text(0) ); TQFileInfo fi( d->url.path() + newItem->text(0) );
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if ( fi.isSymLink() ) { if ( fi.isSymLink() ) {
nameEdit->setText( fi.readLink() ); nameEdit->setText( fi.readLink() );
okClicked(); okClicked();
@ -4505,7 +4505,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir,
if ( workingDirectory ) if ( workingDirectory )
wd = *workingDirectory; wd = *workingDirectory;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
TQString initialDir; TQString initialDir;
if ( !dir.isEmpty() ) { if ( !dir.isEmpty() ) {
TQUrlOperator u( dir ); TQUrlOperator u( dir );
@ -4515,7 +4515,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir,
initialDir = TQString::null; initialDir = TQString::null;
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled()) if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::getExistingDirectory( initialDir, parent, name, caption ); return TQTDEIntegration::getExistingDirectory( initialDir, parent, name, caption );
#elif defined(Q_WS_WIN) #elif defined(TQ_WS_WIN)
TQString initialDir; TQString initialDir;
if ( !dir.isEmpty() ) { if ( !dir.isEmpty() ) {
TQUrlOperator u( dir ); 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 ) if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle && dirOnly )
return winGetExistingDirectory( initialDir, parent, name, caption ); return winGetExistingDirectory( initialDir, parent, name, caption );
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
TQString *initialDir = 0; TQString *initialDir = 0;
if (!dir.isEmpty()) { if (!dir.isEmpty()) {
TQUrlOperator u(dir); 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 // ### FIXME: this code is duplicated in qdns.cpp
static TQString getWindowsRegString( HKEY key, const TQString &subKey ) 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 ) { } else if ( o == nameEdit && e->type() == TQEvent::KeyPress && d->mode != AnyFile ) {
if ( ( nameEdit->cursorPosition() == (int)nameEdit->text().length() || nameEdit->hasSelectedText() ) && if ( ( nameEdit->cursorPosition() == (int)nameEdit->text().length() || nameEdit->hasSelectedText() ) &&
isprint(((TQKeyEvent *)e)->ascii()) ) { isprint(((TQKeyEvent *)e)->ascii()) ) {
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
TQString nt( nameEdit->text().lower() ); TQString nt( nameEdit->text().lower() );
#else #else
TQString nt( nameEdit->text() ); TQString nt( nameEdit->text() );
@ -5450,7 +5450,7 @@ bool TQFileDialog::eventFilter( TQObject * o, TQEvent * e )
nt.truncate( nameEdit->cursorPosition() ); nt.truncate( nameEdit->cursorPosition() );
nt += (char)(((TQKeyEvent *)e)->ascii()); nt += (char)(((TQKeyEvent *)e)->ascii());
TQListViewItem * i = files->firstChild(); TQListViewItem * i = files->firstChild();
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
while( i && i->text( 0 ).left(nt.length()).lower() != nt ) while( i && i->text( 0 ).left(nt.length()).lower() != nt )
#else #else
while( i && i->text( 0 ).left(nt.length()) != nt ) 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()) if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter, true ); 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 ) if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle )
return winGetOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter ); 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) if (tqt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE)
|| tqApp->style().inherits("TQMacStyle"))) { || tqApp->style().inherits("TQMacStyle"))) {
TQStringList sl = macGetOpenFileNames(filter, dir.isEmpty() ? 0 : workingDirectory, parent, TQStringList sl = macGetOpenFileNames(filter, dir.isEmpty() ? 0 : workingDirectory, parent,
@ -5786,7 +5786,7 @@ void TQFileDialog::urlStart( TQNetworkOperation *op )
if ( !op ) if ( !op )
return; return;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
qt_ntfs_permission_lookup--; qt_ntfs_permission_lookup--;
#endif #endif
if ( op->operation() == TQNetworkProtocol::OpListChildren ) { if ( op->operation() == TQNetworkProtocol::OpListChildren ) {
@ -5812,7 +5812,7 @@ void TQFileDialog::urlStart( TQNetworkOperation *op )
TQString s = d->url.toString( FALSE, FALSE ); TQString s = d->url.toString( FALSE, FALSE );
bool found = FALSE; bool found = FALSE;
for ( int i = 0; i < d->paths->count(); ++i ) { 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() ) { if ( d->paths->text( i ).lower() == s.lower() ) {
#else #else
if ( d->paths->text( i ) == s ) { if ( d->paths->text( i ) == s ) {
@ -5879,7 +5879,7 @@ void TQFileDialog::urlFinished( TQNetworkOperation *op )
op == d->currListChildren ) { op == d->currListChildren ) {
if ( !d->hadDotDot && !isRoot( d->url ) ) { if ( !d->hadDotDot && !isRoot( d->url ) ) {
bool ok = TRUE; bool ok = TRUE;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if ( d->url.path().left( 2 ) == "//" ) if ( d->url.path().left( 2 ) == "//" )
ok = FALSE; ok = FALSE;
#endif #endif
@ -5907,7 +5907,7 @@ void TQFileDialog::urlFinished( TQNetworkOperation *op )
d->progressDia = 0; d->progressDia = 0;
} }
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if (d->oldPermissionLookup != qt_ntfs_permission_lookup) if (d->oldPermissionLookup != qt_ntfs_permission_lookup)
qt_ntfs_permission_lookup++; qt_ntfs_permission_lookup++;
#endif #endif
@ -5968,14 +5968,14 @@ void TQFileDialog::insertEntry( const TQValueList<TQUrlInfo> &lst, TQNetworkOper
d->hadDotDot = TRUE; d->hadDotDot = TRUE;
if ( isRoot( d->url ) ) if ( isRoot( d->url ) )
continue; continue;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if ( d->url.path().left( 2 ) == "//" ) if ( d->url.path().left( 2 ) == "//" )
continue; continue;
#endif #endif
} else if ( inf.name() == "." ) } else if ( inf.name() == "." )
continue; continue;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
// Workaround a Windows bug, '..' is apparantly hidden in directories // Workaround a Windows bug, '..' is apparantly hidden in directories
// that are one level away from root // that are one level away from root
if ( !bShowHiddenFiles && inf.name() != ".." ) { if ( !bShowHiddenFiles && inf.name() != ".." ) {

@ -59,7 +59,7 @@
#include <private/qfontdata_p.h> #include <private/qfontdata_p.h>
#include <ntqvalidator.h> #include <ntqvalidator.h>
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#include "private/tqttdeintegration_x11_p.h" #include "private/tqttdeintegration_x11_p.h"
#endif #endif
@ -396,7 +396,7 @@ extern bool tqt_use_native_dialogs;
TQFont TQFontDialog::getFont( bool *ok, const TQFont *def, TQFont TQFontDialog::getFont( bool *ok, const TQFont *def,
TQWidget *parent, const char* name) TQWidget *parent, const char* name)
{ {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled()) if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::getFont( ok, def, parent, name ); return TQTDEIntegration::getFont( ok, def, parent, name );
#endif #endif
@ -465,7 +465,7 @@ bool TQFontDialog::eventFilter( TQObject * o , TQEvent * e )
return TQDialog::eventFilter( o, e ); return TQDialog::eventFilter( o, e );
} }
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
// #define SHOW_FONTS_IN_FAMILIES // #define SHOW_FONTS_IN_FAMILIES
#endif #endif

@ -53,7 +53,7 @@
#include "ntqaccessible.h" #include "ntqaccessible.h"
#endif #endif
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#include "private/tqttdeintegration_x11_p.h" #include "private/tqttdeintegration_x11_p.h"
#endif #endif
@ -949,7 +949,7 @@ void TQMessageBox::adjustSize()
w = screen.width(); w = screen.width();
resize( w, h ); resize( w, h );
setMinimumSize( size() ); setMinimumSize( size() );
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
setMaximumSize(size()); setMaximumSize(size());
#endif #endif
} }
@ -1112,7 +1112,7 @@ int TQMessageBox::information( TQWidget *parent,
const TQString& caption, const TQString& text, const TQString& caption, const TQString& text,
int button0, int button1, int button2 ) int button0, int button1, int button2 )
{ {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled()) if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::information( parent, caption, text, button0, button1, button2 ); return TQTDEIntegration::information( parent, caption, text, button0, button1, button2 );
#endif #endif
@ -1163,7 +1163,7 @@ int TQMessageBox::question( TQWidget *parent,
const TQString& caption, const TQString& text, const TQString& caption, const TQString& text,
int button0, int button1, int button2 ) int button0, int button1, int button2 )
{ {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled()) if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::question( parent, caption, text, button0, button1, button2 ); return TQTDEIntegration::question( parent, caption, text, button0, button1, button2 );
#endif #endif
@ -1215,7 +1215,7 @@ int TQMessageBox::warning( TQWidget *parent,
const TQString& caption, const TQString& text, const TQString& caption, const TQString& text,
int button0, int button1, int button2 ) int button0, int button1, int button2 )
{ {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled()) if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::warning( parent, caption, text, button0, button1, button2 ); return TQTDEIntegration::warning( parent, caption, text, button0, button1, button2 );
#endif #endif
@ -1267,7 +1267,7 @@ int TQMessageBox::critical( TQWidget *parent,
const TQString& caption, const TQString& text, const TQString& caption, const TQString& text,
int button0, int button1, int button2 ) int button0, int button1, int button2 )
{ {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled()) if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::critical( parent, caption, text, button0, button1, button2 ); return TQTDEIntegration::critical( parent, caption, text, button0, button1, button2 );
#endif #endif
@ -1418,7 +1418,7 @@ int TQMessageBox::information( TQWidget *parent, const TQString &caption,
int defaultButtonNumber, int defaultButtonNumber,
int escapeButtonNumber ) int escapeButtonNumber )
{ {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled()) if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::information( parent, caption, text, return TQTDEIntegration::information( parent, caption, text,
button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );
@ -1465,7 +1465,7 @@ int TQMessageBox::question( TQWidget *parent, const TQString &caption,
int defaultButtonNumber, int defaultButtonNumber,
int escapeButtonNumber ) int escapeButtonNumber )
{ {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled()) if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::question( parent, caption, text, return TQTDEIntegration::question( parent, caption, text,
button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );
@ -1514,7 +1514,7 @@ int TQMessageBox::warning( TQWidget *parent, const TQString &caption,
int defaultButtonNumber, int defaultButtonNumber,
int escapeButtonNumber ) int escapeButtonNumber )
{ {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled()) if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::warning( parent, caption, text, return TQTDEIntegration::warning( parent, caption, text,
button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );
@ -1559,7 +1559,7 @@ int TQMessageBox::critical( TQWidget *parent, const TQString &caption,
int defaultButtonNumber, int defaultButtonNumber,
int escapeButtonNumber ) int escapeButtonNumber )
{ {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if ( tqt_use_native_dialogs && TQTDEIntegration::enabled()) if ( tqt_use_native_dialogs && TQTDEIntegration::enabled())
return TQTDEIntegration::critical( parent, caption, text, return TQTDEIntegration::critical( parent, caption, text,
button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );

@ -1416,7 +1416,7 @@ void TQPrintDialog::printerOrFileSelected( int id )
cur += '/'; cur += '/';
if ( cur.left( home.length() ) != home ) if ( cur.left( home.length() ) != home )
cur = home; cur = home;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
cur += "print.ps"; cur += "print.ps";
#endif #endif
d->fileName->setText( cur ); d->fileName->setText( cur );

@ -617,7 +617,7 @@ void TQProgressDialog::setProgress( int progress )
d->shown_once = TRUE; d->shown_once = TRUE;
} }
} }
#ifdef Q_WS_MACX #ifdef TQ_WS_MACX
TQApplication::flush(); TQApplication::flush();
#endif #endif
} }

@ -101,7 +101,7 @@ TQInputContext *TQInputContextFactory::create( const TQString& key, TQWidget *wi
if ( iface ) { if ( iface ) {
ret = iface->create( inputcontext ); ret = iface->create( inputcontext );
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
if ( ret ) if ( ret )
ret->setHolderWidget( widget ); ret->setHolderWidget( widget );
#endif #endif

@ -54,7 +54,7 @@ struct TQAccessibleInterface;
class TQ_EXPORT TQAccessible class TQ_EXPORT TQAccessible
{ {
private: private:
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
static TQMAC_PASCAL OSStatus globalEventProcessor(EventHandlerCallRef, EventRef, void *); static TQMAC_PASCAL OSStatus globalEventProcessor(EventHandlerCallRef, EventRef, void *);
static TQObject *queryAccessibleObject(TQAccessibleInterface *); static TQObject *queryAccessibleObject(TQAccessibleInterface *);
#endif #endif

@ -54,10 +54,10 @@ class TQSessionManager;
class TQStyle; class TQStyle;
class TQTranslator; class TQTranslator;
class TQEventLoop; class TQEventLoop;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
class TQIMEvent; class TQIMEvent;
#endif #endif
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
class TQWSDecoration; class TQWSDecoration;
#endif #endif
@ -80,7 +80,7 @@ public:
TQApplication( int &argc, char **argv, bool GUIenabled, bool SMenabled ); TQApplication( int &argc, char **argv, bool GUIenabled, bool SMenabled );
enum Type { Tty, GuiClient, GuiServer }; enum Type { Tty, GuiClient, GuiServer };
TQApplication( int &argc, char **argv, Type ); 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, HANDLE visual = 0, HANDLE cmap = 0 );
TQApplication( Display *dpy, int argc, char **argv, TQApplication( Display *dpy, int argc, char **argv,
HANDLE visual = 0, HANDLE cmap= 0 ); HANDLE visual = 0, HANDLE cmap= 0 );
@ -236,18 +236,18 @@ public:
static bool isEffectEnabled( TQt::UIEffect ); static bool isEffectEnabled( TQt::UIEffect );
static void setEffectEnabled( TQt::UIEffect, bool enable = TRUE ); static void setEffectEnabled( TQt::UIEffect, bool enable = TRUE );
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
virtual bool macEventFilter( EventHandlerCallRef, EventRef ); virtual bool macEventFilter( EventHandlerCallRef, EventRef );
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
virtual bool winEventFilter( MSG * ); virtual bool winEventFilter( MSG * );
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
virtual bool x11EventFilter( XEvent * ); virtual bool x11EventFilter( XEvent * );
virtual int x11ClientMessage( TQWidget*, XEvent*, bool passive_only); virtual int x11ClientMessage( TQWidget*, XEvent*, bool passive_only);
int x11ProcessEvent( XEvent* ); int x11ProcessEvent( XEvent* );
#endif #endif
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
virtual bool qwsEventFilter( TQWSEvent * ); virtual bool qwsEventFilter( TQWSEvent * );
int qwsProcessEvent( TQWSEvent* ); int qwsProcessEvent( TQWSEvent* );
void qwsSetCustomColors( TQRgb *colortable, int start, int numColors ); void qwsSetCustomColors( TQRgb *colortable, int start, int numColors );
@ -267,7 +267,7 @@ public:
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)
static MacintoshVersion macVersion(); static MacintoshVersion macVersion();
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
void winFocus( TQWidget *, bool ); void winFocus( TQWidget *, bool );
static void winMouseButtonUp(); static void winMouseButtonUp();
#endif #endif
@ -280,7 +280,7 @@ public:
virtual void commitData( TQSessionManager& sm ); virtual void commitData( TQSessionManager& sm );
virtual void saveState( TQSessionManager& sm ); virtual void saveState( TQSessionManager& sm );
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
#if !defined(TQT_NO_IM_EXTENSIONS) #if !defined(TQT_NO_IM_EXTENSIONS)
virtual TQWidget *locateICHolderWidget( TQWidget *w ); virtual TQWidget *locateICHolderWidget( TQWidget *w );
virtual TQWidgetList *icHolderWidgets(); virtual TQWidgetList *icHolderWidgets();
@ -314,7 +314,7 @@ public slots:
void closeAllWindows(); void closeAllWindows();
void aboutTQt(); void aboutTQt();
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
protected: protected:
void setArgs(int, char **); void setArgs(int, char **);
#endif #endif
@ -328,12 +328,12 @@ private:
void init_precmdline(); void init_precmdline();
void process_cmdline( int* argcptr, char ** argv ); void process_cmdline( int* argcptr, char ** argv );
bool internalNotify( TQObject *, TQEvent * ); 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 *findChildWidget( const TQWidget *p, const TQPoint &pos );
static TQWidget *findWidget( const TQObjectList&, const TQPoint &, bool rec ); static TQWidget *findWidget( const TQObjectList&, const TQPoint &, bool rec );
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
bool do_mouse_down(Point *, bool *); bool do_mouse_down(Point *, bool *);
static TQMAC_PASCAL OSStatus globalEventProcessor(EventHandlerCallRef, EventRef, void *); static TQMAC_PASCAL OSStatus globalEventProcessor(EventHandlerCallRef, EventRef, void *);
static TQMAC_PASCAL OSStatus globalAppleEventProcessor(const AppleEvent *, AppleEvent *, long); static TQMAC_PASCAL OSStatus globalAppleEventProcessor(const AppleEvent *, AppleEvent *, long);
@ -348,7 +348,7 @@ private:
friend void tqt_init(int *, char **, TQApplication::Type); friend void tqt_init(int *, char **, TQApplication::Type);
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
private slots: private slots:
void postIMEvent( TQObject *receiver, TQIMEvent *event ); void postIMEvent( TQObject *receiver, TQIMEvent *event );
#endif #endif
@ -406,7 +406,7 @@ private:
static TQString* session_key; static TQString* session_key;
bool is_session_restored; bool is_session_restored;
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
#if !defined (TQT_NO_STYLE) #if !defined (TQT_NO_STYLE)
static void x11_initialize_style(); static void x11_initialize_style();
#endif #endif
@ -442,10 +442,10 @@ private:
friend class TQTranslator; friend class TQTranslator;
friend class TQEventLoop; friend class TQEventLoop;
friend TQ_EXPORT void tqt_ucm_initialize( TQApplication * ); friend TQ_EXPORT void tqt_ucm_initialize( TQApplication * );
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
friend bool qt_sendSpontaneousEvent( TQObject*, TQEvent* ); friend bool qt_sendSpontaneousEvent( TQObject*, TQEvent* );
#endif #endif
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
friend class TQInputContext; friend class TQInputContext;
#endif #endif
private: // Disabled copy constructor and operator= private: // Disabled copy constructor and operator=
@ -475,7 +475,7 @@ inline char **TQApplication::argv() const
return app_argv; return app_argv;
} }
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
inline void TQApplication::setArgs(int c, char **v) inline void TQApplication::setArgs(int c, char **v)
{ {
app_argc = c; app_argc = c;

@ -117,7 +117,7 @@ protected:
friend class TQMimeSource; friend class TQMimeSource;
private: private:
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
void loadScrap(bool convert); void loadScrap(bool convert);
void saveScrap(); void saveScrap();
#endif #endif

@ -116,7 +116,7 @@ public:
uint alloc(); uint alloc();
uint pixel() const; 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? // ### in 4.0, make this take a default argument of -1 for default screen?
uint alloc( int screen ); uint alloc( int screen );
uint pixel( int screen ) const; uint pixel( int screen ) const;
@ -130,7 +130,7 @@ public:
static int currentAllocContext(); static int currentAllocContext();
static void destroyAllocContext( int ); static void destroyAllocContext( int );
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
static const TQRgb* palette( int* numEntries = 0 ); static const TQRgb* palette( int* numEntries = 0 );
static int setPaletteEntries( const TQRgb* entries, int numEntries, static int setPaletteEntries( const TQRgb* entries, int numEntries,
int base = -1 ); int base = -1 );
@ -153,7 +153,7 @@ private:
static TQColor* globalColors(); static TQColor* globalColors();
static bool color_init; static bool color_init;
static bool globals_init; static bool globals_init;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
static HPALETTE hpal; static HPALETTE hpal;
#endif #endif
static enum ColorModel { d8, d32 } colormodel; static enum ColorModel { d8, d32 } colormodel;

@ -88,15 +88,15 @@ public:
const TQBitmap *mask() const; const TQBitmap *mask() const;
TQPoint hotSpot() const; TQPoint hotSpot() const;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
HCURSOR handle() const; HCURSOR handle() const;
TQCursor( HCURSOR ); TQCursor( HCURSOR );
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
HANDLE handle() const; HANDLE handle() const;
TQCursor( HANDLE ); TQCursor( HANDLE );
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
HANDLE handle() const; HANDLE handle() const;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
HANDLE handle() const; HANDLE handle() const;
#endif #endif
@ -107,7 +107,7 @@ public:
static void initialize(); static void initialize();
static void cleanup(); static void cleanup();
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
static int x11Screen(); static int x11Screen();
#endif #endif
private: private:
@ -116,7 +116,7 @@ private:
void update() const; void update() const;
TQCursorData *data; TQCursorData *data;
TQCursor *find_cur(int); 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); friend void qt_mac_set_cursor(const TQCursor *c, const Point *p);
#endif #endif
}; };

@ -95,7 +95,7 @@ private:
#endif #endif
friend class TQApplication; friend class TQApplication;
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
friend class TQWSDisplay; friend class TQWSDisplay;
#endif #endif
}; };

@ -254,7 +254,7 @@ private:
TQDragObject * object; TQDragObject * object;
bool updateMode( ButtonState newstate ); bool updateMode( ButtonState newstate );
void updateCursor(); void updateCursor();
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
void createCursors(); void createCursors();
#endif #endif

@ -54,7 +54,7 @@
class TQEventLoopPrivate; class TQEventLoopPrivate;
class TQSocketNotifier; class TQSocketNotifier;
class TQTimer; class TQTimer;
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
struct timeval; //stdc struct struct timeval; //stdc struct
struct TimerInfo; //internal structure (qeventloop_mac.cpp) struct TimerInfo; //internal structure (qeventloop_mac.cpp)
#endif #endif
@ -109,11 +109,11 @@ signals:
void aboutToBlock(); void aboutToBlock();
private: private:
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
friend TQMAC_PASCAL void qt_mac_select_timer_callbk(EventLoopTimerRef, void *); friend TQMAC_PASCAL void qt_mac_select_timer_callbk(EventLoopTimerRef, void *);
int macHandleSelect(timeval *); int macHandleSelect(timeval *);
void macHandleTimer(TimerInfo *); void macHandleTimer(TimerInfo *);
#endif // Q_WS_MAC #endif // TQ_WS_MAC
// internal initialization/cleanup - implemented in various platform specific files // internal initialization/cleanup - implemented in various platform specific files
void init(); void init();

@ -165,11 +165,11 @@ public:
bool isCopyOf( const TQFont & ) const; bool isCopyOf( const TQFont & ) const;
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
HFONT handle() const; HFONT handle() const;
#else // !Q_WS_WIN #else // !TQ_WS_WIN
TQt::HANDLE handle() const; TQt::HANDLE handle() const;
#endif // Q_WS_WIN #endif // TQ_WS_WIN
// needed for X11 // needed for X11
@ -191,11 +191,11 @@ public:
#endif //TQT_NO_STRINGLIST #endif //TQT_NO_STRINGLIST
static void initialize(); static void initialize();
static void cleanup(); static void cleanup();
#ifndef Q_WS_QWS #ifndef TQ_WS_QWS
static void cacheStatistics(); static void cacheStatistics();
#endif #endif
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
void qwsRenderToDisk(bool all=TRUE); void qwsRenderToDisk(bool all=TRUE);
#endif #endif
@ -320,9 +320,9 @@ private:
void detach(); void detach();
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
void macSetFont(TQPaintDevice *); void macSetFont(TQPaintDevice *);
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
void x11SetScreen( int screen = -1 ); void x11SetScreen( int screen = -1 );
int x11Screen() const; int x11Screen() const;
#endif #endif
@ -337,7 +337,7 @@ private:
friend class TQTextLayout; friend class TQTextLayout;
friend class TQTextItem; friend class TQTextItem;
friend class TQGLContext; 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); friend TQt::HANDLE qt_xft_handle(const TQFont &font);
#endif #endif
#ifndef TQT_NO_DATASTREAM #ifndef TQT_NO_DATASTREAM

@ -58,7 +58,7 @@ struct TQtFontFamily;
struct TQtFontFoundry; struct TQtFontFoundry;
struct TQFontDef; struct TQFontDef;
class TQFontEngine; class TQFontEngine;
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
class TQDiskFont; class TQDiskFont;
#endif #endif
@ -92,7 +92,7 @@ public:
static TQString scriptName(TQFont::Script); static TQString scriptName(TQFont::Script);
static TQString scriptSample(TQFont::Script); static TQString scriptSample(TQFont::Script);
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
static void qwsAddDiskFont( TQDiskFont *qdf ); static void qwsAddDiskFont( TQDiskFont *qdf );
#endif #endif
@ -118,10 +118,10 @@ public:
#endif // TQT_NO_COMPAT #endif // TQT_NO_COMPAT
private: 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, static TQFontEngine *findFont( TQFont::Script script, const TQFontPrivate *fp,
const TQFontDef &request, int force_encoding_id = -1 ); const TQFontDef &request, int force_encoding_id = -1 );
#endif // Q_WS_X11 #endif // TQ_WS_X11
static void createDatabase(); static void createDatabase();

@ -46,7 +46,7 @@
#include "ntqrect.h" #include "ntqrect.h"
#endif // QT_H #endif // QT_H
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
class TQFontEngine; class TQFontEngine;
#endif #endif
@ -104,7 +104,7 @@ private:
friend class TQWidget; friend class TQWidget;
friend class TQPainter; friend class TQPainter;
friend class TQTextFormat; friend class TQTextFormat;
#if defined( Q_WS_MAC ) #if defined( TQ_WS_MAC )
friend class TQFontPrivate; friend class TQFontPrivate;
#endif #endif

@ -93,7 +93,7 @@
return i->iface(); \ 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 # define Q_STDCALL __stdcall
#else #else
# define Q_STDCALL # define Q_STDCALL

@ -83,7 +83,7 @@ public:
TQImage( uchar* data, int w, int h, int depth, TQImage( uchar* data, int w, int h, int depth,
TQRgb* colortable, int numColors, TQRgb* colortable, int numColors,
Endian bitOrder ); Endian bitOrder );
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
TQImage( uchar* data, int w, int h, int depth, int pbl, TQImage( uchar* data, int w, int h, int depth, int pbl,
TQRgb* colortable, int numColors, TQRgb* colortable, int numColors,
Endian bitOrder ); Endian bitOrder );
@ -129,7 +129,7 @@ public:
int numBytes() const; int numBytes() const;
int bytesPerLine() const; int bytesPerLine() const;
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
TQGfx * graphicsContext(); TQGfx * graphicsContext();
#endif #endif

@ -72,9 +72,9 @@ public:
virtual TQString identifierName(); virtual TQString identifierName();
virtual TQString language(); virtual TQString language();
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
virtual bool x11FilterEvent( TQWidget *keywidget, XEvent *event ); virtual bool x11FilterEvent( TQWidget *keywidget, XEvent *event );
#endif // Q_WS_X11 #endif // TQ_WS_X11
virtual bool filterEvent( const TQEvent *event ); virtual bool filterEvent( const TQEvent *event );
virtual void reset(); virtual void reset();
@ -90,7 +90,7 @@ public:
virtual TQPtrList<TQInputContextMenu> *menus(); virtual TQPtrList<TQInputContextMenu> *menus();
void addMenusTo( TQPopupMenu *popup, TQInputContextMenu::Action action = TQInputContextMenu::InsertSeparator ); 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 // these functions are not recommended for ordinary use
virtual TQWidget *focusWidget() const; virtual TQWidget *focusWidget() const;
virtual TQWidget *holderWidget() const; virtual TQWidget *holderWidget() const;

@ -122,7 +122,7 @@ private:
TQMimeSourceFactoryData* d; TQMimeSourceFactoryData* d;
}; };
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
#ifndef QT_H #ifndef QT_H
#include "ntqptrlist.h" // down here for GCC 2.7.* compatibility #include "ntqptrlist.h" // down here for GCC 2.7.* compatibility
@ -158,7 +158,7 @@ public:
}; };
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
#ifndef QT_H #ifndef QT_H
#include "ntqptrlist.h" // down here for GCC 2.7.* compatibility #include "ntqptrlist.h" // down here for GCC 2.7.* compatibility
@ -193,7 +193,7 @@ public:
virtual TQValueList<TQByteArray> convertFromMime(TQByteArray data, const char* mime, int flav)=0; virtual TQValueList<TQByteArray> convertFromMime(TQByteArray data, const char* mime, int flav)=0;
}; };
#endif // Q_WS_MAC #endif // TQ_WS_MAC
#endif // TQT_NO_MIME #endif // TQT_NO_MIME

@ -96,7 +96,7 @@ public:
void connectUpdate(TQObject* receiver, const char *member); void connectUpdate(TQObject* receiver, const char *member);
void disconnectUpdate(TQObject* receiver, const char *member=0); void disconnectUpdate(TQObject* receiver, const char *member=0);
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
// Temporary hack // Temporary hack
void setDisplayWidget(TQWidget * w); void setDisplayWidget(TQWidget * w);
#endif #endif

@ -175,7 +175,7 @@ public:
// documented in qwidget.cpp // documented in qwidget.cpp
enum NETWMFlags { enum NETWMFlags {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
WX11DisableMove = 0x00000001, WX11DisableMove = 0x00000001,
WX11DisableClose = 0x00000002, WX11DisableClose = 0x00000002,
WX11DisableResize = 0x00000004, WX11DisableResize = 0x00000004,
@ -226,12 +226,12 @@ public:
WMouseNoMask = 0x00200000, WMouseNoMask = 0x00200000,
WStaticContents = 0x00400000, WStaticContents = 0x00400000,
WRepaintNoErase = 0x00800000, // OBSOLETE WRepaintNoErase = 0x00800000, // OBSOLETE
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
WX11BypassWM = 0x01000000, WX11BypassWM = 0x01000000,
WWinOwnDC = 0x00000000, WWinOwnDC = 0x00000000,
WMacNoSheet = 0x00000000, WMacNoSheet = 0x00000000,
WMacDrawer = 0x00000000, WMacDrawer = 0x00000000,
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
WX11BypassWM = 0x00000000, WX11BypassWM = 0x00000000,
WWinOwnDC = 0x00000000, WWinOwnDC = 0x00000000,
WMacNoSheet = 0x01000000, WMacNoSheet = 0x01000000,
@ -246,7 +246,7 @@ public:
WShowModal = 0x04000000, WShowModal = 0x04000000,
WNoMousePropagation = 0x08000000, WNoMousePropagation = 0x08000000,
WSubWindow = 0x10000000, WSubWindow = 0x10000000,
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
WStyle_Splash = 0x20000000, WStyle_Splash = 0x20000000,
#else #else
WStyle_Splash = WStyle_NoBorder | WMacNoSheet | WStyle_Tool | WWinOwnDC, WStyle_Splash = WStyle_NoBorder | WMacNoSheet | WStyle_Tool | WWinOwnDC,
@ -1007,13 +1007,13 @@ public:
// "handle" type for system objects. Documented as \internal in // "handle" type for system objects. Documented as \internal in
// qapplication.cpp // qapplication.cpp
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
typedef void * HANDLE; typedef void * HANDLE;
#elif defined(Q_WS_WIN) #elif defined(TQ_WS_WIN)
typedef void *HANDLE; typedef void *HANDLE;
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
typedef unsigned long HANDLE; typedef unsigned long HANDLE;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
typedef void * HANDLE; typedef void * HANDLE;
#endif #endif
}; };

@ -46,7 +46,7 @@
#include "ntqrect.h" #include "ntqrect.h"
#endif // QT_H #endif // QT_H
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
class TQWSDisplay; class TQWSDisplay;
class TQGfx; class TQGfx;
#endif #endif
@ -56,7 +56,7 @@ class TQString;
class TQTextItem; class TQTextItem;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
struct TQPaintDeviceX11Data; struct TQPaintDeviceX11Data;
#endif #endif
@ -95,18 +95,18 @@ public:
// Windows: get device context // Windows: get device context
// X-Windows: get drawable // X-Windows: get drawable
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
virtual HDC handle() const; virtual HDC handle() const;
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
virtual TQt::HANDLE handle() const; virtual TQt::HANDLE handle() const;
virtual TQt::HANDLE x11RenderHandle() const; virtual TQt::HANDLE x11RenderHandle() const;
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
virtual TQt::HANDLE handle() const; virtual TQt::HANDLE handle() const;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
virtual TQt::HANDLE handle() const; virtual TQt::HANDLE handle() const;
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
Display *x11Display() const; Display *x11Display() const;
int x11Screen() const; int x11Screen() const;
int x11Depth() const; int x11Depth() const;
@ -146,7 +146,7 @@ public:
static void x11SetAppDpiY( int, int ); static void x11SetAppDpiY( int, int );
#endif #endif
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
static TQWSDisplay *qwsDisplay(); static TQWSDisplay *qwsDisplay();
virtual unsigned char * scanLine(int) const; virtual unsigned char * scanLine(int) const;
virtual int bytesPerLine() const; virtual int bytesPerLine() const;
@ -215,9 +215,9 @@ public:
protected: protected:
TQPaintDevice( uint devflags ); TQPaintDevice( uint devflags );
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
HDC hdc; // device context HDC hdc; // device context
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
TQt::HANDLE hd; // handle to drawable TQt::HANDLE hd; // handle to drawable
TQt::HANDLE rendhd; // handle to RENDER pict TQt::HANDLE rendhd; // handle to RENDER pict
@ -225,12 +225,12 @@ protected:
void cloneX11Data( const TQPaintDevice * ); void cloneX11Data( const TQPaintDevice * );
virtual void setX11Data( const TQPaintDeviceX11Data* ); virtual void setX11Data( const TQPaintDeviceX11Data* );
TQPaintDeviceX11Data* getX11Data( bool def=FALSE ) const; TQPaintDeviceX11Data* getX11Data( bool def=FALSE ) const;
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
#if !defined( TQMAC_NO_QUARTZ ) #if !defined( TQMAC_NO_QUARTZ )
CGContextRef ctx; CGContextRef ctx;
#endif #endif
void * hd; void * hd;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
TQt::HANDLE hd; TQt::HANDLE hd;
#endif #endif
@ -244,7 +244,7 @@ protected:
friend class TQPainter; friend class TQPainter;
friend class TQPaintDeviceMetrics; friend class TQPaintDeviceMetrics;
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
#ifndef TQMAC_NO_QUARTZ #ifndef TQMAC_NO_QUARTZ
virtual CGContextRef macCGContext(bool clipped=TRUE) const; virtual CGContextRef macCGContext(bool clipped=TRUE) const;
#endif #endif
@ -255,13 +255,13 @@ protected:
const TQPaintDevice *, const TQPaintDevice *,
int, int, int, int, TQt::RasterOp, bool ); int, int, int, int, TQt::RasterOp, bool );
#endif #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_init_internal( int *, char **, Display *, TQt::HANDLE, TQt::HANDLE );
friend void tqt_cleanup(); friend void tqt_cleanup();
#endif #endif
private: private:
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
static Display *x_appdisplay; static Display *x_appdisplay;
static int x_appscreen; static int x_appscreen;
@ -304,7 +304,7 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy,
int conversion_flags=0 ); int conversion_flags=0 );
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
struct TQ_EXPORT TQPaintDeviceX11Data : public TQShared { struct TQ_EXPORT TQPaintDeviceX11Data : public TQShared {
Display* x_display; Display* x_display;
@ -332,7 +332,7 @@ inline bool TQPaintDevice::isExtDev() const
inline bool TQPaintDevice::paintingActive() const inline bool TQPaintDevice::paintingActive() const
{ return painters != 0; } { return painters != 0; }
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
inline Display *TQPaintDevice::x11Display() const inline Display *TQPaintDevice::x11Display() const
{ return x11Data ? x11Data->x_display : x_appdisplay; } { return x11Data ? x11Data->x_display : x_appdisplay; }
@ -405,7 +405,7 @@ inline void *TQPaintDevice::x11AppVisual()
inline bool TQPaintDevice::x11AppDefaultVisual() inline bool TQPaintDevice::x11AppDefaultVisual()
{ return x_appdefvisual; } { return x_appdefvisual; }
#endif // Q_WS_X11 #endif // TQ_WS_X11
TQ_EXPORT TQ_EXPORT

@ -58,12 +58,12 @@ class TQTextCodec;
class TQTextParag; class TQTextParag;
class TQPaintDevice; class TQPaintDevice;
class TQTextItem; class TQTextItem;
#if defined( Q_WS_MAC ) #if defined( TQ_WS_MAC )
class TQMacSavedPortInfo; class TQMacSavedPortInfo;
#endif #endif
class TQPainterPrivate; class TQPainterPrivate;
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
class TQScreen; class TQScreen;
#endif #endif
@ -82,7 +82,7 @@ public:
bool end(); bool end();
TQPaintDevice *device() const; TQPaintDevice *device() const;
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
TQGfx * internalGfx(); TQGfx * internalGfx();
#ifdef QT_QWS_EXPERIMENTAL_SCREENPAINTER #ifdef QT_QWS_EXPERIMENTAL_SCREENPAINTER
bool begin(TQScreen *screen); bool begin(TQScreen *screen);
@ -286,9 +286,9 @@ public:
// Other functions // Other functions
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
HDC handle() const; HDC handle() const;
#elif defined(Q_WS_X11) || defined(Q_WS_MAC) #elif defined(TQ_WS_X11) || defined(TQ_WS_MAC)
HANDLE handle() const; HANDLE handle() const;
#endif #endif
@ -388,11 +388,11 @@ protected:
TQPoint internalCurrentPos; TQPoint internalCurrentPos;
uint old_pix; // ### All win platforms in 4.0 uint old_pix; // ### All win platforms in 4.0
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
friend class TQFontEngineWin; friend class TQFontEngineWin;
friend class TQFontEngineBox; friend class TQFontEngineBox;
QT_WIN_PAINTER_MEMBERS QT_WIN_PAINTER_MEMBERS
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
friend class TQFontEngineXLFD; friend class TQFontEngineXLFD;
friend class TQFontEngineXft; friend class TQFontEngineXft;
friend class TQFontEngineBox; friend class TQFontEngineBox;
@ -404,13 +404,13 @@ protected:
GC gc_brush; // graphics contect for brush GC gc_brush; // graphics contect for brush
TQPoint curPt; // current point TQPoint curPt; // current point
uint clip_serial; // clipping serial number uint clip_serial; // clipping serial number
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
TQt::HANDLE hd; // handle to drawable TQt::HANDLE hd; // handle to drawable
void initPaintDevice(bool force=FALSE, TQPoint *off=NULL, TQRegion *rgn=NULL); void initPaintDevice(bool force=FALSE, TQPoint *off=NULL, TQRegion *rgn=NULL);
friend const TQRegion &qt_mac_update_painter(TQPainter *, bool); friend const TQRegion &qt_mac_update_painter(TQPainter *, bool);
friend class TQFontEngineMac; friend class TQFontEngineMac;
friend class TQMacPainter; friend class TQMacPainter;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
friend class TQFontEngine; friend class TQFontEngine;
TQGfx * gfx; TQGfx * gfx;
friend void qwsUpdateActivePainters(); friend void qwsUpdateActivePainters();
@ -549,12 +549,12 @@ inline int *TQPainter::tabArray() const
return tabarray; return tabarray;
} }
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
inline HDC TQPainter::handle() const inline HDC TQPainter::handle() const
{ {
return hdc; 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 inline TQt::HANDLE TQPainter::handle() const
{ {
return hd; 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 ); return boundingRect( r, tf, str, len, i );
} }
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
inline TQGfx * TQPainter::internalGfx() inline TQGfx * TQPainter::internalGfx()
{ {
return gfx; return gfx;

@ -75,7 +75,7 @@ public:
private: private:
friend class TQPainter; friend class TQPainter;
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
friend class TQFontEngineWin; friend class TQFontEngineWin;
#endif #endif

@ -51,7 +51,7 @@
class TQGfx; class TQGfx;
class TQPixmapPrivate; class TQPixmapPrivate;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
// Internal pixmap memory optimization class for Windows 9x // Internal pixmap memory optimization class for Windows 9x
class TQMultiCellPixmap; class TQMultiCellPixmap;
#endif #endif
@ -139,7 +139,7 @@ public:
bool save( TQIODevice* device, const char* format, int quality = -1 ) const; bool save( TQIODevice* device, const char* format, int quality = -1 ) const;
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
HBITMAP hbm() const; HBITMAP hbm() const;
#endif #endif
@ -154,7 +154,7 @@ public:
bool isTQBitmap() const; bool isTQBitmap() const;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
// These functions are internal and used by Windows 9x only // These functions are internal and used by Windows 9x only
bool isMultiCellPixmap() const; bool isMultiCellPixmap() const;
HDC multiCellHandle() const; HDC multiCellHandle() const;
@ -164,13 +164,13 @@ public:
void freeCell( bool = FALSE ); void freeCell( bool = FALSE );
#endif #endif
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
virtual TQGfx * graphicsContext(bool clip_children=TRUE) const; virtual TQGfx * graphicsContext(bool clip_children=TRUE) const;
virtual unsigned char * scanLine(int) const; virtual unsigned char * scanLine(int) const;
virtual int bytesPerLine() const; virtual int bytesPerLine() const;
TQRgb * clut() const; TQRgb * clut() const;
int numCols() const; int numCols() const;
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
static int x11SetDefaultScreen( int screen ); static int x11SetDefaultScreen( int screen );
void x11SetScreen( int screen ); void x11SetScreen( int screen );
#endif #endif
@ -183,7 +183,7 @@ protected:
TQPixmap( int w, int h, const uchar *data, bool isXbitmap ); TQPixmap( int w, int h, const uchar *data, bool isXbitmap );
int metric( int ) const; int metric( int ) const;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
struct TQMCPI { // mem optim for win9x struct TQMCPI { // mem optim for win9x
TQMultiCellPixmap *mcp; TQMultiCellPixmap *mcp;
int offset; int offset;
@ -196,12 +196,12 @@ protected:
uint uninit : 1; uint uninit : 1;
uint bitmap : 1; uint bitmap : 1;
uint selfmask : 1; uint selfmask : 1;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
uint mcp : 1; uint mcp : 1;
#endif #endif
int ser_no; int ser_no;
TQBitmap *mask; TQBitmap *mask;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
TQPixmap *maskpm; TQPixmap *maskpm;
union { union {
HBITMAP hbm; // if mcp == FALSE HBITMAP hbm; // if mcp == FALSE
@ -211,14 +211,14 @@ protected:
#ifdef Q_OS_TEMP #ifdef Q_OS_TEMP
uchar* ppvBits; // Pointer to DIBSection bits uchar* ppvBits; // Pointer to DIBSection bits
#endif #endif
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
void *ximage; void *ximage;
void *maskgc; void *maskgc;
TQPixmap *alphapm; TQPixmap *alphapm;
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
ColorTable *clut; ColorTable *clut;
TQPixmap *alphapm; TQPixmap *alphapm;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
int id; // ### should use TQPaintDevice::hd, since it is there int id; // ### should use TQPaintDevice::hd, since it is there
TQRgb * clut; TQRgb * clut;
int numcols; int numcols;
@ -227,7 +227,7 @@ protected:
bool hasAlpha; bool hasAlpha;
#endif #endif
Optimization optim; Optimization optim;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
HBITMAP old_hbm; HBITMAP old_hbm;
#endif #endif
} *data; } *data;
@ -239,7 +239,7 @@ private:
void init( int, int, int, bool, Optimization ); void init( int, int, int, bool, Optimization );
void deref(); void deref();
TQPixmap copy( bool ignoreMask = FALSE ) const; 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 initAlphaPixmap( uchar *bytes, int length, struct tagBITMAPINFO *bmi );
void convertToAlphaPixmap( bool initAlpha=TRUE ); void convertToAlphaPixmap( bool initAlpha=TRUE );
static void bitBltAlphaPixmap( TQPixmap *dst, int dx, int dy, static void bitBltAlphaPixmap( TQPixmap *dst, int dx, int dy,
@ -257,7 +257,7 @@ private:
const TQPixmap *src, int sx, int sy, const TQPixmap *src, int sx, int sy,
int sw, int sh ); int sw, int sh );
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
friend void unclippedScaledBitBlt(TQPaintDevice *, int, int, int, int, friend void unclippedScaledBitBlt(TQPaintDevice *, int, int, int, int,
const TQPaintDevice *, int, int, int, int, const TQPaintDevice *, int, int, int, int,
TQt::RasterOp, bool, bool); TQt::RasterOp, bool, bool);
@ -295,7 +295,7 @@ inline bool TQPixmap::selfMask() const
return data->selfmask; return data->selfmask;
} }
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
inline HBITMAP TQPixmap::hbm() const inline HBITMAP TQPixmap::hbm() const
{ {
return data->mcp ? 0 : data->hbm_or_mcpi.hbm; return data->mcp ? 0 : data->hbm_or_mcpi.hbm;
@ -317,7 +317,7 @@ inline bool TQPixmap::isTQBitmap() const
return data->bitmap; return data->bitmap;
} }
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
inline bool TQPixmap::isMultiCellPixmap() const inline bool TQPixmap::isMultiCellPixmap() const
{ {
return data->mcp; return data->mcp;
@ -341,7 +341,7 @@ TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQPixmap & );
#ifndef TQT_NO_PIXMAP_TRANSFORMATION #ifndef TQT_NO_PIXMAP_TRANSFORMATION
# define QT_XFORM_TYPE_MSBFIRST 0 # define QT_XFORM_TYPE_MSBFIRST 0
# define QT_XFORM_TYPE_LSBFIRST 1 # define QT_XFORM_TYPE_LSBFIRST 1
# if defined(Q_WS_WIN) # if defined(TQ_WS_WIN)
# define QT_XFORM_TYPE_WINDOWSPIXMAP 2 # define QT_XFORM_TYPE_WINDOWSPIXMAP 2
# endif # endif
bool qt_xForm_helper( const TQWMatrix&, int, int, int, uchar*, int, int, int, uchar*, int, int, int ); bool qt_xForm_helper( const TQWMatrix&, int, int, int, uchar*, int, int, int, uchar*, int, int, int );

@ -108,11 +108,11 @@ public:
virtual void setOrientation( Orientation ); virtual void setOrientation( Orientation );
PageSize pageSize() const; PageSize pageSize() const;
virtual void setPageSize( PageSize ); virtual void setPageSize( PageSize );
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
void setWinPageSize( short winPageSize ); void setWinPageSize( short winPageSize );
short winPageSize() const; short winPageSize() const;
#endif #endif
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
bool printSetup(); bool printSetup();
bool pageSetup(); bool pageSetup();
#endif #endif
@ -165,17 +165,17 @@ protected:
bool cmd( int, TQPainter *, TQPDevCmdParam * ); bool cmd( int, TQPainter *, TQPDevCmdParam * );
int metric( int ) const; int metric( int ) const;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
virtual void setActive(); virtual void setActive();
virtual void setIdle(); virtual void setIdle();
#endif #endif
private: private:
#if defined(Q_WS_X11) || defined(Q_WS_QWS) #if defined(TQ_WS_X11) || defined(TQ_WS_QWS)
TQPaintDevice *pdrv; TQPaintDevice *pdrv;
int pid; int pid;
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
friend class TQPrinterPrivate; friend class TQPrinterPrivate;
PMPageFormat pformat; PMPageFormat pformat;
PMPrintSettings psettings; PMPrintSettings psettings;
@ -185,7 +185,7 @@ private:
void interpret(PMPrintSettings *); void interpret(PMPrintSettings *);
void interpret(PMPageFormat *); void interpret(PMPageFormat *);
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
void readPdlg( void* ); void readPdlg( void* );
void readPdlgA( void* ); void readPdlgA( void* );
void writeDevmode( TQt::HANDLE ); void writeDevmode( TQt::HANDLE );

@ -135,7 +135,7 @@ public:
friend TQ_EXPORT bool operator!=( const TQRect &, const TQRect & ); friend TQ_EXPORT bool operator!=( const TQRect &, const TQRect & );
private: 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 ); friend void qt_setCoords( TQRect *r, int xp1, int yp1, int xp2, int yp2 );
#endif #endif
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)

@ -46,7 +46,7 @@
#include "ntqrect.h" #include "ntqrect.h"
#endif // QT_H #endif // QT_H
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
struct TQRegionPrivate; struct TQRegionPrivate;
#endif #endif
@ -96,13 +96,13 @@ public:
bool operator!=( const TQRegion &r ) const bool operator!=( const TQRegion &r ) const
{ return !(operator==(r)); } { return !(operator==(r)); }
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
HRGN handle() const { return data->rgn; } 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; } 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; RgnHandle handle(bool require_rgn=FALSE) const;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
// TQGfx_QWS needs this for region drawing // TQGfx_QWS needs this for region drawing
void * handle() const { return data->rgn; } void * handle() const { return data->rgn; }
#endif #endif
@ -115,37 +115,37 @@ private:
TQRegion( bool ); TQRegion( bool );
TQRegion copy() const; TQRegion copy() const;
void detach(); void detach();
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
TQRegion winCombine( const TQRegion &, int ) const; TQRegion winCombine( const TQRegion &, int ) const;
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
void updateX11Region() const; void updateX11Region() const;
void *clipRectangles( int &num ) const; void *clipRectangles( int &num ) const;
friend void *qt_getClipRects( const TQRegion &, int & ); friend void *qt_getClipRects( const TQRegion &, int & );
#endif #endif
void exec( const TQByteArray &, int ver = 0 ); void exec( const TQByteArray &, int ver = 0 );
struct TQRegionData : public TQShared { struct TQRegionData : public TQShared {
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
HRGN rgn; HRGN rgn;
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
Region rgn; Region rgn;
void *xrectangles; void *xrectangles;
TQRegionPrivate *region; TQRegionPrivate *region;
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
uint is_rect:1; uint is_rect:1;
TQRect rect; TQRect rect;
RgnHandle rgn; RgnHandle rgn;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
void * rgn; void * rgn;
#endif #endif
bool is_null; bool is_null;
} *data; } *data;
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
friend struct qt_mac_rgn_data_cache; friend struct qt_mac_rgn_data_cache;
friend TQRegionData *qt_mac_get_rgn_data(); friend TQRegionData *qt_mac_get_rgn_data();
friend void qt_mac_free_rgn_data(TQRegionData *); friend void qt_mac_free_rgn_data(TQRegionData *);
void rectifyRegion(); void rectifyRegion();
#elif defined(Q_WS_WIN) #elif defined(TQ_WS_WIN)
friend class TQETWidget; friend class TQETWidget;
#endif #endif

@ -59,7 +59,7 @@ class TQ_EXPORT TQSessionManager : public TQObject
public: public:
TQString sessionId() const; TQString sessionId() const;
TQString sessionKey() 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; void* handle() const;
#endif #endif

@ -311,20 +311,20 @@
#endif // Private headers #endif // Private headers
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#include "private/tqttdeintegration_x11_p.h" #include "private/tqttdeintegration_x11_p.h"
#endif #endif
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
#include <qaquastyle.h> #include <qaquastyle.h>
#include <qmacstyle_mac.h> #include <qmacstyle_mac.h>
#endif // Q_WS_MAC #endif // TQ_WS_MAC
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
#include <qwindowsxpstyle.h> #include <qwindowsxpstyle.h>
#endif #endif
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
#include <private/qtextengine_p.h> #include <private/qtextengine_p.h>
#include "qfontmanager_qws.h" #include "qfontmanager_qws.h"
#include <qfontfactorybdf_qws.h> #include <qfontfactorybdf_qws.h>
@ -363,11 +363,11 @@
#include "qwsevent_qws.h" #include "qwsevent_qws.h"
#include <qwindowsystem_qws.h> #include <qwindowsystem_qws.h>
#include <qwswindowsdecoration_qws.h> #include <qwswindowsdecoration_qws.h>
#endif // Q_WS_QWS #endif // TQ_WS_QWS
#ifdef Q_WS_WCE #ifdef TQ_WS_WCE
#include <qpocketpcstyle_wce.h> #include <qpocketpcstyle_wce.h>
#endif // Q_WS_WCE #endif // TQ_WS_WCE
#endif // QT_H #endif // QT_H

@ -52,7 +52,7 @@
#include "ntqsizepolicy.h" #include "ntqsizepolicy.h"
#endif // QT_H #endif // QT_H
#if defined(Q_WS_X11) && !defined(TQT_NO_IM) #if defined(TQ_WS_X11) && !defined(TQT_NO_IM)
class TQInputContext; class TQInputContext;
#endif #endif
@ -336,7 +336,7 @@ public:
bool isUpdatesEnabled() const; bool isUpdatesEnabled() const;
#if 0 //def Q_WS_QWS #if 0 //def TQ_WS_QWS
void repaintUnclipped( const TQRegion &, bool erase = TRUE ); void repaintUnclipped( const TQRegion &, bool erase = TRUE );
#endif #endif
public slots: public slots:
@ -466,17 +466,17 @@ public:
TQWidget *childAt( int x, int y, bool includeThis = FALSE ) const; TQWidget *childAt( int x, int y, bool includeThis = FALSE ) const;
TQWidget *childAt( const TQPoint &, 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; virtual TQGfx * graphicsContext(bool clip_children=TRUE) const;
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
TQRegion clippedRegion(bool do_children=TRUE); TQRegion clippedRegion(bool do_children=TRUE);
uint clippedSerial(bool do_children=TRUE); uint clippedSerial(bool do_children=TRUE);
#ifndef TQMAC_NO_QUARTZ #ifndef TQMAC_NO_QUARTZ
CGContextRef macCGContext(bool clipped=TRUE) const; CGContextRef macCGContext(bool clipped=TRUE) const;
#endif #endif
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
enum X11WindowType { enum X11WindowType {
X11WindowTypeSelect, X11WindowTypeSelect,
X11WindowTypeCombo, X11WindowTypeCombo,
@ -528,16 +528,16 @@ protected:
virtual void showEvent( TQShowEvent * ); virtual void showEvent( TQShowEvent * );
virtual void hideEvent( TQHideEvent * ); virtual void hideEvent( TQHideEvent * );
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
virtual bool macEvent( MSG * ); virtual bool macEvent( MSG * );
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
virtual bool winEvent( MSG * ); virtual bool winEvent( MSG * );
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
virtual bool x11Event( XEvent * ); virtual bool x11Event( XEvent * );
#endif #endif
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
virtual bool qwsEvent( TQWSEvent * ); virtual bool qwsEvent( TQWSEvent * );
virtual unsigned char *scanLine( int ) const; virtual unsigned char *scanLine( int ) const;
virtual int bytesPerLine() const; virtual int bytesPerLine() const;
@ -559,7 +559,7 @@ protected:
int metric( int ) const; int metric( int ) const;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
#if !defined(TQT_NO_IM_EXTENSIONS) #if !defined(TQT_NO_IM_EXTENSIONS)
virtual TQWidget *icHolderWidget(); virtual TQWidget *icHolderWidget();
#else #else
@ -593,7 +593,7 @@ protected:
virtual void setKeyCompression(bool); virtual void setKeyCompression(bool);
virtual void setMicroFocusHint(int x, int y, int w, int h, bool text=TRUE, TQFont *f = 0); 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); void dirtyClippedRegion(bool);
bool isClippedRegionDirty(); bool isClippedRegionDirty();
virtual void setRegionDirty(bool); virtual void setRegionDirty(bool);
@ -602,13 +602,13 @@ protected:
private slots: private slots:
void focusProxyDestroyed(); void focusProxyDestroyed();
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
void destroyInputContext(); void destroyInputContext();
#endif #endif
private: private:
void setFontSys( TQFont *f = 0 ); void setFontSys( TQFont *f = 0 );
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
void createInputContext(); void createInputContext();
void focusInputContext(); void focusInputContext();
void unfocusInputContext(); void unfocusInputContext();
@ -621,7 +621,7 @@ private:
void handleSyncRequest( void* ev ); void handleSyncRequest( void* ev );
#endif #endif
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
uint own_id : 1, macDropEnabled : 1; uint own_id : 1, macDropEnabled : 1;
EventHandlerRef window_event; EventHandlerRef window_event;
//mac event functions //mac event functions
@ -666,7 +666,7 @@ private:
void setBackgroundModeDirect( BackgroundMode ); void setBackgroundModeDirect( BackgroundMode );
void setBackgroundEmpty(); void setBackgroundEmpty();
void updateFrameStrut() const; void updateFrameStrut() const;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
void setBackgroundX11Relative(); void setBackgroundX11Relative();
#endif #endif
@ -696,11 +696,11 @@ private:
#ifndef TQT_NO_LAYOUT #ifndef TQT_NO_LAYOUT
TQLayout *lay_out; TQLayout *lay_out;
#endif #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 TQInputContext *ic; // Input Context
#endif #endif
TQWExtra *extra; TQWExtra *extra;
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
TQRegion req_region; // Requested region TQRegion req_region; // Requested region
mutable TQRegion paintable_region; // Paintable region mutable TQRegion paintable_region; // Paintable region
mutable bool paintable_region_dirty;// needs to be recalculated mutable bool paintable_region_dirty;// needs to be recalculated
@ -984,10 +984,10 @@ inline bool TQWidget::isInputMethodEnabled() const
class TQFocusData; class TQFocusData;
class TQWSManager; class TQWSManager;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
class TQOleDropTarget; class TQOleDropTarget;
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
class TQMacDndExtra; class TQMacDndExtra;
#endif #endif
@ -1002,12 +1002,12 @@ struct TQ_EXPORT TQTLWExtra {
// frame strut // frame strut
ulong fleft, fright, ftop, fbottom; ulong fleft, fright, ftop, fbottom;
uint unused : 8; // not used at this point... 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. uint opacity : 8; // Stores opacity level on Windows/Mac OS X.
#endif #endif
uint savedFlags; // Save widgetflags while showing fullscreen uint savedFlags; // Save widgetflags while showing fullscreen
short basew, baseh; // base sizes short basew, baseh; // base sizes
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
WId parentWinId; // parent window Id (valid after reparenting) WId parentWinId; // parent window Id (valid after reparenting)
uint embedded : 1; // window is embedded in another TQt application uint embedded : 1; // window is embedded in another TQt application
uint spont_unmapped: 1; // window was spontaneously unmapped uint spont_unmapped: 1; // window was spontaneously unmapped
@ -1023,20 +1023,20 @@ struct TQ_EXPORT TQTLWExtra {
uint syncRequestValue[2]; uint syncRequestValue[2];
#endif #endif
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
WindowGroupRef group; WindowGroupRef group;
uint is_moved: 1; uint is_moved: 1;
uint resizer : 4; uint resizer : 4;
#endif #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 TQRegion decor_allocated_region; // decoration allocated region
TQWSManager *qwsManager; TQWSManager *qwsManager;
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
HICON winIcon; // internal Windows icon HICON winIcon; // internal Windows icon
#endif #endif
TQRect normalGeometry; // used by showMin/maximized/FullScreen TQRect normalGeometry; // used by showMin/maximized/FullScreen
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
uint style, exstyle; uint style, exstyle;
#endif #endif
}; };
@ -1055,13 +1055,13 @@ struct TQ_EXPORT TQWExtra {
TQCursor *curs; TQCursor *curs;
#endif #endif
TQTLWExtra *topextra; // only useful for TLWs TQTLWExtra *topextra; // only useful for TLWs
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
TQOleDropTarget *dropTarget; // drop target TQOleDropTarget *dropTarget; // drop target
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
WId xDndProxy; // XDND forwarding to embedded windows WId xDndProxy; // XDND forwarding to embedded windows
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
TQRegion clip_saved, clip_sibs, clip_children; TQRegion clip_saved, clip_sibs, clip_children;
TQMacDndExtra *macDndExtra; TQMacDndExtra *macDndExtra;
TQRegion dirty_area; TQRegion dirty_area;
@ -1071,13 +1071,13 @@ struct TQ_EXPORT TQWExtra {
uint ctx_children_clipped:1; uint ctx_children_clipped:1;
#endif // TQMAC_NO_QUARTZ #endif // TQMAC_NO_QUARTZ
uint has_dirty_area:1; uint has_dirty_area:1;
#endif // Q_WS_MAC #endif // TQ_WS_MAC
uint bg_origin : 2; uint bg_origin : 2;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
uint children_use_dnd : 1; uint children_use_dnd : 1;
uint compress_events : 1; uint compress_events : 1;
#endif #endif
#if defined(Q_WS_QWS) || defined(Q_WS_MAC) #if defined(TQ_WS_QWS) || defined(TQ_WS_MAC)
TQRegion mask; // widget mask TQRegion mask; // widget mask
#endif #endif
char bg_mode; // background mode char bg_mode; // background mode

@ -92,7 +92,7 @@ class TQWidgetListIt;
// Window system dependent definitions // Window system dependent definitions
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
#if QT_MACOSX_VERSION < 0x1020 #if QT_MACOSX_VERSION < 0x1020
typedef struct OpaqueEventLoopTimerRef* EventLoopTimerRef; typedef struct OpaqueEventLoopTimerRef* EventLoopTimerRef;
typedef struct OpaqueMenuHandle *MenuRef; typedef struct OpaqueMenuHandle *MenuRef;
@ -101,7 +101,7 @@ typedef struct __EventLoopTimer* EventLoopTimerRef;
typedef struct OpaqueMenuRef* MenuRef; typedef struct OpaqueMenuRef* MenuRef;
#endif #endif
#ifndef Q_WS_MACX #ifndef TQ_WS_MACX
typedef struct CGContext *CGContextRef; typedef struct CGContext *CGContextRef;
#endif #endif
typedef struct OpaqueWindowGroupRef *WindowGroupRef; typedef struct OpaqueWindowGroupRef *WindowGroupRef;
@ -128,18 +128,18 @@ typedef void * MSG;
typedef int WId; typedef int WId;
typedef struct AEDesc AppleEvent; 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" #include "qwindowdefs_win.h"
#endif // Q_WS_WIN #endif // TQ_WS_WIN
#if defined(Q_OS_TEMP) #if defined(Q_OS_TEMP)
#include "qwinfunctions_wce.h" #include "qwinfunctions_wce.h"
#endif // Q_OS_TEMP #endif // Q_OS_TEMP
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
typedef struct _XDisplay Display; typedef struct _XDisplay Display;
typedef union _XEvent XEvent; 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 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; typedef unsigned long WId;
struct TQWSEvent; struct TQWSEvent;
class TQGfx; class TQGfx;
#endif // Q_WS_QWS #endif // TQ_WS_QWS
class TQApplication; class TQApplication;

@ -205,7 +205,7 @@ bool TQ_EXPORT tqt_tryComposeUnicode( TQWidget* w, TQKeyEvent* e){
return TQAccelManager::self()->tryComposeUnicode( w, e ); return TQAccelManager::self()->tryComposeUnicode( w, e );
} }
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
static bool qt_accel_no_shortcuts = TRUE; static bool qt_accel_no_shortcuts = TRUE;
#else #else
static bool qt_accel_no_shortcuts = FALSE; static bool qt_accel_no_shortcuts = FALSE;

@ -327,7 +327,7 @@ static void qAccessibleCleanup()
qAccessibleManager = 0; qAccessibleManager = 0;
} }
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
TQObject *TQAccessible::queryAccessibleObject(TQAccessibleInterface *o) TQObject *TQAccessible::queryAccessibleObject(TQAccessibleInterface *o)
{ {
if(qAccessibleInterface) { if(qAccessibleInterface) {

@ -60,7 +60,7 @@
#include "ntqmessagebox.h" #include "ntqmessagebox.h"
#include "ntqdir.h" #include "ntqdir.h"
#include "ntqfileinfo.h" #include "ntqfileinfo.h"
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
#include "qinputcontext_p.h" #include "qinputcontext_p.h"
#endif #endif
#include "qfontdata_p.h" #include "qfontdata_p.h"
@ -319,7 +319,7 @@
void tqt_init( int *, char **, TQApplication::Type ); void tqt_init( int *, char **, TQApplication::Type );
void tqt_cleanup(); 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( Display* dpy, TQt::HANDLE, TQt::HANDLE );
void tqt_init( int *, char **, Display* dpy, TQt::HANDLE, TQt::HANDLE ); void tqt_init( int *, char **, Display* dpy, TQt::HANDLE, TQt::HANDLE );
#endif #endif
@ -705,7 +705,7 @@ void TQApplication::process_cmdline( int* argcptr, char ** argv )
} }
if(j < argc) { if(j < argc) {
#ifdef Q_WS_MACX #ifdef TQ_WS_MACX
static char* empty = "\0"; static char* empty = "\0";
argv[j] = empty; argv[j] = empty;
#else #else
@ -816,7 +816,7 @@ TQApplication::TQApplication( int &argc, char **argv )
\code \code
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
bool useGUI = getenv( "DISPLAY" ) != 0; bool useGUI = getenv( "DISPLAY" ) != 0;
#else #else
bool useGUI = TRUE; bool useGUI = TRUE;
@ -864,7 +864,7 @@ TQApplication::TQApplication( int &argc, char **argv, bool GUIenabled )
\code \code
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
bool useGUI = getenv( "DISPLAY" ) != 0; bool useGUI = getenv( "DISPLAY" ) != 0;
#else #else
bool useGUI = TRUE; bool useGUI = TRUE;
@ -943,7 +943,7 @@ TQApplication::Type TQApplication::type() const
return tqt_appType; 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 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 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 #ifdef TQT_THREAD_SUPPORT
TQThread* TQApplication::guiThread() { TQThread* TQApplication::guiThread() {
@ -1366,7 +1366,7 @@ TQStyle& TQApplication::style()
if ( !tqt_is_gui_used ) if ( !tqt_is_gui_used )
tqFatal( "No style available in non-gui applications!" ); tqFatal( "No style available in non-gui applications!" );
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if(!qt_style_override) if(!qt_style_override)
x11_initialize_style(); // run-time search for default style x11_initialize_style(); // run-time search for default style
#endif #endif
@ -1379,22 +1379,22 @@ TQStyle& TQApplication::style()
delete qt_style_override; delete qt_style_override;
qt_style_override = 0; qt_style_override = 0;
} else { } else {
# if defined(Q_WS_WIN) && defined(Q_OS_TEMP) # if defined(TQ_WS_WIN) && defined(Q_OS_TEMP)
style = "PocketPC"; style = "PocketPC";
#elif defined(Q_WS_WIN) #elif defined(TQ_WS_WIN)
if ( qWinVersion() >= TQt::WV_XP && qWinVersion() < TQt::WV_NT_based ) if ( qWinVersion() >= TQt::WV_XP && qWinVersion() < TQt::WV_NT_based )
style = "WindowsXP"; style = "WindowsXP";
else else
style = "Windows"; // default styles for Windows 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 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 style = "SGI"; // default style for X11 on IRIX
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
style = "Motif"; // default style for 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 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 style = "Compact"; // default style for small devices
#endif #endif
} }
@ -1454,9 +1454,9 @@ void TQApplication::setStyle( TQStyle *style )
{ {
TQStyle* old = app_style; TQStyle* old = app_style;
app_style = style; app_style = style;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
tqt_explicit_app_style = TRUE; tqt_explicit_app_style = TRUE;
#endif // Q_WS_X11 #endif // TQ_WS_X11
if ( startingUp() ) { if ( startingUp() ) {
delete old; delete old;
@ -1530,9 +1530,9 @@ void TQApplication::setStyle( TQStyle *style )
*/ */
TQStyle* TQApplication::setStyle( const TQString& style ) TQStyle* TQApplication::setStyle( const TQString& style )
{ {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
tqt_explicit_app_style = TRUE; tqt_explicit_app_style = TRUE;
#endif // Q_WS_X11 #endif // TQ_WS_X11
if ( startingUp() ) { if ( startingUp() ) {
if(qt_style_override) if(qt_style_override)
@ -1695,12 +1695,12 @@ void TQApplication::setGlobalStrut( const TQSize& strut )
app_strut = 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(); extern const char *tqAppFileName();
#endif #endif
#ifndef TQT_NO_DIR #ifndef TQT_NO_DIR
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
static TQString resolveSymlinks( const TQString& path, int depth = 0 ) static TQString resolveSymlinks( const TQString& path, int depth = 0 )
{ {
bool foundLink = FALSE; bool foundLink = FALSE;
@ -1744,7 +1744,7 @@ static TQString resolveSymlinks( const TQString& path, int depth = 0 )
return path; return path;
} }
} }
#endif // Q_WS_WIN #endif // TQ_WS_WIN
/*! /*!
Returns the directory that contains the application executable. Returns the directory that contains the application executable.
@ -1783,7 +1783,7 @@ TQString TQApplication::applicationDirPath()
*/ */
TQString TQApplication::applicationFilePath() TQString TQApplication::applicationFilePath()
{ {
#if defined( Q_WS_WIN ) #if defined( TQ_WS_WIN )
TQFileInfo filePath; TQFileInfo filePath;
QT_WA({ QT_WA({
WCHAR module_name[256]; WCHAR module_name[256];
@ -1796,7 +1796,7 @@ TQString TQApplication::applicationFilePath()
}); });
return filePath.filePath(); return filePath.filePath();
#elif defined( Q_WS_MAC ) #elif defined( TQ_WS_MAC )
return TQDir::cleanDirPath( TQFile::decodeName( tqAppFileName() ) ); return TQDir::cleanDirPath( TQFile::decodeName( tqAppFileName() ) );
#else #else
TQString argv0 = TQFile::decodeName( argv()[0] ); TQString argv0 = TQFile::decodeName( argv()[0] );
@ -1875,7 +1875,7 @@ TQStringList TQApplication::libraryPaths()
app_libpaths = new TQStringList; app_libpaths = new TQStringList;
TQString installPathPlugins = TQString::fromLocal8Bit(tqInstallPathPlugins()); TQString installPathPlugins = TQString::fromLocal8Bit(tqInstallPathPlugins());
if ( TQFile::exists(installPathPlugins) ) { if ( TQFile::exists(installPathPlugins) ) {
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
installPathPlugins.replace('\\', '/'); installPathPlugins.replace('\\', '/');
#endif #endif
app_libpaths->append(installPathPlugins); app_libpaths->append(installPathPlugins);
@ -1884,7 +1884,7 @@ TQStringList TQApplication::libraryPaths()
TQString app_location; TQString app_location;
if (tqApp) if (tqApp)
app_location = tqApp->applicationFilePath(); app_location = tqApp->applicationFilePath();
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
else { else {
app_location = TQString(tqAppFileName()); app_location = TQString(tqAppFileName());
app_location.replace('\\', '/'); app_location.replace('\\', '/');
@ -3105,7 +3105,7 @@ bool TQApplication::hasPendingEvents()
return eventLoop()->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 // 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 ); TQFocusEvent out( TQEvent::FocusOut );
TQWidget *tmp = focus_widget; TQWidget *tmp = focus_widget;
focus_widget = 0; focus_widget = 0;
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
TQInputContext::accept( tmp ); TQInputContext::accept( tmp );
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
tmp->unfocusInputContext(); tmp->unfocusInputContext();
#endif #endif
TQApplication::sendSpontaneousEvent( tmp, &out ); 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 extern TQWidget *tqt_tryModalHelperMac( TQWidget * top ); //qapplication_mac.cpp
#endif #endif
@ -4028,7 +4028,7 @@ TQ_EXPORT bool tqt_tryModalHelper( TQWidget *widget, TQWidget **rettop ) {
if ( tqApp->activePopupWidget() ) if ( tqApp->activePopupWidget() )
return TRUE; return TRUE;
#ifdef Q_WS_MACX #ifdef TQ_WS_MACX
top = tqt_tryModalHelperMac( top ); top = tqt_tryModalHelperMac( top );
if ( rettop ) *rettop = top; if ( rettop ) *rettop = top;
#endif #endif
@ -4808,7 +4808,7 @@ void MyApplication::commitData( TQSessionManager& sm ) {
Stubbed session management support Stubbed session management support
*****************************************************************************/ *****************************************************************************/
#ifndef TQT_NO_SESSIONMANAGER #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 class TQSessionManagerData
{ {
@ -4826,7 +4826,7 @@ TQSessionManager::TQSessionManager( TQApplication * app, TQString &id, TQString
{ {
qt_session_manager_self = this; qt_session_manager_self = this;
d = new TQSessionManagerData; 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]; wchar_t guidstr[40];
GUID guid; GUID guid;
CoCreateGuid( &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 void* TQSessionManager::handle() const
{ {
return 0; return 0;
} }
#endif #endif
#if !defined(Q_WS_WIN) #if !defined(TQ_WS_WIN)
bool TQSessionManager::allowsInteraction() bool TQSessionManager::allowsInteraction()
{ {
return TRUE; return TRUE;

@ -84,7 +84,7 @@ const int QT_TABLET_NPACKETQSIZE = 128;
extern TQt::MacintoshVersion qt_macver; extern TQt::MacintoshVersion qt_macver;
#endif #endif
#if defined (Q_WS_X11) #if defined (TQ_WS_X11)
extern int qt_ncols_option; extern int qt_ncols_option;
#endif #endif

@ -157,7 +157,7 @@ TQClipboard::TQClipboard( TQObject *parent, const char *name )
// nothing // nothing
} }
#ifndef Q_WS_WIN32 #ifndef TQ_WS_WIN32
/*! /*!
\internal \internal

@ -165,7 +165,7 @@
Global colors Global colors
*****************************************************************************/ *****************************************************************************/
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
#define COLOR0_PIX 0x00ffffff #define COLOR0_PIX 0x00ffffff
#define COLOR1_PIX 0 #define COLOR1_PIX 0
#else #else
@ -255,7 +255,7 @@ void TQColor::initGlobalColors()
{ {
globals_init = TRUE; globals_init = TRUE;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
// HACK: we need a way to recognize color0 and color1 uniquely, so // HACK: we need a way to recognize color0 and color1 uniquely, so
// that we can use color0 and color1 with fixed pixel values on // that we can use color0 and color1 with fixed pixel values on
// all screens // all screens
@ -264,7 +264,7 @@ void TQColor::initGlobalColors()
#else #else
stdcol[ 0].d.argb = tqRgb(255,255,255); stdcol[ 0].d.argb = tqRgb(255,255,255);
stdcol[ 1].d.argb = 0; stdcol[ 1].d.argb = 0;
#endif // Q_WS_X11 #endif // TQ_WS_X11
stdcol[ 0].setPixel( COLOR0_PIX ); stdcol[ 0].setPixel( COLOR0_PIX );
stdcol[ 1].setPixel( COLOR1_PIX ); stdcol[ 1].setPixel( COLOR1_PIX );
@ -901,7 +901,7 @@ uint TQColor::pixel() const
if ( isDirty() ) if ( isDirty() )
return ((TQColor*)this)->alloc(); return ((TQColor*)this)->alloc();
else if ( colormodel == d8 ) else if ( colormodel == d8 )
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
// since d.d8.pix is uchar we have to use the PALETTEINDEX // since d.d8.pix is uchar we have to use the PALETTEINDEX
// macro to get the respective palette entry index. // macro to get the respective palette entry index.
return (0x01000000 | (int)(short)(d.d8.pix)); return (0x01000000 | (int)(short)(d.d8.pix));

@ -109,7 +109,7 @@ public:
static const char * const move_xpm[] = { static const char * const move_xpm[] = {
"11 20 3 1", "11 20 3 1",
". c None", ". c None",
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
"a c #000000", "a c #000000",
"X c #FFFFFF", // Windows cursor is traditionally white "X c #FFFFFF", // Windows cursor is traditionally white
#else #else
@ -143,7 +143,7 @@ static const char * const copy_xpm[] = {
". c None", ". c None",
"a c #000000", "a c #000000",
"X c #FFFFFF", "X c #FFFFFF",
#if defined(Q_WS_WIN) // Windows cursor is traditionally white #if defined(TQ_WS_WIN) // Windows cursor is traditionally white
"aa......................", "aa......................",
"aXa.....................", "aXa.....................",
"aXXa....................", "aXXa....................",
@ -203,7 +203,7 @@ static const char * const link_xpm[] = {
". c None", ". c None",
"a c #000000", "a c #000000",
"X c #FFFFFF", "X c #FFFFFF",
#if defined(Q_WS_WIN) // Windows cursor is traditionally white #if defined(TQ_WS_WIN) // Windows cursor is traditionally white
"aa......................", "aa......................",
"aXa.....................", "aXa.....................",
"aXXa....................", "aXXa....................",
@ -271,7 +271,7 @@ TQDragManager::TQDragManager()
pm_cursor[0] = TQPixmap((const char **)move_xpm); pm_cursor[0] = TQPixmap((const char **)move_xpm);
pm_cursor[1] = TQPixmap((const char **)copy_xpm); pm_cursor[1] = TQPixmap((const char **)copy_xpm);
pm_cursor[2] = TQPixmap((const char **)link_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) createCursors(); // Xcursors cache can hold only 8 bitmaps (4 cursors)
#endif #endif
object = 0; object = 0;
@ -840,7 +840,7 @@ TQByteArray TQTextDrag::encodedData(const char* mime) const
if ( !codec ) if ( !codec )
return r; return r;
TQString text( d->txt ); TQString text( d->txt );
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
int index = text.find( TQString::fromLatin1("\r\n"), 0 ); int index = text.find( TQString::fromLatin1("\r\n"), 0 );
while ( index != -1 ) { while ( index != -1 ) {
text.replace( index, 2, TQChar('\n') ); text.replace( index, 2, TQChar('\n') );
@ -850,7 +850,7 @@ TQByteArray TQTextDrag::encodedData(const char* mime) const
r = codec->fromUnicode(text); r = codec->fromUnicode(text);
if (!codec || codec->mibEnum() != 1000) { if (!codec || codec->mibEnum() != 1000) {
// Don't include NUL in size (TQCString::resize() adds NUL) // 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 // This is needed to ensure the \0 isn't lost on Windows 95
if ( qWinVersion() & TQt::WV_DOS_based ) if ( qWinVersion() & TQt::WV_DOS_based )
((TQByteArray&)r).resize(r.length()+1); ((TQByteArray&)r).resize(r.length()+1);
@ -1508,7 +1508,7 @@ TQCString TQUriDrag::localFileToUri(const TQString& filename)
if (TQDir::isRelativePath(r)) if (TQDir::isRelativePath(r))
return TQCString(); return TQCString();
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
bool hasHost = FALSE; bool hasHost = FALSE;
@ -1529,7 +1529,7 @@ TQCString TQUriDrag::localFileToUri(const TQString& filename)
r.insert(0,'/'); r.insert(0,'/');
#endif #endif
#if defined ( Q_WS_X11 ) && 0 #if defined ( TQ_WS_X11 ) && 0
// URL without the hostname is considered to be errorneous by XDnD. // URL without the hostname is considered to be errorneous by XDnD.
// See: http://www.newplanetsoftware.com/xdnd/dragging_files.html // 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. // 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; return file;
bool local = uri[0] != '/' || ( uri[0] != '\0' && uri[1] == '/' ); bool local = uri[0] != '/' || ( uri[0] != '\0' && uri[1] == '/' );
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
// do we have a hostname? // do we have a hostname?
if ( !local && uri[0] == '/' && uri[2] != '/' ) { if ( !local && uri[0] == '/' && uri[2] != '/' ) {
// then move the pointer to after the 'hostname/' part of the uri // then move the pointer to after the 'hostname/' part of the uri
@ -1618,7 +1618,7 @@ TQString TQUriDrag::uriToLocalFile(const char* uri)
} else { } else {
file.insert(0,'/'); file.insert(0,'/');
} }
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
if ( file.length() > 2 && file[0] == '/' && file[2] == '|' ) { if ( file.length() > 2 && file[0] == '/' && file[2] == '|' ) {
file[2] = ':'; file[2] = ':';
file.remove(0,1); file.remove(0,1);
@ -1628,7 +1628,7 @@ TQString TQUriDrag::uriToLocalFile(const char* uri)
// Leave slash as slashes. // Leave slash as slashes.
#endif #endif
} }
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
else { else {
file = uriToUnicodeUri(uri); file = uriToUnicodeUri(uri);
// convert to network path // convert to network path

@ -415,7 +415,7 @@ void TQEventLoop::processEvents( ProcessEventsFlags flags, int maxTime )
\sa awake() \sa awake()
*/ */
#if !defined(Q_WS_X11) #if !defined(TQ_WS_X11)
void TQEventLoop::appStartingUp(){} void TQEventLoop::appStartingUp(){}
void TQEventLoop::appClosingDown(){} void TQEventLoop::appClosingDown(){}
#endif // Q_WS_X11 #endif // TQ_WS_X11

@ -95,10 +95,10 @@ public:
unsigned int exitloop : 1; unsigned int exitloop : 1;
unsigned int shortcut : 1; unsigned int shortcut : 1;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
int xfd; int xfd;
GPollFD x_gPollFD; GPollFD x_gPollFD;
#endif // Q_WS_X11 #endif // TQ_WS_X11
int thread_pipe[2]; int thread_pipe[2];
GPollFD threadPipe_gPollFD; GPollFD threadPipe_gPollFD;

@ -69,9 +69,9 @@ class TQSocketNotifier;
class TQMacSockNotPrivate; class TQMacSockNotPrivate;
#endif #endif
#if defined(Q_OS_UNIX) || defined (Q_WS_WIN) #if defined(Q_OS_UNIX) || defined (TQ_WS_WIN)
#include "ntqptrlist.h" #include "ntqptrlist.h"
#endif // Q_OS_UNIX || Q_WS_WIN #endif // Q_OS_UNIX || TQ_WS_WIN
#if defined(Q_OS_UNIX) #if defined(Q_OS_UNIX)
struct TQSockNot struct TQSockNot
@ -95,12 +95,12 @@ public:
}; };
#endif // Q_OS_UNIX #endif // Q_OS_UNIX
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
struct TQSockNot { struct TQSockNot {
TQSocketNotifier *obj; TQSocketNotifier *obj;
int fd; int fd;
}; };
#endif // Q_WS_WIN #endif // TQ_WS_WIN
class TQEventLoopPrivate class TQEventLoopPrivate
{ {
@ -124,14 +124,14 @@ public:
unsigned int exitloop : 1; unsigned int exitloop : 1;
unsigned int shortcut : 1; unsigned int shortcut : 1;
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
uchar next_select_timer; uchar next_select_timer;
EventLoopTimerRef select_timer; EventLoopTimerRef select_timer;
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
int xfd; int xfd;
#endif // Q_WS_X11 #endif // TQ_WS_X11
#if defined(Q_OS_UNIX) #if defined(Q_OS_UNIX)
int thread_pipe[2]; int thread_pipe[2];
@ -144,10 +144,10 @@ public:
TQSockNotType sn_vec[3]; TQSockNotType sn_vec[3];
#endif #endif
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
// pending socket notifiers list // pending socket notifiers list
TQPtrList<TQSockNot> sn_pending_list; TQPtrList<TQSockNot> sn_pending_list;
#endif // Q_WS_WIN #endif // TQ_WS_WIN
}; };

@ -433,12 +433,12 @@ bool qKillTimer( TQObject *obj )
TQEventLoopPrivate::TQEventLoopPrivate() { TQEventLoopPrivate::TQEventLoopPrivate() {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
xfd = -1; xfd = -1;
x_gPollFD.fd = -1; x_gPollFD.fd = -1;
x_gPollFD.events = 0; x_gPollFD.events = 0;
x_gPollFD.revents = 0; x_gPollFD.revents = 0;
#endif // Q_WS_X11 #endif // TQ_WS_X11
singletoolkit = TRUE; singletoolkit = TRUE;
ctx = 0; ctx = 0;
ctx_is_default = false; ctx_is_default = false;

@ -51,7 +51,7 @@
#include "ntqapplication.h" #include "ntqapplication.h"
#include "ntqcleanuphandler.h" #include "ntqcleanuphandler.h"
#include "ntqstringlist.h" #include "ntqstringlist.h"
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
#include "ntqpaintdevicemetrics.h" #include "ntqpaintdevicemetrics.h"
#endif #endif
@ -121,9 +121,9 @@ bool TQFontDef::operator==( const TQFontDef &other ) const
&& (this_foundry.isEmpty() && (this_foundry.isEmpty()
|| other_foundry.isEmpty() || other_foundry.isEmpty()
|| this_foundry == other_foundry) || this_foundry == other_foundry)
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
&& addStyle == other.addStyle && 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 ), rawMode( FALSE ), underline( FALSE ), overline( FALSE ), strikeOut( FALSE ),
mask( 0 ) mask( 0 )
{ {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
screen = TQPaintDevice::x11AppScreen(); screen = TQPaintDevice::x11AppScreen();
#else #else
screen = 0; screen = 0;
#endif // Q_WS_X11 #endif // TQ_WS_X11
} }
TQFontPrivate::TQFontPrivate( const TQFontPrivate &other ) TQFontPrivate::TQFontPrivate( const TQFontPrivate &other )
@ -208,19 +208,19 @@ void TQFontPrivate::resolve( const TQFontPrivate *other )
TQFontEngineData::TQFontEngineData() TQFontEngineData::TQFontEngineData()
: lineWidth( 1 ) : 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 * ) ); memset( engines, 0, TQFont::LastPrivateScript * sizeof( TQFontEngine * ) );
#else #else
engine = 0; engine = 0;
#endif // Q_WS_X11 || Q_WS_WIN #endif // TQ_WS_X11 || TQ_WS_WIN
#ifndef Q_WS_MAC #ifndef TQ_WS_MAC
memset( widthCache, 0, widthCacheSize*sizeof( uchar ) ); memset( widthCache, 0, widthCacheSize*sizeof( uchar ) );
#endif #endif
} }
TQFontEngineData::~TQFontEngineData() 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++ ) { for ( int i = 0; i < TQFont::LastPrivateScript; i++ ) {
if ( engines[i] ) if ( engines[i] )
engines[i]->deref(); engines[i]->deref();
@ -230,7 +230,7 @@ TQFontEngineData::~TQFontEngineData()
if ( engine ) if ( engine )
engine->deref(); engine->deref();
engine = 0; 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(); detach();
d->request.family = family; d->request.family = family;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
d->request.addStyle = TQString::null; d->request.addStyle = TQString::null;
#endif // Q_WS_X11 #endif // TQ_WS_X11
d->mask |= TQFontPrivate::Family; d->mask |= TQFontPrivate::Family;
} }
@ -1130,9 +1130,9 @@ void TQFont::setStyleHint( StyleHint hint, StyleStrategy strategy )
d->mask |= TQFontPrivate::StyleHint; d->mask |= TQFontPrivate::StyleHint;
d->mask |= TQFontPrivate::StyleStrategy; d->mask |= TQFontPrivate::StyleStrategy;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
d->request.addStyle = TQString::null; d->request.addStyle = TQString::null;
#endif // Q_WS_X11 #endif // TQ_WS_X11
} }
/*! /*!
@ -1386,11 +1386,11 @@ static void initFontSubst()
// default substitutions // default substitutions
static const char *initTbl[] = { static const char *initTbl[] = {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
"arial", "helvetica", "arial", "helvetica",
"helv", "helvetica", "helv", "helvetica",
"tms rmn", "times", "tms rmn", "times",
#elif defined(Q_WS_WIN) #elif defined(TQ_WS_WIN)
"times", "Times New Roman", "times", "Times New Roman",
"courier", "Courier New", "courier", "Courier New",
"helvetica", "Arial", "helvetica", "Arial",
@ -1691,7 +1691,7 @@ bool TQFont::fromString(const TQString &descrip)
return TRUE; return TRUE;
} }
#if !defined( Q_WS_QWS ) #if !defined( TQ_WS_QWS )
/*! \internal /*! \internal
Internal function that dumps font cache statistics. 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 ) { if ( s.version() <= 3 ) {
TQ_INT16 pointSize = (TQ_INT16) font.d->request.pointSize; TQ_INT16 pointSize = (TQ_INT16) font.d->request.pointSize;
if ( pointSize == -1 ) { if ( pointSize == -1 ) {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
pointSize = (TQ_INT16)(font.d->request.pixelSize*720/TQPaintDevice::x11AppDpiY()); pointSize = (TQ_INT16)(font.d->request.pixelSize*720/TQPaintDevice::x11AppDpiY());
#else #else
pointSize = (TQ_INT16)TQFontInfo( font ).pointSize() * 10; 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; d = painter->pfont ? painter->pfont->d : painter->cfont.d;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if ( d->screen != p->scrn ) { if ( d->screen != p->scrn ) {
TQFontPrivate *new_d = new TQFontPrivate( *d ); TQFontPrivate *new_d = new TQFontPrivate( *d );
TQ_CHECK_PTR( new_d ); TQ_CHECK_PTR( new_d );
@ -1934,7 +1934,7 @@ TQFontMetrics::TQFontMetrics( const TQPainter *p )
d->screen = p->scrn; d->screen = p->scrn;
d->count = 1; d->count = 1;
} else } else
#endif // Q_WS_X11 #endif // TQ_WS_X11
d->ref(); d->ref();
} }
@ -2170,7 +2170,7 @@ bool TQFontMetrics::inFont(TQChar ch) const
\sa rightBearing(), minLeftBearing(), width() \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 int TQFontMetrics::leftBearing(TQChar ch) const
{ {
TQFont::Script script; TQFont::Script script;
@ -2190,7 +2190,7 @@ int TQFontMetrics::leftBearing(TQChar ch) const
glyph_metrics_t gi = engine->boundingBox( glyphs[0] ); glyph_metrics_t gi = engine->boundingBox( glyphs[0] );
return gi.x; return gi.x;
} }
#endif // !Q_WS_WIN #endif // !TQ_WS_WIN
/*! \fn int TQFontMetrics::rightBearing(TQChar ch) const /*! \fn int TQFontMetrics::rightBearing(TQChar ch) const
Returns the right bearing of character \a ch in the font. 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() \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 int TQFontMetrics::rightBearing(TQChar ch) const
{ {
TQFont::Script script; TQFont::Script script;
@ -2224,10 +2224,10 @@ int TQFontMetrics::rightBearing(TQChar ch) const
glyph_metrics_t gi = engine->boundingBox( glyphs[0] ); glyph_metrics_t gi = engine->boundingBox( glyphs[0] );
return gi.xoff - gi.x - gi.width; 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 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 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 pos = 0;
int width = 0; int width = 0;
#ifndef Q_WS_MAC #ifndef TQ_WS_MAC
const TQChar *ch = str.unicode(); const TQChar *ch = str.unicode();
while (pos < len) { while (pos < len) {
@ -2287,7 +2287,7 @@ int TQFontMetrics::width( const TQString &str, int len ) const
TQTextEngine layout( str, d ); TQTextEngine layout( str, d );
layout.itemize( TQTextEngine::WidthOnly ); layout.itemize( TQTextEngine::WidthOnly );
width += layout.width( pos, len-pos ); width += layout.width( pos, len-pos );
#ifndef Q_WS_MAC #ifndef TQ_WS_MAC
} }
#endif #endif
return width; return width;
@ -2339,7 +2339,7 @@ int TQFontMetrics::width( const TQString &str, int len ) const
account. account.
*/ */
#ifndef Q_WS_QWS #ifndef TQ_WS_QWS
/*! /*!
Returns the bounding rectangle of the first \a len characters of 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 \a str, which is the set of pixels the text would cover if drawn
@ -2986,7 +2986,7 @@ TQFontCache::~TQFontCache()
instance = 0; instance = 0;
} }
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
void TQFontCache::clear() void TQFontCache::clear()
{ {
{ {
@ -3107,7 +3107,7 @@ void TQFontCache::decreaseCost( uint cost )
cost, total_cost, max_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() void TQFontCache::cleanupPrinterFonts()
{ {
FC_DEBUG( "TQFontCache::cleanupPrinterFonts" ); FC_DEBUG( "TQFontCache::cleanupPrinterFonts" );
@ -3125,7 +3125,7 @@ void TQFontCache::cleanupPrinterFonts()
} }
if( it.data()->count > 0 ) { if( it.data()->count > 0 ) {
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
for(int i = 0; i < TQFont::LastPrivateScript; ++i) { for(int i = 0; i < TQFont::LastPrivateScript; ++i) {
if( it.data()->engines[i] ) { if( it.data()->engines[i] ) {
it.data()->engines[i]->deref(); it.data()->engines[i]->deref();
@ -3209,13 +3209,13 @@ void TQFontCache::timerEvent( TQTimerEvent * )
#ifdef TQFONTCACHE_DEBUG #ifdef TQFONTCACHE_DEBUG
FC_DEBUG( " %p: ref %2d", it.data(), it.data()->count ); 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 // print out all engines
for ( int i = 0; i < TQFont::LastPrivateScript; ++i ) { for ( int i = 0; i < TQFont::LastPrivateScript; ++i ) {
if ( ! it.data()->engines[i] ) continue; if ( ! it.data()->engines[i] ) continue;
FC_DEBUG( " contains %p", it.data()->engines[i] ); 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 #endif // TQFONTCACHE_DEBUG
if ( it.data()->count > 0 ) if ( it.data()->count > 0 )

@ -69,7 +69,7 @@ struct TQFontDef
styleHint( TQFont::AnyStyle ), styleStrategy( TQFont::PreferDefault ), styleHint( TQFont::AnyStyle ), styleStrategy( TQFont::PreferDefault ),
weight( 50 ), italic( FALSE ), fixedPitch( FALSE ), stretch( 100 ), weight( 50 ), italic( FALSE ), fixedPitch( FALSE ), stretch( 100 ),
ignorePitch(TRUE) ignorePitch(TRUE)
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
,fixedPitchComputed(FALSE) ,fixedPitchComputed(FALSE)
#endif #endif
{ {
@ -77,9 +77,9 @@ struct TQFontDef
TQString family; TQString family;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
TQString addStyle; TQString addStyle;
#endif // Q_WS_X11 #endif // TQ_WS_X11
int pointSize; int pointSize;
int pixelSize; int pixelSize;
@ -107,9 +107,9 @@ struct TQFontDef
if ( styleStrategy != other.styleStrategy ) return styleStrategy < other.styleStrategy; if ( styleStrategy != other.styleStrategy ) return styleStrategy < other.styleStrategy;
if ( family != other.family ) return family < other.family; if ( family != other.family ) return family < other.family;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
if ( addStyle != other.addStyle ) return addStyle < other.addStyle; if ( addStyle != other.addStyle ) return addStyle < other.addStyle;
#endif // Q_WS_X11 #endif // TQ_WS_X11
return FALSE; return FALSE;
} }
@ -123,12 +123,12 @@ public:
uint lineWidth; uint lineWidth;
#if defined(Q_WS_X11) || defined(Q_WS_WIN) #if defined(TQ_WS_X11) || defined(TQ_WS_WIN)
TQFontEngine *engines[TQFont::LastPrivateScript]; TQFontEngine *engines[TQFont::LastPrivateScript];
#else #else
TQFontEngine *engine; TQFontEngine *engine;
#endif // Q_WS_X11 || Q_WS_WIN #endif // TQ_WS_X11 || TQ_WS_WIN
#ifndef Q_WS_MAC #ifndef TQ_WS_MAC
enum { widthCacheSize = 0x500 }; enum { widthCacheSize = 0x500 };
uchar widthCache[widthCacheSize]; uchar widthCache[widthCacheSize];
#endif #endif
@ -139,9 +139,9 @@ class TQFontPrivate : public TQShared
{ {
public: public:
static TQFont::Script defaultScript; static TQFont::Script defaultScript;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
static int defaultEncodingID; static int defaultEncodingID;
#endif // Q_WS_X11 #endif // TQ_WS_X11
TQFontPrivate(); TQFontPrivate();
TQFontPrivate( const TQFontPrivate &other ); TQFontPrivate( const TQFontPrivate &other );
@ -151,7 +151,7 @@ public:
TQFontEngine *engineForScript( TQFont::Script script ) const { TQFontEngine *engineForScript( TQFont::Script script ) const {
if ( script == TQFont::NoScript ) if ( script == TQFont::NoScript )
script = TQFontPrivate::defaultScript; 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] ) if ( ! engineData || ! engineData->engines[script] )
((TQFontPrivate *) this)->load( script ); ((TQFontPrivate *) this)->load( script );
return engineData->engines[script]; return engineData->engines[script];
@ -159,7 +159,7 @@ public:
if ( ! engineData || ! engineData->engine ) if ( ! engineData || ! engineData->engine )
((TQFontPrivate *) this)->load( script ); ((TQFontPrivate *) this)->load( script );
return engineData->engine; return engineData->engine;
#endif // Q_WS_X11 || Q_WS_WIN #endif // TQ_WS_X11 || TQ_WS_WIN
} }
TQFontDef request; TQFontDef request;
@ -201,7 +201,7 @@ public:
TQFontCache(); TQFontCache();
~TQFontCache(); ~TQFontCache();
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
void clear(); void clear();
#endif #endif
// universal key structure. TQFontEngineDatas and TQFontEngines are cached using // 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 ) Key( const TQFontDef &d, TQFont::Script c, int s, TQPaintDevice *pdev )
: script(c), screen(s) { : script(c), screen(s) {
def = d; def = d;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
dpi = pdev ? TQPaintDeviceMetrics(pdev).logicalDpiY() : 0; dpi = pdev ? TQPaintDeviceMetrics(pdev).logicalDpiY() : 0;
#else #else
Q_UNUSED(pdev); Q_UNUSED(pdev);
@ -259,7 +259,7 @@ public:
TQFontEngine *findEngine( const Key &key ); TQFontEngine *findEngine( const Key &key );
void insertEngine( const Key &key, TQFontEngine *engine ); 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(); void cleanupPrinterFonts();
#endif #endif

@ -50,7 +50,7 @@
#include <ntqcleanuphandler.h> #include <ntqcleanuphandler.h>
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#include <locale.h> #include <locale.h>
#endif #endif
#include <stdlib.h> #include <stdlib.h>
@ -123,7 +123,7 @@ static int getFontWeight( const TQString &weightString )
return (int) TQFont::Normal; return (int) TQFont::Normal;
} }
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
struct TQtFontEncoding struct TQtFontEncoding
{ {
signed int encoding : 16; signed int encoding : 16;
@ -134,22 +134,22 @@ struct TQtFontEncoding
uint avgwidth : 16; uint avgwidth : 16;
uchar pitch : 8; uchar pitch : 8;
}; };
#endif // Q_WS_X11 #endif // TQ_WS_X11
struct TQtFontSize struct TQtFontSize
{ {
unsigned short pixelSize; unsigned short pixelSize;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
int count; int count;
TQtFontEncoding *encodings; TQtFontEncoding *encodings;
TQtFontEncoding *encodingID( int id, uint xpoint = 0, uint xres = 0, TQtFontEncoding *encodingID( int id, uint xpoint = 0, uint xres = 0,
uint yres = 0, uint avgwidth = 0, bool add = FALSE); 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, TQtFontEncoding *TQtFontSize::encodingID( int id, uint xpoint, uint xres,
uint yres, uint avgwidth, bool add ) uint yres, uint avgwidth, bool add )
{ {
@ -173,7 +173,7 @@ TQtFontEncoding *TQtFontSize::encodingID( int id, uint xpoint, uint xres,
encodings[count].pitch = '*'; encodings[count].pitch = '*';
return encodings + count++; return encodings + count++;
} }
#endif // Q_WS_X11 #endif // TQ_WS_X11
struct TQtFontStyle struct TQtFontStyle
{ {
@ -208,13 +208,13 @@ struct TQtFontStyle
: key( k ), bitmapScalable( FALSE ), smoothScalable( FALSE ), : key( k ), bitmapScalable( FALSE ), smoothScalable( FALSE ),
fakeOblique( FALSE ), count( 0 ), pixelSizes( 0 ) fakeOblique( FALSE ), count( 0 ), pixelSizes( 0 )
{ {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
weightName = setwidthName = 0; weightName = setwidthName = 0;
#endif // Q_WS_X11 #endif // TQ_WS_X11
} }
~TQtFontStyle() { ~TQtFontStyle() {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
delete [] weightName; delete [] weightName;
delete [] setwidthName; delete [] setwidthName;
while ( count-- ) while ( count-- )
@ -230,10 +230,10 @@ struct TQtFontStyle
int count : 29; int count : 29;
TQtFontSize *pixelSizes; TQtFontSize *pixelSizes;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
const char *weightName; const char *weightName;
const char *setwidthName; const char *setwidthName;
#endif // Q_WS_X11 #endif // TQ_WS_X11
TQtFontSize *pixelSize( unsigned short size, bool = FALSE ); TQtFontSize *pixelSize( unsigned short size, bool = FALSE );
}; };
@ -263,7 +263,7 @@ TQtFontSize *TQtFontStyle::pixelSize( unsigned short size, bool add )
realloc( pixelSizes, realloc( pixelSizes,
(((count+8) >> 3 ) << 3) * sizeof(TQtFontSize) ); (((count+8) >> 3 ) << 3) * sizeof(TQtFontSize) );
pixelSizes[count].pixelSize = size; pixelSizes[count].pixelSize = size;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
pixelSizes[count].count = 0; pixelSizes[count].count = 0;
pixelSizes[count].encodings = 0; pixelSizes[count].encodings = 0;
#endif #endif
@ -326,12 +326,12 @@ struct TQtFontFamily
TQtFontFamily(const TQString &n ) TQtFontFamily(const TQString &n )
: :
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
fixedPitch( TRUE ), hasXft( FALSE ), xftScriptCheck( FALSE ), xlfdLoaded( FALSE ), synthetic(FALSE), fixedPitch( TRUE ), hasXft( FALSE ), xftScriptCheck( FALSE ), xlfdLoaded( FALSE ), synthetic(FALSE),
#else #else
fixedPitch( FALSE ), fixedPitch( FALSE ),
#endif #endif
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
scriptCheck( FALSE ), scriptCheck( FALSE ),
#endif #endif
#if defined(Q_OS_MAC) && !defined(TQWS) #if defined(Q_OS_MAC) && !defined(TQWS)
@ -348,13 +348,13 @@ struct TQtFontFamily
} }
bool fixedPitch : 1; bool fixedPitch : 1;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
bool hasXft : 1; bool hasXft : 1;
bool xftScriptCheck : 1; bool xftScriptCheck : 1;
bool xlfdLoaded : 1; bool xlfdLoaded : 1;
bool synthetic : 1; bool synthetic : 1;
#endif #endif
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
bool scriptCheck : 1; bool scriptCheck : 1;
#endif #endif
#if defined(Q_OS_MAC) && !defined(TQWS) #if defined(Q_OS_MAC) && !defined(TQWS)
@ -363,14 +363,14 @@ struct TQtFontFamily
bool fullyLoaded : 1; bool fullyLoaded : 1;
TQString name; TQString name;
TQString rawName; TQString rawName;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
TQCString fontFilename; TQCString fontFilename;
int fontFileIndex; int fontFileIndex;
#endif #endif
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
FMFontFamily macFamily; FMFontFamily macFamily;
#endif #endif
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
TQString english_name; TQString english_name;
#endif #endif
int count; 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] = static const unsigned short sample_chars[TQFont::LastPrivateScript][14] =
{ {
// European Alphabetic Scripts // European Alphabetic Scripts
@ -601,7 +601,7 @@ static const unsigned short sample_chars[TQFont::LastPrivateScript][14] =
// Taiwan would be 0x201C, 0x3002, 0x4E00, 0x9F98, 0xFFE5 // 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) static inline bool requiresOpenType(TQFont::Script s)
{ {
return (s >= TQFont::Syriac && s <= TQFont::Sinhala) return (s >= TQFont::Syriac && s <= TQFont::Sinhala)
@ -631,7 +631,7 @@ static inline bool canRender( TQFontEngine *fe, TQFont::Script script )
} }
++i; ++i;
} }
#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) #if defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
if (hasChar && requiresOpenType(script)) { if (hasChar && requiresOpenType(script)) {
TQOpenType *ot = fe->openType(); TQOpenType *ot = fe->openType();
if (!ot || !ot->supportsScript(script)) if (!ot || !ot->supportsScript(script))
@ -641,20 +641,20 @@ static inline bool canRender( TQFontEngine *fe, TQFont::Script script )
return hasChar; return hasChar;
} }
#endif // Q_WS_X11 || Q_WS_WIN #endif // TQ_WS_X11 || TQ_WS_WIN
static TQSingleCleanupHandler<TQFontDatabasePrivate> qfontdatabase_cleanup; static TQSingleCleanupHandler<TQFontDatabasePrivate> qfontdatabase_cleanup;
static TQFontDatabasePrivate *db=0; static TQFontDatabasePrivate *db=0;
#define SMOOTH_SCALABLE 0xffff #define SMOOTH_SCALABLE 0xffff
#if defined( Q_WS_X11 ) #if defined( TQ_WS_X11 )
# include "qfontdatabase_x11.cpp" # include "qfontdatabase_x11.cpp"
#elif defined( Q_WS_MAC ) #elif defined( TQ_WS_MAC )
# include "qfontdatabase_mac.cpp" # include "qfontdatabase_mac.cpp"
#elif defined( Q_WS_WIN ) #elif defined( TQ_WS_WIN )
# include "qfontdatabase_win.cpp" # include "qfontdatabase_win.cpp"
#elif defined( Q_WS_QWS ) #elif defined( TQ_WS_QWS )
# include "qfontdatabase_qws.cpp" # include "qfontdatabase_qws.cpp"
#endif #endif
@ -696,7 +696,7 @@ static TQtFontStyle *bestStyle(TQtFontFoundry *foundry, const TQtFontStyle::Key
return foundry->styles[best]; return foundry->styles[best];
} }
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
static TQtFontEncoding *findEncoding(TQFont::Script script, int styleStrategy, static TQtFontEncoding *findEncoding(TQFont::Script script, int styleStrategy,
TQtFontSize *size, int force_encoding_id) TQtFontSize *size, int force_encoding_id)
{ {
@ -733,17 +733,17 @@ static TQtFontEncoding *findEncoding(TQFont::Script script, int styleStrategy,
return encoding; 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 static
unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleStrategy, unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleStrategy,
const TQtFontFamily *family, const TQString &foundry_name, const TQtFontFamily *family, const TQString &foundry_name,
TQtFontStyle::Key styleKey, int pixelSize, char pitch, TQtFontStyle::Key styleKey, int pixelSize, char pitch,
TQtFontFoundry **best_foundry, TQtFontStyle **best_style, TQtFontFoundry **best_foundry, TQtFontStyle **best_style,
TQtFontSize **best_size TQtFontSize **best_size
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
, TQtFontEncoding **best_encoding, int force_encoding_id , TQtFontEncoding **best_encoding, int force_encoding_id
#endif #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; TQtFontEncoding *encoding = 0;
#endif #endif
@ -807,7 +807,7 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt
if (! size) { if (! size) {
unsigned int distance = ~0u; unsigned int distance = ~0u;
for (int x = 0; x < style->count; ++x) { for (int x = 0; x < style->count; ++x) {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
encoding = encoding =
findEncoding(script, styleStrategy, style->pixelSizes + x, force_encoding_id); findEncoding(script, styleStrategy, style->pixelSizes + x, force_encoding_id);
if (!encoding) { 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) { if (size) {
encoding = findEncoding(script, styleStrategy, size, force_encoding_id); encoding = findEncoding(script, styleStrategy, size, force_encoding_id);
if (!encoding) size = 0; 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" ); FM_DEBUG( " foundry doesn't support the script we want" );
continue; continue;
} }
#endif // Q_WS_X11 #endif // TQ_WS_X11
unsigned int this_score = 0x0000; unsigned int this_score = 0x0000;
enum { enum {
@ -861,7 +861,7 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt
XLFDPenalty = 0x0001 XLFDPenalty = 0x0001
}; };
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
if ( encoding->encoding != -1 ) { if ( encoding->encoding != -1 ) {
this_score += XLFDPenalty; this_score += XLFDPenalty;
if ( encoding->encoding != TQFontPrivate::defaultEncodingID ) if ( encoding->encoding != TQFontPrivate::defaultEncodingID )
@ -896,9 +896,9 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt
*best_foundry = foundry; *best_foundry = foundry;
*best_style = style; *best_style = style;
*best_size = size; *best_size = size;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
*best_encoding = encoding; *best_encoding = encoding;
#endif // Q_WS_X11 #endif // TQ_WS_X11
} else { } else {
FM_DEBUG( " score %x no better than best %x", this_score, score); 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, TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
const TQFontDef &request, int force_encoding_id ) const TQFontDef &request, int force_encoding_id )
{ {
#ifndef Q_WS_X11 #ifndef TQ_WS_X11
Q_UNUSED( force_encoding_id ); Q_UNUSED( force_encoding_id );
#endif #endif
@ -925,7 +925,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
if ( fp ) { if ( fp ) {
if ( fp->rawMode ) { if ( fp->rawMode ) {
fe = loadEngine( script, fp, request, 0, 0, 0 fe = loadEngine( script, fp, request, 0, 0, 0
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
, 0, 0, FALSE , 0, 0, FALSE
#endif #endif
); );
@ -936,7 +936,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
} }
TQFontCache::Key key( request, script, TQFontCache::Key key( request, script,
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
(int)fp->paintdevice, (int)fp->paintdevice,
#else #else
fp->screen, fp->screen,
@ -947,7 +947,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
if ( fe ) return fe; if ( fe ) return fe;
} }
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
if (request.styleStrategy & TQFont::PreferDevice) { if (request.styleStrategy & TQFont::PreferDevice) {
TQFontEngine *fe = loadEngine(script, fp, request, 0, 0, 0); TQFontEngine *fe = loadEngine(script, fp, request, 0, 0, 0);
if(fe) if(fe)
@ -964,7 +964,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
parseFontName( request.family, foundry_name, family_name ); parseFontName( request.family, foundry_name, family_name );
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
if (script == TQFont::Han) { if (script == TQFont::Han) {
// modify script according to locale // modify script according to locale
static TQFont::Script defaultHan; static TQFont::Script defaultHan;
@ -1013,9 +1013,9 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
TQtFontFoundry *best_foundry = 0; TQtFontFoundry *best_foundry = 0;
TQtFontStyle *best_style = 0; TQtFontStyle *best_style = 0;
TQtFontSize *best_size = 0; TQtFontSize *best_size = 0;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
TQtFontEncoding *best_encoding = 0; TQtFontEncoding *best_encoding = 0;
#endif // Q_WS_X11 #endif // TQ_WS_X11
unsigned int score = ~0; unsigned int score = ~0;
@ -1023,14 +1023,14 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
for ( int x = 0; x < db->count; ++x ) { for ( int x = 0; x < db->count; ++x ) {
TQtFontFamily *try_family = db->families[x]; TQtFontFamily *try_family = db->families[x];
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
if (try_family->synthetic) // skip generated fontconfig fonts if (try_family->synthetic) // skip generated fontconfig fonts
continue; continue;
#endif #endif
if ( !family_name.isEmpty() && if ( !family_name.isEmpty() &&
ucstricmp( try_family->name, family_name ) != 0 ucstricmp( try_family->name, family_name ) != 0
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
&& ucstricmp( try_family->english_name, family_name ) != 0 && ucstricmp( try_family->english_name, family_name ) != 0
#endif #endif
) )
@ -1044,7 +1044,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
if ( ! ( try_family->scripts[script] & TQtFontFamily::Supported ) if ( ! ( try_family->scripts[script] & TQtFontFamily::Supported )
&& script != TQFont::Unicode) { && script != TQFont::Unicode) {
// family not supported in the script we want // 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 if (script >= TQFont::Han_Japanese && script <= TQFont::Han_Korean
&& try_family->scripts[TQFont::Han] == TQtFontFamily::Supported) { && try_family->scripts[TQFont::Han] == TQtFontFamily::Supported) {
// try with the han script instead, give it a penalty // 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; TQtFontFoundry *try_foundry = 0;
TQtFontStyle *try_style = 0; TQtFontStyle *try_style = 0;
TQtFontSize *try_size = 0; TQtFontSize *try_size = 0;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
TQtFontEncoding *try_encoding = 0; TQtFontEncoding *try_encoding = 0;
#endif // Q_WS_X11 #endif // TQ_WS_X11
// as we know the script is supported, we can be sure // as we know the script is supported, we can be sure
// to find a matching font here. // to find a matching font here.
@ -1091,7 +1091,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
bestFoundry( override_script, score, request.styleStrategy, bestFoundry( override_script, score, request.styleStrategy,
try_family, foundry_name, styleKey, request.pixelSize, pitch, try_family, foundry_name, styleKey, request.pixelSize, pitch,
&try_foundry, &try_style, &try_size &try_foundry, &try_style, &try_size
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
, &try_encoding, force_encoding_id , &try_encoding, force_encoding_id
#endif #endif
); );
@ -1101,7 +1101,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
newscore = bestFoundry( override_script, score, request.styleStrategy, try_family, newscore = bestFoundry( override_script, score, request.styleStrategy, try_family,
TQString::null, styleKey, request.pixelSize, TQString::null, styleKey, request.pixelSize,
pitch, &try_foundry, &try_style, &try_size pitch, &try_foundry, &try_style, &try_size
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
, &try_encoding, force_encoding_id , &try_encoding, force_encoding_id
#endif #endif
); );
@ -1114,16 +1114,16 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
best_foundry = try_foundry; best_foundry = try_foundry;
best_style = try_style; best_style = try_style;
best_size = try_size; best_size = try_size;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
best_encoding = try_encoding; best_encoding = try_encoding;
#endif // Q_WS_X11 #endif // TQ_WS_X11
} }
if ( newscore < 10 ) // xlfd instead of xft... just accept it if ( newscore < 10 ) // xlfd instead of xft... just accept it
break; break;
} }
if ( best_family != 0 && best_foundry != 0 && best_style != 0 if ( best_family != 0 && best_foundry != 0 && best_style != 0
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
&& best_size != 0 && best_encoding != 0 && best_size != 0 && best_encoding != 0
#endif #endif
) { ) {
@ -1138,7 +1138,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
best_foundry->name.isEmpty() ? "-- none --" : best_foundry->name.latin1(), best_foundry->name.isEmpty() ? "-- none --" : best_foundry->name.latin1(),
best_style->key.weight, best_style->key.italic, best_style->key.oblique, best_style->key.weight, best_style->key.italic, best_style->key.oblique,
best_style->key.stretch, best_size ? best_size->pixelSize : 0xffff, best_style->key.stretch, best_size ? best_size->pixelSize : 0xffff,
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
best_encoding->pitch, best_encoding->encoding best_encoding->pitch, best_encoding->encoding
#else #else
'p', 0 '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 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 ) , best_size, best_encoding, ( force_encoding_id >= 0 )
#endif #endif
); );
@ -1191,7 +1191,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
def.family = def.family.left(def.family.find(',')); def.family = def.family.left(def.family.find(','));
} }
TQFontCache::Key key( def, script, TQFontCache::Key key( def, script,
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
(int)fp->paintdevice, (int)fp->paintdevice,
#else #else
fp->screen, fp->screen,
@ -1224,7 +1224,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
if ( fp ) { if ( fp ) {
TQFontCache::Key key( request, script, TQFontCache::Key key( request, script,
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
(int)fp->paintdevice, (int)fp->paintdevice,
#else #else
fp->screen, fp->screen,
@ -1236,10 +1236,10 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
} }
if ( fp ) { if ( fp ) {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
fe->fontDef.pointSize = fe->fontDef.pointSize =
tqRound(10. * qt_pointSize(fe->fontDef.pixelSize, fp->paintdevice, fp->screen)); 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 / fe->fontDef.pointSize = int( double( fe->fontDef.pixelSize ) * 720.0 /
GetDeviceCaps(shared_dc,LOGPIXELSY) ); GetDeviceCaps(shared_dc,LOGPIXELSY) );
#else #else
@ -1252,7 +1252,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
return fe; 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<int> TQFontDatabase::pointSizes( const TQString &family, TQValueList<int> TQFontDatabase::pointSizes( const TQString &family,
const TQString &style) const TQString &style)
{ {
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
// windows and macosx are always smoothly scalable // windows and macosx are always smoothly scalable
Q_UNUSED( family ); Q_UNUSED( family );
Q_UNUSED( style ); Q_UNUSED( style );
@ -1725,7 +1725,7 @@ TQValueList<int> TQFontDatabase::pointSizes( const TQString &family,
const TQtFontSize *size = style->pixelSizes + l; const TQtFontSize *size = style->pixelSizes + l;
if (size->pixelSize != 0 && size->pixelSize != USHRT_MAX) { 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)); const uint pointSize = tqRound(qt_pointSize(size->pixelSize, 0, -1));
#else #else
const uint pointSize = size->pixelSize; // embedded uses 72dpi const uint pointSize = size->pixelSize; // embedded uses 72dpi
@ -1792,7 +1792,7 @@ TQFont TQFontDatabase::font( const TQString &family, const TQString &style,
TQValueList<int> TQFontDatabase::smoothSizes( const TQString &family, TQValueList<int> TQFontDatabase::smoothSizes( const TQString &family,
const TQString &style) const TQString &style)
{ {
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
Q_UNUSED( family ); Q_UNUSED( family );
Q_UNUSED( style ); Q_UNUSED( style );
return TQFontDatabase::standardSizes(); return TQFontDatabase::standardSizes();
@ -1826,7 +1826,7 @@ TQValueList<int> TQFontDatabase::smoothSizes( const TQString &family,
const TQtFontSize *size = style->pixelSizes + l; const TQtFontSize *size = style->pixelSizes + l;
if ( size->pixelSize != 0 && size->pixelSize != USHRT_MAX ) { 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)); const uint pointSize = tqRound(qt_pointSize(size->pixelSize, 0, -1));
#else #else
const uint pointSize = size->pixelSize; // embedded uses 72dpi const uint pointSize = size->pixelSize; // embedded uses 72dpi

@ -41,7 +41,7 @@
#include "ntqglobal.h" #include "ntqglobal.h"
#endif // QT_H #endif // QT_H
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
#include "qt_windows.h" #include "qt_windows.h"
#include "ntqptrdict.h" #include "ntqptrdict.h"
#endif #endif
@ -58,7 +58,7 @@ typedef int advance_t;
class TQOpenType; class TQOpenType;
struct TransformedFont; 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 class TQFontEngine : public TQShared
{ {
public: public:
@ -87,7 +87,7 @@ public:
TQFontEngine() { TQFontEngine() {
count = 0; cache_count = 0; count = 0; cache_count = 0;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
transformed_fonts = 0; transformed_fonts = 0;
#endif #endif
} }
@ -97,7 +97,7 @@ public:
virtual Error stringToCMap( const TQChar *str, int len, glyph_t *glyphs, virtual Error stringToCMap( const TQChar *str, int len, glyph_t *glyphs,
advance_t *advances, int *nglyphs, bool mirrored ) const = 0; advance_t *advances, int *nglyphs, bool mirrored ) const = 0;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
virtual int cmap() const { return -1; } virtual int cmap() const { return -1; }
virtual TQOpenType *openType() const { return 0; } virtual TQOpenType *openType() const { return 0; }
#endif #endif
@ -133,7 +133,7 @@ public:
uint cache_cost; // amount of mem used in kb by the font uint cache_cost; // amount of mem used in kb by the font
int cache_count; int cache_count;
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
HDC dc() const; HDC dc() const;
void getGlyphIndexes( const TQChar *ch, int numChars, glyph_t *glyphs, bool mirrored ) const; void getGlyphIndexes( const TQChar *ch, int numChars, glyph_t *glyphs, bool mirrored ) const;
void getCMap(); void getCMap();
@ -157,12 +157,12 @@ public:
static TQPtrDict<TQFontEngine> cacheDict; static TQPtrDict<TQFontEngine> cacheDict;
short lbearing; short lbearing;
short rbearing; short rbearing;
#endif // Q_WS_WIN #endif // TQ_WS_WIN
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
TransformedFont *transformed_fonts; TransformedFont *transformed_fonts;
#endif #endif
}; };
#elif defined( Q_WS_QWS ) #elif defined( TQ_WS_QWS )
class TQGfx; class TQGfx;
class TQFontEngine : public TQShared class TQFontEngine : public TQShared
@ -248,7 +248,7 @@ enum IndicFeatures {
HalantFeature HalantFeature
}; };
#if defined(Q_WS_X11) || defined(Q_WS_WIN) #if defined(TQ_WS_X11) || defined(TQ_WS_WIN)
class TQFontEngineBox : public TQFontEngine class TQFontEngineBox : public TQFontEngine
{ {
public: public:
@ -270,7 +270,7 @@ public:
int minLeftBearing() const { return 0; } int minLeftBearing() const { return 0; }
int minRightBearing() const { return 0; } int minRightBearing() const { return 0; }
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
int cmap() const; int cmap() const;
#endif #endif
const char *name() const; const char *name() const;
@ -286,7 +286,7 @@ private:
}; };
#endif #endif
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#include "qt_x11_p.h" #include "qt_x11_p.h"
@ -527,7 +527,7 @@ private:
#endif // TQT_NO_XFTFREETYPE #endif // TQT_NO_XFTFREETYPE
#elif defined( Q_WS_MAC ) #elif defined( TQ_WS_MAC )
#include "qt_mac.h" #include "qt_mac.h"
#include <ntqmap.h> #include <ntqmap.h>
#include <ntqcache.h> #include <ntqcache.h>
@ -584,7 +584,7 @@ public:
TQPaintDevice *dev=NULL, const TQRegion *rgn=NULL) const; TQPaintDevice *dev=NULL, const TQRegion *rgn=NULL) const;
}; };
#elif defined( Q_WS_WIN ) #elif defined( TQ_WS_WIN )
class TQFontEngineWin : public TQFontEngine class TQFontEngineWin : public TQFontEngine
{ {
@ -627,6 +627,6 @@ public:
}; };
#endif #endif
#endif // Q_WS_WIN #endif // TQ_WS_WIN
#endif #endif

@ -2610,14 +2610,14 @@ bool TQOpenType::shape(TQShaperItem *item, const unsigned int *properties)
bool TQOpenType::positionAndAdd(TQShaperItem *item, bool doLogClusters) bool TQOpenType::positionAndAdd(TQShaperItem *item, bool doLogClusters)
{ {
if (gpos) { if (gpos) {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
Q_ASSERT(fontEngine->type() == TQFontEngine::Xft); Q_ASSERT(fontEngine->type() == TQFontEngine::Xft);
face = lockFTFace(static_cast<TQFontEngineXft *>(fontEngine)->font()); face = lockFTFace(static_cast<TQFontEngineXft *>(fontEngine)->font());
#endif #endif
memset(otl_buffer->positions, 0, otl_buffer->in_length*sizeof(OTL_PositionRec)); memset(otl_buffer->positions, 0, otl_buffer->in_length*sizeof(OTL_PositionRec));
// #### check that passing "FALSE,FALSE" is correct // #### check that passing "FALSE,FALSE" is correct
TT_GPOS_Apply_String(face, gpos, loadFlags, otl_buffer, FALSE, FALSE); TT_GPOS_Apply_String(face, gpos, loadFlags, otl_buffer, FALSE, FALSE);
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
unlockFTFace(static_cast<TQFontEngineXft *>(fontEngine)->font()); unlockFTFace(static_cast<TQFontEngineXft *>(fontEngine)->font());
#endif #endif
} }

@ -59,12 +59,12 @@
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
#include "qgfx_qws.h" #include "qgfx_qws.h"
#endif #endif
// 16bpp images on supported on TQt/Embedded // 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 #define TQT_NO_IMAGE_16_BIT
#endif #endif
@ -510,7 +510,7 @@ TQImage::TQImage( uchar* yourdata, int w, int h, int depth,
data->bitordr = bitOrder; data->bitordr = bitOrder;
} }
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
/*! /*!
Constructs an image that uses an existing memory buffer. The 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->bits = jt;
data->bitordr = bitOrder; data->bitordr = bitOrder;
} }
#endif // Q_WS_QWS #endif // TQ_WS_QWS
/*! /*!
Destroys the image and cleans up. Destroys the image and cleans up.
@ -666,7 +666,7 @@ TQImage TQImage::copy() const
} else { } else {
TQImage image; TQImage image;
image.create( width(), height(), depth(), numColors(), bitOrder() ); image.create( width(), height(), depth(), numColors(), bitOrder() );
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
// TQt/Embedded can create images with non-default bpl // TQt/Embedded can create images with non-default bpl
// make sure we don't crash. // make sure we don't crash.
if ( image.numBytes() != numBytes() ) if ( image.numBytes() != numBytes() )
@ -1098,7 +1098,7 @@ TQImage::Endian TQImage::systemByteOrder()
} }
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
#include <X11/Xlib.h> // needed for systemBitOrder #include <X11/Xlib.h> // needed for systemBitOrder
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/Xos.h> #include <X11/Xos.h>
@ -1129,7 +1129,7 @@ TQImage::Endian TQImage::systemByteOrder()
TQImage::Endian TQImage::systemBitOrder() TQImage::Endian TQImage::systemBitOrder()
{ {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
return BitmapBitOrder(tqt_xdisplay()) == MSBFirst ? BigEndian :LittleEndian; return BitmapBitOrder(tqt_xdisplay()) == MSBFirst ? BigEndian :LittleEndian;
#else #else
return BigEndian; return BigEndian;
@ -1279,7 +1279,7 @@ bool TQImage::create( int width, int height, int depth, int numColors,
return FALSE; return FALSE;
} }
// TQt/Embedded doesn't waste memory on unnecessary padding. // 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 bpl = (width*depth+7)/8; // bytes per scanline
const int pad = 0; const int pad = 0;
#else #else
@ -4745,7 +4745,7 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image )
d->at( startpos + offset ); // start of image data d->at( startpos + offset ); // start of image data
int bpl = image.bytesPerLine(); 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 // Guess the number of bytes-per-line if we don't know how much
// image data is in the file (bogus image ?). // 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 ) { while ( --h >= 0 ) {
if ( d->readBlock((char*)line[h],bpl) != bpl ) if ( d->readBlock((char*)line[h],bpl) != bpl )
break; break;
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
if ( pad > 0 ) if ( pad > 0 )
d->at(d->at()+pad); d->at(d->at()+pad);
#endif #endif
@ -4911,7 +4911,7 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image )
while ( --h >= 0 ) { while ( --h >= 0 ) {
if ( d->readBlock((char *)line[h],bpl) != bpl ) if ( d->readBlock((char *)line[h],bpl) != bpl )
break; break;
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
if ( pad > 0 ) if ( pad > 0 )
d->at(d->at()+pad); d->at(d->at()+pad);
#endif #endif
@ -4989,7 +4989,7 @@ bool qt_write_dib( TQDataStream& s, TQImage image )
} else if ( image.depth() == 32 ) { } else if ( image.depth() == 32 ) {
bpl_bmp = ((image.width()*24+31)/32)*4; bpl_bmp = ((image.width()*24+31)/32)*4;
nbits = 24; nbits = 24;
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
} else if ( image.depth() == 1 || image.depth() == 8 ) { } else if ( image.depth() == 1 || image.depth() == 8 ) {
// TQt/E doesn't word align. // TQt/E doesn't word align.
bpl_bmp = ((image.width()*image.depth()+31)/32)*4; bpl_bmp = ((image.width()*image.depth()+31)/32)*4;
@ -5035,14 +5035,14 @@ bool qt_write_dib( TQDataStream& s, TQImage image )
int y; int y;
if ( nbits == 1 || nbits == 8 ) { // direct output if ( nbits == 1 || nbits == 8 ) { // direct output
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
// TQt/E doesn't word align. // TQt/E doesn't word align.
int pad = bpl_bmp - bpl; int pad = bpl_bmp - bpl;
char padding[4]; char padding[4];
#endif #endif
for ( y=image.height()-1; y>=0; y-- ) { for ( y=image.height()-1; y>=0; y-- ) {
d->writeBlock( (char*)image.scanLine(y), bpl ); d->writeBlock( (char*)image.scanLine(y), bpl );
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
d->writeBlock( padding, pad ); d->writeBlock( padding, pad );
#endif #endif
} }
@ -6500,7 +6500,7 @@ void TQImage::setText(const char* key, const char* lang, const TQString& s)
#endif // TQT_NO_IMAGE_TEXT #endif // TQT_NO_IMAGE_TEXT
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
/*! /*!
\internal \internal
*/ */

@ -313,7 +313,7 @@ TQInputContext::~TQInputContext()
delete d; delete d;
} }
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
/*! /*!
\internal \internal
Returns the owner of this input context. Ordinary input methods Returns the owner of this input context. Ordinary input methods
@ -416,7 +416,7 @@ void TQInputContext::releaseComposingWidget( TQWidget *w )
d->hasFocus = FALSE; d->hasFocus = FALSE;
} }
} }
#endif // Q_WS_X11 #endif // TQ_WS_X11
/*! /*!
\internal \internal
@ -518,9 +518,9 @@ void TQInputContext::sendIMEventInternal( TQEvent::Type type,
TQObject *receiver = 0; TQObject *receiver = 0;
TQIMEvent *event = 0; TQIMEvent *event = 0;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
receiver = d->composingWidget; receiver = d->composingWidget;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
// just a placeholder // just a placeholder
#endif #endif
if ( ! receiver ) if ( ! receiver )
@ -597,7 +597,7 @@ void TQInputContext::sendIMEventInternal( TQEvent::Type type,
void TQInputContext::sendIMEvent( TQEvent::Type type, const TQString &text, void TQInputContext::sendIMEvent( TQEvent::Type type, const TQString &text,
int cursorPosition, int selLength ) int cursorPosition, int selLength )
{ {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if ( !focusWidget() ) if ( !focusWidget() )
return; return;
#endif #endif

@ -60,24 +60,24 @@ class TQFont;
class TQString; class TQString;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#include "ntqmemarray.h" #include "ntqmemarray.h"
#include "ntqwindowdefs.h" #include "ntqwindowdefs.h"
#include "qt_x11_p.h" #include "qt_x11_p.h"
#endif #endif
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
#include "qt_windows.h" #include "qt_windows.h"
#endif #endif
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
class TQWSIMEvent; class TQWSIMEvent;
#endif #endif
class TQInputContext class TQInputContext
{ {
public: public:
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
TQInputContext(TQWidget *); // should be a toplevel widget TQInputContext(TQWidget *); // should be a toplevel widget
~TQInputContext(); ~TQInputContext();
@ -96,17 +96,17 @@ public:
TQFont font; TQFont font;
XFontSet fontset; XFontSet fontset;
TQMemArray<bool> selectedChars; TQMemArray<bool> selectedChars;
#endif // Q_WS_X11 #endif // TQ_WS_X11
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
static void translateIMEvent( TQWSIMEvent *, TQWidget * ); static void translateIMEvent( TQWSIMEvent *, TQWidget * );
static void reset(); static void reset();
private: private:
static TQWidget* focusWidget; static TQWidget* focusWidget;
static TQString* composition; static TQString* composition;
#endif //Q_WS_QWS #endif //TQ_WS_QWS
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
static void init(); static void init();
static void shutdown(); static void shutdown();

@ -55,7 +55,7 @@ static TQSharedDoubleBuffer* qdb_owner = 0;
TQCleanupHandler<TQPixmap> qdb_pixmap_cleanup; TQCleanupHandler<TQPixmap> qdb_pixmap_cleanup;
#ifdef Q_WS_MACX #ifdef TQ_WS_MACX
bool TQSharedDoubleBuffer::dblbufr = FALSE; bool TQSharedDoubleBuffer::dblbufr = FALSE;
#else #else
bool TQSharedDoubleBuffer::dblbufr = TRUE; bool TQSharedDoubleBuffer::dblbufr = TRUE;
@ -74,7 +74,7 @@ bool TQSharedDoubleBuffer::dblbufr = TRUE;
*/ */
static const int hardLimitWidth = -1; static const int hardLimitWidth = -1;
static const int hardLimitHeight = -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 // Small in TQt/Embedded / Mac9 - 5K on 32bpp
static const int sharedLimitWidth = 64; static const int sharedLimitWidth = 64;
static const int sharedLimitHeight = 20; static const int sharedLimitHeight = 20;
@ -354,11 +354,11 @@ bool TQSharedDoubleBuffer::begin( TQPainter* painter, int x, int y, int w, int h
rh = h; rh = h;
if ( ( pix = getPixmap() ) ) { if ( ( pix = getPixmap() ) ) {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
if ( painter->device()->x11Screen() != pix->x11Screen() ) if ( painter->device()->x11Screen() != pix->x11Screen() )
pix->x11SetScreen( painter->device()->x11Screen() ); pix->x11SetScreen( painter->device()->x11Screen() );
TQPixmap::x11SetDefaultScreen( pix->x11Screen() ); TQPixmap::x11SetDefaultScreen( pix->x11Screen() );
#endif // Q_WS_X11 #endif // TQ_WS_X11
state |= BufferActive; state |= BufferActive;
p = new TQPainter( pix ); 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; rh = h <= 0 ? wid->height() : h;
if ( ( pix = getPixmap() ) ) { if ( ( pix = getPixmap() ) ) {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
if ( wid->x11Screen() != pix->x11Screen() ) if ( wid->x11Screen() != pix->x11Screen() )
pix->x11SetScreen( wid->x11Screen() ); pix->x11SetScreen( wid->x11Screen() );
TQPixmap::x11SetDefaultScreen( pix->x11Screen() ); TQPixmap::x11SetDefaultScreen( pix->x11Screen() );
#endif // Q_WS_X11 #endif // TQ_WS_X11
state |= BufferActive; state |= BufferActive;
if ( flags & InitBG ) { if ( flags & InitBG ) {

@ -49,7 +49,7 @@
# include "ntqregexp.h" # include "ntqregexp.h"
#endif #endif
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
#define TQMAC_CTRL (TQString(TQChar(0x2318))) #define TQMAC_CTRL (TQString(TQChar(0x2318)))
#define TQMAC_META (TQString(TQChar(0x2303))) #define TQMAC_META (TQString(TQChar(0x2303)))
#define TQMAC_ALT (TQString(TQChar(0x2325))) #define TQMAC_ALT (TQString(TQChar(0x2325)))

@ -363,7 +363,7 @@ const TQMimeSource* TQMimeSourceFactory::data(const TQString& abs_name) const
TQMimeSource* r = 0; TQMimeSource* r = 0;
TQStringList::Iterator it; TQStringList::Iterator it;
if ( abs_name[0] == '/' if ( abs_name[0] == '/'
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
|| ( abs_name[0] && abs_name[1] == ':' ) || abs_name.startsWith("\\\\") || ( abs_name[0] && abs_name[1] == ':' ) || abs_name.startsWith("\\\\")
#endif #endif
) )
@ -463,7 +463,7 @@ TQString TQMimeSourceFactory::makeAbsolute(const TQString& abs_or_rel_name, cons
{ {
if ( context.isNull() || if ( context.isNull() ||
!(context[0] == '/' !(context[0] == '/'
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
|| ( context[0] && context[1] == ':') || ( context[0] && context[1] == ':')
#endif #endif
)) ))

@ -52,7 +52,7 @@
#ifndef TQT_NO_MOVIE #ifndef TQT_NO_MOVIE
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
#include "qgfx_qws.h" #include "qgfx_qws.h"
#endif #endif
@ -397,7 +397,7 @@ void TQMoviePrivate::updatePixmapFromImage(const TQPoint& off,
&lines, off.x(), off.y(), area.width(), area.height() ); &lines, off.x(), off.y(), area.width(), area.height() );
} }
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
if(display_widget) { if(display_widget) {
TQGfx * mygfx=display_widget->graphicsContext(); TQGfx * mygfx=display_widget->graphicsContext();
if(mygfx) { if(mygfx) {
@ -679,7 +679,7 @@ void TQMovie::pushData(const uchar* data, int length)
d->receive(data,length); d->receive(data,length);
} }
#ifdef Q_WS_QWS // ##### Temporary performance experiment #ifdef TQ_WS_QWS // ##### Temporary performance experiment
/*! /*!
\internal \internal
*/ */

@ -51,7 +51,7 @@
#include "qrichtext_p.h" #include "qrichtext_p.h"
#include "ntqregexp.h" #include "ntqregexp.h"
#include "ntqcleanuphandler.h" #include "ntqcleanuphandler.h"
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
#include "qgfx_qws.h" #include "qgfx_qws.h"
#endif #endif
#include <string.h> #include <string.h>
@ -1633,13 +1633,13 @@ void TQPainter::updateXForm()
txop = TxTranslate; txop = TxTranslate;
} else { } else {
txop = TxScale; txop = TxScale;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
setf(DirtyFont); setf(DirtyFont);
#endif #endif
} }
} else { } else {
txop = TxRotShear; txop = TxRotShear;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
setf(DirtyFont); setf(DirtyFont);
#endif #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 // The doc and X implementation of this functions is in qpainter_x11.cpp
void TQPainter::drawWinFocusRect( int, int, int, int, void TQPainter::drawWinFocusRect( int, int, int, int,
bool, const TQColor & ) bool, const TQColor & )
@ -2340,13 +2340,13 @@ void TQPainter::drawPixmap( const TQRect &r, const TQPixmap &pm )
TQPDevCmdParam param[2]; TQPDevCmdParam param[2];
param[0].rect = &r; param[0].rect = &r;
param[1].pixmap = &pm; param[1].pixmap = &pm;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if ( !pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ) || !hdc ) if ( !pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ) || !hdc )
return; return;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ); pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param );
return; return;
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
if ( !pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ) || !pdev->handle()) if ( !pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ) || !pdev->handle())
return; return;
#else #else
@ -2417,7 +2417,7 @@ void TQPainter::drawImage( int x, int y, const TQImage & image,
int sx, int sy, int sw, int sh, int sx, int sy, int sw, int sh,
int conversionFlags ) int conversionFlags )
{ {
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
//### Hackish //### Hackish
# ifndef TQT_NO_TRANSFORMATIONS # ifndef TQT_NO_TRANSFORMATIONS
if ( !image.isNull() && gfx && 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() ); TQRect r( x, y, subimage.width(), subimage.height() );
param[0].rect = &r; param[0].rect = &r;
param[1].image = &subimage; param[1].image = &subimage;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !hdc ) if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !hdc )
return; return;
#elif defined (Q_WS_QWS) #elif defined (TQ_WS_QWS)
pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ); pdev->cmd( TQPaintDevice::PdcDrawImage, this, param );
return; return;
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
if(!pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !pdev->handle() ) if(!pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !pdev->handle() )
return; return;
#else #else
@ -2547,13 +2547,13 @@ void TQPainter::drawImage( const TQRect &r, const TQImage &i )
TQPDevCmdParam param[2]; TQPDevCmdParam param[2];
param[0].rect = &r; param[0].rect = &r;
param[1].image = &i; param[1].image = &i;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !hdc ) if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !hdc )
return; return;
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ); pdev->cmd( TQPaintDevice::PdcDrawImage, this, param );
return; return;
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !pdev->handle() ) if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !pdev->handle() )
return; return;
#else #else
@ -2786,15 +2786,15 @@ void TQPainter::drawText( const TQRect &r, int tf,
param[1].ival = tf; param[1].ival = tf;
param[2].str = &newstr; param[2].str = &newstr;
if ( pdev->devType() != TQInternal::Printer ) { if ( pdev->devType() != TQInternal::Printer ) {
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if ( !pdev->cmd( TQPaintDevice::PdcDrawText2Formatted, if ( !pdev->cmd( TQPaintDevice::PdcDrawText2Formatted,
this, param) || this, param) ||
!hdc ) !hdc )
return; // TQPrinter wants PdcDrawText2 return; // TQPrinter wants PdcDrawText2
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
pdev->cmd( TQPaintDevice::PdcDrawText2Formatted, this, param); pdev->cmd( TQPaintDevice::PdcDrawText2Formatted, this, param);
return; return;
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
if ( !pdev->cmd( TQPaintDevice::PdcDrawText2Formatted, this, param) || if ( !pdev->cmd( TQPaintDevice::PdcDrawText2Formatted, this, param) ||
!pdev->handle()) !pdev->handle())
return; // TQPrinter wants PdcDrawText2 return; // TQPrinter wants PdcDrawText2
@ -3045,7 +3045,7 @@ void qt_format_text( const TQFont& font, const TQRect &_r,
textFlags |= TQt::Underline; textFlags |= TQt::Underline;
cUlChar++; 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 ) { if ( painter->bg_mode == TQt::OpaqueMode ) {
int h = ti.ascent() + ti.descent() + 1; int h = ti.ascent() + ti.descent() + 1;
if (ti.y() + h < height) if (ti.y() + h < height)

@ -367,13 +367,13 @@ TQPixmap::TQPixmap( const TQPixmap &pixmap )
data = pixmap.data; data = pixmap.data;
data->ref(); data->ref();
devFlags = pixmap.devFlags; // copy TQPaintDevice flags devFlags = pixmap.devFlags; // copy TQPaintDevice flags
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
hdc = pixmap.hdc; // copy Windows device context hdc = pixmap.hdc; // copy Windows device context
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
hd = pixmap.hd; // copy X11 drawable hd = pixmap.hd; // copy X11 drawable
rendhd = pixmap.rendhd; rendhd = pixmap.rendhd;
copyX11Data( &pixmap ); // copy x11Data copyX11Data( &pixmap ); // copy x11Data
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
hd = pixmap.hd; hd = pixmap.hd;
#endif #endif
} }
@ -425,16 +425,16 @@ TQPixmap TQPixmap::fromMimeSource( const TQString &abs_name )
TQPixmap TQPixmap::copy( bool ignoreMask ) const TQPixmap TQPixmap::copy( bool ignoreMask ) const
{ {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
int old = x11SetDefaultScreen( x11Screen() ); int old = x11SetDefaultScreen( x11Screen() );
#endif // Q_WS_X11 #endif // TQ_WS_X11
TQPixmap pm( data->w, data->h, data->d, data->bitmap, data->optim ); TQPixmap pm( data->w, data->h, data->d, data->bitmap, data->optim );
if ( !pm.isNull() ) { // copy the bitmap if ( !pm.isNull() ) { // copy the bitmap
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
pm.cloneX11Data( this ); pm.cloneX11Data( this );
#endif // Q_WS_X11 #endif // TQ_WS_X11
if ( ignoreMask ) if ( ignoreMask )
bitBlt( &pm, 0, 0, this, 0, 0, data->w, data->h, TQt::CopyROP, TRUE ); 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 ); copyBlt( &pm, 0, 0, this, 0, 0, data->w, data->h );
} }
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
x11SetDefaultScreen( old ); x11SetDefaultScreen( old );
#endif // Q_WS_X11 #endif // TQ_WS_X11
return pm; return pm;
} }
@ -475,13 +475,13 @@ TQPixmap &TQPixmap::operator=( const TQPixmap &pixmap )
} else { } else {
data = pixmap.data; data = pixmap.data;
devFlags = pixmap.devFlags; // copy TQPaintDevice flags devFlags = pixmap.devFlags; // copy TQPaintDevice flags
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
hdc = pixmap.hdc; hdc = pixmap.hdc;
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
hd = pixmap.hd; // copy TQPaintDevice drawable hd = pixmap.hd; // copy TQPaintDevice drawable
rendhd = pixmap.rendhd; rendhd = pixmap.rendhd;
copyX11Data( &pixmap ); // copy x11Data 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; hd = pixmap.hd;
#endif #endif
} }
@ -660,22 +660,22 @@ void TQPixmap::resize( int w, int h )
d = isTQBitmap() ? 1 : -1; d = isTQBitmap() ? 1 : -1;
// Create new pixmap // Create new pixmap
TQPixmap pm( w, h, d, data->bitmap, data->optim ); TQPixmap pm( w, h, d, data->bitmap, data->optim );
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
pm.x11SetScreen( x11Screen() ); pm.x11SetScreen( x11Screen() );
#endif // Q_WS_X11 #endif // TQ_WS_X11
if ( !data->uninit && !isNull() ) // has existing pixmap if ( !data->uninit && !isNull() ) // has existing pixmap
bitBlt( &pm, 0, 0, this, 0, 0, // copy old pixmap bitBlt( &pm, 0, 0, this, 0, 0, // copy old pixmap
TQMIN(width(), w), TQMIN(width(), w),
TQMIN(height(),h), CopyROP, TRUE ); TQMIN(height(),h), CopyROP, TRUE );
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
if(data->alphapm) { if(data->alphapm) {
data->alphapm->resize(w, h); data->alphapm->resize(w, h);
} else } else
#elif defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) #elif defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
if (data->alphapm) if (data->alphapm)
tqWarning("TQPixmap::resize: TODO: resize alpha data"); tqWarning("TQPixmap::resize: TODO: resize alpha data");
else else
#endif // Q_WS_X11 #endif // TQ_WS_X11
if ( data->mask ) { // resize mask as well if ( data->mask ) { // resize mask as well
if ( data->selfmask ) { // preserve self-mask if ( data->selfmask ) { // preserve self-mask
pm.setMask( *((TQBitmap*)&pm) ); pm.setMask( *((TQBitmap*)&pm) );
@ -751,11 +751,11 @@ void TQPixmap::setMask( const TQBitmap &newmask )
#endif #endif
return; 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 // when setting the mask, we get rid of the alpha channel completely
delete data->alphapm; delete data->alphapm;
data->alphapm = 0; data->alphapm = 0;
#endif // Q_WS_X11 && !TQT_NO_XFTFREETYPE #endif // TQ_WS_X11 && !TQT_NO_XFTFREETYPE
delete data->mask; delete data->mask;
TQBitmap* newmaskcopy; TQBitmap* newmaskcopy;
@ -763,7 +763,7 @@ void TQPixmap::setMask( const TQBitmap &newmask )
newmaskcopy = (TQBitmap*)new TQPixmap( tmp->copy( TRUE ) ); newmaskcopy = (TQBitmap*)new TQPixmap( tmp->copy( TRUE ) );
else else
newmaskcopy = new TQBitmap( newmask ); newmaskcopy = new TQBitmap( newmask );
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
newmaskcopy->x11SetScreen( x11Screen() ); newmaskcopy->x11SetScreen( x11Screen() );
#endif #endif
data->mask = newmaskcopy; data->mask = newmaskcopy;
@ -1481,7 +1481,7 @@ bool qt_xForm_helper( const TQWMatrix &trueMat, int xoffset,
dptr++; dptr++;
} }
break; break;
# if defined(Q_WS_WIN) # if defined(TQ_WS_WIN)
case QT_XFORM_TYPE_WINDOWSPIXMAP: case QT_XFORM_TYPE_WINDOWSPIXMAP:
while ( dptr < maxp ) { while ( dptr < maxp ) {
IWX_PIX(128); IWX_PIX(128);

@ -95,7 +95,7 @@
static const int cache_size = 149; // size of internal hash array 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 static int cache_limit = 256; // 256 KB cache limit
#else #else
static int cache_limit = 1024; // 1024 KB cache limit static int cache_limit = 1024; // 1024 KB cache limit
@ -305,7 +305,7 @@ int TQPixmapCache::cacheLimit()
void TQPixmapCache::setCacheLimit( int n ) void TQPixmapCache::setCacheLimit( int n )
{ {
#ifdef Q_WS_MAC9 #ifdef TQ_WS_MAC9
if(n > 256) if(n > 256)
tqWarning("TQPixmapCache::setCacheLimit: Setting cache limits high is harmfull to mac9's health"); tqWarning("TQPixmapCache::setCacheLimit: Setting cache limits high is harmfull to mac9's health");
#endif #endif

@ -518,7 +518,7 @@ void TQPrinter::setCreator( const TQString &creator )
void TQPrinter::setOrientation( Orientation orientation ) void TQPrinter::setOrientation( Orientation orientation )
{ {
orient = orientation; orient = orientation;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
reinit(); reinit();
#endif #endif
} }
@ -555,7 +555,7 @@ void TQPrinter::setPageSize( PageSize newPageSize )
return; return;
} }
page_size = newPageSize; page_size = newPageSize;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
reinit(); reinit();
#endif #endif
} }
@ -577,7 +577,7 @@ void TQPrinter::setPageSize( PageSize newPageSize )
void TQPrinter::setPageOrder( PageOrder newPageOrder ) void TQPrinter::setPageOrder( PageOrder newPageOrder )
{ {
page_order = newPageOrder; page_order = newPageOrder;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
reinit(); reinit();
#endif #endif
} }
@ -608,7 +608,7 @@ TQPrinter::PageOrder TQPrinter::pageOrder() const
void TQPrinter::setColorMode( ColorMode newColorMode ) void TQPrinter::setColorMode( ColorMode newColorMode )
{ {
color_mode = newColorMode; color_mode = newColorMode;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
reinit(); reinit();
#endif #endif
} }
@ -818,7 +818,7 @@ void TQPrinter::setCollateCopies(bool on)
void TQPrinter::setNumCopies( int numCopies ) void TQPrinter::setNumCopies( int numCopies )
{ {
ncopies = numCopies; ncopies = numCopies;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
reinit(); reinit();
#endif #endif
} }
@ -948,7 +948,7 @@ int TQPrinter::resolution() const
void TQPrinter::setPaperSource( PaperSource source ) void TQPrinter::setPaperSource( PaperSource source )
{ {
paper_source = source; paper_source = source;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
reinit(); reinit();
#endif #endif
} }

@ -126,7 +126,7 @@ TQPrinter::TQPrinter( PrinterMode m )
paper_source = OnlyOne; paper_source = OnlyOne;
switch ( m ) { switch ( m ) {
case ScreenResolution: case ScreenResolution:
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
res = 72; res = 72;
#else #else
res = TQPaintDevice::x11AppDpiY(); res = TQPaintDevice::x11AppDpiY();

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

@ -74,7 +74,7 @@ class TQTextFormatCollection;
const int border_tolerance = 2; const int border_tolerance = 2;
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
#include "qt_windows.h" #include "qt_windows.h"
#endif #endif
@ -91,18 +91,18 @@ static inline int scale( int value, TQPainter *painter )
{ {
if ( is_printer( painter ) ) { if ( is_printer( painter ) ) {
TQPaintDeviceMetrics metrics( painter->device() ); TQPaintDeviceMetrics metrics( painter->device() );
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
value = value * metrics.logicalDpiY() / value = value * metrics.logicalDpiY() /
TQPaintDevice::x11AppDpiY( painter->device()->x11Screen() ); TQPaintDevice::x11AppDpiY( painter->device()->x11Screen() );
#elif defined (Q_WS_WIN) #elif defined (TQ_WS_WIN)
HDC hdc = GetDC( 0 ); HDC hdc = GetDC( 0 );
int gdc = GetDeviceCaps( hdc, LOGPIXELSY ); int gdc = GetDeviceCaps( hdc, LOGPIXELSY );
if ( gdc ) if ( gdc )
value = value * metrics.logicalDpiY() / gdc; value = value * metrics.logicalDpiY() / gdc;
ReleaseDC( 0, hdc ); ReleaseDC( 0, hdc );
#elif defined (Q_WS_MAC) #elif defined (TQ_WS_MAC)
value = value * metrics.logicalDpiY() / 75; // ##### FIXME value = value * metrics.logicalDpiY() / 75; // ##### FIXME
#elif defined (Q_WS_QWS) #elif defined (TQ_WS_QWS)
value = value * metrics.logicalDpiY() / 75; value = value * metrics.logicalDpiY() / 75;
#endif #endif
} }
@ -519,7 +519,7 @@ void TQTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArray<TQ
tmpX = -1; tmpX = -1;
bool justInsert = TRUE; bool justInsert = TRUE;
TQString s( str ); TQString s( str );
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if ( checkNewLine ) { if ( checkNewLine ) {
int i = 0; int i = 0;
while ( ( i = s.find( '\r', i ) ) != -1 ) while ( ( i = s.find( '\r', i ) ) != -1 )
@ -672,7 +672,7 @@ bool TQTextCursor::place( const TQPoint &p, TQTextParagraph *s, bool link, bool
TQTextParagraph *str = s; TQTextParagraph *str = s;
if ( pos.y() < s->rect().y() ) { if ( pos.y() < s->rect().y() ) {
pos.setY( s->rect().y() ); pos.setY( s->rect().y() );
#ifdef Q_WS_MACX #ifdef TQ_WS_MACX
pos.setX( s->rect().x() ); pos.setX( s->rect().x() );
#endif #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() ) if ( pos.y() >= r.y() && pos.y() <= r.y() + r.height() )
break; break;
if ( loosePlacing == TRUE && !s->next() ) { if ( loosePlacing == TRUE && !s->next() ) {
#ifdef Q_WS_MACX #ifdef TQ_WS_MACX
pos.setX( s->rect().x() + s->rect().width() ); pos.setX( s->rect().x() + s->rect().width() );
#endif #endif
break; break;
@ -4020,7 +4020,7 @@ int TQTextString::width( int idx ) const
{ {
int r = c->c.row(); int r = c->c.row();
if(r < 0x06 if(r < 0x06
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
// Uniscribe's handling of Asian makes the condition below fail. // Uniscribe's handling of Asian makes the condition below fail.
|| (r > 0x1f && !(r > 0xd7 && r < 0xe0)) || (r > 0x1f && !(r > 0xd7 && r < 0xe0))
#endif #endif
@ -4731,7 +4731,7 @@ void TQTextParagraph::setColorForSelection( TQColor &color, TQPainter &painter,
document()->selectionColor( selection ) : document()->selectionColor( selection ) :
cg.color( TQColorGroup::Highlight ); cg.color( TQColorGroup::Highlight );
if ( selection == TQTextDocument::IMCompositionText ) { if ( selection == TQTextDocument::IMCompositionText ) {
#ifndef Q_WS_MACX #ifndef TQ_WS_MACX
int h1, s1, v1, h2, s2, v2; int h1, s1, v1, h2, s2, v2;
cg.color( TQColorGroup::Base ).hsv( &h1, &s1, &v1 ); cg.color( TQColorGroup::Base ).hsv( &h1, &s1, &v1 );
cg.color( TQColorGroup::Background ).hsv( &h2, &s2, &v2 ); cg.color( TQColorGroup::Background ).hsv( &h2, &s2, &v2 );
@ -6063,7 +6063,7 @@ void TQTextFormatCollection::setPaintDevice( TQPaintDevice *pd )
{ {
paintdevice = pd; paintdevice = pd;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
int scr = ( paintdevice ) ? paintdevice->x11Screen() : TQPaintDevice::x11AppScreen(); int scr = ( paintdevice ) ? paintdevice->x11Screen() : TQPaintDevice::x11AppScreen();
defFormat->fn.x11SetScreen( scr ); defFormat->fn.x11SetScreen( scr );
@ -6076,7 +6076,7 @@ void TQTextFormatCollection::setPaintDevice( TQPaintDevice *pd )
format->fn.x11SetScreen( scr ); format->fn.x11SetScreen( scr );
format->update(); format->update();
} }
#endif // Q_WS_X11 #endif // TQ_WS_X11
} }
TQTextFormat *TQTextFormatCollection::format( TQTextFormat *f ) TQTextFormat *TQTextFormatCollection::format( TQTextFormat *f )
@ -6695,7 +6695,7 @@ void TQTextImage::adjustToPainter( TQPainter* p )
height = scale( tmpheight, p ); height = scale( tmpheight, p );
} }
#if !defined(Q_WS_X11) #if !defined(TQ_WS_X11)
#include <ntqbitmap.h> #include <ntqbitmap.h>
#include <ntqcleanuphandler.h> #include <ntqcleanuphandler.h>
static TQPixmap *qrt_selection = 0; 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 ); p->drawPixmap( cx , cy, pm, cx - x, cy - y, cw, ch );
if ( selected && placement() == PlaceInline && is_printer( p ) ) { 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) ); 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 #else // in WIN32 Dense4Pattern doesn't work correctly (transparency problem), so work around it
if ( !qrt_selection ) if ( !qrt_selection )

@ -404,7 +404,7 @@ static bool basic_shape(TQShaperItem *item)
enum { enum {
CcmpProperty = 0x1 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[] = { static const TQOpenType::Features hebrew_features[] = {
{ FT_MAKE_TAG('c', 'c', 'm', 'p'), CcmpProperty }, { FT_MAKE_TAG('c', 'c', 'm', 'p'), CcmpProperty },
{0, 0} {0, 0}
@ -419,7 +419,7 @@ static bool hebrew_shape(TQShaperItem *item)
{ {
Q_ASSERT(item->script == TQFont::Hebrew); 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(); TQOpenType *openType = item->font->openType();
if (openType && openType->supportsScript(item->script)) { 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; *shapedLength = data - shapeBuffer;
} }
#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) #if defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
enum { enum {
InitProperty = 0x2, InitProperty = 0x2,
@ -1582,7 +1582,7 @@ static bool arabic_shape(TQShaperItem *item)
{ {
Q_ASSERT(item->script == TQFont::Arabic); 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(); TQOpenType *openType = item->font->openType();
if (openType && openType->supportsScript(TQFont::Arabic)) { if (openType && openType->supportsScript(TQFont::Arabic)) {
@ -1613,12 +1613,12 @@ static bool arabic_shape(TQShaperItem *item)
return TRUE; return TRUE;
} }
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
# include "qscriptengine_x11.cpp" # include "qscriptengine_x11.cpp"
#elif defined(Q_WS_WIN) #elif defined(TQ_WS_WIN)
# include "qscriptengine_win.cpp" # include "qscriptengine_win.cpp"
#elif defined(Q_WS_MAC) #elif defined(TQ_WS_MAC)
# include "qscriptengine_mac.cpp" # include "qscriptengine_mac.cpp"
#elif defined(Q_WS_QWS) #elif defined(TQ_WS_QWS)
# include "qscriptengine_qws.cpp" # include "qscriptengine_qws.cpp"
#endif #endif

@ -46,13 +46,13 @@
#include "ntqapplication.h" #include "ntqapplication.h"
#include "ntqstyle.h" #include "ntqstyle.h"
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
#include "qt_x11_p.h" #include "qt_x11_p.h"
extern Atom qt_sizegrip; // defined in qapplication_x11.cpp extern Atom qt_sizegrip; // defined in qapplication_x11.cpp
#elif defined (Q_WS_WIN ) #elif defined (TQ_WS_WIN )
#include "ntqobjectlist.h" #include "ntqobjectlist.h"
#include "qt_windows.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 bool qt_mac_update_sizer(TQWidget *, int); //qwidget_mac.cpp
#endif #endif
@ -112,7 +112,7 @@ TQSizeGrip::TQSizeGrip( TQWidget * parent, const char* name )
: TQWidget( parent, name ) : TQWidget( parent, name )
{ {
#ifndef TQT_NO_CURSOR #ifndef TQT_NO_CURSOR
#ifndef Q_WS_MAC #ifndef TQ_WS_MAC
if ( TQApplication::reverseLayout() ) if ( TQApplication::reverseLayout() )
setCursor( sizeBDiagCursor ); setCursor( sizeBDiagCursor );
else else
@ -120,7 +120,7 @@ TQSizeGrip::TQSizeGrip( TQWidget * parent, const char* name )
#endif #endif
#endif #endif
setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if ( !qt_sizegrip_workspace( this ) ) { if ( !qt_sizegrip_workspace( this ) ) {
WId id = winId(); WId id = winId();
XChangeProperty(tqt_xdisplay(), topLevelWidget()->winId(), XChangeProperty(tqt_xdisplay(), topLevelWidget()->winId(),
@ -140,7 +140,7 @@ TQSizeGrip::TQSizeGrip( TQWidget * parent, const char* name )
*/ */
TQSizeGrip::~TQSizeGrip() TQSizeGrip::~TQSizeGrip()
{ {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if ( !TQApplication::closingDown() && parentWidget() ) { if ( !TQApplication::closingDown() && parentWidget() ) {
WId id = None; WId id = None;
XChangeProperty(tqt_xdisplay(), topLevelWidget()->winId(), XChangeProperty(tqt_xdisplay(), topLevelWidget()->winId(),
@ -232,7 +232,7 @@ void TQSizeGrip::mouseMoveEvent( TQMouseEvent * e )
} else { } else {
tlw->resize( w, h ); tlw->resize( w, h );
} }
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
MSG msg; MSG msg;
while( PeekMessage( &msg, winId(), WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE ) ) while( PeekMessage( &msg, winId(), WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE ) )
; ;
@ -250,7 +250,7 @@ bool TQSizeGrip::eventFilter( TQObject *o, TQEvent *e )
{ {
if ( o == tlw ) { if ( o == tlw ) {
switch ( e->type() ) { 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 */ /* The size grip goes no where on Mac OS X when you maximize! --Sam */
case TQEvent::ShowMaximized: case TQEvent::ShowMaximized:
#endif #endif
@ -264,7 +264,7 @@ bool TQSizeGrip::eventFilter( TQObject *o, TQEvent *e )
break; break;
} }
} else if(o == this) { } else if(o == this) {
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
switch(e->type()) { switch(e->type()) {
case TQEvent::Hide: case TQEvent::Hide:
case TQEvent::Show: case TQEvent::Show:

@ -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" # include "qtextengine_unix.cpp"
#elif defined( Q_WS_WIN ) #elif defined( TQ_WS_WIN )
# include "qtextengine_win.cpp" # include "qtextengine_win.cpp"
#elif defined( Q_WS_MAC ) #elif defined( TQ_WS_MAC )
# include "qtextengine_mac.cpp" # include "qtextengine_mac.cpp"
#endif #endif
@ -888,7 +888,7 @@ static void calcLineBreaks(const TQString &str, TQCharAttributes *charAttributes
TQTextEngine::TQTextEngine( const TQString &str, TQFontPrivate *f ) TQTextEngine::TQTextEngine( const TQString &str, TQFontPrivate *f )
: string( str ), fnt( f ), direction( TQChar::DirON ), haveCharAttributes( FALSE ), widthOnly( FALSE ) : string( str ), fnt( f ), direction( TQChar::DirON ), haveCharAttributes( FALSE ), widthOnly( FALSE )
{ {
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
if ( !resolvedUsp10 ) if ( !resolvedUsp10 )
resolveUsp10(); resolveUsp10();
#endif #endif
@ -983,7 +983,7 @@ const TQCharAttributes *TQTextEngine::attributes()
for ( int i = 0; i < items.size(); i++ ) { for ( int i = 0; i < items.size(); i++ ) {
TQScriptItem &si = items[i]; TQScriptItem &si = items[i];
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
int script = uspScriptForItem(this, i); int script = uspScriptForItem(this, i);
#else #else
int script = si.analysis.script; int script = si.analysis.script;

@ -86,7 +86,7 @@ struct glyph_metrics_t
int yoff; 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; typedef unsigned short glyph_t;
struct qoffset_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; 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! // 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. // it is designed to be compatible with the types found in uniscribe.

@ -210,7 +210,7 @@ public:
#ifndef TQT_NO_TRANSLATION_BUILDER #ifndef TQT_NO_TRANSLATION_BUILDER
TQMap<TQTranslatorMessage, void *> * messages; TQMap<TQTranslatorMessage, void *> * messages;
#endif #endif
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
int oldPermissionLookup; int oldPermissionLookup;
#endif #endif
}; };
@ -340,7 +340,7 @@ public:
explicitly documented as such. explicitly documented as such.
*/ */
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
extern int qt_ntfs_permission_lookup; extern int qt_ntfs_permission_lookup;
#endif #endif
@ -353,7 +353,7 @@ TQTranslator::TQTranslator( TQObject * parent, const char * name )
: TQObject( parent, name ) : TQObject( parent, name )
{ {
d = new TQTranslatorPrivate; d = new TQTranslatorPrivate;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
d->oldPermissionLookup = qt_ntfs_permission_lookup; d->oldPermissionLookup = qt_ntfs_permission_lookup;
#endif #endif
} }
@ -419,7 +419,7 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory,
TQString prefix; TQString prefix;
if ( filename[0] == '/' if ( filename[0] == '/'
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
|| (filename[0] && filename[1] == ':') || filename[0] == '\\' || (filename[0] && filename[1] == ':') || filename[0] == '\\'
#endif #endif
) )
@ -438,7 +438,7 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory,
delims = search_delimiters.isNull() ? delims = search_delimiters.isNull() ?
TQString::fromLatin1( "_." ) : search_delimiters; TQString::fromLatin1( "_." ) : search_delimiters;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
qt_ntfs_permission_lookup--; qt_ntfs_permission_lookup--;
#endif #endif
for ( ;; ) { for ( ;; ) {
@ -463,7 +463,7 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory,
// no truncations? fail // no truncations? fail
if ( rightmost == 0 ) { if ( rightmost == 0 ) {
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if (d->oldPermissionLookup != qt_ntfs_permission_lookup) if (d->oldPermissionLookup != qt_ntfs_permission_lookup)
qt_ntfs_permission_lookup++; qt_ntfs_permission_lookup++;
#endif #endif
@ -472,7 +472,7 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory,
fname.truncate( rightmost ); fname.truncate( rightmost );
} }
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if (d->oldPermissionLookup != qt_ntfs_permission_lookup) if (d->oldPermissionLookup != qt_ntfs_permission_lookup)
qt_ntfs_permission_lookup++; qt_ntfs_permission_lookup++;
#endif #endif

@ -78,7 +78,7 @@ static void slashify( TQString& s, bool allowMultiple = TRUE )
} }
if ( s[ i ] == '\\' ) if ( s[ i ] == '\\' )
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 if ( s[ i ] == ':' && (i == (int)s.length()-1 || s[ i + 1 ] != '/' ) ) //mac colon's go away, unless after a protocol
s[ i ] = '/'; s[ i ] = '/';
#endif #endif
@ -1106,7 +1106,7 @@ bool TQUrl::isLocalFile() const
TQString TQUrl::fileName() const TQString TQUrl::fileName() const
{ {
if ( d->path.isEmpty() || d->path.endsWith( "/" ) if ( d->path.isEmpty() || d->path.endsWith( "/" )
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
|| d->path.endsWith( "\\" ) || d->path.endsWith( "\\" )
#endif #endif
) )

@ -62,11 +62,11 @@
#if defined(QT_ACCESSIBILITY_SUPPORT) #if defined(QT_ACCESSIBILITY_SUPPORT)
#include "ntqaccessible.h" #include "ntqaccessible.h"
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
#include "qt_windows.h" #include "qt_windows.h"
#include "qinputcontext_p.h" #include "qinputcontext_p.h"
#endif #endif
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
#include "qwsmanager_qws.h" #include "qwsmanager_qws.h"
#endif #endif
#include "qfontdata_p.h" #include "qfontdata_p.h"
@ -455,7 +455,7 @@
in the file qapp_xxx.cpp. 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 static const int WDictSize = 163; // plenty for small devices
#else #else
static const int WDictSize = 1123; // plenty for 5 big complex windows 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 ) ); s.setWidth( TQMAX( s.width(), 200 ) );
if ( exp & TQSizePolicy::Vertically ) if ( exp & TQSizePolicy::Vertically )
s.setHeight( TQMAX( s.height(), 150 ) ); s.setHeight( TQMAX( s.height(), 150 ) );
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
TQRect screen = TQApplication::desktop()->screenGeometry( w->x11Screen() ); TQRect screen = TQApplication::desktop()->screenGeometry( w->x11Screen() );
#else // all others #else // all others
TQRect screen = TQApplication::desktop()->screenGeometry( w->pos() ); 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 ) TQWidget::TQWidget( TQWidget *parent, const char *name, WFlags f, NFlags n )
: TQObject( parent, name ), TQPaintDevice( TQInternal::Widget ) : 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 ) { if ( tqApp->type() == TQApplication::Tty ) {
tqWarning( "TQWidget: Cannot create a TQWidget when no GUI " tqWarning( "TQWidget: Cannot create a TQWidget when no GUI "
"is being used" ); "is being used" );
@ -924,9 +924,9 @@ TQWidget::TQWidget( TQWidget *parent, const char *name, WFlags f, NFlags n )
#endif #endif
if ( ! isTopLevel() ) if ( ! isTopLevel() )
fnt = parentWidget()->font(); fnt = parentWidget()->font();
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
fnt.x11SetScreen( x11Screen() ); fnt.x11SetScreen( x11Screen() );
#endif // Q_WS_X11 #endif // TQ_WS_X11
if ( !isDesktop() ) if ( !isDesktop() )
setBackgroundFromMode(); //### parts of this are done in create but not all (see reparent(...) ) 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 ) if ( winid )
mapper->remove( winid ); mapper->remove( winid );
winid = id; winid = id;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
hd = id; // X11: hd == ident hd = id; // X11: hd == ident
#endif #endif
if ( id ) if ( id )
@ -1139,7 +1139,7 @@ void TQWidget::createTLExtra()
createExtra(); createExtra();
if ( !extra->topextra ) { if ( !extra->topextra ) {
TQTLWExtra* x = extra->topextra = new TQTLWExtra; 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; x->opacity = 255;
#endif #endif
#ifndef TQT_NO_WIDGET_TOPEXTRA #ifndef TQT_NO_WIDGET_TOPEXTRA
@ -1150,7 +1150,7 @@ void TQWidget::createTLExtra()
x->incw = x->inch = 0; x->incw = x->inch = 0;
x->basew = x->baseh = 0; x->basew = x->baseh = 0;
x->normalGeometry = TQRect(0,0,-1,-1); x->normalGeometry = TQRect(0,0,-1,-1);
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
x->embedded = 0; x->embedded = 0;
x->parentWinId = 0; x->parentWinId = 0;
x->spont_unmapped = 0; x->spont_unmapped = 0;
@ -1159,7 +1159,7 @@ void TQWidget::createTLExtra()
x->ussize = 0; x->ussize = 0;
#endif #endif
x->savedFlags = 0; 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->decor_allocated_region = TQRegion();
x->qwsManager = 0; x->qwsManager = 0;
#endif #endif
@ -1221,7 +1221,7 @@ void TQWidget::deleteExtra()
delete extra->topextra->icon; delete extra->topextra->icon;
#endif #endif
delete extra->topextra->focusData; 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; delete extra->topextra->qwsManager;
#endif #endif
delete extra->topextra; delete extra->topextra;
@ -1246,7 +1246,7 @@ void TQWidget::deactivateWidgetCleanup()
if ( this == TQApplication::active_window ) if ( this == TQApplication::active_window )
tqApp->setActiveWindow( 0 ); tqApp->setActiveWindow( 0 );
// If the is the active mouse press widget, reset it // If the is the active mouse press widget, reset it
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
extern TQGuardedPtr<TQWidget> qt_button_down; extern TQGuardedPtr<TQWidget> qt_button_down;
#else #else
extern TQWidget *qt_button_down; 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 ) ) { if ( testWState( WState_OwnCursor ) ) {
// enforce the windows behavior of clearing the cursor on // enforce the windows behavior of clearing the cursor on
// disabled widgets // disabled widgets
@ -1777,7 +1777,7 @@ void TQWidget::setEnabled( bool enable )
tqt_x11_enforce_cursor( this ); tqt_x11_enforce_cursor( this );
} }
#endif #endif
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
TQInputContext::enable( this, im_enabled & !((bool)testWState(WState_Disabled)) ); TQInputContext::enable( this, im_enabled & !((bool)testWState(WState_Disabled)) );
#endif #endif
} }
@ -2549,7 +2549,7 @@ void TQWidget::setBackgroundFromMode()
r = TQColorGroup::ButtonText; r = TQColorGroup::ButtonText;
break; break;
case X11ParentRelative: case X11ParentRelative:
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
setBackgroundX11Relative(); setBackgroundX11Relative();
#endif #endif
return; return;
@ -3000,7 +3000,7 @@ void TQWidget::setFont( const TQFont &font )
return; return;
TQFont old = fnt; TQFont old = fnt;
fnt = font.resolve( qt_naturalWidgetFont( this ) ); 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 // make sure the font set on this widget is associated with the correct screen
fnt.x11SetScreen( x11Screen() ); fnt.x11SetScreen( x11Screen() );
#endif #endif
@ -3298,7 +3298,7 @@ void TQWidget::setFocus()
TQFocusData * f = focusData( TRUE ); TQFocusData * f = focusData( TRUE );
if ( f->it.current() == this && tqApp->focusWidget() == this if ( f->it.current() == this && tqApp->focusWidget() == this
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
&& GetFocus() == winId() && GetFocus() == winId()
#endif #endif
) )
@ -3318,7 +3318,7 @@ void TQWidget::setFocus()
if ( isActiveWindow() ) { if ( isActiveWindow() ) {
TQWidget * prev = tqApp->focus_widget; TQWidget * prev = tqApp->focus_widget;
if ( prev ) { 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 // had already reset focus_widget when received XFocusIn
// Don't reset input context explicitly here. Whether reset or not // Don't reset input context explicitly here. Whether reset or not
@ -3337,7 +3337,7 @@ void TQWidget::setFocus()
#endif #endif
} }
} }
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
else { else {
TQInputContext::endComposition(); TQInputContext::endComposition();
} }
@ -3346,7 +3346,7 @@ void TQWidget::setFocus()
if( isInputMethodEnabled() ) if( isInputMethodEnabled() )
focusInputContext(); focusInputContext();
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if ( !topLevelWidget()->isPopup() ) if ( !topLevelWidget()->isPopup() )
SetFocus( winId() ); SetFocus( winId() );
else { else {
@ -3354,7 +3354,7 @@ void TQWidget::setFocus()
#if defined(QT_ACCESSIBILITY_SUPPORT) #if defined(QT_ACCESSIBILITY_SUPPORT)
TQAccessible::updateAccessibility( this, 0, TQAccessible::Focus ); TQAccessible::updateAccessibility( this, 0, TQAccessible::Focus );
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
} }
#endif #endif
@ -3392,7 +3392,7 @@ void TQWidget::clearFocus()
focusProxy()->clearFocus(); focusProxy()->clearFocus();
return; return;
} else if ( hasFocus() ) { } else if ( hasFocus() ) {
#if !defined(Q_WS_X11) #if !defined(TQ_WS_X11)
resetInputContext(); resetInputContext();
#else #else
unfocusInputContext(); unfocusInputContext();
@ -3402,7 +3402,7 @@ void TQWidget::clearFocus()
tqApp->focus_widget = 0; tqApp->focus_widget = 0;
TQFocusEvent out( TQEvent::FocusOut ); TQFocusEvent out( TQEvent::FocusOut );
TQApplication::sendEvent( w, &out ); TQApplication::sendEvent( w, &out );
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if ( !isPopup() && GetFocus() == winId() ) if ( !isPopup() && GetFocus() == winId() )
SetFocus( 0 ); SetFocus( 0 );
else { else {
@ -3410,7 +3410,7 @@ void TQWidget::clearFocus()
#if defined(QT_ACCESSIBILITY_SUPPORT) #if defined(QT_ACCESSIBILITY_SUPPORT)
TQAccessible::updateAccessibility( this, 0, TQAccessible::Focus ); TQAccessible::updateAccessibility( this, 0, TQAccessible::Focus );
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
} }
#endif #endif
} }
@ -3540,7 +3540,7 @@ TQFocusData * TQWidget::focusData( bool create )
void TQWidget::setInputMethodEnabled( bool b ) void TQWidget::setInputMethodEnabled( bool b )
{ {
im_enabled = b; im_enabled = b;
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
TQInputContext::enable( this, im_enabled & !((bool)testWState(WState_Disabled)) ); TQInputContext::enable( this, im_enabled & !((bool)testWState(WState_Disabled)) );
#endif #endif
} }
@ -3629,7 +3629,7 @@ bool TQWidget::isActiveWindow() const
} }
} }
#endif #endif
#if defined(Q_WS_WIN32) #if defined(TQ_WS_WIN32)
HWND parent = tlw->winId(); HWND parent = tlw->winId();
HWND topparent = GetActiveWindow(); HWND topparent = GetActiveWindow();
while ( parent ) { while ( parent ) {
@ -4056,7 +4056,7 @@ void TQWidget::show()
// On Windows, show the popup now so that our own focus handling // 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 // 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) ) if ( testWFlags(WType_Popup) )
tqApp->openPopup( this ); tqApp->openPopup( this );
#endif #endif
@ -4077,7 +4077,7 @@ void TQWidget::show()
else else
showWindow(); showWindow();
#if !defined(Q_WS_WIN) #if !defined(TQ_WS_WIN)
if ( testWFlags(WType_Popup) ) if ( testWFlags(WType_Popup) )
tqApp->openPopup( this ); tqApp->openPopup( this );
#endif #endif
@ -4119,7 +4119,7 @@ void TQWidget::hide()
if ( testWFlags(WShowModal) ) if ( testWFlags(WShowModal) )
tqt_leave_modal( this ); tqt_leave_modal( this );
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if ( isTopLevel() && !isPopup() && parentWidget() && isActiveWindow() ) if ( isTopLevel() && !isPopup() && parentWidget() && isActiveWindow() )
parentWidget()->setActiveWindow(); // Activate parent parentWidget()->setActiveWindow(); // Activate parent
#endif #endif
@ -4543,7 +4543,7 @@ void TQWidget::adjustSize()
if ( isTopLevel() ) { if ( isTopLevel() ) {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
TQRect screen = TQApplication::desktop()->screenGeometry( x11Screen() ); TQRect screen = TQApplication::desktop()->screenGeometry( x11Screen() );
#else // all others #else // all others
TQRect screen = TQApplication::desktop()->screenGeometry( pos() ); TQRect screen = TQApplication::desktop()->screenGeometry( pos() );
@ -4923,7 +4923,7 @@ bool TQWidget::event( TQEvent *e )
case TQEvent::ApplicationPaletteChange: case TQEvent::ApplicationPaletteChange:
if ( !own_palette && !isDesktop() ) if ( !own_palette && !isDesktop() )
unsetPalette(); 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 ) { if ( isTopLevel() && topData()->qwsManager ) {
TQRegion r( topData()->qwsManager->region() ); TQRegion r( topData()->qwsManager->region() );
TQApplication::postEvent(topData()->qwsManager, new TQPaintEvent(r, FALSE) ); 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 This special event handler can be reimplemented in a subclass to
@ -5590,7 +5590,7 @@ bool TQWidget::macEvent( MSG * )
} }
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
/*! /*!
This special event handler can be reimplemented in a subclass to This special event handler can be reimplemented in a subclass to
@ -5611,7 +5611,7 @@ bool TQWidget::winEvent( MSG * )
} }
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
/*! /*!
This special event handler can be reimplemented in a subclass to This special event handler can be reimplemented in a subclass to
@ -5632,7 +5632,7 @@ bool TQWidget::x11Event( XEvent * )
} }
#endif #endif
#if defined(Q_WS_QWS) #if defined(TQ_WS_QWS)
/*! /*!
This special event handler can be reimplemented in a subclass to This special event handler can be reimplemented in a subclass to

@ -57,7 +57,7 @@
#ifndef QT_H #ifndef QT_H
#endif // 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; extern int qt_widget_tlw_gravity;
#endif #endif

@ -41,7 +41,7 @@
#include "ntqwmatrix.h" #include "ntqwmatrix.h"
#include "ntqdatastream.h" #include "ntqdatastream.h"
#include "ntqregion.h" #include "ntqregion.h"
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
double qsincos( double, bool calcCos ); // defined in qpainter_x11.cpp double qsincos( double, bool calcCos ); // defined in qpainter_x11.cpp
#else #else
#include <math.h> #include <math.h>
@ -851,7 +851,7 @@ const double deg2rad = 0.017453292519943295769; // pi/180
TQWMatrix &TQWMatrix::rotate( double a ) TQWMatrix &TQWMatrix::rotate( double a )
{ {
double b = deg2rad*a; // convert to radians 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 sina = qsincos(b,FALSE); // fast and convenient
double cosa = qsincos(b,TRUE); double cosa = qsincos(b,TRUE);
#else #else

@ -515,7 +515,7 @@ bool TQFtpDTP::parseDir( const TQString &buffer, const TQString &userName, TQUrl
void TQFtpDTP::socketConnected() void TQFtpDTP::socketConnected()
{ {
#if !defined (Q_WS_QWS) #if !defined (TQ_WS_QWS)
// Use a large send buffer to reduce the number // Use a large send buffer to reduce the number
// of writeBlocks when download and uploading files. // of writeBlocks when download and uploading files.
// The actual size used here (128k) is default on most // The actual size used here (128k) is default on most

@ -61,11 +61,11 @@ TQM_EXPORT_OPENGL inline const char *qGLVersion() {
} }
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
# include "qt_windows.h" # include "qt_windows.h"
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
#if !defined( TQMAC_OPENGL_DOUBLEBUFFER ) #if !defined( TQMAC_OPENGL_DOUBLEBUFFER )
/* This macro is different now. If the macro is not defined TQGLWidget will /* 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 * 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 <GL/glu.h> # include <GL/glu.h>
#endif #endif
#if defined(Q_WS_WIN) || defined(Q_WS_MAC) #if defined(TQ_WS_WIN) || defined(TQ_WS_MAC)
class TQGLCmap; class TQGLCmap;
#endif #endif
class TQPixmap; class TQPixmap;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
class TQGLOverlayWidget; class TQGLOverlayWidget;
#endif #endif
@ -202,14 +202,14 @@ protected:
virtual bool chooseContext( const TQGLContext* shareContext = 0 ); virtual bool chooseContext( const TQGLContext* shareContext = 0 );
virtual void doneCurrent(); // ### 4.0: make this public - needed for multithreading stuff 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 ); virtual int choosePixelFormat( void* pfd, HDC pdc );
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
virtual void* tryVisual( const TQGLFormat& f, int bufDepth = 1 ); virtual void* tryVisual( const TQGLFormat& f, int bufDepth = 1 );
virtual void* chooseVisual(); virtual void* chooseVisual();
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
virtual void* chooseMacVisual(GDHandle); virtual void* chooseMacVisual(GDHandle);
#endif #endif
@ -225,16 +225,16 @@ protected:
void setDevice( TQPaintDevice *pDev ); void setDevice( TQPaintDevice *pDev );
protected: protected:
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
HGLRC rc; HGLRC rc;
HDC dc; HDC dc;
WId win; WId win;
int pixelFormatId; int pixelFormatId;
TQGLCmap* cmap; TQGLCmap* cmap;
#elif defined(Q_WS_X11) || defined(Q_WS_MAC) #elif defined(TQ_WS_X11) || defined(TQ_WS_MAC)
void* vi; void* vi;
void* cx; void* cx;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
TQ_UINT32 gpm; TQ_UINT32 gpm;
#endif #endif
#endif #endif
@ -252,14 +252,14 @@ private:
bool crWin; bool crWin;
TQPaintDevice* paintDevice; TQPaintDevice* paintDevice;
TQColor transpColor; TQColor transpColor;
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
TQRect oldR; TQRect oldR;
#endif #endif
}; };
Private* d; Private* d;
friend class TQGLWidget; friend class TQGLWidget;
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
void fixBufferRect(); void fixBufferRect();
#endif #endif
@ -359,9 +359,9 @@ private:
TQGLColormap cmap; TQGLColormap cmap;
#if defined(Q_WS_WIN) || defined(Q_WS_MAC) #if defined(TQ_WS_WIN) || defined(TQ_WS_MAC)
TQGLContext* olcx; TQGLContext* olcx;
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
TQGLOverlayWidget* olw; TQGLOverlayWidget* olw;
friend class TQGLOverlayWidget; friend class TQGLOverlayWidget;
#endif #endif
@ -372,7 +372,7 @@ private: // Disabled copy constructor and operator=
TQGLWidget& operator=( const TQGLWidget& ); TQGLWidget& operator=( const TQGLWidget& );
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
private: private:
const TQGLContext *slcx; const TQGLContext *slcx;
uint pending_fix : 1, uint pending_fix : 1,

@ -48,7 +48,7 @@
static TQGLFormat* qgl_default_format = 0; static TQGLFormat* qgl_default_format = 0;
static TQGLFormat* qgl_default_overlay_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" #include "private/qt_x11_p.h"
#define INT32 dummy_INT32 #define INT32 dummy_INT32
#define INT8 dummy_INT8 #define INT8 dummy_INT8
@ -886,18 +886,18 @@ void TQGLContext::init( TQPaintDevice *dev )
{ {
d = new Private; d = new Private;
d->valid = FALSE; d->valid = FALSE;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
qt_resolve_gl_symbols(); qt_resolve_gl_symbols();
gpm = 0; gpm = 0;
#endif #endif
setDevice( dev ); setDevice( dev );
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
dc = 0; dc = 0;
win = 0; win = 0;
pixelFormatId = 0; pixelFormatId = 0;
cmap = 0; cmap = 0;
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
d->oldR = TQRect(1, 1, 1, 1); d->oldR = TQRect(1, 1, 1, 1);
#endif #endif
d->crWin = FALSE; d->crWin = FALSE;
@ -1408,7 +1408,7 @@ TQGLWidget::~TQGLWidget()
if ( doRelease ) if ( doRelease )
glXReleaseBuffersMESA( x11Display(), winId() ); glXReleaseBuffersMESA( x11Display(), winId() );
#endif #endif
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
if(gl_pix) { if(gl_pix) {
delete gl_pix; delete gl_pix;
gl_pix = NULL; gl_pix = NULL;
@ -1500,7 +1500,7 @@ bool TQGLWidget::isSharing() const
void TQGLWidget::makeCurrent() void TQGLWidget::makeCurrent()
{ {
#if defined( Q_WS_MAC ) #if defined( TQ_WS_MAC )
macInternalDoubleBuffer(); //make sure the correct context is used macInternalDoubleBuffer(); //make sure the correct context is used
#endif #endif
glcx->makeCurrent(); glcx->makeCurrent();
@ -1535,7 +1535,7 @@ void TQGLWidget::doneCurrent()
void TQGLWidget::swapBuffers() void TQGLWidget::swapBuffers()
{ {
glcx->swapBuffers(); glcx->swapBuffers();
#if defined(Q_WS_MAC) #if defined(TQ_WS_MAC)
if(macInternalDoubleBuffer() && gl_pix) if(macInternalDoubleBuffer() && gl_pix)
bitBlt(this, 0, 0, gl_pix); bitBlt(this, 0, 0, gl_pix);
#endif #endif
@ -1824,7 +1824,7 @@ TQPixmap TQGLWidget::renderPixmap( int w, int h, bool useContext )
if ( (w > 0) && (h > 0) ) if ( (w > 0) && (h > 0) )
sz = TQSize( w, h ); sz = TQSize( w, h );
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
TQPixmap pm( sz.width(), sz.height(), x11Depth() ); TQPixmap pm( sz.width(), sz.height(), x11Depth() );
bool needConversion = x11Visual() != TQPaintDevice::x11AppVisual(); bool needConversion = x11Visual() != TQPaintDevice::x11AppVisual();
@ -1869,7 +1869,7 @@ TQPixmap TQGLWidget::renderPixmap( int w, int h, bool useContext )
ocx->makeCurrent(); ocx->makeCurrent();
if ( success ) { if ( success ) {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
if ( needConversion ) { if ( needConversion ) {
TQImage image = pm.convertToImage(); TQImage image = pm.convertToImage();
TQPixmap p; TQPixmap p;
@ -1894,7 +1894,7 @@ TQPixmap TQGLWidget::renderPixmap( int w, int h, bool useContext )
*/ */
TQImage TQGLWidget::grabFrameBuffer( bool withAlpha ) TQImage TQGLWidget::grabFrameBuffer( bool withAlpha )
{ {
#if defined( Q_WS_MAC ) #if defined( TQ_WS_MAC )
if(dblbuf == macInternalDoubleBuffer(FALSE) && gl_pix) //why not optimize? if(dblbuf == macInternalDoubleBuffer(FALSE) && gl_pix) //why not optimize?
return ((TQPixmap*)gl_pix)->convertToImage(); return ((TQPixmap*)gl_pix)->convertToImage();
#endif #endif
@ -1928,7 +1928,7 @@ TQImage TQGLWidget::grabFrameBuffer( bool withAlpha )
res.setAlphaBuffer( withAlpha && format().alpha() ); res.setAlphaBuffer( withAlpha && format().alpha() );
} }
else { else {
#if defined (Q_WS_WIN) #if defined (TQ_WS_WIN)
res = TQImage( w, h, 8 ); res = TQImage( w, h, 8 );
glReadPixels( 0, 0, w, h, GL_COLOR_INDEX, GL_UNSIGNED_BYTE, glReadPixels( 0, 0, w, h, GL_COLOR_INDEX, GL_UNSIGNED_BYTE,
res.bits() ); res.bits() );
@ -1987,7 +1987,7 @@ void TQGLWidget::glDraw()
swapBuffers(); swapBuffers();
} else { } else {
glFlush(); glFlush();
#if defined( Q_WS_MAC ) #if defined( TQ_WS_MAC )
if(dblbuf && gl_pix) if(dblbuf && gl_pix)
bitBlt(this, 0, 0, gl_pix); bitBlt(this, 0, 0, gl_pix);
#endif #endif

@ -40,7 +40,7 @@
#include "ntqgl.h" #include "ntqgl.h"
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
#include "ntqmap.h" #include "ntqmap.h"
#include "ntqpixmap.h" #include "ntqpixmap.h"

@ -1535,7 +1535,7 @@ void TQODBCDriver::cleanup()
// as two byte unicode characters // as two byte unicode characters
void TQODBCPrivate::checkUnicode() void TQODBCPrivate::checkUnicode()
{ {
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if ( !qt_winunicode ) { if ( !qt_winunicode ) {
unicode = FALSE; unicode = FALSE;
return; return;

@ -18,7 +18,7 @@
#include <ntqregexp.h> #include <ntqregexp.h>
#include <ntqfile.h> #include <ntqfile.h>
#include <ntqptrvector.h> #include <ntqptrvector.h>
#if !defined Q_WS_WIN32 #if !defined TQ_WS_WIN32
# include <unistd.h> # include <unistd.h>
#endif #endif
#include <sqlite.h> #include <sqlite.h>
@ -160,7 +160,7 @@ bool TQSQLiteResultPrivate::fetchNext(TQtSqlCachedResult::RowCache* row)
// keep trying while busy, wish I could implement this better. // keep trying while busy, wish I could implement this better.
while ((res = sqlite_step(currentMachine, &colNum, &fvals, &cnames)) == SQLITE_BUSY) { while ((res = sqlite_step(currentMachine, &colNum, &fvals, &cnames)) == SQLITE_BUSY) {
// sleep instead requesting result again immidiately. // sleep instead requesting result again immidiately.
#if defined Q_WS_WIN32 #if defined TQ_WS_WIN32
Sleep(1000); Sleep(1000);
#else #else
sleep(1); sleep(1);

@ -20,7 +20,7 @@
#include <ntqfile.h> #include <ntqfile.h>
#include <sqlite3.h> #include <sqlite3.h>
#include <ntqptrvector.h> #include <ntqptrvector.h>
#if !defined Q_WS_WIN32 #if !defined TQ_WS_WIN32
# include <unistd.h> # include <unistd.h>
#endif #endif

@ -61,7 +61,7 @@
#include "qpocketpcstyle_wce.h" #include "qpocketpcstyle_wce.h"
#endif #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 TQString p2qstring(const unsigned char *c); //qglobal.cpp
#include "qt_mac.h" #include "qt_mac.h"
#include "qmacstyle_mac.h" #include "qmacstyle_mac.h"
@ -172,7 +172,7 @@ TQStyle *TQStyleFactory::create( const TQString& key )
if ( style == "pocketpc" ) if ( style == "pocketpc" )
ret = new TQPocketPCStyle; ret = new TQPocketPCStyle;
#endif #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" ) if( style.left(9) == "macintosh" )
ret = new TQMacStyle; ret = new TQMacStyle;
#endif #endif
@ -247,7 +247,7 @@ TQStringList TQStyleFactory::keys()
if ( !list.contains( "Aqua" ) ) if ( !list.contains( "Aqua" ) )
list << "Aqua"; list << "Aqua";
#endif #endif
#if !defined( TQT_NO_STYLE_MAC ) && defined( Q_WS_MAC ) #if !defined( TQT_NO_STYLE_MAC ) && defined( TQ_WS_MAC )
TQString mstyle = "Macintosh"; TQString mstyle = "Macintosh";
Collection c = NewCollection(); Collection c = NewCollection();
if (c) { if (c) {

@ -2911,7 +2911,7 @@ void TQTable::paintCell( TQPainter* p, int row, int col,
{ {
if ( cr.width() == 0 || cr.height() == 0 ) if ( cr.width() == 0 || cr.height() == 0 )
return; return;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
const TQColorGroup &cg = ( !drawActiveSelection && style().styleHint( TQStyle::SH_ItemView_ChangeHighlightOnFocus ) ? palette().inactive() : colorGroup() ); const TQColorGroup &cg = ( !drawActiveSelection && style().styleHint( TQStyle::SH_ItemView_ChangeHighlightOnFocus ) ? palette().inactive() : colorGroup() );
#else #else
const TQColorGroup &cg = colorGroup(); const TQColorGroup &cg = colorGroup();

@ -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 MACX - Mac OS X
MAC9 - Mac OS 9 MAC9 - Mac OS 9
@ -565,39 +565,50 @@
#if defined(Q_OS_MAC9) #if defined(Q_OS_MAC9)
# define Q_WS_MAC9 # define Q_WS_MAC9
# define TQ_WS_MAC9
#elif defined(Q_OS_MSDOS) #elif defined(Q_OS_MSDOS)
# define Q_WS_WIN16 # define Q_WS_WIN16
# define TQ_WS_WIN16
# error "TQt requires Win32 and does not work with Windows 3.x" # error "TQt requires Win32 and does not work with Windows 3.x"
#elif defined(_WIN32_X11_) #elif defined(_WIN32_X11_)
# define Q_WS_X11 # define Q_WS_X11
# define TQ_WS_X11
#elif defined(Q_OS_WIN32) #elif defined(Q_OS_WIN32)
# define Q_WS_WIN32 # define Q_WS_WIN32
# define TQ_WS_WIN32
# if defined(Q_OS_WIN64) # if defined(Q_OS_WIN64)
# define Q_WS_WIN64 # define Q_WS_WIN64
# define TQ_WS_WIN64
# endif # endif
#elif defined(Q_OS_OS2) #elif defined(Q_OS_OS2)
# define Q_WS_PM # define Q_WS_PM
# define TQ_WS_PM
# error "TQt does not work with OS/2 Presentation Manager or Workplace Shell" # error "TQt does not work with OS/2 Presentation Manager or Workplace Shell"
#elif defined(Q_OS_UNIX) #elif defined(Q_OS_UNIX)
# if defined(TQWS) # if defined(TQWS)
# define Q_WS_QWS # define Q_WS_QWS
# define TQ_WS_QWS
# define TQT_NO_QWS_IM # define TQT_NO_QWS_IM
# elif defined(Q_OS_MACX) # elif defined(Q_OS_MACX)
# define Q_WS_MACX # define Q_WS_MACX
# define TQ_WS_MACX
# else # else
# define Q_WS_X11 # define Q_WS_X11
# define TQ_WS_X11
# endif # endif
#endif #endif
#if defined(Q_OS_MAC) && !defined(TQMAC_PASCAL) #if defined(Q_OS_MAC) && !defined(TQMAC_PASCAL)
# define TQMAC_PASCAL # define TQMAC_PASCAL
#endif #endif
#if defined(Q_WS_WIN16) || defined(Q_WS_WIN32) #if defined(TQ_WS_WIN16) || defined(TQ_WS_WIN32)
# define Q_WS_WIN # define Q_WS_WIN
# define TQ_WS_WIN
#endif #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 Q_WS_MAC
# define TQ_WS_MAC
#endif #endif
@ -802,7 +813,7 @@ class TQString;
# define TQT_NO_SQL # define TQT_NO_SQL
#endif #endif
#if defined(Q_WS_MAC9) #if defined(TQ_WS_MAC9)
//No need for menu merging //No need for menu merging
# ifndef TQMAC_QMENUBAR_NO_MERGE # ifndef TQMAC_QMENUBAR_NO_MERGE
# define TQMAC_QMENUBAR_NO_MERGE # define TQMAC_QMENUBAR_NO_MERGE
@ -815,7 +826,7 @@ class TQString;
# define TQMAC_QMENUBAR_NO_EVENT # define TQMAC_QMENUBAR_NO_EVENT
# endif # endif
#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 # ifndef TQMAC_NO_QUARTZ
# define TQMAC_NO_QUARTZ # define TQMAC_NO_QUARTZ
# endif # endif
@ -824,7 +835,7 @@ class TQString;
# endif # endif
#endif #endif
#if !defined(Q_WS_QWS) && !defined(TQT_NO_COP) #if !defined(TQ_WS_QWS) && !defined(TQT_NO_COP)
# define TQT_NO_COP # define TQT_NO_COP
#endif #endif
@ -891,7 +902,7 @@ class TQString;
// Some platform specific stuff // Some platform specific stuff
// //
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
extern TQ_EXPORT bool qt_winunicode; extern TQ_EXPORT bool qt_winunicode;
#endif #endif
@ -905,7 +916,7 @@ TQ_EXPORT bool tqSysInfo( int *wordSize, bool *bigEndian );
TQ_EXPORT bool tqSharedBuild(); TQ_EXPORT bool tqSharedBuild();
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
int qMacVersion(); int qMacVersion();
#elif defined(Q_WS_WIN) #elif defined(TQ_WS_WIN)
TQ_EXPORT int qWinVersion(); TQ_EXPORT int qWinVersion();
#if defined(UNICODE) #if defined(UNICODE)
#define QT_WA( uni, ansi ) if ( qt_winunicode ) { uni } else { ansi } #define QT_WA( uni, ansi ) if ( qt_winunicode ) { uni } else { ansi }

@ -311,7 +311,7 @@ public: \
return iface; return iface;
#endif // Q_CREATE_INSTANCE #endif // Q_CREATE_INSTANCE
# ifdef Q_WS_WIN # ifdef TQ_WS_WIN
# ifdef Q_CC_BOR # ifdef Q_CC_BOR
# define Q_EXPORT_COMPONENT() \ # define Q_EXPORT_COMPONENT() \
Q_UCM_VERIFICATION_DATA \ Q_UCM_VERIFICATION_DATA \

@ -56,7 +56,7 @@
#if defined(TQT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
/* /*
TQCriticalSection TQCriticalSection

@ -517,7 +517,7 @@ TQString TQDate::shortMonthName( int month )
month = 1; month = 1;
} }
#endif #endif
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
char buffer[255]; char buffer[255];
tm tt; tm tt;
memset( &tt, 0, sizeof( tm ) ); memset( &tt, 0, sizeof( tm ) );
@ -563,7 +563,7 @@ TQString TQDate::longMonthName( int month )
month = 1; month = 1;
} }
#endif #endif
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
char buffer[255]; char buffer[255];
tm tt; tm tt;
memset( &tt, 0, sizeof( tm ) ); memset( &tt, 0, sizeof( tm ) );
@ -617,7 +617,7 @@ TQString TQDate::shortDayName( int weekday )
weekday = 1; weekday = 1;
} }
#endif #endif
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
char buffer[255]; char buffer[255];
tm tt; tm tt;
memset( &tt, 0, sizeof( tm ) ); memset( &tt, 0, sizeof( tm ) );
@ -665,7 +665,7 @@ TQString TQDate::longDayName( int weekday )
weekday = 1; weekday = 1;
} }
#endif #endif
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
char buffer[255]; char buffer[255];
tm tt; tm tt;
memset( &tt, 0, sizeof( tm ) ); memset( &tt, 0, sizeof( tm ) );
@ -731,7 +731,7 @@ TQString TQDate::toString( TQt::DateFormat f ) const
switch ( f ) { switch ( f ) {
case TQt::LocalDate: case TQt::LocalDate:
{ {
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
tm tt; tm tt;
memset( &tt, 0, sizeof( tm ) ); memset( &tt, 0, sizeof( tm ) );
char buf[255]; char buf[255];
@ -1397,7 +1397,7 @@ TQString TQTime::toString( TQt::DateFormat f ) const
switch ( f ) { switch ( f ) {
case TQt::LocalDate: case TQt::LocalDate:
{ {
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
tm tt; tm tt;
memset( &tt, 0, sizeof( tm ) ); memset( &tt, 0, sizeof( tm ) );
char buf[255]; char buf[255];
@ -2112,7 +2112,7 @@ TQString TQDateTime::toString( TQt::DateFormat f ) const
} }
#ifndef TQT_NO_TEXTDATE #ifndef TQT_NO_TEXTDATE
else if ( f == TQt::TextDate ) { else if ( f == TQt::TextDate ) {
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
TQString buf = d.shortDayName( d.dayOfWeek() ); TQString buf = d.shortDayName( d.dayOfWeek() );
buf += ' '; buf += ' ';
buf += d.shortMonthName( d.month() ); buf += d.shortMonthName( d.month() );

@ -1097,7 +1097,7 @@ char TQDir::separator()
{ {
#if defined(Q_OS_UNIX) #if defined(Q_OS_UNIX)
return '/'; return '/';
#elif defined (Q_FS_FAT) || defined(Q_WS_WIN) #elif defined (Q_FS_FAT) || defined(TQ_WS_WIN)
return '\\'; return '\\';
#elif defined (Q_OS_MAC) #elif defined (Q_OS_MAC)
return ':'; return ':';

@ -625,7 +625,7 @@ void TQFile::setEncodingFunction( EncoderFn f )
static static
TQString locale_decoder( const TQCString &localFileName ) TQString locale_decoder( const TQCString &localFileName )
{ {
#ifndef Q_WS_MAC #ifndef TQ_WS_MAC
return TQString::fromLocal8Bit(localFileName); return TQString::fromLocal8Bit(localFileName);
#else #else
extern TQString qt_mac_precomposeFileName(const TQString &); // qglobal.cpp extern TQString qt_mac_precomposeFileName(const TQString &); // qglobal.cpp

@ -56,7 +56,7 @@
// Be sure to include qplatformdefs.h first! // Be sure to include qplatformdefs.h first!
struct TQFileInfoCache struct TQFileInfoCache
{ {
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
QT_STATBUF st; QT_STATBUF st;
#else #else
struct stat st; struct stat st;

@ -497,7 +497,7 @@ TQDir TQFileInfo::dir( bool absPath ) const
bool TQFileInfo::isReadable() const bool TQFileInfo::isReadable() const
{ {
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
return qt_file_access( fn, R_OK ) && permission( ReadUser ); return qt_file_access( fn, R_OK ) && permission( ReadUser );
#else #else
return qt_file_access( fn, R_OK ); return qt_file_access( fn, R_OK );
@ -512,7 +512,7 @@ bool TQFileInfo::isReadable() const
bool TQFileInfo::isWritable() const bool TQFileInfo::isWritable() const
{ {
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
return qt_file_access( fn, W_OK ) && permission( WriteUser ); return qt_file_access( fn, W_OK ) && permission( WriteUser );
#else #else
return qt_file_access( fn, W_OK ); return qt_file_access( fn, W_OK );
@ -527,7 +527,7 @@ bool TQFileInfo::isWritable() const
bool TQFileInfo::isExecutable() const bool TQFileInfo::isExecutable() const
{ {
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
#if defined(_MSC_VER) && _MSC_VER >= 1400 #if defined(_MSC_VER) && _MSC_VER >= 1400
return permission( ExeUser ); return permission( ExeUser );
#else #else
@ -538,7 +538,7 @@ bool TQFileInfo::isExecutable() const
#endif #endif
} }
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
bool TQFileInfo::isHidden() const bool TQFileInfo::isHidden() const
{ {
return fileName()[ 0 ] == TQChar( '.' ); return fileName()[ 0 ] == TQChar( '.' );

@ -42,7 +42,7 @@
#if defined(Q_CC_BOR) #if defined(Q_CC_BOR)
// needed for qsort() because of a std namespace problem on Borland // needed for qsort() because of a std namespace problem on Borland
# include "qplatformdefs.h" # include "qplatformdefs.h"
#elif defined(Q_WS_WIN) #elif defined(TQ_WS_WIN)
// needed for bsearch on some platforms // needed for bsearch on some platforms
# include "qt_windows.h" # include "qt_windows.h"
#endif #endif

@ -56,7 +56,7 @@
# endif # endif
#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_FREEBSD) && defined(Q_CC_INTEL)) \
|| (defined(Q_OS_IRIX) && defined(Q_CC_GNU)) || (defined(Q_OS_IRIX) && defined(Q_CC_GNU))
#define TQT_NO_LIBRARY_UNLOAD #define TQT_NO_LIBRARY_UNLOAD
@ -192,7 +192,7 @@ TQLibrary::~TQLibrary()
with \c MY_EXPORT defined as with \c MY_EXPORT defined as
\code \code
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
# define MY_EXPORT __declspec(dllexport) # define MY_EXPORT __declspec(dllexport)
#else #else
# define MY_EXPORT # define MY_EXPORT
@ -398,7 +398,7 @@ TQString TQLibrary::library() const
TQString filename = libfile; TQString filename = libfile;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if ( filename.findRev( '.' ) <= filename.findRev( '/' ) ) if ( filename.findRev( '.' ) <= filename.findRev( '/' ) )
filename += ".dll"; filename += ".dll";
#else #else

@ -66,7 +66,7 @@ class TQLibraryPrivate
public: public:
TQLibraryPrivate( TQLibrary *lib ); TQLibraryPrivate( TQLibrary *lib );
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
HINSTANCE pHnd; HINSTANCE pHnd;
#else #else
void *pHnd; void *pHnd;

@ -1858,7 +1858,7 @@ const char* TQLocalePrivate::systemLocaleName()
lang = mac_ret; lang = mac_ret;
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if ( !lang.isEmpty() ) { if ( !lang.isEmpty() ) {
long id = 0; long id = 0;
bool ok = false; bool ok = false;

@ -339,7 +339,7 @@ void TQSettingsHeading::read(const TQString &filename)
if (! TQFileInfo(filename).exists()) if (! TQFileInfo(filename).exists())
return; return;
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
HANDLE lockfd = openlock( filename, Q_LOCKREAD ); HANDLE lockfd = openlock( filename, Q_LOCKREAD );
#endif #endif
@ -362,7 +362,7 @@ void TQSettingsHeading::read(const TQString &filename)
file.close(); file.close();
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
closelock( lockfd ); closelock( lockfd );
#endif #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 "qt_windows.h"
#include "ntqlibrary.h" #include "ntqlibrary.h"
@ -462,7 +462,7 @@ void TQSettingsHeading::parseLine(TQTextStream &stream)
TQSettingsPrivate::TQSettingsPrivate( TQSettings::Format format ) TQSettingsPrivate::TQSettingsPrivate( TQSettings::Format format )
: groupDirty( TRUE ), modified(FALSE), globalScope(TRUE) : 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 ) if ( format != TQSettings::Ini )
return; return;
#else #else
@ -483,7 +483,7 @@ TQSettingsPrivate::TQSettingsPrivate( TQSettings::Format format )
TQString appSettings(home); TQString appSettings(home);
TQString defPath; TQString defPath;
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
#ifdef Q_OS_TEMP #ifdef Q_OS_TEMP
TCHAR path[MAX_PATH]; TCHAR path[MAX_PATH];
SHGetSpecialFolderPath( 0, path, CSIDL_APPDATA, FALSE ); 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) 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 ) { if ( d->sysd ) {
d->sysInsertSearchPath( s, path ); d->sysInsertSearchPath( s, path );
return; return;
} }
#endif #endif
#if !defined(Q_WS_WIN) #if !defined(TQ_WS_WIN)
if ( s == Windows ) if ( s == Windows )
return; return;
#endif #endif
@ -832,7 +832,7 @@ void TQSettings::insertSearchPath( System s, const TQString &path)
return; 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 ) { if ( d->sysd && s != Unix ) {
#else #else
if ( s != Unix ) { if ( s != Unix ) {
@ -844,7 +844,7 @@ void TQSettings::insertSearchPath( System s, const TQString &path)
} }
TQString realPath = path; TQString realPath = path;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
TQString defPath = d->globalScope ? d->searchPaths.first() : d->searchPaths.last(); TQString defPath = d->globalScope ? d->searchPaths.first() : d->searchPaths.last();
realPath = defPath + path; realPath = defPath + path;
#endif #endif
@ -872,13 +872,13 @@ void TQSettings::removeSearchPath( System s, const TQString &path)
return; return;
} }
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
if ( d->sysd ) { if ( d->sysd ) {
d->sysRemoveSearchPath( s, path ); d->sysRemoveSearchPath( s, path );
return; return;
} }
#endif #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 ) { if ( d->sysd && s != Unix ) {
#else #else
if ( s != Unix ) { if ( s != Unix ) {
@ -907,7 +907,7 @@ TQSettings::TQSettings()
d = new TQSettingsPrivate( Native ); d = new TQSettingsPrivate( Native );
TQ_CHECK_PTR(d); 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->sysd = 0;
d->sysInit(); d->sysInit();
#endif #endif
@ -927,7 +927,7 @@ TQSettings::TQSettings( Format format )
d = new TQSettingsPrivate( format ); d = new TQSettingsPrivate( format );
TQ_CHECK_PTR(d); 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->sysd = 0;
if ( format == Native ) if ( format == Native )
d->sysInit(); d->sysInit();
@ -945,7 +945,7 @@ TQSettings::~TQSettings()
{ {
sync(); 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 ) if ( d->sysd )
d->sysClear(); d->sysClear();
#endif #endif
@ -960,7 +960,7 @@ TQSettings::~TQSettings()
*/ */
bool TQSettings::sync() 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 ) if ( d->sysd )
return d->sysSync(); return d->sysSync();
#endif #endif
@ -992,7 +992,7 @@ bool TQSettings::sync()
if ((fi.exists() && fi.isFile() && fi.isWritable()) || if ((fi.exists() && fi.isFile() && fi.isWritable()) ||
(! fi.exists() && di.isDir() (! fi.exists() && di.isDir()
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
&& di.isWritable() && di.isWritable()
#else #else
&& ((qWinVersion()&TQt::WV_NT_based) > TQt::WV_2000 || di.isWritable()) && ((qWinVersion()&TQt::WV_NT_based) > TQt::WV_2000 || di.isWritable())
@ -1015,7 +1015,7 @@ bool TQSettings::sync()
continue; continue;
} }
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
HANDLE lockfd = openlock( filename, Q_LOCKWRITE ); HANDLE lockfd = openlock( filename, Q_LOCKWRITE );
#endif #endif
@ -1089,7 +1089,7 @@ bool TQSettings::sync()
// remove temporary file // remove temporary file
file.remove(); file.remove();
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
closelock( lockfd ); closelock( lockfd );
#endif #endif
} }
@ -1127,7 +1127,7 @@ bool TQSettings::readBoolEntry(const TQString &key, bool def, bool *ok )
return def; 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 ) if ( d->sysd )
return d->sysReadBoolEntry( grp_key, def, ok ); return d->sysReadBoolEntry( grp_key, def, ok );
#endif #endif
@ -1179,7 +1179,7 @@ double TQSettings::readDoubleEntry(const TQString &key, double def, bool *ok )
return def; 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 ) if ( d->sysd )
return d->sysReadDoubleEntry( grp_key, def, ok ); return d->sysReadDoubleEntry( grp_key, def, ok );
#endif #endif
@ -1224,7 +1224,7 @@ int TQSettings::readNumEntry(const TQString &key, int def, bool *ok )
return def; 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 ) if ( d->sysd )
return d->sysReadNumEntry( grp_key, def, ok ); return d->sysReadNumEntry( grp_key, def, ok );
#endif #endif
@ -1270,7 +1270,7 @@ TQString TQSettings::readEntry(const TQString &key, const TQString &def, bool *o
return def; 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 ) if ( d->sysd )
return d->sysReadEntry( grp_key, def, ok ); return d->sysReadEntry( grp_key, def, ok );
#endif #endif
@ -1349,7 +1349,7 @@ bool TQSettings::writeEntry(const TQString &key, bool value)
return FALSE; 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 ) if ( d->sysd )
return d->sysWriteEntry( grp_key, value ); return d->sysWriteEntry( grp_key, value );
#endif #endif
@ -1380,7 +1380,7 @@ bool TQSettings::writeEntry(const TQString &key, double value)
return FALSE; 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 ) if ( d->sysd )
return d->sysWriteEntry( grp_key, value ); return d->sysWriteEntry( grp_key, value );
#endif #endif
@ -1410,7 +1410,7 @@ bool TQSettings::writeEntry(const TQString &key, int value)
return FALSE; 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 ) if ( d->sysd )
return d->sysWriteEntry( grp_key, value ); return d->sysWriteEntry( grp_key, value );
#endif #endif
@ -1463,7 +1463,7 @@ bool TQSettings::writeEntry(const TQString &key, const TQString &value)
return FALSE; 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 ) if ( d->sysd )
return d->sysWriteEntry( grp_key, value ); return d->sysWriteEntry( grp_key, value );
#endif #endif
@ -1526,7 +1526,7 @@ bool TQSettings::removeEntry(const TQString &key)
return FALSE; 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 ) if ( d->sysd )
return d->sysRemoveEntry( grp_key ); return d->sysRemoveEntry( grp_key );
#endif #endif
@ -1606,7 +1606,7 @@ TQStringList TQSettings::entryList(const TQString &key) const
return TQStringList(); 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 ) if ( d->sysd )
return d->sysEntryList( grp_key ); return d->sysEntryList( grp_key );
#endif #endif
@ -1714,7 +1714,7 @@ TQStringList TQSettings::subkeyList(const TQString &key) const
return TQStringList(); 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 ) if ( d->sysd )
return d->sysSubkeyList( grp_key ); return d->sysSubkeyList( grp_key );
#endif #endif
@ -1809,7 +1809,7 @@ TQDateTime TQSettings::lastModificationTime( const TQString &key )
return TQDateTime(); 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 ) if ( d->sysd )
return TQDateTime(); return TQDateTime();
#endif #endif
@ -2038,7 +2038,7 @@ void TQSettings::setPath( const TQString &domain, const TQString &product, Scope
TQString actualSearchPath; TQString actualSearchPath;
int lastDot = domain.findRev( '.' ); int lastDot = domain.findRev( '.' );
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
actualSearchPath = "/" + domain.mid( 0, lastDot ) + "/" + product; actualSearchPath = "/" + domain.mid( 0, lastDot ) + "/" + product;
insertSearchPath( Windows, actualSearchPath ); insertSearchPath( Windows, actualSearchPath );
#elif !defined(TQWS) && defined(Q_OS_MAC) #elif !defined(TQWS) && defined(Q_OS_MAC)

@ -108,7 +108,7 @@ public:
bool modified :1; bool modified :1;
bool globalScope :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 dependent implementations to use the
// system specific setting database (ie. registry on Windows) // system specific setting database (ie. registry on Windows)

@ -68,7 +68,7 @@
#ifndef Q_OS_TEMP #ifndef Q_OS_TEMP
#include <locale.h> #include <locale.h>
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
#include "qt_windows.h" #include "qt_windows.h"
#endif #endif
#if defined(Q_OS_LINUX) #if defined(Q_OS_LINUX)
@ -6261,23 +6261,23 @@ TQCString TQString::local8Bit() const
*d->cString = TQCString(latin1()); *d->cString = TQCString(latin1());
return *d->cString; return *d->cString;
#else #else
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
TQTextCodec* codec = TQTextCodec::codecForLocale(); TQTextCodec* codec = TQTextCodec::codecForLocale();
*d->cString = codec ? codec->fromUnicode(*this) : TQCString(latin1()); *d->cString = codec ? codec->fromUnicode(*this) : TQCString(latin1());
return *d->cString; return *d->cString;
#endif #endif
#if defined( Q_WS_MACX ) #if defined( TQ_WS_MACX )
return utf8(); return utf8();
#endif #endif
#if defined( Q_WS_MAC9 ) #if defined( TQ_WS_MAC9 )
*d->cString = TQCString(latin1()); //I'm evil.. *d->cString = TQCString(latin1()); //I'm evil..
return *d->cString; return *d->cString;
#endif #endif
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
*d->cString = isNull() ? TQCString("") : qt_winTQString2MB( *this ); *d->cString = isNull() ? TQCString("") : qt_winTQString2MB( *this );
return *d->cString; return *d->cString;
#endif #endif
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
return utf8(); // ### if there is any 8 bit format supported? return utf8(); // ### if there is any 8 bit format supported?
#endif #endif
#endif #endif
@ -6307,7 +6307,7 @@ TQString TQString::fromLocal8Bit( const char* local8Bit, int len )
if ( !local8Bit ) if ( !local8Bit )
return TQString::null; return TQString::null;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
TQTextCodec* codec = TQTextCodec::codecForLocale(); TQTextCodec* codec = TQTextCodec::codecForLocale();
if ( len < 0 ) if ( len < 0 )
len = strlen( local8Bit ); len = strlen( local8Bit );
@ -6315,18 +6315,18 @@ TQString TQString::fromLocal8Bit( const char* local8Bit, int len )
? codec->toUnicode( local8Bit, len ) ? codec->toUnicode( local8Bit, len )
: fromLatin1( local8Bit, len ); : fromLatin1( local8Bit, len );
#endif #endif
#if defined( Q_WS_MAC ) #if defined( TQ_WS_MAC )
return fromUtf8(local8Bit,len); return fromUtf8(local8Bit,len);
#endif #endif
// Should this be OS_WIN32? // Should this be OS_WIN32?
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
if ( len >= 0 ) { if ( len >= 0 ) {
TQCString s(local8Bit,len+1); TQCString s(local8Bit,len+1);
return qt_winMB2TQString(s); return qt_winMB2TQString(s);
} }
return qt_winMB2TQString( local8Bit ); return qt_winMB2TQString( local8Bit );
#endif #endif
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
return fromUtf8(local8Bit,len); return fromUtf8(local8Bit,len);
#endif #endif
#endif // TQT_NO_TEXTCODEC #endif // TQT_NO_TEXTCODEC
@ -6757,7 +6757,7 @@ int TQString::localeAwareCompare( const TQString& s ) const
if ( isEmpty() || s.isEmpty() ) if ( isEmpty() || s.isEmpty() )
return compare( s ); return compare( s );
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
int res; int res;
QT_WA( { QT_WA( {
const TCHAR* s1 = (TCHAR*)ucs2(); const TCHAR* s1 = (TCHAR*)ucs2();
@ -6777,7 +6777,7 @@ int TQString::localeAwareCompare( const TQString& s ) const
default: default:
return 0; return 0;
} }
#elif defined(Q_WS_MACX) #elif defined(TQ_WS_MACX)
int delta = 0; int delta = 0;
#if !defined(TQT_NO_TEXTCODEC) #if !defined(TQT_NO_TEXTCODEC)
TQTextCodec *codec = TQTextCodec::codecForLocale(); TQTextCodec *codec = TQTextCodec::codecForLocale();
@ -6787,7 +6787,7 @@ int TQString::localeAwareCompare( const TQString& s ) const
#endif #endif
delta = ucstrcmp(*this, s); delta = ucstrcmp(*this, s);
return delta; return delta;
#elif defined(Q_WS_X11) #elif defined(TQ_WS_X11)
// declared in <string.h> // declared in <string.h>
int delta = strcoll( local8Bit(), s.local8Bit() ); int delta = strcoll( local8Bit(), s.local8Bit() );
if ( delta == 0 ) if ( delta == 0 )

@ -248,7 +248,7 @@ inline int scriptForChar( ushort uc )
return script; return script;
} }
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#define SCRIPT_FOR_CHAR( script, c ) \ #define SCRIPT_FOR_CHAR( script, c ) \
do { \ do { \
unsigned short _uc = (c).unicode(); \ unsigned short _uc = (c).unicode(); \

@ -86,7 +86,7 @@ public:
void activateItemAt( int index ); 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 initialize();
static void cleanup(); static void cleanup();
#endif #endif
@ -160,7 +160,7 @@ private:
friend class TQPopupMenu; 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 TQWidget;
friend class TQApplication; friend class TQApplication;
friend void qt_mac_set_modal_state(bool, TQMenuBar *); friend void qt_mac_set_modal_state(bool, TQMenuBar *);

@ -165,7 +165,7 @@ private:
TQAccel *autoaccel; TQAccel *autoaccel;
#endif #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); bool macPopupMenu(const TQPoint &, int);
uint mac_dirty_popup : 1; uint mac_dirty_popup : 1;
#endif #endif

@ -48,7 +48,7 @@
#endif // QT_H #endif // QT_H
#ifndef TQT_NO_WIDGETPLUGIN #ifndef TQT_NO_WIDGETPLUGIN
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
#ifdef QT_PLUGIN #ifdef QT_PLUGIN
#define QT_WIDGET_PLUGIN_EXPORT __declspec(dllexport) #define QT_WIDGET_PLUGIN_EXPORT __declspec(dllexport)
#else #else

@ -193,7 +193,7 @@ void TQCheckBox::drawButton( TQPainter *paint )
TQRect irect = TQStyle::visualRect( style().subRect(TQStyle::SR_CheckBoxIndicator, this), this ); TQRect irect = TQStyle::visualRect( style().subRect(TQStyle::SR_CheckBoxIndicator, this), this );
const TQColorGroup &cg = colorGroup(); 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 # define SAVE_CHECKBOX_PIXMAPS
#endif #endif
#if defined(SAVE_CHECKBOX_PIXMAPS) #if defined(SAVE_CHECKBOX_PIXMAPS)

@ -444,7 +444,7 @@ void TQComboBoxData::setListBox( TQListBox *l )
lBox = l; lBox = l;
usingLBox = TRUE; usingLBox = TRUE;
l->setMouseTracking( TRUE ); l->setMouseTracking( TRUE );
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
l->x11SetWindowType( TQWidget::X11WindowTypeCombo ); l->x11SetWindowType( TQWidget::X11WindowTypeCombo );
l->x11SetWindowTransient( combo->topLevelWidget()); l->x11SetWindowTransient( combo->topLevelWidget());
#endif #endif
@ -455,7 +455,7 @@ void TQComboBoxData::setPopupMenu( TQComboBoxPopup * pm, bool isPopup )
pop = pm; pop = pm;
if(isPopup) if(isPopup)
usingLBox = FALSE; usingLBox = FALSE;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
if( pm ) { if( pm ) {
pm->x11SetWindowType( TQWidget::X11WindowTypeCombo ); pm->x11SetWindowType( TQWidget::X11WindowTypeCombo );
pm->x11SetWindowTransient( combo->topLevelWidget()); pm->x11SetWindowTransient( combo->topLevelWidget());

@ -52,7 +52,7 @@
#include "ntqstring.h" #include "ntqstring.h"
#include "ntqstyle.h" #include "ntqstyle.h"
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
#include "qt_windows.h" #include "qt_windows.h"
#endif #endif
@ -111,7 +111,7 @@ static void readLocaleSettings()
lDateSep = new TQString(); lDateSep = new TQString();
lTimeSep = new TQString(); lTimeSep = new TQString();
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
QT_WA( { QT_WA( {
TCHAR data[10]; TCHAR data[10];
GetLocaleInfo( LOCALE_USER_DEFAULT, LOCALE_SDATE, 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 // 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 ); TQString sep = d.mid( TQMIN( dpos, mpos ) + 2, TQABS( dpos - mpos ) - 2 );
if ( d.contains( sep ) == 2 ) { if ( d.contains( sep ) == 2 ) {
*lDateSep = sep; *lDateSep = sep;
@ -178,7 +178,7 @@ static void readLocaleSettings()
#endif #endif
} }
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
TQString t = TQTime( 11, 22, 33 ).toString( TQt::LocalDate ); TQString t = TQTime( 11, 22, 33 ).toString( TQt::LocalDate );
dpos = t.find( "11" ); dpos = t.find( "11" );
mpos = t.find( "22" ); mpos = t.find( "22" );

@ -57,10 +57,10 @@
#include "ntqcursor.h" #include "ntqcursor.h"
#include "ntqstyle.h" #include "ntqstyle.h"
#if defined(Q_WS_MAC9) #if defined(TQ_WS_MAC9)
#define MAC_DRAG_HACK #define MAC_DRAG_HACK
#endif #endif
#ifdef Q_WS_MACX #ifdef TQ_WS_MACX
static bool default_opaque = TRUE; static bool default_opaque = TRUE;
#else #else
static bool default_opaque = FALSE; static bool default_opaque = FALSE;
@ -393,7 +393,7 @@ TQDockWindowHandle::TQDockWindowHandle( TQDockWindow *dw )
ctrlDown = FALSE; ctrlDown = FALSE;
timer = new TQTimer( this ); timer = new TQTimer( this );
connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( minimize() ) ); connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( minimize() ) );
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
setCursor( SizeAllCursor ); setCursor( SizeAllCursor );
#endif #endif
} }
@ -476,7 +476,7 @@ void TQDockWindowHandle::mouseReleaseEvent( TQMouseEvent *e )
return; return;
dockWindow->endRectDraw( !opaque ); dockWindow->endRectDraw( !opaque );
mousePressed = FALSE; mousePressed = FALSE;
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
releaseMouse(); releaseMouse();
#endif #endif
if ( !hadDblClick && offset == e->pos() ) { if ( !hadDblClick && offset == e->pos() ) {
@ -613,7 +613,7 @@ void TQDockWindowTitleBar::mousePressEvent( TQMouseEvent *e )
oldFocus = tqApp->focusWidget(); oldFocus = tqApp->focusWidget();
// setFocus activates the window, which deactivates the main window // setFocus activates the window, which deactivates the main window
// not what we want, and not required anyway on Windows // not what we want, and not required anyway on Windows
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
setFocus(); setFocus();
#endif #endif
@ -631,7 +631,7 @@ void TQDockWindowTitleBar::mousePressEvent( TQMouseEvent *e )
dockWindow->startRectDraw( mapToGlobal( e->pos() ), !opaque ); dockWindow->startRectDraw( mapToGlobal( e->pos() ), !opaque );
// grabMouse resets the Windows mouse press count, so we never receive a double click on Windows // 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 // 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()) if(!oldPressed && dockWindow->opaqueMoving())
grabMouse(); grabMouse();
#else #else
@ -1271,7 +1271,7 @@ void TQDockWindow::updateGui()
verHandle->show(); verHandle->show();
else else
verHandle->hide(); verHandle->hide();
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
if(horHandle->mousePressed) { if(horHandle->mousePressed) {
horHandle->mousePressed = FALSE; horHandle->mousePressed = FALSE;
verHandle->mousePressed = TRUE; verHandle->mousePressed = TRUE;
@ -1285,7 +1285,7 @@ void TQDockWindow::updateGui()
else else
horHandle->hide(); horHandle->hide();
horHandle->updateGui(); horHandle->updateGui();
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
if(verHandle->mousePressed) { if(verHandle->mousePressed) {
verHandle->mousePressed = FALSE; verHandle->mousePressed = FALSE;
horHandle->mousePressed = TRUE; horHandle->mousePressed = TRUE;

@ -109,7 +109,7 @@ TQAlphaWidget::TQAlphaWidget( TQWidget* w, WFlags f )
: TQWidget( TQApplication::desktop()->screen(TQApplication::desktop()->screenNumber(w)), : TQWidget( TQApplication::desktop()->screen(TQApplication::desktop()->screenNumber(w)),
"qt internal alpha effect widget", f ) "qt internal alpha effect widget", f )
{ {
#if 1 //ndef Q_WS_WIN #if 1 //ndef TQ_WS_WIN
setEnabled( FALSE ); setEnabled( FALSE );
#endif #endif
@ -255,7 +255,7 @@ void TQAlphaWidget::render()
if ( widget ) { if ( widget ) {
if ( !showWidget ) { if ( !showWidget ) {
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
setEnabled(TRUE); setEnabled(TRUE);
setFocus(); setFocus();
#endif #endif
@ -381,7 +381,7 @@ TQRollEffect::TQRollEffect( TQWidget* w, WFlags f, DirFlags orient )
: TQWidget( TQApplication::desktop()->screen(TQApplication::desktop()->screenNumber(w)), : TQWidget( TQApplication::desktop()->screen(TQApplication::desktop()->screenNumber(w)),
"qt internal roll effect widget", f ), orientation(orient) "qt internal roll effect widget", f ), orientation(orient)
{ {
#if 1 //ndef Q_WS_WIN #if 1 //ndef TQ_WS_WIN
setEnabled( FALSE ); setEnabled( FALSE );
#endif #endif
widget = (TQAccessWidget*) w; widget = (TQAccessWidget*) w;
@ -584,7 +584,7 @@ void TQRollEffect::scroll()
tqApp->removeEventFilter( this ); tqApp->removeEventFilter( this );
if ( widget ) { if ( widget ) {
if ( !showWidget ) { if ( !showWidget ) {
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
setEnabled(TRUE); setEnabled(TRUE);
setFocus(); setFocus();
#endif #endif
@ -635,7 +635,7 @@ void qScrollEffect( TQWidget* w, TQEffects::DirFlags orient, int time )
tqApp->sendPostedEvents( w, TQEvent::Move ); tqApp->sendPostedEvents( w, TQEvent::Move );
tqApp->sendPostedEvents( w, TQEvent::Resize ); tqApp->sendPostedEvents( w, TQEvent::Resize );
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
uint flags = TQt::WStyle_Customize | TQt::WNoAutoErase | TQt::WStyle_StaysOnTop uint flags = TQt::WStyle_Customize | TQt::WNoAutoErase | TQt::WStyle_StaysOnTop
| (w->isPopup() ? TQt::WType_Popup : (TQt::WX11BypassWM | TQt::WStyle_Tool)); | (w->isPopup() ? TQt::WType_Popup : (TQt::WX11BypassWM | TQt::WStyle_Tool));
#else #else
@ -660,7 +660,7 @@ void qFadeEffect( TQWidget* w, int time )
tqApp->sendPostedEvents( w, TQEvent::Move ); tqApp->sendPostedEvents( w, TQEvent::Move );
tqApp->sendPostedEvents( w, TQEvent::Resize ); tqApp->sendPostedEvents( w, TQEvent::Resize );
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
uint flags = TQt::WStyle_Customize | TQt::WNoAutoErase | TQt::WStyle_StaysOnTop uint flags = TQt::WStyle_Customize | TQt::WNoAutoErase | TQt::WStyle_StaysOnTop
| (w->isPopup() ? TQt::WType_Popup : (TQt::WX11BypassWM | TQt::WStyle_Tool)); | (w->isPopup() ? TQt::WType_Popup : (TQt::WX11BypassWM | TQt::WStyle_Tool));
#else #else

@ -125,14 +125,14 @@ static const char * const unknown_xpm[] = {
static TQPixmap *unknown_icon = 0; static TQPixmap *unknown_icon = 0;
static TQPixmap *qiv_buffer_pixmap = 0; static TQPixmap *qiv_buffer_pixmap = 0;
#if !defined(Q_WS_X11) #if !defined(TQ_WS_X11)
static TQPixmap *qiv_selection = 0; static TQPixmap *qiv_selection = 0;
#endif #endif
static bool optimize_layout = FALSE; static bool optimize_layout = FALSE;
static TQCleanupHandler<TQPixmap> qiv_cleanup_pixmap; static TQCleanupHandler<TQPixmap> qiv_cleanup_pixmap;
#if !defined(Q_WS_X11) #if !defined(TQ_WS_X11)
static void createSelectionPixmap( const TQColorGroup &cg ) static void createSelectionPixmap( const TQColorGroup &cg )
{ {
TQBitmap m( 2, 2 ); TQBitmap m( 2, 2 );
@ -2022,7 +2022,7 @@ void TQIconViewItem::paintItem( TQPainter *p, const TQColorGroup &cg )
p2.end(); p2.end();
buffer->setMask( mask ); buffer->setMask( mask );
p2.begin( buffer ); p2.begin( buffer );
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
p2.fillRect( pix->rect(), TQBrush( cg.highlight(), TQBrush::Dense4Pattern) ); p2.fillRect( pix->rect(), TQBrush( cg.highlight(), TQBrush::Dense4Pattern) );
#else // in WIN32 Dense4Pattern doesn't work correctly (transparency problem), so work around it #else // in WIN32 Dense4Pattern doesn't work correctly (transparency problem), so work around it
if ( iconView()->d->drawActiveSelection ) { if ( iconView()->d->drawActiveSelection ) {
@ -2832,7 +2832,7 @@ void TQIconView::styleChange( TQStyle& old )
item->calcRect(); item->calcRect();
} }
#if !defined(Q_WS_X11) #if !defined(TQ_WS_X11)
delete qiv_selection; delete qiv_selection;
qiv_selection = 0; qiv_selection = 0;
#endif #endif

@ -1407,7 +1407,7 @@ bool TQLineEdit::event( TQEvent * e )
case Key_Z: case Key_Z:
case Key_Left: case Key_Left:
case Key_Right: case Key_Right:
#if defined (Q_WS_WIN) #if defined (TQ_WS_WIN)
case Key_Insert: case Key_Insert:
case Key_Delete: case Key_Delete:
#endif #endif
@ -1591,7 +1591,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
if ( !t.isEmpty() && (!e->ascii() || e->ascii()>=32) && if ( !t.isEmpty() && (!e->ascii() || e->ascii()>=32) &&
e->key() != Key_Delete && e->key() != Key_Delete &&
e->key() != Key_Backspace ) { e->key() != Key_Backspace ) {
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
extern bool tqt_hebrew_keyboard_hack; extern bool tqt_hebrew_keyboard_hack;
if ( tqt_hebrew_keyboard_hack ) { if ( tqt_hebrew_keyboard_hack ) {
// the X11 keyboard layout is broken and does not reverse // the X11 keyboard layout is broken and does not reverse
@ -1616,7 +1616,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
if ( e->state() & ControlButton ) { if ( e->state() & ControlButton ) {
switch ( e->key() ) { switch ( e->key() ) {
case Key_A: case Key_A:
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
home( e->state() & ShiftButton ); home( e->state() & ShiftButton );
#else #else
selectAll(); selectAll();
@ -1655,7 +1655,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
d->finishChange( priorState ); d->finishChange( priorState );
} }
break; break;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
case Key_U: case Key_U:
if ( !d->readOnly ) if ( !d->readOnly )
clear(); clear();
@ -1672,7 +1672,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
del(); del();
} }
break; break;
#if defined (Q_WS_WIN) #if defined (TQ_WS_WIN)
case Key_Insert: case Key_Insert:
copy(); copy();
break; break;
@ -1736,20 +1736,20 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
} }
break; break;
case Key_Home: case Key_Home:
#ifdef Q_WS_MACX #ifdef TQ_WS_MACX
case Key_Up: case Key_Up:
#endif #endif
home( e->state() & ShiftButton ); home( e->state() & ShiftButton );
break; break;
case Key_End: case Key_End:
#ifdef Q_WS_MACX #ifdef TQ_WS_MACX
case Key_Down: case Key_Down:
#endif #endif
end( e->state() & ShiftButton ); end( e->state() & ShiftButton );
break; break;
case Key_Delete: case Key_Delete:
if ( !d->readOnly ) { if ( !d->readOnly ) {
#if defined (Q_WS_WIN) #if defined (TQ_WS_WIN)
if ( e->state() & ShiftButton ) { if ( e->state() & ShiftButton ) {
cut(); cut();
break; break;
@ -1758,7 +1758,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
del(); del();
} }
break; break;
#if defined (Q_WS_WIN) #if defined (TQ_WS_WIN)
case Key_Insert: case Key_Insert:
if ( !d->readOnly && e->state() & ShiftButton ) if ( !d->readOnly && e->state() & ShiftButton )
paste(); paste();
@ -2242,7 +2242,7 @@ TQPopupMenu *TQLineEdit::createPopupMenu()
popup->insertItem( tr( "Clear" ) ); popup->insertItem( tr( "Clear" ) );
popup->insertSeparator(); popup->insertSeparator();
popup->insertItem( tr( "Select All" ) popup->insertItem( tr( "Select All" )
#ifndef Q_WS_X11 #ifndef TQ_WS_X11
+ ACCEL_KEY( A ) + ACCEL_KEY( A )
#endif #endif
); );

@ -62,7 +62,7 @@
#include "ntqdockarea.h" #include "ntqdockarea.h"
#include "ntqstringlist.h" #include "ntqstringlist.h"
#include "ntqstyle.h" #include "ntqstyle.h"
#ifdef Q_WS_MACX #ifdef TQ_WS_MACX
# include "qt_mac.h" # include "qt_mac.h"
#endif #endif
@ -893,7 +893,7 @@ TQMainWindow::TQMainWindow( TQWidget * parent, const char * name, WFlags f )
: TQWidget( parent, name, f ) : TQWidget( parent, name, f )
{ {
d = new TQMainWindowPrivate; d = new TQMainWindowPrivate;
#ifdef Q_WS_MACX #ifdef TQ_WS_MACX
d->opaque = TRUE; d->opaque = TRUE;
#else #else
d->opaque = FALSE; d->opaque = FALSE;
@ -1239,7 +1239,7 @@ bool TQMainWindow::isDockEnabled( TQDockWindow *tb, Dock dock ) const
void TQMainWindow::addDockWindow( TQDockWindow *dockWindow, void TQMainWindow::addDockWindow( TQDockWindow *dockWindow,
Dock edge, bool newLine ) Dock edge, bool newLine )
{ {
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
if(isTopLevel() && edge == DockTop) if(isTopLevel() && edge == DockTop)
ChangeWindowAttributes((WindowPtr)handle(), kWindowToolbarButtonAttribute, 0); ChangeWindowAttributes((WindowPtr)handle(), kWindowToolbarButtonAttribute, 0);
#endif #endif
@ -1407,7 +1407,7 @@ void TQMainWindow::moveDockWindow( TQDockWindow * dockWindow, Dock edge, bool nl
void TQMainWindow::removeDockWindow( TQDockWindow * dockWindow ) void TQMainWindow::removeDockWindow( TQDockWindow * dockWindow )
{ {
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
if(isTopLevel() && dockWindow->area() == topDock() && !dockWindows( DockTop ).count()) if(isTopLevel() && dockWindow->area() == topDock() && !dockWindows( DockTop ).count())
ChangeWindowAttributes((WindowPtr)handle(), 0, kWindowToolbarButtonAttribute); ChangeWindowAttributes((WindowPtr)handle(), 0, kWindowToolbarButtonAttribute);
#endif #endif

@ -71,7 +71,7 @@ public:
static bool inMenu = FALSE; static bool inMenu = FALSE;
#endif #endif
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
extern int qt_xfocusout_grab_counter; // defined in qapplication_x11.cpp extern int qt_xfocusout_grab_counter; // defined in qapplication_x11.cpp
#endif #endif
@ -265,7 +265,7 @@ static const int gtkItemVMargin = 8;
TQMenuBar::TQMenuBar( TQWidget *parent, const char *name ) TQMenuBar::TQMenuBar( TQWidget *parent, const char *name )
: TQFrame( parent, name, WNoAutoErase ) : 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_eaten_menubar = FALSE;
mac_d = 0; mac_d = 0;
macCreateNativeMenubar(); macCreateNativeMenubar();
@ -334,7 +334,7 @@ TQMenuBar::~TQMenuBar()
#ifndef TQT_NO_ACCEL #ifndef TQT_NO_ACCEL
delete autoaccel; delete autoaccel;
#endif #endif
#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE) #if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
macRemoveNativeMenubar(); macRemoveNativeMenubar();
#endif #endif
if ( irects ) // Avoid purify complaint. if ( irects ) // Avoid purify complaint.
@ -354,7 +354,7 @@ void TQMenuBar::updateItem( int id )
repaint( irects[i], FALSE ); 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; static bool fromFrameChange = FALSE;
#endif #endif
@ -436,7 +436,7 @@ void TQMenuBar::performDelayedStateChanged()
void TQMenuBar::performDelayedChanges() 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. // I must do this here as the values change in the function below.
bool needMacUpdate = (pendingDelayedContentsChanges || pendingDelayedStateChanges); bool needMacUpdate = (pendingDelayedContentsChanges || pendingDelayedStateChanges);
#endif #endif
@ -444,7 +444,7 @@ void TQMenuBar::performDelayedChanges()
performDelayedContentsChanged(); performDelayedContentsChanged();
if( pendingDelayedStateChanges ) if( pendingDelayedStateChanges )
performDelayedStateChanged(); 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) { if(mac_eaten_menubar && needMacUpdate) {
macDirtyNativeMenubar(); macDirtyNativeMenubar();
@ -485,11 +485,11 @@ void TQMenuBar::menuDelPopup( TQPopupMenu *popup )
void TQMenuBar::frameChanged() 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; fromFrameChange = TRUE;
#endif #endif
menuContentsChanged(); menuContentsChanged();
#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE) #if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
fromFrameChange = FALSE; fromFrameChange = FALSE;
#endif #endif
} }
@ -580,7 +580,7 @@ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event )
// Start waiting for Alt release on focus widget // Start waiting for Alt release on focus widget
} else if ( ke->stateAfter() == AltButton ) { } else if ( ke->stateAfter() == AltButton ) {
waitforalt = 1; waitforalt = 1;
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
TQMenuData::d->aInt = qt_xfocusout_grab_counter; TQMenuData::d->aInt = qt_xfocusout_grab_counter;
#endif #endif
if ( f && f != object ) if ( f && f != object )
@ -606,7 +606,7 @@ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event )
(object->parent() == 0 && ((TQWidget*)object)->focusWidget() == 0) ) { (object->parent() == 0 && ((TQWidget*)object)->focusWidget() == 0) ) {
if ( waitforalt && event->type() == TQEvent::KeyRelease && if ( waitforalt && event->type() == TQEvent::KeyRelease &&
( ke->key() == Key_Alt || ke->key() == Key_Meta ) ( 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 && TQMenuData::d->aInt == qt_xfocusout_grab_counter
#endif #endif
) { ) {
@ -664,7 +664,7 @@ void TQMenuBar::subHighlighted( int id )
#ifndef TQT_NO_ACCEL #ifndef TQT_NO_ACCEL
void TQMenuBar::accelActivated( int id ) 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) if(mac_eaten_menubar)
return; return;
#endif #endif
@ -823,7 +823,7 @@ void TQMenuBar::show()
performDelayedChanges(); performDelayedChanges();
calculateRects(); 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(mac_eaten_menubar) {
//If all elements are invisible no reason for me to be visible either //If all elements are invisible no reason for me to be visible either
bool all_hidden = TRUE; bool all_hidden = TRUE;
@ -942,7 +942,7 @@ int TQMenuBar::calculateRects( int max_width )
int w=0, h=0; int w=0, h=0;
if ( !mi->isVisible() 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() ) || (mac_eaten_menubar && !mi->custom() && !mi->widget() )
#endif #endif
) { ) {
@ -978,14 +978,14 @@ int TQMenuBar::calculateRects( int max_width )
separator = i; //### only motif? separator = i; //### only motif?
} }
if ( !mi->isSeparator() || mi->widget() ) { 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 ) { if ( !mac_eaten_menubar ) {
#endif #endif
if ( gs == MotifStyle && mi->isVisible() ) { if ( gs == MotifStyle && mi->isVisible() ) {
w += 2*motifItemFrame; w += 2*motifItemFrame;
h += 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 #endif
@ -1189,7 +1189,7 @@ void TQMenuBar::drawContents( TQPainter *p )
style().drawControl(TQStyle::CE_MenuBarEmptyArea, p, this, contentsRect(), g); style().drawControl(TQStyle::CE_MenuBarEmptyArea, p, this, contentsRect(), g);
p->restore(); 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 ) if ( !mac_eaten_menubar )
#endif #endif
{ {

@ -303,7 +303,7 @@ TQPopupMenu::TQPopupMenu( TQWidget *parent, const char *name )
connectModalRecursionSafety = 0; connectModalRecursionSafety = 0;
setFocusPolicy( StrongFocus ); setFocusPolicy( StrongFocus );
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
x11SetWindowType( X11WindowTypePopup ); x11SetWindowType( X11WindowTypePopup );
#endif #endif
} }
@ -373,7 +373,7 @@ void TQPopupMenu::menuContentsChanged()
// here the part that can't be delayed // here the part that can't be delayed
TQMenuData::menuContentsChanged(); TQMenuData::menuContentsChanged();
badSize = TRUE; // might change the size 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; mac_dirty_popup = 1;
#endif #endif
if( pendingDelayedContentsChanges ) if( pendingDelayedContentsChanges )
@ -404,7 +404,7 @@ void TQPopupMenu::performDelayedContentsChanged()
p->updateSize(TRUE); p->updateSize(TRUE);
p->update(); 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; mac_dirty_popup = 1;
#endif #endif
} }
@ -468,7 +468,7 @@ void TQPopupMenu::frameChanged()
TQRect TQPopupMenu::screenRect( const TQPoint& pos ) TQRect TQPopupMenu::screenRect( const TQPoint& pos )
{ {
int screen_num = TQApplication::desktop()->screenNumber( pos ); int screen_num = TQApplication::desktop()->screenNumber( pos );
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
return TQApplication::desktop()->availableGeometry( screen_num ); return TQApplication::desktop()->availableGeometry( screen_num );
#else #else
return TQApplication::desktop()->screenGeometry( screen_num ); return TQApplication::desktop()->screenGeometry( screen_num );
@ -497,7 +497,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint )
if ( isVisible() || !isEnabled() ) if ( isVisible() || !isEnabled() )
return; 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 )) if( macPopupMenu(pos, indexAtPoint ))
return; return;
#endif #endif
@ -553,7 +553,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint )
if ( y < sy ) if ( y < sy )
y = sy; y = sy;
} }
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
#ifndef TQT_NO_MENUBAR #ifndef TQT_NO_MENUBAR
TQMenuData *top = this; // find top level TQMenuData *top = this; // find top level
while ( top->parentMenu ) while ( top->parentMenu )
@ -2746,7 +2746,7 @@ void TQPopupMenu::toggleTearOff()
geometry().topLeft(), FALSE ); geometry().topLeft(), FALSE );
p->mitems->setAutoDelete( FALSE ); p->mitems->setAutoDelete( FALSE );
p->tornOff = TRUE; p->tornOff = TRUE;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
p->x11SetWindowType( X11WindowTypeMenu ); p->x11SetWindowType( X11WindowTypeMenu );
#endif #endif
for ( TQMenuItemListIt it( *mitems ); it.current(); ++it ) { for ( TQMenuItemListIt it( *mitems ); it.current(); ++it ) {

@ -197,7 +197,7 @@ void TQRadioButton::drawButton( TQPainter *paint )
TQRect irect = TQStyle::visualRect( style().subRect(TQStyle::SR_RadioButtonIndicator, this), this ); TQRect irect = TQStyle::visualRect( style().subRect(TQStyle::SR_RadioButtonIndicator, this), this );
const TQColorGroup &cg = colorGroup(); 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 # define SAVE_RADIOBUTTON_PIXMAPS
#endif #endif
#if defined(SAVE_RADIOBUTTON_PIXMAPS) #if defined(SAVE_RADIOBUTTON_PIXMAPS)

@ -52,7 +52,7 @@
#include "ntqtimer.h" #include "ntqtimer.h"
#include "ntqstyle.h" #include "ntqstyle.h"
#include "ntqlistview.h" #include "ntqlistview.h"
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
# include "qt_mac.h" # include "qt_mac.h"
#endif #endif
@ -892,7 +892,7 @@ void TQScrollView::updateScrollBars()
else else
showv = needv; showv = needv;
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
bool mac_need_scroll = FALSE; bool mac_need_scroll = FALSE;
if(!parentWidget()) { if(!parentWidget()) {
mac_need_scroll = TRUE; mac_need_scroll = TRUE;

@ -213,7 +213,7 @@ void TQSplashScreen::clear()
void TQSplashScreen::finish( TQWidget *mainWin ) void TQSplashScreen::finish( TQWidget *mainWin )
{ {
if ( mainWin ) { if ( mainWin ) {
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
extern void tqt_wait_for_window_manager( TQWidget *mainWin ); extern void tqt_wait_for_window_manager( TQWidget *mainWin );
tqt_wait_for_window_manager( mainWin ); tqt_wait_for_window_manager( mainWin );
#endif #endif

@ -52,7 +52,7 @@
#include "ntqaccessible.h" #include "ntqaccessible.h"
#endif #endif
#ifdef Q_WS_MACX #ifdef TQ_WS_MACX
#include <qmacstyle_mac.h> #include <qmacstyle_mac.h>
#endif #endif
@ -618,7 +618,7 @@ void TQTabBar::paint( TQPainter * p, TQTab * t, bool selected ) const
int w = iw + fw + 4; int w = iw + fw + 4;
int h = TQMAX(fm.height() + 4, ih ); int h = TQMAX(fm.height() + 4, ih );
int offset = 3; int offset = 3;
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
if (::tqt_cast<TQMacStyle *>(&style())) { if (::tqt_cast<TQMacStyle *>(&style())) {
offset = 0; offset = 0;
} }
@ -920,7 +920,7 @@ void TQTabBar::setCurrentTab( TQTab * tab )
if ( tab->r.intersects( r ) ) { if ( tab->r.intersects( r ) ) {
repaint( r.unite( tab->r ), FALSE ); repaint( r.unite( tab->r ), FALSE );
} else { } else {
#ifdef Q_WS_MACX #ifdef TQ_WS_MACX
update(); update();
#else #else
repaint( r, FALSE ); repaint( r, FALSE );

@ -1179,7 +1179,7 @@ bool TQTextEdit::event( TQEvent *e )
case Key_Down: case Key_Down:
case Key_Home: case Key_Home:
case Key_End: case Key_End:
#if defined (Q_WS_WIN) #if defined (TQ_WS_WIN)
case Key_Insert: case Key_Insert:
case Key_Delete: case Key_Delete:
#endif #endif
@ -1191,7 +1191,7 @@ bool TQTextEdit::event( TQEvent *e )
default: default:
switch ( ke->key() ) { switch ( ke->key() ) {
#if defined (Q_WS_WIN) #if defined (TQ_WS_WIN)
case Key_Insert: case Key_Insert:
ke->accept(); ke->accept();
#endif #endif
@ -1296,7 +1296,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
} }
break; break;
case Key_Delete: case Key_Delete:
#if defined (Q_WS_WIN) #if defined (TQ_WS_WIN)
if ( e->state() & ShiftButton ) { if ( e->state() & ShiftButton ) {
cut(); cut();
break; break;
@ -1314,7 +1314,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
case Key_Insert: case Key_Insert:
if ( e->state() & ShiftButton ) if ( e->state() & ShiftButton )
paste(); paste();
#if defined (Q_WS_WIN) #if defined (TQ_WS_WIN)
else if ( e->state() & ControlButton ) else if ( e->state() & ControlButton )
copy(); copy();
#endif #endif
@ -1322,7 +1322,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
setOverwriteMode( !isOverwriteMode() ); setOverwriteMode( !isOverwriteMode() );
break; break;
case Key_Backspace: case Key_Backspace:
#if defined (Q_WS_WIN) #if defined (TQ_WS_WIN)
if ( e->state() & AltButton ) { if ( e->state() & AltButton ) {
if (e->state() & ControlButton ) { if (e->state() & ControlButton ) {
break; break;
@ -1450,7 +1450,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
clearUndoRedoInfo = FALSE; clearUndoRedoInfo = FALSE;
} }
TQString t = e->text(); TQString t = e->text();
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
extern bool tqt_hebrew_keyboard_hack; extern bool tqt_hebrew_keyboard_hack;
if ( tqt_hebrew_keyboard_hack ) { if ( tqt_hebrew_keyboard_hack ) {
// the X11 keyboard layout is broken and does not reverse // the X11 keyboard layout is broken and does not reverse
@ -1486,7 +1486,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
indent(); indent();
break; break;
case Key_A: case Key_A:
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
moveCursor( MoveLineStart, e->state() & ShiftButton ); moveCursor( MoveLineStart, e->state() & ShiftButton );
#else #else
selectAll( TRUE ); selectAll( TRUE );
@ -1539,7 +1539,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
case Key_K: case Key_K:
doKeyboardAction( ActionKill ); doKeyboardAction( ActionKill );
break; break;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
case Key_Insert: case Key_Insert:
copy(); copy();
break; break;
@ -1942,7 +1942,7 @@ void TQTextEdit::removeSelectedText( int selNum )
ensureCursorVisible(); ensureCursorVisible();
drawCursor( TRUE ); drawCursor( TRUE );
clearUndoRedo(); clearUndoRedo();
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
// there seems to be a problem with repainting or erasing the area // there seems to be a problem with repainting or erasing the area
// of the scrollview which is not the contents on windows // of the scrollview which is not the contents on windows
if ( contentsHeight() < visibleHeight() ) if ( contentsHeight() < visibleHeight() )
@ -1977,7 +1977,7 @@ void TQTextEdit::moveCursor( CursorAction action, bool select )
if ( d->optimMode ) if ( d->optimMode )
return; return;
#endif #endif
#ifdef Q_WS_MACX #ifdef TQ_WS_MACX
TQTextCursor c1 = *cursor; TQTextCursor c1 = *cursor;
TQTextCursor c2; TQTextCursor c2;
#endif #endif
@ -1986,7 +1986,7 @@ void TQTextEdit::moveCursor( CursorAction action, bool select )
if ( !doc->hasSelection( TQTextDocument::Standard ) ) if ( !doc->hasSelection( TQTextDocument::Standard ) )
doc->setSelectionStart( TQTextDocument::Standard, *cursor ); doc->setSelectionStart( TQTextDocument::Standard, *cursor );
moveCursor( action ); moveCursor( action );
#ifdef Q_WS_MACX #ifdef TQ_WS_MACX
c2 = *cursor; c2 = *cursor;
if (c1 == c2) if (c1 == c2)
if (action == MoveDown || action == MovePgDown) if (action == MoveDown || action == MovePgDown)
@ -2004,7 +2004,7 @@ void TQTextEdit::moveCursor( CursorAction action, bool select )
emit selectionChanged(); emit selectionChanged();
emit copyAvailable( doc->hasSelection( TQTextDocument::Standard ) ); emit copyAvailable( doc->hasSelection( TQTextDocument::Standard ) );
} else { } else {
#ifdef Q_WS_MACX #ifdef TQ_WS_MACX
TQTextCursor cStart = doc->selectionStartCursor( TQTextDocument::Standard ); TQTextCursor cStart = doc->selectionStartCursor( TQTextDocument::Standard );
TQTextCursor cEnd = doc->selectionEndCursor( TQTextDocument::Standard ); TQTextCursor cEnd = doc->selectionEndCursor( TQTextDocument::Standard );
bool redraw = doc->removeSelection( 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 case Key_C: case Key_F16: // Copy key on Sun keyboards
copy(); copy();
break; break;
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
case Key_Insert: case Key_Insert:
copy(); copy();
break; break;
@ -5655,7 +5655,7 @@ TQPopupMenu *TQTextEdit::createPopupMenu( const TQPoint& pos )
d->id[ IdClear ] = popup->insertItem( tr( "Clear" ) ); d->id[ IdClear ] = popup->insertItem( tr( "Clear" ) );
popup->insertSeparator(); popup->insertSeparator();
} }
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
d->id[ IdSelectAll ] = popup->insertItem( tr( "Select All" ) ); d->id[ IdSelectAll ] = popup->insertItem( tr( "Select All" ) );
#else #else
d->id[ IdSelectAll ] = popup->insertItem( tr( "Select All" ) + ACCEL_KEY( A ) ); d->id[ IdSelectAll ] = popup->insertItem( tr( "Select All" ) + ACCEL_KEY( A ) );

@ -58,7 +58,7 @@
#ifndef TQT_NO_WORKSPACE #ifndef TQT_NO_WORKSPACE
#include "ntqworkspace.h" #include "ntqworkspace.h"
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
#include "qt_windows.h" #include "qt_windows.h"
#endif #endif
@ -191,7 +191,7 @@ TQTitleBar::~TQTitleBar()
d = 0; d = 0;
} }
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
extern TQRgb qt_colorref2qrgb(COLORREF col); extern TQRgb qt_colorref2qrgb(COLORREF col);
#endif #endif
@ -201,7 +201,7 @@ void TQTitleBar::readColors()
bool colorsInitialized = FALSE; bool colorsInitialized = FALSE;
#ifdef Q_WS_WIN // ask system properties on windows #ifdef TQ_WS_WIN // ask system properties on windows
#ifndef SPI_GETGRADIENTCAPTIONS #ifndef SPI_GETGRADIENTCAPTIONS
#define SPI_GETGRADIENTCAPTIONS 0x1008 #define SPI_GETGRADIENTCAPTIONS 0x1008
#endif #endif
@ -233,7 +233,7 @@ void TQTitleBar::readColors()
} }
} }
} }
#endif // Q_WS_WIN #endif // TQ_WS_WIN
if ( !colorsInitialized ) { if ( !colorsInitialized ) {
pal.setColor( TQPalette::Active, TQColorGroup::Highlight, palette().active().highlight() ); pal.setColor( TQPalette::Active, TQColorGroup::Highlight, palette().active().highlight() );
pal.setColor( TQPalette::Active, TQColorGroup::Base, palette().active().highlight() ); pal.setColor( TQPalette::Active, TQColorGroup::Base, palette().active().highlight() );

@ -475,7 +475,7 @@ bool TQTipManager::eventFilter( TQObject *obj, TQEvent *e )
void TQTipManager::showTip() void TQTipManager::showTip()
{ {
if ( !widget || !globally_enabled if ( !widget || !globally_enabled
#ifndef Q_WS_X11 #ifndef TQ_WS_X11
|| !widget->isActiveWindow() || !widget->isActiveWindow()
#endif #endif
) )
@ -505,7 +505,7 @@ void TQTipManager::showTip()
scr = TQApplication::desktop()->screenNumber( widget ); scr = TQApplication::desktop()->screenNumber( widget );
if ( label if ( label
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
&& label->x11Screen() == widget->x11Screen() && label->x11Screen() == widget->x11Screen()
#endif #endif
) { ) {
@ -533,11 +533,11 @@ void TQTipManager::showTip()
if (!widget) if (!widget)
return; return;
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
label->x11SetWindowTransient( widget->topLevelWidget()); label->x11SetWindowTransient( widget->topLevelWidget());
#endif #endif
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
TQRect screen = TQApplication::desktop()->availableGeometry( scr ); TQRect screen = TQApplication::desktop()->availableGeometry( scr );
#else #else
TQRect screen = TQApplication::desktop()->screenGeometry( scr ); TQRect screen = TQApplication::desktop()->screenGeometry( scr );
@ -545,7 +545,7 @@ void TQTipManager::showTip()
TQPoint p; TQPoint p;
if ( t->geometry == TQRect( -1, -1, -1, -1 ) ) { if ( t->geometry == TQRect( -1, -1, -1, -1 ) ) {
p = widget->mapToGlobal( pos ) + p = widget->mapToGlobal( pos ) +
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
TQPoint( 2, 24 ); TQPoint( 2, 24 );
#else #else
TQPoint( 2, 16 ); TQPoint( 2, 16 );

@ -54,7 +54,7 @@
#if defined(QT_ACCESSIBILITY_SUPPORT) #if defined(QT_ACCESSIBILITY_SUPPORT)
#include "ntqaccessible.h" #include "ntqaccessible.h"
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
#include "qt_windows.h" #include "qt_windows.h"
#ifndef SPI_GETDROPSHADOW #ifndef SPI_GETDROPSHADOW
#define SPI_GETDROPSHADOW 0x1024 #define SPI_GETDROPSHADOW 0x1024
@ -277,7 +277,7 @@ TQWhatsThat::TQWhatsThat( TQWidget* w, const TQString& txt, TQWidget* parent, co
AlignAuto + AlignTop + WordBreak + ExpandTabs, AlignAuto + AlignTop + WordBreak + ExpandTabs,
text ); text );
} }
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if ( (qWinVersion()&WV_NT_based) > WV_2000 ) { if ( (qWinVersion()&WV_NT_based) > WV_2000 ) {
BOOL shadow; BOOL shadow;
SystemParametersInfo( SPI_GETDROPSHADOW, 0, &shadow, 0 ); SystemParametersInfo( SPI_GETDROPSHADOW, 0, &shadow, 0 );
@ -365,13 +365,13 @@ void TQWhatsThat::keyPressEvent( TQKeyEvent* )
void TQWhatsThat::paintEvent( TQPaintEvent* ) void TQWhatsThat::paintEvent( TQPaintEvent* )
{ {
bool drawShadow = TRUE; bool drawShadow = TRUE;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if ( (qWinVersion()&WV_NT_based) > WV_2000 ) { if ( (qWinVersion()&WV_NT_based) > WV_2000 ) {
BOOL shadow; BOOL shadow;
SystemParametersInfo( SPI_GETDROPSHADOW, 0, &shadow, 0 ); SystemParametersInfo( SPI_GETDROPSHADOW, 0, &shadow, 0 );
drawShadow = !shadow; 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 drawShadow = FALSE; //never draw it on OS X we get it for free
#endif #endif
@ -657,7 +657,7 @@ void TQWhatsThisPrivate::say( TQWidget * widget, const TQString &text, const TQP
delete whatsThat; delete whatsThat;
whatsThat = new TQWhatsThat( whatsThat = new TQWhatsThat(
widget, text, widget, text,
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
TQApplication::desktop()->screen( widget ? TQApplication::desktop()->screen( widget ?
widget->x11Screen() : widget->x11Screen() :
TQCursor::x11Screen() ), TQCursor::x11Screen() ),
@ -671,11 +671,11 @@ void TQWhatsThisPrivate::say( TQWidget * widget, const TQString &text, const TQP
int scr = ( widget ? int scr = ( widget ?
TQApplication::desktop()->screenNumber( widget ) : TQApplication::desktop()->screenNumber( widget ) :
#if defined(Q_WS_X11) #if defined(TQ_WS_X11)
TQCursor::x11Screen() TQCursor::x11Screen()
#else #else
TQApplication::desktop()->screenNumber( ppos ) TQApplication::desktop()->screenNumber( ppos )
#endif // Q_WS_X11 #endif // TQ_WS_X11
); );
TQRect screen = TQApplication::desktop()->screenGeometry( scr ); TQRect screen = TQApplication::desktop()->screenGeometry( scr );

@ -45,7 +45,7 @@
#include "ntqapplication.h" #include "ntqapplication.h"
#include "ntqcursor.h" #include "ntqcursor.h"
#include "ntqsizegrip.h" #include "ntqsizegrip.h"
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
#include "qt_windows.h" #include "qt_windows.h"
#endif #endif
@ -299,7 +299,7 @@ void TQWidgetResizeHandler::mouseMoveEvent( TQMouseEvent *e )
widget->setGeometry( geom ); widget->setGeometry( geom );
} }
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
MSG msg; MSG msg;
QT_WA( { QT_WA( {
while(PeekMessageW( &msg, widget->winId(), WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE )) while(PeekMessageW( &msg, widget->winId(), WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE ))

@ -297,13 +297,13 @@ TQWorkspace::init()
d->px = 0; d->px = 0;
d->py = 0; d->py = 0;
d->becomeActive = 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; d->wmode = AutoDetect;
#else #else
d->wmode = MDI; d->wmode = MDI;
#endif #endif
d->mainwindow = 0; d->mainwindow = 0;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
d->popup = new TQPopupMenu( this, "qt_internal_mdi_popup" ); d->popup = new TQPopupMenu( this, "qt_internal_mdi_popup" );
d->toolPopup = new TQPopupMenu( this, "qt_internal_mdi_popup" ); d->toolPopup = new TQPopupMenu( this, "qt_internal_mdi_popup" );
#else #else

@ -323,7 +323,7 @@ void HelpDialog::loadIndexFile()
if (!indexFile.open(IO_ReadOnly)) { if (!indexFile.open(IO_ReadOnly)) {
TQMessageBox::warning(help, tr("TQt Assistant"), tr("Failed to load keyword index file\n" TQMessageBox::warning(help, tr("TQt Assistant"), tr("Failed to load keyword index file\n"
"Assistant will not work!")); "Assistant will not work!"));
#if defined Q_WS_WIN || defined Q_WS_MACX #if defined TQ_WS_WIN || defined TQ_WS_MACX
startTimer(50); startTimer(50);
#endif #endif
return; return;

@ -146,7 +146,7 @@ TQAssistantClient::TQAssistantClient( const TQString &path, TQObject *parent, co
#if defined(Q_OS_MACX) #if defined(Q_OS_MACX)
assistantCommand += ".app/Contents/MacOS/assistant"; assistantCommand += ".app/Contents/MacOS/assistant";
#elif defined(Q_WS_WIN) #elif defined(TQ_WS_WIN)
if (!assistantCommand.endsWith(".exe")) if (!assistantCommand.endsWith(".exe"))
assistantCommand += ".exe"; assistantCommand += ".exe";
#endif #endif

@ -48,7 +48,7 @@
#include <stdio.h> #include <stdio.h>
#include <ntqtextcodec.h> #include <ntqtextcodec.h>
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
#define INDEX_CHECK( text ) if( i+1 >= argc ) { TQMessageBox::information( 0, "TQt Assistant", text ); return 1; } #define INDEX_CHECK( text ) if( i+1 >= argc ) { TQMessageBox::information( 0, "TQt Assistant", text ); return 1; }
#else #else
#define INDEX_CHECK( text ) if( i+1 >= argc ) { fprintf( stderr, text "\n" ); return 1; } #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(); arg = arg.lower();
if ( arg == "-addcontentfile" if ( arg == "-addcontentfile"
|| arg == "-removecontentfile" || arg == "-removecontentfile"
#ifndef Q_WS_WIN #ifndef TQ_WS_WIN
|| arg == "-help" || arg == "-help"
#endif #endif
) )
@ -267,7 +267,7 @@ int main( int argc, char ** argv )
" -resourceDir assistant will load translations from\n" " -resourceDir assistant will load translations from\n"
" this directory.\n" " this directory.\n"
" -help shows this help."); " -help shows this help.");
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
TQMessageBox::information( 0, "TQt Assistant", "<pre>" + helpText + "</pre>" ); TQMessageBox::information( 0, "TQt Assistant", "<pre>" + helpText + "</pre>" );
#else #else
printf( "%s\n", helpText.latin1() ); printf( "%s\n", helpText.latin1() );

@ -46,13 +46,13 @@
TQPtrList<MainWindow> *MainWindow::windows = 0; TQPtrList<MainWindow> *MainWindow::windows = 0;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
extern TQ_EXPORT int qt_ntfs_permission_lookup; extern TQ_EXPORT int qt_ntfs_permission_lookup;
#endif #endif
void MainWindow::init() void MainWindow::init()
{ {
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
// Workaround for TQMimeSourceFactory failing in TQFileInfo::isReadable() for // Workaround for TQMimeSourceFactory failing in TQFileInfo::isReadable() for
// certain user configs. See task: 34372 // certain user configs. See task: 34372
qt_ntfs_permission_lookup = 0; qt_ntfs_permission_lookup = 0;
@ -679,7 +679,7 @@ void MainWindow::forwardAvailable( bool enable )
void MainWindow::updateProfileSettings() void MainWindow::updateProfileSettings()
{ {
Config *config = Config::configuration(); Config *config = Config::configuration();
#ifndef Q_WS_MACX #ifndef TQ_WS_MACX
setIcon( config->applicationIcon() ); setIcon( config->applicationIcon() );
#endif #endif
helpMenu->clear(); helpMenu->clear();

@ -57,7 +57,7 @@
# undef raise # undef raise
#endif #endif
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
#include <qt_windows.h> #include <qt_windows.h>
#include <process.h> #include <process.h>
#endif #endif

@ -41,7 +41,7 @@
#include <ntqsettings.h> #include <ntqsettings.h>
#include <ntqsplashscreen.h> #include <ntqsplashscreen.h>
#ifdef Q_WS_WIN #ifdef TQ_WS_WIN
#include <qt_windows.h> #include <qt_windows.h>
#include <process.h> #include <process.h>
#endif #endif
@ -61,7 +61,7 @@ void set_splash_status( const TQString &txt )
TQ_EXPORT DesignerApplication::DesignerApplication( int &argc, char **argv ) TQ_EXPORT DesignerApplication::DesignerApplication( int &argc, char **argv )
: TQApplication( argc, argv ) : TQApplication( argc, argv )
{ {
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
if ( winVersion() & TQt::WV_NT_based ) if ( winVersion() & TQt::WV_NT_based )
DESIGNER_OPENFILE = RegisterWindowMessage((TCHAR*)"QT_DESIGNER_OPEN_FILE"); DESIGNER_OPENFILE = RegisterWindowMessage((TCHAR*)"QT_DESIGNER_OPEN_FILE");
else else
@ -136,7 +136,7 @@ void DesignerApplication::setSettingsKey( const TQString &key )
*settings_key = key; *settings_key = key;
} }
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
bool DesignerApplication::winEventFilter( MSG *msg ) bool DesignerApplication::winEventFilter( MSG *msg )
{ {
if ( msg->message == DESIGNER_OPENFILE ) { if ( msg->message == DESIGNER_OPENFILE ) {

@ -55,7 +55,7 @@ public:
protected: protected:
TQDateTime lastMod; TQDateTime lastMod;
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
bool winEventFilter( MSG *msg ); bool winEventFilter( MSG *msg );
uint DESIGNER_OPENFILE; uint DESIGNER_OPENFILE;
#endif #endif

@ -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 <qt_windows.h> #include <qt_windows.h>
static void flickerfree_update( TQWidget *w ) static void flickerfree_update( TQWidget *w )
{ {
@ -844,7 +844,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
sizePreviewLabel->setGeometry( lg ); sizePreviewLabel->setGeometry( lg );
sizePreviewLabel->raise(); sizePreviewLabel->raise();
sizePreviewLabel->show(); sizePreviewLabel->show();
#if defined(Q_WS_WIN32) #if defined(TQ_WS_WIN32)
windowsRepaintWorkaroundTimer->start( 100, TRUE ); windowsRepaintWorkaroundTimer->start( 100, TRUE );
#endif #endif
} else { // if we don't need to move, do some indication } else { // if we don't need to move, do some indication
@ -1605,14 +1605,14 @@ void FormWindow::resizeEvent( TQResizeEvent *e )
if ( isVisible() ) if ( isVisible() )
formFile()->setModified( TRUE, FormFile::WFormWindow ); formFile()->setModified( TRUE, FormFile::WFormWindow );
#if defined(Q_WS_WIN32) #if defined(TQ_WS_WIN32)
windowsRepaintWorkaroundTimer->start( 100, TRUE ); windowsRepaintWorkaroundTimer->start( 100, TRUE );
#endif #endif
} }
void FormWindow::windowsRepaintWorkaroundTimerTimeout() void FormWindow::windowsRepaintWorkaroundTimerTimeout()
{ {
#if defined(Q_WS_WIN32) #if defined(TQ_WS_WIN32)
TQObjectList *l = queryList( "TQWidget" ); TQObjectList *l = queryList( "TQWidget" );
for ( TQObject *o = l->first(); o; o = l->next() ) { for ( TQObject *o = l->first(); o; o = l->next() ) {
flickerfree_update( (TQWidget*)o ); flickerfree_update( (TQWidget*)o );

@ -187,7 +187,7 @@ TQ_EXPORT MainWindow::MainWindow( bool asClient, bool single, const TQString &pl
if ( !single ) if ( !single )
tqApp->setMainWidget( this ); tqApp->setMainWidget( this );
TQWidgetFactory::addWidgetFactory( new CustomWidgetFactory ); TQWidgetFactory::addWidgetFactory( new CustomWidgetFactory );
#ifndef Q_WS_MACX #ifndef TQ_WS_MACX
setIcon( TQPixmap::fromMimeSource( "designer_appicon.png" ) ); setIcon( TQPixmap::fromMimeSource( "designer_appicon.png" ) );
#endif #endif
@ -2400,7 +2400,7 @@ void MainWindow::readConfig()
if ( !restoreConfig ) if ( !restoreConfig )
return; 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 /* 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 in TQLayout, it gets into a very large loop - and seems it has to do with clever
things the designer does ###Sam */ things the designer does ###Sam */

@ -159,7 +159,7 @@ void MainWindow::setupEditActions()
actionEditDelete->setWhatsThis( whatsThisFrom( "Edit|Delete" ) ); actionEditDelete->setWhatsThis( whatsThisFrom( "Edit|Delete" ) );
connect( actionEditDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) ); connect( actionEditDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) );
actionEditDelete->setEnabled( FALSE ); actionEditDelete->setEnabled( FALSE );
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
TQAction *macDelete = new TQAction( tr( "Delete" ), TQPixmap(), tr( "&Delete" ), Key_Backspace, this, 0 ); TQAction *macDelete = new TQAction( tr( "Delete" ), TQPixmap(), tr( "&Delete" ), Key_Backspace, this, 0 );
connect( macDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) ); connect( macDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) );
#endif #endif

@ -588,7 +588,7 @@ TQString Project::makeRelative( const TQString &f )
return f; return f;
TQString p = TQFileInfo( filename ).dirPath( TRUE ); TQString p = TQFileInfo( filename ).dirPath( TRUE );
TQString f2 = f; TQString f2 = f;
#if defined(Q_WS_WIN32) #if defined(TQ_WS_WIN32)
if ( p.endsWith("/") ) if ( p.endsWith("/") )
p = p.left( p.length() - 1 ); p = p.left( p.length() - 1 );
if ( f2.left( p.length() ).lower() == p.lower() ) if ( f2.left( p.length() ).lower() == p.lower() )

@ -95,7 +95,7 @@
static TQFontDatabase *fontDataBase = 0; static TQFontDatabase *fontDataBase = 0;
TQString assistantPath(); TQString assistantPath();
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
#include <ntqwindowsstyle.h> #include <ntqwindowsstyle.h>
static void setupStyle(TQWidget *w) static void setupStyle(TQWidget *w)
{ {
@ -443,7 +443,7 @@ void PropertyItem::placeEditor( TQWidget *w )
TQRect r = listview->itemRect( this ); TQRect r = listview->itemRect( this );
if ( !r.size().isValid() ) { if ( !r.size().isValid() ) {
listview->ensureItemVisible( this ); listview->ensureItemVisible( this );
#if defined(Q_WS_WIN) #if defined(TQ_WS_WIN)
listview->repaintContents( FALSE ); listview->repaintContents( FALSE );
#endif #endif
r = listview->itemRect( this ); r = listview->itemRect( this );

@ -108,7 +108,7 @@ static TQString entitize( const TQString &s, bool attribute = FALSE )
return s2; return s2;
} }
#ifdef Q_WS_MACX #ifdef TQ_WS_MACX
static struct { static struct {
int key; int key;
const char* name; const char* name;
@ -205,7 +205,7 @@ static struct {
#endif #endif
static TQString platformNeutralKeySequence(const TQKeySequence &ks) static TQString platformNeutralKeySequence(const TQKeySequence &ks)
{ {
#ifndef Q_WS_MACX #ifndef TQ_WS_MACX
return TQString(ks); return TQString(ks);
#else #else
uint k; uint k;

@ -286,7 +286,7 @@ Workspace::Workspace( TQWidget *parent, MainWindow *mw )
header()->hide(); header()->hide();
setSorting( 0 ); setSorting( 0 );
setResizePolicy( TQScrollView::Manual ); setResizePolicy( TQScrollView::Manual );
#ifndef Q_WS_MAC #ifndef TQ_WS_MAC
TQPalette p( palette() ); TQPalette p( palette() );
p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) ); p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) );
(void)*selectedBack; // hack (void)*selectedBack; // hack

@ -43,7 +43,7 @@
// on embedded, we do not compress image data. Rationale: by mapping // on embedded, we do not compress image data. Rationale: by mapping
// the ready-only data directly into memory we are both faster and // the ready-only data directly into memory we are both faster and
// more memory efficient // 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 #define TQT_NO_IMAGE_COLLECTION_COMPRESSION
#endif #endif

@ -231,7 +231,7 @@ TrWindow::TrWindow()
: TQMainWindow( 0, "translation window", WType_TopLevel | WDestructiveClose ) : TQMainWindow( 0, "translation window", WType_TopLevel | WDestructiveClose )
{ {
#ifndef Q_WS_MACX #ifndef TQ_WS_MACX
setIcon( TQPixmap::fromMimeSource( "appicon.png" ) ); setIcon( TQPixmap::fromMimeSource( "appicon.png" ) );
#endif #endif

@ -43,7 +43,7 @@
#include <ntqmainwindow.h> #include <ntqmainwindow.h>
#include <ntqmessagebox.h> #include <ntqmessagebox.h>
#include <ntqpainter.h> #include <ntqpainter.h>
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
#include <qmemorymanager_qws.h> #include <qmemorymanager_qws.h>
#endif #endif
@ -67,7 +67,7 @@ public:
void renderAndSave() void renderAndSave()
{ {
font = TQFont(family,pointSize,weight,italic); font = TQFont(family,pointSize,weight,italic);
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
memorymanager->savePrerenderedFont((TQMemoryManager::FontID)font.handle()); memorymanager->savePrerenderedFont((TQMemoryManager::FontID)font.handle());
#endif #endif
setHeight(TQFontMetrics(font).lineSpacing()); setHeight(TQFontMetrics(font).lineSpacing());
@ -77,7 +77,7 @@ public:
void render(int from, int to) void render(int from, int to)
{ {
font = TQFont(family,pointSize,weight,italic); font = TQFont(family,pointSize,weight,italic);
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
for (int i=from; i<=to; i++) { for (int i=from; i<=to; i++) {
if ( memorymanager->inFont((TQMemoryManager::FontID)font.handle(),TQChar(i))) { if ( memorymanager->inFont((TQMemoryManager::FontID)font.handle(),TQChar(i))) {
memorymanager->lockGlyph((TQMemoryManager::FontID)font.handle(),TQChar(i)); memorymanager->lockGlyph((TQMemoryManager::FontID)font.handle(),TQChar(i));
@ -90,7 +90,7 @@ public:
void save() void save()
{ {
font = TQFont(family,pointSize,weight,italic); font = TQFont(family,pointSize,weight,italic);
#ifdef Q_WS_QWS #ifdef TQ_WS_QWS
memorymanager->savePrerenderedFont((TQMemoryManager::FontID)font.handle(),FALSE); memorymanager->savePrerenderedFont((TQMemoryManager::FontID)font.handle(),FALSE);
#endif #endif
setHeight(TQFontMetrics(font).lineSpacing()); setHeight(TQFontMetrics(font).lineSpacing());

@ -77,7 +77,7 @@ int main( int argc, char **argv )
TQStringList args; TQStringList args;
for ( int i = 1; i < argc; ++i ) { for ( int i = 1; i < argc; ++i ) {
TQString file( argv[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 // Since wildcards are not expanded automatically for us on Windows, we need to do
// it ourselves // it ourselves
if ( file.contains( '*' ) || file.contains( '?' ) ) { if ( file.contains( '*' ) || file.contains( '?' ) ) {

@ -375,14 +375,14 @@ MainWindow::MainWindow()
rtlExtensions->setChecked( settings.readBoolEntry( "/qt/useRtlExtensions", FALSE ) ); 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" ) ) ); inputStyle->setCurrentText( settings.readEntry( "/qt/XIMInputStyle", trUtf8( "On The Spot" ) ) );
#else #else
inputStyle->hide(); inputStyle->hide();
inputStyleLabel->hide(); inputStyleLabel->hide();
#endif #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. This code makes it possible to set up default input method.
@ -508,7 +508,7 @@ void MainWindow::fileSave()
settings.writeEntry("/qt/useRtlExtensions", rtlExtensions->isChecked() ); settings.writeEntry("/qt/useRtlExtensions", rtlExtensions->isChecked() );
#ifdef Q_WS_X11 #ifdef TQ_WS_X11
TQString style = inputStyle->currentText(); TQString style = inputStyle->currentText();
TQString str = "On The Spot"; TQString str = "On The Spot";
if ( style == trUtf8( "Over 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(); TQApplication::x11_apply_settings();
#endif // Q_WS_X11 #endif // TQ_WS_X11
setModified(FALSE); setModified(FALSE);
statusBar()->message("Saved changes."); statusBar()->message("Saved changes.");

@ -40,7 +40,7 @@
#include <ntqtextstream.h> #include <ntqtextstream.h>
#include <ntqfile.h> #include <ntqfile.h>
#include <ntqpainter.h> #include <ntqpainter.h>
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
# include <qt_mac.h> # include <qt_mac.h>
#endif #endif
@ -97,7 +97,7 @@ void Skin::setView( TQVFbView *v )
{ {
view = v; view = v;
view->move( viewX1, viewY1 ); view->move( viewX1, viewY1 );
#ifdef Q_WS_MAC #ifdef TQ_WS_MAC
TQMacSavedPortInfo::setAlphaTransparancy(view, transparancy); TQMacSavedPortInfo::setAlphaTransparancy(view, transparancy);
#endif #endif
} }

@ -229,10 +229,10 @@ void TQVFb::changeRate()
void TQVFb::about() void TQVFb::about()
{ {
#if defined( Q_WS_MAC ) #if defined( TQ_WS_MAC )
TQString platform("Mac OS X"); TQString platform("Mac OS X");
TQString qt("Mac"); TQString qt("Mac");
#elif defined( Q_WS_WIN ) #elif defined( TQ_WS_WIN )
TQString platform("Windows"); TQString platform("Windows");
TQString qt("Windows"); TQString qt("Windows");
#else #else

@ -32,7 +32,7 @@
**********************************************************************/ **********************************************************************/
#include "ntqglobal.h" #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 #define TQLock TQWSSemaphore
#undef TQT_NO_QWS_MULTIPROCESS #undef TQT_NO_QWS_MULTIPROCESS
#include "../../src/kernel/qlock.cpp" #include "../../src/kernel/qlock.cpp"
@ -269,7 +269,7 @@ void TQVFbView::setRate( int r )
timer->start( 1000/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 // Get the name of the directory where TQt/Embedded temporary data should
// live. // live.
static TQString qws_dataDir() static TQString qws_dataDir()

Loading…
Cancel
Save