From 1f9d00360b9018301630ce062d7dda0c6583edfb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:17 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 252fce5a2a5384702fbcc1c9987284d7bd2e6943. --- .../ofximport/dialogs/kofxdirectconnectdlg.cpp | 18 +++++++------- .../ofximport/dialogs/kofxdirectconnectdlg.h | 2 +- .../ofximport/dialogs/kofxdirectconnectdlgdecl.ui | 6 ++--- .../ofximport/dialogs/konlinebankingsetupdecl.ui | 18 +++++++------- .../dialogs/konlinebankingsetupwizard.cpp | 26 ++++++++++---------- .../ofximport/dialogs/konlinebankingstatus.cpp | 22 ++++++++--------- .../ofximport/dialogs/konlinebankingstatus.h | 6 ++--- .../ofximport/dialogs/konlinebankingstatusdecl.ui | 28 +++++++++++----------- .../ofximport/dialogs/mymoneyofxconnector.cpp | 26 ++++++++++---------- 9 files changed, 76 insertions(+), 76 deletions(-) (limited to 'kmymoney2/plugins/ofximport/dialogs') diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp index e06de07..398f369 100644 --- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp +++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include // ---------------------------------------------------------------------------- // KDE Includes @@ -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").arg(TQDir::homeDirPath())); + d->m_fpTrace.setName(TQString("%1/ofxlog.txt").tqarg(TQDir::homeDirPath())); d->m_fpTrace.open(IO_WriteOnly | IO_Append); } @@ -113,12 +113,12 @@ 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...").arg(m_connector.url())); + settqStatus(TQString("Contacting %1...").tqarg(m_connector.url())); kProgress1->setTotalSteps(3); kProgress1->setProgress(1); } -void KOfxDirectConnectDlg::setStatus(const TQString& _status) +void KOfxDirectConnectDlg::settqStatus(const TQString& _status) { textLabel1->setText(_status); kdDebug(2) << "STATUS: " << _status << endl; @@ -133,13 +133,13 @@ void KOfxDirectConnectDlg::slotOfxConnected(KIO::Job*) { if ( m_tmpfile ) { -// throw new MYMONEYEXCEPTION(TQString("Already connected, using %1.").arg(m_tmpfile->name())); +// throw new MYMONEYEXCEPTION(TQString("Already connected, using %1.").tqarg(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...").arg(m_tmpfile->name())); + settqStatus("Connection established, retrieving data..."); + setDetails(TQString("Downloading data to %1...").tqarg(m_tmpfile->name())); kProgress1->advance(1); } @@ -154,13 +154,13 @@ void KOfxDirectConnectDlg::slotOfxData(KIO::Job*,const TQByteArray& _ba) d->m_fpTrace.writeBlock(_ba, _ba.size()); } - setDetails(TQString("Got %1 bytes").arg(_ba.size())); + setDetails(TQString("Got %1 bytes").tqarg(_ba.size())); } void KOfxDirectConnectDlg::slotOfxFinished(KIO::Job* /* e */) { kProgress1->advance(1); - setStatus("Completed."); + settqStatus("Completed."); if(d->m_fpTrace.isOpen()) { d->m_fpTrace.writeBlock("\nCompleted\n\n\n\n", 14); diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h index 1227a90..b07e191 100644 --- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h +++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h @@ -70,7 +70,7 @@ protected slots: virtual void reject(void); protected: - void setStatus(const TQString& _status); + void settqStatus(const TQString& _status); void setDetails(const TQString& _details); KTempFile* m_tmpfile; diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlgdecl.ui b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlgdecl.ui index 57cb5b1..a7d73e4 100644 --- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlgdecl.ui +++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlgdecl.ui @@ -37,7 +37,7 @@ - layout2 + tqlayout2 @@ -53,7 +53,7 @@ Expanding - + 51 20 @@ -84,7 +84,7 @@ Expanding - + 61 20 diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui index 100cbd1..a6bd384 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 @@ -111,7 +111,7 @@ - layout8 + tqlayout8 @@ -168,7 +168,7 @@ Expanding - + 20 90 @@ -212,7 +212,7 @@ - layout6 + tqlayout6 @@ -228,7 +228,7 @@ Expanding - + 120 21 @@ -348,7 +348,7 @@ - layout29 + tqlayout29 @@ -361,7 +361,7 @@ Please select the account from your financial institution from the list below which matches this account. - + WordBreak|AlignVCenter @@ -448,7 +448,7 @@ - layout6 + tqlayout6 @@ -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 bafde2e..7287c6a 100644 --- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp +++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp @@ -22,10 +22,10 @@ // ---------------------------------------------------------------------------- // QT Includes -#include +#include #include #include -#include +#include #include #include #include @@ -134,7 +134,7 @@ bool KOnlineBankingSetupWizard::finishFiPage(void) { TQString bank = item->text(0); m_textDetails->clear(); - m_textDetails->append(TQString("

