diff options
Diffstat (limited to 'src/sql')
44 files changed, 110 insertions, 110 deletions
diff --git a/src/sql/drivers/cache/qsqlcachedresult.cpp b/src/sql/drivers/cache/qsqlcachedresult.cpp index 4f60fa252..aa3a0ac14 100644 --- a/src/sql/drivers/cache/qsqlcachedresult.cpp +++ b/src/sql/drivers/cache/qsqlcachedresult.cpp @@ -40,7 +40,7 @@ #include "qsqlcachedresult.h" #include <ntqdatetime.h> -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL static const uint initial_cache_size = 128; class TQtSqlCachedResultPrivate @@ -256,4 +256,4 @@ int TQtSqlCachedResult::colCount() const { return d->colCount; } -#endif // QT_NO_SQL +#endif // TQT_NO_SQL diff --git a/src/sql/drivers/cache/qsqlcachedresult.h b/src/sql/drivers/cache/qsqlcachedresult.h index b00779dc0..46f8afae4 100644 --- a/src/sql/drivers/cache/qsqlcachedresult.h +++ b/src/sql/drivers/cache/qsqlcachedresult.h @@ -63,7 +63,7 @@ #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQtSqlCachedResultPrivate; diff --git a/src/sql/ntqdatabrowser.h b/src/sql/ntqdatabrowser.h index 54a1d9e8d..8c5cc7016 100644 --- a/src/sql/ntqdatabrowser.h +++ b/src/sql/ntqdatabrowser.h @@ -51,7 +51,7 @@ #include "ntqsqlerror.h" #endif // QT_H -#ifndef QT_NO_SQL_VIEW_WIDGETS +#ifndef TQT_NO_SQL_VIEW_WIDGETS class TQSqlForm; class TQDataBrowserPrivate; diff --git a/src/sql/ntqdatatable.h b/src/sql/ntqdatatable.h index 489661c87..d03f9f7b7 100644 --- a/src/sql/ntqdatatable.h +++ b/src/sql/ntqdatatable.h @@ -58,7 +58,7 @@ #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL_VIEW_WIDGETS +#ifndef TQT_NO_SQL_VIEW_WIDGETS class TQPainter; class TQSqlField; diff --git a/src/sql/ntqdataview.h b/src/sql/ntqdataview.h index ca1fed1b4..9d982e1e8 100644 --- a/src/sql/ntqdataview.h +++ b/src/sql/ntqdataview.h @@ -51,7 +51,7 @@ #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL_VIEW_WIDGETS +#ifndef TQT_NO_SQL_VIEW_WIDGETS class TQSqlForm; class TQSqlRecord; diff --git a/src/sql/ntqeditorfactory.h b/src/sql/ntqeditorfactory.h index 8818770c9..2a18b4b47 100644 --- a/src/sql/ntqeditorfactory.h +++ b/src/sql/ntqeditorfactory.h @@ -52,7 +52,7 @@ #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL_EDIT_WIDGETS +#ifndef TQT_NO_SQL_EDIT_WIDGETS class TQM_EXPORT_SQL TQEditorFactory : public TQObject { @@ -72,5 +72,5 @@ private: #endif }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif // TQEDITORFACTORY_H diff --git a/src/sql/ntqsql.h b/src/sql/ntqsql.h index 78030f790..f1c8b0883 100644 --- a/src/sql/ntqsql.h +++ b/src/sql/ntqsql.h @@ -51,7 +51,7 @@ #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQM_EXPORT_SQL TQSql { diff --git a/src/sql/ntqsqlcursor.h b/src/sql/ntqsqlcursor.h index f04f53d08..9541fe7b1 100644 --- a/src/sql/ntqsqlcursor.h +++ b/src/sql/ntqsqlcursor.h @@ -54,7 +54,7 @@ #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlDatabase; class TQSqlCursorPrivate; @@ -156,5 +156,5 @@ private: -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif diff --git a/src/sql/ntqsqldatabase.h b/src/sql/ntqsqldatabase.h index b44735e61..6017bfcfe 100644 --- a/src/sql/ntqsqldatabase.h +++ b/src/sql/ntqsqldatabase.h @@ -54,7 +54,7 @@ #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlError; class TQSqlDriver; @@ -155,5 +155,5 @@ private: }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif diff --git a/src/sql/ntqsqldriver.h b/src/sql/ntqsqldriver.h index 09c74b249..5e5c625ed 100644 --- a/src/sql/ntqsqldriver.h +++ b/src/sql/ntqsqldriver.h @@ -59,7 +59,7 @@ #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlDriverExtension; @@ -122,5 +122,5 @@ private: #endif }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif diff --git a/src/sql/ntqsqldriverplugin.h b/src/sql/ntqsqldriverplugin.h index 1b4514772..8a6d3944a 100644 --- a/src/sql/ntqsqldriverplugin.h +++ b/src/sql/ntqsqldriverplugin.h @@ -46,8 +46,8 @@ #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_SQL -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_SQL +#ifndef TQT_NO_COMPONENT class TQSqlDriver; class TQSqlDriverPluginPrivate; @@ -66,7 +66,7 @@ private: TQSqlDriverPluginPrivate *d; }; -#endif // QT_NO_COMPONENT -#endif // QT_NO_SQL +#endif // TQT_NO_COMPONENT +#endif // TQT_NO_SQL #endif // TQSQLDRIVERPLUGIN_H diff --git a/src/sql/ntqsqleditorfactory.h b/src/sql/ntqsqleditorfactory.h index 0fb30ff2d..eb100952c 100644 --- a/src/sql/ntqsqleditorfactory.h +++ b/src/sql/ntqsqleditorfactory.h @@ -51,7 +51,7 @@ #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL_EDIT_WIDGETS +#ifndef TQT_NO_SQL_EDIT_WIDGETS class TQSqlField; @@ -73,5 +73,5 @@ private: #endif }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif // TQSQLEDITORFACTORY_H diff --git a/src/sql/ntqsqlerror.h b/src/sql/ntqsqlerror.h index ca4c6cae6..7fb816614 100644 --- a/src/sql/ntqsqlerror.h +++ b/src/sql/ntqsqlerror.h @@ -51,7 +51,7 @@ #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQM_EXPORT_SQL TQSqlError { @@ -89,5 +89,5 @@ private: int errorNumber; }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif diff --git a/src/sql/ntqsqlfield.h b/src/sql/ntqsqlfield.h index bec5edd27..f917b6e92 100644 --- a/src/sql/ntqsqlfield.h +++ b/src/sql/ntqsqlfield.h @@ -52,7 +52,7 @@ #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlFieldPrivate { @@ -150,5 +150,5 @@ private: }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif diff --git a/src/sql/ntqsqlform.h b/src/sql/ntqsqlform.h index 2c050c96c..c39382449 100644 --- a/src/sql/ntqsqlform.h +++ b/src/sql/ntqsqlform.h @@ -52,7 +52,7 @@ #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL_FORM +#ifndef TQT_NO_SQL_FORM class TQSqlField; class TQSqlRecord; @@ -104,5 +104,5 @@ private: #endif }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif // TQSQLFORM_H diff --git a/src/sql/ntqsqlindex.h b/src/sql/ntqsqlindex.h index 1b88cb9d2..b387ea7da 100644 --- a/src/sql/ntqsqlindex.h +++ b/src/sql/ntqsqlindex.h @@ -56,7 +56,7 @@ #define TQM_TEMPLATE_EXTERN_SQL Q_TEMPLATE_EXTERN #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlCursor; @@ -95,5 +95,5 @@ private: #define Q_DEFINED_QSQLINDEX #include "ntqwinexport.h" -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif diff --git a/src/sql/ntqsqlpropertymap.h b/src/sql/ntqsqlpropertymap.h index 93c30cb5c..893e8b6ab 100644 --- a/src/sql/ntqsqlpropertymap.h +++ b/src/sql/ntqsqlpropertymap.h @@ -46,7 +46,7 @@ #include "ntqstring.h" #endif // QT_H -#ifndef QT_NO_SQL_FORM +#ifndef TQT_NO_SQL_FORM class TQWidget; class TQSqlPropertyMapPrivate; @@ -74,5 +74,5 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_SQL_FORM +#endif // TQT_NO_SQL_FORM #endif // TQSQLPROPERTYMAP_H diff --git a/src/sql/ntqsqlquery.h b/src/sql/ntqsqlquery.h index 718886c26..80776251b 100644 --- a/src/sql/ntqsqlquery.h +++ b/src/sql/ntqsqlquery.h @@ -51,7 +51,7 @@ #include "ntqsql.h" #endif // QT_H -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlDriver; class TQSqlResult; @@ -129,5 +129,5 @@ private: }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif diff --git a/src/sql/ntqsqlrecord.h b/src/sql/ntqsqlrecord.h index 1dcd888eb..bf3ebfc4f 100644 --- a/src/sql/ntqsqlrecord.h +++ b/src/sql/ntqsqlrecord.h @@ -48,7 +48,7 @@ #include "ntqsqlfield.h" #endif // QT_H -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlRecordPrivate; @@ -137,5 +137,5 @@ public: }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif diff --git a/src/sql/ntqsqlresult.h b/src/sql/ntqsqlresult.h index 410d6f0d6..4e0255a8f 100644 --- a/src/sql/ntqsqlresult.h +++ b/src/sql/ntqsqlresult.h @@ -55,7 +55,7 @@ #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlDriver; class TQSql; @@ -111,5 +111,5 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif diff --git a/src/sql/ntqsqlselectcursor.h b/src/sql/ntqsqlselectcursor.h index f3065634b..7168dbefd 100644 --- a/src/sql/ntqsqlselectcursor.h +++ b/src/sql/ntqsqlselectcursor.h @@ -51,7 +51,7 @@ #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlSelectCursorPrivate; @@ -100,5 +100,5 @@ private: TQSqlSelectCursorPrivate * d; }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif // TQSQLSELECTCURSOR_H diff --git a/src/sql/qdatabrowser.cpp b/src/sql/qdatabrowser.cpp index 79ac4ab0b..1b722822c 100644 --- a/src/sql/qdatabrowser.cpp +++ b/src/sql/qdatabrowser.cpp @@ -40,7 +40,7 @@ #include "ntqdatabrowser.h" -#ifndef QT_NO_SQL_VIEW_WIDGETS +#ifndef TQT_NO_SQL_VIEW_WIDGETS #include "ntqsqlform.h" #include "qsqlmanager_p.h" diff --git a/src/sql/qdatatable.cpp b/src/sql/qdatatable.cpp index 3a901a86e..6df0cce08 100644 --- a/src/sql/qdatatable.cpp +++ b/src/sql/qdatatable.cpp @@ -40,7 +40,7 @@ #include "ntqdatatable.h" -#ifndef QT_NO_SQL_VIEW_WIDGETS +#ifndef TQT_NO_SQL_VIEW_WIDGETS #include "ntqsqldriver.h" #include "ntqsqleditorfactory.h" @@ -722,7 +722,7 @@ bool TQDataTable::eventFilter( TQObject *o, TQEvent *e ) if ( sql && sql->driver() && !sql->driver()->hasFeature( TQSqlDriver::QuerySize ) && ke->key() == Key_End && d->dat.mode() == TQSql::None ) { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQApplication::setOverrideCursor( TQt::WaitCursor ); #endif int i = sql->at(); @@ -734,7 +734,7 @@ bool TQDataTable::eventFilter( TQObject *o, TQEvent *e ) i++; setNumRows( i+1 ); setCurrentCell( i+1, currentColumn() ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQApplication::restoreOverrideCursor(); #endif return TRUE; @@ -1059,12 +1059,12 @@ bool TQDataTable::insertCurrent() conf = confirmEdit( TQSql::Insert ); switch ( conf ) { case TQSql::Yes: { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQApplication::setOverrideCursor( TQt::waitCursor ); #endif emit beforeInsert( d->editBuffer ); b = sqlCursor()->insert(); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQApplication::restoreOverrideCursor(); #endif if ( ( !b && !sqlCursor()->isActive() ) || !sqlCursor()->isActive() ) { @@ -1141,12 +1141,12 @@ bool TQDataTable::updateCurrent() conf = confirmEdit( TQSql::Update ); switch ( conf ) { case TQSql::Yes: { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQApplication::setOverrideCursor( TQt::waitCursor ); #endif emit beforeUpdate( d->editBuffer ); b = sqlCursor()->update(); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQApplication::restoreOverrideCursor(); #endif if ( ( !b && !sqlCursor()->isActive() ) || !sqlCursor()->isActive() ) { @@ -1215,14 +1215,14 @@ bool TQDataTable::deleteCurrent() return FALSE; switch ( conf ) { case TQSql::Yes:{ -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQApplication::setOverrideCursor( TQt::waitCursor ); #endif sqlCursor()->primeDelete(); emit primeDelete( sqlCursor()->editBuffer() ); emit beforeDelete( sqlCursor()->editBuffer() ); b = sqlCursor()->del(); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQApplication::restoreOverrideCursor(); #endif if ( !b ) @@ -1300,7 +1300,7 @@ void TQDataTable::find( const TQString & str, bool caseSensitive, bool backwards else tmp = str; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQApplication::setOverrideCursor( TQt::waitCursor ); #endif while( wrap ){ @@ -1344,7 +1344,7 @@ void TQDataTable::find( const TQString & str, bool caseSensitive, bool backwards row = numRows() - 1; } } -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQApplication::restoreOverrideCursor(); #endif } diff --git a/src/sql/qdataview.cpp b/src/sql/qdataview.cpp index 32d437ba2..177aa6419 100644 --- a/src/sql/qdataview.cpp +++ b/src/sql/qdataview.cpp @@ -40,7 +40,7 @@ #include "ntqdataview.h" -#ifndef QT_NO_SQL_VIEW_WIDGETS +#ifndef TQT_NO_SQL_VIEW_WIDGETS #include "qsqlmanager_p.h" diff --git a/src/sql/qeditorfactory.cpp b/src/sql/qeditorfactory.cpp index 660434cf8..bc9d2605a 100644 --- a/src/sql/qeditorfactory.cpp +++ b/src/sql/qeditorfactory.cpp @@ -47,7 +47,7 @@ #include "ntqeditorfactory.h" #include "ntqdatetimeedit.h" -#ifndef QT_NO_SQL_EDIT_WIDGETS +#ifndef TQT_NO_SQL_EDIT_WIDGETS /*! \class TQEditorFactory ntqeditorfactory.h @@ -161,7 +161,7 @@ TQWidget * TQEditorFactory::createEditor( TQWidget * parent, const TQVariant & v case TQVariant::DateTime: w = new TQDateTimeEdit( parent, "qt_editor_datetime" ); break; -#ifndef QT_NO_LABEL +#ifndef TQT_NO_LABEL case TQVariant::Pixmap: w = new TQLabel( parent, "qt_editor_pixmap" ); break; @@ -189,4 +189,4 @@ TQWidget * TQEditorFactory::createEditor( TQWidget * parent, const TQVariant & v } return w; } -#endif // QT_NO_SQL +#endif // TQT_NO_SQL diff --git a/src/sql/qsqlcursor.cpp b/src/sql/qsqlcursor.cpp index 3e4624803..ed1613d57 100644 --- a/src/sql/qsqlcursor.cpp +++ b/src/sql/qsqlcursor.cpp @@ -40,7 +40,7 @@ #include "ntqsqlcursor.h" -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL #include "ntqsqldriver.h" #include "ntqsqlresult.h" diff --git a/src/sql/qsqldatabase.cpp b/src/sql/qsqldatabase.cpp index cc38f86fc..0dddb3b17 100644 --- a/src/sql/qsqldatabase.cpp +++ b/src/sql/qsqldatabase.cpp @@ -40,7 +40,7 @@ #include "ntqsqldatabase.h" -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL #ifdef Q_OS_WIN32 // Conflicting declarations of LPCBYTE in sqlfront.h and winscard.h @@ -345,7 +345,7 @@ class TQSqlDatabasePrivate public: TQSqlDatabasePrivate(): driver(0), -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT plugIns(0), #endif port(-1) {} @@ -353,7 +353,7 @@ public: { } TQSqlDriver* driver; -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT TQPluginManager<TQSqlDriverFactoryInterface> *plugIns; #endif TQString dbname; @@ -486,7 +486,7 @@ TQStringList TQSqlDatabase::drivers() { TQStringList l; -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT TQPluginManager<TQSqlDriverFactoryInterface> *plugIns; plugIns = new TQPluginManager<TQSqlDriverFactoryInterface>( IID_QSqlDriverFactory, TQApplication::libraryPaths(), "/sqldrivers" ); @@ -695,7 +695,7 @@ void TQSqlDatabase::init( const TQString& type, const TQString& ) } } -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT if ( !d->driver ) { d->plugIns = new TQPluginManager<TQSqlDriverFactoryInterface>( IID_QSqlDriverFactory, TQApplication::libraryPaths(), "/sqldrivers" ); @@ -724,7 +724,7 @@ void TQSqlDatabase::init( const TQString& type, const TQString& ) TQSqlDatabase::~TQSqlDatabase() { delete d->driver; -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT delete d->plugIns; #endif delete d; @@ -1357,4 +1357,4 @@ TQSqlDatabase* TQSqlDatabase::addDatabase( TQSqlDriver* driver, const TQString& { return TQSqlDatabaseManager::addDatabase( new TQSqlDatabase( driver ), connectionName ); } -#endif // QT_NO_SQL +#endif // TQT_NO_SQL diff --git a/src/sql/qsqldriver.cpp b/src/sql/qsqldriver.cpp index f4798c9af..b00f76c7b 100644 --- a/src/sql/qsqldriver.cpp +++ b/src/sql/qsqldriver.cpp @@ -40,7 +40,7 @@ #include "ntqsqldriver.h" -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL #include "ntqdatetime.h" #include "qsqlextension_p.h" @@ -506,4 +506,4 @@ bool TQSqlDriver::open( const TQString& db, return open( db, user, password, host, port ); } -#endif // QT_NO_SQL +#endif // TQT_NO_SQL diff --git a/src/sql/qsqldriverinterface_p.h b/src/sql/qsqldriverinterface_p.h index 0944153b2..7f0678288 100644 --- a/src/sql/qsqldriverinterface_p.h +++ b/src/sql/qsqldriverinterface_p.h @@ -63,9 +63,9 @@ #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT // {EDDD5AD5-DF3C-400c-A711-163B72FE5F61} #ifndef IID_QSqlDriverFactory @@ -79,7 +79,7 @@ struct TQM_EXPORT_SQL TQSqlDriverFactoryInterface : public TQFeatureListInterfac virtual TQSqlDriver* create( const TQString& name ) = 0; }; -#endif //QT_NO_COMPONENT -#endif // QT_NO_SQL +#endif //TQT_NO_COMPONENT +#endif // TQT_NO_SQL #endif // TQSQLDRIVERINTERFACE_P_H diff --git a/src/sql/qsqldriverplugin.cpp b/src/sql/qsqldriverplugin.cpp index 74487f5be..54a48af14 100644 --- a/src/sql/qsqldriverplugin.cpp +++ b/src/sql/qsqldriverplugin.cpp @@ -40,8 +40,8 @@ #include "ntqsqldriverplugin.h" -#ifndef QT_NO_SQL -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_SQL +#ifndef TQT_NO_COMPONENT #include "qsqldriverinterface_p.h" @@ -157,5 +157,5 @@ TQSqlDriverPlugin::~TQSqlDriverPlugin() // don't delete d, as this is deleted by d } -#endif // QT_NO_COMPONENT -#endif // QT_NO_SQL +#endif // TQT_NO_COMPONENT +#endif // TQT_NO_SQL diff --git a/src/sql/qsqleditorfactory.cpp b/src/sql/qsqleditorfactory.cpp index c962e4ce8..b831cae50 100644 --- a/src/sql/qsqleditorfactory.cpp +++ b/src/sql/qsqleditorfactory.cpp @@ -40,7 +40,7 @@ #include "ntqsqleditorfactory.h" -#ifndef QT_NO_SQL_EDIT_WIDGETS +#ifndef TQT_NO_SQL_EDIT_WIDGETS #include "ntqsqlfield.h" #include "ntqcleanuphandler.h" @@ -189,7 +189,7 @@ TQWidget * TQSqlEditorFactory::createEditor( TQWidget * parent, case TQVariant::DateTime: w = new TQDateTimeEdit( parent, "qt_editor_datetime" ); break; -#ifndef QT_NO_LABEL +#ifndef TQT_NO_LABEL case TQVariant::Pixmap: w = new TQLabel( parent, "qt_editor_pixmap" ); break; @@ -218,4 +218,4 @@ TQWidget * TQSqlEditorFactory::createEditor( TQWidget * parent, return w; } -#endif // QT_NO_SQL +#endif // TQT_NO_SQL diff --git a/src/sql/qsqlerror.cpp b/src/sql/qsqlerror.cpp index c837aecfc..5ae1be7bc 100644 --- a/src/sql/qsqlerror.cpp +++ b/src/sql/qsqlerror.cpp @@ -41,7 +41,7 @@ #include "ntqsqlerror.h" #include <ntqmessagebox.h> -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL /*! \class TQSqlError ntqsqlerror.h @@ -220,9 +220,9 @@ TQString TQSqlError::text() const */ void TQSqlError::showMessage( const TQString& msg ) const { -#ifndef QT_NO_MESSAGEBOX +#ifndef TQT_NO_MESSAGEBOX TQMessageBox::warning( NULL, "SQL Error", msg + text(), TQMessageBox::Ok, TQMessageBox::NoButton ); -#endif // QT_NO_MESSAGEBOX +#endif // TQT_NO_MESSAGEBOX } -#endif // QT_NO_SQL +#endif // TQT_NO_SQL diff --git a/src/sql/qsqlextension_p.cpp b/src/sql/qsqlextension_p.cpp index 71508753f..0a032055c 100644 --- a/src/sql/qsqlextension_p.cpp +++ b/src/sql/qsqlextension_p.cpp @@ -40,7 +40,7 @@ #include "qsqlextension_p.h" -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL TQSqlExtension::TQSqlExtension() : bindm( BindByPosition ), bindCount( 0 ) { diff --git a/src/sql/qsqlextension_p.h b/src/sql/qsqlextension_p.h index e87d5e547..5ca2232d5 100644 --- a/src/sql/qsqlextension_p.h +++ b/src/sql/qsqlextension_p.h @@ -61,7 +61,7 @@ #include "ntqsql.h" #endif // QT_H -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL diff --git a/src/sql/qsqlfield.cpp b/src/sql/qsqlfield.cpp index 0dec46790..17d2f7608 100644 --- a/src/sql/qsqlfield.cpp +++ b/src/sql/qsqlfield.cpp @@ -40,7 +40,7 @@ #include "ntqsqlfield.h" -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL /*! diff --git a/src/sql/qsqlform.cpp b/src/sql/qsqlform.cpp index a03a53d63..7ebb79f28 100644 --- a/src/sql/qsqlform.cpp +++ b/src/sql/qsqlform.cpp @@ -40,7 +40,7 @@ #include "ntqsqlform.h" -#ifndef QT_NO_SQL_FORM +#ifndef TQT_NO_SQL_FORM #include "ntqsqlfield.h" #include "ntqsqlpropertymap.h" @@ -400,4 +400,4 @@ void TQSqlForm::clearMap() d->map.clear(); } -#endif // QT_NO_SQL +#endif // TQT_NO_SQL diff --git a/src/sql/qsqlindex.cpp b/src/sql/qsqlindex.cpp index 6f69ae27d..c916f82f6 100644 --- a/src/sql/qsqlindex.cpp +++ b/src/sql/qsqlindex.cpp @@ -40,7 +40,7 @@ #include "ntqsqlindex.h" -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL #include "ntqsqlcursor.h" diff --git a/src/sql/qsqlmanager_p.cpp b/src/sql/qsqlmanager_p.cpp index 563406772..3cf91b802 100644 --- a/src/sql/qsqlmanager_p.cpp +++ b/src/sql/qsqlmanager_p.cpp @@ -40,7 +40,7 @@ #include "qsqlmanager_p.h" -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL #include "ntqapplication.h" #include "ntqwidget.h" @@ -444,7 +444,7 @@ bool TQSqlCursorManager::findBuffer( const TQSqlIndex& idx, int atHint ) #ifdef QT_DEBUG_DATAMANAGER tqDebug(" Using brute search..."); #endif -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQApplication::setOverrideCursor( TQt::waitCursor ); #endif /* give up, use brute force */ @@ -460,7 +460,7 @@ bool TQSqlCursorManager::findBuffer( const TQSqlIndex& idx, int atHint ) if ( !cur->next() ) break; } -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQApplication::restoreOverrideCursor(); #endif } @@ -470,7 +470,7 @@ bool TQSqlCursorManager::findBuffer( const TQSqlIndex& idx, int atHint ) return indexEquals; } -#ifndef QT_NO_SQL_FORM +#ifndef TQT_NO_SQL_FORM class TQSqlFormManagerPrivate { @@ -614,7 +614,7 @@ void TQSqlFormManager::writeFields() } } -#endif // QT_NO_SQL_FORM +#endif // TQT_NO_SQL_FORM class TQDataManagerPrivate { @@ -677,14 +677,14 @@ TQDataManager::~TQDataManager() */ void TQDataManager::handleError( TQWidget* parent, const TQSqlError& e ) { -#ifndef QT_NO_MESSAGEBOX +#ifndef TQT_NO_MESSAGEBOX if (e.driverText().isEmpty() && e.databaseText().isEmpty()) { TQMessageBox::warning ( parent, "Warning", "An error occurred while accessing the database"); } else { TQMessageBox::warning ( parent, "Warning", e.driverText() + "\n" + e.databaseText(), 0, 0 ); } -#endif // QT_NO_MESSAGEBOX +#endif // TQT_NO_MESSAGEBOX } @@ -867,7 +867,7 @@ TQSql::Confirm TQDataManager::confirmEdit( TQWidget* parent, TQSql::Op m ) { int ans = 2; if ( m == TQSql::Delete ) { -#ifndef QT_NO_MESSAGEBOX +#ifndef TQT_NO_MESSAGEBOX ans = TQMessageBox::information( parent, tqApp->translate( "TQSql", "Delete" ), tqApp->translate( "TQSql", "Delete this record?" ), @@ -876,7 +876,7 @@ TQSql::Confirm TQDataManager::confirmEdit( TQWidget* parent, TQSql::Op m ) TQString::null, 0, 1 ); #else ans = TQSql::No; -#endif // QT_NO_MESSAGEBOX +#endif // TQT_NO_MESSAGEBOX } else if ( m != TQSql::None ) { TQString caption; if ( m == TQSql::Insert ) { @@ -884,7 +884,7 @@ TQSql::Confirm TQDataManager::confirmEdit( TQWidget* parent, TQSql::Op m ) } else { // TQSql::Update caption = tqApp->translate( "TQSql", "Update" ); } -#ifndef QT_NO_MESSAGEBOX +#ifndef TQT_NO_MESSAGEBOX ans = TQMessageBox::information( parent, caption, tqApp->translate( "TQSql", "Save edits?" ), tqApp->translate( "TQSql", "Yes" ), @@ -893,7 +893,7 @@ TQSql::Confirm TQDataManager::confirmEdit( TQWidget* parent, TQSql::Op m ) 0, 2 ); #else ans = TQSql::No; -#endif // QT_NO_MESSAGEBOX +#endif // TQT_NO_MESSAGEBOX } switch ( ans ) { @@ -919,7 +919,7 @@ TQSql::Confirm TQDataManager::confirmEdit( TQWidget* parent, TQSql::Op m ) TQSql::Confirm TQDataManager::confirmCancel( TQWidget* parent, TQSql::Op ) { -#ifndef QT_NO_MESSAGEBOX +#ifndef TQT_NO_MESSAGEBOX switch ( TQMessageBox::information( parent, tqApp->translate( "TQSql", "Confirm" ), tqApp->translate( "TQSql", "Cancel your edits?" ), @@ -935,7 +935,7 @@ TQSql::Confirm TQDataManager::confirmCancel( TQWidget* parent, TQSql::Op ) } #else return TQSql::Yes; -#endif // QT_NO_MESSAGEBOX +#endif // TQT_NO_MESSAGEBOX } #endif diff --git a/src/sql/qsqlmanager_p.h b/src/sql/qsqlmanager_p.h index 0fb203320..d9ef527e5 100644 --- a/src/sql/qsqlmanager_p.h +++ b/src/sql/qsqlmanager_p.h @@ -69,7 +69,7 @@ #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlCursor; class TQSqlForm; @@ -99,7 +99,7 @@ private: TQSqlCursorManagerPrivate* d; }; -#ifndef QT_NO_SQL_FORM +#ifndef TQT_NO_SQL_FORM class TQSqlFormManagerPrivate; diff --git a/src/sql/qsqlpropertymap.cpp b/src/sql/qsqlpropertymap.cpp index a83f01862..c50368190 100644 --- a/src/sql/qsqlpropertymap.cpp +++ b/src/sql/qsqlpropertymap.cpp @@ -40,7 +40,7 @@ #include "ntqsqlpropertymap.h" -#ifndef QT_NO_SQL_FORM +#ifndef TQT_NO_SQL_FORM #include "ntqwidget.h" #include "ntqcleanuphandler.h" @@ -301,4 +301,4 @@ void TQSqlPropertyMap::installDefaultMap( TQSqlPropertyMap * map ) qsql_cleanup_property_map.add( &defaultmap ); } -#endif // QT_NO_SQL_FORM +#endif // TQT_NO_SQL_FORM diff --git a/src/sql/qsqlquery.cpp b/src/sql/qsqlquery.cpp index ac4631b1a..829e46947 100644 --- a/src/sql/qsqlquery.cpp +++ b/src/sql/qsqlquery.cpp @@ -40,7 +40,7 @@ #include "ntqsqlquery.h" -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL //#define QT_DEBUG_SQL @@ -1212,4 +1212,4 @@ TQString TQSqlQuery::executedQuery() const { return d->executedQuery; } -#endif // QT_NO_SQL +#endif // TQT_NO_SQL diff --git a/src/sql/qsqlrecord.cpp b/src/sql/qsqlrecord.cpp index b1e0aa8e3..d106f98c8 100644 --- a/src/sql/qsqlrecord.cpp +++ b/src/sql/qsqlrecord.cpp @@ -40,7 +40,7 @@ #include "ntqsqlrecord.h" -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL #include "ntqregexp.h" #include "ntqvaluevector.h" diff --git a/src/sql/qsqlresult.cpp b/src/sql/qsqlresult.cpp index 5afd6a08d..d005803cf 100644 --- a/src/sql/qsqlresult.cpp +++ b/src/sql/qsqlresult.cpp @@ -41,7 +41,7 @@ #include "ntqsqlresult.h" #include "private/qsqlextension_p.h" -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlResultPrivate { @@ -365,4 +365,4 @@ TQSqlExtension * TQSqlResult::extension() { return d->ext; } -#endif // QT_NO_SQL +#endif // TQT_NO_SQL diff --git a/src/sql/qsqlselectcursor.cpp b/src/sql/qsqlselectcursor.cpp index 6919ae994..23f65c91d 100644 --- a/src/sql/qsqlselectcursor.cpp +++ b/src/sql/qsqlselectcursor.cpp @@ -41,7 +41,7 @@ #include "ntqsqlselectcursor.h" #include "ntqsqldriver.h" -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlSelectCursorPrivate { @@ -246,4 +246,4 @@ void TQSqlSelectCursor::populateCursor() /*! \fn TQString TQSqlSelectCursor::toString( const TQString&, const TQString& ) const \reimp */ -#endif // QT_NO_SQL +#endif // TQT_NO_SQL |