summaryrefslogtreecommitdiffstats
path: root/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/kexidb/drivers/sqlite/sqliteconnection.cpp')
-rw-r--r--kexi/kexidb/drivers/sqlite/sqliteconnection.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
index 631f3bc6..cf478b94 100644
--- a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
@@ -130,7 +130,7 @@ bool SQLiteConnection::drv_containsTable( const TQString &tableName )
{
bool success;
return resultExists(TQString("select name from sqlite_master where type='table' and name LIKE %1")
- .tqarg(driver()->escapeString(tableName)), success) && success;
+ .arg(driver()->escapeString(tableName)), success) && success;
}
bool SQLiteConnection::drv_getTablesList( TQStringList &list )
@@ -188,7 +188,7 @@ bool SQLiteConnection::drv_useDatabase( const TQString &dbName, bool *cancelled,
d->res = sqlite3_open(
//TQFile::encodeName( data()->fileName() ),
- data()->fileName().utf8(), /* tqunicode expected since SQLite 3.1 */
+ data()->fileName().utf8(), /* unicode expected since SQLite 3.1 */
&d->data,
exclusiveFlag,
allowReadonly /* If 1 and locking fails, try opening in read-only mode */
@@ -200,7 +200,7 @@ bool SQLiteConnection::drv_useDatabase( const TQString &dbName, bool *cancelled,
if (KMessageBox::Continue !=
askQuestion(
i18n("Do you want to open file \"%1\" as read-only?")
- .tqarg(TQDir::convertSeparators(data()->fileName()))
+ .arg(TQDir::convertSeparators(data()->fileName()))
+ "\n\n"
+ i18n("The file is probably already open on this or another computer.") + " "
+ i18n("Could not gain exclusive access for writing the file."),
@@ -264,7 +264,7 @@ bool SQLiteConnection::drv_dropDatabase( const TQString &dbName )
const TQString filename = data()->fileName();
if (TQFile(filename).exists() && !TQDir().remove(filename)) {
setError(ERR_ACCESS_RIGHTS, i18n("Could not remove file \"%1\".")
- .tqarg(TQDir::convertSeparators(filename)) + " "
+ .arg(TQDir::convertSeparators(filename)) + " "
+ i18n("Check the file's permissions and whether it is already opened and locked by another application."));
return false;
}
@@ -324,9 +324,9 @@ TQString SQLiteConnection::serverResultName()
{
TQString r =
#ifdef SQLITE2
- TQString::tqfromLatin1( sqlite_error_string(d->res) );
+ TQString::fromLatin1( sqlite_error_string(d->res) );
#else //SQLITE3
- TQString(); //tqfromLatin1( d->result_name );
+ TQString(); //fromLatin1( d->result_name );
#endif
return r.isEmpty() ? Connection::serverResultName() : r;
}
@@ -395,8 +395,8 @@ bool SQLiteConnection::drv_alterTableName(TableSchema& tableSchema, const TQStri
//TODO indices, etc.???
// 3. copy all rows to the new table
- if (!executeSQL(TQString::tqfromLatin1("INSERT INTO %1 SELECT * FROM %2")
- .tqarg(escapeIdentifier(tableSchema.name())).tqarg(escapeIdentifier(oldTableName))))
+ if (!executeSQL(TQString::fromLatin1("INSERT INTO %1 SELECT * FROM %2")
+ .arg(escapeIdentifier(tableSchema.name())).arg(escapeIdentifier(oldTableName))))
{
drv_alterTableName_ERR;
return false;