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
v3.5.13-sru
tpearson 13 years ago
parent f42d56d07c
commit a37fd34f6b

@ -431,7 +431,7 @@ void MyMoneyStatementReader::processPriceEntry(const MyMoneyStatement::Price& p_
MyMoneyPrice price(d->securitiesBySymbol[p_in.m_strSecurity].id(), MyMoneyPrice price(d->securitiesBySymbol[p_in.m_strSecurity].id(),
MyMoneyFile::instance()->baseCurrency().id(), MyMoneyFile::instance()->baseCurrency().id(),
p_in.m_date, p_in.m_date,
p_in.m_amount, "TQIF"); p_in.m_amount, "QIF");
MyMoneyFile::instance()->addPrice(price); MyMoneyFile::instance()->addPrice(price);
} else if(d->securitiesByName.contains(p_in.m_strSecurity)) { } 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(), MyMoneyPrice price(d->securitiesByName[p_in.m_strSecurity].id(),
MyMoneyFile::instance()->baseCurrency().id(), MyMoneyFile::instance()->baseCurrency().id(),
p_in.m_date, p_in.m_date,
p_in.m_amount, "TQIF"); p_in.m_amount, "QIF");
MyMoneyFile::instance()->addPrice(price); MyMoneyFile::instance()->addPrice(price);
} }

@ -56,7 +56,7 @@ KChooseImportExportDlg::KChooseImportExportDlg(int type, TQWidget *parent, const
readConfig(); readConfig();
slotTypeActivated(m_lastType); 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(typeCombo, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotTypeActivated(const TQString&)));
connect(okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); connect(okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()));
@ -70,7 +70,7 @@ KChooseImportExportDlg::~KChooseImportExportDlg()
void KChooseImportExportDlg::slotTypeActivated(const TQString& text) 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" 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" "Another dialog will appear, if you choose this type, asking for further\n"
"information relevant to the Quicken format.")); "information relevant to the Quicken format."));

@ -88,13 +88,13 @@ void MyMoneyDatabaseMgrTest::testCreateDb() {
if (pwd != 0) { if (pwd != 0) {
userName = TQString(pwd->pw_name); userName = TQString(pwd->pw_name);
} }
//"TQMYSQL3" //"QMYSQL3"
//"TQPSQL7" //"QPSQL7"
//"TQSQLITE3" //"QSQLITE3"
m_url = "sql://" + userName + "@localhost/kmm_test_driver?driver=" m_url = "sql://" + userName + "@localhost/kmm_test_driver?driver="
//"TQPSQL7&mode=single"; //"QPSQL7&mode=single";
//"TQSQLITE3&mode=single"; //"QSQLITE3&mode=single";
//"TQMYSQL3&mode=single"; //"QMYSQL3&mode=single";
+ *it + "&mode=single"; + *it + "&mode=single";
KSharedPtr <MyMoneyStorageSql> sql = m->connectToDatabase(m_url); KSharedPtr <MyMoneyStorageSql> sql = m->connectToDatabase(m_url);
CPPUNIT_ASSERT(0 != sql); CPPUNIT_ASSERT(0 != sql);

@ -79,24 +79,24 @@ bool MyMoneySqlQuery::prepare ( const TQString & query ) {
//***************************************************************************** //*****************************************************************************
MyMoneyDbDrivers::MyMoneyDbDrivers () { MyMoneyDbDrivers::MyMoneyDbDrivers () {
m_driverMap["TQDB2"] = TQString("IBM DB2"); m_driverMap["TQDB2"] = TQString("IBM DB2");
m_driverMap["TQIBASE"] = TQString("Borland Interbase"); m_driverMap["QIBASE"] = TQString("Borland Interbase");
m_driverMap["TQMYSQL3"] = TQString("MySQL"); m_driverMap["QMYSQL3"] = TQString("MySQL");
m_driverMap["TQOCI8"] = TQString("Oracle Call Interface, version 8 and 9"); m_driverMap["QOCI8"] = TQString("Oracle Call Interface, version 8 and 9");
m_driverMap["TQODBC3"] = TQString("Open Database Connectivity"); m_driverMap["QODBC3"] = TQString("Open Database Connectivity");
m_driverMap["TQPSQL7"] = TQString("PostgreSQL v6.x and v7.x"); m_driverMap["QPSQL7"] = TQString("PostgreSQL v6.x and v7.x");
m_driverMap["TQTDS7"] = TQString("Sybase Adaptive Server and Microsoft SQL Server"); m_driverMap["QTDS7"] = TQString("Sybase Adaptive Server and Microsoft SQL Server");
m_driverMap["TQSQLITE3"] = TQString("SQLite Version 3"); m_driverMap["QSQLITE3"] = TQString("SQLite Version 3");
} }
databaseTypeE MyMoneyDbDrivers::driverToType (const TQString& driver) const { databaseTypeE MyMoneyDbDrivers::driverToType (const TQString& driver) const {
if (driver == "TQDB2") return(Db2); if (driver == "TQDB2") return(Db2);
else if (driver == "TQIBASE") return(Interbase); else if (driver == "QIBASE") return(Interbase);
else if (driver == "TQMYSQL3") return(Mysql); else if (driver == "QMYSQL3") return(Mysql);
else if (driver == "TQOCI8") return(Oracle8); else if (driver == "QOCI8") return(Oracle8);
else if (driver == "TQODBC3") return(ODBC3); else if (driver == "QODBC3") return(ODBC3);
else if (driver == "TQPSQL7") return(Postgresql); else if (driver == "QPSQL7") return(Postgresql);
else if (driver == "TQTDS7") return(Sybase); else if (driver == "QTDS7") return(Sybase);
else if (driver == "TQSQLITE3") return(Sqlite3); else if (driver == "QSQLITE3") return(Sqlite3);
else throw new MYMONEYEXCEPTION (TQString("Unknown database driver type").tqarg(driver)); else throw new MYMONEYEXCEPTION (TQString("Unknown database driver type").tqarg(driver));
} }

@ -237,7 +237,7 @@ bool KOnlineBankingSetupWizard::finishLoginPage(void)
strncpy(fi.appid, exp.cap(1).latin1(), OFX_APPID_LENGTH-1); strncpy(fi.appid, exp.cap(1).latin1(), OFX_APPID_LENGTH-1);
strncpy(fi.appver, exp.cap(2).latin1(), OFX_APPVER_LENGTH-1); strncpy(fi.appver, exp.cap(2).latin1(), OFX_APPVER_LENGTH-1);
} else { } 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); strncpy(fi.appver, "1700", OFX_APPVER_LENGTH-1);
} }

