From 04766b207afba7961d4d802313e426f5a2fbef63 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kexi/migration/importoptionsdlg.cpp | 4 ++-- kexi/migration/importoptionsdlg.h | 2 +- kexi/migration/importwizard.cpp | 4 ++-- kexi/migration/importwizard.h | 2 +- kexi/migration/keximigrate.cpp | 4 ++-- kexi/migration/keximigrate.h | 2 +- kexi/migration/mysql/mysqlmigrate.cpp | 4 ++-- kexi/migration/mysql/mysqlmigrate.h | 2 +- kexi/migration/pqxx/pg_type.h | 4 ++-- kexi/migration/pqxx/pqxxmigrate.cpp | 6 +++--- kexi/migration/pqxx/pqxxmigrate.h | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) (limited to 'kexi/migration') diff --git a/kexi/migration/importoptionsdlg.cpp b/kexi/migration/importoptionsdlg.cpp index 4741bf5c..50d6726d 100644 --- a/kexi/migration/importoptionsdlg.cpp +++ b/kexi/migration/importoptionsdlg.cpp @@ -36,13 +36,13 @@ using namespace KexiMigration; -OptionsDialog::OptionsDialog( const TQString& databaseFile, const TQString& selectedEncoding, TQWidget* tqparent ) +OptionsDialog::OptionsDialog( const TQString& databaseFile, const TQString& selectedEncoding, TQWidget* parent ) : KDialogBase( KDialogBase::Plain, i18n( "Advanced Import Options" ), Ok|Cancel, Ok, - tqparent, + parent, "KexiMigration::OptionsDialog", true, false diff --git a/kexi/migration/importoptionsdlg.h b/kexi/migration/importoptionsdlg.h index f40e8230..e24e37c7 100644 --- a/kexi/migration/importoptionsdlg.h +++ b/kexi/migration/importoptionsdlg.h @@ -35,7 +35,7 @@ class OptionsDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - OptionsDialog( const TQString& databaseFile, const TQString& selectedEncoding, TQWidget* tqparent = 0 ); + OptionsDialog( const TQString& databaseFile, const TQString& selectedEncoding, TQWidget* parent = 0 ); virtual ~OptionsDialog(); KexiCharacterEncodingComboBox* encodingComboBox() const; diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp index b97b6fcf..9c1b4559 100644 --- a/kexi/migration/importwizard.cpp +++ b/kexi/migration/importwizard.cpp @@ -58,8 +58,8 @@ using namespace KexiMigration; //=========================================================== // -ImportWizard::ImportWizard(TQWidget *tqparent, TQMap* args) - : KWizard(tqparent) +ImportWizard::ImportWizard(TQWidget *parent, TQMap* args) + : KWizard(parent) , m_args(args) { setCaption(i18n("Import Database")); diff --git a/kexi/migration/importwizard.h b/kexi/migration/importwizard.h index 95da22cd..8d3a82b0 100644 --- a/kexi/migration/importwizard.h +++ b/kexi/migration/importwizard.h @@ -69,7 +69,7 @@ public: \a args contains arguments that can be parsed by parseArguments(). \a *arg will be also set to imported project's filename on success and to null value on failure or cancellation. */ - ImportWizard(TQWidget *tqparent = 0, TQMap* args = 0); + ImportWizard(TQWidget *parent = 0, TQMap* args = 0); virtual ~ImportWizard(); public slots: diff --git a/kexi/migration/keximigrate.cpp b/kexi/migration/keximigrate.cpp index fc11d0cd..b225f6ba 100644 --- a/kexi/migration/keximigrate.cpp +++ b/kexi/migration/keximigrate.cpp @@ -33,9 +33,9 @@ using namespace KexiDB; using namespace KexiMigration; -KexiMigrate::KexiMigrate(TQObject *tqparent, const char *name, +KexiMigrate::KexiMigrate(TQObject *parent, const char *name, const TQStringList&) - : TQObject( tqparent, name ) + : TQObject( parent, name ) , m_migrateData(0) , m_destPrj(0) { diff --git a/kexi/migration/keximigrate.h b/kexi/migration/keximigrate.h index b897bd95..ee22ded8 100644 --- a/kexi/migration/keximigrate.h +++ b/kexi/migration/keximigrate.h @@ -145,7 +145,7 @@ class KEXIMIGR_EXPORT KexiMigrate : public TQObject, public KexiDB::Object protected: //! Used by MigrateManager. - KexiMigrate(TQObject *tqparent, const char *name, const TQStringList &args = TQStringList()); + KexiMigrate(TQObject *parent, const char *name, const TQStringList &args = TQStringList()); //! Connect to source database (driver specific) virtual bool drv_connect() = 0; diff --git a/kexi/migration/mysql/mysqlmigrate.cpp b/kexi/migration/mysql/mysqlmigrate.cpp index 1ea152c6..1b125d8d 100644 --- a/kexi/migration/mysql/mysqlmigrate.cpp +++ b/kexi/migration/mysql/mysqlmigrate.cpp @@ -52,9 +52,9 @@ KEXIMIGRATE_DRIVER_INFO( MySQLMigrate, mysql ) }*/ //! Constructor (needed for trading interface) -MySQLMigrate::MySQLMigrate(TQObject *tqparent, const char *name, +MySQLMigrate::MySQLMigrate(TQObject *parent, const char *name, const TQStringList &args) : - KexiMigrate(tqparent, name, args) + KexiMigrate(parent, name, args) ,d(new MySqlConnectionInternal(0)) ,m_mysqlres(0) { diff --git a/kexi/migration/mysql/mysqlmigrate.h b/kexi/migration/mysql/mysqlmigrate.h index e7627e76..8f223ac5 100644 --- a/kexi/migration/mysql/mysqlmigrate.h +++ b/kexi/migration/mysql/mysqlmigrate.h @@ -68,7 +68,7 @@ namespace KexiMigration public: // MySQLMigrate(); - MySQLMigrate(TQObject *tqparent, const char *name, const TQStringList& args = TQStringList()); + MySQLMigrate(TQObject *parent, const char *name, const TQStringList& args = TQStringList()); ~MySQLMigrate(); KexiDB::Field::Type type(const TQString& table, const MYSQL_FIELD* t); diff --git a/kexi/migration/pqxx/pg_type.h b/kexi/migration/pqxx/pg_type.h index a8b94f0a..e0ead91a 100644 --- a/kexi/migration/pqxx/pg_type.h +++ b/kexi/migration/pqxx/pg_type.h @@ -152,10 +152,10 @@ //XX:XX:XX:XX:XX:XX, MAC address #define MACADDROID 829 -//IP address/nettqmask, host address, nettqmask optional +//IP address/netmask, host address, netmask optional #define INETOID 869 -//network IP address/nettqmask, network address +//network IP address/netmask, network address #define CIDROID 650 //access control list diff --git a/kexi/migration/pqxx/pqxxmigrate.cpp b/kexi/migration/pqxx/pqxxmigrate.cpp index c01d68fd..d6c655f9 100644 --- a/kexi/migration/pqxx/pqxxmigrate.cpp +++ b/kexi/migration/pqxx/pqxxmigrate.cpp @@ -50,15 +50,15 @@ KEXIMIGRATE_DRIVER_INFO( PqxxMigrate, pqxx ) //================================================================================== //Constructor /*PqxxMigrate::PqxxMigrate() - : KexiMigrate(tqparent, name, args) + : KexiMigrate(parent, name, args) { m_res=0; m_trans=0; m_conn=0; }*/ -PqxxMigrate::PqxxMigrate(TQObject *tqparent, const char *name, const TQStringList &args) - : KexiMigrate(tqparent, name, args) +PqxxMigrate::PqxxMigrate(TQObject *parent, const char *name, const TQStringList &args) + : KexiMigrate(parent, name, args) { m_res=0; m_trans=0; diff --git a/kexi/migration/pqxx/pqxxmigrate.h b/kexi/migration/pqxx/pqxxmigrate.h index ee33c138..6202c0db 100644 --- a/kexi/migration/pqxx/pqxxmigrate.h +++ b/kexi/migration/pqxx/pqxxmigrate.h @@ -38,7 +38,7 @@ namespace KexiMigration KEXIMIGRATION_DRIVER public: - PqxxMigrate(TQObject *tqparent, const char *name, const TQStringList &args = TQStringList()); + PqxxMigrate(TQObject *parent, const char *name, const TQStringList &args = TQStringList()); virtual ~PqxxMigrate(); protected: -- cgit v1.2.1