Replace Q_WS_* defines with TQ_WS_* equivalents

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

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

1 files changed, 31 insertions, 31 deletions

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