summaryrefslogtreecommitdiffstats
path: root/kmymoney2
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-18 23:43:22 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-18 23:43:22 +0000
commita37fd34f6b4c37d51ebdcc3ad3c53b19336bd838 (patch)
tree99805ceff437ff257cb1ab4fc5c5aac87346841c /kmymoney2
parentf42d56d07c1ec8adc1857b47328a5fc4109662c5 (diff)
downloadkmymoney-a37fd34f6b4c37d51ebdcc3ad3c53b19336bd838.tar.gz
kmymoney-a37fd34f6b4c37d51ebdcc3ad3c53b19336bd838.zip
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
Diffstat (limited to 'kmymoney2')
-rw-r--r--kmymoney2/converter/mymoneystatementreader.cpp4
-rw-r--r--kmymoney2/dialogs/kchooseimportexportdlg.cpp4
-rw-r--r--kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp12
-rw-r--r--kmymoney2/mymoney/storage/mymoneystoragesql.cpp28
-rw-r--r--kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp2
-rw-r--r--kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp18
-rw-r--r--kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.h2
-rw-r--r--kmymoney2/views/kmymoneyview.cpp2
8 files changed, 36 insertions, 36 deletions
diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp
index 6595033..f25eed4 100644
--- a/kmymoney2/converter/mymoneystatementreader.cpp
+++ b/kmymoney2/converter/mymoneystatementreader.cpp
@@ -431,7 +431,7 @@ void MyMoneyStatementReader::processPriceEntry(const MyMoneyStatement::Price& p_
MyMoneyPrice price(d->securitiesBySymbol[p_in.m_strSecurity].id(),
MyMoneyFile::instance()->baseCurrency().id(),
p_in.m_date,
- p_in.m_amount, "TQIF");
+ p_in.m_amount, "QIF");
MyMoneyFile::instance()->addPrice(price);
} else if(d->securitiesByName.contains(p_in.m_strSecurity)) {
@@ -439,7 +439,7 @@ void MyMoneyStatementReader::processPriceEntry(const MyMoneyStatement::Price& p_
MyMoneyPrice price(d->securitiesByName[p_in.m_strSecurity].id(),
MyMoneyFile::instance()->baseCurrency().id(),
p_in.m_date,
- p_in.m_amount, "TQIF");
+ p_in.m_amount, "QIF");
MyMoneyFile::instance()->addPrice(price);
}
diff --git a/kmymoney2/dialogs/kchooseimportexportdlg.cpp b/kmymoney2/dialogs/kchooseimportexportdlg.cpp
index 4a44fa3..558216c 100644
--- a/kmymoney2/dialogs/kchooseimportexportdlg.cpp
+++ b/kmymoney2/dialogs/kchooseimportexportdlg.cpp
@@ -56,7 +56,7 @@ KChooseImportExportDlg::KChooseImportExportDlg(int type, TQWidget *parent, const
readConfig();
slotTypeActivated(m_lastType);
- typeCombo->setCurrentItem(((m_lastType=="TQIF") ? 0 : 1));
+ typeCombo->setCurrentItem(((m_lastType=="QIF") ? 0 : 1));
connect(typeCombo, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotTypeActivated(const TQString&)));
connect(okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()));
@@ -70,7 +70,7 @@ KChooseImportExportDlg::~KChooseImportExportDlg()
void KChooseImportExportDlg::slotTypeActivated(const TQString& text)
{
- if (text=="TQIF") {
+ if (text=="QIF") {
descriptionLabel->setText(i18n("TQIF files are created by the popular accounting program Quicken.\n"
"Another dialog will appear, if you choose this type, asking for further\n"
"information relevant to the Quicken format."));
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 <MyMoneyStorageSql> 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));
}
diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp
index 6d57e49..7287c6a 100644
--- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp
@@ -237,7 +237,7 @@ bool KOnlineBankingSetupWizard::finishLoginPage(void)
strncpy(fi.appid, exp.cap(1).latin1(), OFX_APPID_LENGTH-1);
strncpy(fi.appver, exp.cap(2).latin1(), OFX_APPVER_LENGTH-1);
} else {
- strncpy(fi.appid, "TQWIN", OFX_APPID_LENGTH-1);
+ strncpy(fi.appid, "QWIN", OFX_APPID_LENGTH-1);
strncpy(fi.appver, "1700", OFX_APPVER_LENGTH-1);
}
diff --git a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
index 71897d2..28f9e29 100644
--- a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
@@ -78,12 +78,12 @@ OfxAppVersion::OfxAppVersion(KComboBox* combo, const TQString& appId) :
// http://ofxblog.wordpress.com/2007/06/06/ofx-appid-and-appver-for-microsoft-money/
// Quicken
- m_appMap[i18n("Quicken Windows 2003")] = "TQWIN:1200";
- m_appMap[i18n("Quicken Windows 2004")] = "TQWIN:1300";
- m_appMap[i18n("Quicken Windows 2005")] = "TQWIN:1400";
- m_appMap[i18n("Quicken Windows 2006")] = "TQWIN:1500";
- m_appMap[i18n("Quicken Windows 2007")] = "TQWIN:1600";
- m_appMap[i18n("Quicken Windows 2008")] = "TQWIN:1700";
+ m_appMap[i18n("Quicken Windows 2003")] = "QWIN:1200";
+ m_appMap[i18n("Quicken Windows 2004")] = "QWIN:1300";
+ m_appMap[i18n("Quicken Windows 2005")] = "QWIN:1400";
+ m_appMap[i18n("Quicken Windows 2006")] = "QWIN:1500";
+ m_appMap[i18n("Quicken Windows 2007")] = "QWIN:1600";
+ m_appMap[i18n("Quicken Windows 2008")] = "QWIN:1700";
// MS-Money
m_appMap[i18n("MS-Money 2003")] = "Money:1100";
@@ -120,7 +120,7 @@ OfxAppVersion::OfxAppVersion(KComboBox* combo, const TQString& appId) :
const TQString& OfxAppVersion::appId(void) const
{
- static TQString defaultAppId("TQWIN:1700");
+ static TQString defaultAppId("QWIN:1700");
TQString app = m_combo->currentText();
if(m_appMap[app] != defaultAppId)
@@ -275,7 +275,7 @@ void MyMoneyOfxConnector::initRequest(OfxFiLogin* fi) const
strncpy(fi->appid, exp.cap(1).latin1(), OFX_APPID_LENGTH-1);
strncpy(fi->appver, exp.cap(2).latin1(), OFX_APPVER_LENGTH-1);
} else {
- strncpy(fi->appid, "TQWIN", OFX_APPID_LENGTH-1);
+ strncpy(fi->appid, "QWIN", OFX_APPID_LENGTH-1);
strncpy(fi->appver, "1700", OFX_APPVER_LENGTH-1);
}
@@ -401,7 +401,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::signOn(void) const
.element("USERPASS",password())
.element("LANGUAGE","ENG")
.subtag(fi)
- .element("APPID","TQWIN")
+ .element("APPID","QWIN")
.element("APPVER","1100"));
}
diff --git a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.h b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.h
index 56497f2..ccb3ee6 100644
--- a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.h
+++ b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.h
@@ -65,7 +65,7 @@ public:
/**
* This method returns the currently selected application id
* as a colon separated value consisting of the application
- * and version (eg. "TQWIN:1700"). If current value is the
+ * and version (eg. "QWIN:1700"). If current value is the
* default, an empty string is returned.
*/
const TQString& appId(void) const;
diff --git a/kmymoney2/views/kmymoneyview.cpp b/kmymoney2/views/kmymoneyview.cpp
index ccdc5a7..eba2a82 100644
--- a/kmymoney2/views/kmymoneyview.cpp
+++ b/kmymoney2/views/kmymoneyview.cpp
@@ -1462,7 +1462,7 @@ void KMyMoneyView::loadDefaultCurrencies(void)
loadDefaultCurrency(MyMoneySecurity("PEN", i18n("Peruvian Nuevo Sol")), create);
loadDefaultCurrency(MyMoneySecurity("PHP", i18n("Philippine Peso"), TQChar(0x20B1)), create);
loadDefaultCurrency(MyMoneySecurity("PLN", i18n("Polish Zloty")), create);
- loadDefaultCurrency(MyMoneySecurity("TQAR", i18n("Qatari Rial")), create);
+ loadDefaultCurrency(MyMoneySecurity("QAR", i18n("Qatari Rial")), create);
loadDefaultCurrency(MyMoneySecurity("RON", i18n("Romanian Leu (new)")), true);
loadDefaultCurrency(MyMoneySecurity("RUB", i18n("Russian Ruble")), true);
loadDefaultCurrency(MyMoneySecurity("RWF", i18n("Rwanda Franc")), create);