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 <[email protected]>

11 files changed, 19 insertions, 19 deletions

diff --git a/tools/designer/app/main.cpp b/tools/designer/app/main.cpp
index 230097646..6d7a90c40 100644
--- a/tools/designer/app/main.cpp
+++ b/tools/designer/app/main.cpp
@@ -57,7 +57,7 @@
 # undef raise
 #endif
 
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
 #include <qt_windows.h>
 #include <process.h>
 #endif
diff --git a/tools/designer/designer/designerapp.cpp b/tools/designer/designer/designerapp.cpp
index caa4b0b30..370558d76 100644
--- a/tools/designer/designer/designerapp.cpp
+++ b/tools/designer/designer/designerapp.cpp
@@ -41,7 +41,7 @@
 #include <ntqsettings.h>
 #include <ntqsplashscreen.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include <qt_windows.h>
 #include <process.h>
 #endif
@@ -61,7 +61,7 @@ void set_splash_status( const TQString &txt )
 TQ_EXPORT DesignerApplication::DesignerApplication( int &argc, char **argv )
     : TQApplication( argc, argv )
 {
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
     if ( winVersion() & TQt::WV_NT_based )
 	DESIGNER_OPENFILE = RegisterWindowMessage((TCHAR*)"QT_DESIGNER_OPEN_FILE");
     else
@@ -136,7 +136,7 @@ void DesignerApplication::setSettingsKey( const TQString &key )
 	*settings_key = key;
 }
 
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
 bool DesignerApplication::winEventFilter( MSG *msg )
 {
     if ( msg->message == DESIGNER_OPENFILE ) {
diff --git a/tools/designer/designer/designerapp.h b/tools/designer/designer/designerapp.h
index 703443f93..296572e5b 100644
--- a/tools/designer/designer/designerapp.h
+++ b/tools/designer/designer/designerapp.h
@@ -55,7 +55,7 @@ public:
 protected:
     TQDateTime lastMod;
 
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
     bool winEventFilter( MSG *msg );
     uint DESIGNER_OPENFILE;
 #endif
diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp
index 9e02b2b1d..caf9d0030 100644
--- a/tools/designer/designer/formwindow.cpp
+++ b/tools/designer/designer/formwindow.cpp
@@ -111,7 +111,7 @@ static void restoreCursors( TQWidget *start, FormWindow *fw )
     }
 }
 
