26 files changed, 44 insertions, 44 deletions

diff --git a/src/sql/drivers/cache/qsqlcachedresult.h b/src/sql/drivers/cache/qsqlcachedresult.h
index bde3457d1..b00779dc0 100644
--- a/src/sql/drivers/cache/qsqlcachedresult.h
+++ b/src/sql/drivers/cache/qsqlcachedresult.h
@@ -57,7 +57,7 @@
 #include <ntqvaluevector.h>
 #include <ntqsqlresult.h>
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp
index 433e8de26..d34e58500 100644
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
@@ -305,7 +305,7 @@ bool TQMYSQLResult::reset ( const TQString& query )
     cleanup();
 
     const char *encQuery = query.ascii();
-    if ( mysql_real_query( d->mysql, encQuery, qstrlen(encQuery) ) ) {
+    if ( mysql_real_query( d->mysql, encQuery, tqstrlen(encQuery) ) ) {
 	setLastError( qMakeError("Unable to execute query", TQSqlError::Statement, d ) );
 	return FALSE;
     }
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index b91bea329..2a387f516 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -428,7 +428,7 @@ static double qGetDoubleData( SQLHANDLE hStmt, int column, bool& isNull )
 
 static SQLBIGINT qGetBigIntData( SQLHANDLE hStmt, int column, bool& isNull )
 {
-    SQLBIGINT lngbuf = Q_INT64_C( 0 );
+    SQLBIGINT lngbuf = TQ_INT64_C( 0 );
     isNull = FALSE;
     TQSQLLEN lengthIndicator = 0;
     SQLRETURN r = SQLGetData( hStmt,
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp
index 1662a6e8c..35033667b 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp
@@ -18,7 +18,7 @@
 #include <ntqregexp.h>
 #include <ntqfile.h>
 
-#if (QT_VERSION-0 < 0x030000)
+#if (TQT_VERSION-0 < 0x030000)
 #  include <ntqvector.h>
 #  if !defined Q_WS_WIN32
 #    include <unistd.h>
@@ -303,7 +303,7 @@ bool TQSQLiteDriver::hasFeature(DriverFeature f) const
     switch (f) {
     case Transactions:
         return TRUE;
-#if (QT_VERSION-0 >= 0x030000)
+#if (TQT_VERSION-0 >= 0x030000)
     case Unicode:
         return d->utf8;
 #endif
@@ -414,7 +414,7 @@ TQStringList TQSQLiteDriver::tables(const TQString &typeName) const
 
     TQSqlQuery q = createQuery();
     q.setForwardOnly(TRUE);
-#if (QT_VERSION-0 >= 0x030000)
+#if (TQT_VERSION-0 >= 0x030000)
     if ((type & (int)TQSql::Tables) && (type & (int)TQSql::Views))
         q.exec("SELECT name FROM sqlite_master WHERE type='table' OR type='view'");
     else if (typeName.isEmpty() || (type & (int)TQSql::Tables))
@@ -431,7 +431,7 @@ TQStringList TQSQLiteDriver::tables(const TQString &typeName) const
             res.append(q.value(0).toString());
     }
 
-#if (QT_VERSION-0 >= 0x030000)
+#if (TQT_VERSION-0 >= 0x030000)
     if (type & (int)TQSql::SystemTables) {
         // there are no internal tables beside this one:
         res.append("sqlite_master");
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.h b/src/sql/drivers/sqlite/qsql_sqlite.h
index 300642ce1..ff05ede60 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.h
+++ b/src/sql/drivers/sqlite/qsql_sqlite.h
@@ -21,7 +21,7 @@
 #include <ntqsqlindex.h>
 #include "../cache/qsqlcachedresult.h"
 
-#if (QT_VERSION-0 >= 0x030000)
+#if (TQT_VERSION-0 >= 0x030000)
 typedef TQVariant TQSqlVariant;
 #endif
 
diff --git a/src/sql/ntqdatabrowser.h b/src/sql/ntqdatabrowser.h
index 9fa57a894..938b93208 100644
--- a/src/sql/ntqdatabrowser.h
+++ b/src/sql/ntqdatabrowser.h
@@ -58,7 +58,7 @@ class TQDataBrowserPrivate;
 
 class Q_EXPORT TQDataBrowser : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool boundaryChecking READ boundaryChecking WRITE setBoundaryChecking )
     Q_PROPERTY( TQString filter READ filter WRITE setFilter )
     Q_PROPERTY( TQStringList sort READ sort WRITE setSort )
@@ -166,7 +166,7 @@ private:
     void nav( Nav nav );
     TQDataBrowserPrivate* d;
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDataBrowser( const TQDataBrowser & );
     TQDataBrowser &operator=( const TQDataBrowser & );
 #endif
diff --git a/src/sql/ntqdatatable.h b/src/sql/ntqdatatable.h
index 11b9c60bf..e92f8b6c8 100644
--- a/src/sql/ntqdatatable.h
+++ b/src/sql/ntqdatatable.h
@@ -52,7 +52,7 @@
 #include "ntqiconset.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -67,7 +67,7 @@ class TQDataTablePrivate;
 
 class TQM_EXPORT_SQL TQDataTable : public TQTable
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     Q_PROPERTY( TQString nullText READ nullText WRITE setNullText )
     Q_PROPERTY( TQString trueText READ trueText WRITE setTrueText )
@@ -234,7 +234,7 @@ private:
     void         endUpdate();
     TQDataTablePrivate* d;
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDataTable( const TQDataTable & );
     TQDataTable &operator=( const TQDataTable & );
 #endif
diff --git a/src/sql/ntqdataview.h b/src/sql/ntqdataview.h
index 244c8039c..ca1fed1b4 100644
--- a/src/sql/ntqdataview.h
+++ b/src/sql/ntqdataview.h
@@ -45,7 +45,7 @@
 #include "ntqwidget.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -59,7 +59,7 @@ class TQDataViewPrivate;
 
 class TQM_EXPORT_SQL TQDataView : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQDataView( TQWidget* parent=0, const char* name=0, WFlags fl = 0 );
@@ -79,7 +79,7 @@ public slots:
 private:
     TQDataViewPrivate* d;
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDataView( const TQDataView & );
     TQDataView &operator=( const TQDataView & );
 #endif
diff --git a/src/sql/ntqeditorfactory.h b/src/sql/ntqeditorfactory.h
index 9ec8485c8..8818770c9 100644
--- a/src/sql/ntqeditorfactory.h
+++ b/src/sql/ntqeditorfactory.h
@@ -46,7 +46,7 @@
 #include "ntqvariant.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -66,7 +66,7 @@ public:
     static void installDefaultFactory( TQEditorFactory * factory);
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQEditorFactory( const TQEditorFactory & );
     TQEditorFactory &operator=( const TQEditorFactory & );
 #endif
diff --git a/src/sql/ntqsql.h b/src/sql/ntqsql.h
index 68aa971f2..78030f790 100644
--- a/src/sql/ntqsql.h
+++ b/src/sql/ntqsql.h
@@ -45,7 +45,7 @@
 #include "ntqglobal.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -89,7 +89,7 @@ public:
     };
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSql( const TQSql & );
     TQSql &operator=( const TQSql & );
 #endif
diff --git a/src/sql/ntqsqlcursor.h b/src/sql/ntqsqlcursor.h
index 0e6e3d0b4..f04f53d08 100644
--- a/src/sql/ntqsqlcursor.h
+++ b/src/sql/ntqsqlcursor.h
@@ -48,7 +48,7 @@
 #include "ntqsqlindex.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
diff --git a/src/sql/ntqsqldatabase.h b/src/sql/ntqsqldatabase.h
index 3112e2b3b..97b744b1a 100644
--- a/src/sql/ntqsqldatabase.h
+++ b/src/sql/ntqsqldatabase.h
@@ -48,7 +48,7 @@
 #include "ntqstringlist.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -78,7 +78,7 @@ public:
 
 class TQM_EXPORT_SQL TQSqlDatabase : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString databaseName  READ databaseName WRITE setDatabaseName )
     Q_PROPERTY( TQString userName  READ userName WRITE setUserName )
     Q_PROPERTY( TQString password  READ password WRITE setPassword )
@@ -144,7 +144,7 @@ protected:
 private:
     void 	init( const TQString& type, const TQString& name );
     TQSqlDatabasePrivate* d;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQSqlDatabase( const TQSqlDatabase & );
     TQSqlDatabase &operator=( const TQSqlDatabase & );
 #endif
diff --git a/src/sql/ntqsqldriver.h b/src/sql/ntqsqldriver.h
index c10597723..5da90309d 100644
--- a/src/sql/ntqsqldriver.h
+++ b/src/sql/ntqsqldriver.h
@@ -53,7 +53,7 @@
 #include "ntqmap.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -68,7 +68,7 @@ class TQSqlDatabase;
 class TQM_EXPORT_SQL TQSqlDriver : public TQObject
 {
     friend class TQSqlDatabase;
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum DriverFeature { Transactions, QuerySize, BLOB, Unicode, PreparedQueries,
 			 NamedPlaceholders, PositionalPlaceholders };
@@ -115,7 +115,7 @@ private:
     // ### This class needs a d-pointer in 4.0.
     int		          dbState;
     TQSqlError	          error;
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSqlDriver( const TQSqlDriver & );
     TQSqlDriver &operator=( const TQSqlDriver & );
 #endif
diff --git a/src/sql/ntqsqldriverplugin.h b/src/sql/ntqsqldriverplugin.h
index e5a9352a9..1b4514772 100644
--- a/src/sql/ntqsqldriverplugin.h
+++ b/src/sql/ntqsqldriverplugin.h
@@ -54,7 +54,7 @@ class TQSqlDriverPluginPrivate;
 
 class Q_EXPORT TQSqlDriverPlugin : public TQGPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSqlDriverPlugin();
     ~TQSqlDriverPlugin();
diff --git a/src/sql/ntqsqleditorfactory.h b/src/sql/ntqsqleditorfactory.h
index f04e3b35a..0fb30ff2d 100644
--- a/src/sql/ntqsqleditorfactory.h
+++ b/src/sql/ntqsqleditorfactory.h
@@ -45,7 +45,7 @@
 #include "ntqeditorfactory.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -67,7 +67,7 @@ public:
     static void installDefaultFactory( TQSqlEditorFactory * factory );
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQSqlEditorFactory( const TQSqlEditorFactory & );
     TQSqlEditorFactory &operator=( const TQSqlEditorFactory & );
 #endif
diff --git a/src/sql/ntqsqlerror.h b/src/sql/ntqsqlerror.h
index 04beb09df..ca4c6cae6 100644
--- a/src/sql/ntqsqlerror.h
+++ b/src/sql/ntqsqlerror.h
@@ -45,7 +45,7 @@
 #include "ntqstring.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
diff --git a/src/sql/ntqsqlfield.h b/src/sql/ntqsqlfield.h
index 0c33bb67f..bec5edd27 100644
--- a/src/sql/ntqsqlfield.h
+++ b/src/sql/ntqsqlfield.h
@@ -46,7 +46,7 @@
 #include "ntqvariant.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
diff --git a/src/sql/ntqsqlform.h b/src/sql/ntqsqlform.h
index f5aefa763..2c050c96c 100644
--- a/src/sql/ntqsqlform.h
+++ b/src/sql/ntqsqlform.h
@@ -46,7 +46,7 @@
 #include "ntqmap.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -63,7 +63,7 @@ class TQSqlFormPrivate;
 
 class TQM_EXPORT_SQL TQSqlForm : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSqlForm( TQObject * parent = 0, const char * name = 0 );
     ~TQSqlForm();
@@ -98,7 +98,7 @@ private:
     virtual void sync();
     TQSqlFormPrivate* d;
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQSqlForm( const TQSqlForm & );
     TQSqlForm &operator=( const TQSqlForm & );
 #endif
diff --git a/src/sql/ntqsqlindex.h b/src/sql/ntqsqlindex.h
index 59ca42200..1b88cb9d2 100644
--- a/src/sql/ntqsqlindex.h
+++ b/src/sql/ntqsqlindex.h
@@ -48,7 +48,7 @@
 #include "ntqsqlrecord.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #define TQM_TEMPLATE_EXTERN_SQL
 #else
diff --git a/src/sql/ntqsqlpropertymap.h b/src/sql/ntqsqlpropertymap.h
index 57920009b..93c30cb5c 100644
--- a/src/sql/ntqsqlpropertymap.h
+++ b/src/sql/ntqsqlpropertymap.h
@@ -66,7 +66,7 @@ public:
     static void installDefaultMap( TQSqlPropertyMap * map );
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSqlPropertyMap( const TQSqlPropertyMap & );
     TQSqlPropertyMap &operator=( const TQSqlPropertyMap & );
 #endif
diff --git a/src/sql/ntqsqlquery.h b/src/sql/ntqsqlquery.h
index 502f07f4a..4852e78e7 100644
--- a/src/sql/ntqsqlquery.h
+++ b/src/sql/ntqsqlquery.h
@@ -59,7 +59,7 @@ class TQSqlDatabase;
 
 class Q_EXPORT TQSqlResultShared : public TQObject, public TQShared
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSqlResultShared( TQSqlResult* result );
     virtual ~TQSqlResultShared();
diff --git a/src/sql/ntqsqlresult.h b/src/sql/ntqsqlresult.h
index 0ad0d05d0..410d6f0d6 100644
--- a/src/sql/ntqsqlresult.h
+++ b/src/sql/ntqsqlresult.h
@@ -49,7 +49,7 @@
 #include "ntqsql.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -105,7 +105,7 @@ private:
     bool forwardOnly;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSqlResult( const TQSqlResult & );
     TQSqlResult &operator=( const TQSqlResult & );
 #endif
diff --git a/src/sql/ntqsqlselectcursor.h b/src/sql/ntqsqlselectcursor.h
index 5ad13ec48..f3065634b 100644
--- a/src/sql/ntqsqlselectcursor.h
+++ b/src/sql/ntqsqlselectcursor.h
@@ -45,7 +45,7 @@
 #include "ntqsqlcursor.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
diff --git a/src/sql/qsqldriverinterface_p.h b/src/sql/qsqldriverinterface_p.h
index bfc5dc316..0944153b2 100644
--- a/src/sql/qsqldriverinterface_p.h
+++ b/src/sql/qsqldriverinterface_p.h
@@ -57,7 +57,7 @@
 #include <private/qcom_p.h>
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
diff --git a/src/sql/qsqlextension_p.h b/src/sql/qsqlextension_p.h
index 7e4237c6e..e87d5e547 100644
--- a/src/sql/qsqlextension_p.h
+++ b/src/sql/qsqlextension_p.h
@@ -63,7 +63,7 @@
 
 #ifndef QT_NO_SQL
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #define TQM_TEMPLATE_EXTERN_SQL
 #else
diff --git a/src/sql/qsqlmanager_p.h b/src/sql/qsqlmanager_p.h
index b36b4d1ed..0fb203320 100644
--- a/src/sql/qsqlmanager_p.h
+++ b/src/sql/qsqlmanager_p.h
@@ -63,7 +63,7 @@
 #include "ntqsqlcursor.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT