From c70e40bd3f54a2c4d9ef57a36f19c996f4e00ed6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:37:08 -0600 Subject: Remove additional unneeded tq method conversions --- .../ofximport/dialogs/kofxdirectconnectdlg.cpp | 10 +++++----- .../ofximport/dialogs/konlinebankingsetupdecl.ui | 6 +++--- .../dialogs/konlinebankingsetupwizard.cpp | 22 +++++++++++----------- .../ofximport/dialogs/konlinebankingstatus.cpp | 4 ++-- .../ofximport/dialogs/mymoneyofxconnector.cpp | 2 +- kmymoney2/plugins/ofximport/ofximporterplugin.cpp | 20 ++++++++++---------- kmymoney2/plugins/ofximport/ofxpartner.cpp | 8 ++++---- 7 files changed, 36 insertions(+), 36 deletions(-) (limited to 'kmymoney2/plugins') diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp index 4485be9..ccaf6d3 100644 --- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp +++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp @@ -88,7 +88,7 @@ void KOfxDirectConnectDlg::init(void) TQDir homeDir(TQDir::home()); if(homeDir.exists("ofxlog.txt")) { - d->m_fpTrace.setName(TQString("%1/ofxlog.txt").tqarg(TQDir::homeDirPath())); + d->m_fpTrace.setName(TQString("%1/ofxlog.txt").arg(TQDir::homeDirPath())); d->m_fpTrace.open(IO_WriteOnly | IO_Append); } @@ -113,7 +113,7 @@ void KOfxDirectConnectDlg::init(void) connect(m_job,TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),this,TQT_SLOT(slotOfxData(KIO::Job*,const TQByteArray&))); connect(m_job,TQT_SIGNAL(connected(KIO::Job*)),this,TQT_SLOT(slotOfxConnected(KIO::Job*))); - setStatus(TQString("Contacting %1...").tqarg(m_connector.url())); + setStatus(TQString("Contacting %1...").arg(m_connector.url())); kProgress1->setTotalSteps(3); kProgress1->setProgress(1); } @@ -133,13 +133,13 @@ void KOfxDirectConnectDlg::slotOfxConnected(KIO::Job*) { if ( m_tmpfile ) { -// throw new MYMONEYEXCEPTION(TQString("Already connected, using %1.").tqarg(m_tmpfile->name())); +// throw new MYMONEYEXCEPTION(TQString("Already connected, using %1.").arg(m_tmpfile->name())); kdDebug(2) << "Already connected, using " << m_tmpfile->name() << endl; delete m_tmpfile; //delete otherwise we mem leak } m_tmpfile = new KTempFile(); setStatus("Connection established, retrieving data..."); - setDetails(TQString("Downloading data to %1...").tqarg(m_tmpfile->name())); + setDetails(TQString("Downloading data to %1...").arg(m_tmpfile->name())); kProgress1->advance(1); } @@ -154,7 +154,7 @@ void KOfxDirectConnectDlg::slotOfxData(KIO::Job*,const TQByteArray& _ba) d->m_fpTrace.writeBlock(_ba, _ba.size()); } - setDetails(TQString("Got %1 bytes").tqarg(_ba.size())); + setDetails(TQString("Got %1 bytes").arg(_ba.size())); } void KOfxDirectConnectDlg::slotOfxFinished(KIO::Job* /* e */) diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui index a897869..97612b9 100644 --- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui +++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui @@ -58,7 +58,7 @@ Please select your financial institution from the list below... - + WordBreak|AlignVCenter @@ -361,7 +361,7 @@ Please select the account from your financial institution from the list below which matches this account. - + WordBreak|AlignVCenter @@ -461,7 +461,7 @@ Congratulations! You have successfully set up your bank for online banking via OFX. - + WordBreak|AlignVCenter diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp index 7287c6a..bdb0b23 100644 --- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp +++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp @@ -134,7 +134,7 @@ bool KOnlineBankingSetupWizard::finishFiPage(void) { TQString bank = item->text(0); m_textDetails->clear(); - m_textDetails->append(TQString("

Details for %1:

").tqarg(bank)); + m_textDetails->append(TQString("

Details for %1:

").arg(bank)); TQStringList fipids = OfxPartner::FipidForBank(bank); TQStringList::const_iterator it_fipid = fipids.begin(); while ( it_fipid != fipids.end() ) @@ -143,14 +143,14 @@ bool KOnlineBankingSetupWizard::finishFiPage(void) info = OfxPartner::ServiceInfo(*it_fipid); // Print them to the text browser - TQString message = TQString("

Fipid: %1
").tqarg(*it_fipid); + TQString message = TQString("

Fipid: %1
").arg(*it_fipid); // If the bank supports retrieving statements if ( info.accountlist ) { m_bankInfo.push_back(info); - message += TQString("URL: %1
Org: %2
Fid: %3
").tqarg(info.url,info.org,info.fid); + message += TQString("URL: %1
Org: %2
Fid: %3
").arg(info.url,info.org,info.fid); if ( info.statements ) message += i18n("Supports online statements
"); if ( info.investments ) @@ -180,7 +180,7 @@ bool KOnlineBankingSetupWizard::finishFiPage(void) } m_textDetails->clear(); - m_textDetails->append(TQString("

Details for %1:

").tqarg(m_bankName->text())); + m_textDetails->append(TQString("

Details for %1:

").arg(m_bankName->text())); memset(&info, 0, sizeof(OfxFiServiceInfo)); strncpy(info.fid, m_fid->text().ascii(), OFX_FID_LENGTH-1); @@ -194,7 +194,7 @@ bool KOnlineBankingSetupWizard::finishFiPage(void) m_bankInfo.push_back(info); TQString message; - message += TQString("URL: %1
Org: %2
Fid: %3
").tqarg(info.url,info.org,info.fid); + message += TQString("URL: %1
Org: %2
Fid: %3
").arg(info.url,info.org,info.fid); if ( info.statements ) message += i18n("Supports online statements
"); if ( info.investments ) @@ -248,7 +248,7 @@ bool KOnlineBankingSetupWizard::finishLoginPage(void) // who owns this memory?!?! char* request = libofx_request_accountinfo( &fi ); - KURL filename(TQString("%1response.ofx").tqarg(locateLocal("appdata", ""))); + KURL filename(TQString("%1response.ofx").arg(locateLocal("appdata", ""))); TQByteArray req; req.setRawData(request, strlen(request)); OfxHttpsRequest("POST", (*m_it_info).url, req, TQMap(), filename, true); @@ -360,7 +360,7 @@ int KOnlineBankingSetupWizard::ofxAccountCallback(struct OfxAccountData data, vo if(/* !kvps.value("bankid").isEmpty() && */ !kvps.value("uniqueId").isEmpty()) { - kvps.setValue("kmmofx-acc-ref", TQString("%1-%2").tqarg(kvps.value("bankid"), kvps.value("uniqueId"))); + kvps.setValue("kmmofx-acc-ref", TQString("%1-%2").arg(kvps.value("bankid"), kvps.value("uniqueId"))); } else { qDebug("Cannot setup kmmofx-acc-ref for '%s'", kvps.value("bankname").data()); } @@ -379,11 +379,11 @@ int KOnlineBankingSetupWizard::ofxStatusCallback(struct OfxStatusData data, void if(data.code_valid==true) { - message += TQString("#%1 %2: \"%3\"\n").tqarg(data.code).tqarg(data.name,data.description); + message += TQString("#%1 %2: \"%3\"\n").arg(data.code).arg(data.name,data.description); } if(data.server_message_valid==true){ - message += i18n("Server message: %1\n").tqarg(data.server_message); + message += i18n("Server message: %1\n").arg(data.server_message); } if(data.severity_valid==true){ @@ -391,10 +391,10 @@ int KOnlineBankingSetupWizard::ofxStatusCallback(struct OfxStatusData data, void case OfxStatusData::INFO : break; case OfxStatusData::WARN : - KMessageBox::detailedError( pthis, i18n("Your bank returned warnings when signing on"), i18n("WARNING %1").tqarg(message) ); + KMessageBox::detailedError( pthis, i18n("Your bank returned warnings when signing on"), i18n("WARNING %1").arg(message) ); break; case OfxStatusData::ERROR : - KMessageBox::detailedError( pthis, i18n("Error signing onto your bank"), i18n("ERROR %1").tqarg(message) ); + KMessageBox::detailedError( pthis, i18n("Error signing onto your bank"), i18n("ERROR %1").arg(message) ); break; default: break; diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp index c010ab6..084d73c 100644 --- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp +++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp @@ -61,9 +61,9 @@ KOnlineBankingStatus::KOnlineBankingStatus(const MyMoneyAccount& acc, TQWidget * TQString account = settings.value("accountid"); TQString bank = settings.value("bankname"); - TQString bankid = TQString("%1 %2").tqarg(settings.value("bankid")).tqarg(settings.value("branchid")); + TQString bankid = TQString("%1 %2").arg(settings.value("bankid")).arg(settings.value("branchid")); if ( bankid.length() > 1 ) - bank += TQString(" (%1)").tqarg(bankid); + bank += TQString(" (%1)").arg(bankid); m_textBank->setText(bank); m_textOnlineAccount->setText(account); diff --git a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp index f5222dc..36a05b5 100644 --- a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp +++ b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp @@ -416,7 +416,7 @@ TQString MyMoneyOfxConnector::header(void) "COMPRESSION:NONE\r\n" "OLDFILEUID:NONE\r\n" "NEWFILEUID:%1\r\n" - "\r\n").tqarg(uuid()); + "\r\n").arg(uuid()); } TQString MyMoneyOfxConnector::uuid(void) diff --git a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp index 5ed6175..a155ccc 100644 --- a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp +++ b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp @@ -74,7 +74,7 @@ void OfxImporterPlugin::slotImportFile(void) if ( isMyFormat(url.path()) ) { slotImportFile(url.path()); } else { - KMessageBox::error( 0, i18n("Unable to import %1 using the OFX importer plugin. This file is not the correct format.").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Incorrect format")); + KMessageBox::error( 0, i18n("Unable to import %1 using the OFX importer plugin. This file is not the correct format.").arg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Incorrect format")); } } @@ -351,7 +351,7 @@ int OfxImporterPlugin::ofxTransactionCallback(struct OfxTransactionData data, vo break; default: unhandledtype = true; - type = TQString("UNKNOWN %1").tqarg(data.invtransactiontype); + type = TQString("UNKNOWN %1").arg(data.invtransactiontype); break; } } @@ -373,14 +373,14 @@ int OfxImporterPlugin::ofxTransactionCallback(struct OfxTransactionData data, vo double proper_total = t.m_dShares * data.unitprice + t.m_moneyFees; if ( proper_total != t.m_moneyAmount ) { - pofx->addWarning(TQString("Transaction %1 has an incorrect total of %2. Using calculated total of %3 instead.").tqarg(t.m_strBankID).tqarg(t.m_moneyAmount).tqarg(proper_total)); + pofx->addWarning(TQString("Transaction %1 has an incorrect total of %2. Using calculated total of %3 instead.").arg(t.m_strBankID).arg(t.m_moneyAmount).arg(proper_total)); t.m_moneyAmount = proper_total; } } #endif if ( unhandledtype ) - pofx->addWarning(TQString("Transaction %1 has an unsupported type (%2).").tqarg(t.m_strBankID,type)); + pofx->addWarning(TQString("Transaction %1 has an unsupported type (%2).").arg(t.m_strBankID,type)); else s.m_listTransactions += t; @@ -482,7 +482,7 @@ int OfxImporterPlugin::ofxAccountCallback(struct OfxAccountData data, void * pv) } // ask KMyMoney for an account id - s.m_accountId = pofx->account("kmmofx-acc-ref", TQString("%1-%2").tqarg(s.m_strRoutingNumber, s.m_strAccountNumber)).id(); + s.m_accountId = pofx->account("kmmofx-acc-ref", TQString("%1-%2").arg(s.m_strRoutingNumber, s.m_strAccountNumber)).id(); // copy over the securities s.m_listSecurities = pofx->m_securitylist; @@ -527,13 +527,13 @@ int OfxImporterPlugin::ofxStatusCallback(struct OfxStatusData data, void * pv) pofx->m_fatalerror = "No accounts found."; if(data.ofx_element_name_valid==true) - message.prepend(TQString("%1: ").tqarg(data.ofx_element_name)); + message.prepend(TQString("%1: ").arg(data.ofx_element_name)); if(data.code_valid==true) - message += TQString("%1 (Code %2): %3").tqarg(data.name).tqarg(data.code).tqarg(data.description); + message += TQString("%1 (Code %2): %3").arg(data.name).arg(data.code).arg(data.description); if(data.server_message_valid==true) - message += TQString(" (%1)").tqarg(data.server_message); + message += TQString(" (%1)").arg(data.server_message); if(data.severity_valid==true){ switch(data.severity){ @@ -636,7 +636,7 @@ bool OfxImporterPlugin::updateAccount(const MyMoneyAccount& acc, bool moreAccoun dlg.exec(); } } catch (MyMoneyException *e) { - KMessageBox::information(0 ,i18n("Error connecting to bank: %1").tqarg(e->what())); + KMessageBox::information(0 ,i18n("Error connecting to bank: %1").arg(e->what())); delete e; } @@ -647,7 +647,7 @@ void OfxImporterPlugin::slotImportFile(const TQString& url) { if(!import(url)) { - KMessageBox::error( 0, TQString("%1").tqarg(i18n("Unable to import %1 using the OFX importer plugin. The plugin returned the following error:

%2").tqarg(url, lastError())), i18n("Importing error")); + KMessageBox::error( 0, TQString("%1").arg(i18n("Unable to import %1 using the OFX importer plugin. The plugin returned the following error:

%2").arg(url, lastError())), i18n("Importing error")); } } diff --git a/kmymoney2/plugins/ofximport/ofxpartner.cpp b/kmymoney2/plugins/ofximport/ofxpartner.cpp index 651fd2a..711bff5 100644 --- a/kmymoney2/plugins/ofximport/ofxpartner.cpp +++ b/kmymoney2/plugins/ofximport/ofxpartner.cpp @@ -233,7 +233,7 @@ OfxFiServiceInfo ServiceInfo(const TQString& fipid) attr["content-type"] = "application/x-www-form-urlencoded"; attr["accept"] = "*/*"; - KURL guidFile(TQString("%1fipid-%2.xml").tqarg(directory).tqarg(fipid)); + KURL guidFile(TQString("%1fipid-%2.xml").arg(directory).arg(fipid)); // Apparently at some point in time, for VER=6 msn returned an online URL // to a static error page (http://moneycentral.msn.com/cust404.htm). @@ -241,7 +241,7 @@ OfxFiServiceInfo ServiceInfo(const TQString& fipid) // future. TQFileInfo i(guidFile.path()); if(!i.isReadable() || i.lastModified().addDays(7) < TQDateTime::currentDateTime()) - get("", attr, KURL(TQString("http://moneycentral.msn.com/money/2005/mnynet/service/olsvcupd/OnlSvcBrandInfo.aspx?MSNGUID=&GUID=%1&SKU=3&VER=" VER).tqarg(fipid)), guidFile); + get("", attr, KURL(TQString("http://moneycentral.msn.com/money/2005/mnynet/service/olsvcupd/OnlSvcBrandInfo.aspx?MSNGUID=&GUID=%1&SKU=3&VER=" VER).arg(fipid)), guidFile); TQFile f(guidFile.path()); if(f.open(IO_ReadOnly)) { @@ -299,7 +299,7 @@ OfxHttpsRequest::OfxHttpsRequest(const TQString& type, const KURL &url, const TQ { TQDir homeDir(TQDir::home()); if(homeDir.exists("ofxlog.txt")) { - d->m_fpTrace.setName(TQString("%1/ofxlog.txt").tqarg(TQDir::homeDirPath())); + d->m_fpTrace.setName(TQString("%1/ofxlog.txt").arg(TQDir::homeDirPath())); d->m_fpTrace.open(IO_WriteOnly | IO_Append); } @@ -407,7 +407,7 @@ OfxHttpRequest::OfxHttpRequest(const TQString& type, const KURL &url, const TQBy delete m_job; } else { m_error = TQHttp::Aborted; - errorMsg = i18n("Cannot open file %1 for writing").tqarg(dst.path()); + errorMsg = i18n("Cannot open file %1 for writing").arg(dst.path()); } if(m_error != TQHttp::NoError) { -- cgit v1.2.1