From a37fd34f6b4c37d51ebdcc3ad3c53b19336bd838 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 18 Sep 2011 23:43:22 +0000 Subject: 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/kmymoney@1254372 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../mymoney/storage/mymoneydatabasemgrtest.cpp | 12 +++++----- kmymoney2/mymoney/storage/mymoneystoragesql.cpp | 28 +++++++++++----------- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'kmymoney2/mymoney') diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp index 0591e2d..d0d2065 100644 --- a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp +++ b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp @@ -88,13 +88,13 @@ void MyMoneyDatabaseMgrTest::testCreateDb() { if (pwd != 0) { userName = TQString(pwd->pw_name); } - //"TQMYSQL3" - //"TQPSQL7" - //"TQSQLITE3" + //"QMYSQL3" + //"QPSQL7" + //"QSQLITE3" m_url = "sql://" + userName + "@localhost/kmm_test_driver?driver=" - //"TQPSQL7&mode=single"; - //"TQSQLITE3&mode=single"; - //"TQMYSQL3&mode=single"; + //"QPSQL7&mode=single"; + //"QSQLITE3&mode=single"; + //"QMYSQL3&mode=single"; + *it + "&mode=single"; KSharedPtr sql = m->connectToDatabase(m_url); CPPUNIT_ASSERT(0 != sql); diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp index 4995d02..8f6a4f3 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp +++ b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp @@ -79,24 +79,24 @@ bool MyMoneySqlQuery::prepare ( const TQString & query ) { //***************************************************************************** MyMoneyDbDrivers::MyMoneyDbDrivers () { m_driverMap["TQDB2"] = TQString("IBM DB2"); - m_driverMap["TQIBASE"] = TQString("Borland Interbase"); - m_driverMap["TQMYSQL3"] = TQString("MySQL"); - m_driverMap["TQOCI8"] = TQString("Oracle Call Interface, version 8 and 9"); - m_driverMap["TQODBC3"] = TQString("Open Database Connectivity"); - m_driverMap["TQPSQL7"] = TQString("PostgreSQL v6.x and v7.x"); - m_driverMap["TQTDS7"] = TQString("Sybase Adaptive Server and Microsoft SQL Server"); - m_driverMap["TQSQLITE3"] = TQString("SQLite Version 3"); + m_driverMap["QIBASE"] = TQString("Borland Interbase"); + m_driverMap["QMYSQL3"] = TQString("MySQL"); + m_driverMap["QOCI8"] = TQString("Oracle Call Interface, version 8 and 9"); + m_driverMap["QODBC3"] = TQString("Open Database Connectivity"); + m_driverMap["QPSQL7"] = TQString("PostgreSQL v6.x and v7.x"); + m_driverMap["QTDS7"] = TQString("Sybase Adaptive Server and Microsoft SQL Server"); + m_driverMap["QSQLITE3"] = TQString("SQLite Version 3"); } databaseTypeE MyMoneyDbDrivers::driverToType (const TQString& driver) const { if (driver == "TQDB2") return(Db2); - else if (driver == "TQIBASE") return(Interbase); - else if (driver == "TQMYSQL3") return(Mysql); - else if (driver == "TQOCI8") return(Oracle8); - else if (driver == "TQODBC3") return(ODBC3); - else if (driver == "TQPSQL7") return(Postgresql); - else if (driver == "TQTDS7") return(Sybase); - else if (driver == "TQSQLITE3") return(Sqlite3); + else if (driver == "QIBASE") return(Interbase); + else if (driver == "QMYSQL3") return(Mysql); + else if (driver == "QOCI8") return(Oracle8); + else if (driver == "QODBC3") return(ODBC3); + else if (driver == "QPSQL7") return(Postgresql); + else if (driver == "QTDS7") return(Sybase); + else if (driver == "QSQLITE3") return(Sqlite3); else throw new MYMONEYEXCEPTION (TQString("Unknown database driver type").tqarg(driver)); } -- cgit v1.2.1