-#if defined(Q_WS_WIN32) // #### needed for the workaround for repaint problem on windows
+#if defined(TQ_WS_WIN32) // #### needed for the workaround for repaint problem on windows
 #include <qt_windows.h>
 static void flickerfree_update( TQWidget *w )
 {
@@ -844,7 +844,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 		sizePreviewLabel->setGeometry( lg );
 		sizePreviewLabel->raise();
 		sizePreviewLabel->show();
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
 		windowsRepaintWorkaroundTimer->start( 100, TRUE );
 #endif
 	    } else { // if we don't need to move, do some indication
@@ -1605,14 +1605,14 @@ void FormWindow::resizeEvent( TQResizeEvent *e )
     if ( isVisible() )
 	formFile()->setModified( TRUE, FormFile::WFormWindow );
 
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
     windowsRepaintWorkaroundTimer->start( 100, TRUE );
 #endif
 }
 
 void FormWindow::windowsRepaintWorkaroundTimerTimeout()
 {
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
     TQObjectList *l = queryList( "TQWidget" );
     for ( TQObject *o = l->first(); o; o = l->next() ) {
 	flickerfree_update( (TQWidget*)o );
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index 93d0eeac5..ba2dfb9e4 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -187,7 +187,7 @@ TQ_EXPORT MainWindow::MainWindow( bool asClient, bool single, const TQString &pl
     if ( !single )
 	tqApp->setMainWidget( this );
     TQWidgetFactory::addWidgetFactory( new CustomWidgetFactory );
-#ifndef Q_WS_MACX
+#ifndef TQ_WS_MACX
     setIcon( TQPixmap::fromMimeSource( "designer_appicon.png" ) );
 #endif
 
@@ -2400,7 +2400,7 @@ void MainWindow::readConfig()
     if ( !restoreConfig )
 	return;
 
-#ifndef Q_WS_MAC
+#ifndef TQ_WS_MAC
     /* I'm sorry to make this not happen on the Mac, but it seems to hang somewhere deep
        in TQLayout, it gets into a very large loop - and seems it has to do with clever
        things the designer does ###Sam */
diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp
index b9418913a..d7699dca6 100644
--- a/tools/designer/designer/mainwindowactions.cpp
+++ b/tools/designer/designer/mainwindowactions.cpp
@@ -159,7 +159,7 @@ void MainWindow::setupEditActions()
     actionEditDelete->setWhatsThis( whatsThisFrom( "Edit|Delete" ) );
     connect( actionEditDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) );
     actionEditDelete->setEnabled( FALSE );
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
     TQAction *macDelete = new TQAction( tr( "Delete" ), TQPixmap(), tr( "&Delete" ), Key_Backspace, this, 0 );
     connect( macDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) );
 #endif
diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp
index 02899830a..024d9a181 100644
--- a/tools/designer/designer/project.cpp
+++ b/tools/designer/designer/project.cpp
@@ -588,7 +588,7 @@ TQString Project::makeRelative( const TQString &f )
 	return f;
     TQString p = TQFileInfo( filename ).dirPath( TRUE );    
     TQString f2 = f;
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
     if ( p.endsWith("/") )
         p = p.left( p.length() - 1 );
     if ( f2.left( p.length() ).lower() == p.lower() )
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 5058a3618..78bb88b78 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -95,7 +95,7 @@
 static TQFontDatabase *fontDataBase = 0;
 TQString assistantPath();
 
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
 #include <ntqwindowsstyle.h>
 static void setupStyle(TQWidget *w)
 {
@@ -443,7 +443,7 @@ void PropertyItem::placeEditor( TQWidget *w )
     TQRect r = listview->itemRect( this );
     if ( !r.size().isValid() ) {
 	listview->ensureItemVisible( this );
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
 	listview->repaintContents( FALSE );
 #endif
 	r = listview->itemRect( this );
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index 9818bd280..f683d3ec3 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -108,7 +108,7 @@ static TQString entitize( const TQString &s, bool attribute = FALSE )
     return s2;
 }
 
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
 static struct {
     int key;
     const char* name;
@@ -205,7 +205,7 @@ static struct {
 #endif
 static TQString platformNeutralKeySequence(const TQKeySequence &ks)
 {
-#ifndef Q_WS_MACX
+#ifndef TQ_WS_MACX
     return TQString(ks);
 #else
     uint k;
diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp
index 2a7f194f0..be050bce5 100644
--- a/tools/designer/designer/workspace.cpp
+++ b/tools/designer/designer/workspace.cpp
@@ -286,7 +286,7 @@ Workspace::Workspace( TQWidget *parent, MainWindow *mw )
     header()->hide();
     setSorting( 0 );
     setResizePolicy( TQScrollView::Manual );
-#ifndef Q_WS_MAC
+#ifndef TQ_WS_MAC
     TQPalette p( palette() );
     p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) );
     (void)*selectedBack; // hack
diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp
index b4618618c..5a272e33d 100644
--- a/tools/designer/uic/embed.cpp
+++ b/tools/designer/uic/embed.cpp
@@ -43,7 +43,7 @@
 // on embedded, we do not compress image data. Rationale: by mapping
 // the ready-only data directly into memory we are both faster and
 // more memory efficient
-#if defined(Q_WS_QWS) && !defined(TQT_NO_IMAGE_COLLECTION_COMPRESSION)
+#if defined(TQ_WS_QWS) && !defined(TQT_NO_IMAGE_COLLECTION_COMPRESSION)
 #define TQT_NO_IMAGE_COLLECTION_COMPRESSION
 #endif