From 87f567cd9fd6ecf39a65f8c4564958e64df40e5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 28 Jul 2012 14:54:40 +0200 Subject: Fix inadvertent "TQ" changes. --- kmymoney2/converter/imymoneyreader.h | 2 +- kmymoney2/converter/mymoneyqifprofile.cpp | 2 +- kmymoney2/converter/mymoneyqifprofile.h | 4 +-- kmymoney2/converter/mymoneyqifreader.cpp | 60 +++++++++++++++---------------- kmymoney2/converter/mymoneyqifreader.h | 12 +++---- kmymoney2/converter/mymoneyqifwriter.h | 6 ++-- kmymoney2/converter/webpricequote.cpp | 2 +- 7 files changed, 44 insertions(+), 44 deletions(-) (limited to 'kmymoney2/converter') diff --git a/kmymoney2/converter/imymoneyreader.h b/kmymoney2/converter/imymoneyreader.h index 4866b03..92f8963 100644 --- a/kmymoney2/converter/imymoneyreader.h +++ b/kmymoney2/converter/imymoneyreader.h @@ -81,7 +81,7 @@ public: * into the MyMoney engine. * * This method also starts the user defined import filter program - * defined in the TQIF profile(when a TQIF file is selected). If none is + * defined in the QIF profile(when a QIF file is selected). If none is * defined, the file is read as is (actually the UNIX command * 'cat -' is used as the filter). * diff --git a/kmymoney2/converter/mymoneyqifprofile.cpp b/kmymoney2/converter/mymoneyqifprofile.cpp index f0533db..77bbe07 100644 --- a/kmymoney2/converter/mymoneyqifprofile.cpp +++ b/kmymoney2/converter/mymoneyqifprofile.cpp @@ -825,7 +825,7 @@ void MyMoneyQifProfile::autoDetect(const TQStringList& lines) TQString numericRecords = "BT$OIQ"; TQStringList::const_iterator it; int datesScanned = 0; - // section: used to switch between different TQIF sections, + // section: used to switch between different QIF sections, // because the Record identifiers are ambigous between sections // eg. in transaction records, T identifies a total amount, in // account sections it's the type. diff --git a/kmymoney2/converter/mymoneyqifprofile.h b/kmymoney2/converter/mymoneyqifprofile.h index bc716da..ca0ac31 100644 --- a/kmymoney2/converter/mymoneyqifprofile.h +++ b/kmymoney2/converter/mymoneyqifprofile.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef MYMONEYTQIFPROFILE_H -#define MYMONEYTQIFPROFILE_H +#ifndef MYMONEYQIFPROFILE_H +#define MYMONEYQIFPROFILE_H // ---------------------------------------------------------------------------- // QT Includes diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp index 3161a0b..8764e03 100644 --- a/kmymoney2/converter/mymoneyqifreader.cpp +++ b/kmymoney2/converter/mymoneyqifreader.cpp @@ -82,13 +82,13 @@ class MyMoneyQifReader::Private { bool isTransfer(TQString& name, const TQString& leftDelim, const TQString& rightDelim); /** - * Converts the TQIF specific N-record of investment transactions into + * Converts the QIF specific N-record of investment transactions into * a category name */ TQString typeToAccountName(const TQString& type) const; /** - * Converts the TQIF reconcile state to the KMyMoney reconcile state + * Converts the QIF reconcile state to the KMyMoney reconcile state */ MyMoneySplit::reconcileFlagE reconcileState(const TQString& state) const; @@ -202,7 +202,7 @@ TQString MyMoneyQifReader::Private::typeToAccountName(const TQString& type) cons if(type == "sell" || type == "buy") return i18n("Category name", "Investment fees"); - return i18n("Unknown TQIF type %1").arg(type); + return i18n("Unknown QIF type %1").arg(type); } bool MyMoneyQifReader::Private::isTransfer(TQString& tmp, const TQString& leftDelim, const TQString& rightDelim) @@ -288,7 +288,7 @@ void MyMoneyQifReader::slotSendDataToFilter(void) } else { len = m_file->readBlock(m_buffer, sizeof(m_buffer)); if(len == -1) { - tqWarning("Failed to read block from TQIF import file"); + tqWarning("Failed to read block from QIF import file"); m_filter.closeStdin(); m_filter.kill(); } else { @@ -363,7 +363,7 @@ void MyMoneyQifReader::slotProcessData(void) tqDebug("Selected date format: '%s'", list.first().data()); - signalProgress(0, m_qifLines.count(), i18n("Importing TQIF ...")); + signalProgress(0, m_qifLines.count(), i18n("Importing QIF ...")); TQStringList::iterator it; for(it = m_qifLines.begin(); m_userAbort == false && it != m_qifLines.end(); ++it) { ++m_linenumber; @@ -419,7 +419,7 @@ bool MyMoneyQifReader::startImport(void) while(!m_file->atEnd()) { len = m_file->readBlock(m_buffer, sizeof(m_buffer)); if(len == -1) { - tqWarning("Failed to read block from TQIF import file"); + tqWarning("Failed to read block from QIF import file"); } else { slotReceivedDataFromFilter(0, m_buffer, len); } @@ -439,7 +439,7 @@ bool MyMoneyQifReader::startImport(void) if(m_filter.start(KProcess::NotifyOnExit, KProcess::All)) { m_filter.resume(); - signalProgress(0, m_file->size(), i18n("Reading TQIF ...")); + signalProgress(0, m_file->size(), i18n("Reading QIF ...")); slotSendDataToFilter(); rc = true; } else { @@ -571,12 +571,12 @@ void MyMoneyQifReader::processQifSpecial(const TQString& _line) d->firstTransaction = true; d->transactionType = m_entryType = EntryTransaction; - } else if(line.lower() == "oth l" || line.lower() == i18n("TQIF tag for liability account", "Oth L").lower()) { + } else if(line.lower() == "oth l" || line.lower() == i18n("QIF tag for liability account", "Oth L").lower()) { d->accountType = MyMoneyAccount::Liability; d->firstTransaction = true; d->transactionType = m_entryType = EntryTransaction; - } else if(line.lower() == "invst" || line.lower() == i18n("TQIF tag for investment account", "Invst").lower()) { + } else if(line.lower() == "invst" || line.lower() == i18n("QIF tag for investment account", "Invst").lower()) { d->transactionType = m_entryType = EntryInvestmentTransaction; } else if(line.lower() == "invoice" || KMyMoneyGlobalSettings::qifInvoice().lower().contains(line.lower())) { @@ -589,19 +589,19 @@ void MyMoneyQifReader::processQifSpecial(const TQString& _line) m_entryType = EntrySkip; // exportable lists - } else if(line.lower() == "cat" || line.lower() == i18n("TQIF tag for category", "Cat").lower()) { + } else if(line.lower() == "cat" || line.lower() == i18n("QIF tag for category", "Cat").lower()) { m_entryType = EntryCategory; - } else if(line.lower() == "security" || line.lower() == i18n("TQIF tag for security", "Security").lower()) { + } else if(line.lower() == "security" || line.lower() == i18n("QIF tag for security", "Security").lower()) { m_entryType = EntrySecurity; - } else if(line.lower() == "prices" || line.lower() == i18n("TQIF tag for prices", "Prices").lower()) { + } else if(line.lower() == "prices" || line.lower() == i18n("QIF tag for prices", "Prices").lower()) { m_entryType = EntryPrice; } else if(line.lower() == "payee") { m_entryType = EntryPayee; - } else if(line.lower() == "class" || line.lower() == i18n("TQIF tag for a class", "Class").lower()) { + } else if(line.lower() == "class" || line.lower() == i18n("QIF tag for a class", "Class").lower()) { m_entryType = EntryClass; } else if(line.lower() == "memorized") { @@ -617,7 +617,7 @@ void MyMoneyQifReader::processQifSpecial(const TQString& _line) m_entryType = EntrySkip; } else { - tqWarning("Unknown export header '!Type:%s' in TQIF file on line %d: Skipping section.", line.data(), m_linenumber); + tqWarning("Unknown export header '!Type:%s' in QIF file on line %d: Skipping section.", line.data(), m_linenumber); m_entryType = EntrySkip; } @@ -635,7 +635,7 @@ void MyMoneyQifReader::processQifSpecial(const TQString& _line) void MyMoneyQifReader::processQifEntry(void) { - // This method processes a 'TQIF Entry' which is everything between two caret + // This method processes a 'QIF Entry' which is everything between two caret // signs // try { @@ -773,7 +773,7 @@ void MyMoneyQifReader::processMSAccountEntry(const MyMoneyAccount::accountTypeE const MyMoneySecurity& sec = file->security(m_account.currencyId()); if ( KMessageBox::questionYesNo( tqApp->mainWidget(), - i18n("The %1 account currently has an opening balance of %2. This TQIF file reports an opening balance of %3. Would you like to overwrite the current balance with the one from the TQIF file?").arg(m_account.name(), split.shares().formatMoney(m_account, sec),balance.formatMoney(m_account, sec)), + i18n("The %1 account currently has an opening balance of %2. This QIF file reports an opening balance of %3. Would you like to overwrite the current balance with the one from the QIF file?").arg(m_account.name(), split.shares().formatMoney(m_account, sec),balance.formatMoney(m_account, sec)), i18n("Overwrite opening balance"), KStdGuiItem::yes(), KStdGuiItem::no(), @@ -817,7 +817,7 @@ void MyMoneyQifReader::processMSAccountEntry(const MyMoneyAccount::accountTypeE // Lines 1-5 are processed via processQifEntry() and processAccountEntry() // Then Quicken issues line 6 but since the account does not carry any // transaction does not write an end delimiter. Arrrgh! So we end up with - // a TQIF entry comprising of lines 6-11 and end up in this routine. Actually, + // a QIF entry comprising of lines 6-11 and end up in this routine. Actually, // lines 7-11 are the leadin for the next account. So we check here if // the !Type:xxx record also contains an !Account line and process the // entry as required. @@ -899,7 +899,7 @@ TQString MyMoneyQifReader::transferAccount(TQString name, bool useBrokerage) m_qifEntry.clear(); // and construct a temp entry to create/search the account m_qifEntry << TQString("N%1").arg(name); m_qifEntry << TQString("Tunknown"); - m_qifEntry << TQString("D%1").arg(i18n("Autogenerated by TQIF importer")); + m_qifEntry << TQString("D%1").arg(i18n("Autogenerated by QIF importer")); accountId = processAccountEntry(false); // in case we found a reference to an investment account, we need @@ -910,7 +910,7 @@ TQString MyMoneyQifReader::transferAccount(TQString name, bool useBrokerage) m_qifEntry.clear(); // and construct a temp entry to create/search the account m_qifEntry << TQString("N%1").arg(name); m_qifEntry << TQString("Tunknown"); - m_qifEntry << TQString("D%1").arg(i18n("Autogenerated by TQIF importer")); + m_qifEntry << TQString("D%1").arg(i18n("Autogenerated by QIF importer")); accountId = processAccountEntry(false); } m_qifEntry = tmpEntry; // restore local copies @@ -927,14 +927,14 @@ void MyMoneyQifReader::createOpeningBalance(MyMoneyAccount::_accountTypeE accTyp if(m_account.name().isEmpty()) { TQString name = extractLine('L'); if(name.isEmpty()) { - name = i18n("TQIF imported, no account name supplied"); + name = i18n("QIF imported, no account name supplied"); } d->isTransfer(name, m_qifProfile.accountDelimiter().left(1), m_qifProfile.accountDelimiter().mid(1,1)); TQStringList entry = m_qifEntry; // keep a temp copy m_qifEntry.clear(); // and construct a temp entry to create/search the account m_qifEntry << TQString("N%1").arg(name); m_qifEntry << TQString("T%1").arg(d->accountTypeToQif(accType)); - m_qifEntry << TQString("D%1").arg(i18n("Autogenerated by TQIF importer")); + m_qifEntry << TQString("D%1").arg(i18n("Autogenerated by QIF importer")); processAccountEntry(); m_qifEntry = entry; // restore local copy } @@ -1053,7 +1053,7 @@ void MyMoneyQifReader::processTransactionEntry(void) "date profile setting of \"%2\".\n\nPressing \"Continue\" will " "assign todays date to the transaction. Pressing \"Cancel\" will abort " "the import operation. You can then restart the import and select a different " - "TQIF profile or create a new one.") + "QIF profile or create a new one.") .arg(extractLine('D')).arg(m_qifProfile.inputDateFormat()), i18n("Invalid date format")); switch(rc) { @@ -1081,7 +1081,7 @@ void MyMoneyQifReader::processTransactionEntry(void) // t.setMemo(tmp); // Assign the "#" field to the transaction's bank id - // This is the custom KMM extension to TQIF for a unique ID + // This is the custom KMM extension to QIF for a unique ID tmp = extractLine('#'); if(!tmp.isEmpty()) { @@ -1101,7 +1101,7 @@ void MyMoneyQifReader::processTransactionEntry(void) tmp = tmp.mid(1, tmp.length()-2); s1.m_strCategoryName = tmp; #endif - // TODO (Ace) Deal with currencies more gracefully. TQIF cannot deal with multiple + // TODO (Ace) Deal with currencies more gracefully. QIF cannot deal with multiple // currencies, so we should assume that transactions imported into a given // account are in THAT ACCOUNT's currency. If one of those involves a transfer // to an account with a different currency, value and shares should be @@ -1300,7 +1300,7 @@ void MyMoneyQifReader::processInvestmentTransactionEntry(void) "date profile setting of \"%2\".\n\nPressing \"Continue\" will " "assign todays date to the transaction. Pressing \"Cancel\" will abort " "the import operation. You can then restart the import and select a different " - "TQIF profile or create a new one.") + "QIF profile or create a new one.") .arg(extractLine('D')).arg(m_qifProfile.inputDateFormat()), i18n("Invalid date format")); switch(rc) { @@ -1379,10 +1379,10 @@ void MyMoneyQifReader::processInvestmentTransactionEntry(void) // abbreviations or ordered words differently, etc. // // If there is a perfect name match with a subordinate stock account, great. - // More likely, we have to rely on the TQIF file containing !Type:Security + // More likely, we have to rely on the QIF file containing !Type:Security // records, which tell us the mapping from name to symbol. // - // Therefore, generally it is not recommended to import a TQIF file containing + // Therefore, generally it is not recommended to import a QIF file containing // investment transactions but NOT containing security records. TQString securitysymbol = m_investmentMap[securityname]; @@ -2042,7 +2042,7 @@ TQString MyMoneyQifReader::processAccountEntry(bool resetAccountId) // in case it's a stock account, we need to setup a fix investment account if(account.isInvest()) { acc.setName(i18n("%1 (Investment)").arg(account.name())); // use the same name for the investment account - acc.setDescription(i18n("Autogenerated by TQIF importer from type Mutual account entry")); + acc.setDescription(i18n("Autogenerated by QIF importer from type Mutual account entry")); acc.setAccountType(MyMoneyAccount::Investment); parentAccount = file->asset(); kmymoney2->createAccount(acc, parentAccount, brokerage, MyMoneyMoney()); @@ -2175,7 +2175,7 @@ void MyMoneyQifReader::selectOrCreateAccount(const SelectCreateMode mode, MyMone } } else { accountSelect.setHeader(i18n("Import transactions to %1").arg(typeStr)); - msg = i18n("No %1 information has been found in the selected TQIF file. " + msg = i18n("No %1 information has been found in the selected QIF file. " "Please select an account using the selection box in the dialog or " "create a new %2 by pressing the Create button.") .arg(typeStr).arg(typeStr); @@ -2223,7 +2223,7 @@ void MyMoneyQifReader::selectOrCreateAccount(const SelectCreateMode mode, MyMone const MyMoneySecurity& sec = file->security(account.currencyId()); if ( KMessageBox::questionYesNo( tqApp->mainWidget(), - i18n("The %1 account currently has an opening balance of %2. This TQIF file reports an opening balance of %3. Would you like to overwrite the current balance with the one from the TQIF file?").arg(account.name(), split.shares().formatMoney(account, sec), balance.formatMoney(account, sec)), + i18n("The %1 account currently has an opening balance of %2. This QIF file reports an opening balance of %3. Would you like to overwrite the current balance with the one from the QIF file?").arg(account.name(), split.shares().formatMoney(account, sec), balance.formatMoney(account, sec)), i18n("Overwrite opening balance"), KStdGuiItem::yes(), KStdGuiItem::no(), diff --git a/kmymoney2/converter/mymoneyqifreader.h b/kmymoney2/converter/mymoneyqifreader.h index b97efe4..dfde437 100644 --- a/kmymoney2/converter/mymoneyqifreader.h +++ b/kmymoney2/converter/mymoneyqifreader.h @@ -20,8 +20,8 @@ * * ***************************************************************************/ -#ifndef MYMONEYTQIFREADER_H -#define MYMONEYTQIFREADER_H +#ifndef MYMONEYQIFREADER_H +#define MYMONEYQIFREADER_H // ---------------------------------------------------------------------------- // QT Headers @@ -109,7 +109,7 @@ public: * into the MyMoney engine. * * This method also starts the user defined import filter program - * defined in the TQIF profile. If none is defined, the file is read + * defined in the QIF profile. If none is defined, the file is read * as is (actually the UNIX command 'cat -' is used as the filter). * * If data from the filter program is available, the slot @@ -152,7 +152,7 @@ private: /** * This method scans a transaction contained in - * a TQIF file formatted as an account record. This + * a QIF file formatted as an account record. This * format is used by MS-Money. If the specific data * is not found, then the data in the entry is treated * as a transaction. In this case, the user will be asked to @@ -222,11 +222,11 @@ private: /** * This method is used to get the account id of the split for - * a transaction from the text found in the TQIF $ or L record. + * a transaction from the text found in the QIF $ or L record. * If an account with the name is not found, the user is asked * if it should be created. * - * @param name name of account as found in the TQIF file + * @param name name of account as found in the QIF file * @param value value found in the T record * @param value2 value found in the $ record for splitted transactions * diff --git a/kmymoney2/converter/mymoneyqifwriter.h b/kmymoney2/converter/mymoneyqifwriter.h index ceb915e..9f08159 100644 --- a/kmymoney2/converter/mymoneyqifwriter.h +++ b/kmymoney2/converter/mymoneyqifwriter.h @@ -20,8 +20,8 @@ * * ***************************************************************************/ -#ifndef MYMONEYTQIFWRITER_H -#define MYMONEYTQIFWRITER_H +#ifndef MYMONEYQIFWRITER_H +#define MYMONEYQIFWRITER_H // ---------------------------------------------------------------------------- // QT Headers @@ -44,7 +44,7 @@ class MyMoneySplit; */ /** - * This class represents the TQIF writer. All conversion between the + * This class represents the QIF writer. All conversion between the * internal representation of accounts, transactions is handled in this * object. The conversion is controlled using a MyMoneyQifProfile to allow * the user to control the conversion. diff --git a/kmymoney2/converter/webpricequote.cpp b/kmymoney2/converter/webpricequote.cpp index 2a25abf..a5a9087 100644 --- a/kmymoney2/converter/webpricequote.cpp +++ b/kmymoney2/converter/webpricequote.cpp @@ -870,7 +870,7 @@ const TQString FinanceQuoteProcess::niceName(const TQString& crypticName) { // Universal date converter // -// In 'strict' mode, this is designed to be compatable with the TQIF profile date +// In 'strict' mode, this is designed to be compatable with the QIF profile date // converter. However, that converter deals with the concept of an apostrophe // format in a way I don't understand. So for the moment, they are 99% // compatable, waiting on that issue. (acejones) -- cgit v1.2.1