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, 21 insertions, 21 deletions

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);