diff options
Diffstat (limited to 'src/sql')
54 files changed, 247 insertions, 247 deletions
diff --git a/src/sql/drivers/cache/qsqlcachedresult.cpp b/src/sql/drivers/cache/qsqlcachedresult.cpp index 4c841e5f1..4f60fa252 100644 --- a/src/sql/drivers/cache/qsqlcachedresult.cpp +++ b/src/sql/drivers/cache/qsqlcachedresult.cpp @@ -38,7 +38,7 @@ **********************************************************************/ #include "qsqlcachedresult.h" -#include <qdatetime.h> +#include <ntqdatetime.h> #ifndef QT_NO_SQL static const uint initial_cache_size = 128; diff --git a/src/sql/drivers/cache/qsqlcachedresult.h b/src/sql/drivers/cache/qsqlcachedresult.h index 6d78f39de..bde3457d1 100644 --- a/src/sql/drivers/cache/qsqlcachedresult.h +++ b/src/sql/drivers/cache/qsqlcachedresult.h @@ -51,11 +51,11 @@ // // -#include <qglobal.h> -#include <qvariant.h> -#include <qptrvector.h> -#include <qvaluevector.h> -#include <qsqlresult.h> +#include <ntqglobal.h> +#include <ntqvariant.h> +#include <ntqptrvector.h> +#include <ntqvaluevector.h> +#include <ntqsqlresult.h> #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL diff --git a/src/sql/drivers/ibase/qsql_ibase.cpp b/src/sql/drivers/ibase/qsql_ibase.cpp index 22c41064d..f6aff5dbb 100644 --- a/src/sql/drivers/ibase/qsql_ibase.cpp +++ b/src/sql/drivers/ibase/qsql_ibase.cpp @@ -14,7 +14,7 @@ #include "qsql_ibase.h" -#include <qdatetime.h> +#include <ntqdatetime.h> #include <private/qsqlextension_p.h> #include <ibase.h> diff --git a/src/sql/drivers/ibase/qsql_ibase.h b/src/sql/drivers/ibase/qsql_ibase.h index fcb738513..45cb4b86b 100644 --- a/src/sql/drivers/ibase/qsql_ibase.h +++ b/src/sql/drivers/ibase/qsql_ibase.h @@ -41,8 +41,8 @@ #ifndef TQSQL_IBASE_H #define TQSQL_IBASE_H -#include "qsqlresult.h" -#include "qsqldriver.h" +#include "ntqsqlresult.h" +#include "ntqsqldriver.h" #include "../cache/qsqlcachedresult.h" diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp index 10448414e..433e8de26 100644 --- a/src/sql/drivers/mysql/qsql_mysql.cpp +++ b/src/sql/drivers/mysql/qsql_mysql.cpp @@ -41,9 +41,9 @@ #include "qsql_mysql.h" #include <private/qsqlextension_p.h> -#include <qdatetime.h> -#include <qvaluevector.h> -#include <qsqlrecord.h> +#include <ntqdatetime.h> +#include <ntqvaluevector.h> +#include <ntqsqlrecord.h> #define TQMYSQL_DRIVER_NAME "TQMYSQL3" diff --git a/src/sql/drivers/mysql/qsql_mysql.h b/src/sql/drivers/mysql/qsql_mysql.h index 4d4c7b1e5..6b1daef3a 100644 --- a/src/sql/drivers/mysql/qsql_mysql.h +++ b/src/sql/drivers/mysql/qsql_mysql.h @@ -41,10 +41,10 @@ #ifndef TQSQL_MYSQL_H #define TQSQL_MYSQL_H -#include <qsqldriver.h> -#include <qsqlresult.h> -#include <qsqlfield.h> -#include <qsqlindex.h> +#include <ntqsqldriver.h> +#include <ntqsqlresult.h> +#include <ntqsqlfield.h> +#include <ntqsqlindex.h> #if defined (Q_OS_WIN32) #include <qt_windows.h> diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index 9851e1cb1..b91bea329 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -39,13 +39,13 @@ **********************************************************************/ #include "qsql_odbc.h" -#include <qsqlrecord.h> +#include <ntqsqlrecord.h> #if defined (Q_OS_WIN32) #include <qt_windows.h> -#include <qapplication.h> +#include <ntqapplication.h> #endif -#include <qdatetime.h> +#include <ntqdatetime.h> #include <private/qsqlextension_p.h> #include <private/qinternal_p.h> #include <stdlib.h> diff --git a/src/sql/drivers/odbc/qsql_odbc.h b/src/sql/drivers/odbc/qsql_odbc.h index 8583dced4..0ce01703a 100644 --- a/src/sql/drivers/odbc/qsql_odbc.h +++ b/src/sql/drivers/odbc/qsql_odbc.h @@ -41,12 +41,12 @@ #ifndef TQSQL_ODBC_H #define TQSQL_ODBC_H -#include <qmap.h> -#include <qstring.h> -#include <qsqldriver.h> -#include <qsqlfield.h> -#include <qsqlresult.h> -#include <qsqlindex.h> +#include <ntqmap.h> +#include <ntqstring.h> +#include <ntqsqldriver.h> +#include <ntqsqlfield.h> +#include <ntqsqlresult.h> +#include <ntqsqlindex.h> #if defined (Q_OS_WIN32) #include <qt_windows.h> diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp index 788a69358..b039a2474 100644 --- a/src/sql/drivers/psql/qsql_psql.cpp +++ b/src/sql/drivers/psql/qsql_psql.cpp @@ -43,10 +43,10 @@ #include <math.h> -#include <qpointarray.h> -#include <qsqlrecord.h> -#include <qregexp.h> -#include <qdatetime.h> +#include <ntqpointarray.h> +#include <ntqsqlrecord.h> +#include <ntqregexp.h> +#include <ntqdatetime.h> // PostgreSQL header <utils/elog.h> included by <postgres.h> redefines DEBUG. #if defined(DEBUG) # undef DEBUG diff --git a/src/sql/drivers/psql/qsql_psql.h b/src/sql/drivers/psql/qsql_psql.h index bed3ebbc9..dd1ddc71c 100644 --- a/src/sql/drivers/psql/qsql_psql.h +++ b/src/sql/drivers/psql/qsql_psql.h @@ -41,9 +41,9 @@ #ifndef TQSQL_PSQL_H #define TQSQL_PSQL_H -#include <qsqlresult.h> -#include <qsqlfield.h> -#include <qsqldriver.h> +#include <ntqsqlresult.h> +#include <ntqsqlfield.h> +#include <ntqsqldriver.h> #include <libpq-fe.h> #ifdef QT_PLUGIN diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp index ecdda1c0c..1662a6e8c 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.cpp +++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp @@ -14,18 +14,18 @@ #include "qsql_sqlite.h" -#include <qdatetime.h> -#include <qregexp.h> -#include <qfile.h> +#include <ntqdatetime.h> +#include <ntqregexp.h> +#include <ntqfile.h> #if (QT_VERSION-0 < 0x030000) -# include <qvector.h> +# include <ntqvector.h> # if !defined Q_WS_WIN32 # include <unistd.h> # endif # include "../../../3rdparty/libraries/sqlite/sqlite.h" #else -# include <qptrvector.h> +# include <ntqptrvector.h> # if !defined Q_WS_WIN32 # include <unistd.h> # endif diff --git a/src/sql/drivers/sqlite/qsql_sqlite.h b/src/sql/drivers/sqlite/qsql_sqlite.h index ccde9b865..300642ce1 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.h +++ b/src/sql/drivers/sqlite/qsql_sqlite.h @@ -15,10 +15,10 @@ #ifndef TQSQL_SQLITE_H #define TQSQL_SQLITE_H -#include <qsqldriver.h> -#include <qsqlresult.h> -#include <qsqlrecord.h> -#include <qsqlindex.h> +#include <ntqsqldriver.h> +#include <ntqsqlresult.h> +#include <ntqsqlrecord.h> +#include <ntqsqlindex.h> #include "../cache/qsqlcachedresult.h" #if (QT_VERSION-0 >= 0x030000) diff --git a/src/sql/qdatabrowser.h b/src/sql/ntqdatabrowser.h index 3c991bfcf..9fa57a894 100644 --- a/src/sql/qdatabrowser.h +++ b/src/sql/ntqdatabrowser.h @@ -42,13 +42,13 @@ #define TQDATABROWSER_H #ifndef QT_H -#include "qwidget.h" -#include "qstring.h" -#include "qstringlist.h" -#include "qsql.h" -#include "qsqlindex.h" -#include "qsqlcursor.h" -#include "qsqlerror.h" +#include "ntqwidget.h" +#include "ntqstring.h" +#include "ntqstringlist.h" +#include "ntqsql.h" +#include "ntqsqlindex.h" +#include "ntqsqlcursor.h" +#include "ntqsqlerror.h" #endif // QT_H #ifndef QT_NO_SQL_VIEW_WIDGETS diff --git a/src/sql/qdatatable.h b/src/sql/ntqdatatable.h index 46d9c7e34..11b9c60bf 100644 --- a/src/sql/qdatatable.h +++ b/src/sql/ntqdatatable.h @@ -42,14 +42,14 @@ #define TQDATATABLE_H #ifndef QT_H -#include "qstring.h" -#include "qvariant.h" -#include "qtable.h" -#include "qsql.h" -#include "qsqlcursor.h" -#include "qsqlindex.h" -#include "qsqleditorfactory.h" -#include "qiconset.h" +#include "ntqstring.h" +#include "ntqvariant.h" +#include "ntqtable.h" +#include "ntqsql.h" +#include "ntqsqlcursor.h" +#include "ntqsqlindex.h" +#include "ntqsqleditorfactory.h" +#include "ntqiconset.h" #endif // QT_H #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/qdataview.h b/src/sql/ntqdataview.h index 90f488356..244c8039c 100644 --- a/src/sql/qdataview.h +++ b/src/sql/ntqdataview.h @@ -42,7 +42,7 @@ #define TQDATAVIEW_H #ifndef QT_H -#include "qwidget.h" +#include "ntqwidget.h" #endif // QT_H #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/qeditorfactory.h b/src/sql/ntqeditorfactory.h index 2798c5939..9ec8485c8 100644 --- a/src/sql/qeditorfactory.h +++ b/src/sql/ntqeditorfactory.h @@ -42,8 +42,8 @@ #define TQEDITORFACTORY_H #ifndef QT_H -#include "qobject.h" -#include "qvariant.h" +#include "ntqobject.h" +#include "ntqvariant.h" #endif // QT_H #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/qsql.h b/src/sql/ntqsql.h index b4fddae1a..68aa971f2 100644 --- a/src/sql/qsql.h +++ b/src/sql/ntqsql.h @@ -42,7 +42,7 @@ #define TQSQL_H #ifndef QT_H -#include "qglobal.h" +#include "ntqglobal.h" #endif // QT_H #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/qsqlcursor.h b/src/sql/ntqsqlcursor.h index 8670ef6f8..0e6e3d0b4 100644 --- a/src/sql/qsqlcursor.h +++ b/src/sql/ntqsqlcursor.h @@ -42,10 +42,10 @@ #define TQSQLCURSOR_H #ifndef QT_H -#include "qsqlrecord.h" -#include "qstringlist.h" -#include "qsqlquery.h" -#include "qsqlindex.h" +#include "ntqsqlrecord.h" +#include "ntqstringlist.h" +#include "ntqsqlquery.h" +#include "ntqsqlindex.h" #endif // QT_H #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/qsqldatabase.h b/src/sql/ntqsqldatabase.h index 2fd6d4917..3112e2b3b 100644 --- a/src/sql/qsqldatabase.h +++ b/src/sql/ntqsqldatabase.h @@ -42,10 +42,10 @@ #define TQSQLDATABASE_H #ifndef QT_H -#include "qobject.h" -#include "qstring.h" -#include "qsqlquery.h" -#include "qstringlist.h" +#include "ntqobject.h" +#include "ntqstring.h" +#include "ntqsqlquery.h" +#include "ntqstringlist.h" #endif // QT_H #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/qsqldriver.h b/src/sql/ntqsqldriver.h index b312d3a0d..c10597723 100644 --- a/src/sql/qsqldriver.h +++ b/src/sql/ntqsqldriver.h @@ -42,15 +42,15 @@ #define TQSQLDRIVER_H #ifndef QT_H -#include "qobject.h" -#include "qptrdict.h" -#include "qstring.h" -#include "qsqlerror.h" -#include "qsqlquery.h" -#include "qsqlfield.h" -#include "qsqlindex.h" -#include "qstringlist.h" -#include "qmap.h" +#include "ntqobject.h" +#include "ntqptrdict.h" +#include "ntqstring.h" +#include "ntqsqlerror.h" +#include "ntqsqlquery.h" +#include "ntqsqlfield.h" +#include "ntqsqlindex.h" +#include "ntqstringlist.h" +#include "ntqmap.h" #endif // QT_H #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/qsqldriverplugin.h b/src/sql/ntqsqldriverplugin.h index 54c05b692..e5a9352a9 100644 --- a/src/sql/qsqldriverplugin.h +++ b/src/sql/ntqsqldriverplugin.h @@ -42,8 +42,8 @@ #define TQSQLDRIVERPLUGIN_H #ifndef QT_H -#include "qgplugin.h" -#include "qstringlist.h" +#include "ntqgplugin.h" +#include "ntqstringlist.h" #endif // QT_H #ifndef QT_NO_SQL diff --git a/src/sql/qsqleditorfactory.h b/src/sql/ntqsqleditorfactory.h index 48757d480..f04e3b35a 100644 --- a/src/sql/qsqleditorfactory.h +++ b/src/sql/ntqsqleditorfactory.h @@ -42,7 +42,7 @@ #define TQSQLEDITORFACTORY_H #ifndef QT_H -#include "qeditorfactory.h" +#include "ntqeditorfactory.h" #endif // QT_H #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/qsqlerror.h b/src/sql/ntqsqlerror.h index 7eb29f027..04beb09df 100644 --- a/src/sql/qsqlerror.h +++ b/src/sql/ntqsqlerror.h @@ -42,7 +42,7 @@ #define TQSQLERROR_H #ifndef QT_H -#include "qstring.h" +#include "ntqstring.h" #endif // QT_H #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/qsqlfield.h b/src/sql/ntqsqlfield.h index b81717c7a..0c33bb67f 100644 --- a/src/sql/qsqlfield.h +++ b/src/sql/ntqsqlfield.h @@ -42,8 +42,8 @@ #define TQSQLFIELD_H #ifndef QT_H -#include "qstring.h" -#include "qvariant.h" +#include "ntqstring.h" +#include "ntqvariant.h" #endif // QT_H #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/qsqlform.h b/src/sql/ntqsqlform.h index 7ca157c0f..f5aefa763 100644 --- a/src/sql/qsqlform.h +++ b/src/sql/ntqsqlform.h @@ -42,8 +42,8 @@ #define TQSQLFORM_H #ifndef QT_H -#include "qobject.h" -#include "qmap.h" +#include "ntqobject.h" +#include "ntqmap.h" #endif // QT_H #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/qsqlindex.h b/src/sql/ntqsqlindex.h index 61df18aa3..59ca42200 100644 --- a/src/sql/qsqlindex.h +++ b/src/sql/ntqsqlindex.h @@ -42,10 +42,10 @@ #define TQSQLINDEX_H #ifndef QT_H -#include "qstring.h" -#include "qstringlist.h" -#include "qsqlfield.h" -#include "qsqlrecord.h" +#include "ntqstring.h" +#include "ntqstringlist.h" +#include "ntqsqlfield.h" +#include "ntqsqlrecord.h" #endif // QT_H #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) @@ -94,6 +94,6 @@ private: }; #define Q_DEFINED_QSQLINDEX -#include "qwinexport.h" +#include "ntqwinexport.h" #endif // QT_NO_SQL #endif diff --git a/src/sql/qsqlpropertymap.h b/src/sql/ntqsqlpropertymap.h index 2054b134a..57920009b 100644 --- a/src/sql/qsqlpropertymap.h +++ b/src/sql/ntqsqlpropertymap.h @@ -42,8 +42,8 @@ #define TQSQLPROPERTYMAP_H #ifndef QT_H -#include "qvariant.h" -#include "qstring.h" +#include "ntqvariant.h" +#include "ntqstring.h" #endif // QT_H #ifndef QT_NO_SQL_FORM diff --git a/src/sql/qsqlquery.h b/src/sql/ntqsqlquery.h index 8ea2462e4..502f07f4a 100644 --- a/src/sql/qsqlquery.h +++ b/src/sql/ntqsqlquery.h @@ -42,13 +42,13 @@ #define TQSQLTQUERY_H #ifndef QT_H -#include "qobject.h" -#include "qstring.h" -#include "qvariant.h" -#include "qvaluelist.h" -#include "qsqlerror.h" -#include "qsqlfield.h" -#include "qsql.h" +#include "ntqobject.h" +#include "ntqstring.h" +#include "ntqvariant.h" +#include "ntqvaluelist.h" +#include "ntqsqlerror.h" +#include "ntqsqlfield.h" +#include "ntqsql.h" #endif // QT_H #ifndef QT_NO_SQL diff --git a/src/sql/qsqlrecord.h b/src/sql/ntqsqlrecord.h index 405961df9..7023cf923 100644 --- a/src/sql/qsqlrecord.h +++ b/src/sql/ntqsqlrecord.h @@ -42,10 +42,10 @@ #define TQSQLRECORD_H #ifndef QT_H -#include "qstring.h" -#include "qstringlist.h" -#include "qvariant.h" -#include "qsqlfield.h" +#include "ntqstring.h" +#include "ntqstringlist.h" +#include "ntqvariant.h" +#include "ntqsqlfield.h" #endif // QT_H #ifndef QT_NO_SQL diff --git a/src/sql/qsqlresult.h b/src/sql/ntqsqlresult.h index 5b72b7f94..0ad0d05d0 100644 --- a/src/sql/qsqlresult.h +++ b/src/sql/ntqsqlresult.h @@ -42,11 +42,11 @@ #define TQSQLRESULT_H #ifndef QT_H -#include "qstring.h" -#include "qvariant.h" -#include "qsqlerror.h" -#include "qsqlfield.h" -#include "qsql.h" +#include "ntqstring.h" +#include "ntqvariant.h" +#include "ntqsqlerror.h" +#include "ntqsqlfield.h" +#include "ntqsql.h" #endif // QT_H #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/qsqlselectcursor.h b/src/sql/ntqsqlselectcursor.h index 91d5c4d6a..5ad13ec48 100644 --- a/src/sql/qsqlselectcursor.h +++ b/src/sql/ntqsqlselectcursor.h @@ -42,7 +42,7 @@ #define TQSQLSELECTCURSOR_H #ifndef QT_H -#include "qsqlcursor.h" +#include "ntqsqlcursor.h" #endif // QT_H #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/qdatabrowser.cpp b/src/sql/qdatabrowser.cpp index c9570deb2..79ac4ab0b 100644 --- a/src/sql/qdatabrowser.cpp +++ b/src/sql/qdatabrowser.cpp @@ -38,13 +38,13 @@ ** **********************************************************************/ -#include "qdatabrowser.h" +#include "ntqdatabrowser.h" #ifndef QT_NO_SQL_VIEW_WIDGETS -#include "qsqlform.h" +#include "ntqsqlform.h" #include "qsqlmanager_p.h" -#include "qsqlresult.h" +#include "ntqsqlresult.h" class TQDataBrowserPrivate { @@ -58,7 +58,7 @@ public: }; /*! - \class TQDataBrowser qdatabrowser.h + \class TQDataBrowser ntqdatabrowser.h \brief The TQDataBrowser class provides data manipulation and navigation for data entry forms. diff --git a/src/sql/qdatatable.cpp b/src/sql/qdatatable.cpp index bd3708eda..f300c43e5 100644 --- a/src/sql/qdatatable.cpp +++ b/src/sql/qdatatable.cpp @@ -38,22 +38,22 @@ ** **********************************************************************/ -#include "qdatatable.h" +#include "ntqdatatable.h" #ifndef QT_NO_SQL_VIEW_WIDGETS -#include "qsqldriver.h" -#include "qsqleditorfactory.h" -#include "qsqlpropertymap.h" -#include "qapplication.h" -#include "qlayout.h" -#include "qpainter.h" -#include "qpopupmenu.h" -#include "qvaluelist.h" +#include "ntqsqldriver.h" +#include "ntqsqleditorfactory.h" +#include "ntqsqlpropertymap.h" +#include "ntqapplication.h" +#include "ntqlayout.h" +#include "ntqpainter.h" +#include "ntqpopupmenu.h" +#include "ntqvaluelist.h" #include "qsqlmanager_p.h" -#include "qdatetime.h" -#include "qcursor.h" -#include "qtimer.h" +#include "ntqdatetime.h" +#include "ntqcursor.h" +#include "ntqtimer.h" //#define QT_DEBUG_DATATABLE @@ -132,7 +132,7 @@ void qt_debug_buffer( const TQString& msg, TQSqlRecord* cursor ) /*! - \class TQDataTable qdatatable.h + \class TQDataTable ntqdatatable.h \brief The TQDataTable class provides a flexible SQL table widget that supports browsing and editing. \ingroup database diff --git a/src/sql/qdataview.cpp b/src/sql/qdataview.cpp index a689025f0..32d437ba2 100644 --- a/src/sql/qdataview.cpp +++ b/src/sql/qdataview.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include "qdataview.h" +#include "ntqdataview.h" #ifndef QT_NO_SQL_VIEW_WIDGETS @@ -53,7 +53,7 @@ public: /*! - \class TQDataView qdataview.h + \class TQDataView ntqdataview.h \brief The TQDataView class provides read-only SQL forms. \ingroup database diff --git a/src/sql/qeditorfactory.cpp b/src/sql/qeditorfactory.cpp index 6f5fb7f36..660434cf8 100644 --- a/src/sql/qeditorfactory.cpp +++ b/src/sql/qeditorfactory.cpp @@ -38,19 +38,19 @@ ** **********************************************************************/ -#include "qcleanuphandler.h" -#include "qlabel.h" -#include "qlineedit.h" -#include "qspinbox.h" -#include "qcombobox.h" +#include "ntqcleanuphandler.h" +#include "ntqlabel.h" +#include "ntqlineedit.h" +#include "ntqspinbox.h" +#include "ntqcombobox.h" -#include "qeditorfactory.h" -#include "qdatetimeedit.h" +#include "ntqeditorfactory.h" +#include "ntqdatetimeedit.h" #ifndef QT_NO_SQL_EDIT_WIDGETS /*! - \class TQEditorFactory qeditorfactory.h + \class TQEditorFactory ntqeditorfactory.h \brief The TQEditorFactory class is used to create editor widgets for TQVariant data types. diff --git a/src/sql/qsql.cpp b/src/sql/qsql.cpp index 42d59c004..74ea4bd4c 100644 --- a/src/sql/qsql.cpp +++ b/src/sql/qsql.cpp @@ -40,7 +40,7 @@ /*! - \class TQSql qsql.h + \class TQSql ntqsql.h \brief The TQSql class is a namespace for TQt SQL identifiers that need to be global-like. diff --git a/src/sql/qsqlcursor.cpp b/src/sql/qsqlcursor.cpp index e5949951b..3ddd2c9e0 100644 --- a/src/sql/qsqlcursor.cpp +++ b/src/sql/qsqlcursor.cpp @@ -38,15 +38,15 @@ ** **********************************************************************/ -#include "qsqlcursor.h" +#include "ntqsqlcursor.h" #ifndef QT_NO_SQL -#include "qsqldriver.h" -#include "qsqlresult.h" -#include "qdatetime.h" -#include "qsqldatabase.h" -#include "qsql.h" +#include "ntqsqldriver.h" +#include "ntqsqlresult.h" +#include "ntqdatetime.h" +#include "ntqsqldatabase.h" +#include "ntqsql.h" class TQSqlCursorPrivate { @@ -124,7 +124,7 @@ TQString qWhereClause( TQSqlRecord* rec, const TQString& prefix, const TQString& } /*! - \class TQSqlCursor qsqlcursor.h + \class TQSqlCursor ntqsqlcursor.h \brief The TQSqlCursor class provides browsing and editing of SQL tables and views. diff --git a/src/sql/qsqldatabase.cpp b/src/sql/qsqldatabase.cpp index 6d01cf419..ebe65d1ba 100644 --- a/src/sql/qsqldatabase.cpp +++ b/src/sql/qsqldatabase.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include "qsqldatabase.h" +#include "ntqsqldatabase.h" #ifndef QT_NO_SQL @@ -72,16 +72,16 @@ #include "drivers/ibase/qsql_ibase.h" #endif -#include "qapplication.h" -#include "qsqlresult.h" -#include "qsqldriver.h" +#include "ntqapplication.h" +#include "ntqsqlresult.h" +#include "ntqsqldriver.h" #include "qsqldriverinterface_p.h" #include <private/qpluginmanager_p.h> #include <private/qsqlextension_p.h> -#include "qobject.h" -#include "qguardedptr.h" -#include "qcleanuphandler.h" -#include "qdict.h" +#include "ntqobject.h" +#include "ntqguardedptr.h" +#include "ntqcleanuphandler.h" +#include "ntqdict.h" #include <stdlib.h> QT_STATIC_CONST_IMPL char * const TQSqlDatabase::defaultConnection = "qt_sql_default_connection"; @@ -356,7 +356,7 @@ public: }; /*! - \class TQSqlDatabase qsqldatabase.h + \class TQSqlDatabase ntqsqldatabase.h \brief The TQSqlDatabase class is used to create SQL database connections and to provide transaction handling. diff --git a/src/sql/qsqldriver.cpp b/src/sql/qsqldriver.cpp index 6ecbdca88..3bce7ee43 100644 --- a/src/sql/qsqldriver.cpp +++ b/src/sql/qsqldriver.cpp @@ -38,11 +38,11 @@ ** **********************************************************************/ -#include "qsqldriver.h" +#include "ntqsqldriver.h" #ifndef QT_NO_SQL -#include "qdatetime.h" +#include "ntqdatetime.h" #include "qsqlextension_p.h" // database states @@ -54,7 +54,7 @@ TQPtrDict<TQSqlDriverExtension> *qSqlDriverExtDict(); TQPtrDict<TQSqlOpenExtension> *qSqlOpenExtDict(); /*! - \class TQSqlDriver qsqldriver.h + \class TQSqlDriver ntqsqldriver.h \brief The TQSqlDriver class is an abstract base class for accessing SQL databases. diff --git a/src/sql/qsqldriverplugin.cpp b/src/sql/qsqldriverplugin.cpp index fe294ba09..74487f5be 100644 --- a/src/sql/qsqldriverplugin.cpp +++ b/src/sql/qsqldriverplugin.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include "qsqldriverplugin.h" +#include "ntqsqldriverplugin.h" #ifndef QT_NO_SQL #ifndef QT_NO_COMPONENT @@ -46,7 +46,7 @@ #include "qsqldriverinterface_p.h" /*! - \class TQSqlDriverPlugin qsqldriverplugin.h + \class TQSqlDriverPlugin ntqsqldriverplugin.h \brief The TQSqlDriverPlugin class provides an abstract base for custom TQSqlDriver plugins. \ingroup plugins diff --git a/src/sql/qsqleditorfactory.cpp b/src/sql/qsqleditorfactory.cpp index 55a6d5a7e..c962e4ce8 100644 --- a/src/sql/qsqleditorfactory.cpp +++ b/src/sql/qsqleditorfactory.cpp @@ -38,20 +38,20 @@ ** **********************************************************************/ -#include "qsqleditorfactory.h" +#include "ntqsqleditorfactory.h" #ifndef QT_NO_SQL_EDIT_WIDGETS -#include "qsqlfield.h" -#include "qcleanuphandler.h" -#include "qlabel.h" -#include "qlineedit.h" -#include "qspinbox.h" -#include "qcombobox.h" -#include "qdatetimeedit.h" +#include "ntqsqlfield.h" +#include "ntqcleanuphandler.h" +#include "ntqlabel.h" +#include "ntqlineedit.h" +#include "ntqspinbox.h" +#include "ntqcombobox.h" +#include "ntqdatetimeedit.h" /*! - \class TQSqlEditorFactory qsqleditorfactory.h + \class TQSqlEditorFactory ntqsqleditorfactory.h \brief The TQSqlEditorFactory class is used to create the editors used by TQDataTable and TQSqlForm. diff --git a/src/sql/qsqlerror.cpp b/src/sql/qsqlerror.cpp index 1d3d1e7df..c837aecfc 100644 --- a/src/sql/qsqlerror.cpp +++ b/src/sql/qsqlerror.cpp @@ -38,13 +38,13 @@ ** **********************************************************************/ -#include "qsqlerror.h" -#include <qmessagebox.h> +#include "ntqsqlerror.h" +#include <ntqmessagebox.h> #ifndef QT_NO_SQL /*! - \class TQSqlError qsqlerror.h + \class TQSqlError ntqsqlerror.h \brief The TQSqlError class provides SQL database error information. \ingroup database diff --git a/src/sql/qsqlextension_p.h b/src/sql/qsqlextension_p.h index cd189d926..7e4237c6e 100644 --- a/src/sql/qsqlextension_p.h +++ b/src/sql/qsqlextension_p.h @@ -54,11 +54,11 @@ // #ifndef QT_H -#include "qmap.h" -#include "qvaluevector.h" -#include "qstring.h" -#include "qvariant.h" -#include "qsql.h" +#include "ntqmap.h" +#include "ntqvaluevector.h" +#include "ntqstring.h" +#include "ntqvariant.h" +#include "ntqsql.h" #endif // QT_H #ifndef QT_NO_SQL @@ -87,7 +87,7 @@ struct Holder { }; #define Q_DEFINED_QSQLEXTENSION -#include "qwinexport.h" +#include "ntqwinexport.h" class TQM_EXPORT_SQL TQSqlExtension { public: diff --git a/src/sql/qsqlfield.cpp b/src/sql/qsqlfield.cpp index 95c798676..ca7edc3d5 100644 --- a/src/sql/qsqlfield.cpp +++ b/src/sql/qsqlfield.cpp @@ -38,13 +38,13 @@ ** **********************************************************************/ -#include "qsqlfield.h" +#include "ntqsqlfield.h" #ifndef QT_NO_SQL /*! - \class TQSqlField qsqlfield.h + \class TQSqlField ntqsqlfield.h \brief The TQSqlField class manipulates the fields in SQL database tables and views. @@ -306,7 +306,7 @@ struct TQSqlFieldInfoPrivate }; /*! - \class TQSqlFieldInfo qsqlfield.h + \class TQSqlFieldInfo ntqsqlfield.h \brief The TQSqlFieldInfo class stores meta data associated with a SQL field. \ingroup database diff --git a/src/sql/qsqlform.cpp b/src/sql/qsqlform.cpp index 07d0ef4e3..a03a53d63 100644 --- a/src/sql/qsqlform.cpp +++ b/src/sql/qsqlform.cpp @@ -38,16 +38,16 @@ ** **********************************************************************/ -#include "qsqlform.h" +#include "ntqsqlform.h" #ifndef QT_NO_SQL_FORM -#include "qsqlfield.h" -#include "qsqlpropertymap.h" -#include "qsqlrecord.h" -#include "qstringlist.h" -#include "qwidget.h" -#include "qdict.h" +#include "ntqsqlfield.h" +#include "ntqsqlpropertymap.h" +#include "ntqsqlrecord.h" +#include "ntqstringlist.h" +#include "ntqwidget.h" +#include "ntqdict.h" class TQSqlFormPrivate { diff --git a/src/sql/qsqlindex.cpp b/src/sql/qsqlindex.cpp index 06f17eca8..d0df39788 100644 --- a/src/sql/qsqlindex.cpp +++ b/src/sql/qsqlindex.cpp @@ -38,14 +38,14 @@ ** **********************************************************************/ -#include "qsqlindex.h" +#include "ntqsqlindex.h" #ifndef QT_NO_SQL -#include "qsqlcursor.h" +#include "ntqsqlcursor.h" /*! - \class TQSqlIndex qsqlindex.h + \class TQSqlIndex ntqsqlindex.h \brief The TQSqlIndex class provides functions to manipulate and describe TQSqlCursor and TQSqlDatabase indexes. diff --git a/src/sql/qsqlmanager_p.cpp b/src/sql/qsqlmanager_p.cpp index 1ca0d5f30..0ed88cf8c 100644 --- a/src/sql/qsqlmanager_p.cpp +++ b/src/sql/qsqlmanager_p.cpp @@ -42,14 +42,14 @@ #ifndef QT_NO_SQL -#include "qapplication.h" -#include "qwidget.h" -#include "qsqlcursor.h" -#include "qsqlform.h" -#include "qsqldriver.h" -#include "qstring.h" -#include "qmessagebox.h" -#include "qbitarray.h" +#include "ntqapplication.h" +#include "ntqwidget.h" +#include "ntqsqlcursor.h" +#include "ntqsqlform.h" +#include "ntqsqldriver.h" +#include "ntqstring.h" +#include "ntqmessagebox.h" +#include "ntqbitarray.h" //#define QT_DEBUG_DATAMANAGER diff --git a/src/sql/qsqlmanager_p.h b/src/sql/qsqlmanager_p.h index fd442ead6..b36b4d1ed 100644 --- a/src/sql/qsqlmanager_p.h +++ b/src/sql/qsqlmanager_p.h @@ -54,13 +54,13 @@ // #ifndef QT_H -#include "qglobal.h" -#include "qstring.h" -#include "qstringlist.h" -#include "qsql.h" -#include "qsqlerror.h" -#include "qsqlindex.h" -#include "qsqlcursor.h" +#include "ntqglobal.h" +#include "ntqstring.h" +#include "ntqstringlist.h" +#include "ntqsql.h" +#include "ntqsqlerror.h" +#include "ntqsqlindex.h" +#include "ntqsqlcursor.h" #endif // QT_H #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/qsqlpropertymap.cpp b/src/sql/qsqlpropertymap.cpp index 98f3fd159..9d619a016 100644 --- a/src/sql/qsqlpropertymap.cpp +++ b/src/sql/qsqlpropertymap.cpp @@ -38,14 +38,14 @@ ** **********************************************************************/ -#include "qsqlpropertymap.h" +#include "ntqsqlpropertymap.h" #ifndef QT_NO_SQL_FORM -#include "qwidget.h" -#include "qcleanuphandler.h" -#include "qmetaobject.h" -#include "qmap.h" +#include "ntqwidget.h" +#include "ntqcleanuphandler.h" +#include "ntqmetaobject.h" +#include "ntqmap.h" class TQSqlPropertyMapPrivate { @@ -55,7 +55,7 @@ public: }; /*! - \class TQSqlPropertyMap qsqlpropertymap.h + \class TQSqlPropertyMap ntqsqlpropertymap.h \brief The TQSqlPropertyMap class is used to map widgets to SQL fields. \ingroup database diff --git a/src/sql/qsqlquery.cpp b/src/sql/qsqlquery.cpp index 98b481811..94325d507 100644 --- a/src/sql/qsqlquery.cpp +++ b/src/sql/qsqlquery.cpp @@ -38,17 +38,17 @@ ** **********************************************************************/ -#include "qsqlquery.h" +#include "ntqsqlquery.h" #ifndef QT_NO_SQL //#define QT_DEBUG_SQL -#include "qsqlresult.h" -#include "qsqldriver.h" -#include "qsqldatabase.h" -#include "qsql.h" -#include "qregexp.h" +#include "ntqsqlresult.h" +#include "ntqsqldriver.h" +#include "ntqsqldatabase.h" +#include "ntqsql.h" +#include "ntqregexp.h" #include "private/qsqlextension_p.h" @@ -81,7 +81,7 @@ void TQSqlResultShared::slotResultDestroyed() } /*! - \class TQSqlQuery qsqlquery.h + \class TQSqlQuery ntqsqlquery.h \brief The TQSqlQuery class provides a means of executing and manipulating SQL statements. diff --git a/src/sql/qsqlrecord.cpp b/src/sql/qsqlrecord.cpp index f8489b0e0..998ba0a71 100644 --- a/src/sql/qsqlrecord.cpp +++ b/src/sql/qsqlrecord.cpp @@ -38,14 +38,14 @@ ** **********************************************************************/ -#include "qsqlrecord.h" +#include "ntqsqlrecord.h" #ifndef QT_NO_SQL -#include "qregexp.h" -#include "qvaluevector.h" -#include "qshared.h" -#include "qnamespace.h" +#include "ntqregexp.h" +#include "ntqvaluevector.h" +#include "ntqshared.h" +#include "ntqnamespace.h" class TQSqlRecordPrivate { @@ -153,7 +153,7 @@ TQSqlRecordShared::~TQSqlRecordShared() } /*! - \class TQSqlRecord qsqlfield.h + \class TQSqlRecord ntqsqlfield.h \brief The TQSqlRecord class encapsulates a database record, i.e. a set of database fields. @@ -688,7 +688,7 @@ void TQSqlRecord::setValue( const TQString& name, const TQVariant& val ) /******************************************/ /*! - \class TQSqlRecordInfo qsqlrecord.h + \class TQSqlRecordInfo ntqsqlrecord.h \brief The TQSqlRecordInfo class encapsulates a set of database field meta data. \ingroup database diff --git a/src/sql/qsqlresult.cpp b/src/sql/qsqlresult.cpp index d0550f329..5afd6a08d 100644 --- a/src/sql/qsqlresult.cpp +++ b/src/sql/qsqlresult.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include "qsqlresult.h" +#include "ntqsqlresult.h" #include "private/qsqlextension_p.h" #ifndef QT_NO_SQL diff --git a/src/sql/qsqlselectcursor.cpp b/src/sql/qsqlselectcursor.cpp index f14d2d378..6919ae994 100644 --- a/src/sql/qsqlselectcursor.cpp +++ b/src/sql/qsqlselectcursor.cpp @@ -38,8 +38,8 @@ ** **********************************************************************/ -#include "qsqlselectcursor.h" -#include "qsqldriver.h" +#include "ntqsqlselectcursor.h" +#include "ntqsqldriver.h" #ifndef QT_NO_SQL @@ -52,7 +52,7 @@ public: }; /*! - \class TQSqlSelectCursor qsqlselectcursor.h + \class TQSqlSelectCursor ntqsqlselectcursor.h \brief The TQSqlSelectCursor class provides browsing of general SQL SELECT statements. diff --git a/src/sql/qt_sql.pri b/src/sql/qt_sql.pri index 5533c6fbe..6856b5730 100644 --- a/src/sql/qt_sql.pri +++ b/src/sql/qt_sql.pri @@ -8,28 +8,28 @@ sql { } SQL_P = sql - HEADERS += $$SQL_H/qsql.h \ - $$SQL_H/qsqlquery.h \ - $$SQL_H/qsqldatabase.h \ - $$SQL_H/qsqlfield.h \ - $$SQL_H/qsqlrecord.h \ - $$SQL_H/qsqlcursor.h \ - $$SQL_H/qsqlform.h \ - $$SQL_H/qeditorfactory.h \ - $$SQL_H/qsqleditorfactory.h \ - $$SQL_H/qsqldriver.h \ + HEADERS += $$SQL_H/ntqsql.h \ + $$SQL_H/ntqsqlquery.h \ + $$SQL_H/ntqsqldatabase.h \ + $$SQL_H/ntqsqlfield.h \ + $$SQL_H/ntqsqlrecord.h \ + $$SQL_H/ntqsqlcursor.h \ + $$SQL_H/ntqsqlform.h \ + $$SQL_H/ntqeditorfactory.h \ + $$SQL_H/ntqsqleditorfactory.h \ + $$SQL_H/ntqsqldriver.h \ $$SQL_P/qsqldriverinterface_p.h \ $$SQL_P/qsqlextension_p.h \ - $$SQL_H/qsqldriverplugin.h \ - $$SQL_H/qsqlerror.h \ - $$SQL_H/qsqlresult.h \ - $$SQL_H/qsqlindex.h \ - $$SQL_H/qsqlpropertymap.h \ + $$SQL_H/ntqsqldriverplugin.h \ + $$SQL_H/ntqsqlerror.h \ + $$SQL_H/ntqsqlresult.h \ + $$SQL_H/ntqsqlindex.h \ + $$SQL_H/ntqsqlpropertymap.h \ $$SQL_P/qsqlmanager_p.h \ - $$SQL_H/qdatatable.h \ - $$SQL_H/qdataview.h \ - $$SQL_H/qdatabrowser.h \ - $$SQL_H/qsqlselectcursor.h + $$SQL_H/ntqdatatable.h \ + $$SQL_H/ntqdataview.h \ + $$SQL_H/ntqdatabrowser.h \ + $$SQL_H/ntqsqlselectcursor.h SOURCES += $$SQL_CPP/qsqlquery.cpp \ $$SQL_CPP/qsqldatabase.cpp \ |