diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-02-12 14:08:42 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-02-12 14:08:52 +0900 |
| commit | 67bff2edcacb208dc44dcd521386bef686dc6dbf (patch) | |
| tree | 538584042585402a59d4b1464b117033778ccc28 /src/kernel | |
| parent | fb401a891f1b426e9419c0cb16403df407138611 (diff) | |
| download | tqt3-67bff2edcacb208dc44dcd521386bef686dc6dbf.tar.gz tqt3-67bff2edcacb208dc44dcd521386bef686dc6dbf.zip | |
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>
Diffstat (limited to 'src/kernel')
67 files changed, 568 insertions, 568 deletions
diff --git a/src/kernel/ntqaccessible.h b/src/kernel/ntqaccessible.h index fb826d4f0..61baf31b0 100644 --- a/src/kernel/ntqaccessible.h +++ b/src/kernel/ntqaccessible.h @@ -54,7 +54,7 @@ struct TQAccessibleInterface; class TQ_EXPORT TQAccessible { private: -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC static TQMAC_PASCAL OSStatus globalEventProcessor(EventHandlerCallRef, EventRef, void *); static TQObject *queryAccessibleObject(TQAccessibleInterface *); #endif diff --git a/src/kernel/ntqapplication.h b/src/kernel/ntqapplication.h index d657e2647..4696b290e 100644 --- a/src/kernel/ntqapplication.h +++ b/src/kernel/ntqapplication.h @@ -54,10 +54,10 @@ class TQSessionManager; class TQStyle; class TQTranslator; class TQEventLoop; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) class TQIMEvent; #endif -#if defined(Q_WS_QWS) +#if defined(TQ_WS_QWS) class TQWSDecoration; #endif @@ -80,7 +80,7 @@ public: TQApplication( int &argc, char **argv, bool GUIenabled, bool SMenabled ); enum Type { Tty, GuiClient, GuiServer }; TQApplication( int &argc, char **argv, Type ); -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) TQApplication( Display* dpy, HANDLE visual = 0, HANDLE cmap = 0 ); TQApplication( Display *dpy, int argc, char **argv, HANDLE visual = 0, HANDLE cmap= 0 ); @@ -236,18 +236,18 @@ public: static bool isEffectEnabled( TQt::UIEffect ); static void setEffectEnabled( TQt::UIEffect, bool enable = TRUE ); -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) virtual bool macEventFilter( EventHandlerCallRef, EventRef ); #endif -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) virtual bool winEventFilter( MSG * ); #endif -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) virtual bool x11EventFilter( XEvent * ); virtual int x11ClientMessage( TQWidget*, XEvent*, bool passive_only); int x11ProcessEvent( XEvent* ); #endif -#if defined(Q_WS_QWS) +#if defined(TQ_WS_QWS) virtual bool qwsEventFilter( TQWSEvent * ); int qwsProcessEvent( TQWSEvent* ); void qwsSetCustomColors( TQRgb *colortable, int start, int numColors ); @@ -267,7 +267,7 @@ public: #elif defined(Q_OS_MAC) static MacintoshVersion macVersion(); #endif -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) void winFocus( TQWidget *, bool ); static void winMouseButtonUp(); #endif @@ -280,7 +280,7 @@ public: virtual void commitData( TQSessionManager& sm ); virtual void saveState( TQSessionManager& sm ); #endif -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) #if !defined(TQT_NO_IM_EXTENSIONS) virtual TQWidget *locateICHolderWidget( TQWidget *w ); virtual TQWidgetList *icHolderWidgets(); @@ -314,7 +314,7 @@ public slots: void closeAllWindows(); void aboutTQt(); -#if defined(Q_WS_QWS) +#if defined(TQ_WS_QWS) protected: void setArgs(int, char **); #endif @@ -328,12 +328,12 @@ private: void init_precmdline(); void process_cmdline( int* argcptr, char ** argv ); bool internalNotify( TQObject *, TQEvent * ); -#if defined(Q_WS_QWS) +#if defined(TQ_WS_QWS) static TQWidget *findChildWidget( const TQWidget *p, const TQPoint &pos ); static TQWidget *findWidget( const TQObjectList&, const TQPoint &, bool rec ); #endif -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) bool do_mouse_down(Point *, bool *); static TQMAC_PASCAL OSStatus globalEventProcessor(EventHandlerCallRef, EventRef, void *); static TQMAC_PASCAL OSStatus globalAppleEventProcessor(const AppleEvent *, AppleEvent *, long); @@ -348,7 +348,7 @@ private: friend void tqt_init(int *, char **, TQApplication::Type); #endif -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) private slots: void postIMEvent( TQObject *receiver, TQIMEvent *event ); #endif @@ -406,7 +406,7 @@ private: static TQString* session_key; bool is_session_restored; #endif -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) #if !defined (TQT_NO_STYLE) static void x11_initialize_style(); #endif @@ -442,10 +442,10 @@ private: friend class TQTranslator; friend class TQEventLoop; friend TQ_EXPORT void tqt_ucm_initialize( TQApplication * ); -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) friend bool qt_sendSpontaneousEvent( TQObject*, TQEvent* ); #endif -#if defined(Q_WS_QWS) +#if defined(TQ_WS_QWS) friend class TQInputContext; #endif private: // Disabled copy constructor and operator= @@ -475,7 +475,7 @@ inline char **TQApplication::argv() const return app_argv; } -#if defined(Q_WS_QWS) +#if defined(TQ_WS_QWS) inline void TQApplication::setArgs(int c, char **v) { app_argc = c; diff --git a/src/kernel/ntqclipboard.h b/src/kernel/ntqclipboard.h index 390508889..706115f33 100644 --- a/src/kernel/ntqclipboard.h +++ b/src/kernel/ntqclipboard.h @@ -117,7 +117,7 @@ protected: friend class TQMimeSource; private: -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) void loadScrap(bool convert); void saveScrap(); #endif diff --git a/src/kernel/ntqcolor.h b/src/kernel/ntqcolor.h index d45dd4f5a..5c32307ea 100644 --- a/src/kernel/ntqcolor.h +++ b/src/kernel/ntqcolor.h @@ -116,7 +116,7 @@ public: uint alloc(); uint pixel() const; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) // ### in 4.0, make this take a default argument of -1 for default screen? uint alloc( int screen ); uint pixel( int screen ) const; @@ -130,7 +130,7 @@ public: static int currentAllocContext(); static void destroyAllocContext( int ); -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) static const TQRgb* palette( int* numEntries = 0 ); static int setPaletteEntries( const TQRgb* entries, int numEntries, int base = -1 ); @@ -153,7 +153,7 @@ private: static TQColor* globalColors(); static bool color_init; static bool globals_init; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) static HPALETTE hpal; #endif static enum ColorModel { d8, d32 } colormodel; diff --git a/src/kernel/ntqcursor.h b/src/kernel/ntqcursor.h index 8e7b10ce2..d67ed55e8 100644 --- a/src/kernel/ntqcursor.h +++ b/src/kernel/ntqcursor.h @@ -88,15 +88,15 @@ public: const TQBitmap *mask() const; TQPoint hotSpot() const; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) HCURSOR handle() const; TQCursor( HCURSOR ); -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) HANDLE handle() const; TQCursor( HANDLE ); -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) HANDLE handle() const; -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) HANDLE handle() const; #endif @@ -107,7 +107,7 @@ public: static void initialize(); static void cleanup(); -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) static int x11Screen(); #endif private: @@ -116,7 +116,7 @@ private: void update() const; TQCursorData *data; TQCursor *find_cur(int); -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) friend void qt_mac_set_cursor(const TQCursor *c, const Point *p); #endif }; diff --git a/src/kernel/ntqdesktopwidget.h b/src/kernel/ntqdesktopwidget.h index 51fbc8230..de199f31e 100644 --- a/src/kernel/ntqdesktopwidget.h +++ b/src/kernel/ntqdesktopwidget.h @@ -95,7 +95,7 @@ private: #endif friend class TQApplication; -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS friend class TQWSDisplay; #endif }; diff --git a/src/kernel/ntqdragobject.h b/src/kernel/ntqdragobject.h index bc63a07d5..069e82973 100644 --- a/src/kernel/ntqdragobject.h +++ b/src/kernel/ntqdragobject.h @@ -254,7 +254,7 @@ private: TQDragObject * object; bool updateMode( ButtonState newstate ); void updateCursor(); -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) void createCursors(); #endif diff --git a/src/kernel/ntqeventloop.h b/src/kernel/ntqeventloop.h index 9f802dbd2..deca8d061 100644 --- a/src/kernel/ntqeventloop.h +++ b/src/kernel/ntqeventloop.h @@ -54,7 +54,7 @@ class TQEventLoopPrivate; class TQSocketNotifier; class TQTimer; -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC struct timeval; //stdc struct struct TimerInfo; //internal structure (qeventloop_mac.cpp) #endif @@ -109,11 +109,11 @@ signals: void aboutToBlock(); private: -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) friend TQMAC_PASCAL void qt_mac_select_timer_callbk(EventLoopTimerRef, void *); int macHandleSelect(timeval *); void macHandleTimer(TimerInfo *); -#endif // Q_WS_MAC +#endif // TQ_WS_MAC // internal initialization/cleanup - implemented in various platform specific files void init(); diff --git a/src/kernel/ntqfont.h b/src/kernel/ntqfont.h index 6f347e411..d2a45c981 100644 --- a/src/kernel/ntqfont.h +++ b/src/kernel/ntqfont.h @@ -165,11 +165,11 @@ public: bool isCopyOf( const TQFont & ) const; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN HFONT handle() const; -#else // !Q_WS_WIN +#else // !TQ_WS_WIN TQt::HANDLE handle() const; -#endif // Q_WS_WIN +#endif // TQ_WS_WIN // needed for X11 @@ -191,11 +191,11 @@ public: #endif //TQT_NO_STRINGLIST static void initialize(); static void cleanup(); -#ifndef Q_WS_QWS +#ifndef TQ_WS_QWS static void cacheStatistics(); #endif -#if defined(Q_WS_QWS) +#if defined(TQ_WS_QWS) void qwsRenderToDisk(bool all=TRUE); #endif @@ -320,9 +320,9 @@ private: void detach(); -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) void macSetFont(TQPaintDevice *); -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) void x11SetScreen( int screen = -1 ); int x11Screen() const; #endif @@ -337,7 +337,7 @@ private: friend class TQTextLayout; friend class TQTextItem; friend class TQGLContext; -#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) +#if defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE) friend TQt::HANDLE qt_xft_handle(const TQFont &font); #endif #ifndef TQT_NO_DATASTREAM diff --git a/src/kernel/ntqfontdatabase.h b/src/kernel/ntqfontdatabase.h index fd19761c6..0f2a913af 100644 --- a/src/kernel/ntqfontdatabase.h +++ b/src/kernel/ntqfontdatabase.h @@ -58,7 +58,7 @@ struct TQtFontFamily; struct TQtFontFoundry; struct TQFontDef; class TQFontEngine; -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS class TQDiskFont; #endif @@ -92,7 +92,7 @@ public: static TQString scriptName(TQFont::Script); static TQString scriptSample(TQFont::Script); -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS static void qwsAddDiskFont( TQDiskFont *qdf ); #endif @@ -118,10 +118,10 @@ public: #endif // TQT_NO_COMPAT private: -#if defined(Q_WS_X11) || defined(Q_WS_WIN) +#if defined(TQ_WS_X11) || defined(TQ_WS_WIN) static TQFontEngine *findFont( TQFont::Script script, const TQFontPrivate *fp, const TQFontDef &request, int force_encoding_id = -1 ); -#endif // Q_WS_X11 +#endif // TQ_WS_X11 static void createDatabase(); diff --git a/src/kernel/ntqfontmetrics.h b/src/kernel/ntqfontmetrics.h index e5a649759..a182a5983 100644 --- a/src/kernel/ntqfontmetrics.h +++ b/src/kernel/ntqfontmetrics.h @@ -46,7 +46,7 @@ #include "ntqrect.h" #endif // QT_H -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS class TQFontEngine; #endif @@ -104,7 +104,7 @@ private: friend class TQWidget; friend class TQPainter; friend class TQTextFormat; -#if defined( Q_WS_MAC ) +#if defined( TQ_WS_MAC ) friend class TQFontPrivate; #endif diff --git a/src/kernel/ntqgplugin.h b/src/kernel/ntqgplugin.h index 71f3e00db..1b7431458 100644 --- a/src/kernel/ntqgplugin.h +++ b/src/kernel/ntqgplugin.h @@ -93,7 +93,7 @@ return i->iface(); \ } -#if defined(Q_WS_WIN) && defined(Q_CC_BOR) +#if defined(TQ_WS_WIN) && defined(Q_CC_BOR) # define Q_STDCALL __stdcall #else # define Q_STDCALL diff --git a/src/kernel/ntqimage.h b/src/kernel/ntqimage.h index d571aae01..32f20b23f 100644 --- a/src/kernel/ntqimage.h +++ b/src/kernel/ntqimage.h @@ -83,7 +83,7 @@ public: TQImage( uchar* data, int w, int h, int depth, TQRgb* colortable, int numColors, Endian bitOrder ); -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS TQImage( uchar* data, int w, int h, int depth, int pbl, TQRgb* colortable, int numColors, Endian bitOrder ); @@ -129,7 +129,7 @@ public: int numBytes() const; int bytesPerLine() const; -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS TQGfx * graphicsContext(); #endif diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/ntqinputcontext.h index 0b1dfe90d..24bbca763 100644 --- a/src/kernel/ntqinputcontext.h +++ b/src/kernel/ntqinputcontext.h @@ -72,9 +72,9 @@ public: virtual TQString identifierName(); virtual TQString language(); -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) virtual bool x11FilterEvent( TQWidget *keywidget, XEvent *event ); -#endif // Q_WS_X11 +#endif // TQ_WS_X11 virtual bool filterEvent( const TQEvent *event ); virtual void reset(); @@ -90,7 +90,7 @@ public: virtual TQPtrList<TQInputContextMenu> *menus(); void addMenusTo( TQPopupMenu *popup, TQInputContextMenu::Action action = TQInputContextMenu::InsertSeparator ); -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) // these functions are not recommended for ordinary use virtual TQWidget *focusWidget() const; virtual TQWidget *holderWidget() const; diff --git a/src/kernel/ntqmime.h b/src/kernel/ntqmime.h index 719f83b01..5b541510a 100644 --- a/src/kernel/ntqmime.h +++ b/src/kernel/ntqmime.h @@ -122,7 +122,7 @@ private: TQMimeSourceFactoryData* d; }; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) #ifndef QT_H #include "ntqptrlist.h" // down here for GCC 2.7.* compatibility @@ -158,7 +158,7 @@ public: }; #endif -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) #ifndef QT_H #include "ntqptrlist.h" // down here for GCC 2.7.* compatibility @@ -193,7 +193,7 @@ public: virtual TQValueList<TQByteArray> convertFromMime(TQByteArray data, const char* mime, int flav)=0; }; -#endif // Q_WS_MAC +#endif // TQ_WS_MAC #endif // TQT_NO_MIME diff --git a/src/kernel/ntqmovie.h b/src/kernel/ntqmovie.h index 939f10c93..9c8d3bf07 100644 --- a/src/kernel/ntqmovie.h +++ b/src/kernel/ntqmovie.h @@ -96,7 +96,7 @@ public: void connectUpdate(TQObject* receiver, const char *member); void disconnectUpdate(TQObject* receiver, const char *member=0); -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS // Temporary hack void setDisplayWidget(TQWidget * w); #endif diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h index a8261be23..218529349 100644 --- a/src/kernel/ntqnamespace.h +++ b/src/kernel/ntqnamespace.h @@ -175,7 +175,7 @@ public: // documented in qwidget.cpp enum NETWMFlags { -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) WX11DisableMove = 0x00000001, WX11DisableClose = 0x00000002, WX11DisableResize = 0x00000004, @@ -226,12 +226,12 @@ public: WMouseNoMask = 0x00200000, WStaticContents = 0x00400000, WRepaintNoErase = 0x00800000, // OBSOLETE -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) WX11BypassWM = 0x01000000, WWinOwnDC = 0x00000000, WMacNoSheet = 0x00000000, WMacDrawer = 0x00000000, -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) WX11BypassWM = 0x00000000, WWinOwnDC = 0x00000000, WMacNoSheet = 0x01000000, @@ -246,7 +246,7 @@ public: WShowModal = 0x04000000, WNoMousePropagation = 0x08000000, WSubWindow = 0x10000000, -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) WStyle_Splash = 0x20000000, #else WStyle_Splash = WStyle_NoBorder | WMacNoSheet | WStyle_Tool | WWinOwnDC, @@ -1007,13 +1007,13 @@ public: // "handle" type for system objects. Documented as \internal in // qapplication.cpp -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) typedef void * HANDLE; -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) typedef void *HANDLE; -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) typedef unsigned long HANDLE; -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) typedef void * HANDLE; #endif }; diff --git a/src/kernel/ntqpaintdevice.h b/src/kernel/ntqpaintdevice.h index 114cf8b1c..8ce90f069 100644 --- a/src/kernel/ntqpaintdevice.h +++ b/src/kernel/ntqpaintdevice.h @@ -46,7 +46,7 @@ #include "ntqrect.h" #endif // QT_H -#if defined(Q_WS_QWS) +#if defined(TQ_WS_QWS) class TQWSDisplay; class TQGfx; #endif @@ -56,7 +56,7 @@ class TQString; class TQTextItem; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) struct TQPaintDeviceX11Data; #endif @@ -95,18 +95,18 @@ public: // Windows: get device context // X-Windows: get drawable -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) virtual HDC handle() const; -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) virtual TQt::HANDLE handle() const; virtual TQt::HANDLE x11RenderHandle() const; -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) virtual TQt::HANDLE handle() const; -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) virtual TQt::HANDLE handle() const; #endif -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) Display *x11Display() const; int x11Screen() const; int x11Depth() const; @@ -146,7 +146,7 @@ public: static void x11SetAppDpiY( int, int ); #endif -#if defined(Q_WS_QWS) +#if defined(TQ_WS_QWS) static TQWSDisplay *qwsDisplay(); virtual unsigned char * scanLine(int) const; virtual int bytesPerLine() const; @@ -215,9 +215,9 @@ public: protected: TQPaintDevice( uint devflags ); -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) HDC hdc; // device context -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) TQt::HANDLE hd; // handle to drawable TQt::HANDLE rendhd; // handle to RENDER pict @@ -225,12 +225,12 @@ protected: void cloneX11Data( const TQPaintDevice * ); virtual void setX11Data( const TQPaintDeviceX11Data* ); TQPaintDeviceX11Data* getX11Data( bool def=FALSE ) const; -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) #if !defined( TQMAC_NO_QUARTZ ) CGContextRef ctx; #endif void * hd; -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) TQt::HANDLE hd; #endif @@ -244,7 +244,7 @@ protected: friend class TQPainter; friend class TQPaintDeviceMetrics; -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) #ifndef TQMAC_NO_QUARTZ virtual CGContextRef macCGContext(bool clipped=TRUE) const; #endif @@ -255,13 +255,13 @@ protected: const TQPaintDevice *, int, int, int, int, TQt::RasterOp, bool ); #endif -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) friend void tqt_init_internal( int *, char **, Display *, TQt::HANDLE, TQt::HANDLE ); friend void tqt_cleanup(); #endif private: -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) static Display *x_appdisplay; static int x_appscreen; @@ -304,7 +304,7 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, int conversion_flags=0 ); -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) struct TQ_EXPORT TQPaintDeviceX11Data : public TQShared { Display* x_display; @@ -332,7 +332,7 @@ inline bool TQPaintDevice::isExtDev() const inline bool TQPaintDevice::paintingActive() const { return painters != 0; } -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) inline Display *TQPaintDevice::x11Display() const { return x11Data ? x11Data->x_display : x_appdisplay; } @@ -405,7 +405,7 @@ inline void *TQPaintDevice::x11AppVisual() inline bool TQPaintDevice::x11AppDefaultVisual() { return x_appdefvisual; } -#endif // Q_WS_X11 +#endif // TQ_WS_X11 TQ_EXPORT diff --git a/src/kernel/ntqpainter.h b/src/kernel/ntqpainter.h index 96b5c13c3..77e3d183b 100644 --- a/src/kernel/ntqpainter.h +++ b/src/kernel/ntqpainter.h @@ -58,12 +58,12 @@ class TQTextCodec; class TQTextParag; class TQPaintDevice; class TQTextItem; -#if defined( Q_WS_MAC ) +#if defined( TQ_WS_MAC ) class TQMacSavedPortInfo; #endif class TQPainterPrivate; -#if defined(Q_WS_QWS) +#if defined(TQ_WS_QWS) class TQScreen; #endif @@ -82,7 +82,7 @@ public: bool end(); TQPaintDevice *device() const; -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS TQGfx * internalGfx(); #ifdef QT_QWS_EXPERIMENTAL_SCREENPAINTER bool begin(TQScreen *screen); @@ -286,9 +286,9 @@ public: // Other functions -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) HDC handle() const; -#elif defined(Q_WS_X11) || defined(Q_WS_MAC) +#elif defined(TQ_WS_X11) || defined(TQ_WS_MAC) HANDLE handle() const; #endif @@ -388,11 +388,11 @@ protected: TQPoint internalCurrentPos; uint old_pix; // ### All win platforms in 4.0 #endif -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) friend class TQFontEngineWin; friend class TQFontEngineBox; QT_WIN_PAINTER_MEMBERS -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) friend class TQFontEngineXLFD; friend class TQFontEngineXft; friend class TQFontEngineBox; @@ -404,13 +404,13 @@ protected: GC gc_brush; // graphics contect for brush TQPoint curPt; // current point uint clip_serial; // clipping serial number -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) TQt::HANDLE hd; // handle to drawable void initPaintDevice(bool force=FALSE, TQPoint *off=NULL, TQRegion *rgn=NULL); friend const TQRegion &qt_mac_update_painter(TQPainter *, bool); friend class TQFontEngineMac; friend class TQMacPainter; -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) friend class TQFontEngine; TQGfx * gfx; friend void qwsUpdateActivePainters(); @@ -549,12 +549,12 @@ inline int *TQPainter::tabArray() const return tabarray; } -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) inline HDC TQPainter::handle() const { return hdc; } -#elif defined(Q_WS_X11) || defined(Q_WS_MAC) +#elif defined(TQ_WS_X11) || defined(TQ_WS_MAC) inline TQt::HANDLE TQPainter::handle() const { return hd; @@ -711,7 +711,7 @@ inline TQRect TQPainter::boundingRect( int x, int y, int w, int h, int tf, return boundingRect( r, tf, str, len, i ); } -#if defined(Q_WS_QWS) +#if defined(TQ_WS_QWS) inline TQGfx * TQPainter::internalGfx() { return gfx; diff --git a/src/kernel/ntqpen.h b/src/kernel/ntqpen.h index 248fdc6cf..226ff1cf2 100644 --- a/src/kernel/ntqpen.h +++ b/src/kernel/ntqpen.h @@ -75,7 +75,7 @@ public: private: friend class TQPainter; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN friend class TQFontEngineWin; #endif diff --git a/src/kernel/ntqpixmap.h b/src/kernel/ntqpixmap.h index 94d923626..e6e5e529b 100644 --- a/src/kernel/ntqpixmap.h +++ b/src/kernel/ntqpixmap.h @@ -51,7 +51,7 @@ class TQGfx; class TQPixmapPrivate; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) // Internal pixmap memory optimization class for Windows 9x class TQMultiCellPixmap; #endif @@ -139,7 +139,7 @@ public: bool save( TQIODevice* device, const char* format, int quality = -1 ) const; #endif -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) HBITMAP hbm() const; #endif @@ -154,7 +154,7 @@ public: bool isTQBitmap() const; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) // These functions are internal and used by Windows 9x only bool isMultiCellPixmap() const; HDC multiCellHandle() const; @@ -164,13 +164,13 @@ public: void freeCell( bool = FALSE ); #endif -#if defined(Q_WS_QWS) +#if defined(TQ_WS_QWS) virtual TQGfx * graphicsContext(bool clip_children=TRUE) const; virtual unsigned char * scanLine(int) const; virtual int bytesPerLine() const; TQRgb * clut() const; int numCols() const; -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) static int x11SetDefaultScreen( int screen ); void x11SetScreen( int screen ); #endif @@ -183,7 +183,7 @@ protected: TQPixmap( int w, int h, const uchar *data, bool isXbitmap ); int metric( int ) const; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) struct TQMCPI { // mem optim for win9x TQMultiCellPixmap *mcp; int offset; @@ -196,12 +196,12 @@ protected: uint uninit : 1; uint bitmap : 1; uint selfmask : 1; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) uint mcp : 1; #endif int ser_no; TQBitmap *mask; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) TQPixmap *maskpm; union { HBITMAP hbm; // if mcp == FALSE @@ -211,14 +211,14 @@ protected: #ifdef Q_OS_TEMP uchar* ppvBits; // Pointer to DIBSection bits #endif -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) void *ximage; void *maskgc; TQPixmap *alphapm; -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) ColorTable *clut; TQPixmap *alphapm; -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) int id; // ### should use TQPaintDevice::hd, since it is there TQRgb * clut; int numcols; @@ -227,7 +227,7 @@ protected: bool hasAlpha; #endif Optimization optim; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) HBITMAP old_hbm; #endif } *data; @@ -239,7 +239,7 @@ private: void init( int, int, int, bool, Optimization ); void deref(); TQPixmap copy( bool ignoreMask = FALSE ) const; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) void initAlphaPixmap( uchar *bytes, int length, struct tagBITMAPINFO *bmi ); void convertToAlphaPixmap( bool initAlpha=TRUE ); static void bitBltAlphaPixmap( TQPixmap *dst, int dx, int dy, @@ -257,7 +257,7 @@ private: const TQPixmap *src, int sx, int sy, int sw, int sh ); -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) friend void unclippedScaledBitBlt(TQPaintDevice *, int, int, int, int, const TQPaintDevice *, int, int, int, int, TQt::RasterOp, bool, bool); @@ -295,7 +295,7 @@ inline bool TQPixmap::selfMask() const return data->selfmask; } -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) inline HBITMAP TQPixmap::hbm() const { return data->mcp ? 0 : data->hbm_or_mcpi.hbm; @@ -317,7 +317,7 @@ inline bool TQPixmap::isTQBitmap() const return data->bitmap; } -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) inline bool TQPixmap::isMultiCellPixmap() const { return data->mcp; @@ -341,7 +341,7 @@ TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQPixmap & ); #ifndef TQT_NO_PIXMAP_TRANSFORMATION # define QT_XFORM_TYPE_MSBFIRST 0 # define QT_XFORM_TYPE_LSBFIRST 1 -# if defined(Q_WS_WIN) +# if defined(TQ_WS_WIN) # define QT_XFORM_TYPE_WINDOWSPIXMAP 2 # endif bool qt_xForm_helper( const TQWMatrix&, int, int, int, uchar*, int, int, int, uchar*, int, int, int ); diff --git a/src/kernel/ntqprinter.h b/src/kernel/ntqprinter.h index 1e57c3307..f7175bb51 100644 --- a/src/kernel/ntqprinter.h +++ b/src/kernel/ntqprinter.h @@ -108,11 +108,11 @@ public: virtual void setOrientation( Orientation ); PageSize pageSize() const; virtual void setPageSize( PageSize ); -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN void setWinPageSize( short winPageSize ); short winPageSize() const; #endif -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC bool printSetup(); bool pageSetup(); #endif @@ -165,17 +165,17 @@ protected: bool cmd( int, TQPainter *, TQPDevCmdParam * ); int metric( int ) const; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) virtual void setActive(); virtual void setIdle(); #endif private: -#if defined(Q_WS_X11) || defined(Q_WS_QWS) +#if defined(TQ_WS_X11) || defined(TQ_WS_QWS) TQPaintDevice *pdrv; int pid; #endif -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) friend class TQPrinterPrivate; PMPageFormat pformat; PMPrintSettings psettings; @@ -185,7 +185,7 @@ private: void interpret(PMPrintSettings *); void interpret(PMPageFormat *); #endif -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) void readPdlg( void* ); void readPdlgA( void* ); void writeDevmode( TQt::HANDLE ); diff --git a/src/kernel/ntqrect.h b/src/kernel/ntqrect.h index c56d637d4..aa1c1ce35 100644 --- a/src/kernel/ntqrect.h +++ b/src/kernel/ntqrect.h @@ -135,7 +135,7 @@ public: friend TQ_EXPORT bool operator!=( const TQRect &, const TQRect & ); private: -#if defined(Q_WS_X11) || defined(Q_OS_TEMP) +#if defined(TQ_WS_X11) || defined(Q_OS_TEMP) friend void qt_setCoords( TQRect *r, int xp1, int yp1, int xp2, int yp2 ); #endif #if defined(Q_OS_MAC) diff --git a/src/kernel/ntqregion.h b/src/kernel/ntqregion.h index 934dd9816..8de535fa3 100644 --- a/src/kernel/ntqregion.h +++ b/src/kernel/ntqregion.h @@ -46,7 +46,7 @@ #include "ntqrect.h" #endif // QT_H -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 struct TQRegionPrivate; #endif @@ -96,13 +96,13 @@ public: bool operator!=( const TQRegion &r ) const { return !(operator==(r)); } -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) HRGN handle() const { return data->rgn; } -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) Region handle() const { if(!data->rgn) updateX11Region(); return data->rgn; } -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) RgnHandle handle(bool require_rgn=FALSE) const; -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) // TQGfx_QWS needs this for region drawing void * handle() const { return data->rgn; } #endif @@ -115,37 +115,37 @@ private: TQRegion( bool ); TQRegion copy() const; void detach(); -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) TQRegion winCombine( const TQRegion &, int ) const; #endif -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) void updateX11Region() const; void *clipRectangles( int &num ) const; friend void *qt_getClipRects( const TQRegion &, int & ); #endif void exec( const TQByteArray &, int ver = 0 ); struct TQRegionData : public TQShared { -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) HRGN rgn; -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) Region rgn; void *xrectangles; TQRegionPrivate *region; -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) uint is_rect:1; TQRect rect; RgnHandle rgn; -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) void * rgn; #endif bool is_null; } *data; -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) friend struct qt_mac_rgn_data_cache; friend TQRegionData *qt_mac_get_rgn_data(); friend void qt_mac_free_rgn_data(TQRegionData *); void rectifyRegion(); -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) friend class TQETWidget; #endif diff --git a/src/kernel/ntqsessionmanager.h b/src/kernel/ntqsessionmanager.h index b70559ee2..f87fb3b11 100644 --- a/src/kernel/ntqsessionmanager.h +++ b/src/kernel/ntqsessionmanager.h @@ -59,7 +59,7 @@ class TQ_EXPORT TQSessionManager : public TQObject public: TQString sessionId() const; TQString sessionKey() const; -#if defined(Q_WS_X11) || defined(Q_WS_MAC) +#if defined(TQ_WS_X11) || defined(TQ_WS_MAC) void* handle() const; #endif diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h index d1676377f..95cb2c67c 100644 --- a/src/kernel/ntqt.h +++ b/src/kernel/ntqt.h @@ -311,20 +311,20 @@ #endif // Private headers -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include "private/tqttdeintegration_x11_p.h" #endif -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC #include <qaquastyle.h> #include <qmacstyle_mac.h> -#endif // Q_WS_MAC +#endif // TQ_WS_MAC -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include <qwindowsxpstyle.h> #endif -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS #include <private/qtextengine_p.h> #include "qfontmanager_qws.h" #include <qfontfactorybdf_qws.h> @@ -363,11 +363,11 @@ #include "qwsevent_qws.h" #include <qwindowsystem_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> -#endif // Q_WS_WCE +#endif // TQ_WS_WCE #endif // QT_H diff --git a/src/kernel/ntqwidget.h b/src/kernel/ntqwidget.h index 3a9f32eb3..aec9c6d2c 100644 --- a/src/kernel/ntqwidget.h +++ b/src/kernel/ntqwidget.h @@ -52,7 +52,7 @@ #include "ntqsizepolicy.h" #endif // QT_H -#if defined(Q_WS_X11) && !defined(TQT_NO_IM) +#if defined(TQ_WS_X11) && !defined(TQT_NO_IM) class TQInputContext; #endif @@ -336,7 +336,7 @@ public: bool isUpdatesEnabled() const; -#if 0 //def Q_WS_QWS +#if 0 //def TQ_WS_QWS void repaintUnclipped( const TQRegion &, bool erase = TRUE ); #endif public slots: @@ -466,17 +466,17 @@ public: TQWidget *childAt( int x, int y, bool includeThis = FALSE ) const; TQWidget *childAt( const TQPoint &, bool includeThis = FALSE ) const; -#if defined(Q_WS_QWS) +#if defined(TQ_WS_QWS) virtual TQGfx * graphicsContext(bool clip_children=TRUE) const; #endif -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) TQRegion clippedRegion(bool do_children=TRUE); uint clippedSerial(bool do_children=TRUE); #ifndef TQMAC_NO_QUARTZ CGContextRef macCGContext(bool clipped=TRUE) const; #endif #endif -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) enum X11WindowType { X11WindowTypeSelect, X11WindowTypeCombo, @@ -528,16 +528,16 @@ protected: virtual void showEvent( TQShowEvent * ); virtual void hideEvent( TQHideEvent * ); -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) virtual bool macEvent( MSG * ); #endif -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) virtual bool winEvent( MSG * ); #endif -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) virtual bool x11Event( XEvent * ); #endif -#if defined(Q_WS_QWS) +#if defined(TQ_WS_QWS) virtual bool qwsEvent( TQWSEvent * ); virtual unsigned char *scanLine( int ) const; virtual int bytesPerLine() const; @@ -559,7 +559,7 @@ protected: int metric( int ) const; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) #if !defined(TQT_NO_IM_EXTENSIONS) virtual TQWidget *icHolderWidget(); #else @@ -593,7 +593,7 @@ protected: virtual void setKeyCompression(bool); virtual void setMicroFocusHint(int x, int y, int w, int h, bool text=TRUE, TQFont *f = 0); -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) void dirtyClippedRegion(bool); bool isClippedRegionDirty(); virtual void setRegionDirty(bool); @@ -602,13 +602,13 @@ protected: private slots: void focusProxyDestroyed(); -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) void destroyInputContext(); #endif private: void setFontSys( TQFont *f = 0 ); -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) void createInputContext(); void focusInputContext(); void unfocusInputContext(); @@ -621,7 +621,7 @@ private: void handleSyncRequest( void* ev ); #endif -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) uint own_id : 1, macDropEnabled : 1; EventHandlerRef window_event; //mac event functions @@ -666,7 +666,7 @@ private: void setBackgroundModeDirect( BackgroundMode ); void setBackgroundEmpty(); void updateFrameStrut() const; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) void setBackgroundX11Relative(); #endif @@ -696,11 +696,11 @@ private: #ifndef TQT_NO_LAYOUT TQLayout *lay_out; #endif -#if defined(Q_WS_X11) && !defined(TQT_NO_IM) && !defined(TQT_NO_IM_EXTENSIONS) +#if defined(TQ_WS_X11) && !defined(TQT_NO_IM) && !defined(TQT_NO_IM_EXTENSIONS) TQInputContext *ic; // Input Context #endif TQWExtra *extra; -#if defined(Q_WS_QWS) +#if defined(TQ_WS_QWS) TQRegion req_region; // Requested region mutable TQRegion paintable_region; // Paintable region mutable bool paintable_region_dirty;// needs to be recalculated @@ -984,10 +984,10 @@ inline bool TQWidget::isInputMethodEnabled() const class TQFocusData; class TQWSManager; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) class TQOleDropTarget; #endif -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) class TQMacDndExtra; #endif @@ -1002,12 +1002,12 @@ struct TQ_EXPORT TQTLWExtra { // frame strut ulong fleft, fright, ftop, fbottom; uint unused : 8; // not used at this point... -#if defined( Q_WS_WIN ) || defined( Q_WS_MAC ) +#if defined( TQ_WS_WIN ) || defined( TQ_WS_MAC ) uint opacity : 8; // Stores opacity level on Windows/Mac OS X. #endif uint savedFlags; // Save widgetflags while showing fullscreen short basew, baseh; // base sizes -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) WId parentWinId; // parent window Id (valid after reparenting) uint embedded : 1; // window is embedded in another TQt application uint spont_unmapped: 1; // window was spontaneously unmapped @@ -1023,20 +1023,20 @@ struct TQ_EXPORT TQTLWExtra { uint syncRequestValue[2]; #endif #endif -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) WindowGroupRef group; uint is_moved: 1; uint resizer : 4; #endif -#if defined(Q_WS_QWS) && !defined ( TQT_NO_QWS_MANAGER ) +#if defined(TQ_WS_QWS) && !defined ( TQT_NO_QWS_MANAGER ) TQRegion decor_allocated_region; // decoration allocated region TQWSManager *qwsManager; #endif -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) HICON winIcon; // internal Windows icon #endif TQRect normalGeometry; // used by showMin/maximized/FullScreen -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN uint style, exstyle; #endif }; @@ -1055,13 +1055,13 @@ struct TQ_EXPORT TQWExtra { TQCursor *curs; #endif TQTLWExtra *topextra; // only useful for TLWs -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) TQOleDropTarget *dropTarget; // drop target #endif -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) WId xDndProxy; // XDND forwarding to embedded windows #endif -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) TQRegion clip_saved, clip_sibs, clip_children; TQMacDndExtra *macDndExtra; TQRegion dirty_area; @@ -1071,13 +1071,13 @@ struct TQ_EXPORT TQWExtra { uint ctx_children_clipped:1; #endif // TQMAC_NO_QUARTZ uint has_dirty_area:1; -#endif // Q_WS_MAC +#endif // TQ_WS_MAC uint bg_origin : 2; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) uint children_use_dnd : 1; uint compress_events : 1; #endif -#if defined(Q_WS_QWS) || defined(Q_WS_MAC) +#if defined(TQ_WS_QWS) || defined(TQ_WS_MAC) TQRegion mask; // widget mask #endif char bg_mode; // background mode diff --git a/src/kernel/ntqwindowdefs.h b/src/kernel/ntqwindowdefs.h index 6ec8f7796..4af074cc9 100644 --- a/src/kernel/ntqwindowdefs.h +++ b/src/kernel/ntqwindowdefs.h @@ -92,7 +92,7 @@ class TQWidgetListIt; // Window system dependent definitions -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) #if QT_MACOSX_VERSION < 0x1020 typedef struct OpaqueEventLoopTimerRef* EventLoopTimerRef; typedef struct OpaqueMenuHandle *MenuRef; @@ -101,7 +101,7 @@ typedef struct __EventLoopTimer* EventLoopTimerRef; typedef struct OpaqueMenuRef* MenuRef; #endif -#ifndef Q_WS_MACX +#ifndef TQ_WS_MACX typedef struct CGContext *CGContextRef; #endif typedef struct OpaqueWindowGroupRef *WindowGroupRef; @@ -128,18 +128,18 @@ typedef void * MSG; typedef int WId; typedef struct AEDesc AppleEvent; -#endif // Q_WS_MAC +#endif // TQ_WS_MAC -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) #include "qwindowdefs_win.h" -#endif // Q_WS_WIN +#endif // TQ_WS_WIN #if defined(Q_OS_TEMP) #include "qwinfunctions_wce.h" #endif // Q_OS_TEMP -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) typedef struct _XDisplay Display; typedef union _XEvent XEvent; @@ -156,15 +156,15 @@ TQ_EXPORT GC tqt_xget_temp_gc( int scrn, bool monochrome ); TQ_EXPORT const char *tqAppClass(); // get application class -#endif // Q_WS_X11 +#endif // TQ_WS_X11 -#if defined(Q_WS_QWS) +#if defined(TQ_WS_QWS) typedef unsigned long WId; struct TQWSEvent; class TQGfx; -#endif // Q_WS_QWS +#endif // TQ_WS_QWS class TQApplication; diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp index 76181cca9..c52f090fd 100644 --- a/src/kernel/qaccel.cpp +++ b/src/kernel/qaccel.cpp @@ -205,7 +205,7 @@ bool TQ_EXPORT tqt_tryComposeUnicode( TQWidget* w, TQKeyEvent* e){ return TQAccelManager::self()->tryComposeUnicode( w, e ); } -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC static bool qt_accel_no_shortcuts = TRUE; #else static bool qt_accel_no_shortcuts = FALSE; diff --git a/src/kernel/qaccessible.cpp b/src/kernel/qaccessible.cpp index f99543593..8306faa0a 100644 --- a/src/kernel/qaccessible.cpp +++ b/src/kernel/qaccessible.cpp @@ -327,7 +327,7 @@ static void qAccessibleCleanup() qAccessibleManager = 0; } -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC TQObject *TQAccessible::queryAccessibleObject(TQAccessibleInterface *o) { if(qAccessibleInterface) { diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp index 68e81d0f9..4b2684f18 100644 --- a/src/kernel/qapplication.cpp +++ b/src/kernel/qapplication.cpp @@ -60,7 +60,7 @@ #include "ntqmessagebox.h" #include "ntqdir.h" #include "ntqfileinfo.h" -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "qinputcontext_p.h" #endif #include "qfontdata_p.h" @@ -319,7 +319,7 @@ void tqt_init( int *, char **, TQApplication::Type ); void tqt_cleanup(); -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) void tqt_init( Display* dpy, TQt::HANDLE, TQt::HANDLE ); void tqt_init( int *, char **, Display* dpy, TQt::HANDLE, TQt::HANDLE ); #endif @@ -705,7 +705,7 @@ void TQApplication::process_cmdline( int* argcptr, char ** argv ) } if(j < argc) { -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX static char* empty = "\0"; argv[j] = empty; #else @@ -816,7 +816,7 @@ TQApplication::TQApplication( int &argc, char **argv ) \code int main( int argc, char **argv ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 bool useGUI = getenv( "DISPLAY" ) != 0; #else bool useGUI = TRUE; @@ -864,7 +864,7 @@ TQApplication::TQApplication( int &argc, char **argv, bool GUIenabled ) \code int main( int argc, char **argv ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 bool useGUI = getenv( "DISPLAY" ) != 0; #else bool useGUI = TRUE; @@ -943,7 +943,7 @@ TQApplication::Type TQApplication::type() const return tqt_appType; } -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) /*! Create an application, given an already open display \a dpy. If \a visual and \a colormap are non-zero, the application will use those as @@ -1033,7 +1033,7 @@ TQApplication::TQApplication(Display *dpy, int argc, char **argv, } -#endif // Q_WS_X11 +#endif // TQ_WS_X11 #ifdef TQT_THREAD_SUPPORT TQThread* TQApplication::guiThread() { @@ -1366,7 +1366,7 @@ TQStyle& TQApplication::style() if ( !tqt_is_gui_used ) tqFatal( "No style available in non-gui applications!" ); -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) if(!qt_style_override) x11_initialize_style(); // run-time search for default style #endif @@ -1379,22 +1379,22 @@ TQStyle& TQApplication::style() delete qt_style_override; qt_style_override = 0; } else { -# if defined(Q_WS_WIN) && defined(Q_OS_TEMP) +# if defined(TQ_WS_WIN) && defined(Q_OS_TEMP) style = "PocketPC"; -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) if ( qWinVersion() >= TQt::WV_XP && qWinVersion() < TQt::WV_NT_based ) style = "WindowsXP"; else style = "Windows"; // default styles for Windows -#elif defined(Q_WS_X11) && defined(Q_OS_SOLARIS) +#elif defined(TQ_WS_X11) && defined(Q_OS_SOLARIS) style = "CDE"; // default style for X11 on Solaris -#elif defined(Q_WS_X11) && defined(Q_OS_IRIX) +#elif defined(TQ_WS_X11) && defined(Q_OS_IRIX) style = "SGI"; // default style for X11 on IRIX -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) style = "Motif"; // default style for X11 -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) style = "Macintosh"; // default style for all Mac's -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) style = "Compact"; // default style for small devices #endif } @@ -1454,9 +1454,9 @@ void TQApplication::setStyle( TQStyle *style ) { TQStyle* old = app_style; app_style = style; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 tqt_explicit_app_style = TRUE; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 if ( startingUp() ) { delete old; @@ -1530,9 +1530,9 @@ void TQApplication::setStyle( TQStyle *style ) */ TQStyle* TQApplication::setStyle( const TQString& style ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 tqt_explicit_app_style = TRUE; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 if ( startingUp() ) { if(qt_style_override) @@ -1695,12 +1695,12 @@ void TQApplication::setGlobalStrut( const TQSize& strut ) app_strut = strut; } -#if defined( Q_WS_WIN ) || defined( Q_WS_MAC ) +#if defined( TQ_WS_WIN ) || defined( TQ_WS_MAC ) extern const char *tqAppFileName(); #endif #ifndef TQT_NO_DIR -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN static TQString resolveSymlinks( const TQString& path, int depth = 0 ) { bool foundLink = FALSE; @@ -1744,7 +1744,7 @@ static TQString resolveSymlinks( const TQString& path, int depth = 0 ) return path; } } -#endif // Q_WS_WIN +#endif // TQ_WS_WIN /*! Returns the directory that contains the application executable. @@ -1783,7 +1783,7 @@ TQString TQApplication::applicationDirPath() */ TQString TQApplication::applicationFilePath() { -#if defined( Q_WS_WIN ) +#if defined( TQ_WS_WIN ) TQFileInfo filePath; QT_WA({ WCHAR module_name[256]; @@ -1796,7 +1796,7 @@ TQString TQApplication::applicationFilePath() }); return filePath.filePath(); -#elif defined( Q_WS_MAC ) +#elif defined( TQ_WS_MAC ) return TQDir::cleanDirPath( TQFile::decodeName( tqAppFileName() ) ); #else TQString argv0 = TQFile::decodeName( argv()[0] ); @@ -1875,7 +1875,7 @@ TQStringList TQApplication::libraryPaths() app_libpaths = new TQStringList; TQString installPathPlugins = TQString::fromLocal8Bit(tqInstallPathPlugins()); if ( TQFile::exists(installPathPlugins) ) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN installPathPlugins.replace('\\', '/'); #endif app_libpaths->append(installPathPlugins); @@ -1884,7 +1884,7 @@ TQStringList TQApplication::libraryPaths() TQString app_location; if (tqApp) app_location = tqApp->applicationFilePath(); -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN else { app_location = TQString(tqAppFileName()); app_location.replace('\\', '/'); @@ -3105,7 +3105,7 @@ bool TQApplication::hasPendingEvents() return eventLoop()->hasPendingEvents(); } -#if !defined(Q_WS_X11) +#if !defined(TQ_WS_X11) // The doc and X implementation of these functions is in qapplication_x11.cpp @@ -3908,9 +3908,9 @@ void TQApplication::setActiveWindow( TQWidget* act ) TQFocusEvent out( TQEvent::FocusOut ); TQWidget *tmp = focus_widget; focus_widget = 0; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN TQInputContext::accept( tmp ); -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) tmp->unfocusInputContext(); #endif TQApplication::sendSpontaneousEvent( tmp, &out ); @@ -4011,7 +4011,7 @@ TQ_EXPORT void tqt_dispatchEnterLeave( TQWidget* enter, TQWidget* leave ) { } -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX extern TQWidget *tqt_tryModalHelperMac( TQWidget * top ); //qapplication_mac.cpp #endif @@ -4028,7 +4028,7 @@ TQ_EXPORT bool tqt_tryModalHelper( TQWidget *widget, TQWidget **rettop ) { if ( tqApp->activePopupWidget() ) return TRUE; -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX top = tqt_tryModalHelperMac( top ); if ( rettop ) *rettop = top; #endif @@ -4808,7 +4808,7 @@ void MyApplication::commitData( TQSessionManager& sm ) { Stubbed session management support *****************************************************************************/ #ifndef TQT_NO_SESSIONMANAGER -#if defined( TQT_NO_SM_SUPPORT ) || defined( Q_WS_WIN ) || defined( Q_WS_MAC ) || defined( Q_WS_QWS ) +#if defined( TQT_NO_SM_SUPPORT ) || defined( TQ_WS_WIN ) || defined( TQ_WS_MAC ) || defined( TQ_WS_QWS ) class TQSessionManagerData { @@ -4826,7 +4826,7 @@ TQSessionManager::TQSessionManager( TQApplication * app, TQString &id, TQString { qt_session_manager_self = this; d = new TQSessionManagerData; -#if defined(Q_WS_WIN) && !defined(Q_OS_TEMP) +#if defined(TQ_WS_WIN) && !defined(Q_OS_TEMP) wchar_t guidstr[40]; GUID guid; CoCreateGuid( &guid ); @@ -4858,14 +4858,14 @@ TQString TQSessionManager::sessionKey() const } -#if defined(Q_WS_X11) || defined(Q_WS_MAC) +#if defined(TQ_WS_X11) || defined(TQ_WS_MAC) void* TQSessionManager::handle() const { return 0; } #endif -#if !defined(Q_WS_WIN) +#if !defined(TQ_WS_WIN) bool TQSessionManager::allowsInteraction() { return TRUE; diff --git a/src/kernel/qapplication_p.h b/src/kernel/qapplication_p.h index abeceee64..5093dcfc7 100644 --- a/src/kernel/qapplication_p.h +++ b/src/kernel/qapplication_p.h @@ -84,7 +84,7 @@ const int QT_TABLET_NPACKETQSIZE = 128; extern TQt::MacintoshVersion qt_macver; #endif -#if defined (Q_WS_X11) +#if defined (TQ_WS_X11) extern int qt_ncols_option; #endif diff --git a/src/kernel/qclipboard.cpp b/src/kernel/qclipboard.cpp index ae5328806..0008f9a34 100644 --- a/src/kernel/qclipboard.cpp +++ b/src/kernel/qclipboard.cpp @@ -157,7 +157,7 @@ TQClipboard::TQClipboard( TQObject *parent, const char *name ) // nothing } -#ifndef Q_WS_WIN32 +#ifndef TQ_WS_WIN32 /*! \internal diff --git a/src/kernel/qcolor.cpp b/src/kernel/qcolor.cpp index 1b0895ba8..6278730f6 100644 --- a/src/kernel/qcolor.cpp +++ b/src/kernel/qcolor.cpp @@ -165,7 +165,7 @@ Global colors *****************************************************************************/ -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) #define COLOR0_PIX 0x00ffffff #define COLOR1_PIX 0 #else @@ -255,7 +255,7 @@ void TQColor::initGlobalColors() { globals_init = TRUE; - #ifdef Q_WS_X11 + #ifdef TQ_WS_X11 // HACK: we need a way to recognize color0 and color1 uniquely, so // that we can use color0 and color1 with fixed pixel values on // all screens @@ -264,7 +264,7 @@ void TQColor::initGlobalColors() #else stdcol[ 0].d.argb = tqRgb(255,255,255); stdcol[ 1].d.argb = 0; - #endif // Q_WS_X11 + #endif // TQ_WS_X11 stdcol[ 0].setPixel( COLOR0_PIX ); stdcol[ 1].setPixel( COLOR1_PIX ); @@ -901,7 +901,7 @@ uint TQColor::pixel() const if ( isDirty() ) return ((TQColor*)this)->alloc(); else if ( colormodel == d8 ) -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN // since d.d8.pix is uchar we have to use the PALETTEINDEX // macro to get the respective palette entry index. return (0x01000000 | (int)(short)(d.d8.pix)); diff --git a/src/kernel/qdragobject.cpp b/src/kernel/qdragobject.cpp index efc086164..c9d4e8f1b 100644 --- a/src/kernel/qdragobject.cpp +++ b/src/kernel/qdragobject.cpp @@ -109,7 +109,7 @@ public: static const char * const move_xpm[] = { "11 20 3 1", ". c None", -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) "a c #000000", "X c #FFFFFF", // Windows cursor is traditionally white #else @@ -143,7 +143,7 @@ static const char * const copy_xpm[] = { ". c None", "a c #000000", "X c #FFFFFF", -#if defined(Q_WS_WIN) // Windows cursor is traditionally white +#if defined(TQ_WS_WIN) // Windows cursor is traditionally white "aa......................", "aXa.....................", "aXXa....................", @@ -203,7 +203,7 @@ static const char * const link_xpm[] = { ". c None", "a c #000000", "X c #FFFFFF", -#if defined(Q_WS_WIN) // Windows cursor is traditionally white +#if defined(TQ_WS_WIN) // Windows cursor is traditionally white "aa......................", "aXa.....................", "aXXa....................", @@ -271,7 +271,7 @@ TQDragManager::TQDragManager() pm_cursor[0] = TQPixmap((const char **)move_xpm); pm_cursor[1] = TQPixmap((const char **)copy_xpm); pm_cursor[2] = TQPixmap((const char **)link_xpm); -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) createCursors(); // Xcursors cache can hold only 8 bitmaps (4 cursors) #endif object = 0; @@ -840,7 +840,7 @@ TQByteArray TQTextDrag::encodedData(const char* mime) const if ( !codec ) return r; TQString text( d->txt ); -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) int index = text.find( TQString::fromLatin1("\r\n"), 0 ); while ( index != -1 ) { text.replace( index, 2, TQChar('\n') ); @@ -850,7 +850,7 @@ TQByteArray TQTextDrag::encodedData(const char* mime) const r = codec->fromUnicode(text); if (!codec || codec->mibEnum() != 1000) { // Don't include NUL in size (TQCString::resize() adds NUL) -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) // This is needed to ensure the \0 isn't lost on Windows 95 if ( qWinVersion() & TQt::WV_DOS_based ) ((TQByteArray&)r).resize(r.length()+1); @@ -1508,7 +1508,7 @@ TQCString TQUriDrag::localFileToUri(const TQString& filename) if (TQDir::isRelativePath(r)) return TQCString(); -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN bool hasHost = FALSE; @@ -1529,7 +1529,7 @@ TQCString TQUriDrag::localFileToUri(const TQString& filename) r.insert(0,'/'); #endif -#if defined ( Q_WS_X11 ) && 0 +#if defined ( TQ_WS_X11 ) && 0 // URL without the hostname is considered to be errorneous by XDnD. // See: http://www.newplanetsoftware.com/xdnd/dragging_files.html // This feature is not active because this would break dnd between old and new qt apps. @@ -1594,7 +1594,7 @@ TQString TQUriDrag::uriToLocalFile(const char* uri) return file; bool local = uri[0] != '/' || ( uri[0] != '\0' && uri[1] == '/' ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // do we have a hostname? if ( !local && uri[0] == '/' && uri[2] != '/' ) { // then move the pointer to after the 'hostname/' part of the uri @@ -1618,7 +1618,7 @@ TQString TQUriDrag::uriToLocalFile(const char* uri) } else { file.insert(0,'/'); } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN if ( file.length() > 2 && file[0] == '/' && file[2] == '|' ) { file[2] = ':'; file.remove(0,1); @@ -1628,7 +1628,7 @@ TQString TQUriDrag::uriToLocalFile(const char* uri) // Leave slash as slashes. #endif } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN else { file = uriToUnicodeUri(uri); // convert to network path diff --git a/src/kernel/qeventloop.cpp b/src/kernel/qeventloop.cpp index 94018fa5f..2aa96de69 100644 --- a/src/kernel/qeventloop.cpp +++ b/src/kernel/qeventloop.cpp @@ -415,7 +415,7 @@ void TQEventLoop::processEvents( ProcessEventsFlags flags, int maxTime ) \sa awake() */ -#if !defined(Q_WS_X11) +#if !defined(TQ_WS_X11) void TQEventLoop::appStartingUp(){} void TQEventLoop::appClosingDown(){} -#endif // Q_WS_X11 +#endif // TQ_WS_X11 diff --git a/src/kernel/qeventloop_glib_p.h b/src/kernel/qeventloop_glib_p.h index dc19986a9..6c5fbbbb8 100644 --- a/src/kernel/qeventloop_glib_p.h +++ b/src/kernel/qeventloop_glib_p.h @@ -95,10 +95,10 @@ public: unsigned int exitloop : 1; unsigned int shortcut : 1; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) int xfd; GPollFD x_gPollFD; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 int thread_pipe[2]; GPollFD threadPipe_gPollFD; diff --git a/src/kernel/qeventloop_p.h b/src/kernel/qeventloop_p.h index 35a0ae95e..d0e00f669 100644 --- a/src/kernel/qeventloop_p.h +++ b/src/kernel/qeventloop_p.h @@ -69,9 +69,9 @@ class TQSocketNotifier; class TQMacSockNotPrivate; #endif -#if defined(Q_OS_UNIX) || defined (Q_WS_WIN) +#if defined(Q_OS_UNIX) || defined (TQ_WS_WIN) #include "ntqptrlist.h" -#endif // Q_OS_UNIX || Q_WS_WIN +#endif // Q_OS_UNIX || TQ_WS_WIN #if defined(Q_OS_UNIX) struct TQSockNot @@ -95,12 +95,12 @@ public: }; #endif // Q_OS_UNIX -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) struct TQSockNot { TQSocketNotifier *obj; int fd; }; -#endif // Q_WS_WIN +#endif // TQ_WS_WIN class TQEventLoopPrivate { @@ -124,14 +124,14 @@ public: unsigned int exitloop : 1; unsigned int shortcut : 1; -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) uchar next_select_timer; EventLoopTimerRef select_timer; #endif -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) int xfd; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 #if defined(Q_OS_UNIX) int thread_pipe[2]; @@ -144,10 +144,10 @@ public: TQSockNotType sn_vec[3]; #endif -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN // pending socket notifiers list TQPtrList<TQSockNot> sn_pending_list; -#endif // Q_WS_WIN +#endif // TQ_WS_WIN }; diff --git a/src/kernel/qeventloop_unix_glib.cpp b/src/kernel/qeventloop_unix_glib.cpp index d1e6c3adf..f84339651 100644 --- a/src/kernel/qeventloop_unix_glib.cpp +++ b/src/kernel/qeventloop_unix_glib.cpp @@ -433,12 +433,12 @@ bool qKillTimer( TQObject *obj ) TQEventLoopPrivate::TQEventLoopPrivate() { -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) xfd = -1; x_gPollFD.fd = -1; x_gPollFD.events = 0; x_gPollFD.revents = 0; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 singletoolkit = TRUE; ctx = 0; ctx_is_default = false; diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp index 455941123..44168a1fa 100644 --- a/src/kernel/qfont.cpp +++ b/src/kernel/qfont.cpp @@ -51,7 +51,7 @@ #include "ntqapplication.h" #include "ntqcleanuphandler.h" #include "ntqstringlist.h" -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC #include "ntqpaintdevicemetrics.h" #endif @@ -121,9 +121,9 @@ bool TQFontDef::operator==( const TQFontDef &other ) const && (this_foundry.isEmpty() || other_foundry.isEmpty() || this_foundry == other_foundry) -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 && addStyle == other.addStyle -#endif // Q_WS_X11 +#endif // TQ_WS_X11 ); } @@ -135,11 +135,11 @@ TQFontPrivate::TQFontPrivate() rawMode( FALSE ), underline( FALSE ), overline( FALSE ), strikeOut( FALSE ), mask( 0 ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 screen = TQPaintDevice::x11AppScreen(); #else screen = 0; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 } TQFontPrivate::TQFontPrivate( const TQFontPrivate &other ) @@ -208,19 +208,19 @@ void TQFontPrivate::resolve( const TQFontPrivate *other ) TQFontEngineData::TQFontEngineData() : lineWidth( 1 ) { -#if defined(Q_WS_X11) || defined(Q_WS_WIN) +#if defined(TQ_WS_X11) || defined(TQ_WS_WIN) memset( engines, 0, TQFont::LastPrivateScript * sizeof( TQFontEngine * ) ); #else engine = 0; -#endif // Q_WS_X11 || Q_WS_WIN -#ifndef Q_WS_MAC +#endif // TQ_WS_X11 || TQ_WS_WIN +#ifndef TQ_WS_MAC memset( widthCache, 0, widthCacheSize*sizeof( uchar ) ); #endif } TQFontEngineData::~TQFontEngineData() { -#if defined(Q_WS_X11) || defined(Q_WS_WIN) +#if defined(TQ_WS_X11) || defined(TQ_WS_WIN) for ( int i = 0; i < TQFont::LastPrivateScript; i++ ) { if ( engines[i] ) engines[i]->deref(); @@ -230,7 +230,7 @@ TQFontEngineData::~TQFontEngineData() if ( engine ) engine->deref(); engine = 0; -#endif // Q_WS_X11 || Q_WS_WIN +#endif // TQ_WS_X11 || TQ_WS_WIN } @@ -691,9 +691,9 @@ void TQFont::setFamily( const TQString &family ) detach(); d->request.family = family; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) d->request.addStyle = TQString::null; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 d->mask |= TQFontPrivate::Family; } @@ -1130,9 +1130,9 @@ void TQFont::setStyleHint( StyleHint hint, StyleStrategy strategy ) d->mask |= TQFontPrivate::StyleHint; d->mask |= TQFontPrivate::StyleStrategy; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) d->request.addStyle = TQString::null; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 } /*! @@ -1386,11 +1386,11 @@ static void initFontSubst() // default substitutions static const char *initTbl[] = { -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) "arial", "helvetica", "helv", "helvetica", "tms rmn", "times", -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) "times", "Times New Roman", "courier", "Courier New", "helvetica", "Arial", @@ -1691,7 +1691,7 @@ bool TQFont::fromString(const TQString &descrip) return TRUE; } -#if !defined( Q_WS_QWS ) +#if !defined( TQ_WS_QWS ) /*! \internal Internal function that dumps font cache statistics. @@ -1701,7 +1701,7 @@ void TQFont::cacheStatistics() } -#endif // !Q_WS_QWS +#endif // !TQ_WS_QWS @@ -1730,7 +1730,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQFont &font ) if ( s.version() <= 3 ) { TQ_INT16 pointSize = (TQ_INT16) font.d->request.pointSize; if ( pointSize == -1 ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 pointSize = (TQ_INT16)(font.d->request.pixelSize*720/TQPaintDevice::x11AppDpiY()); #else pointSize = (TQ_INT16)TQFontInfo( font ).pointSize() * 10; @@ -1926,7 +1926,7 @@ TQFontMetrics::TQFontMetrics( const TQPainter *p ) d = painter->pfont ? painter->pfont->d : painter->cfont.d; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) if ( d->screen != p->scrn ) { TQFontPrivate *new_d = new TQFontPrivate( *d ); TQ_CHECK_PTR( new_d ); @@ -1934,7 +1934,7 @@ TQFontMetrics::TQFontMetrics( const TQPainter *p ) d->screen = p->scrn; d->count = 1; } else -#endif // Q_WS_X11 +#endif // TQ_WS_X11 d->ref(); } @@ -2170,7 +2170,7 @@ bool TQFontMetrics::inFont(TQChar ch) const \sa rightBearing(), minLeftBearing(), width() */ -#if !defined(Q_WS_WIN) && !defined(Q_WS_QWS) +#if !defined(TQ_WS_WIN) && !defined(TQ_WS_QWS) int TQFontMetrics::leftBearing(TQChar ch) const { TQFont::Script script; @@ -2190,7 +2190,7 @@ int TQFontMetrics::leftBearing(TQChar ch) const glyph_metrics_t gi = engine->boundingBox( glyphs[0] ); return gi.x; } -#endif // !Q_WS_WIN +#endif // !TQ_WS_WIN /*! \fn int TQFontMetrics::rightBearing(TQChar ch) const Returns the right bearing of character \a ch in the font. @@ -2204,7 +2204,7 @@ int TQFontMetrics::leftBearing(TQChar ch) const \sa leftBearing(), minRightBearing(), width() */ -#if !defined(Q_WS_WIN) && !defined(Q_WS_QWS) +#if !defined(TQ_WS_WIN) && !defined(TQ_WS_QWS) int TQFontMetrics::rightBearing(TQChar ch) const { TQFont::Script script; @@ -2224,10 +2224,10 @@ int TQFontMetrics::rightBearing(TQChar ch) const glyph_metrics_t gi = engine->boundingBox( glyphs[0] ); return gi.xoff - gi.x - gi.width; } -#endif // !Q_WS_WIN +#endif // !TQ_WS_WIN -#ifndef Q_WS_QWS +#ifndef TQ_WS_QWS /*! Returns the width in pixels of the first \a len characters of \a str. If \a len is negative (the default), the entire string is @@ -2249,7 +2249,7 @@ int TQFontMetrics::width( const TQString &str, int len ) const int pos = 0; int width = 0; -#ifndef Q_WS_MAC +#ifndef TQ_WS_MAC const TQChar *ch = str.unicode(); while (pos < len) { @@ -2287,7 +2287,7 @@ int TQFontMetrics::width( const TQString &str, int len ) const TQTextEngine layout( str, d ); layout.itemize( TQTextEngine::WidthOnly ); width += layout.width( pos, len-pos ); -#ifndef Q_WS_MAC +#ifndef TQ_WS_MAC } #endif return width; @@ -2339,7 +2339,7 @@ int TQFontMetrics::width( const TQString &str, int len ) const account. */ -#ifndef Q_WS_QWS +#ifndef TQ_WS_QWS /*! Returns the bounding rectangle of the first \a len characters of \a str, which is the set of pixels the text would cover if drawn @@ -2986,7 +2986,7 @@ TQFontCache::~TQFontCache() instance = 0; } -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS void TQFontCache::clear() { { @@ -3107,7 +3107,7 @@ void TQFontCache::decreaseCost( uint cost ) cost, total_cost, max_cost ); } -#if defined(Q_WS_WIN ) || defined (Q_WS_QWS) +#if defined(TQ_WS_WIN ) || defined (TQ_WS_QWS) void TQFontCache::cleanupPrinterFonts() { FC_DEBUG( "TQFontCache::cleanupPrinterFonts" ); @@ -3125,7 +3125,7 @@ void TQFontCache::cleanupPrinterFonts() } if( it.data()->count > 0 ) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN for(int i = 0; i < TQFont::LastPrivateScript; ++i) { if( it.data()->engines[i] ) { it.data()->engines[i]->deref(); @@ -3209,13 +3209,13 @@ void TQFontCache::timerEvent( TQTimerEvent * ) #ifdef TQFONTCACHE_DEBUG FC_DEBUG( " %p: ref %2d", it.data(), it.data()->count ); -# if defined(Q_WS_X11) || defined(Q_WS_WIN) +# if defined(TQ_WS_X11) || defined(TQ_WS_WIN) // print out all engines for ( int i = 0; i < TQFont::LastPrivateScript; ++i ) { if ( ! it.data()->engines[i] ) continue; FC_DEBUG( " contains %p", it.data()->engines[i] ); } -# endif // Q_WS_X11 || Q_WS_WIN +# endif // TQ_WS_X11 || TQ_WS_WIN #endif // TQFONTCACHE_DEBUG if ( it.data()->count > 0 ) diff --git a/src/kernel/qfontdata_p.h b/src/kernel/qfontdata_p.h index fc0734489..9c21dfe60 100644 --- a/src/kernel/qfontdata_p.h +++ b/src/kernel/qfontdata_p.h @@ -69,7 +69,7 @@ struct TQFontDef styleHint( TQFont::AnyStyle ), styleStrategy( TQFont::PreferDefault ), weight( 50 ), italic( FALSE ), fixedPitch( FALSE ), stretch( 100 ), ignorePitch(TRUE) -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC ,fixedPitchComputed(FALSE) #endif { @@ -77,9 +77,9 @@ struct TQFontDef TQString family; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQString addStyle; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 int pointSize; int pixelSize; @@ -107,9 +107,9 @@ struct TQFontDef if ( styleStrategy != other.styleStrategy ) return styleStrategy < other.styleStrategy; if ( family != other.family ) return family < other.family; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( addStyle != other.addStyle ) return addStyle < other.addStyle; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 return FALSE; } @@ -123,12 +123,12 @@ public: uint lineWidth; -#if defined(Q_WS_X11) || defined(Q_WS_WIN) +#if defined(TQ_WS_X11) || defined(TQ_WS_WIN) TQFontEngine *engines[TQFont::LastPrivateScript]; #else TQFontEngine *engine; -#endif // Q_WS_X11 || Q_WS_WIN -#ifndef Q_WS_MAC +#endif // TQ_WS_X11 || TQ_WS_WIN +#ifndef TQ_WS_MAC enum { widthCacheSize = 0x500 }; uchar widthCache[widthCacheSize]; #endif @@ -139,9 +139,9 @@ class TQFontPrivate : public TQShared { public: static TQFont::Script defaultScript; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static int defaultEncodingID; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 TQFontPrivate(); TQFontPrivate( const TQFontPrivate &other ); @@ -151,7 +151,7 @@ public: TQFontEngine *engineForScript( TQFont::Script script ) const { if ( script == TQFont::NoScript ) script = TQFontPrivate::defaultScript; -#if defined(Q_WS_X11) || defined(Q_WS_WIN) +#if defined(TQ_WS_X11) || defined(TQ_WS_WIN) if ( ! engineData || ! engineData->engines[script] ) ((TQFontPrivate *) this)->load( script ); return engineData->engines[script]; @@ -159,7 +159,7 @@ public: if ( ! engineData || ! engineData->engine ) ((TQFontPrivate *) this)->load( script ); return engineData->engine; -#endif // Q_WS_X11 || Q_WS_WIN +#endif // TQ_WS_X11 || TQ_WS_WIN } TQFontDef request; @@ -201,7 +201,7 @@ public: TQFontCache(); ~TQFontCache(); -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS void clear(); #endif // universal key structure. TQFontEngineDatas and TQFontEngines are cached using @@ -211,7 +211,7 @@ public: Key( const TQFontDef &d, TQFont::Script c, int s, TQPaintDevice *pdev ) : script(c), screen(s) { def = d; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 dpi = pdev ? TQPaintDeviceMetrics(pdev).logicalDpiY() : 0; #else Q_UNUSED(pdev); @@ -259,7 +259,7 @@ public: TQFontEngine *findEngine( const Key &key ); void insertEngine( const Key &key, TQFontEngine *engine ); -#if defined(Q_WS_WIN) || defined(Q_WS_QWS) +#if defined(TQ_WS_WIN) || defined(TQ_WS_QWS) void cleanupPrinterFonts(); #endif diff --git a/src/kernel/qfontdatabase.cpp b/src/kernel/qfontdatabase.cpp index fd57e179c..152b6f250 100644 --- a/src/kernel/qfontdatabase.cpp +++ b/src/kernel/qfontdatabase.cpp @@ -50,7 +50,7 @@ #include <ntqcleanuphandler.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <locale.h> #endif #include <stdlib.h> @@ -123,7 +123,7 @@ static int getFontWeight( const TQString &weightString ) return (int) TQFont::Normal; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 struct TQtFontEncoding { signed int encoding : 16; @@ -134,22 +134,22 @@ struct TQtFontEncoding uint avgwidth : 16; uchar pitch : 8; }; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 struct TQtFontSize { unsigned short pixelSize; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 int count; TQtFontEncoding *encodings; TQtFontEncoding *encodingID( int id, uint xpoint = 0, uint xres = 0, uint yres = 0, uint avgwidth = 0, bool add = FALSE); -#endif // Q_WS_X11 +#endif // TQ_WS_X11 }; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQtFontEncoding *TQtFontSize::encodingID( int id, uint xpoint, uint xres, uint yres, uint avgwidth, bool add ) { @@ -173,7 +173,7 @@ TQtFontEncoding *TQtFontSize::encodingID( int id, uint xpoint, uint xres, encodings[count].pitch = '*'; return encodings + count++; } -#endif // Q_WS_X11 +#endif // TQ_WS_X11 struct TQtFontStyle { @@ -208,13 +208,13 @@ struct TQtFontStyle : key( k ), bitmapScalable( FALSE ), smoothScalable( FALSE ), fakeOblique( FALSE ), count( 0 ), pixelSizes( 0 ) { -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) weightName = setwidthName = 0; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 } ~TQtFontStyle() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 delete [] weightName; delete [] setwidthName; while ( count-- ) @@ -230,10 +230,10 @@ struct TQtFontStyle int count : 29; TQtFontSize *pixelSizes; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 const char *weightName; const char *setwidthName; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 TQtFontSize *pixelSize( unsigned short size, bool = FALSE ); }; @@ -263,7 +263,7 @@ TQtFontSize *TQtFontStyle::pixelSize( unsigned short size, bool add ) realloc( pixelSizes, (((count+8) >> 3 ) << 3) * sizeof(TQtFontSize) ); pixelSizes[count].pixelSize = size; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 pixelSizes[count].count = 0; pixelSizes[count].encodings = 0; #endif @@ -326,12 +326,12 @@ struct TQtFontFamily TQtFontFamily(const TQString &n ) : -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 fixedPitch( TRUE ), hasXft( FALSE ), xftScriptCheck( FALSE ), xlfdLoaded( FALSE ), synthetic(FALSE), #else fixedPitch( FALSE ), #endif -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN scriptCheck( FALSE ), #endif #if defined(Q_OS_MAC) && !defined(TQWS) @@ -348,13 +348,13 @@ struct TQtFontFamily } bool fixedPitch : 1; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 bool hasXft : 1; bool xftScriptCheck : 1; bool xlfdLoaded : 1; bool synthetic : 1; #endif -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN bool scriptCheck : 1; #endif #if defined(Q_OS_MAC) && !defined(TQWS) @@ -363,14 +363,14 @@ struct TQtFontFamily bool fullyLoaded : 1; TQString name; TQString rawName; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQCString fontFilename; int fontFileIndex; #endif -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC FMFontFamily macFamily; #endif -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN TQString english_name; #endif int count; @@ -454,7 +454,7 @@ TQtFontFamily *TQFontDatabasePrivate::family( const TQString &f, bool create ) -#if defined(Q_WS_X11) || defined(Q_WS_WIN) +#if defined(TQ_WS_X11) || defined(TQ_WS_WIN) static const unsigned short sample_chars[TQFont::LastPrivateScript][14] = { // European Alphabetic Scripts @@ -601,7 +601,7 @@ static const unsigned short sample_chars[TQFont::LastPrivateScript][14] = // Taiwan would be 0x201C, 0x3002, 0x4E00, 0x9F98, 0xFFE5 }; -#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) +#if defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE) static inline bool requiresOpenType(TQFont::Script s) { return (s >= TQFont::Syriac && s <= TQFont::Sinhala) @@ -631,7 +631,7 @@ static inline bool canRender( TQFontEngine *fe, TQFont::Script script ) } ++i; } -#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) +#if defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE) if (hasChar && requiresOpenType(script)) { TQOpenType *ot = fe->openType(); if (!ot || !ot->supportsScript(script)) @@ -641,20 +641,20 @@ static inline bool canRender( TQFontEngine *fe, TQFont::Script script ) return hasChar; } -#endif // Q_WS_X11 || Q_WS_WIN +#endif // TQ_WS_X11 || TQ_WS_WIN static TQSingleCleanupHandler<TQFontDatabasePrivate> qfontdatabase_cleanup; static TQFontDatabasePrivate *db=0; #define SMOOTH_SCALABLE 0xffff -#if defined( Q_WS_X11 ) +#if defined( TQ_WS_X11 ) # include "qfontdatabase_x11.cpp" -#elif defined( Q_WS_MAC ) +#elif defined( TQ_WS_MAC ) # include "qfontdatabase_mac.cpp" -#elif defined( Q_WS_WIN ) +#elif defined( TQ_WS_WIN ) # include "qfontdatabase_win.cpp" -#elif defined( Q_WS_QWS ) +#elif defined( TQ_WS_QWS ) # include "qfontdatabase_qws.cpp" #endif @@ -696,7 +696,7 @@ static TQtFontStyle *bestStyle(TQtFontFoundry *foundry, const TQtFontStyle::Key return foundry->styles[best]; } -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) static TQtFontEncoding *findEncoding(TQFont::Script script, int styleStrategy, TQtFontSize *size, int force_encoding_id) { @@ -733,17 +733,17 @@ static TQtFontEncoding *findEncoding(TQFont::Script script, int styleStrategy, return encoding; } -#endif // Q_WS_X11 +#endif // TQ_WS_X11 -#if defined(Q_WS_X11) || defined(Q_WS_WIN) +#if defined(TQ_WS_X11) || defined(TQ_WS_WIN) static unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleStrategy, const TQtFontFamily *family, const TQString &foundry_name, TQtFontStyle::Key styleKey, int pixelSize, char pitch, TQtFontFoundry **best_foundry, TQtFontStyle **best_style, TQtFontSize **best_size -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 , TQtFontEncoding **best_encoding, int force_encoding_id #endif ) @@ -799,7 +799,7 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt } } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQtFontEncoding *encoding = 0; #endif @@ -807,7 +807,7 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt if (! size) { unsigned int distance = ~0u; for (int x = 0; x < style->count; ++x) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 encoding = findEncoding(script, styleStrategy, style->pixelSizes + x, force_encoding_id); if (!encoding) { @@ -841,7 +841,7 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt } } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if (size) { encoding = findEncoding(script, styleStrategy, size, force_encoding_id); if (!encoding) size = 0; @@ -850,7 +850,7 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt FM_DEBUG( " foundry doesn't support the script we want" ); continue; } -#endif // Q_WS_X11 +#endif // TQ_WS_X11 unsigned int this_score = 0x0000; enum { @@ -861,7 +861,7 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt XLFDPenalty = 0x0001 }; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( encoding->encoding != -1 ) { this_score += XLFDPenalty; if ( encoding->encoding != TQFontPrivate::defaultEncodingID ) @@ -896,9 +896,9 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt *best_foundry = foundry; *best_style = style; *best_size = size; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 *best_encoding = encoding; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 } else { FM_DEBUG( " score %x no better than best %x", this_score, score); } @@ -914,7 +914,7 @@ TQFontEngine * TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, const TQFontDef &request, int force_encoding_id ) { -#ifndef Q_WS_X11 +#ifndef TQ_WS_X11 Q_UNUSED( force_encoding_id ); #endif @@ -925,7 +925,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, if ( fp ) { if ( fp->rawMode ) { fe = loadEngine( script, fp, request, 0, 0, 0 -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 , 0, 0, FALSE #endif ); @@ -936,7 +936,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, } TQFontCache::Key key( request, script, -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN (int)fp->paintdevice, #else fp->screen, @@ -947,7 +947,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, if ( fe ) return fe; } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN if (request.styleStrategy & TQFont::PreferDevice) { TQFontEngine *fe = loadEngine(script, fp, request, 0, 0, 0); if(fe) @@ -964,7 +964,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, parseFontName( request.family, foundry_name, family_name ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if (script == TQFont::Han) { // modify script according to locale static TQFont::Script defaultHan; @@ -1013,9 +1013,9 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, TQtFontFoundry *best_foundry = 0; TQtFontStyle *best_style = 0; TQtFontSize *best_size = 0; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQtFontEncoding *best_encoding = 0; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 unsigned int score = ~0; @@ -1023,14 +1023,14 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, for ( int x = 0; x < db->count; ++x ) { TQtFontFamily *try_family = db->families[x]; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if (try_family->synthetic) // skip generated fontconfig fonts continue; #endif if ( !family_name.isEmpty() && ucstricmp( try_family->name, family_name ) != 0 -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN && ucstricmp( try_family->english_name, family_name ) != 0 #endif ) @@ -1044,7 +1044,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, if ( ! ( try_family->scripts[script] & TQtFontFamily::Supported ) && script != TQFont::Unicode) { // family not supported in the script we want -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if (script >= TQFont::Han_Japanese && script <= TQFont::Han_Korean && try_family->scripts[TQFont::Han] == TQtFontFamily::Supported) { // try with the han script instead, give it a penalty @@ -1081,9 +1081,9 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, TQtFontFoundry *try_foundry = 0; TQtFontStyle *try_style = 0; TQtFontSize *try_size = 0; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQtFontEncoding *try_encoding = 0; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 // as we know the script is supported, we can be sure // to find a matching font here. @@ -1091,7 +1091,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, bestFoundry( override_script, score, request.styleStrategy, try_family, foundry_name, styleKey, request.pixelSize, pitch, &try_foundry, &try_style, &try_size -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 , &try_encoding, force_encoding_id #endif ); @@ -1101,7 +1101,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, newscore = bestFoundry( override_script, score, request.styleStrategy, try_family, TQString::null, styleKey, request.pixelSize, pitch, &try_foundry, &try_style, &try_size -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 , &try_encoding, force_encoding_id #endif ); @@ -1114,16 +1114,16 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, best_foundry = try_foundry; best_style = try_style; best_size = try_size; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 best_encoding = try_encoding; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 } if ( newscore < 10 ) // xlfd instead of xft... just accept it break; } if ( best_family != 0 && best_foundry != 0 && best_style != 0 -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 && best_size != 0 && best_encoding != 0 #endif ) { @@ -1138,7 +1138,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, best_foundry->name.isEmpty() ? "-- none --" : best_foundry->name.latin1(), best_style->key.weight, best_style->key.italic, best_style->key.oblique, best_style->key.stretch, best_size ? best_size->pixelSize : 0xffff, -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 best_encoding->pitch, best_encoding->encoding #else 'p', 0 @@ -1146,7 +1146,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, ); fe = loadEngine( script, fp, request, best_family, best_foundry, best_style -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 , best_size, best_encoding, ( force_encoding_id >= 0 ) #endif ); @@ -1191,7 +1191,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, def.family = def.family.left(def.family.find(',')); } TQFontCache::Key key( def, script, -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN (int)fp->paintdevice, #else fp->screen, @@ -1224,7 +1224,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, if ( fp ) { TQFontCache::Key key( request, script, -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN (int)fp->paintdevice, #else fp->screen, @@ -1236,10 +1236,10 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, } if ( fp ) { -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) fe->fontDef.pointSize = tqRound(10. * qt_pointSize(fe->fontDef.pixelSize, fp->paintdevice, fp->screen)); -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) fe->fontDef.pointSize = int( double( fe->fontDef.pixelSize ) * 720.0 / GetDeviceCaps(shared_dc,LOGPIXELSY) ); #else @@ -1252,7 +1252,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, return fe; } -#endif // Q_WS_X11 || Q_WS_WIN +#endif // TQ_WS_X11 || TQ_WS_WIN @@ -1692,7 +1692,7 @@ bool TQFontDatabase::isScalable( const TQString &family, TQValueList<int> TQFontDatabase::pointSizes( const TQString &family, const TQString &style) { -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) // windows and macosx are always smoothly scalable Q_UNUSED( family ); Q_UNUSED( style ); @@ -1725,7 +1725,7 @@ TQValueList<int> TQFontDatabase::pointSizes( const TQString &family, const TQtFontSize *size = style->pixelSizes + l; if (size->pixelSize != 0 && size->pixelSize != USHRT_MAX) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 const uint pointSize = tqRound(qt_pointSize(size->pixelSize, 0, -1)); #else const uint pointSize = size->pixelSize; // embedded uses 72dpi @@ -1792,7 +1792,7 @@ TQFont TQFontDatabase::font( const TQString &family, const TQString &style, TQValueList<int> TQFontDatabase::smoothSizes( const TQString &family, const TQString &style) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN Q_UNUSED( family ); Q_UNUSED( style ); return TQFontDatabase::standardSizes(); @@ -1826,7 +1826,7 @@ TQValueList<int> TQFontDatabase::smoothSizes( const TQString &family, const TQtFontSize *size = style->pixelSizes + l; if ( size->pixelSize != 0 && size->pixelSize != USHRT_MAX ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 const uint pointSize = tqRound(qt_pointSize(size->pixelSize, 0, -1)); #else const uint pointSize = size->pixelSize; // embedded uses 72dpi diff --git a/src/kernel/qfontengine_p.h b/src/kernel/qfontengine_p.h index 499a5598b..e1fc58545 100644 --- a/src/kernel/qfontengine_p.h +++ b/src/kernel/qfontengine_p.h @@ -41,7 +41,7 @@ #include "ntqglobal.h" #endif // QT_H -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "qt_windows.h" #include "ntqptrdict.h" #endif @@ -58,7 +58,7 @@ typedef int advance_t; class TQOpenType; struct TransformedFont; -#if defined( Q_WS_X11 ) || defined( Q_WS_WIN) || defined( Q_WS_MAC ) +#if defined( TQ_WS_X11 ) || defined( TQ_WS_WIN) || defined( TQ_WS_MAC ) class TQFontEngine : public TQShared { public: @@ -87,7 +87,7 @@ public: TQFontEngine() { count = 0; cache_count = 0; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 transformed_fonts = 0; #endif } @@ -97,7 +97,7 @@ public: virtual Error stringToCMap( const TQChar *str, int len, glyph_t *glyphs, advance_t *advances, int *nglyphs, bool mirrored ) const = 0; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 virtual int cmap() const { return -1; } virtual TQOpenType *openType() const { return 0; } #endif @@ -133,7 +133,7 @@ public: uint cache_cost; // amount of mem used in kb by the font int cache_count; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN HDC dc() const; void getGlyphIndexes( const TQChar *ch, int numChars, glyph_t *glyphs, bool mirrored ) const; void getCMap(); @@ -157,12 +157,12 @@ public: static TQPtrDict<TQFontEngine> cacheDict; short lbearing; short rbearing; -#endif // Q_WS_WIN -#ifdef Q_WS_X11 +#endif // TQ_WS_WIN +#ifdef TQ_WS_X11 TransformedFont *transformed_fonts; #endif }; -#elif defined( Q_WS_QWS ) +#elif defined( TQ_WS_QWS ) class TQGfx; class TQFontEngine : public TQShared @@ -248,7 +248,7 @@ enum IndicFeatures { HalantFeature }; -#if defined(Q_WS_X11) || defined(Q_WS_WIN) +#if defined(TQ_WS_X11) || defined(TQ_WS_WIN) class TQFontEngineBox : public TQFontEngine { public: @@ -270,7 +270,7 @@ public: int minLeftBearing() const { return 0; } int minRightBearing() const { return 0; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 int cmap() const; #endif const char *name() const; @@ -286,7 +286,7 @@ private: }; #endif -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include "qt_x11_p.h" @@ -527,7 +527,7 @@ private: #endif // TQT_NO_XFTFREETYPE -#elif defined( Q_WS_MAC ) +#elif defined( TQ_WS_MAC ) #include "qt_mac.h" #include <ntqmap.h> #include <ntqcache.h> @@ -584,7 +584,7 @@ public: TQPaintDevice *dev=NULL, const TQRegion *rgn=NULL) const; }; -#elif defined( Q_WS_WIN ) +#elif defined( TQ_WS_WIN ) class TQFontEngineWin : public TQFontEngine { @@ -627,6 +627,6 @@ public: }; #endif -#endif // Q_WS_WIN +#endif // TQ_WS_WIN #endif diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp index a736afa64..65ab15811 100644 --- a/src/kernel/qfontengine_x11.cpp +++ b/src/kernel/qfontengine_x11.cpp @@ -2610,14 +2610,14 @@ bool TQOpenType::shape(TQShaperItem *item, const unsigned int *properties) bool TQOpenType::positionAndAdd(TQShaperItem *item, bool doLogClusters) { if (gpos) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Q_ASSERT(fontEngine->type() == TQFontEngine::Xft); face = lockFTFace(static_cast<TQFontEngineXft *>(fontEngine)->font()); #endif memset(otl_buffer->positions, 0, otl_buffer->in_length*sizeof(OTL_PositionRec)); // #### check that passing "FALSE,FALSE" is correct TT_GPOS_Apply_String(face, gpos, loadFlags, otl_buffer, FALSE, FALSE); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 unlockFTFace(static_cast<TQFontEngineXft *>(fontEngine)->font()); #endif } diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp index 1c1d84b2c..ce95f1cb6 100644 --- a/src/kernel/qimage.cpp +++ b/src/kernel/qimage.cpp @@ -59,12 +59,12 @@ #include <ctype.h> #include <stdlib.h> -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS #include "qgfx_qws.h" #endif // 16bpp images on supported on TQt/Embedded -#if !defined( Q_WS_QWS ) && !defined(TQT_NO_IMAGE_16_BIT) +#if !defined( TQ_WS_QWS ) && !defined(TQT_NO_IMAGE_16_BIT) #define TQT_NO_IMAGE_16_BIT #endif @@ -510,7 +510,7 @@ TQImage::TQImage( uchar* yourdata, int w, int h, int depth, data->bitordr = bitOrder; } -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS /*! Constructs an image that uses an existing memory buffer. The @@ -559,7 +559,7 @@ TQImage::TQImage( uchar* yourdata, int w, int h, int depth, data->bits = jt; data->bitordr = bitOrder; } -#endif // Q_WS_QWS +#endif // TQ_WS_QWS /*! Destroys the image and cleans up. @@ -666,7 +666,7 @@ TQImage TQImage::copy() const } else { TQImage image; image.create( width(), height(), depth(), numColors(), bitOrder() ); -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS // TQt/Embedded can create images with non-default bpl // make sure we don't crash. if ( image.numBytes() != numBytes() ) @@ -1098,7 +1098,7 @@ TQImage::Endian TQImage::systemByteOrder() } -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) #include <X11/Xlib.h> // needed for systemBitOrder #include <X11/Xutil.h> #include <X11/Xos.h> @@ -1129,7 +1129,7 @@ TQImage::Endian TQImage::systemByteOrder() TQImage::Endian TQImage::systemBitOrder() { -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) return BitmapBitOrder(tqt_xdisplay()) == MSBFirst ? BigEndian :LittleEndian; #else return BigEndian; @@ -1279,7 +1279,7 @@ bool TQImage::create( int width, int height, int depth, int numColors, return FALSE; } // TQt/Embedded doesn't waste memory on unnecessary padding. -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS const int bpl = (width*depth+7)/8; // bytes per scanline const int pad = 0; #else @@ -4745,7 +4745,7 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image ) d->at( startpos + offset ); // start of image data int bpl = image.bytesPerLine(); -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS // // Guess the number of bytes-per-line if we don't know how much // image data is in the file (bogus image ?). @@ -4761,7 +4761,7 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image ) while ( --h >= 0 ) { if ( d->readBlock((char*)line[h],bpl) != bpl ) break; -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS if ( pad > 0 ) d->at(d->at()+pad); #endif @@ -4911,7 +4911,7 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image ) while ( --h >= 0 ) { if ( d->readBlock((char *)line[h],bpl) != bpl ) break; -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS if ( pad > 0 ) d->at(d->at()+pad); #endif @@ -4989,7 +4989,7 @@ bool qt_write_dib( TQDataStream& s, TQImage image ) } else if ( image.depth() == 32 ) { bpl_bmp = ((image.width()*24+31)/32)*4; nbits = 24; -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS } else if ( image.depth() == 1 || image.depth() == 8 ) { // TQt/E doesn't word align. bpl_bmp = ((image.width()*image.depth()+31)/32)*4; @@ -5035,14 +5035,14 @@ bool qt_write_dib( TQDataStream& s, TQImage image ) int y; if ( nbits == 1 || nbits == 8 ) { // direct output -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS // TQt/E doesn't word align. int pad = bpl_bmp - bpl; char padding[4]; #endif for ( y=image.height()-1; y>=0; y-- ) { d->writeBlock( (char*)image.scanLine(y), bpl ); -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS d->writeBlock( padding, pad ); #endif } @@ -6500,7 +6500,7 @@ void TQImage::setText(const char* key, const char* lang, const TQString& s) #endif // TQT_NO_IMAGE_TEXT -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS /*! \internal */ diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp index 24050fe89..0149304ef 100644 --- a/src/kernel/qinputcontext.cpp +++ b/src/kernel/qinputcontext.cpp @@ -313,7 +313,7 @@ TQInputContext::~TQInputContext() delete d; } -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) /*! \internal Returns the owner of this input context. Ordinary input methods @@ -416,7 +416,7 @@ void TQInputContext::releaseComposingWidget( TQWidget *w ) d->hasFocus = FALSE; } } -#endif // Q_WS_X11 +#endif // TQ_WS_X11 /*! \internal @@ -518,9 +518,9 @@ void TQInputContext::sendIMEventInternal( TQEvent::Type type, TQObject *receiver = 0; TQIMEvent *event = 0; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) receiver = d->composingWidget; -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) // just a placeholder #endif if ( ! receiver ) @@ -597,7 +597,7 @@ void TQInputContext::sendIMEventInternal( TQEvent::Type type, void TQInputContext::sendIMEvent( TQEvent::Type type, const TQString &text, int cursorPosition, int selLength ) { -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) if ( !focusWidget() ) return; #endif diff --git a/src/kernel/qinputcontext_p.h b/src/kernel/qinputcontext_p.h index 0ab3a0884..88cff048a 100644 --- a/src/kernel/qinputcontext_p.h +++ b/src/kernel/qinputcontext_p.h @@ -60,24 +60,24 @@ class TQFont; class TQString; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include "ntqmemarray.h" #include "ntqwindowdefs.h" #include "qt_x11_p.h" #endif -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "qt_windows.h" #endif -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS class TQWSIMEvent; #endif class TQInputContext { public: -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQInputContext(TQWidget *); // should be a toplevel widget ~TQInputContext(); @@ -96,17 +96,17 @@ public: TQFont font; XFontSet fontset; TQMemArray<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 reset(); private: static TQWidget* focusWidget; static TQString* composition; -#endif //Q_WS_QWS +#endif //TQ_WS_QWS -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN static void init(); static void shutdown(); diff --git a/src/kernel/qinternal.cpp b/src/kernel/qinternal.cpp index 8281e70b4..e99c95f79 100644 --- a/src/kernel/qinternal.cpp +++ b/src/kernel/qinternal.cpp @@ -55,7 +55,7 @@ static TQSharedDoubleBuffer* qdb_owner = 0; TQCleanupHandler<TQPixmap> qdb_pixmap_cleanup; -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX bool TQSharedDoubleBuffer::dblbufr = FALSE; #else bool TQSharedDoubleBuffer::dblbufr = TRUE; @@ -74,7 +74,7 @@ bool TQSharedDoubleBuffer::dblbufr = TRUE; */ static const int hardLimitWidth = -1; static const int hardLimitHeight = -1; -#if defined( Q_WS_QWS ) || defined( Q_WS_MAC9 ) +#if defined( TQ_WS_QWS ) || defined( TQ_WS_MAC9 ) // Small in TQt/Embedded / Mac9 - 5K on 32bpp static const int sharedLimitWidth = 64; static const int sharedLimitHeight = 20; @@ -354,11 +354,11 @@ bool TQSharedDoubleBuffer::begin( TQPainter* painter, int x, int y, int w, int h rh = h; if ( ( pix = getPixmap() ) ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( painter->device()->x11Screen() != pix->x11Screen() ) pix->x11SetScreen( painter->device()->x11Screen() ); TQPixmap::x11SetDefaultScreen( pix->x11Screen() ); -#endif // Q_WS_X11 +#endif // TQ_WS_X11 state |= BufferActive; p = new TQPainter( pix ); @@ -405,11 +405,11 @@ bool TQSharedDoubleBuffer::begin( TQWidget* widget, int x, int y, int w, int h ) rh = h <= 0 ? wid->height() : h; if ( ( pix = getPixmap() ) ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( wid->x11Screen() != pix->x11Screen() ) pix->x11SetScreen( wid->x11Screen() ); TQPixmap::x11SetDefaultScreen( pix->x11Screen() ); -#endif // Q_WS_X11 +#endif // TQ_WS_X11 state |= BufferActive; if ( flags & InitBG ) { diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp index c679bb52b..42a955911 100644 --- a/src/kernel/qkeysequence.cpp +++ b/src/kernel/qkeysequence.cpp @@ -49,7 +49,7 @@ # include "ntqregexp.h" #endif -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC #define TQMAC_CTRL (TQString(TQChar(0x2318))) #define TQMAC_META (TQString(TQChar(0x2303))) #define TQMAC_ALT (TQString(TQChar(0x2325))) diff --git a/src/kernel/qmime.cpp b/src/kernel/qmime.cpp index 1c8606373..e1dd27d68 100644 --- a/src/kernel/qmime.cpp +++ b/src/kernel/qmime.cpp @@ -363,7 +363,7 @@ const TQMimeSource* TQMimeSourceFactory::data(const TQString& abs_name) const TQMimeSource* r = 0; TQStringList::Iterator it; if ( abs_name[0] == '/' -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN || ( abs_name[0] && abs_name[1] == ':' ) || abs_name.startsWith("\\\\") #endif ) @@ -463,7 +463,7 @@ TQString TQMimeSourceFactory::makeAbsolute(const TQString& abs_or_rel_name, cons { if ( context.isNull() || !(context[0] == '/' -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN || ( context[0] && context[1] == ':') #endif )) diff --git a/src/kernel/qmovie.cpp b/src/kernel/qmovie.cpp index 79218badd..6833762e8 100644 --- a/src/kernel/qmovie.cpp +++ b/src/kernel/qmovie.cpp @@ -52,7 +52,7 @@ #ifndef TQT_NO_MOVIE -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS #include "qgfx_qws.h" #endif @@ -397,7 +397,7 @@ void TQMoviePrivate::updatePixmapFromImage(const TQPoint& off, &lines, off.x(), off.y(), area.width(), area.height() ); } -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS if(display_widget) { TQGfx * mygfx=display_widget->graphicsContext(); if(mygfx) { @@ -679,7 +679,7 @@ void TQMovie::pushData(const uchar* data, int length) d->receive(data,length); } -#ifdef Q_WS_QWS // ##### Temporary performance experiment +#ifdef TQ_WS_QWS // ##### Temporary performance experiment /*! \internal */ diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp index d408a3df8..4868ffb00 100644 --- a/src/kernel/qpainter.cpp +++ b/src/kernel/qpainter.cpp @@ -51,7 +51,7 @@ #include "qrichtext_p.h" #include "ntqregexp.h" #include "ntqcleanuphandler.h" -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS #include "qgfx_qws.h" #endif #include <string.h> @@ -1633,13 +1633,13 @@ void TQPainter::updateXForm() txop = TxTranslate; } else { txop = TxScale; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) setf(DirtyFont); #endif } } else { txop = TxRotShear; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) setf(DirtyFont); #endif } @@ -2253,7 +2253,7 @@ TQRegion TQPainter::clipRegion( CoordinateMode m ) const */ -#if !defined(Q_WS_X11) && !defined(Q_WS_QWS) && !defined(Q_WS_MAC) +#if !defined(TQ_WS_X11) && !defined(TQ_WS_QWS) && !defined(TQ_WS_MAC) // The doc and X implementation of this functions is in qpainter_x11.cpp void TQPainter::drawWinFocusRect( int, int, int, int, bool, const TQColor & ) @@ -2340,13 +2340,13 @@ void TQPainter::drawPixmap( const TQRect &r, const TQPixmap &pm ) TQPDevCmdParam param[2]; param[0].rect = &r; param[1].pixmap = ± -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) if ( !pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ) || !hdc ) return; -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ); return; -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) if ( !pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ) || !pdev->handle()) return; #else @@ -2417,7 +2417,7 @@ void TQPainter::drawImage( int x, int y, const TQImage & image, int sx, int sy, int sw, int sh, int conversionFlags ) { -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS //### Hackish # ifndef TQT_NO_TRANSFORMATIONS if ( !image.isNull() && gfx && @@ -2488,13 +2488,13 @@ void TQPainter::drawImage( int x, int y, const TQImage & image, TQRect r( x, y, subimage.width(), subimage.height() ); param[0].rect = &r; param[1].image = &subimage; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !hdc ) return; -#elif defined (Q_WS_QWS) +#elif defined (TQ_WS_QWS) pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ); return; -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) if(!pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !pdev->handle() ) return; #else @@ -2547,13 +2547,13 @@ void TQPainter::drawImage( const TQRect &r, const TQImage &i ) TQPDevCmdParam param[2]; param[0].rect = &r; param[1].image = &i; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !hdc ) return; -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ); return; -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !pdev->handle() ) return; #else @@ -2786,15 +2786,15 @@ void TQPainter::drawText( const TQRect &r, int tf, param[1].ival = tf; param[2].str = &newstr; if ( pdev->devType() != TQInternal::Printer ) { -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) if ( !pdev->cmd( TQPaintDevice::PdcDrawText2Formatted, this, param) || !hdc ) return; // TQPrinter wants PdcDrawText2 -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) pdev->cmd( TQPaintDevice::PdcDrawText2Formatted, this, param); return; -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) if ( !pdev->cmd( TQPaintDevice::PdcDrawText2Formatted, this, param) || !pdev->handle()) return; // TQPrinter wants PdcDrawText2 @@ -3045,7 +3045,7 @@ void qt_format_text( const TQFont& font, const TQRect &_r, textFlags |= TQt::Underline; cUlChar++; } -#if defined(Q_WS_X11) || defined(Q_WS_QWS) +#if defined(TQ_WS_X11) || defined(TQ_WS_QWS) if ( painter->bg_mode == TQt::OpaqueMode ) { int h = ti.ascent() + ti.descent() + 1; if (ti.y() + h < height) diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp index 6d802cfdd..b11530f6c 100644 --- a/src/kernel/qpixmap.cpp +++ b/src/kernel/qpixmap.cpp @@ -367,13 +367,13 @@ TQPixmap::TQPixmap( const TQPixmap &pixmap ) data = pixmap.data; data->ref(); devFlags = pixmap.devFlags; // copy TQPaintDevice flags -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) hdc = pixmap.hdc; // copy Windows device context -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) hd = pixmap.hd; // copy X11 drawable rendhd = pixmap.rendhd; copyX11Data( &pixmap ); // copy x11Data -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) hd = pixmap.hd; #endif } @@ -425,16 +425,16 @@ TQPixmap TQPixmap::fromMimeSource( const TQString &abs_name ) TQPixmap TQPixmap::copy( bool ignoreMask ) const { -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) int old = x11SetDefaultScreen( x11Screen() ); -#endif // Q_WS_X11 +#endif // TQ_WS_X11 TQPixmap pm( data->w, data->h, data->d, data->bitmap, data->optim ); if ( !pm.isNull() ) { // copy the bitmap -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) pm.cloneX11Data( this ); -#endif // Q_WS_X11 +#endif // TQ_WS_X11 if ( ignoreMask ) bitBlt( &pm, 0, 0, this, 0, 0, data->w, data->h, TQt::CopyROP, TRUE ); @@ -442,9 +442,9 @@ TQPixmap TQPixmap::copy( bool ignoreMask ) const copyBlt( &pm, 0, 0, this, 0, 0, data->w, data->h ); } -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) x11SetDefaultScreen( old ); -#endif // Q_WS_X11 +#endif // TQ_WS_X11 return pm; } @@ -475,13 +475,13 @@ TQPixmap &TQPixmap::operator=( const TQPixmap &pixmap ) } else { data = pixmap.data; devFlags = pixmap.devFlags; // copy TQPaintDevice flags -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) hdc = pixmap.hdc; -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) hd = pixmap.hd; // copy TQPaintDevice drawable rendhd = pixmap.rendhd; copyX11Data( &pixmap ); // copy x11Data -#elif defined(Q_WS_MACX) || defined(Q_OS_MAC9) +#elif defined(TQ_WS_MACX) || defined(Q_OS_MAC9) hd = pixmap.hd; #endif } @@ -660,22 +660,22 @@ void TQPixmap::resize( int w, int h ) d = isTQBitmap() ? 1 : -1; // Create new pixmap TQPixmap pm( w, h, d, data->bitmap, data->optim ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 pm.x11SetScreen( x11Screen() ); -#endif // Q_WS_X11 +#endif // TQ_WS_X11 if ( !data->uninit && !isNull() ) // has existing pixmap bitBlt( &pm, 0, 0, this, 0, 0, // copy old pixmap TQMIN(width(), w), TQMIN(height(),h), CopyROP, TRUE ); -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) if(data->alphapm) { data->alphapm->resize(w, h); } else -#elif defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) +#elif defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE) if (data->alphapm) tqWarning("TQPixmap::resize: TODO: resize alpha data"); else -#endif // Q_WS_X11 +#endif // TQ_WS_X11 if ( data->mask ) { // resize mask as well if ( data->selfmask ) { // preserve self-mask pm.setMask( *((TQBitmap*)&pm) ); @@ -751,11 +751,11 @@ void TQPixmap::setMask( const TQBitmap &newmask ) #endif return; } -#if defined(Q_WS_MAC) || (defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE)) +#if defined(TQ_WS_MAC) || (defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE)) // when setting the mask, we get rid of the alpha channel completely delete data->alphapm; data->alphapm = 0; -#endif // Q_WS_X11 && !TQT_NO_XFTFREETYPE +#endif // TQ_WS_X11 && !TQT_NO_XFTFREETYPE delete data->mask; TQBitmap* newmaskcopy; @@ -763,7 +763,7 @@ void TQPixmap::setMask( const TQBitmap &newmask ) newmaskcopy = (TQBitmap*)new TQPixmap( tmp->copy( TRUE ) ); else newmaskcopy = new TQBitmap( newmask ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 newmaskcopy->x11SetScreen( x11Screen() ); #endif data->mask = newmaskcopy; @@ -1481,7 +1481,7 @@ bool qt_xForm_helper( const TQWMatrix &trueMat, int xoffset, dptr++; } break; -# if defined(Q_WS_WIN) +# if defined(TQ_WS_WIN) case QT_XFORM_TYPE_WINDOWSPIXMAP: while ( dptr < maxp ) { IWX_PIX(128); diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp index 6f350620a..c30e5b9d0 100644 --- a/src/kernel/qpixmapcache.cpp +++ b/src/kernel/qpixmapcache.cpp @@ -95,7 +95,7 @@ static const int cache_size = 149; // size of internal hash array -#ifdef Q_WS_MAC9 +#ifdef TQ_WS_MAC9 static int cache_limit = 256; // 256 KB cache limit #else static int cache_limit = 1024; // 1024 KB cache limit @@ -305,7 +305,7 @@ int TQPixmapCache::cacheLimit() void TQPixmapCache::setCacheLimit( int n ) { -#ifdef Q_WS_MAC9 +#ifdef TQ_WS_MAC9 if(n > 256) tqWarning("TQPixmapCache::setCacheLimit: Setting cache limits high is harmfull to mac9's health"); #endif diff --git a/src/kernel/qprinter.cpp b/src/kernel/qprinter.cpp index 2c89b6ad3..37ef9af8f 100644 --- a/src/kernel/qprinter.cpp +++ b/src/kernel/qprinter.cpp @@ -518,7 +518,7 @@ void TQPrinter::setCreator( const TQString &creator ) void TQPrinter::setOrientation( Orientation orientation ) { orient = orientation; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) reinit(); #endif } @@ -555,7 +555,7 @@ void TQPrinter::setPageSize( PageSize newPageSize ) return; } page_size = newPageSize; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) reinit(); #endif } @@ -577,7 +577,7 @@ void TQPrinter::setPageSize( PageSize newPageSize ) void TQPrinter::setPageOrder( PageOrder newPageOrder ) { page_order = newPageOrder; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) reinit(); #endif } @@ -608,7 +608,7 @@ TQPrinter::PageOrder TQPrinter::pageOrder() const void TQPrinter::setColorMode( ColorMode newColorMode ) { color_mode = newColorMode; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) reinit(); #endif } @@ -818,7 +818,7 @@ void TQPrinter::setCollateCopies(bool on) void TQPrinter::setNumCopies( int numCopies ) { ncopies = numCopies; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) reinit(); #endif } @@ -948,7 +948,7 @@ int TQPrinter::resolution() const void TQPrinter::setPaperSource( PaperSource source ) { paper_source = source; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) reinit(); #endif } diff --git a/src/kernel/qprinter_unix.cpp b/src/kernel/qprinter_unix.cpp index 5141f7b19..3fed326c5 100644 --- a/src/kernel/qprinter_unix.cpp +++ b/src/kernel/qprinter_unix.cpp @@ -126,7 +126,7 @@ TQPrinter::TQPrinter( PrinterMode m ) paper_source = OnlyOne; switch ( m ) { case ScreenResolution: -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS res = 72; #else res = TQPaintDevice::x11AppDpiY(); diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp index d8bb1d46e..d1678fa38 100644 --- a/src/kernel/qpsprinter.cpp +++ b/src/kernel/qpsprinter.cpp @@ -85,7 +85,7 @@ #include <stdlib.h> #endif -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include "qt_x11_p.h" #ifdef None #undef None @@ -95,7 +95,7 @@ #endif #endif -#if defined( Q_WS_X11 ) || defined (Q_WS_QWS) +#if defined( TQ_WS_X11 ) || defined (TQ_WS_QWS) #include "qfontdata_p.h" #include "qfontengine_p.h" #include "qtextlayout_p.h" @@ -2433,13 +2433,13 @@ void TQPSPrinterFontTTF::drawText( TQTextStream &stream, const TQPoint &p, TQTex glyph_t *glyphs = engine->glyphs( &si ); advance_t *advances = engine->advances( &si ); qoffset_t *offsets = engine->offsets( &si ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 int type = si.fontEngine->type(); bool glyphIndices = (type == TQFontEngine::Xft); // This helps us get arabic for XLFD fonts working. In that case we have a Unicode // cmap (== 0), and the glyphs array contains the shaped string. bool useGlyphAsUnicode = (type == TQFontEngine::XLFD && si.fontEngine->cmap() == 0); -#else // Q_WS_QWS +#else // TQ_WS_QWS const bool glyphIndices = FALSE; const bool useGlyphAsUnicode = TRUE; #endif @@ -4919,7 +4919,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate // ### implement similar code for TQWS and WIN xfontname = makePSFontName( engine ); -#if defined( Q_WS_X11 ) +#if defined( TQ_WS_X11 ) bool xlfd = FALSE; //tqDebug("engine = %p name=%s, script=%d", engine, engine ? engine->name() : "(null)", script); @@ -4951,7 +4951,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate xlfd = TRUE; } } -#endif // Q_WS_X11 +#endif // TQ_WS_X11 #ifndef TQT_NO_TEXTCODEC // map some scripts to something more useful if ( script == TQFont::Han ) { @@ -4989,7 +4989,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate #endif TQString searchname = xfontname; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) // we need an extension here due to the fact that we use different // fonts for different scripts if ( xlfd && script >= TQFont::Han && script <= TQFont::Bopomofo ) @@ -5001,7 +5001,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate if ( p ) return; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) if ( xlfd ) { for (TQStringList::Iterator it=priv->fontpath.begin(); it!=priv->fontpath.end() && fontfilename.isEmpty(); ++it) { @@ -5158,7 +5158,7 @@ TQPSPrinterPrivate::TQPSPrinterPrivate( TQPrinter *prt, int filedes ) scale = 1.; scriptUsed = -1; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // append qsettings fontpath TQSettings settings; embedFonts = settings.readBoolEntry( "/qt/embedFonts", TRUE ); @@ -6165,7 +6165,7 @@ void TQPSPrinterPrivate::flushPage( bool last ) if ( buffer && // ( last || pagesInBuffer++ > -1 || // ( pagesInBuffer > 4 && buffer->size() > 262144 ) ) ) -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS (last || buffer->size() > 2000000) // embedded is usually limited in memory #else (last || buffer->size() > 50000000) diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp index 439355135..ecc304071 100644 --- a/src/kernel/qrichtext.cpp +++ b/src/kernel/qrichtext.cpp @@ -74,7 +74,7 @@ class TQTextFormatCollection; const int border_tolerance = 2; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "qt_windows.h" #endif @@ -91,18 +91,18 @@ static inline int scale( int value, TQPainter *painter ) { if ( is_printer( painter ) ) { TQPaintDeviceMetrics metrics( painter->device() ); -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) value = value * metrics.logicalDpiY() / TQPaintDevice::x11AppDpiY( painter->device()->x11Screen() ); -#elif defined (Q_WS_WIN) +#elif defined (TQ_WS_WIN) HDC hdc = GetDC( 0 ); int gdc = GetDeviceCaps( hdc, LOGPIXELSY ); if ( gdc ) value = value * metrics.logicalDpiY() / gdc; ReleaseDC( 0, hdc ); -#elif defined (Q_WS_MAC) +#elif defined (TQ_WS_MAC) value = value * metrics.logicalDpiY() / 75; // ##### FIXME -#elif defined (Q_WS_QWS) +#elif defined (TQ_WS_QWS) value = value * metrics.logicalDpiY() / 75; #endif } @@ -519,7 +519,7 @@ void TQTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArray<TQ tmpX = -1; bool justInsert = TRUE; TQString s( str ); -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) if ( checkNewLine ) { int i = 0; 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; if ( pos.y() < s->rect().y() ) { pos.setY( s->rect().y() ); -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX pos.setX( s->rect().x() ); #endif } @@ -684,7 +684,7 @@ bool TQTextCursor::place( const TQPoint &p, TQTextParagraph *s, bool link, bool if ( pos.y() >= r.y() && pos.y() <= r.y() + r.height() ) break; if ( loosePlacing == TRUE && !s->next() ) { -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX pos.setX( s->rect().x() + s->rect().width() ); #endif break; @@ -4020,7 +4020,7 @@ int TQTextString::width( int idx ) const { int r = c->c.row(); if(r < 0x06 -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN // Uniscribe's handling of Asian makes the condition below fail. || (r > 0x1f && !(r > 0xd7 && r < 0xe0)) #endif @@ -4731,7 +4731,7 @@ void TQTextParagraph::setColorForSelection( TQColor &color, TQPainter &painter, document()->selectionColor( selection ) : cg.color( TQColorGroup::Highlight ); if ( selection == TQTextDocument::IMCompositionText ) { -#ifndef Q_WS_MACX +#ifndef TQ_WS_MACX int h1, s1, v1, h2, s2, v2; cg.color( TQColorGroup::Base ).hsv( &h1, &s1, &v1 ); cg.color( TQColorGroup::Background ).hsv( &h2, &s2, &v2 ); @@ -6063,7 +6063,7 @@ void TQTextFormatCollection::setPaintDevice( TQPaintDevice *pd ) { paintdevice = pd; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) int scr = ( paintdevice ) ? paintdevice->x11Screen() : TQPaintDevice::x11AppScreen(); defFormat->fn.x11SetScreen( scr ); @@ -6076,7 +6076,7 @@ void TQTextFormatCollection::setPaintDevice( TQPaintDevice *pd ) format->fn.x11SetScreen( scr ); format->update(); } -#endif // Q_WS_X11 +#endif // TQ_WS_X11 } TQTextFormat *TQTextFormatCollection::format( TQTextFormat *f ) @@ -6695,7 +6695,7 @@ void TQTextImage::adjustToPainter( TQPainter* p ) height = scale( tmpheight, p ); } -#if !defined(Q_WS_X11) +#if !defined(TQ_WS_X11) #include <ntqbitmap.h> #include <ntqcleanuphandler.h> static TQPixmap *qrt_selection = 0; @@ -6744,7 +6744,7 @@ void TQTextImage::draw( TQPainter* p, int x, int y, int cx, int cy, int cw, int p->drawPixmap( cx , cy, pm, cx - x, cy - y, cw, ch ); if ( selected && placement() == PlaceInline && is_printer( p ) ) { -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) p->fillRect( TQRect( TQPoint( x, y ), pm.size() ), TQBrush( cg.highlight(), TQBrush::Dense4Pattern) ); #else // in WIN32 Dense4Pattern doesn't work correctly (transparency problem), so work around it if ( !qrt_selection ) diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/qscriptengine.cpp index 7cb8848f9..19ca36e97 100644 --- a/src/kernel/qscriptengine.cpp +++ b/src/kernel/qscriptengine.cpp @@ -404,7 +404,7 @@ static bool basic_shape(TQShaperItem *item) enum { CcmpProperty = 0x1 }; -#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) +#if defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE) static const TQOpenType::Features hebrew_features[] = { { FT_MAKE_TAG('c', 'c', 'm', 'p'), CcmpProperty }, {0, 0} @@ -419,7 +419,7 @@ static bool hebrew_shape(TQShaperItem *item) { Q_ASSERT(item->script == TQFont::Hebrew); -#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) +#if defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE) TQOpenType *openType = item->font->openType(); if (openType && openType->supportsScript(item->script)) { @@ -1460,7 +1460,7 @@ static void shapedString(const TQString *uc, int from, int len, TQChar *shapeBuf *shapedLength = data - shapeBuffer; } -#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) +#if defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE) enum { InitProperty = 0x2, @@ -1582,7 +1582,7 @@ static bool arabic_shape(TQShaperItem *item) { Q_ASSERT(item->script == TQFont::Arabic); -#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) +#if defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE) TQOpenType *openType = item->font->openType(); if (openType && openType->supportsScript(TQFont::Arabic)) { @@ -1613,12 +1613,12 @@ static bool arabic_shape(TQShaperItem *item) return TRUE; } -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) # include "qscriptengine_x11.cpp" -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) # include "qscriptengine_win.cpp" -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) # include "qscriptengine_mac.cpp" -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) # include "qscriptengine_qws.cpp" #endif diff --git a/src/kernel/qsizegrip.cpp b/src/kernel/qsizegrip.cpp index 5dbaaa326..7b8140c62 100644 --- a/src/kernel/qsizegrip.cpp +++ b/src/kernel/qsizegrip.cpp @@ -46,13 +46,13 @@ #include "ntqapplication.h" #include "ntqstyle.h" -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) #include "qt_x11_p.h" extern Atom qt_sizegrip; // defined in qapplication_x11.cpp -#elif defined (Q_WS_WIN ) +#elif defined (TQ_WS_WIN ) #include "ntqobjectlist.h" #include "qt_windows.h" -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) bool qt_mac_update_sizer(TQWidget *, int); //qwidget_mac.cpp #endif @@ -112,7 +112,7 @@ TQSizeGrip::TQSizeGrip( TQWidget * parent, const char* name ) : TQWidget( parent, name ) { #ifndef TQT_NO_CURSOR -#ifndef Q_WS_MAC +#ifndef TQ_WS_MAC if ( TQApplication::reverseLayout() ) setCursor( sizeBDiagCursor ); else @@ -120,7 +120,7 @@ TQSizeGrip::TQSizeGrip( TQWidget * parent, const char* name ) #endif #endif setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) if ( !qt_sizegrip_workspace( this ) ) { WId id = winId(); XChangeProperty(tqt_xdisplay(), topLevelWidget()->winId(), @@ -140,7 +140,7 @@ TQSizeGrip::TQSizeGrip( TQWidget * parent, const char* name ) */ TQSizeGrip::~TQSizeGrip() { -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) if ( !TQApplication::closingDown() && parentWidget() ) { WId id = None; XChangeProperty(tqt_xdisplay(), topLevelWidget()->winId(), @@ -232,7 +232,7 @@ void TQSizeGrip::mouseMoveEvent( TQMouseEvent * e ) } else { tlw->resize( w, h ); } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN MSG msg; while( PeekMessage( &msg, winId(), WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE ) ) ; @@ -250,7 +250,7 @@ bool TQSizeGrip::eventFilter( TQObject *o, TQEvent *e ) { if ( o == tlw ) { switch ( e->type() ) { -#ifndef Q_WS_MAC +#ifndef TQ_WS_MAC /* The size grip goes no where on Mac OS X when you maximize! --Sam */ case TQEvent::ShowMaximized: #endif @@ -264,7 +264,7 @@ bool TQSizeGrip::eventFilter( TQObject *o, TQEvent *e ) break; } } else if(o == this) { -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) switch(e->type()) { case TQEvent::Hide: case TQEvent::Show: diff --git a/src/kernel/qtextengine.cpp b/src/kernel/qtextengine.cpp index d23f21e92..48839b5c8 100644 --- a/src/kernel/qtextengine.cpp +++ b/src/kernel/qtextengine.cpp @@ -875,11 +875,11 @@ static void calcLineBreaks(const TQString &str, TQCharAttributes *charAttributes } } -#if defined( Q_WS_X11 ) || defined ( Q_WS_QWS ) +#if defined( TQ_WS_X11 ) || defined ( TQ_WS_QWS ) # include "qtextengine_unix.cpp" -#elif defined( Q_WS_WIN ) +#elif defined( TQ_WS_WIN ) # include "qtextengine_win.cpp" -#elif defined( Q_WS_MAC ) +#elif defined( TQ_WS_MAC ) # include "qtextengine_mac.cpp" #endif @@ -888,7 +888,7 @@ static void calcLineBreaks(const TQString &str, TQCharAttributes *charAttributes TQTextEngine::TQTextEngine( const TQString &str, TQFontPrivate *f ) : string( str ), fnt( f ), direction( TQChar::DirON ), haveCharAttributes( FALSE ), widthOnly( FALSE ) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN if ( !resolvedUsp10 ) resolveUsp10(); #endif @@ -983,7 +983,7 @@ const TQCharAttributes *TQTextEngine::attributes() for ( int i = 0; i < items.size(); i++ ) { TQScriptItem &si = items[i]; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN int script = uspScriptForItem(this, i); #else int script = si.analysis.script; diff --git a/src/kernel/qtextengine_p.h b/src/kernel/qtextengine_p.h index 04faa33b0..751cdf043 100644 --- a/src/kernel/qtextengine_p.h +++ b/src/kernel/qtextengine_p.h @@ -86,7 +86,7 @@ struct glyph_metrics_t int yoff; }; -#if defined( Q_WS_X11 ) || defined ( Q_WS_QWS ) +#if defined( TQ_WS_X11 ) || defined ( TQ_WS_QWS ) typedef unsigned short glyph_t; struct qoffset_t { @@ -112,7 +112,7 @@ struct TQScriptAnalysis }; -#elif defined( Q_WS_MAC ) +#elif defined( TQ_WS_MAC ) typedef unsigned short glyph_t; @@ -139,7 +139,7 @@ struct TQScriptAnalysis }; -#elif defined( Q_WS_WIN ) +#elif defined( TQ_WS_WIN ) // do not change the definitions below unless you know what you are doing! // it is designed to be compatible with the types found in uniscribe. diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp index 7439cba40..99d475859 100644 --- a/src/kernel/qtranslator.cpp +++ b/src/kernel/qtranslator.cpp @@ -210,7 +210,7 @@ public: #ifndef TQT_NO_TRANSLATION_BUILDER TQMap<TQTranslatorMessage, void *> * messages; #endif -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN int oldPermissionLookup; #endif }; @@ -340,7 +340,7 @@ public: explicitly documented as such. */ -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) extern int qt_ntfs_permission_lookup; #endif @@ -353,7 +353,7 @@ TQTranslator::TQTranslator( TQObject * parent, const char * name ) : TQObject( parent, name ) { d = new TQTranslatorPrivate; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) d->oldPermissionLookup = qt_ntfs_permission_lookup; #endif } @@ -419,7 +419,7 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory, TQString prefix; if ( filename[0] == '/' -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN || (filename[0] && filename[1] == ':') || filename[0] == '\\' #endif ) @@ -438,7 +438,7 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory, delims = search_delimiters.isNull() ? TQString::fromLatin1( "_." ) : search_delimiters; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) qt_ntfs_permission_lookup--; #endif for ( ;; ) { @@ -463,7 +463,7 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory, // no truncations? fail if ( rightmost == 0 ) { -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) if (d->oldPermissionLookup != qt_ntfs_permission_lookup) qt_ntfs_permission_lookup++; #endif @@ -472,7 +472,7 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory, fname.truncate( rightmost ); } -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) if (d->oldPermissionLookup != qt_ntfs_permission_lookup) qt_ntfs_permission_lookup++; #endif diff --git a/src/kernel/qurl.cpp b/src/kernel/qurl.cpp index f097eac2e..827e6875d 100644 --- a/src/kernel/qurl.cpp +++ b/src/kernel/qurl.cpp @@ -78,7 +78,7 @@ static void slashify( TQString& s, bool allowMultiple = TRUE ) } if ( s[ i ] == '\\' ) s[ i ] = '/'; -#if defined (Q_WS_MAC9) +#if defined (TQ_WS_MAC9) if ( s[ i ] == ':' && (i == (int)s.length()-1 || s[ i + 1 ] != '/' ) ) //mac colon's go away, unless after a protocol s[ i ] = '/'; #endif @@ -1106,7 +1106,7 @@ bool TQUrl::isLocalFile() const TQString TQUrl::fileName() const { if ( d->path.isEmpty() || d->path.endsWith( "/" ) -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN || d->path.endsWith( "\\" ) #endif ) diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp index 0e9c606af..1af274c6e 100644 --- a/src/kernel/qwidget.cpp +++ b/src/kernel/qwidget.cpp @@ -62,11 +62,11 @@ #if defined(QT_ACCESSIBILITY_SUPPORT) #include "ntqaccessible.h" #endif -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) #include "qt_windows.h" #include "qinputcontext_p.h" #endif -#if defined(Q_WS_QWS) +#if defined(TQ_WS_QWS) #include "qwsmanager_qws.h" #endif #include "qfontdata_p.h" @@ -455,7 +455,7 @@ in the file qapp_xxx.cpp. *****************************************************************************/ -#if defined(Q_WS_QWS) || defined(Q_OS_TEMP) +#if defined(TQ_WS_QWS) || defined(Q_OS_TEMP) static const int WDictSize = 163; // plenty for small devices #else static const int WDictSize = 1123; // plenty for 5 big complex windows @@ -558,7 +558,7 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) { s.setWidth( TQMAX( s.width(), 200 ) ); if ( exp & TQSizePolicy::Vertically ) s.setHeight( TQMAX( s.height(), 150 ) ); -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) TQRect screen = TQApplication::desktop()->screenGeometry( w->x11Screen() ); #else // all others TQRect screen = TQApplication::desktop()->screenGeometry( w->pos() ); @@ -883,7 +883,7 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) { TQWidget::TQWidget( TQWidget *parent, const char *name, WFlags f, NFlags n ) : TQObject( parent, name ), TQPaintDevice( TQInternal::Widget ) { -#if defined(QT_CHECK_STATE) && !defined(Q_WS_WIN) +#if defined(QT_CHECK_STATE) && !defined(TQ_WS_WIN) if ( tqApp->type() == TQApplication::Tty ) { tqWarning( "TQWidget: Cannot create a TQWidget when no GUI " "is being used" ); @@ -924,9 +924,9 @@ TQWidget::TQWidget( TQWidget *parent, const char *name, WFlags f, NFlags n ) #endif if ( ! isTopLevel() ) fnt = parentWidget()->font(); -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) fnt.x11SetScreen( x11Screen() ); -#endif // Q_WS_X11 +#endif // TQ_WS_X11 if ( !isDesktop() ) setBackgroundFromMode(); //### parts of this are done in create but not all (see reparent(...) ) @@ -1100,7 +1100,7 @@ void TQWidget::setWinId( WId id ) // set widget identifier if ( winid ) mapper->remove( winid ); winid = id; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) hd = id; // X11: hd == ident #endif if ( id ) @@ -1139,7 +1139,7 @@ void TQWidget::createTLExtra() createExtra(); if ( !extra->topextra ) { TQTLWExtra* x = extra->topextra = new TQTLWExtra; -#if defined( Q_WS_WIN ) || defined( Q_WS_MAC ) +#if defined( TQ_WS_WIN ) || defined( TQ_WS_MAC ) x->opacity = 255; #endif #ifndef TQT_NO_WIDGET_TOPEXTRA @@ -1150,7 +1150,7 @@ void TQWidget::createTLExtra() x->incw = x->inch = 0; x->basew = x->baseh = 0; x->normalGeometry = TQRect(0,0,-1,-1); -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) x->embedded = 0; x->parentWinId = 0; x->spont_unmapped = 0; @@ -1159,7 +1159,7 @@ void TQWidget::createTLExtra() x->ussize = 0; #endif x->savedFlags = 0; -#if defined(Q_WS_QWS) && !defined(TQT_NO_QWS_MANAGER) +#if defined(TQ_WS_QWS) && !defined(TQT_NO_QWS_MANAGER) x->decor_allocated_region = TQRegion(); x->qwsManager = 0; #endif @@ -1221,7 +1221,7 @@ void TQWidget::deleteExtra() delete extra->topextra->icon; #endif delete extra->topextra->focusData; -#if defined(Q_WS_QWS) && !defined(TQT_NO_QWS_MANAGER) +#if defined(TQ_WS_QWS) && !defined(TQT_NO_QWS_MANAGER) delete extra->topextra->qwsManager; #endif delete extra->topextra; @@ -1246,7 +1246,7 @@ void TQWidget::deactivateWidgetCleanup() if ( this == TQApplication::active_window ) tqApp->setActiveWindow( 0 ); // If the is the active mouse press widget, reset it -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC extern TQGuardedPtr<TQWidget> qt_button_down; #else extern TQWidget *qt_button_down; @@ -1768,7 +1768,7 @@ void TQWidget::setEnabled( bool enable ) } } } -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) if ( testWState( WState_OwnCursor ) ) { // enforce the windows behavior of clearing the cursor on // disabled widgets @@ -1777,7 +1777,7 @@ void TQWidget::setEnabled( bool enable ) tqt_x11_enforce_cursor( this ); } #endif -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN TQInputContext::enable( this, im_enabled & !((bool)testWState(WState_Disabled)) ); #endif } @@ -2549,7 +2549,7 @@ void TQWidget::setBackgroundFromMode() r = TQColorGroup::ButtonText; break; case X11ParentRelative: -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) setBackgroundX11Relative(); #endif return; @@ -3000,7 +3000,7 @@ void TQWidget::setFont( const TQFont &font ) return; TQFont old = fnt; fnt = font.resolve( qt_naturalWidgetFont( this ) ); -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) // make sure the font set on this widget is associated with the correct screen fnt.x11SetScreen( x11Screen() ); #endif @@ -3298,7 +3298,7 @@ void TQWidget::setFocus() TQFocusData * f = focusData( TRUE ); if ( f->it.current() == this && tqApp->focusWidget() == this -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) && GetFocus() == winId() #endif ) @@ -3318,7 +3318,7 @@ void TQWidget::setFocus() if ( isActiveWindow() ) { TQWidget * prev = tqApp->focus_widget; if ( prev ) { - // This part is never executed when Q_WS_X11? Preceding XFocusOut + // This part is never executed when TQ_WS_X11? Preceding XFocusOut // had already reset focus_widget when received XFocusIn // Don't reset input context explicitly here. Whether reset or not @@ -3337,7 +3337,7 @@ void TQWidget::setFocus() #endif } } -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) else { TQInputContext::endComposition(); } @@ -3346,7 +3346,7 @@ void TQWidget::setFocus() if( isInputMethodEnabled() ) focusInputContext(); -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) if ( !topLevelWidget()->isPopup() ) SetFocus( winId() ); else { @@ -3354,7 +3354,7 @@ void TQWidget::setFocus() #if defined(QT_ACCESSIBILITY_SUPPORT) TQAccessible::updateAccessibility( this, 0, TQAccessible::Focus ); #endif -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) } #endif @@ -3392,7 +3392,7 @@ void TQWidget::clearFocus() focusProxy()->clearFocus(); return; } else if ( hasFocus() ) { -#if !defined(Q_WS_X11) +#if !defined(TQ_WS_X11) resetInputContext(); #else unfocusInputContext(); @@ -3402,7 +3402,7 @@ void TQWidget::clearFocus() tqApp->focus_widget = 0; TQFocusEvent out( TQEvent::FocusOut ); TQApplication::sendEvent( w, &out ); -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) if ( !isPopup() && GetFocus() == winId() ) SetFocus( 0 ); else { @@ -3410,7 +3410,7 @@ void TQWidget::clearFocus() #if defined(QT_ACCESSIBILITY_SUPPORT) TQAccessible::updateAccessibility( this, 0, TQAccessible::Focus ); #endif -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) } #endif } @@ -3540,7 +3540,7 @@ TQFocusData * TQWidget::focusData( bool create ) void TQWidget::setInputMethodEnabled( bool b ) { im_enabled = b; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN TQInputContext::enable( this, im_enabled & !((bool)testWState(WState_Disabled)) ); #endif } @@ -3629,7 +3629,7 @@ bool TQWidget::isActiveWindow() const } } #endif -#if defined(Q_WS_WIN32) +#if defined(TQ_WS_WIN32) HWND parent = tlw->winId(); HWND topparent = GetActiveWindow(); while ( parent ) { @@ -4056,7 +4056,7 @@ void TQWidget::show() // On Windows, show the popup now so that our own focus handling // stores the correct old focus widget even if it's stolen in the showevent -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) if ( testWFlags(WType_Popup) ) tqApp->openPopup( this ); #endif @@ -4077,7 +4077,7 @@ void TQWidget::show() else showWindow(); -#if !defined(Q_WS_WIN) +#if !defined(TQ_WS_WIN) if ( testWFlags(WType_Popup) ) tqApp->openPopup( this ); #endif @@ -4119,7 +4119,7 @@ void TQWidget::hide() if ( testWFlags(WShowModal) ) tqt_leave_modal( this ); -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) if ( isTopLevel() && !isPopup() && parentWidget() && isActiveWindow() ) parentWidget()->setActiveWindow(); // Activate parent #endif @@ -4543,7 +4543,7 @@ void TQWidget::adjustSize() if ( isTopLevel() ) { -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) TQRect screen = TQApplication::desktop()->screenGeometry( x11Screen() ); #else // all others TQRect screen = TQApplication::desktop()->screenGeometry( pos() ); @@ -4923,7 +4923,7 @@ bool TQWidget::event( TQEvent *e ) case TQEvent::ApplicationPaletteChange: if ( !own_palette && !isDesktop() ) unsetPalette(); -# if defined(Q_WS_QWS) && !defined (TQT_NO_QWS_MANAGER) +# if defined(TQ_WS_QWS) && !defined (TQT_NO_QWS_MANAGER) if ( isTopLevel() && topData()->qwsManager ) { TQRegion r( topData()->qwsManager->region() ); TQApplication::postEvent(topData()->qwsManager, new TQPaintEvent(r, FALSE) ); @@ -5568,7 +5568,7 @@ void TQWidget::hideEvent( TQHideEvent * ) */ -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) /*! This special event handler can be reimplemented in a subclass to @@ -5590,7 +5590,7 @@ bool TQWidget::macEvent( MSG * ) } #endif -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) /*! This special event handler can be reimplemented in a subclass to @@ -5611,7 +5611,7 @@ bool TQWidget::winEvent( MSG * ) } #endif -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) /*! This special event handler can be reimplemented in a subclass to @@ -5632,7 +5632,7 @@ bool TQWidget::x11Event( XEvent * ) } #endif -#if defined(Q_WS_QWS) +#if defined(TQ_WS_QWS) /*! This special event handler can be reimplemented in a subclass to diff --git a/src/kernel/qwidget_p.h b/src/kernel/qwidget_p.h index 4308f95ab..b56b4960c 100644 --- a/src/kernel/qwidget_p.h +++ b/src/kernel/qwidget_p.h @@ -57,7 +57,7 @@ #ifndef QT_H #endif // QT_H -#if defined (Q_WS_X11) || defined (Q_WS_QWS) +#if defined (TQ_WS_X11) || defined (TQ_WS_QWS) extern int qt_widget_tlw_gravity; #endif diff --git a/src/kernel/qwmatrix.cpp b/src/kernel/qwmatrix.cpp index eb8324f37..dae4bc74b 100644 --- a/src/kernel/qwmatrix.cpp +++ b/src/kernel/qwmatrix.cpp @@ -41,7 +41,7 @@ #include "ntqwmatrix.h" #include "ntqdatastream.h" #include "ntqregion.h" -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) double qsincos( double, bool calcCos ); // defined in qpainter_x11.cpp #else #include <math.h> @@ -851,7 +851,7 @@ const double deg2rad = 0.017453292519943295769; // pi/180 TQWMatrix &TQWMatrix::rotate( double a ) { double b = deg2rad*a; // convert to radians -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) double sina = qsincos(b,FALSE); // fast and convenient double cosa = qsincos(b,TRUE); #else |