Details for %1:

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

Details for %1:

").tqarg(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
").arg(*it_fipid); + TQString message = TQString("

Fipid: %1
").tqarg(*it_fipid); // If the bank supports retrieving statements if ( info.accountlist ) { m_bankInfo.push_back(info); - message += TQString("URL: %1
Org: %2
Fid: %3
").arg(info.url,info.org,info.fid); + message += TQString("URL: %1
Org: %2
Fid: %3
").tqarg(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:

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

Details for %1:

").tqarg(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
").arg(info.url,info.org,info.fid); + message += TQString("URL: %1
Org: %2
Fid: %3
").tqarg(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").arg(locateLocal("appdata", ""))); + KURL filename(TQString("%1response.ofx").tqarg(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").arg(kvps.value("bankid"), kvps.value("uniqueId"))); + kvps.setValue("kmmofx-acc-ref", TQString("%1-%2").tqarg(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").arg(data.code).arg(data.name,data.description); + message += TQString("#%1 %2: \"%3\"\n").tqarg(data.code).tqarg(data.name,data.description); } if(data.server_message_valid==true){ - message += i18n("Server message: %1\n").arg(data.server_message); + message += i18n("Server message: %1\n").tqarg(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").arg(message) ); + KMessageBox::detailedError( pthis, i18n("Your bank returned warnings when signing on"), i18n("WARNING %1").tqarg(message) ); break; case OfxStatusData::ERROR : - KMessageBox::detailedError( pthis, i18n("Error signing onto your bank"), i18n("ERROR %1").arg(message) ); + KMessageBox::detailedError( pthis, i18n("Error signing onto your bank"), i18n("ERROR %1").tqarg(message) ); break; default: break; diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp index 084d73c..d2b9880 100644 --- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp +++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp @@ -48,22 +48,22 @@ #include #include "mymoneyofxconnector.h" -KOnlineBankingStatus::KOnlineBankingStatus(const MyMoneyAccount& acc, TQWidget *parent, const char *name) : +KOnlineBankingtqStatus::KOnlineBankingtqStatus(const MyMoneyAccount& acc, TQWidget *parent, const char *name) : KOnlineBankingStatusDecl(parent,name), m_appId(0) { - m_ledOnlineStatus->off(); + m_ledOnlinetqStatus->off(); // Set up online banking settings if applicable MyMoneyKeyValueContainer settings = acc.onlineBankingSettings(); - m_textOnlineStatus->setText(i18n("Enabled & configured")); - m_ledOnlineStatus->on(); + m_textOnlinetqStatus->setText(i18n("Enabled & configured")); + m_ledOnlinetqStatus->on(); TQString account = settings.value("accountid"); TQString bank = settings.value("bankname"); - TQString bankid = TQString("%1 %2").arg(settings.value("bankid")).arg(settings.value("branchid")); + TQString bankid = TQString("%1 %2").tqarg(settings.value("bankid")).tqarg(settings.value("branchid")); if ( bankid.length() > 1 ) - bank += TQString(" (%1)").arg(bankid); + bank += TQString(" (%1)").tqarg(bankid); m_textBank->setText(bank); m_textOnlineAccount->setText(account); @@ -83,25 +83,25 @@ KOnlineBankingStatus::KOnlineBankingStatus(const MyMoneyAccount& acc, TQWidget * if (!specificDate.isEmpty()) m_specificDate->setDate(TQDate::fromString(specificDate)); else - m_specificDate->setDate(TQDate::currentDate()); - m_specificDate->setMaxValue(TQDate::currentDate()); + m_specificDate->setDate(TQDate::tqcurrentDate()); + m_specificDate->setMaxValue(TQDate::tqcurrentDate()); m_payeeidRB->setChecked(settings.value("kmmofx-preferPayeeid").isEmpty() || settings.value("kmmofx-preferPayeeid").toInt() != 0); m_nameRB->setChecked(!settings.value("kmmofx-preferName").isEmpty() && settings.value("kmmofx-preferName").toInt() != 0); } -KOnlineBankingStatus::~KOnlineBankingStatus() +KOnlineBankingtqStatus::~KOnlineBankingtqStatus() { delete m_appId; } -const TQString& KOnlineBankingStatus::appId(void) const +const TQString& KOnlineBankingtqStatus::appId(void) const { if(m_appId) return m_appId->appId(); return TQString(); } -TQString KOnlineBankingStatus::headerVersion(void) const +TQString KOnlineBankingtqStatus::headerVersion(void) const { if(m_headerVersion) return m_headerVersion->headerVersion(); diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.h b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.h index 3b04903..52e43ee 100644 --- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.h +++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.h @@ -41,13 +41,13 @@ class OfxHeaderVersion; * @author Thomas Baumgart */ -class KOnlineBankingStatus : public KOnlineBankingStatusDecl +class KOnlineBankingtqStatus : public KOnlineBankingStatusDecl { Q_OBJECT TQ_OBJECT public: - KOnlineBankingStatus(const MyMoneyAccount& acc, TQWidget *parent=0, const char *name=0); - ~KOnlineBankingStatus(); + KOnlineBankingtqStatus(const MyMoneyAccount& acc, TQWidget *parent=0, const char *name=0); + ~KOnlineBankingtqStatus(); const TQString& appId(void) const; TQString headerVersion(void) const; private: diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatusdecl.ui b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatusdecl.ui index e7d5cec..5f3af99 100644 --- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatusdecl.ui +++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatusdecl.ui @@ -79,7 +79,7 @@ - layout5 + tqlayout5 @@ -87,7 +87,7 @@ - m_ledOnlineStatus + m_ledOnlinetqStatus Off @@ -95,7 +95,7 @@ - m_textOnlineStatus + m_textOnlinetqStatus @@ -119,7 +119,7 @@ Expanding - + 41 21 @@ -159,7 +159,7 @@ - layout8 + tqlayout8 @@ -188,7 +188,7 @@ Expanding - + 150 21 @@ -229,7 +229,7 @@ - layout17 + tqlayout17 @@ -237,7 +237,7 @@ - layout8 + tqlayout8 @@ -274,7 +274,7 @@ - layout16 + tqlayout16 @@ -300,7 +300,7 @@ - layout7 + tqlayout7 @@ -346,7 +346,7 @@ Expanding - + 41 20 @@ -368,7 +368,7 @@ - layout11 + tqlayout11 @@ -435,7 +435,7 @@ Expanding - + 31 20 @@ -456,7 +456,7 @@ Expanding - + 20 50 diff --git a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp index 36a05b5..28f9e29 100644 --- a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp +++ b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp @@ -145,7 +145,7 @@ TQString MyMoneyOfxConnector::url(void) const { return m_fiSettings.value("url") TQDate MyMoneyOfxConnector::statementStartDate(void) const { if ((m_fiSettings.value("kmmofx-todayMinus").toInt() != 0) && !m_fiSettings.value("kmmofx-numRequestDays").isEmpty()) { - return TQDate::currentDate().addDays(-m_fiSettings.value("kmmofx-numRequestDays").toInt()); + return TQDate::tqcurrentDate().addDays(-m_fiSettings.value("kmmofx-numRequestDays").toInt()); } else if ((m_fiSettings.value("kmmofx-lastUpdate").toInt() != 0) && !m_account.value("lastImportedTransactionDate").isEmpty()) { @@ -155,7 +155,7 @@ TQDate MyMoneyOfxConnector::statementStartDate(void) const { { return TQDate::fromString(m_fiSettings.value("kmmofx-specificDate")); } - return TQDate::currentDate().addMonths(-2); + return TQDate::tqcurrentDate().addMonths(-2); } #if LIBOFX_IS_VERSION(0,9,0) @@ -356,7 +356,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::message(const TQString& _msgType, MyMoneyOfxConnector::Tag MyMoneyOfxConnector::investmentRequest(void) const { - TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); + TQString dtnow_string = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); return message("INVSTMT","INVSTMT",Tag("INVSTMTRQ") @@ -387,7 +387,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::creditCardRequest(const TQDate& _d MyMoneyOfxConnector::Tag MyMoneyOfxConnector::signOn(void) const { - TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); + TQString dtnow_string = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); Tag fi("FI"); fi.element("ORG",fiorg()); @@ -416,13 +416,13 @@ TQString MyMoneyOfxConnector::header(void) "COMPRESSION:NONE\r\n" "OLDFILEUID:NONE\r\n" "NEWFILEUID:%1\r\n" - "\r\n").arg(uuid()); + "\r\n").tqarg(uuid()); } TQString MyMoneyOfxConnector::uuid(void) { static int id = 1; - return TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmsszzz-") + TQString::number(id++); + return TQDateTime::tqcurrentDateTime().toString("yyyyMMdd-hhmmsszzz-") + TQString::number(id++); } // @@ -456,7 +456,7 @@ const TQByteArray MyMoneyOfxConnector::statementResponse(const TQDate& _dtstart) MyMoneyOfxConnector::Tag MyMoneyOfxConnector::signOnResponse(void) const { - TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); + TQString dtnow_string = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); Tag sonrs("SONRS"); sonrs @@ -495,12 +495,12 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::bankStatementResponse(const TQDate MyMoneyFile* file = MyMoneyFile::instance(); TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); - TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); + TQString dtnow_string = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); TQString transactionlist; MyMoneyTransactionFilter filter; - filter.setDateFilter(_dtstart,TQDate::currentDate()); + filter.setDateFilter(_dtstart,TQDate::tqcurrentDate()); filter.addAccount(m_account.id()); TQValueList transactions = file->transactionList(filter); TQValueList::const_iterator it_transaction = transactions.begin(); @@ -522,12 +522,12 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::creditCardStatementResponse(const MyMoneyFile* file = MyMoneyFile::instance(); TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); - TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); + TQString dtnow_string = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); TQString transactionlist; MyMoneyTransactionFilter filter; - filter.setDateFilter(_dtstart,TQDate::currentDate()); + filter.setDateFilter(_dtstart,TQDate::tqcurrentDate()); filter.addAccount(m_account.id()); TQValueList transactions = file->transactionList(filter); TQValueList::const_iterator it_transaction = transactions.begin(); @@ -549,12 +549,12 @@ TQString MyMoneyOfxConnector::investmentStatementResponse(const TQDate& _dtstart MyMoneyFile* file = MyMoneyFile::instance(); TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); - TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); + TQString dtnow_string = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); TQString transactionlist; MyMoneyTransactionFilter filter; - filter.setDateFilter(_dtstart,TQDate::currentDate()); + filter.setDateFilter(_dtstart,TQDate::tqcurrentDate()); filter.addAccount(m_account.id()); filter.addAccount(m_account.accountList()); TQValueList transactions = file->transactionList(filter); -- cgit v1.2.1