QT_NO_* -> TQT_NO_* renaming.

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

29 files changed, 144 insertions, 144 deletions

diff --git a/tools/designer/designer/actiondnd.cpp b/tools/designer/designer/actiondnd.cpp
index b0e619c2..dbbc6d20 100644
--- a/tools/designer/designer/actiondnd.cpp
+++ b/tools/designer/designer/actiondnd.cpp
@@ -530,7 +530,7 @@ void TQDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
     indicator->hide();
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 void TQDesignerToolBar::dragEnterEvent( TQDragEnterEvent *e )
 {
diff --git a/tools/designer/designer/actiondnd.h b/tools/designer/designer/actiondnd.h
index 6d4f7df7..d444dcd5 100644
--- a/tools/designer/designer/actiondnd.h
+++ b/tools/designer/designer/actiondnd.h
@@ -203,7 +203,7 @@ public:
 protected:
     bool eventFilter( TQObject *, TQEvent * );
     void paintEvent( TQPaintEvent * );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dragEnterEvent( TQDragEnterEvent * );
     void dragMoveEvent( TQDragMoveEvent * );
     void dragLeaveEvent( TQDragLeaveEvent * );
diff --git a/tools/designer/designer/command.cpp b/tools/designer/designer/command.cpp
index 1a39ce84..4858ec28 100644
--- a/tools/designer/designer/command.cpp
+++ b/tools/designer/designer/command.cpp
@@ -58,7 +58,7 @@
 #include <ntqptrstack.h>
 #include <ntqheader.h>
 #include <ntqsplitter.h>
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <ntqtable.h>
 #endif
 #include <ntqaction.h>
@@ -609,7 +609,7 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 	editor->refetchData();
 	editor->emitWidgetChanged();
 	( ( PropertyItem* )editor->propertyList()->currentItem() )->setChanged( MetaDataBase::isPropertyChanged( widget, propName ) );
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	if ( propName == "database" ) {
 	    formWindow()->mainWindow()->objectHierarchy()->databasePropertyChanged( (TQWidget*)((TQObject *)widget), MetaDataBase::fakeProperty( widget, "database" ).toStringList() );
 	}
@@ -1532,7 +1532,7 @@ PopulateIconViewCommand::PopulateIconViewCommand( const TQString &n, FormWindow
 						  TQIconView *iv, const TQValueList<Item> &items )
     : Command( n, fw ), newItems( items ), iconview( iv )
 {
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
     TQIconViewItem *i = 0;
     for ( i = iconview->firstItem(); i; i = i->nextItem() ) {
 	Item item;
@@ -1546,7 +1546,7 @@ PopulateIconViewCommand::PopulateIconViewCommand( const TQString &n, FormWindow
 
 void PopulateIconViewCommand::execute()
 {
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
     iconview->clear();
     for ( TQValueList<Item>::Iterator it = newItems.begin(); it != newItems.end(); ++it ) {
 	Item i = *it;
@@ -1557,7 +1557,7 @@ void PopulateIconViewCommand::execute()
 
 void PopulateIconViewCommand::unexecute()
 {
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
     iconview->clear();
     for ( TQValueList<Item>::Iterator it = oldItems.begin(); it != oldItems.end(); ++it ) {
 	Item i = *it;
@@ -1715,7 +1715,7 @@ PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, T
 					    const TQValueList<Column> &columns )
     : Command( n, fw ), newRows( rows ), newColumns( columns ), table( t )
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     int i = 0;
     TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( table );
     for ( i = 0; i < table->horizontalHeader()->count(); ++i ) {
@@ -1738,7 +1738,7 @@ PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, T
 
 void PopulateTableCommand::execute()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     TQMap<TQString, TQString> columnFields;
     table->setNumCols( (int)newColumns.count() );
     int i = 0;
@@ -1757,7 +1757,7 @@ void PopulateTableCommand::execute()
 
 void PopulateTableCommand::unexecute()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     TQMap<TQString, TQString> columnFields;
     table->setNumCols( (int)oldColumns.count() );
     int i = 0;
diff --git a/tools/designer/designer/connectionitems.cpp b/tools/designer/designer/connectionitems.cpp
index 35d44c19..24a47865 100644
--- a/tools/designer/designer/connectionitems.cpp
+++ b/tools/designer/designer/connectionitems.cpp
@@ -413,7 +413,7 @@ void SlotItem::signalChanged( const TQString &signal )
 
 bool SlotItem::ignoreSlot( const char* slot ) const
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( qstrcmp( slot, "update()" ) == 0 &&
 	 ::tqt_cast<TQDataBrowser*>(lastReceiver) )
 	return FALSE;
diff --git a/tools/designer/designer/database.cpp b/tools/designer/designer/database.cpp
index ca917c1d..602e9c23 100644
--- a/tools/designer/designer/database.cpp
+++ b/tools/designer/designer/database.cpp
@@ -37,7 +37,7 @@
 #include "database2.h"
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 #if defined(DESIGNER)
 #include "formwindow.h"
diff --git a/tools/designer/designer/database.h b/tools/designer/designer/database.h
index 0af7a92f..31e0a1eb 100644
--- a/tools/designer/designer/database.h
+++ b/tools/designer/designer/database.h
@@ -36,7 +36,7 @@
 
 #include "ntqfeatures.h"
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include <ntqdataview.h>
 #include <ntqdatabrowser.h>
 #include <ntqsqlcursor.h>
diff --git a/tools/designer/designer/database2.h b/tools/designer/designer/database2.h
index df7c294b..41a636b4 100644
--- a/tools/designer/designer/database2.h
+++ b/tools/designer/designer/database2.h
@@ -36,7 +36,7 @@
 
 #include "ntqfeatures.h"
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include <ntqdataview.h>
 #include <ntqdatabrowser.h>
 #include <ntqsqlcursor.h>
diff --git a/tools/designer/designer/dbconnectionimpl.cpp b/tools/designer/designer/dbconnectionimpl.cpp
index ae6cbac9..fd9cf4eb 100644
--- a/tools/designer/designer/dbconnectionimpl.cpp
+++ b/tools/designer/designer/dbconnectionimpl.cpp
@@ -57,7 +57,7 @@ DatabaseConnectionEditor::~DatabaseConnectionEditor()
 
 void DatabaseConnectionEditor::accept()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     conn->setUsername( connectionWidget->editUsername->text() );
     conn->setPassword( connectionWidget->editPassword->text() );
     conn->setHostname( connectionWidget->editHostname->text() );
diff --git a/tools/designer/designer/dbconnectionsimpl.cpp b/tools/designer/designer/dbconnectionsimpl.cpp
index 0507cb71..60ad7d34 100644
--- a/tools/designer/designer/dbconnectionsimpl.cpp
+++ b/tools/designer/designer/dbconnectionsimpl.cpp
@@ -62,7 +62,7 @@ DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* pa
     connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) );
     connectionWidget = new DatabaseConnectionWidget( grp );
     grpLayout->addWidget( connectionWidget, 0, 0 );
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQPtrList<DatabaseConnection> lst = project->databaseConnections();
     for ( DatabaseConnection *conn = lst.first(); conn; conn = lst.next() )
 	listConnections->insertItem( conn->name() );
@@ -112,7 +112,7 @@ void DatabaseConnectionsEditor::newConnection()
 
 void DatabaseConnectionsEditor::doConnect()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( listConnections->currentItem() == -1 ||
 	 !listConnections->item( listConnections->currentItem() )->isSelected() ) { // new connection
 	// ### do error checking for duplicated connection names
@@ -154,7 +154,7 @@ void DatabaseConnectionsEditor::doConnect()
 
 void DatabaseConnectionsEditor::currentConnectionChanged( const TQString &s )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     DatabaseConnection *conn = project->databaseConnection( s );
     blockChanges = TRUE;
     enableAll( conn != 0 );
diff --git a/tools/designer/designer/designerappiface.cpp b/tools/designer/designer/designerappiface.cpp
index bbcba778..e00cf67c 100644
--- a/tools/designer/designer/designerappiface.cpp
+++ b/tools/designer/designer/designerappiface.cpp
@@ -278,7 +278,7 @@ void DesignerProjectImpl::setupDatabases() const
 TQPtrList<DesignerDatabase> DesignerProjectImpl::databaseConnections() const
 {
     TQPtrList<DesignerDatabase> lst;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQPtrList<DatabaseConnection> conns = project->databaseConnections();
     for ( DatabaseConnection *d = conns.first(); d; d = conns.next() )
 	lst.append( d->iFace() );
@@ -437,7 +437,7 @@ bool DesignerProjectImpl::isGenericObject( TQObject *o ) const
 
 
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 DesignerDatabaseImpl::DesignerDatabaseImpl( DatabaseConnection *d )
     : db( d )
 {
diff --git a/tools/designer/designer/designerappiface.h b/tools/designer/designer/designerappiface.h
index 7b5719b4..fef579db 100644
--- a/tools/designer/designer/designerappiface.h
+++ b/tools/designer/designer/designerappiface.h
@@ -126,7 +126,7 @@ private:
 
 };
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 class TQSqlDatabase;
 
 class DesignerDatabaseImpl: public DesignerDatabase
diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp
index f092f8d2..e529432a 100644
--- a/tools/designer/designer/formwindow.cpp
+++ b/tools/designer/designer/formwindow.cpp
@@ -2444,7 +2444,7 @@ bool FormWindow::isCustomWidgetUsed( MetaDataBase::CustomWidget *w )
 
 bool FormWindow::isDatabaseWidgetUsed() const
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQStringList dbClasses;
     dbClasses << "TQDataTable"; // add more here
     TQPtrDictIterator<TQWidget> it( insertedWidgets );
@@ -2460,7 +2460,7 @@ bool FormWindow::isDatabaseWidgetUsed() const
 
 bool FormWindow::isDatabaseAware() const
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( TQString(mContainer->className()) == "TQDesignerDataBrowser" || TQString(mContainer->className()) == "TQDesignerDataView" )
 	return TRUE;
     return isDatabaseWidgetUsed();
diff --git a/tools/designer/designer/hierarchyview.cpp b/tools/designer/designer/hierarchyview.cpp
index e96a8647..c365a4d3 100644
--- a/tools/designer/designer/hierarchyview.cpp
+++ b/tools/designer/designer/hierarchyview.cpp
@@ -350,7 +350,7 @@ void HierarchyList::changeNameOf( TQObject *o, const TQString &name )
 
 void HierarchyList::changeDatabaseOf( TQObject *o, const TQString &info )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( !formWindow->isDatabaseAware() )
 	return;
     TQListViewItem *item = findItem( o );
@@ -368,7 +368,7 @@ void HierarchyList::setup()
 	return;
     clear();
     TQWidget *w = formWindow->mainContainer();
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( formWindow->isDatabaseAware() ) {
 	if ( columns() == 2 ) {
 	    addColumn( tr( "Database" ) );
@@ -426,7 +426,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
     }
 
     TQString dbInfo;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     dbInfo = MetaDataBase::fakeProperty( o, "database" ).toStringList().join(".");
 #endif
 
@@ -1445,7 +1445,7 @@ void HierarchyView::namePropertyChanged( TQWidget *w, const TQVariant & )
 
 void HierarchyView::databasePropertyChanged( TQWidget *w, const TQStringList& info )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQString i = info.join( "." );
     listview->changeDatabaseOf( w, i );
 #endif
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index 3c837a9d..f80cf602 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -72,7 +72,7 @@
 #include "formsettings.h"
 #include "preferences.h"
 #include "pixmapcollectioneditor.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "dbconnectionimpl.h"
 #endif
 //#include "connectioneditor.h"
diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp
index 2a5bf1c0..d7519f61 100644
--- a/tools/designer/designer/mainwindowactions.cpp
+++ b/tools/designer/designer/mainwindowactions.cpp
@@ -74,7 +74,7 @@
 #include "pixmapcollectioneditor.h"
 #include "styledbutton.h"
 #include "customwidgeteditorimpl.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "dbconnectionsimpl.h"
 #include "dbconnectionimpl.h"
 #endif
@@ -819,7 +819,7 @@ void MainWindow::setupProjectActions()
     connect( this, SIGNAL( hasNonDummyProject(bool) ), actionEditPixmapCollection, SLOT( setEnabled(bool) ) );
     actionEditPixmapCollection->addTo( projectMenu );
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQAction* actionEditDatabaseConnections = new TQAction( tr( "Database Connections..." ), TQPixmap(),
 						 tr( "&Database Connections..." ), 0, this, 0 );
     actionEditDatabaseConnections->setStatusTip( tr("Opens a dialog for editing the current project's database connections") );
@@ -1853,7 +1853,7 @@ void MainWindow::editPixmapCollection()
 
 void MainWindow::editDatabaseConnections()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     DatabaseConnectionsEditor dia( currentProject, this, 0, TRUE );
     dia.exec();
 #endif
diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp
index ec322f13..aadadc82 100644
--- a/tools/designer/designer/project.cpp
+++ b/tools/designer/designer/project.cpp
@@ -36,7 +36,7 @@
 #include "designerappiface.h"
 #include "../interfaces/languageinterface.h"
 #include "pixmapcollection.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "dbconnectionimpl.h"
 #endif
 #include "resource.h"
@@ -55,7 +55,7 @@
 #include "mainwindow.h"
 #include <ntqworkspace.h>
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include <ntqsqldatabase.h>
 #include <ntqsqlrecord.h>
 #include <ntqdatatable.h>
@@ -66,7 +66,7 @@
 # include <unistd.h>
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 DatabaseConnection::~DatabaseConnection()
 {
     delete iface;
@@ -74,7 +74,7 @@ DatabaseConnection::~DatabaseConnection()
 
 bool DatabaseConnection::refreshCatalog()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( loaded )
 	return TRUE;
     if ( !open() )
@@ -96,7 +96,7 @@ bool DatabaseConnection::refreshCatalog()
 #endif
 }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 void DatabaseConnection::remove()
 {
     if ( nm == "(default)" )
@@ -110,7 +110,7 @@ void DatabaseConnection::remove()
 
 bool DatabaseConnection::open( bool suppressDialog )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     // register our name, if nec
     if ( nm == "(default)" ) {
 	if ( !TQSqlDatabase::contains() ) // default doesn't exists?
@@ -183,7 +183,7 @@ void DatabaseConnection::close()
 {
     if ( !loaded )
 	return;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( conn ) {
 	conn->close();
     }
@@ -241,7 +241,7 @@ void Project::setModified( bool b )
     emit projectModified();
 }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 DatabaseConnection *Project::databaseConnection( const TQString &name )
 {
     for ( DatabaseConnection *conn = dbConnections.first();
@@ -818,21 +818,21 @@ void Project::save( bool onlyProjectFile )
     }
 }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 TQPtrList<DatabaseConnection> Project::databaseConnections() const
 {
     return dbConnections;
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 void Project::setDatabaseConnections( const TQPtrList<DatabaseConnection> &lst )
 {
     dbConnections = lst;
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 void Project::addDatabaseConnection( DatabaseConnection *conn )
 {
     dbConnections.append( conn );
@@ -840,7 +840,7 @@ void Project::addDatabaseConnection( DatabaseConnection *conn )
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 void Project::removeDatabaseConnection( const TQString &c )
 {
     for ( DatabaseConnection *conn = dbConnections.first(); conn; conn = dbConnections.next() ) {
@@ -854,7 +854,7 @@ void Project::removeDatabaseConnection( const TQString &c )
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 TQStringList Project::databaseConnectionList()
 {
     TQStringList lst;
@@ -864,7 +864,7 @@ TQStringList Project::databaseConnectionList()
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 TQStringList Project::databaseTableList( const TQString &connection )
 {
     DatabaseConnection *conn = databaseConnection( connection );
@@ -875,7 +875,7 @@ TQStringList Project::databaseTableList( const TQString &connection )
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 TQStringList Project::databaseFieldList( const TQString &connection, const TQString &table )
 {
     DatabaseConnection *conn = databaseConnection( connection );
@@ -885,7 +885,7 @@ TQStringList Project::databaseFieldList( const TQString &connection, const TQStr
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 static TQString makeIndent( int indent )
 {
     TQString s;
@@ -894,7 +894,7 @@ static TQString makeIndent( int indent )
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 static void saveSingleProperty( TQTextStream &ts, const TQString& name, const TQString& value, int indent )
 {
     ts << makeIndent( indent ) << "<property name=\"" << name << "\">" << endl;
@@ -907,7 +907,7 @@ static void saveSingleProperty( TQTextStream &ts, const TQString& name, const TQ
 
 void Project::saveConnections()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( dbFile.isEmpty() ) {
 	TQFileInfo fi( fileName() );
 	setDatabaseDescription( fi.baseName() + ".db" );
@@ -974,7 +974,7 @@ void Project::saveConnections()
 #endif
 }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 static TQDomElement loadSingleProperty( TQDomElement e, const TQString& name )
 {
     TQDomElement n;
@@ -990,7 +990,7 @@ static TQDomElement loadSingleProperty( TQDomElement e, const TQString& name )
 
 void Project::loadConnections()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( dbFile.isEmpty() || !TQFile::exists( makeAbsolute( dbFile ) ) )
 	return;
 
@@ -1061,7 +1061,7 @@ can be closed again with closeDatabase().
 
 bool Project::openDatabase( const TQString &connection, bool suppressDialog )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     DatabaseConnection *conn = databaseConnection( connection );
     if ( connection.isEmpty() && !conn )
 	conn = databaseConnection( "(default)" );
@@ -1080,7 +1080,7 @@ bool Project::openDatabase( const TQString &connection, bool suppressDialog )
 */
 void Project::closeDatabase( const TQString &connection )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     DatabaseConnection *conn = databaseConnection( connection );
     if ( connection.isEmpty() && !conn )
 	conn = databaseConnection( "(default)" );
diff --git a/tools/designer/designer/project.h b/tools/designer/designer/project.h
index 810e5b00..f5c6f148 100644
--- a/tools/designer/designer/project.h
+++ b/tools/designer/designer/project.h
@@ -54,14 +54,14 @@ struct DesignerDatabase;
 class PixmapCollection;
 class Project;
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 class TQSqlDatabase;
 
 class DatabaseConnection
 {
 public:
     DatabaseConnection( Project *p ) :
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	conn( 0 ),
 #endif
 	project( p ), loaded( FALSE ), iface( 0 ) {}
@@ -93,7 +93,7 @@ public:
     TQStringList tables() const { return tbls; }
     TQStringList fields( const TQString& t ) { return flds[t]; }
     TQMap<TQString, TQStringList> fields() { return flds; }
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQSqlDatabase* connection() const { return conn; }
     void remove();
 #endif
@@ -105,7 +105,7 @@ private:
     int prt;
     TQStringList tbls;
     TQMap<TQString, TQStringList> flds;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQSqlDatabase *conn;
 #endif
     Project *project;
@@ -150,7 +150,7 @@ public:
 
     void save( bool onlyProjectFile = FALSE );
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQPtrList<DatabaseConnection> databaseConnections() const;
     void setDatabaseConnections( const TQPtrList<DatabaseConnection> &lst );
     void addDatabaseConnection( DatabaseConnection *conn );
@@ -255,7 +255,7 @@ private:
     TQString proName;
     TQString desc;
     TQString dbFile;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQPtrList<DatabaseConnection> dbConnections;
 #endif
     TQString lang;
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 27f9bfeb..b3448a8d 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -2012,7 +2012,7 @@ void PropertyDatabaseItem::createChildren()
 
 void PropertyDatabaseItem::initChildren()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     PropertyItem *item = 0;
     TQStringList lst = value().toStringList();
     TQString conn, table;
@@ -2114,7 +2114,7 @@ bool PropertyDatabaseItem::hasSubItems() const
 
 void PropertyDatabaseItem::childValueChanged( PropertyItem *c )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQStringList lst;
     lst << ( (PropertyListItem*)PropertyItem::child( 0 ) )->currentItem()
 	<< ( (PropertyListItem*)PropertyItem::child( 1 ) )->currentItem();
@@ -3008,7 +3008,7 @@ static TQVariant::Type type_to_variant( const TQString &s )
     return TQVariant::Invalid;
 }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 static bool parent_is_data_aware( TQWidget *w )
 {
     TQWidget *p = w ? w->parentWidget() : 0;
@@ -3270,7 +3270,7 @@ void PropertyList::setupProperties()
 	    item->setChanged( TRUE, FALSE );
     }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( !::tqt_cast<TQDataTable*>(editor->widget()) && !::tqt_cast<TQDataBrowser*>(editor->widget()) &&
 	 !::tqt_cast<TQDataView*>(editor->widget()) && parent_is_data_aware( ::tqt_cast<TQWidget*>(editor->widget()) ) ) {
 	item = new PropertyDatabaseItem( this, item, 0, "database", editor->formWindow()->mainContainer() != w );
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index 2866e403..682da9e8 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -33,7 +33,7 @@
 
 #include "actiondnd.h"
 #include "command.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "database.h"
 #endif
 #include "formfile.h"
@@ -70,7 +70,7 @@
 #include <ntqobject.h>
 #include <ntqobjectlist.h>
 #include <ntqtabbar.h>
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <ntqtable.h>
 #include <ntqdatatable.h>
 #endif
@@ -1214,12 +1214,12 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent )
 	}
 	saveItem( lv->firstChild(), ts, indent - 1 );
     }
-#if !defined (QT_NO_TABLE)
+#if !defined (TQT_NO_TABLE)
     else if ( ::tqt_cast<TQTable*>(obj) ) {
 	TQTable *table = (TQTable*)obj;
 	int i;
 	TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( table );
-#  ifndef QT_NO_SQL
+#  ifndef TQT_NO_SQL
 	bool isDataTable = ::tqt_cast<TQDataTable*>(table);
 #  else
         bool isDataTable = false;
@@ -1998,7 +1998,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget )
 	if ( !resizable )
 	    lv->header()->setResizeEnabled( resizable, i );
     }
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     else if ( ::tqt_cast<TQTable*>(widget) ) {
 	TQTable *table = (TQTable*)widget;
 	bool isRow;
diff --git a/tools/designer/designer/styledbutton.cpp b/tools/designer/designer/styledbutton.cpp
index 64c55b48..c60c0944 100644
--- a/tools/designer/designer/styledbutton.cpp
+++ b/tools/designer/designer/styledbutton.cpp
@@ -223,7 +223,7 @@ void StyledButton::mousePressEvent(TQMouseEvent* e)
 void StyledButton::mouseMoveEvent(TQMouseEvent* e)
 {
     TQButton::mouseMoveEvent( e );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     if ( !mousePressed )
 	return;
     if ( ( pressPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) {
@@ -250,7 +250,7 @@ void StyledButton::mouseMoveEvent(TQMouseEvent* e)
 #endif
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 void StyledButton::dragEnterEvent( TQDragEnterEvent *e )
 {
     setFocus();
@@ -299,4 +299,4 @@ void StyledButton::dropEvent( TQDropEvent *e )
 	e->ignore();
     }
 }
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
diff --git a/tools/designer/designer/styledbutton.h b/tools/designer/designer/styledbutton.h
index 81cc634b..3c11cf1f 100644
--- a/tools/designer/designer/styledbutton.h
+++ b/tools/designer/designer/styledbutton.h
@@ -85,12 +85,12 @@ signals:
 protected:
     void mousePressEvent(TQMouseEvent*);
     void mouseMoveEvent(TQMouseEvent*);
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dragEnterEvent ( TQDragEnterEvent * );
     void dragMoveEvent ( TQDragMoveEvent * );
     void dragLeaveEvent ( TQDragLeaveEvent * );
     void dropEvent ( TQDropEvent * );
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
     void drawButton( TQPainter* );
     void drawButtonLabel( TQPainter* );
     void resizeEvent( TQResizeEvent* );
diff --git a/tools/designer/designer/tableeditorimpl.cpp b/tools/designer/designer/tableeditorimpl.cpp
index ecb6bec3..34100071 100644
--- a/tools/designer/designer/tableeditorimpl.cpp
+++ b/tools/designer/designer/tableeditorimpl.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include "tableeditorimpl.h"
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <ntqtable.h>
 #endif
 #include "formwindow.h"
@@ -53,17 +53,17 @@
 
 TableEditor::TableEditor( TQWidget* parent,  TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl )
     : TableEditorBase( parent, name, modal, fl ),
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     editTable( (TQTable*)editWidget ),
 #endif
     formWindow( fw )
 {
     connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) );
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     labelColumnPixmap->setText( "" );
     labelRowPixmap->setText( "" );
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( !::tqt_cast<TQDataTable*>(editTable) ) 
 #endif
     {
@@ -72,7 +72,7 @@ TableEditor::TableEditor( TQWidget* parent,  TQWidget *editWidget, FormWindow *f
 	labelTable->hide();
 	labelTableValue->hide();
     }
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( ::tqt_cast<TQDataTable*>(editTable) ) {
 	// ## why does this behave weird?
 	//	TabWidget->removePage( rows_tab );
@@ -126,7 +126,7 @@ void TableEditor::columnTextChanged( const TQString &s )
     listColumns->blockSignals( TRUE );
     listColumns->changeItem( s, listColumns->currentItem() );
     listColumns->blockSignals( FALSE );
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     if ( table->horizontalHeader()->iconSet( listColumns->currentItem() ) )
 	table->horizontalHeader()->setLabel( listColumns->currentItem(),
 					     *table->horizontalHeader()->iconSet( listColumns->currentItem() ), s );
@@ -163,7 +163,7 @@ void TableEditor::currentColumnChanged( TQListBoxItem *i )
 	labelColumnPixmap->setText( "" );
     editColumnText->blockSignals( FALSE );
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( ::tqt_cast<TQDataTable*>(editTable) ) {
 	TQString s = *fieldMap.find( listColumns->index( i ) );
 	if ( s.isEmpty() )
@@ -206,7 +206,7 @@ void TableEditor::deleteColumnClicked()
 {
     if ( listColumns->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumCols( table->numCols() - 1 );
     delete listColumns->item( listColumns->currentItem() );
     readColumns();
@@ -221,7 +221,7 @@ void TableEditor::deleteRowClicked()
 {
     if ( listRows->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumRows( table->numRows() - 1 );
     delete listRows->item( listRows->currentItem() );
     readRows();
@@ -234,7 +234,7 @@ void TableEditor::deleteRowClicked()
 
 void TableEditor::newColumnClicked()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumCols( table->numCols() + 1 );
     TQMap<TQString, bool> m;
     for ( int i = 0; i < table->numCols() - 1; ++i )
@@ -248,7 +248,7 @@ void TableEditor::newColumnClicked()
     TQListBoxItem *item = listColumns->item( listColumns->count() - 1 );
     listColumns->setCurrentItem( item );
     listColumns->setSelected( item, TRUE );
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( ::tqt_cast<TQDataTable*>(editTable) ) {
 	comboFields->setFocus();
     } else
@@ -262,7 +262,7 @@ void TableEditor::newColumnClicked()
 
 void TableEditor::newRowClicked()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumRows( table->numRows() + 1 );
     TQMap<TQString, bool> m;
     for ( int i = 0; i < table->numRows() - 1; ++i )
@@ -303,7 +303,7 @@ void TableEditor::rowTextChanged( const TQString &s )
 {
     if ( listRows->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     listRows->blockSignals(TRUE);
     listRows->changeItem( s, listRows->currentItem() );
     listRows->blockSignals(FALSE);
@@ -334,7 +334,7 @@ void TableEditor::applyClicked()
     TQValueList<PopulateTableCommand::Column> cols;
 
     int i = 0;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     for ( i = 0; i < table->horizontalHeader()->count(); ++i ) {
 	PopulateTableCommand::Column col;
 	col.text = table->horizontalHeader()->label( i );
@@ -370,7 +370,7 @@ void TableEditor::chooseRowPixmapClicked()
     if ( pix.isNull() )
 	return;
 
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->verticalHeader()->setLabel( listRows->currentItem(), pix, table->verticalHeader()->label( listRows->currentItem() ) );
     listRows->changeItem( pix, listRows->currentText(), listRows->currentItem() );
 #endif
@@ -380,7 +380,7 @@ void TableEditor::deleteRowPixmapClicked()
 {
     if ( listRows->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->verticalHeader()->setLabel( listRows->currentItem(), TQPixmap(), table->verticalHeader()->label( listRows->currentItem() ) );
     listRows->changeItem( listRows->currentText(), listRows->currentItem() );
 #endif
@@ -398,7 +398,7 @@ void TableEditor::chooseColPixmapClicked()
 
     if ( pix.isNull() )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->horizontalHeader()->setLabel( listColumns->currentItem(), pix, table->horizontalHeader()->label( listColumns->currentItem() ) );
     listColumns->changeItem( pix, listColumns->currentText(), listColumns->currentItem() );
 #endif
@@ -408,7 +408,7 @@ void TableEditor::deleteColPixmapClicked()
 {
     if ( listColumns->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->horizontalHeader()->setLabel( listColumns->currentItem(), TQPixmap(), table->horizontalHeader()->label( listColumns->currentItem() ) );
     listColumns->changeItem( listColumns->currentText(), listColumns->currentItem() );
 #endif
@@ -416,7 +416,7 @@ void TableEditor::deleteColPixmapClicked()
 
 void TableEditor::readFromTable()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     TQHeader *cols = editTable->horizontalHeader();
     table->setNumCols( cols->count() );
     TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( editTable );
@@ -463,7 +463,7 @@ void TableEditor::readFromTable()
 void TableEditor::readColumns()
 {
     int j = 0;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     for ( TQListBoxItem *i = listColumns->firstItem(); i; i = i->next(), ++j ) {
 	if ( i->pixmap() )
 	    table->horizontalHeader()->setLabel( j, *i->pixmap(), i->text() );
@@ -476,7 +476,7 @@ void TableEditor::readColumns()
 void TableEditor::readRows()
 {
     int j = 0;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     for ( TQListBoxItem *i = listRows->firstItem(); i; i = i->next(), ++j ) {
 	if ( i->pixmap() )
 	    table->verticalHeader()->setLabel( j, *i->pixmap(), i->text() );
diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp
index 97f3332e..53fa747c 100644
--- a/tools/designer/designer/widgetfactory.cpp
+++ b/tools/designer/designer/widgetfactory.cpp
@@ -45,7 +45,7 @@
 #include "formwindow.h"
 #include "multilineeditorimpl.h"
 #include "../interfaces/widgetinterface.h"
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include "tableeditorimpl.h"
 #endif
 #include "project.h"
@@ -57,10 +57,10 @@
 #include <ntqpixmap.h>
 #include <ntqgroupbox.h>
 #include <ntqiconview.h>
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <ntqtable.h>
 #endif
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include <ntqdatatable.h>
 #endif
 #include <ntqdatetimeedit.h>
@@ -95,7 +95,7 @@
 #include <ntqsplitter.h>
 #include <ntqtoolbox.h>
 #include <ntqsizegrip.h>
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "database.h"
 #endif
 
@@ -735,7 +735,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	    return new TQButtonGroup( TQString::fromLatin1( name ), parent, name );
 	return new TQButtonGroup( parent, name );
     } else if ( className == "TQIconView" ) {
-#if !defined(QT_NO_ICONVIEW)
+#if !defined(TQT_NO_ICONVIEW)
 	TQIconView* iv = new TQIconView( parent, name );
 	if ( init )
 	    (void) new TQIconViewItem( iv, MainWindow::tr( "New Item" ) );
@@ -744,17 +744,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	return 0;
 #endif
     } else if ( className == "TQTable" ) {
-#if !defined(QT_NO_TABLE)
+#if !defined(TQT_NO_TABLE)
 	if ( init )
 	    return new TQTable( 3, 3, parent, name );
 	return new TQTable( parent, name );
 #else
 	return 0;
 #endif
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     } else if ( className == "TQDataTable" ) {
 	return new TQDataTable( parent, name );
-#endif //QT_NO_SQL
+#endif //TQT_NO_SQL
     } else if ( className == "TQDateEdit" ) {
 	return new TQDateEdit( parent, name );
     } else if ( className == "TQTimeEdit" ) {
@@ -966,7 +966,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	MetaDataBase::addEntry( w );
 	return tb;
     }
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     else if ( className == "TQDataBrowser" ) {
 	TQWidget *w = new TQDesignerDataBrowser( parent, name );
 	if ( parent )
@@ -1259,7 +1259,7 @@ const char* WidgetFactory::classNameOf( TQObject* o )
 	return "TQPopupMenu";
     else if ( ::tqt_cast<TQDesignerToolBox*>(o) )
 	return "TQToolBox";
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     else if ( ::tqt_cast<TQDesignerDataBrowser*>(o) )
 	return "TQDataBrowser";
     else if ( ::tqt_cast<TQDesignerDataView*>(o) )
@@ -1343,9 +1343,9 @@ void WidgetFactory::initChangedProperties( TQObject *o )
 	MetaDataBase::setPropertyChanged( o, "itemIconSet", TRUE );
 	MetaDataBase::setPropertyChanged( o, "itemToolTip", TRUE );
 	MetaDataBase::setPropertyChanged( o, "itemBackgroundMode", TRUE );
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     } else if ( ::tqt_cast<TQTable*>(o) ) {
-#  ifndef QT_NO_SQL
+#  ifndef TQT_NO_SQL
         if (!::tqt_cast<TQDataTable*>(o) )
 #  endif
         {
@@ -1455,7 +1455,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget,
 	delete e;
 	return;
     }
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     if (::tqt_cast<TQTable*>(editWidget) != 0) {
 	TableEditor *e = new TableEditor( parent, editWidget, fw );
 	e->exec();
diff --git a/tools/designer/plugins/wizards/main.cpp b/tools/designer/plugins/wizards/main.cpp
index 5060ec7e..159252a4 100644
--- a/tools/designer/plugins/wizards/main.cpp
+++ b/tools/designer/plugins/wizards/main.cpp
@@ -35,7 +35,7 @@
 #include <ntqfeatures.h>
 #include <ntqwidget.h>
 #include <templatewizardiface.h>
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "sqlformwizardimpl.h"
 #endif
 #include "mainwindowwizard.h"
@@ -88,7 +88,7 @@ bool StandardTemplateWizardInterface::canUnload() const
 TQStringList StandardTemplateWizardInterface::featureList() const
 {
     TQStringList list;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     list << "TQDataBrowser" << "TQDesignerDataBrowser" << "TQDataView" << \
 	"TQDesignerDataView" << "TQDataTable";
 #endif
@@ -100,7 +100,7 @@ TQStringList StandardTemplateWizardInterface::featureList() const
 void StandardTemplateWizardInterface::setup( const TQString &templ, TQWidget *widget, DesignerFormWindow *fw, TQUnknownInterface *aIface )
 {
     inUse = TRUE;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( templ == "TQDesignerDataView" ||
 	 templ == "TQDesignerDataBrowser" ||
 	 templ == "TQDataView" ||
diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
index 40c54e04..5da841fe 100644
--- a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
+++ b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
@@ -50,7 +50,7 @@
 #include <ntqspinbox.h>
 #include <limits.h>
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include <ntqdatatable.h>
 #include <ntqdatabrowser.h>
 #include <ntqdataview.h>
@@ -154,7 +154,7 @@ void SqlFormWizard::autoPopulate( bool populate )
 		// remove primary index fields, if any
 		listBoxSortField->insertStringList( lst );
 		d->open( FALSE );
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 		TQSqlCursor tab( listBoxTable->currentText(), TRUE, d->connection() );
 		TQSqlIndex pIdx = tab.primaryIndex();
 		for ( uint i = 0; i < pIdx.count(); i++ ) {
@@ -323,7 +323,7 @@ void SqlFormWizard::accept()
     if ( !appIface || mode == None )
 	return;
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     DesignerProject *proIface = (DesignerProject*)( (DesignerInterface*)appIface )->currentProject();
     if ( !widget || !proIface ) {
 	SqlFormWizardBase::accept();
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index bdda5932..baa3c1be 100644
--- a/tools/designer/shared/widgetdatabase.cpp
+++ b/tools/designer/shared/widgetdatabase.cpp
@@ -240,7 +240,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     append( r );
 
-#if !defined(QT_NO_ICONVIEW) || defined(UIC)
+#if !defined(TQT_NO_ICONVIEW) || defined(UIC)
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_iconview.png";
     r->name = "TQIconView";
@@ -250,7 +250,7 @@ void WidgetDatabase::setupDataBase( int id )
     append( r );
 #endif
 
-#if !defined(QT_NO_TABLE)
+#if !defined(TQT_NO_TABLE)
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_table.png";
     r->name = "TQTable";
@@ -260,7 +260,7 @@ void WidgetDatabase::setupDataBase( int id )
     append( r );
 #endif
 
-#if !defined(QT_NO_SQL)
+#if !defined(TQT_NO_SQL)
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_datatable.png";
     r->includeFile = "ntqdatatable.h";
@@ -548,7 +548,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     append( r );
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
     r->name = "TQDataBrowser";
diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp
index b43233d1..937e1cce 100644
--- a/tools/designer/uic/embed.cpp
+++ b/tools/designer/uic/embed.cpp
@@ -43,8 +43,8 @@
 // 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(QT_NO_IMAGE_COLLECTION_COMPRESSION)
-#define QT_NO_IMAGE_COLLECTION_COMPRESSION
+#if defined(Q_WS_QWS) && !defined(TQT_NO_IMAGE_COLLECTION_COMPRESSION)
+#define TQT_NO_IMAGE_COLLECTION_COMPRESSION
 #endif
 
 struct EmbedImage
@@ -56,7 +56,7 @@ struct EmbedImage
     TQString name;
     TQString cname;
     bool alpha;
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
     ulong compressed;
 #endif
 };
@@ -77,7 +77,7 @@ static TQString convertToCIdentifier( const char *s )
 
 static ulong embedData( TQTextStream& out, const uchar* input, int nbytes )
 {
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
     TQByteArray bazip( tqCompress( input, nbytes ) );
     ulong len = bazip.size();
 #else
@@ -92,7 +92,7 @@ static ulong embedData( TQTextStream& out, const uchar* input, int nbytes )
 	    s.truncate( 0 );
 	}
 	uint v = (uchar)
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
 		 bazip
 #else
 		 input
@@ -176,7 +176,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
 	    img = img.convertBitOrder(TQImage::BigEndian);
 	out << s.sprintf( "static const unsigned char %s_data[] = {",
 			  (const char *)e->cname );
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
 	e->compressed =
 #endif
 	    embedData( out, img.bits(), img.numBytes() );
@@ -193,7 +193,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
 	out << "static struct EmbedImage {\n"
 	    "    int width, height, depth;\n"
 	    "    const unsigned char *data;\n"
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
 	    "    ulong compressed;\n"
 #endif
 	    "    int numColors;\n"
@@ -208,7 +208,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
 		<< e->height << ", "
 		<< e->depth << ", "
 		<< "(const unsigned char*)" << e->cname << "_data, "
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
 		<< e->compressed << ", "
 #endif
 		<< e->numColors << ", ";
@@ -223,7 +223,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
 	    out << "\"" << e->name << "\" },\n";
 	    e = list_image.next();
 	}
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
 	out << "    { 0, 0, 0, 0, 0, 0, 0, 0, 0 }\n};\n";
 #else
 	out << "    { 0, 0, 0, 0, 0, 0, 0, 0 }\n};\n";
@@ -234,7 +234,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
 	    "{\n"
 	    "    for ( int i=0; embed_image_vec[i].data; i++ ) {\n"
 	    "	if ( TQString::fromUtf8(embed_image_vec[i].name) == name ) {\n"
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
 	    "	    TQByteArray baunzip;\n"
 	    "	    baunzip = tqUncompress( embed_image_vec[i].data, \n"
 	    "		embed_image_vec[i].compressed );\n"
diff --git a/tools/designer/uilib/ntqwidgetfactory.h b/tools/designer/uilib/ntqwidgetfactory.h
index 99095d07..5b7e97c3 100644
--- a/tools/designer/uilib/ntqwidgetfactory.h
+++ b/tools/designer/uilib/ntqwidgetfactory.h
@@ -88,7 +88,7 @@ private:
     void createListViewColumn( TQListView *lv, const TQString& txt,
 			       const TQPixmap& pix, bool clickable,
 			       bool resizable );
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     void createTableColumnOrRow( TQTable *table, const TQString& txt,
 				 const TQPixmap& pix, const TQString& field,
 				 bool isRow );
diff --git a/tools/designer/uilib/qwidgetfactory.cpp b/tools/designer/uilib/qwidgetfactory.cpp
index 9cb6eeaa..a0bc0852 100644
--- a/tools/designer/uilib/qwidgetfactory.cpp
+++ b/tools/designer/uilib/qwidgetfactory.cpp
@@ -52,7 +52,7 @@
 #include <ntqmime.h>
 #include <ntqdragobject.h>
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include <ntqsqlrecord.h>
 #include <ntqsqldatabase.h>
 #include <ntqdatatable.h>
@@ -67,7 +67,7 @@
 #include <ntqbuttongroup.h>
 #include <ntqiconview.h>
 #include <ntqheader.h>
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <ntqtable.h>
 #endif
 #include <ntqlistbox.h>
@@ -359,7 +359,7 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge
     widgetFactory->loadExtraSource();
 
     if ( widgetFactory->toplevel ) {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	TQMap<TQWidget*, SqlWidgetConnection>::Iterator cit = widgetFactory->sqlWidgetConnections.begin();
 	for( ; cit != widgetFactory->sqlWidgetConnections.end(); ++cit ) {
 	    if ( widgetFactory->noDatabaseWidgets.find( cit.key()->name() ) !=
@@ -777,7 +777,7 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings,
 	if ( parent->inherits("TQListView") ) {
 	    createListViewColumn( (TQListView *) parent, text, pixmap, clickable,
 				  resizable );
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 	} else if ( parent->inherits("TQTable") ) {
 	    createTableColumnOrRow( (TQTable *) parent, text, pixmap, field,
 				    isRow );
@@ -870,7 +870,7 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in,
 		} else {
 		    (void) new TQListBoxPixmap( listBox, pixmap, text );
 		}
-    #ifndef QT_NO_ICONVIEW
+    #ifndef TQT_NO_ICONVIEW
 	    } else if ( parent->inherits("TQIconView") ) {
 		(void) new TQIconViewItem( (TQIconView *) parent, text, pixmap );
     #endif
@@ -1434,11 +1434,11 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *pa
     } else if ( className == "TQButtonGroup" ) {
 	return new TQButtonGroup( parent, name );
     } else if ( className == "TQIconView" ) {
-#if !defined(QT_NO_ICONVIEW)
+#if !defined(TQT_NO_ICONVIEW)
 	return new TQIconView( parent, name );
 #endif
     } else if ( className == "TQTable" ) {
-#if !defined(QT_NO_TABLE)
+#if !defined(TQT_NO_TABLE)
 	return new TQTable( parent, name );
 #endif
     } else if ( className == "TQListBox" ) {
@@ -1523,7 +1523,7 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *pa
 	return mw;
 
     }
-#if !defined(QT_NO_SQL)
+#if !defined(TQT_NO_SQL)
     else if ( className == "TQDataTable" ) {
 	return new TQDataTable( parent, name );
     } else if ( className == "TQDataBrowser" ) {
@@ -1863,7 +1863,7 @@ void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop,
 	    } else if ( prop == "buttonGroupId" ) {
 		if ( obj->inherits( "TQButton" ) && obj->parent()->inherits( "TQButtonGroup" ) )
 		    ( (TQButtonGroup*)obj->parent() )->insert( (TQButton*)obj, value.toInt() );
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	    } else if ( prop == "database" && !obj->inherits( "TQDataView" )
 		 && !obj->inherits( "TQDataBrowser" ) ) {
 		const TQStringList& lst = value.asStringList();
@@ -2217,18 +2217,18 @@ void TQWidgetFactory::createListViewColumn( TQListView *lv, const TQString& txt,
 	lv->header()->setResizeEnabled( resizable, i );
 }
 
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 void TQWidgetFactory::createTableColumnOrRow( TQTable *table, const TQString& txt,
 					     const TQPixmap& pix,
 					     const TQString& field, bool isRow )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     bool isSql = table->inherits( "TQDataTable" );
 #endif
     if ( isRow )
 	table->setNumRows( table->numRows() + 1 );
     else {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	if ( !isSql )
 #endif
 	    table->setNumCols( table->numCols() + 1 );
@@ -2243,14 +2243,14 @@ void TQWidgetFactory::createTableColumnOrRow( TQTable *table, const TQString& tx
     int i = isRow ? table->numRows() - 1 : table->numCols() - 1;
     TQHeader *h = !isRow ? table->horizontalHeader() : table->verticalHeader();
     if ( !pix.isNull() ) {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	if ( isSql )
 	    ((TQDataTable*)table)->addColumn( field, txt, -1, pix );
 	else
 #endif
 	    h->setLabel( i, pix, txt );
     } else {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	if ( isSql )
 	    ((TQDataTable*)table)->addColumn( field, txt );
 	else
@@ -2290,7 +2290,7 @@ void TQWidgetFactory::createColumn( const TQDomElement &e, TQWidget *widget )
 	}
 	createListViewColumn( lv, txt, pix, clickable, resizable );
     }
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     else if ( widget->inherits( "TQTable" ) ) {
 	TQTable *table = (TQTable*)widget;
 
@@ -2361,7 +2361,7 @@ void TQWidgetFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLis
 	} else {
 	    new TQListBoxText( lb, txt );
 	}
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
     } else if ( widget->inherits( "TQIconView" ) ) {
 	TQDomElement n = e.firstChild().toElement();
 	TQPixmap pix;