From d943ac59762fd6e04159981a292a6f45236bfba0 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 18 Sep 2011 23:43:22 +0000 Subject: [PATCH] Fix a number of strings in Trinity that were incorrectly converted to TQ* from Q* This fixes the Kopete MSN protocol among other things git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kbarcode@1254372 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kbarcode/sqltables.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kbarcode/sqltables.cpp b/kbarcode/sqltables.cpp index 8db24b3..fc9db01 100644 --- a/kbarcode/sqltables.cpp +++ b/kbarcode/sqltables.cpp @@ -73,11 +73,11 @@ class SQLiteDescription : public SqlDescription { SqlTables::SqlTables( TQObject* parent ) : TQObject( parent, "sqltables" ) { - drivers.insert( "TQMYSQL3", new MySqlDescription() ); - drivers.insert( "TQPSQL7", new PostgreSQLDescription() ); + drivers.insert( "QMYSQL3", new MySqlDescription() ); + drivers.insert( "QPSQL7", new PostgreSQLDescription() ); /* The same driver plugin is used for TQDBC and SQLite */ - drivers.insert( "TQSQLITE", new SQLiteDescription() ); - drivers.insert( "TQODBC3", new SQLiteDescription() ); + drivers.insert( "QSQLITE", new SQLiteDescription() ); + drivers.insert( "QODBC3", new SQLiteDescription() ); db = NULL; connected = false; @@ -152,7 +152,7 @@ bool SqlTables::newTables( const TQString & username, const TQString & password, if(dbase->open()) { - if (driver != "TQSQLITE") + if (driver != "QSQLITE") { bool found = false; TQSqlQuery existing("SHOW DATABASES LIKE '" + database + "';"); @@ -349,7 +349,7 @@ void SqlTables::loadConfig() sqldata.password = config->readEntry("password", "" ); sqldata.hostname = config->readEntry("hostname", "localhost" ); sqldata.database = config->readEntry("database", "kbarcode" ); - sqldata.driver = config->readEntry("driver", "TQMYSQL3" ); + sqldata.driver = config->readEntry("driver", "QMYSQL3" ); sqldata.autoconnect = config->readBoolEntry("autoconnect", false ); } @@ -376,7 +376,7 @@ void SqlTables::updateTables() * as they have already been created with the most * recent database structures. */ - if( sqldata.driver != "TQMYSQL3" ) + if( sqldata.driver != "QMYSQL3" ) return; bool changed = false;