From d296f1d337dabfeae5191955fdadb874965dbbe9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 10 Aug 2011 12:13:27 -0500 Subject: rename the following methods: tqparent parent tqmask mask --- .../qt4/src/sql/drivers/ibase/tqsql_ibase.cpp | 8 +++--- .../qt4/src/sql/drivers/ibase/tqsql_ibase.h | 4 +-- .../qt4/src/sql/drivers/mysql/tqsql_mysql.cpp | 8 +++--- .../qt4/src/sql/drivers/mysql/tqsql_mysql.h | 4 +-- .../qt4/src/sql/drivers/odbc/tqsql_odbc.cpp | 8 +++--- tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.h | 4 +-- .../qt4/src/sql/drivers/psql/tqsql_psql.cpp | 8 +++--- tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.h | 4 +-- .../qt4/src/sql/drivers/sqlite/tqsql_sqlite.cpp | 8 +++--- .../qt4/src/sql/drivers/sqlite/tqsql_sqlite.h | 4 +-- tqtinterface/qt4/src/sql/tqdatabrowser.cpp | 6 ++-- tqtinterface/qt4/src/sql/tqdatabrowser.h | 2 +- tqtinterface/qt4/src/sql/tqdatatable.cpp | 12 ++++---- tqtinterface/qt4/src/sql/tqdatatable.h | 4 +-- tqtinterface/qt4/src/sql/tqdataview.cpp | 6 ++-- tqtinterface/qt4/src/sql/tqdataview.h | 2 +- tqtinterface/qt4/src/sql/tqeditorfactory.cpp | 28 +++++++++---------- tqtinterface/qt4/src/sql/tqeditorfactory.h | 4 +-- tqtinterface/qt4/src/sql/tqsqldatabase.cpp | 18 ++++++------ tqtinterface/qt4/src/sql/tqsqldatabase.h | 4 +-- tqtinterface/qt4/src/sql/tqsqldriver.cpp | 6 ++-- tqtinterface/qt4/src/sql/tqsqldriver.h | 2 +- tqtinterface/qt4/src/sql/tqsqleditorfactory.cpp | 32 +++++++++++----------- tqtinterface/qt4/src/sql/tqsqleditorfactory.h | 6 ++-- tqtinterface/qt4/src/sql/tqsqlform.cpp | 6 ++-- tqtinterface/qt4/src/sql/tqsqlform.h | 2 +- tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp | 20 +++++++------- tqtinterface/qt4/src/sql/tqsqlmanager_p.h | 6 ++-- 28 files changed, 113 insertions(+), 113 deletions(-) (limited to 'tqtinterface/qt4/src/sql') diff --git a/tqtinterface/qt4/src/sql/drivers/ibase/tqsql_ibase.cpp b/tqtinterface/qt4/src/sql/drivers/ibase/tqsql_ibase.cpp index ddc103a..735363c 100644 --- a/tqtinterface/qt4/src/sql/drivers/ibase/tqsql_ibase.cpp +++ b/tqtinterface/qt4/src/sql/drivers/ibase/tqsql_ibase.cpp @@ -757,14 +757,14 @@ int TQIBaseResult::numRowsAffected() /*********************************/ -TQIBaseDriver::TQIBaseDriver(TQObject * tqparent, const char * name) - : TQSqlDriver(tqparent, name ? name : TQIBASE_DRIVER_NAME) +TQIBaseDriver::TQIBaseDriver(TQObject * parent, const char * name) + : TQSqlDriver(parent, name ? name : TQIBASE_DRIVER_NAME) { d = new TQIBaseDriverPrivate(this); } -TQIBaseDriver::TQIBaseDriver(void *connection, TQObject *tqparent, const char *name) - : TQSqlDriver(tqparent, name ? name : TQIBASE_DRIVER_NAME) +TQIBaseDriver::TQIBaseDriver(void *connection, TQObject *parent, const char *name) + : TQSqlDriver(parent, name ? name : TQIBASE_DRIVER_NAME) { d = new TQIBaseDriverPrivate(this); d->ibase = (isc_db_handle)(long int)connection; diff --git a/tqtinterface/qt4/src/sql/drivers/ibase/tqsql_ibase.h b/tqtinterface/qt4/src/sql/drivers/ibase/tqsql_ibase.h index be5bfd5..e720c1c 100644 --- a/tqtinterface/qt4/src/sql/drivers/ibase/tqsql_ibase.h +++ b/tqtinterface/qt4/src/sql/drivers/ibase/tqsql_ibase.h @@ -78,8 +78,8 @@ class TQIBaseDriver : public TQSqlDriver friend class TQIBaseResultPrivate; friend class TQIBaseResult; public: - TQIBaseDriver(TQObject *tqparent = 0, const char *name = 0); - TQIBaseDriver(void *connection, TQObject *tqparent = 0, const char *name = 0); + TQIBaseDriver(TQObject *parent = 0, const char *name = 0); + TQIBaseDriver(void *connection, TQObject *parent = 0, const char *name = 0); virtual ~TQIBaseDriver(); bool hasFeature(DriverFeature f) const; bool open(const TQString & db, diff --git a/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.cpp b/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.cpp index e13f12b..98cccb2 100644 --- a/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.cpp +++ b/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.cpp @@ -376,8 +376,8 @@ static void qServerInit() #endif // TQ_NO_MYSTQL_EMBEDDED } -TQMYSTQLDriver::TQMYSTQLDriver( TQObject * tqparent, const char * name ) - : TQSqlDriver( tqparent, name ? name : TQMYSTQL_DRIVER_NAME ) +TQMYSTQLDriver::TQMYSTQLDriver( TQObject * parent, const char * name ) + : TQSqlDriver( parent, name ? name : TQMYSTQL_DRIVER_NAME ) { init(); qServerInit(); @@ -387,8 +387,8 @@ TQMYSTQLDriver::TQMYSTQLDriver( TQObject * tqparent, const char * name ) Create a driver instance with an already open connection handle. */ -TQMYSTQLDriver::TQMYSTQLDriver( MYSQL * con, TQObject * tqparent, const char * name ) - : TQSqlDriver( tqparent, name ? name : TQMYSTQL_DRIVER_NAME ) +TQMYSTQLDriver::TQMYSTQLDriver( MYSQL * con, TQObject * parent, const char * name ) + : TQSqlDriver( parent, name ? name : TQMYSTQL_DRIVER_NAME ) { init(); if ( con ) { diff --git a/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.h b/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.h index ef4f4ce..385d900 100644 --- a/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.h +++ b/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.h @@ -90,8 +90,8 @@ class TQ_EXPORT_STQLDRIVER_MYSQL TQMYSTQLDriver : public TQSqlDriver { friend class TQMYSTQLResult; public: - TQMYSTQLDriver( TQObject * tqparent=0, const char * name=0 ); - TQMYSTQLDriver( MYSQL * con, TQObject * tqparent=0, const char * name=0 ); + TQMYSTQLDriver( TQObject * parent=0, const char * name=0 ); + TQMYSTQLDriver( MYSQL * con, TQObject * parent=0, const char * name=0 ); ~TQMYSTQLDriver(); bool hasFeature( DriverFeature f ) const; bool open( const TQString & db, diff --git a/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.cpp b/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.cpp index 3401435..8e75f90 100644 --- a/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.cpp +++ b/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.cpp @@ -1325,14 +1325,14 @@ bool TQODBCResult::exec() //////////////////////////////////////// -TQODBCDriver::TQODBCDriver( TQObject * tqparent, const char * name ) - : TQSqlDriver(tqparent,name ? name : "TQODBC") +TQODBCDriver::TQODBCDriver( TQObject * parent, const char * name ) + : TQSqlDriver(parent,name ? name : "TQODBC") { init(); } -TQODBCDriver::TQODBCDriver( STQLHANDLE env, STQLHANDLE con, TQObject * tqparent, const char * name ) - : TQSqlDriver(tqparent,name ? name : "TQODBC") +TQODBCDriver::TQODBCDriver( STQLHANDLE env, STQLHANDLE con, TQObject * parent, const char * name ) + : TQSqlDriver(parent,name ? name : "TQODBC") { init(); d->hEnv = env; diff --git a/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.h b/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.h index 74ab4e7..cb09743 100644 --- a/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.h +++ b/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.h @@ -121,8 +121,8 @@ private: class TQ_EXPORT_STQLDRIVER_ODBC TQODBCDriver : public TQSqlDriver { public: - TQODBCDriver( TQObject * tqparent=0, const char * name=0 ); - TQODBCDriver( STQLHANDLE env, STQLHANDLE con, TQObject * tqparent=0, const char * name=0 ); + TQODBCDriver( TQObject * parent=0, const char * name=0 ); + TQODBCDriver( STQLHANDLE env, STQLHANDLE con, TQObject * parent=0, const char * name=0 ); ~TQODBCDriver(); bool hasFeature( DriverFeature f ) const; bool open( const TQString & db, diff --git a/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.cpp b/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.cpp index b5885bf..7809749 100644 --- a/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.cpp +++ b/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.cpp @@ -554,14 +554,14 @@ static TQPSTQLDriver::Protocol getPSTQLVersion( PGconn* connection ) return TQPSTQLDriver::Version6; } -TQPSTQLDriver::TQPSTQLDriver( TQObject * tqparent, const char * name ) - : TQSqlDriver(tqparent,name ? name : "TQPSQL"), pro( TQPSTQLDriver::Version6 ) +TQPSTQLDriver::TQPSTQLDriver( TQObject * parent, const char * name ) + : TQSqlDriver(parent,name ? name : "TQPSQL"), pro( TQPSTQLDriver::Version6 ) { init(); } -TQPSTQLDriver::TQPSTQLDriver( PGconn * conn, TQObject * tqparent, const char * name ) - : TQSqlDriver(tqparent,name ? name : "TQPSQL"), pro( TQPSTQLDriver::Version6 ) +TQPSTQLDriver::TQPSTQLDriver( PGconn * conn, TQObject * parent, const char * name ) + : TQSqlDriver(parent,name ? name : "TQPSQL"), pro( TQPSTQLDriver::Version6 ) { init(); d->connection = conn; diff --git a/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.h b/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.h index c005107..6afbc96 100644 --- a/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.h +++ b/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.h @@ -88,8 +88,8 @@ public: Version73 = 9 }; - TQPSTQLDriver( TQObject * tqparent=0, const char * name=0 ); - TQPSTQLDriver( PGconn * conn, TQObject * tqparent=0, const char * name=0 ); + TQPSTQLDriver( TQObject * parent=0, const char * name=0 ); + TQPSTQLDriver( PGconn * conn, TQObject * parent=0, const char * name=0 ); ~TQPSTQLDriver(); bool hasFeature( DriverFeature f ) const; bool open( const TQString & db, diff --git a/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.cpp b/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.cpp index 864c4c9..bf330e3 100644 --- a/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.cpp +++ b/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.cpp @@ -277,14 +277,14 @@ int TQSTQLiteResult::numRowsAffected() ///////////////////////////////////////////////////////// -TQSTQLiteDriver::TQSTQLiteDriver(TQObject * tqparent, const char * name) - : TQSqlDriver(tqparent, name ? name : TQSQLITE_DRIVER_NAME) +TQSTQLiteDriver::TQSTQLiteDriver(TQObject * parent, const char * name) + : TQSqlDriver(parent, name ? name : TQSQLITE_DRIVER_NAME) { d = new TQSTQLiteDriverPrivate(); } -TQSTQLiteDriver::TQSTQLiteDriver(sqlite *connection, TQObject *tqparent, const char *name) - : TQSqlDriver(tqparent, name ? name : TQSQLITE_DRIVER_NAME) +TQSTQLiteDriver::TQSTQLiteDriver(sqlite *connection, TQObject *parent, const char *name) + : TQSqlDriver(parent, name ? name : TQSQLITE_DRIVER_NAME) { d = new TQSTQLiteDriverPrivate(); d->access = connection; diff --git a/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.h b/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.h index 5350ba1..6100089 100644 --- a/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.h +++ b/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.h @@ -56,8 +56,8 @@ class TQSTQLiteDriver : public TQSqlDriver { friend class TQSTQLiteResult; public: - TQSTQLiteDriver(TQObject *tqparent = 0, const char *name = 0); - TQSTQLiteDriver(sqlite *connection, TQObject *tqparent = 0, const char *name = 0); + TQSTQLiteDriver(TQObject *parent = 0, const char *name = 0); + TQSTQLiteDriver(sqlite *connection, TQObject *parent = 0, const char *name = 0); ~TQSTQLiteDriver(); bool hasFeature(DriverFeature f) const; bool open(const TQString & db, diff --git a/tqtinterface/qt4/src/sql/tqdatabrowser.cpp b/tqtinterface/qt4/src/sql/tqdatabrowser.cpp index 910fb11..df5d15b 100644 --- a/tqtinterface/qt4/src/sql/tqdatabrowser.cpp +++ b/tqtinterface/qt4/src/sql/tqdatabrowser.cpp @@ -155,12 +155,12 @@ public: */ /*! - Constructs a data browser which is a child of \a tqparent, with the + Constructs a data browser which is a child of \a parent, with the name \a name and widget flags set to \a fl. */ -TQDataBrowser::TQDataBrowser( TQWidget *tqparent, const char *name, WFlags fl ) - : TQWidget( tqparent, name, fl ) +TQDataBrowser::TQDataBrowser( TQWidget *parent, const char *name, WFlags fl ) + : TQWidget( parent, name, fl ) { d = new TQDataBrowserPrivate(); d->dat.setMode( TQSql::Update ); diff --git a/tqtinterface/qt4/src/sql/tqdatabrowser.h b/tqtinterface/qt4/src/sql/tqdatabrowser.h index 5379b78..1dd20b4 100644 --- a/tqtinterface/qt4/src/sql/tqdatabrowser.h +++ b/tqtinterface/qt4/src/sql/tqdatabrowser.h @@ -72,7 +72,7 @@ class TQ_EXPORT TQDataBrowser : public TQWidget Q_PROPERTY( bool autoEdit READ autoEdit WRITE setAutoEdit ) public: - TQDataBrowser( TQWidget* tqparent=0, const char* name=0, WFlags fl = 0 ); + TQDataBrowser( TQWidget* parent=0, const char* name=0, WFlags fl = 0 ); ~TQDataBrowser(); enum Boundary { diff --git a/tqtinterface/qt4/src/sql/tqdatatable.cpp b/tqtinterface/qt4/src/sql/tqdatatable.cpp index 647c3a2..99ef396 100644 --- a/tqtinterface/qt4/src/sql/tqdatatable.cpp +++ b/tqtinterface/qt4/src/sql/tqdatatable.cpp @@ -235,18 +235,18 @@ void qt_debug_buffer( const TQString& msg, TQSqlRecord* cursor ) */ /*! - Constructs a data table which is a child of \a tqparent, called + Constructs a data table which is a child of \a parent, called name \a name. */ -TQDataTable::TQDataTable ( TQWidget * tqparent, const char * name ) - : TQTable( tqparent, name ) +TQDataTable::TQDataTable ( TQWidget * parent, const char * name ) + : TQTable( parent, name ) { init(); } /*! - Constructs a data table which is a child of \a tqparent, called name + Constructs a data table which is a child of \a parent, called name \a name using the cursor \a cursor. If \a autoPopulate is TRUE (the default is FALSE), columns are @@ -259,8 +259,8 @@ TQDataTable::TQDataTable ( TQWidget * tqparent, const char * name ) representing NULL values as strings. */ -TQDataTable::TQDataTable ( TQSqlCursor* cursor, bool autoPopulate, TQWidget * tqparent, const char * name ) - : TQTable( tqparent, name ) +TQDataTable::TQDataTable ( TQSqlCursor* cursor, bool autoPopulate, TQWidget * parent, const char * name ) + : TQTable( parent, name ) { init(); setSqlCursor( cursor, autoPopulate ); diff --git a/tqtinterface/qt4/src/sql/tqdatatable.h b/tqtinterface/qt4/src/sql/tqdatatable.h index 2f1c5dd..37f5864 100644 --- a/tqtinterface/qt4/src/sql/tqdatatable.h +++ b/tqtinterface/qt4/src/sql/tqdatatable.h @@ -86,8 +86,8 @@ class TQM_EXPORT_SQL TQDataTable : public TQTable Q_PROPERTY( int numRows READ numRows ) public: - TQDataTable ( TQWidget* tqparent=0, const char* name=0 ); - TQDataTable ( TQSqlCursor* cursor, bool autoPopulate = FALSE, TQWidget* tqparent=0, const char* name=0 ); + TQDataTable ( TQWidget* parent=0, const char* name=0 ); + TQDataTable ( TQSqlCursor* cursor, bool autoPopulate = FALSE, TQWidget* parent=0, const char* name=0 ); ~TQDataTable(); virtual void addColumn( const TQString& fieldName, diff --git a/tqtinterface/qt4/src/sql/tqdataview.cpp b/tqtinterface/qt4/src/sql/tqdataview.cpp index b2fbecf..e4a22a8 100644 --- a/tqtinterface/qt4/src/sql/tqdataview.cpp +++ b/tqtinterface/qt4/src/sql/tqdataview.cpp @@ -76,12 +76,12 @@ public: */ /*! - Constructs a data view which is a child of \a tqparent, called \a + Constructs a data view which is a child of \a parent, called \a name, and with widget flags \a fl. */ -TQDataView::TQDataView( TQWidget *tqparent, const char *name, WFlags fl ) - : TQWidget( tqparent, name, fl ) +TQDataView::TQDataView( TQWidget *parent, const char *name, WFlags fl ) + : TQWidget( parent, name, fl ) { d = new TQDataViewPrivate(); } diff --git a/tqtinterface/qt4/src/sql/tqdataview.h b/tqtinterface/qt4/src/sql/tqdataview.h index 017fae6..77c6344 100644 --- a/tqtinterface/qt4/src/sql/tqdataview.h +++ b/tqtinterface/qt4/src/sql/tqdataview.h @@ -63,7 +63,7 @@ class TQM_EXPORT_SQL TQDataView : public TQWidget TQ_OBJECT public: - TQDataView( TQWidget* tqparent=0, const char* name=0, WFlags fl = 0 ); + TQDataView( TQWidget* parent=0, const char* name=0, WFlags fl = 0 ); ~TQDataView(); virtual void setForm( TQSqlForm* form ); diff --git a/tqtinterface/qt4/src/sql/tqeditorfactory.cpp b/tqtinterface/qt4/src/sql/tqeditorfactory.cpp index 2d02088..7c6e962 100644 --- a/tqtinterface/qt4/src/sql/tqeditorfactory.cpp +++ b/tqtinterface/qt4/src/sql/tqeditorfactory.cpp @@ -69,11 +69,11 @@ */ /*! - Constructs an editor factory with tqparent \a tqparent, called \a name. + Constructs an editor factory with parent \a parent, called \a name. */ -TQEditorFactory::TQEditorFactory ( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ) +TQEditorFactory::TQEditorFactory ( TQObject * parent, const char * name ) + : TQObject( parent, name ) { } @@ -124,11 +124,11 @@ void TQEditorFactory::installDefaultFactory( TQEditorFactory * factory ) /*! Creates and returns the appropriate editor for the TQVariant \a v. - If the TQVariant is invalid, 0 is returned. The \a tqparent is passed + If the TQVariant is invalid, 0 is returned. The \a parent is passed to the appropriate editor's constructor. */ -TQWidget * TQEditorFactory::createEditor( TQWidget * tqparent, const TQVariant & v ) +TQWidget * TQEditorFactory::createEditor( TQWidget * parent, const TQVariant & v ) { TQWidget * w = 0; switch( v.type() ){ @@ -136,34 +136,34 @@ TQWidget * TQEditorFactory::createEditor( TQWidget * tqparent, const TQVariant & w = 0; break; case TQVariant::Bool: - w = new TQComboBox( tqparent, "qt_editor_bool" ); + w = new TQComboBox( parent, "qt_editor_bool" ); ((TQComboBox *) w)->insertItem( "False" ); ((TQComboBox *) w)->insertItem( "True" ); break; case TQVariant::UInt: - w = new TQSpinBox( 0, 999999, 1, tqparent, "qt_editor_spinbox" ); + w = new TQSpinBox( 0, 999999, 1, parent, "qt_editor_spinbox" ); break; case TQVariant::Int: - w = new TQSpinBox( -999999, 999999, 1, tqparent, "qt_editor_int" ); + w = new TQSpinBox( -999999, 999999, 1, parent, "qt_editor_int" ); break; case TQVariant::String: case TQVariant::CString: case TQVariant::Double: - w = new TQLineEdit( tqparent, "qt_editor_double" ); + w = new TQLineEdit( parent, "qt_editor_double" ); ((TQLineEdit*)w)->setFrame( FALSE ); break; case TQVariant::Date: - w = new TQDateEdit( tqparent, "qt_editor_date" ); + w = new TQDateEdit( parent, "qt_editor_date" ); break; case TQVariant::Time: - w = new TQTimeEdit( tqparent, "qt_editor_time" ); + w = new TQTimeEdit( parent, "qt_editor_time" ); break; case TQVariant::DateTime: - w = new TQDateTimeEdit( tqparent, "qt_editor_datetime" ); + w = new TQDateTimeEdit( parent, "qt_editor_datetime" ); break; #ifndef TQT_NO_LABEL case TQVariant::Pixmap: - w = new TQLabel( tqparent, "qt_editor_pixmap" ); + w = new TQLabel( parent, "qt_editor_pixmap" ); break; #endif case TQVariant::Palette: @@ -184,7 +184,7 @@ TQWidget * TQEditorFactory::createEditor( TQWidget * tqparent, const TQVariant & case TQVariant::SizePolicy: case TQVariant::ByteArray: default: - w = new TQWidget( tqparent, "qt_editor_default" ); + w = new TQWidget( parent, "qt_editor_default" ); break; } return w; diff --git a/tqtinterface/qt4/src/sql/tqeditorfactory.h b/tqtinterface/qt4/src/sql/tqeditorfactory.h index fb67e0f..12c123f 100644 --- a/tqtinterface/qt4/src/sql/tqeditorfactory.h +++ b/tqtinterface/qt4/src/sql/tqeditorfactory.h @@ -57,10 +57,10 @@ class TQM_EXPORT_SQL TQEditorFactory : public TQObject { public: - TQEditorFactory ( TQObject * tqparent = 0, const char * name = 0 ); + TQEditorFactory ( TQObject * parent = 0, const char * name = 0 ); ~TQEditorFactory(); - virtual TQWidget * createEditor( TQWidget * tqparent, const TQVariant & v ); + virtual TQWidget * createEditor( TQWidget * parent, const TQVariant & v ); static TQEditorFactory * defaultFactory(); static void installDefaultFactory( TQEditorFactory * factory); diff --git a/tqtinterface/qt4/src/sql/tqsqldatabase.cpp b/tqtinterface/qt4/src/sql/tqsqldatabase.cpp index 70a15ae..1876720 100644 --- a/tqtinterface/qt4/src/sql/tqsqldatabase.cpp +++ b/tqtinterface/qt4/src/sql/tqsqldatabase.cpp @@ -149,7 +149,7 @@ typedef TQDict TQDriverDict; class TQSqlDatabaseManager : public TQObject { public: - TQSqlDatabaseManager( TQObject * tqparent = 0, const char * name = 0 ); + TQSqlDatabaseManager( TQObject * parent = 0, const char * name = 0 ); ~TQSqlDatabaseManager(); static TQSqlDatabase* database( const TQString& name, bool open ); static TQSqlDatabase* addDatabase( TQSqlDatabase* db, const TQString & name ); @@ -168,8 +168,8 @@ protected: Constructs an SQL database manager. */ -TQSqlDatabaseManager::TQSqlDatabaseManager( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), dbDict( 1 ), drDict( 0 ) +TQSqlDatabaseManager::TQSqlDatabaseManager( TQObject * parent, const char * name ) + : TQObject( parent, name ), dbDict( 1 ), drDict( 0 ) { } @@ -563,7 +563,7 @@ bool TQSqlDatabase::contains( const TQString& connectionName ) /*! Creates a TQSqlDatabase connection called \a name that uses the - driver referred to by \a type, with the tqparent \a tqparent and the + driver referred to by \a type, with the parent \a parent and the object name \a objname. If the \a type is not recognized, the database connection will have no functionality. @@ -587,8 +587,8 @@ bool TQSqlDatabase::contains( const TQString& connectionName ) \sa registerSqlDriver() */ -TQSqlDatabase::TQSqlDatabase( const TQString& type, const TQString& name, TQObject * tqparent, const char * objname ) - : TQObject( tqparent, objname ) +TQSqlDatabase::TQSqlDatabase( const TQString& type, const TQString& name, TQObject * parent, const char * objname ) + : TQObject( parent, objname ) { init( type, name ); } @@ -598,14 +598,14 @@ TQSqlDatabase::TQSqlDatabase( const TQString& type, const TQString& name, TQObje \overload Creates a database connection using the driver \a driver, with - the tqparent \a tqparent and the object name \a objname. + the parent \a parent and the object name \a objname. \warning The framework takes ownership of the \a driver pointer, so it should not be deleted. */ -TQSqlDatabase::TQSqlDatabase( TQSqlDriver* driver, TQObject * tqparent, const char * objname ) - : TQObject( tqparent, objname ) +TQSqlDatabase::TQSqlDatabase( TQSqlDriver* driver, TQObject * parent, const char * objname ) + : TQObject( parent, objname ) { d = new TQSqlDatabasePrivate(); d->driver = driver; diff --git a/tqtinterface/qt4/src/sql/tqsqldatabase.h b/tqtinterface/qt4/src/sql/tqsqldatabase.h index 98e7be2..24af2b8 100644 --- a/tqtinterface/qt4/src/sql/tqsqldatabase.h +++ b/tqtinterface/qt4/src/sql/tqsqldatabase.h @@ -140,8 +140,8 @@ public: static bool isDriverAvailable( const TQString& name ); protected: - TQSqlDatabase( const TQString& type, const TQString& name, TQObject * tqparent=0, const char * objname=0 ); - TQSqlDatabase( TQSqlDriver* driver, TQObject * tqparent=0, const char * objname=0 ); + TQSqlDatabase( const TQString& type, const TQString& name, TQObject * parent=0, const char * objname=0 ); + TQSqlDatabase( TQSqlDriver* driver, TQObject * parent=0, const char * objname=0 ); private: void init( const TQString& type, const TQString& name ); TQSqlDatabasePrivate* d; diff --git a/tqtinterface/qt4/src/sql/tqsqldriver.cpp b/tqtinterface/qt4/src/sql/tqsqldriver.cpp index 3f6f137..8ce3fab 100644 --- a/tqtinterface/qt4/src/sql/tqsqldriver.cpp +++ b/tqtinterface/qt4/src/sql/tqsqldriver.cpp @@ -65,13 +65,13 @@ TQPtrDict *qSqlOpenExtDict(); */ /*! - Default constructor. Creates a new driver with tqparent \a tqparent, + Default constructor. Creates a new driver with parent \a parent, called \a name. */ -TQSqlDriver::TQSqlDriver( TQObject * tqparent, const char * name ) -: TQObject(tqparent, name), +TQSqlDriver::TQSqlDriver( TQObject * parent, const char * name ) +: TQObject(parent, name), dbState(0), error() { diff --git a/tqtinterface/qt4/src/sql/tqsqldriver.h b/tqtinterface/qt4/src/sql/tqsqldriver.h index 84e936c..70a60f1 100644 --- a/tqtinterface/qt4/src/sql/tqsqldriver.h +++ b/tqtinterface/qt4/src/sql/tqsqldriver.h @@ -74,7 +74,7 @@ public: enum DriverFeature { Transactions, QuerySize, BLOB, Unicode, PreparedQueries, NamedPlaceholders, PositionalPlaceholders }; - TQSqlDriver( TQObject * tqparent=0, const char * name=0 ); + TQSqlDriver( TQObject * parent=0, const char * name=0 ); ~TQSqlDriver(); bool isOpen() const; bool isOpenError() const; diff --git a/tqtinterface/qt4/src/sql/tqsqleditorfactory.cpp b/tqtinterface/qt4/src/sql/tqsqleditorfactory.cpp index 0c6b16f..b7201bb 100644 --- a/tqtinterface/qt4/src/sql/tqsqleditorfactory.cpp +++ b/tqtinterface/qt4/src/sql/tqsqleditorfactory.cpp @@ -73,12 +73,12 @@ /*! - Constructs a SQL editor factory with tqparent \a tqparent, called \a + Constructs a SQL editor factory with parent \a parent, called \a name. */ -TQSqlEditorFactory::TQSqlEditorFactory ( TQObject * tqparent, const char * name ) - : TQEditorFactory( tqparent, name ) +TQSqlEditorFactory::TQSqlEditorFactory ( TQObject * parent, const char * name ) + : TQEditorFactory( parent, name ) { } @@ -132,14 +132,14 @@ void TQSqlEditorFactory::installDefaultFactory( TQSqlEditorFactory * factory ) Creates and returns the appropriate editor widget for the TQVariant \a variant. - The widget that is returned has the tqparent \a tqparent (which may be + The widget that is returned has the parent \a parent (which may be zero). If \a variant is invalid, 0 is returned. */ -TQWidget * TQSqlEditorFactory::createEditor( TQWidget * tqparent, +TQWidget * TQSqlEditorFactory::createEditor( TQWidget * parent, const TQVariant & variant ) { - return TQEditorFactory::createEditor( tqparent, variant ); + return TQEditorFactory::createEditor( parent, variant ); } /*! @@ -149,7 +149,7 @@ TQWidget * TQSqlEditorFactory::createEditor( TQWidget * tqparent, field. */ -TQWidget * TQSqlEditorFactory::createEditor( TQWidget * tqparent, +TQWidget * TQSqlEditorFactory::createEditor( TQWidget * parent, const TQSqlField * field ) { if ( !field ) { @@ -162,36 +162,36 @@ TQWidget * TQSqlEditorFactory::createEditor( TQWidget * tqparent, w = 0; break; case TQVariant::Bool: - w = new TQComboBox( tqparent, "qt_editor_bool" ); + w = new TQComboBox( parent, "qt_editor_bool" ); ((TQComboBox *) w)->insertItem( "False" ); ((TQComboBox *) w)->insertItem( "True" ); break; case TQVariant::UInt: - w = new TQSpinBox( 0, 2147483647, 1, tqparent, "qt_editor_spinbox" ); + w = new TQSpinBox( 0, 2147483647, 1, parent, "qt_editor_spinbox" ); break; case TQVariant::Int: - w = new TQSpinBox( -2147483647, 2147483647, 1, tqparent, "qt_editor_int" ); + w = new TQSpinBox( -2147483647, 2147483647, 1, parent, "qt_editor_int" ); break; case TQVariant::LongLong: case TQVariant::ULongLong: case TQVariant::String: case TQVariant::CString: case TQVariant::Double: - w = new TQLineEdit( tqparent, "qt_editor_double" ); + w = new TQLineEdit( parent, "qt_editor_double" ); ((TQLineEdit*)w)->setFrame( FALSE ); break; case TQVariant::Date: - w = new TQDateEdit( tqparent, "qt_editor_date" ); + w = new TQDateEdit( parent, "qt_editor_date" ); break; case TQVariant::Time: - w = new TQTimeEdit( tqparent, "qt_editor_time" ); + w = new TQTimeEdit( parent, "qt_editor_time" ); break; case TQVariant::DateTime: - w = new TQDateTimeEdit( tqparent, "qt_editor_datetime" ); + w = new TQDateTimeEdit( parent, "qt_editor_datetime" ); break; #ifndef TQT_NO_LABEL case TQVariant::Pixmap: - w = new TQLabel( tqparent, "qt_editor_pixmap" ); + w = new TQLabel( parent, "qt_editor_pixmap" ); break; #endif case TQVariant::Palette: @@ -212,7 +212,7 @@ TQWidget * TQSqlEditorFactory::createEditor( TQWidget * tqparent, case TQVariant::SizePolicy: case TQVariant::ByteArray: default: - w = new TQWidget( tqparent, "qt_editor_default" ); + w = new TQWidget( parent, "qt_editor_default" ); break; } return w; diff --git a/tqtinterface/qt4/src/sql/tqsqleditorfactory.h b/tqtinterface/qt4/src/sql/tqsqleditorfactory.h index 151fb5e..54a50b3 100644 --- a/tqtinterface/qt4/src/sql/tqsqleditorfactory.h +++ b/tqtinterface/qt4/src/sql/tqsqleditorfactory.h @@ -58,10 +58,10 @@ class TQSqlField; class TQM_EXPORT_SQL TQSqlEditorFactory : public TQEditorFactory { public: - TQSqlEditorFactory ( TQObject * tqparent = 0, const char * name = 0 ); + TQSqlEditorFactory ( TQObject * parent = 0, const char * name = 0 ); ~TQSqlEditorFactory(); - virtual TQWidget * createEditor( TQWidget * tqparent, const TQVariant & variant ); - virtual TQWidget * createEditor( TQWidget * tqparent, const TQSqlField * field ); + virtual TQWidget * createEditor( TQWidget * parent, const TQVariant & variant ); + virtual TQWidget * createEditor( TQWidget * parent, const TQSqlField * field ); static TQSqlEditorFactory * defaultFactory(); static void installDefaultFactory( TQSqlEditorFactory * factory ); diff --git a/tqtinterface/qt4/src/sql/tqsqlform.cpp b/tqtinterface/qt4/src/sql/tqsqlform.cpp index a33c18b..95c125f 100644 --- a/tqtinterface/qt4/src/sql/tqsqlform.cpp +++ b/tqtinterface/qt4/src/sql/tqsqlform.cpp @@ -131,10 +131,10 @@ public: /*! - Constructs a TQSqlForm with tqparent \a tqparent and called \a name. + Constructs a TQSqlForm with parent \a parent and called \a name. */ -TQSqlForm::TQSqlForm( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ) +TQSqlForm::TQSqlForm( TQObject * parent, const char * name ) + : TQObject( parent, name ) { d = new TQSqlFormPrivate(); } diff --git a/tqtinterface/qt4/src/sql/tqsqlform.h b/tqtinterface/qt4/src/sql/tqsqlform.h index 14cdca1..14087eb 100644 --- a/tqtinterface/qt4/src/sql/tqsqlform.h +++ b/tqtinterface/qt4/src/sql/tqsqlform.h @@ -66,7 +66,7 @@ class TQM_EXPORT_SQL TQSqlForm : public TQObject Q_OBJECT TQ_OBJECT public: - TQSqlForm( TQObject * tqparent = 0, const char * name = 0 ); + TQSqlForm( TQObject * parent = 0, const char * name = 0 ); ~TQSqlForm(); virtual void insert( TQWidget * widget, const TQString& field ); diff --git a/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp b/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp index 6a35ef7..b70f1b5 100644 --- a/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp +++ b/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp @@ -675,13 +675,13 @@ TQDataManager::~TQDataManager() information about the error. */ -void TQDataManager::handleError( TQWidget* tqparent, const TQSqlError& e ) +void TQDataManager::handleError( TQWidget* parent, const TQSqlError& e ) { #ifndef TQT_NO_MESSAGEBOX if (e.driverText().isEmpty() && e.databaseText().isEmpty()) { - TQMessageBox::warning ( tqparent, "Warning", "An error occurred while accessing the database"); + TQMessageBox::warning ( parent, "Warning", "An error occurred while accessing the database"); } else { - TQMessageBox::warning ( tqparent, "Warning", e.driverText() + "\n" + e.databaseText(), + TQMessageBox::warning ( parent, "Warning", e.driverText() + "\n" + e.databaseText(), 0, 0 ); } #endif // TQT_NO_MESSAGEBOX @@ -859,16 +859,16 @@ bool TQDataManager::confirmCancels() const m. Derived classes can reimplement this function and provide their own confirmation dialog. The default implementation uses a message box which prompts the user to confirm the edit action. The dialog - is centered over \a tqparent. + is centered over \a parent. */ -TQSql::Confirm TQDataManager::confirmEdit( TQWidget* tqparent, TQSql::Op m ) +TQSql::Confirm TQDataManager::confirmEdit( TQWidget* parent, TQSql::Op m ) { int ans = 2; if ( m == TQSql::Delete ) { #ifndef TQT_NO_MESSAGEBOX - ans = TQMessageBox::information( tqparent, + ans = TQMessageBox::information( parent, tqApp->translate( "TQSql", "Delete" ), tqApp->translate( "TQSql", "Delete this record?" ), tqApp->translate( "TQSql", "Yes" ), @@ -885,7 +885,7 @@ TQSql::Confirm TQDataManager::confirmEdit( TQWidget* tqparent, TQSql::Op m ) caption = tqApp->translate( "TQSql", "Update" ); } #ifndef TQT_NO_MESSAGEBOX - ans = TQMessageBox::information( tqparent, caption, + ans = TQMessageBox::information( parent, caption, tqApp->translate( "TQSql", "Save edits?" ), tqApp->translate( "TQSql", "Yes" ), tqApp->translate( "TQSql", "No" ), @@ -912,15 +912,15 @@ TQSql::Confirm TQDataManager::confirmEdit( TQWidget* tqparent, TQSql::Op m ) mode \a m. Derived classes can reimplement this function and provide their own confirmation dialog. The default implementation uses a message box which prompts the user to confirm the edit - action. The dialog is centered over \a tqparent. + action. The dialog is centered over \a parent. */ -TQSql::Confirm TQDataManager::confirmCancel( TQWidget* tqparent, TQSql::Op ) +TQSql::Confirm TQDataManager::confirmCancel( TQWidget* parent, TQSql::Op ) { #ifndef TQT_NO_MESSAGEBOX - switch ( TQMessageBox::information( tqparent, + switch ( TQMessageBox::information( parent, tqApp->translate( "TQSql", "Confirm" ), tqApp->translate( "TQSql", "Cancel your edits?" ), tqApp->translate( "TQSql", "Yes" ), diff --git a/tqtinterface/qt4/src/sql/tqsqlmanager_p.h b/tqtinterface/qt4/src/sql/tqsqlmanager_p.h index ed892e3..da00830 100644 --- a/tqtinterface/qt4/src/sql/tqsqlmanager_p.h +++ b/tqtinterface/qt4/src/sql/tqsqlmanager_p.h @@ -138,9 +138,9 @@ public: virtual void setAutoEdit( bool autoEdit ); bool autoEdit() const; - virtual void handleError( TQWidget* tqparent, const TQSqlError& error ); - virtual TQSql::Confirm confirmEdit( TQWidget* tqparent, TQSql::Op m ); - virtual TQSql::Confirm confirmCancel( TQWidget* tqparent, TQSql::Op m ); + virtual void handleError( TQWidget* parent, const TQSqlError& error ); + virtual TQSql::Confirm confirmEdit( TQWidget* parent, TQSql::Op m ); + virtual TQSql::Confirm confirmCancel( TQWidget* parent, TQSql::Op m ); virtual void setConfirmEdits( bool confirm ); virtual void setConfirmInsert( bool confirm ); -- cgit v1.2.1