summaryrefslogtreecommitdiffstats
path: root/kexi/migration
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/migration')
-rw-r--r--kexi/migration/importwizard.cpp10
-rw-r--r--kexi/migration/keximigrate.cpp10
-rw-r--r--kexi/migration/migratemanager.cpp10
-rw-r--r--kexi/migration/mysql/mysqlmigrate.cpp4
4 files changed, 17 insertions, 17 deletions
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index bf20fbfb..b97b6fcf 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -130,7 +130,7 @@ void ImportWizard::parseArguments()
if (!(*m_args)["databaseName"].isEmpty() && !(*m_args)["mimeType"].isEmpty()) {
m_predefinedDatabaseName = (*m_args)["databaseName"];
m_predefinedMimeType = (*m_args)["mimeType"];
- if (m_args->tqcontains("connectionData")) {
+ if (m_args->contains("connectionData")) {
m_predefinedConnectionData = new KexiDB::ConnectionData();
KexiDB::fromMap(
KexiUtils::deserializeMap((*m_args)["connectionData"]), *m_predefinedConnectionData
@@ -429,13 +429,13 @@ void ImportWizard::arriveSrcConnPage()
m_setupFileBasedSrcNeeded = false;
TQStringList additionalMimeTypes;
/* moved
- if (m_srcTypeCombo->currentText().tqcontains("Access")) {
+ if (m_srcTypeCombo->currentText().contains("Access")) {
//! @todo tmp: hardcoded!
additionalMimeTypes << "application/x-msaccess";
}*/
m_srcConn->m_fileDlg->setMode(KexiStartupFileDialog::Opening);
m_srcConn->m_fileDlg->setAdditionalFilters(additionalMimeTypes);
-/*moved if (m_srcTypeCombo->currentText().tqcontains("Access")) {
+/*moved if (m_srcTypeCombo->currentText().contains("Access")) {
//! @todo tmp: hardcoded!
#ifdef TQ_WS_WIN
m_srcConn->m_fileDlg->setSelectedFilter("*.mdb");
@@ -639,7 +639,7 @@ void ImportWizard::accept()
// cancelButton()->setEnabled(true);
*/
if (m_args) {
- if ((!fileBasedDstSelected() && !m_args->tqcontains("destinationConnectionShortcut"))
+ if ((!fileBasedDstSelected() && !m_args->contains("destinationConnectionShortcut"))
|| !m_openImportedProjectCheckBox->isChecked())
{
//do not open dest db if used didn't want it
@@ -803,7 +803,7 @@ tristate ImportWizard::import()
{
if (!m_sourceDBEncoding.isEmpty()) {
sourceDriver->setPropertyValue( "source_database_nontqunicode_encoding",
- TQVariant(m_sourceDBEncoding.upper().tqreplace(' ',"")) // "CP1250", not "cp 1250"
+ TQVariant(m_sourceDBEncoding.upper().replace(' ',"")) // "CP1250", not "cp 1250"
);
}
diff --git a/kexi/migration/keximigrate.cpp b/kexi/migration/keximigrate.cpp
index 989a002a..fc11d0cd 100644
--- a/kexi/migration/keximigrate.cpp
+++ b/kexi/migration/keximigrate.cpp
@@ -168,7 +168,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
result->settqStatus(&drvManager);
return false;
}
- const bool kexi__objects_exists = tables.tqfind("kexi__objects")!=tables.end();
+ const bool kexi__objects_exists = tables.find("kexi__objects")!=tables.end();
TQStringList kexiDBTables;
if (kexi__objects_exists) {
tristate res = drv_queryStringListFromSQL(
@@ -344,13 +344,13 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
if (m_migrateData->keepData) {
//! @todo check detailed "copy forms/blobs/tables" flags here when we add them
// Copy data for "kexi__objectdata" as well, if available in the source db
- if (tables.tqfind("kexi__objectdata")!=tables.end())
+ if (tables.find("kexi__objectdata")!=tables.end())
m_tableSchemas.append(destConn->tableSchema("kexi__objectdata"));
// Copy data for "kexi__blobs" as well, if available in the source db
- if (tables.tqfind("kexi__blobs")!=tables.end())
+ if (tables.find("kexi__blobs")!=tables.end())
m_tableSchemas.append(destConn->tableSchema("kexi__blobs"));
// Copy data for "kexi__fields" as well, if available in the source db
- if (tables.tqfind("kexi__fields")!=tables.end())
+ if (tables.find("kexi__fields")!=tables.end())
m_tableSchemas.append(destConn->tableSchema("kexi__fields"));
}
@@ -371,7 +371,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result)
}
kdDebug() << "Copying data for table: " << tname << endl;
TQString originalTableName;
- if (kexiDBTables.tqfind(tname)==kexiDBTables.end())
+ if (kexiDBTables.find(tname)==kexiDBTables.end())
//caption is equal to the original name
originalTableName = ts.current()->caption().isEmpty() ? tname : ts.current()->caption();
else
diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp
index 8cd26c3c..2c0ce6cd 100644
--- a/kexi/migration/migratemanager.cpp
+++ b/kexi/migration/migratemanager.cpp
@@ -112,7 +112,7 @@ bool MigrateManagerInternal::lookupDrivers()
<< ptr->property("Name").toString() << "\" service!\n -- skipped!" << endl;
continue;
}
- if (m_services_lcase.tqcontains(srv_name.lower())) {
+ if (m_services_lcase.contains(srv_name.lower())) {
continue;
}
@@ -152,7 +152,7 @@ bool MigrateManagerInternal::lookupDrivers()
TQString drvType = ptr->property("X-Kexi-MigrationDriverType").toString().lower();
if (drvType=="file") {
if (!mime.isEmpty()) {
- if (!m_services_by_mimetype.tqcontains(mime)) {
+ if (!m_services_by_mimetype.contains(mime)) {
m_services_by_mimetype.insert(mime, ptr);
}
else {
@@ -183,16 +183,16 @@ KexiMigrate* MigrateManagerInternal::driver(const TQString& name)
clearError();
KexiDBDbg << "MigrationrManagerInternal::migrationDriver(): loading " << name << endl;
- KexiMigrate *drv = name.isEmpty() ? 0 : m_drivers.tqfind(name.latin1());
+ KexiMigrate *drv = name.isEmpty() ? 0 : m_drivers.find(name.latin1());
if (drv)
return drv; //cached
- if (!m_services_lcase.tqcontains(name.lower())) {
+ if (!m_services_lcase.contains(name.lower())) {
setError(ERR_DRIVERMANAGER, i18n("Could not find import/export database driver \"%1\".").tqarg(name) );
return 0;
}
- KService::Ptr ptr= *(m_services_lcase.tqfind(name.lower()));
+ KService::Ptr ptr= *(m_services_lcase.find(name.lower()));
TQString srv_name = ptr->property("X-Kexi-MigrationDriverName").toString();
KexiDBDbg << "MigrateManagerInternal::driver(): library: "<<ptr->library()<<endl;
diff --git a/kexi/migration/mysql/mysqlmigrate.cpp b/kexi/migration/mysql/mysqlmigrate.cpp
index 9b69350b..1ea152c6 100644
--- a/kexi/migration/mysql/mysqlmigrate.cpp
+++ b/kexi/migration/mysql/mysqlmigrate.cpp
@@ -417,10 +417,10 @@ KexiDB::Field::Type MySQLMigrate::examineBlobField(const TQString& table,
kdDebug() << "MySQLMigrate::examineBlobField: considering "
<< mysqlType << endl;
- if(mysqlType.tqcontains("blob", false) != 0) {
+ if(mysqlType.contains("blob", false) != 0) {
// Doesn't matter how big it is, it's binary
kexiType = KexiDB::Field::BLOB;
- } else if(mysqlType.tqcontains("text", false) != 0) {
+ } else if(mysqlType.contains("text", false) != 0) {
// All the TEXT types are too big for Kexi text.
kexiType = KexiDB::Field::BLOB;
} else if(fld->length < 200) {