summaryrefslogtreecommitdiffstats
path: root/kexi/migration
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/migration')
-rw-r--r--kexi/migration/importoptionsdlg.cpp6
-rw-r--r--kexi/migration/importwizard.cpp30
-rw-r--r--kexi/migration/importwizard.h4
-rw-r--r--kexi/migration/keximigrate.cpp42
-rw-r--r--kexi/migration/keximigrate.h8
-rw-r--r--kexi/migration/migratemanager.cpp2
-rw-r--r--kexi/migration/mysql/mysqlmigrate.cpp4
-rw-r--r--kexi/migration/pqxx/pqxxmigrate.cpp14
8 files changed, 55 insertions, 55 deletions
diff --git a/kexi/migration/importoptionsdlg.cpp b/kexi/migration/importoptionsdlg.cpp
index 50d6726d0..e89d0932f 100644
--- a/kexi/migration/importoptionsdlg.cpp
+++ b/kexi/migration/importoptionsdlg.cpp
@@ -53,7 +53,7 @@ OptionsDialog::OptionsDialog( const TQString& databaseFile, const TQString& sele
KDialogBase::spacingHint());
m_encodingComboBox = new KexiCharacterEncodingComboBox(plainPage(), selectedEncoding);
- m_encodingComboBox->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+ m_encodingComboBox->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
lyr->addWidget( m_encodingComboBox, 1, 1 );
TQLabel* lbl = new TQLabel(
i18n("<h3>Text encoding for Microsoft Access database</h3>\n"
@@ -61,8 +61,8 @@ OptionsDialog::OptionsDialog( const TQString& databaseFile, const TQString& sele
"<p>In order to properly import national characters, you may need to choose a proper text encoding "
"if the database was created on a computer with a different character set.</p>")
.tqarg(TQDir::convertSeparators(databaseFile)), plainPage());
- lbl->tqsetAlignment( TQt::AlignAuto | TQt::WordBreak );
- lbl->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+ lbl->setAlignment( TQt::AlignAuto | TQt::WordBreak );
+ lbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
lyr->addMultiCellWidget( lbl, 0, 0, 0, 2 );
TQLabel* lbl2 = new TQLabel( m_encodingComboBox, i18n("Text encoding:"), plainPage());
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index 9c1b45598..91de5f7f8 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -110,7 +110,7 @@ ImportWizard::ImportWizard(TQWidget *parent, TQMap<TQString,TQString>* args)
}
}
- m_sourceDBEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding()); //default
+ m_sourceDBEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); //default
}
//===========================================================
@@ -148,7 +148,7 @@ void ImportWizard::setupIntro()
TQVBoxLayout *vbox = new TQVBoxLayout(m_introPage, KDialog::marginHint());
TQLabel *lblIntro = new TQLabel(m_introPage);
- lblIntro->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
+ lblIntro->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
TQString msg;
if (m_predefinedConnectionData) { //predefined import: server source
msg = i18n("<qt>Database Importing wizard is about to import \"%1\" database "
@@ -247,7 +247,7 @@ void ImportWizard::setupDstType()
TQHBoxLayout *hbox = new TQHBoxLayout(vbox);
TQLabel *lbl = new TQLabel(i18n("Destination database type:")+" ", m_dstTypePage);
- lbl->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop);
+ lbl->setAlignment(TQt::AlignAuto|TQt::AlignTop);
hbox->addWidget(lbl);
m_dstPrjTypeSelector = new KexiPrjTypeSelector(m_dstTypePage);
@@ -339,10 +339,10 @@ void ImportWizard::setupImporting()
m_importingPage->hide();
TQVBoxLayout *vbox = new TQVBoxLayout(m_importingPage, KDialog::marginHint());
m_lblImportingTxt = new TQLabel(m_importingPage);
- m_lblImportingTxt->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
+ m_lblImportingTxt->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
m_lblImportingErrTxt = new TQLabel(m_importingPage);
- m_lblImportingErrTxt->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
+ m_lblImportingErrTxt->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
m_progressBar = new KProgress(100, m_importingPage);
m_progressBar->hide();
@@ -374,7 +374,7 @@ void ImportWizard::setupFinish()
m_finishPage->hide();
TQVBoxLayout *vbox = new TQVBoxLayout(m_finishPage, KDialog::marginHint());
m_finishLbl = new TQLabel(m_finishPage);
- m_finishLbl->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
+ m_finishLbl->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
vbox->addWidget( m_finishLbl );
m_openImportedProjectCheckBox = new TQCheckBox(i18n("Open imported project"),
@@ -398,7 +398,7 @@ bool ImportWizard::checkUserInput()
finishtxt = finishtxt + "<br>" + i18n("No new database name was entered.");
}
- Kexi::ObjecttqStatus result;
+ Kexi::ObjectStatus result;
KexiMigrate* sourceDriver = prepareImport(result);
if (sourceDriver && sourceDriver->isSourceAndDestinationDataSourceTheSame())
{
@@ -551,7 +551,7 @@ void ImportWizard::arriveImportingPage() {
//! and KexiMigration::Driver classes
bool showOptions = false;
if (fileBasedSrcSelected()) {
- Kexi::ObjecttqStatus result;
+ Kexi::ObjectStatus result;
KexiMigrate* sourceDriver = prepareImport(result);
if (sourceDriver) {
showOptions = !result.error()
@@ -650,7 +650,7 @@ void ImportWizard::accept()
KWizard::accept();
}
-KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result)
+KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result)
{
KexiUtils::WaitCursor wait;
@@ -667,10 +667,10 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result)
);
if (!destDriver || manager.error())
{
- result.settqStatus(&manager);
+ result.setStatus(&manager);
kdDebug() << "Manager error..." << endl;
manager.debugError();
-// result.settqStatus(&manager);
+// result.setStatus(&manager);
}
// Set up destination connection data
@@ -702,7 +702,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result)
{
//TODO This needs a better message
//KMessageBox::error(this,
- result.settqStatus(i18n("No connection data is available. You did not select a destination filename."),"");
+ result.setStatus(i18n("No connection data is available. You did not select a destination filename."),"");
//return false;
} */
}
@@ -713,7 +713,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result)
{
sourceDriverName = driverNameForSelectedSource();
if (sourceDriverName.isEmpty())
- result.settqStatus(i18n("No appropriate migration driver found."),
+ result.setStatus(i18n("No appropriate migration driver found."),
m_migrateManager.possibleProblemsInfoMsg());
}
@@ -724,7 +724,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result)
sourceDriver = m_migrateManager.driver( sourceDriverName );
if(!sourceDriver || m_migrateManager.error()) {
kdDebug() << "Import migrate driver error..." << endl;
- result.settqStatus(&m_migrateManager);
+ result.setStatus(&m_migrateManager);
}
}
@@ -793,7 +793,7 @@ tristate ImportWizard::import()
{
m_importExecuted = true;
- Kexi::ObjecttqStatus result;
+ Kexi::ObjectStatus result;
KexiMigrate* sourceDriver = prepareImport(result);
bool acceptingNeeded = false;
diff --git a/kexi/migration/importwizard.h b/kexi/migration/importwizard.h
index 8d3a82b02..19a1b844c 100644
--- a/kexi/migration/importwizard.h
+++ b/kexi/migration/importwizard.h
@@ -47,7 +47,7 @@ class KexiPrjTypeSelector;
namespace Kexi
{
- class ObjecttqStatus;
+ class ObjectStatus;
}
namespace KexiDB
@@ -98,7 +98,7 @@ private:
void setupImporting();
bool checkUserInput();
- KexiMigrate* prepareImport(Kexi::ObjecttqStatus& result);
+ KexiMigrate* prepareImport(Kexi::ObjectStatus& result);
/*! Performs import. \return true/false on success/faulure
or cancelled when user cancelled importing (mainly
diff --git a/kexi/migration/keximigrate.cpp b/kexi/migration/keximigrate.cpp
index b225f6ba1..7b4944f25 100644
--- a/kexi/migration/keximigrate.cpp
+++ b/kexi/migration/keximigrate.cpp
@@ -61,18 +61,18 @@ KexiMigrate::~KexiMigrate()
delete m_destPrj;
}
-bool KexiMigrate::checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjecttqStatus* result,
+bool KexiMigrate::checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjectStatus* result,
bool& acceptingNeeded)
{
acceptingNeeded = false;
if (result)
- result->cleartqStatus();
+ result->clearStatus();
KexiDB::DriverManager drvManager;
KexiDB::Driver *destDriver = drvManager.driver(
m_migrateData->destination->connectionData()->driverName);
if (!destDriver) {
- result->settqStatus(&drvManager,
+ result->setStatus(&drvManager,
i18n("Could not create database \"%1\".")
.tqarg(m_migrateData->destination->databaseName()));
return false;
@@ -113,16 +113,16 @@ bool KexiMigrate::isSourceAndDestinationDataSourceTheSame() const
//=============================================================================
// Perform Import operation
-bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
+bool KexiMigrate::performImport(Kexi::ObjectStatus* result)
{
if (result)
- result->cleartqStatus();
+ result->clearStatus();
KexiDB::DriverManager drvManager;
KexiDB::Driver *destDriver = drvManager.driver(
m_migrateData->destination->connectionData()->driverName);
if (!destDriver) {
- result->settqStatus(&drvManager,
+ result->setStatus(&drvManager,
i18n("Could not create database \"%1\".")
.tqarg(m_migrateData->destination->databaseName()));
return false;
@@ -135,7 +135,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
if (!drv_connect()) {
kdDebug() << "Couldnt connect to database server" << endl;
if (result)
- result->settqStatus(i18n("Could not connect to data source \"%1\".")
+ result->setStatus(i18n("Could not connect to data source \"%1\".")
.tqarg(m_migrateData->source->serverInfoString()), "");
return false;
}
@@ -145,7 +145,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
if (!tableNames(tables)) {
kdDebug() << "Couldnt get list of tables" << endl;
if (result)
- result->settqStatus(
+ result->setStatus(
i18n("Could not get a list of table names for data source \"%1\".")
.tqarg(m_migrateData->source->serverInfoString()), "");
return false;
@@ -155,7 +155,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
if (tables.isEmpty()) {
kdDebug() << "There were no tables to import" << endl;
if (result)
- result->settqStatus(
+ result->setStatus(
i18n("No tables to import found in data source \"%1\".")
.tqarg(m_migrateData->source->serverInfoString()), "");
return false;
@@ -165,14 +165,14 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
tables.sort();
m_tableSchemas.clear();
if (!destDriver) {
- result->settqStatus(&drvManager);
+ result->setStatus(&drvManager);
return false;
}
const bool kexi__objects_exists = tables.find("kexi__objects")!=tables.end();
TQStringList kexiDBTables;
if (kexi__objects_exists) {
tristate res = drv_queryStringListFromSQL(
- TQString::tqfromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1")
+ TQString::fromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1")
.tqarg((int)KexiDB::TableObjectType), 0, kexiDBTables, -1);
if (res == true) {
// prepend KexiDB-compatible tables to 'tables' list, so we'll copy KexiDB-compatible tables first,
@@ -199,7 +199,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
if (!drv_readTableSchema(*it, *tableSchema)) {
delete tableSchema;
if (result)
- result->settqStatus(
+ result->setStatus(
i18n("Could not import project from data source \"%1\". Error reading table \"%2\".")
.tqarg(m_migrateData->source->serverInfoString()).tqarg(tableName), "");
return false;
@@ -228,7 +228,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
if (trans.isNull()) {
ok = false;
if (result)
- result->settqStatus(destConn,
+ result->setStatus(destConn,
i18n("Could not create database \"%1\".")
.tqarg(m_migrateData->destination->databaseName()));
//later destConn->dropDatabase(m_migrateData->destination->databaseName());
@@ -258,7 +258,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
//load schema for every field and add it
firstRecord = true;
TQString sql(
- TQString::tqfromLatin1("SELECT t_id, f_type, f_name, f_length, f_precision, f_constraints, "
+ TQString::fromLatin1("SELECT t_id, f_type, f_name, f_length, f_precision, f_constraints, "
"f_options, f_default, f_order, f_caption, f_help"
" FROM kexi__fields WHERE t_id=%1 ORDER BY f_order").tqarg(t->id()) );
while (ok) {
@@ -299,7 +299,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
kdDebug() << "Failed to create a table " << ts->name() << endl;
destConn->debugError();
if (result)
- result->settqStatus(destConn,
+ result->setStatus(destConn,
i18n("Could not create database \"%1\".")
.tqarg(m_migrateData->destination->databaseName()));
m_tableSchemas.remove(ts);
@@ -329,7 +329,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
if (m_destPrj->error()) {
ok = false;
if (result)
- result->settqStatus(m_destPrj,
+ result->setStatus(m_destPrj,
i18n("Could not import project from data source \"%1\".")
.tqarg(m_migrateData->source->serverInfoString()));
}
@@ -380,7 +380,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
if (!ok) {
kdDebug() << "Failed to copy table " << tname << endl;
if (result)
- result->settqStatus(destConn,
+ result->setStatus(destConn,
i18n("Could not copy table \"%1\" to destination database.").tqarg(tname));
break;
}
@@ -404,7 +404,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
// Finally: error handling
if (result && result->error())
- result->settqStatus(destConn,
+ result->setStatus(destConn,
i18n("Could not import data from data source \"%1\".")
.tqarg(m_migrateData->source->serverInfoString()));
if (destConn) {
@@ -420,10 +420,10 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
}
//=============================================================================
-bool KexiMigrate::performExport(Kexi::ObjecttqStatus* result)
+bool KexiMigrate::performExport(Kexi::ObjectStatus* result)
{
if (result)
- result->cleartqStatus();
+ result->clearStatus();
//! @todo performExport
@@ -588,7 +588,7 @@ bool KexiMigrate::drv_queryMaxNumber(const TQString& tableName,
{
TQString string;
tristate r = drv_querySingleStringFromSQL(
- TQString::tqfromLatin1("SELECT MAX(%1) FROM %2").tqarg(drv_escapeIdentifier(columnName))
+ TQString::fromLatin1("SELECT MAX(%1) FROM %2").tqarg(drv_escapeIdentifier(columnName))
.tqarg(drv_escapeIdentifier(tableName)), 0, string);
if (r == false)
return false;
diff --git a/kexi/migration/keximigrate.h b/kexi/migration/keximigrate.h
index ee22ded85..cd2949f9d 100644
--- a/kexi/migration/keximigrate.h
+++ b/kexi/migration/keximigrate.h
@@ -34,7 +34,7 @@
class KexiProject;
namespace Kexi
{
- class ObjecttqStatus;
+ class ObjectStatus;
}
/*! KexiMigration implementation version.
@@ -99,7 +99,7 @@ class KEXIMIGR_EXPORT KexiMigrate : public TQObject, public KexiDB::Object
\a acceptingNeeded is set to true if destination database exists.
In this case you should ask about accepting database overwriting.
Used in ImportWizard::import(). */
- bool checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjecttqStatus* result,
+ bool checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjectStatus* result,
bool& acceptingNeeded);
/*! Checks if the source- and the destination databases are identical.
@@ -107,10 +107,10 @@ class KEXIMIGR_EXPORT KexiMigrate : public TQObject, public KexiDB::Object
bool isSourceAndDestinationDataSourceTheSame() const;
//! Perform an import operation
- bool performImport(Kexi::ObjecttqStatus* result = 0);
+ bool performImport(Kexi::ObjectStatus* result = 0);
//! Perform an export operation
- bool performExport(Kexi::ObjecttqStatus* result = 0);
+ bool performExport(Kexi::ObjectStatus* result = 0);
//! Returns true if the migration driver supports progress updates.
inline bool progressSupported() { return drv_progressSupported(); }
diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp
index 2c0ce6cdb..d46b9e4df 100644
--- a/kexi/migration/migratemanager.cpp
+++ b/kexi/migration/migratemanager.cpp
@@ -363,7 +363,7 @@ TQString MigrateManager::possibleProblemsInfoMsg() const
for (TQStringList::ConstIterator it = d_int->possibleProblems.constBegin();
it!=d_int->possibleProblems.constEnd(); ++it)
{
- str += (TQString::tqfromLatin1("<li>") + *it + TQString::tqfromLatin1("</li>"));
+ str += (TQString::fromLatin1("<li>") + *it + TQString::fromLatin1("</li>"));
}
str += "</ul>";
return str;
diff --git a/kexi/migration/mysql/mysqlmigrate.cpp b/kexi/migration/mysql/mysqlmigrate.cpp
index 1b125d8dc..786712412 100644
--- a/kexi/migration/mysql/mysqlmigrate.cpp
+++ b/kexi/migration/mysql/mysqlmigrate.cpp
@@ -396,7 +396,7 @@ KexiDB::Field::Type MySQLMigrate::examineBlobField(const TQString& table,
TQString mysqlType;
KexiDB::Field::Type kexiType;
TQString query = "SHOW COLUMNS FROM `" + drv_escapeIdentifier(table) +
- "` LIKE '" + TQString::tqfromLatin1(fld->name) + "'";
+ "` LIKE '" + TQString::fromLatin1(fld->name) + "'";
if(d->executeSQL(query)) {
MYSQL_RES *res = mysql_store_result(d->mysql);
@@ -444,7 +444,7 @@ TQStringList MySQLMigrate::examineEnumField(const TQString& table,
const MYSQL_FIELD* fld) {
TQString vals;
TQString query = "SHOW COLUMNS FROM `" + drv_escapeIdentifier(table) +
- "` LIKE '" + TQString::tqfromLatin1(fld->name) + "'";
+ "` LIKE '" + TQString::fromLatin1(fld->name) + "'";
if(d->executeSQL(query)) {
MYSQL_RES *res = mysql_store_result(d->mysql);
diff --git a/kexi/migration/pqxx/pqxxmigrate.cpp b/kexi/migration/pqxx/pqxxmigrate.cpp
index d6c655f98..b7f043514 100644
--- a/kexi/migration/pqxx/pqxxmigrate.cpp
+++ b/kexi/migration/pqxx/pqxxmigrate.cpp
@@ -135,7 +135,7 @@ bool PqxxMigrate::drv_tableNames(TQStringList& tableNames)
for (pqxx::result::const_iterator c = m_res->begin(); c != m_res->end(); ++c)
{
// Copy the result into the return list
- tableNames << TQString::tqfromLatin1 (c[0].c_str());
+ tableNames << TQString::fromLatin1 (c[0].c_str());
}
return true;
}
@@ -217,15 +217,15 @@ bool PqxxMigrate::drv_connect()
if (m_migrateData->source->port == 0)
m_migrateData->source->port = 5432;
- conninfo += TQString::tqfromLatin1(" port='%1'").tqarg(m_migrateData->source->port);
+ conninfo += TQString::fromLatin1(" port='%1'").tqarg(m_migrateData->source->port);
- conninfo += TQString::tqfromLatin1(" dbname='%1'").tqarg(m_migrateData->sourceName);
+ conninfo += TQString::fromLatin1(" dbname='%1'").tqarg(m_migrateData->sourceName);
if (!m_migrateData->source->userName.isNull())
- conninfo += TQString::tqfromLatin1(" user='%1'").tqarg(m_migrateData->source->userName);
+ conninfo += TQString::fromLatin1(" user='%1'").tqarg(m_migrateData->source->userName);
if (!m_migrateData->source->password.isNull())
- conninfo += TQString::tqfromLatin1(" password='%1'").tqarg(m_migrateData->source->password);
+ conninfo += TQString::fromLatin1(" password='%1'").tqarg(m_migrateData->source->password);
try
{
@@ -480,7 +480,7 @@ tristate PqxxMigrate::drv_queryStringListFromSQL(
mysql_free_result(res);
return false;
}
- string = TQString::tqfromLatin1(row[columnNumber], lengths[columnNumber]);
+ string = TQString::fromLatin1(row[columnNumber], lengths[columnNumber]);
mysql_free_result(res);
} else {
kdDebug() << "PqxxMigrate::drv_querySingleStringFromSQL(): null result" << endl;
@@ -647,7 +647,7 @@ bool PqxxMigrate::notEmpty(pqxx::oid /*table_uid*/, int /*col*/) const
// Read value of column 0 into a string N
c[0].to(N);
// Copy the result into the return list
- list << TQString::tqfromLatin1 (N.c_str());
+ list << TQString::fromLatin1 (N.c_str());
KexiDBDrvDbg << N.c_str() << endl;
}
return true;
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-06 18:22:07 +0000