@ -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/ // http://ofxblog.wordpress.com/2007/06/06/ofx-appid-and-appver-for-microsoft-money/
// Quicken // Quicken
m_appMap[i18n("Quicken Windows 2003")] = "TQWIN:1200"; m_appMap[i18n("Quicken Windows 2003")] = "QWIN:1200";
m_appMap[i18n("Quicken Windows 2004")] = "TQWIN:1300"; m_appMap[i18n("Quicken Windows 2004")] = "QWIN:1300";
m_appMap[i18n("Quicken Windows 2005")] = "TQWIN:1400"; m_appMap[i18n("Quicken Windows 2005")] = "QWIN:1400";
m_appMap[i18n("Quicken Windows 2006")] = "TQWIN:1500"; m_appMap[i18n("Quicken Windows 2006")] = "QWIN:1500";
m_appMap[i18n("Quicken Windows 2007")] = "TQWIN:1600"; m_appMap[i18n("Quicken Windows 2007")] = "QWIN:1600";
m_appMap[i18n("Quicken Windows 2008")] = "TQWIN:1700"; m_appMap[i18n("Quicken Windows 2008")] = "QWIN:1700";
// MS-Money // MS-Money
m_appMap[i18n("MS-Money 2003")] = "Money:1100"; 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 const TQString& OfxAppVersion::appId(void) const
{ {
static TQString defaultAppId("TQWIN:1700"); static TQString defaultAppId("QWIN:1700");
TQString app = m_combo->currentText(); TQString app = m_combo->currentText();
if(m_appMap[app] != defaultAppId) 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->appid, exp.cap(1).latin1(), OFX_APPID_LENGTH-1);
strncpy(fi->appver, exp.cap(2).latin1(), OFX_APPVER_LENGTH-1); strncpy(fi->appver, exp.cap(2).latin1(), OFX_APPVER_LENGTH-1);
} else { } 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); strncpy(fi->appver, "1700", OFX_APPVER_LENGTH-1);
} }
@ -401,7 +401,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::signOn(void) const
.element("USERPASS",password()) .element("USERPASS",password())
.element("LANGUAGE","ENG") .element("LANGUAGE","ENG")
.subtag(fi) .subtag(fi)
.element("APPID","TQWIN") .element("APPID","QWIN")
.element("APPVER","1100")); .element("APPVER","1100"));
} }

@ -65,7 +65,7 @@ public:
/** /**
* This method returns the currently selected application id * This method returns the currently selected application id
* as a colon separated value consisting of the application * 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. * default, an empty string is returned.
*/ */
const TQString& appId(void) const; const TQString& appId(void) const;

@ -1462,7 +1462,7 @@ void KMyMoneyView::loadDefaultCurrencies(void)
loadDefaultCurrency(MyMoneySecurity("PEN", i18n("Peruvian Nuevo Sol")), create); loadDefaultCurrency(MyMoneySecurity("PEN", i18n("Peruvian Nuevo Sol")), create);
loadDefaultCurrency(MyMoneySecurity("PHP", i18n("Philippine Peso"), TQChar(0x20B1)), create); loadDefaultCurrency(MyMoneySecurity("PHP", i18n("Philippine Peso"), TQChar(0x20B1)), create);
loadDefaultCurrency(MyMoneySecurity("PLN", i18n("Polish Zloty")), 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("RON", i18n("Romanian Leu (new)")), true);
loadDefaultCurrency(MyMoneySecurity("RUB", i18n("Russian Ruble")), true); loadDefaultCurrency(MyMoneySecurity("RUB", i18n("Russian Ruble")), true);
loadDefaultCurrency(MyMoneySecurity("RWF", i18n("Rwanda Franc")), create); loadDefaultCurrency(MyMoneySecurity("RWF", i18n("Rwanda Franc")), create);

Loading…
Cancel
Save