diff options
Diffstat (limited to 'kexi/kexidb')
24 files changed, 43 insertions, 43 deletions
diff --git a/kexi/kexidb/dbobjectnamevalidator.cpp b/kexi/kexidb/dbobjectnamevalidator.cpp index b7a2f633..1edf5a25 100644 --- a/kexi/kexidb/dbobjectnamevalidator.cpp +++ b/kexi/kexidb/dbobjectnamevalidator.cpp @@ -25,8 +25,8 @@ using namespace KexiDB; using namespace KexiUtils; ObjectNameValidator::ObjectNameValidator( - KexiDB::Driver *drv, TQObject * tqparent, const char * name) -: Validator(tqparent,name) + KexiDB::Driver *drv, TQObject * parent, const char * name) +: Validator(parent,name) { m_drv = drv; } diff --git a/kexi/kexidb/dbobjectnamevalidator.h b/kexi/kexidb/dbobjectnamevalidator.h index 2b9a0645..ad2db4bd 100644 --- a/kexi/kexidb/dbobjectnamevalidator.h +++ b/kexi/kexidb/dbobjectnamevalidator.h @@ -36,7 +36,7 @@ namespace KexiDB { /*! \a drv is a KexiDB driver on which isSystemObjectName() will be called inside check(). If \a drv is 0, KexiDB::Driver::isKexiDBSystemObjectName() static function is called instead. */ - ObjectNameValidator(KexiDB::Driver *drv, TQObject * tqparent = 0, const char * name = 0); + ObjectNameValidator(KexiDB::Driver *drv, TQObject * parent = 0, const char * name = 0); virtual ~ObjectNameValidator(); protected: diff --git a/kexi/kexidb/driver.cpp b/kexi/kexidb/driver.cpp index da77ab72..4db1b400 100644 --- a/kexi/kexidb/driver.cpp +++ b/kexi/kexidb/driver.cpp @@ -69,8 +69,8 @@ Driver::Info::Info() //--------------------------------------------- -Driver::Driver( TQObject *tqparent, const char *name, const TQStringList & ) - : TQObject( tqparent, name ) +Driver::Driver( TQObject *parent, const char *name, const TQStringList & ) + : TQObject( parent, name ) , Object() , beh( new DriverBehaviour() ) , d( new DriverPrivate() ) diff --git a/kexi/kexidb/driver.h b/kexi/kexidb/driver.h index 7a8d5165..3c69a687 100644 --- a/kexi/kexidb/driver.h +++ b/kexi/kexidb/driver.h @@ -43,7 +43,7 @@ class DriverPrivate; //! Generic database abstraction. /*! This class is a prototype of the database driver for implementations. Driver allows new connections to be created, and groups - these as a tqparent. + these as a parent. Before destruction, all connections are destructed. Notes: @@ -305,7 +305,7 @@ class KEXI_DB_EXPORT Driver : public TQObject, public KexiDB::Object You may also want to change options in DriverBehaviour *beh member. See drivers/mySQL/mysqldriver.cpp for usage example. */ - Driver( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); + Driver( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); /*! For reimplemenation: creates and returns connection object with additional structures specific for a given driver. diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp index 4d7db160..01d326af 100644 --- a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp +++ b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp @@ -54,7 +54,7 @@ KEXIDB_DRIVER_INFO( MySqlDriver, mysql ) * * See: http://dev.mysql.com/doc/mysql/en/Column_types.html */ -MySqlDriver::MySqlDriver(TQObject *tqparent, const char *name, const TQStringList &args) : Driver(tqparent, name,args) +MySqlDriver::MySqlDriver(TQObject *parent, const char *name, const TQStringList &args) : Driver(parent, name,args) { // KexiDBDrvDbg << "MySqlDriver::MySqlDriver()" << endl; diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.h b/kexi/kexidb/drivers/mySQL/mysqldriver.h index 7e6d5a35..df02441c 100644 --- a/kexi/kexidb/drivers/mySQL/mysqldriver.h +++ b/kexi/kexidb/drivers/mySQL/mysqldriver.h @@ -34,7 +34,7 @@ class MySqlDriver : public Driver KEXIDB_DRIVER public: - MySqlDriver(TQObject *tqparent, const char *name, const TQStringList &args=TQStringList()); + MySqlDriver(TQObject *parent, const char *name, const TQStringList &args=TQStringList()); virtual ~MySqlDriver(); virtual bool isSystemDatabaseName( const TQString &n ) const; diff --git a/kexi/kexidb/drivers/odbc/odbcdriver.cpp b/kexi/kexidb/drivers/odbc/odbcdriver.cpp index 38e0796e..83d46361 100644 --- a/kexi/kexidb/drivers/odbc/odbcdriver.cpp +++ b/kexi/kexidb/drivers/odbc/odbcdriver.cpp @@ -39,8 +39,8 @@ using namespace KexiDB; KEXIDB_DRIVER_INFO( ODBCDriver, odbc ) -ODBCDriver::ODBCDriver( TQObject *tqparent, const char *name, const TQStringList &args ) - : Driver( tqparent, name, args ) +ODBCDriver::ODBCDriver( TQObject *parent, const char *name, const TQStringList &args ) + : Driver( parent, name, args ) { d->isFileDriver = false; d->isDBOpenedAfterCreate = true; diff --git a/kexi/kexidb/drivers/odbc/odbcdriver.h b/kexi/kexidb/drivers/odbc/odbcdriver.h index c26af43f..a5e7ee68 100644 --- a/kexi/kexidb/drivers/odbc/odbcdriver.h +++ b/kexi/kexidb/drivers/odbc/odbcdriver.h @@ -45,7 +45,7 @@ class ODBCDriver : public Driver KEXIDB_DRIVER public: - ODBCDriver( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); + ODBCDriver( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); ~ODBCDriver(); virtual bool isSystemDatabaseName( const TQString& name ) const; diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp index ce66a6e8..333df590 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp +++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp @@ -33,8 +33,8 @@ KEXIDB_DRIVER_INFO( pqxxSqlDriver, pqxxsql ) //================================================================================== // -pqxxSqlDriver::pqxxSqlDriver( TQObject *tqparent, const char *name, const TQStringList &args ) - : Driver( tqparent, name, args ) +pqxxSqlDriver::pqxxSqlDriver( TQObject *parent, const char *name, const TQStringList &args ) + : Driver( parent, name, args ) { d->isFileDriver = false; d->features = SingleTransactions | CursorForward | CursorBackward; diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.h b/kexi/kexidb/drivers/pqxx/pqxxdriver.h index 779c1368..8ea7b1fa 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxdriver.h +++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.h @@ -38,7 +38,7 @@ class pqxxSqlDriver : public Driver KEXIDB_DRIVER public: - pqxxSqlDriver( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); + pqxxSqlDriver( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); ~pqxxSqlDriver(); virtual bool isSystemObjectName( const TQString& n )const; diff --git a/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp b/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp index 80276682..fc356558 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp @@ -48,9 +48,9 @@ class KexiDB::SQLiteDriverPrivate } }; -//PgSqlDB::PgSqlDB(TQObject *tqparent, const char *name, const TQStringList &) -SQLiteDriver::SQLiteDriver( TQObject *tqparent, const char *name, const TQStringList &args ) - : Driver( tqparent, name, args ) +//PgSqlDB::PgSqlDB(TQObject *parent, const char *name, const TQStringList &) +SQLiteDriver::SQLiteDriver( TQObject *parent, const char *name, const TQStringList &args ) + : Driver( parent, name, args ) ,dp( new SQLiteDriverPrivate() ) { d->isFileDriver = true; diff --git a/kexi/kexidb/drivers/sqlite/sqlitedriver.h b/kexi/kexidb/drivers/sqlite/sqlitedriver.h index a388d823..59fe89af 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitedriver.h +++ b/kexi/kexidb/drivers/sqlite/sqlitedriver.h @@ -39,7 +39,7 @@ class SQLiteDriver : public Driver KEXIDB_DRIVER public: - SQLiteDriver( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); + SQLiteDriver( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); virtual ~SQLiteDriver(); /*! \return true if \a n is a system object name; diff --git a/kexi/kexidb/expression.h b/kexi/kexidb/expression.h index ee2c9810..67c1c07e 100644 --- a/kexi/kexidb/expression.h +++ b/kexi/kexidb/expression.h @@ -80,7 +80,7 @@ public: virtual Field::Type type(); - BaseExpr* tqparent() const { return m_par; } + BaseExpr* parent() const { return m_par; } virtual void setParent(BaseExpr *p) { m_par = p; } @@ -121,7 +121,7 @@ public: protected: int m_cl; //!< class - BaseExpr *m_par; //!< tqparent expression + BaseExpr *m_par; //!< parent expression int m_token; }; @@ -224,7 +224,7 @@ public: virtual QueryParameterExpr* copy() const; virtual Field::Type type(); /*! Sets expected type of the parameter. The default is String. - This method is called from tqparent's expression validate(). + This method is called from parent's expression validate(). This depends on the type of the related expression. For instance: query "SELECT * FROM cars WHERE name=[enter name]", "[enter name]" has parameter of the same type as "name" field. diff --git a/kexi/kexidb/field.h b/kexi/kexidb/field.h index 9e0c9480..a99e845e 100644 --- a/kexi/kexidb/field.h +++ b/kexi/kexidb/field.h @@ -57,8 +57,8 @@ class BaseExpr; Note that aliases for fields are defined within query, not in Field object, because the same field can be used in different queries with different alias. - Notes for advanced use: Field obeject is designed to be owned by a tqparent object. - Such a tqparent object can be KexiDB::TableSchema, if the field defines single table column, + Notes for advanced use: Field obeject is designed to be owned by a parent object. + Such a parent object can be KexiDB::TableSchema, if the field defines single table column, or KexiDB::QuerySchema, if the field defines an expression (KexiDB::BaseExpr class). Using expression class for fields allos to define expressions within queries like diff --git a/kexi/kexidb/fieldlist.h b/kexi/kexidb/fieldlist.h index 439a5cc1..fbf303a9 100644 --- a/kexi/kexidb/fieldlist.h +++ b/kexi/kexidb/fieldlist.h @@ -109,7 +109,7 @@ class KEXI_DB_EXPORT FieldList /*! Creates and returns a list that contain fields selected by name. At least one field (exising on this list) should be selected, otherwise 0 is - returned. Returned FieldList object is not owned by any tqparent (so you need + returned. Returned FieldList object is not owned by any parent (so you need to destroy yourself) and Field objects included in it are not owned by it (but still as before, by 'this' object). Returned list can be usable e.g. as argument for Connection::insertRecord(). diff --git a/kexi/kexidb/fieldvalidator.cpp b/kexi/kexidb/fieldvalidator.cpp index d9252c20..57f8bd8d 100644 --- a/kexi/kexidb/fieldvalidator.cpp +++ b/kexi/kexidb/fieldvalidator.cpp @@ -26,12 +26,12 @@ using namespace KexiDB; -FieldValidator::FieldValidator( const Field &field, TQWidget * tqparent, const char * name ) - : KexiUtils::MultiValidator(TQT_TQOBJECT(tqparent), name) +FieldValidator::FieldValidator( const Field &field, TQWidget * parent, const char * name ) + : KexiUtils::MultiValidator(TQT_TQOBJECT(parent), name) { //! @todo merge this code with KexiTableEdit code! //! @todo set maximum length validator -//! @todo handle input tqmask (via TQLineEdit::setInputMask() +//! @todo handle input mask (via TQLineEdit::setInputMask() const Field::Type t = field.type(); if (field.isIntegerType()) { TQValidator *validator = 0; diff --git a/kexi/kexidb/fieldvalidator.h b/kexi/kexidb/fieldvalidator.h index 7b0e2bf8..038a9100 100644 --- a/kexi/kexidb/fieldvalidator.h +++ b/kexi/kexidb/fieldvalidator.h @@ -40,7 +40,7 @@ class KEXI_DB_EXPORT FieldValidator : public KexiUtils::MultiValidator { public: //! Setups the validator for \a field. Does not keep a pointer to \a field. - FieldValidator( const Field &field, TQWidget * tqparent, const char * name = 0 ); + FieldValidator( const Field &field, TQWidget * parent, const char * name = 0 ); ~FieldValidator(); }; diff --git a/kexi/kexidb/indexschema.h b/kexi/kexidb/indexschema.h index 12feae04..54306af2 100644 --- a/kexi/kexidb/indexschema.h +++ b/kexi/kexidb/indexschema.h @@ -110,7 +110,7 @@ class KEXI_DB_EXPORT IndexSchema : public FieldList, public SchemaData is this IndexSchem object assigned. Note: If \a rel was detached from masterRelationships() list, - this object now has no tqparent, so you need to attach it to somewhere or destruct it. + this object now has no parent, so you need to attach it to somewhere or destruct it. */ void detachRelationship(Relationship *rel); diff --git a/kexi/kexidb/msghandler.cpp b/kexi/kexidb/msghandler.cpp index f2946a2b..e72b33e3 100644 --- a/kexi/kexidb/msghandler.cpp +++ b/kexi/kexidb/msghandler.cpp @@ -35,8 +35,8 @@ MessageTitle::~MessageTitle() //------------------------------------------------ -MessageHandler::MessageHandler(TQWidget *tqparent) - : m_messageHandlerParentWidget(tqparent) +MessageHandler::MessageHandler(TQWidget *parent) + : m_messageHandlerParentWidget(parent) , m_enableMessages(true) { } diff --git a/kexi/kexidb/msghandler.h b/kexi/kexidb/msghandler.h index c0c8c494..e4fc6644 100644 --- a/kexi/kexidb/msghandler.h +++ b/kexi/kexidb/msghandler.h @@ -54,9 +54,9 @@ class KEXI_DB_EXPORT MessageHandler public: enum MessageType { Error, Sorry, Warning }; - /*! Constructs mesage handler, \a tqparent is a widget that will be a tqparent + /*! Constructs mesage handler, \a parent is a widget that will be a parent for displaying gui elements (e.g. message boxes). Can be 0 for non-gui usage. */ - MessageHandler(TQWidget *tqparent = 0); + MessageHandler(TQWidget *parent = 0); virtual ~MessageHandler(); /*! This method can be used to block/unblock messages. diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp index 7ed1a47b..c2cece0b 100644 --- a/kexi/kexidb/parser/parser_p.cpp +++ b/kexi/kexidb/parser/parser_p.cpp @@ -485,7 +485,7 @@ QuerySchema* buildSelectQuery( } } - /* set tqparent table if there's only one */ + /* set parent table if there's only one */ // if (parser->select()->tables()->count()==1) if (querySchema->tables()->count()==1) querySchema->setMasterTable(querySchema->tables()->first()); diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp index d3d1361c..9fa9ca01 100644 --- a/kexi/kexidb/utils.cpp +++ b/kexi/kexidb/utils.cpp @@ -382,10 +382,10 @@ void ConnectionTestThread::run() m_dlg->error(0); } -ConnectionTestDialog::ConnectionTestDialog(TQWidget* tqparent, +ConnectionTestDialog::ConnectionTestDialog(TQWidget* parent, const KexiDB::ConnectionData& data, KexiDB::MessageHandler& msgHandler) - : KProgressDialog(tqparent, "testconn_dlg", + : KProgressDialog(parent, "testconn_dlg", i18n("Test Connection"), i18n("<qt>Testing connection to <b>%1</b> database server...</qt>") .tqarg(data.serverInfoString(true)), true /*modal*/) , m_thread(new ConnectionTestThread(this, data)) @@ -483,10 +483,10 @@ void ConnectionTestDialog::slotCancel() KProgressDialog::slotCancel(); } -void KexiDB::connectionTestDialog(TQWidget* tqparent, const KexiDB::ConnectionData& data, +void KexiDB::connectionTestDialog(TQWidget* parent, const KexiDB::ConnectionData& data, KexiDB::MessageHandler& msgHandler) { - ConnectionTestDialog dlg(tqparent, data, msgHandler); + ConnectionTestDialog dlg(parent, data, msgHandler); dlg.exec(); } diff --git a/kexi/kexidb/utils.h b/kexi/kexidb/utils.h index b8ee03b5..ec807d34 100644 --- a/kexi/kexidb/utils.h +++ b/kexi/kexidb/utils.h @@ -259,7 +259,7 @@ namespace KexiDB (within a second thread). \a data is used to perform a (temporary) test connection. \a msgHandler is used to display errors. On successful connecting, a message is displayed. After testing, temporary connection is closed. */ - KEXI_DB_EXPORT void connectionTestDialog(TQWidget* tqparent, const ConnectionData& data, + KEXI_DB_EXPORT void connectionTestDialog(TQWidget* parent, const ConnectionData& data, MessageHandler& msgHandler); /*! Saves connection data \a data into \a map. */ @@ -349,7 +349,7 @@ namespace KexiDB /*! Convenience version of loadPropertyValueFromDom(). \return TQString value. */ KEXI_DB_EXPORT TQString loadStringPropertyValueFromDom( const TQDomNode& node, bool* ok ); - /*! Saves integer element for value \a value to \a doc document within tqparent element + /*! Saves integer element for value \a value to \a doc document within parent element \a parentEl. The value will be enclosed in "number" element and "elementName" element. Example: saveNumberElementToDom(doc, parentEl, "height", 15) will create \code @@ -359,7 +359,7 @@ namespace KexiDB KEXI_DB_EXPORT TQDomElement saveNumberElementToDom(TQDomDocument& doc, TQDomElement& parentEl, const TQString& elementName, int value); - /*! Saves boolean element for value \a value to \a doc document within tqparent element + /*! Saves boolean element for value \a value to \a doc document within parent element \a parentEl. Like saveNumberElementToDom() but creates "bool" tags. True/false values will be saved as "true"/"false" strings. \return the reference to element created with tag elementName. */ diff --git a/kexi/kexidb/utils_p.h b/kexi/kexidb/utils_p.h index 56c20267..8f10fb5b 100644 --- a/kexi/kexidb/utils_p.h +++ b/kexi/kexidb/utils_p.h @@ -34,7 +34,7 @@ class ConnectionTestDialog : protected KProgressDialog Q_OBJECT TQ_OBJECT public: - ConnectionTestDialog(TQWidget* tqparent, + ConnectionTestDialog(TQWidget* parent, const KexiDB::ConnectionData& data, KexiDB::MessageHandler& msgHandler); virtual ~ConnectionTestDialog(); |