From 6612bcfa1e491fbb2f441f2060f700b6ad589ffd Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmymoney@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmymoney2/converter/mymoneygncreader.cpp | 38 +++++++++++++------------- kmymoney2/converter/mymoneyqifprofile.cpp | 18 ++++++------ kmymoney2/converter/mymoneyqifreader.cpp | 28 +++++++++---------- kmymoney2/converter/mymoneystatementreader.cpp | 6 ++-- 4 files changed, 45 insertions(+), 45 deletions(-) (limited to 'kmymoney2/converter') diff --git a/kmymoney2/converter/mymoneygncreader.cpp b/kmymoney2/converter/mymoneygncreader.cpp index 79f6e89..10472d2 100644 --- a/kmymoney2/converter/mymoneygncreader.cpp +++ b/kmymoney2/converter/mymoneygncreader.cpp @@ -1252,7 +1252,7 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) { throw new MYMONEYEXCEPTION (em); } // if no tqparent account is present, assign to one of our standard accounts - if ((acc.tqparentAccountId().isEmpty()) || (acc.tqparentAccountId() == m_rootId)) { + if ((acc.parentAccountId().isEmpty()) || (acc.parentAccountId() == m_rootId)) { switch (acc.accountGroup()) { case MyMoneyAccount::Asset: acc.setParentAccountId (m_storage->asset().id()); break; case MyMoneyAccount::Liability: acc.setParentAccountId (m_storage->liability().id()); break; @@ -1312,7 +1312,7 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) { if (gncdebug) qDebug("Gnucash account %s has id of %s, type of %s, tqparent is %s", gac->id().latin1(), acc.id().data(), - KMyMoneyUtils::accountTypeToString(acc.accountType()).latin1(), acc.tqparentAccountId().data()); + KMyMoneyUtils::accountTypeToString(acc.accountType()).latin1(), acc.parentAccountId().data()); signalProgress (++m_accountCount, 0); return ; @@ -1913,34 +1913,34 @@ void MyMoneyGncReader::terminate () { TQValueList::Iterator acc; m_storage->accountList(list); for (acc = list.begin(); acc != list.end(); ++acc) { - if ((*acc).tqparentAccountId() == m_storage->asset().id()) { + if ((*acc).parentAccountId() == m_storage->asset().id()) { MyMoneyAccount assets = m_storage->asset(); m_storage->addAccount(assets, (*acc)); if (gncdebug) qDebug("Account id %s is a child of the main asset account", (*acc).id().data()); - } else if ((*acc).tqparentAccountId() == m_storage->liability().id()) { + } else if ((*acc).parentAccountId() == m_storage->liability().id()) { MyMoneyAccount liabilities = m_storage->liability(); m_storage->addAccount(liabilities, (*acc)); if (gncdebug) qDebug("Account id %s is a child of the main liability account", (*acc).id().data()); - } else if ((*acc).tqparentAccountId() == m_storage->income().id()) { + } else if ((*acc).parentAccountId() == m_storage->income().id()) { MyMoneyAccount incomes = m_storage->income(); m_storage->addAccount(incomes, (*acc)); if (gncdebug) qDebug("Account id %s is a child of the main income account", (*acc).id().data()); - } else if ((*acc).tqparentAccountId() == m_storage->expense().id()) { + } else if ((*acc).parentAccountId() == m_storage->expense().id()) { MyMoneyAccount expenses = m_storage->expense(); m_storage->addAccount(expenses, (*acc)); if (gncdebug) qDebug("Account id %s is a child of the main expense account", (*acc).id().data()); - } else if ((*acc).tqparentAccountId() == m_storage->equity().id()) { + } else if ((*acc).parentAccountId() == m_storage->equity().id()) { MyMoneyAccount equity = m_storage->equity(); m_storage->addAccount(equity, (*acc)); if (gncdebug) qDebug("Account id %s is a child of the main equity account", (*acc).id().data()); - } else if ((*acc).tqparentAccountId() == m_rootId) { + } else if ((*acc).parentAccountId() == m_rootId) { if (gncdebug) qDebug("Account id %s is a child of root", (*acc).id().data()); } else { // it is not under one of the main accounts, so find gnucash tqparent - TQString tqparentKey = (*acc).tqparentAccountId(); + TQString parentKey = (*acc).parentAccountId(); if (gncdebug) qDebug ("acc %s, tqparent %s", (*acc).id().data(), - (*acc).tqparentAccountId().data()); - map_accountIds::Iterator id = m_mapIds.tqfind(tqparentKey); + (*acc).parentAccountId().data()); + map_accountIds::Iterator id = m_mapIds.tqfind(parentKey); if (id != m_mapIds.end()) { if (gncdebug) qDebug("Setting account id %s's tqparent account id to %s", (*acc).id().data(), id.data().data()); @@ -2202,8 +2202,8 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) { // investment account. if it is, no further action is needed MyMoneyAccount stockAcc = m_storage->account (m_mapIds[stockId.utf8()]); MyMoneyAccount tqparent; - TQString tqparentKey = stockAcc.tqparentAccountId(); - map_accountIds::Iterator id = m_mapIds.tqfind (tqparentKey); + TQString parentKey = stockAcc.parentAccountId(); + map_accountIds::Iterator id = m_mapIds.tqfind (parentKey); if (id != m_mapIds.end()) { tqparent = m_storage->account (id.data()); if (tqparent.accountType() == MyMoneyAccount::Investment) return ; @@ -2214,11 +2214,11 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) { MyMoneyAccount invAcc (stockAcc); invAcc.setAccountType (MyMoneyAccount::Investment); invAcc.setCurrencyId (TQString("")); // we don't know what currency it is!! - invAcc.setParentAccountId (tqparentKey); // intersperse it between old tqparent and child stock acct + invAcc.setParentAccountId (parentKey); // intersperse it between old tqparent and child stock acct m_storage->addAccount (invAcc); - m_mapIds [invAcc.id()] = invAcc.id(); // so stock account gets tqparented (again) to investment account later + m_mapIds [invAcc.id()] = invAcc.id(); // so stock account gets parented (again) to investment account later if (gncdebug) qDebug ("Created investment account %s as id %s, tqparent %s", invAcc.name().data(), invAcc.id().data(), - invAcc.tqparentAccountId().data()); + invAcc.parentAccountId().data()); if (gncdebug) qDebug ("Setting stock %s, id %s, as child of %s", stockAcc.name().data(), stockAcc.id().data(), invAcc.id().data()); stockAcc.setParentAccountId (invAcc.id()); m_storage->addAccount(invAcc, stockAcc); @@ -2239,9 +2239,9 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) { singleInvAcc.setCurrencyId (TQString("")); singleInvAcc.setParentAccountId (m_storage->asset().id()); m_storage->addAccount (singleInvAcc); - m_mapIds [singleInvAcc.id()] = singleInvAcc.id(); // so stock account gets tqparented (again) to investment account later + m_mapIds [singleInvAcc.id()] = singleInvAcc.id(); // so stock account gets parented (again) to investment account later if (gncdebug) qDebug ("Created investment account %s as id %s, tqparent %s, reparenting stock", - singleInvAcc.name().data(), singleInvAcc.id().data(), singleInvAcc.tqparentAccountId().data()); + singleInvAcc.name().data(), singleInvAcc.id().data(), singleInvAcc.parentAccountId().data()); singleInvAccId = singleInvAcc.id(); } else { // the account has already been created singleInvAcc = m_storage->account (singleInvAccId); @@ -2318,7 +2318,7 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) { } } // end if ok - user pressed Cancel } // end while !ok - m_mapIds [invAcc.id()] = invAcc.id(); // so stock account gets tqparented (again) to investment account later + m_mapIds [invAcc.id()] = invAcc.id(); // so stock account gets parented (again) to investment account later m_storage->addAccount(invAcc, stockAcc); } else { // investment option != 0, 1, 2 qFatal ("Invalid investment option %d", m_investmentOption); diff --git a/kmymoney2/converter/mymoneyqifprofile.cpp b/kmymoney2/converter/mymoneyqifprofile.cpp index 3093941..d9ddd60 100644 --- a/kmymoney2/converter/mymoneyqifprofile.cpp +++ b/kmymoney2/converter/mymoneyqifprofile.cpp @@ -394,20 +394,20 @@ TQString MyMoneyQifProfile::date(const TQDate& datein) const const char* format = m_dateFormat.latin1(); TQString buffer; TQChar delim; - int tqmaskLen; - char tqmaskChar; + int maskLen; + char maskChar; while(*format) { switch(*format) { case '%': - tqmaskLen = 0; - tqmaskChar = *++format; - while(*format && *format == tqmaskChar) { - ++tqmaskLen; + maskLen = 0; + maskChar = *++format; + while(*format && *format == maskChar) { + ++maskLen; ++format; } - switch(tqmaskChar) { + switch(maskChar) { case 'd': if(delim) buffer += delim; @@ -417,14 +417,14 @@ TQString MyMoneyQifProfile::date(const TQDate& datein) const case 'm': if(delim) buffer += delim; - if(tqmaskLen == 3) + if(maskLen == 3) buffer += KGlobal::locale()->calendar()->monthName(datein.month(), datein.year(), true); else buffer += TQString::number(datein.month()).rightJustify(2, '0'); break; case 'y': - if(tqmaskLen == 2) { + if(maskLen == 2) { buffer += twoDigitYear(delim, datein.year()); } else { if(delim) diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp index fde43a4..031ecd5 100644 --- a/kmymoney2/converter/mymoneyqifreader.cpp +++ b/kmymoney2/converter/mymoneyqifreader.cpp @@ -870,13 +870,13 @@ void MyMoneyQifReader::processCategoryEntry(void) account.setName(extractLine('N')); account.setDescription(extractLine('D')); - MyMoneyAccount tqparentAccount; + MyMoneyAccount parentAccount; if(!extractLine('I').isEmpty()) { account.setAccountType(MyMoneyAccount::Income); - tqparentAccount = file->income(); + parentAccount = file->income(); } else if(!extractLine('E').isEmpty()) { account.setAccountType(MyMoneyAccount::Expense); - tqparentAccount = file->expense(); + parentAccount = file->expense(); } // check if we can find the account already in the file @@ -886,7 +886,7 @@ void MyMoneyQifReader::processCategoryEntry(void) if(acc.id().isEmpty()) { MyMoneyAccount brokerage; MyMoneyMoney balance; - kmymoney2->createAccount(account, tqparentAccount, brokerage, balance); + kmymoney2->createAccount(account, parentAccount, brokerage, balance); } } @@ -1962,13 +1962,13 @@ TQString MyMoneyQifReader::checkCategory(const TQString& name, const MyMoneyMone // if we did not find the category, we create it if(!found) { MyMoneyAccount tqparent; - if(account.tqparentAccountId().isEmpty()) { + if(account.parentAccountId().isEmpty()) { if(!value.isNegative() && value2.isNegative()) tqparent = file->income(); else tqparent = file->expense(); } else { - tqparent = file->account(account.tqparentAccountId()); + tqparent = file->account(account.parentAccountId()); } account.setAccountType((!value.isNegative() && value2.isNegative()) ? MyMoneyAccount::Income : MyMoneyAccount::Expense); MyMoneyAccount brokerage; @@ -2036,7 +2036,7 @@ TQString MyMoneyQifReader::processAccountEntry(bool resetAccountId) if(account.accountType() == MyMoneyAccount::UnknownAccountType) account.setAccountType(MyMoneyAccount::Checkings); - MyMoneyAccount tqparentAccount; + MyMoneyAccount parentAccount; MyMoneyAccount brokerage; MyMoneyMoney balance; // in case it's a stock account, we need to setup a fix investment account @@ -2044,22 +2044,22 @@ TQString MyMoneyQifReader::processAccountEntry(bool resetAccountId) acc.setName(i18n("%1 (Investment)").tqarg(account.name())); // use the same name for the investment account acc.setDescription(i18n("Autogenerated by TQIF importer from type Mutual account entry")); acc.setAccountType(MyMoneyAccount::Investment); - tqparentAccount = file->asset(); - kmymoney2->createAccount(acc, tqparentAccount, brokerage, MyMoneyMoney()); - tqparentAccount = acc; + parentAccount = file->asset(); + kmymoney2->createAccount(acc, parentAccount, brokerage, MyMoneyMoney()); + parentAccount = acc; qDebug("We still need to create the stock account in MyMoneyQifReader::processAccountEntry()"); } else { // setup tqparent according the type of the account switch(account.accountGroup()) { case MyMoneyAccount::Asset: default: - tqparentAccount = file->asset(); + parentAccount = file->asset(); break; case MyMoneyAccount::Liability: - tqparentAccount = file->liability(); + parentAccount = file->liability(); break; case MyMoneyAccount::Equity: - tqparentAccount = file->equity(); + parentAccount = file->equity(); break; } } @@ -2071,7 +2071,7 @@ TQString MyMoneyQifReader::processAccountEntry(bool resetAccountId) brokerage.setAccountType(MyMoneyAccount::Checkings); brokerage.setCurrencyId(MyMoneyFile::instance()->baseCurrency().id()); } - kmymoney2->createAccount(account, tqparentAccount, brokerage, balance); + kmymoney2->createAccount(account, parentAccount, brokerage, balance); acc = account; // qDebug("Account created"); } else { diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp index 8268d89..ad74be4 100644 --- a/kmymoney2/converter/mymoneystatementreader.cpp +++ b/kmymoney2/converter/mymoneystatementreader.cpp @@ -86,7 +86,7 @@ class MyMoneyStatementReader::Private TQMap securitiesByName; bool m_skipCategoryMatching; private: - void scanCategories(TQString& id, const MyMoneyAccount& invAcc, const MyMoneyAccount& tqparentAccount, const TQString& defaultName); + void scanCategories(TQString& id, const MyMoneyAccount& invAcc, const MyMoneyAccount& parentAccount, const TQString& defaultName); TQString nameToId(const TQString&name, MyMoneyAccount& tqparent); private: TQString m_feeId; @@ -134,7 +134,7 @@ TQString MyMoneyStatementReader::Private::feeId(const TQString& name) } -void MyMoneyStatementReader::Private::scanCategories(TQString& id, const MyMoneyAccount& invAcc, const MyMoneyAccount& tqparentAccount, const TQString& defaultName) +void MyMoneyStatementReader::Private::scanCategories(TQString& id, const MyMoneyAccount& invAcc, const MyMoneyAccount& parentAccount, const TQString& defaultName) { if(!scannedCategories) { KMyMoneyUtils::previouslyUsedCategories(invAcc.id(), m_feeId, m_interestId); @@ -146,7 +146,7 @@ void MyMoneyStatementReader::Private::scanCategories(TQString& id, const MyMoney MyMoneyAccount acc = file->accountByName(defaultName); // if it does not exist, we have to create it if(acc.id().isEmpty()) { - MyMoneyAccount tqparent = tqparentAccount; + MyMoneyAccount tqparent = parentAccount; acc.setName( defaultName ); acc.setAccountType( tqparent.accountType() ); acc.setCurrencyId(tqparent.currencyId()); -- cgit v1.2.1