From aa85254cd16cb870b8d1649ef1dbad09bd8491e8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:19:48 -0600 Subject: Rename additional global TQt functions --- kmymoney2/mymoney/mymoneyaccount.cpp | 6 ++-- kmymoney2/mymoney/mymoneyexception.cpp | 2 +- kmymoney2/mymoney/mymoneyfile.cpp | 10 +++--- kmymoney2/mymoney/mymoneymoney.cpp | 18 +++++----- kmymoney2/mymoney/mymoneyobjectcontainer.cpp | 2 +- kmymoney2/mymoney/mymoneyprice.cpp | 4 +-- kmymoney2/mymoney/mymoneyscheduled.cpp | 6 ++-- kmymoney2/mymoney/mymoneysubject.cpp | 2 +- kmymoney2/mymoney/mymoneytransaction.cpp | 2 +- kmymoney2/mymoney/mymoneytransactionfilter.cpp | 16 ++++----- kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp | 16 ++++----- .../mymoney/storage/mymoneydatabasemgrtest.cpp | 14 ++++---- kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp | 16 ++++----- .../mymoney/storage/mymoneyseqaccessmgrtest.cpp | 2 +- kmymoney2/mymoney/storage/mymoneystoragedump.cpp | 2 +- kmymoney2/mymoney/storage/mymoneystoragesql.cpp | 42 +++++++++++----------- kmymoney2/mymoney/storage/mymoneystoragesql.h | 2 +- kmymoney2/mymoney/storage/mymoneystoragexml.cpp | 26 +++++++------- 18 files changed, 94 insertions(+), 94 deletions(-) (limited to 'kmymoney2/mymoney') diff --git a/kmymoney2/mymoney/mymoneyaccount.cpp b/kmymoney2/mymoney/mymoneyaccount.cpp index c83e834..569a9ae 100644 --- a/kmymoney2/mymoney/mymoneyaccount.cpp +++ b/kmymoney2/mymoney/mymoneyaccount.cpp @@ -62,7 +62,7 @@ MyMoneyAccount::MyMoneyAccount(const TQDomElement& node) : setName(node.attribute("name")); - // qDebug("Reading information for account %s", acc.name().data()); + // tqDebug("Reading information for account %s", acc.name().data()); setParentAccountId(TQStringEmpty(node.attribute("parentaccount"))); setLastModified(stringToDate(TQStringEmpty(node.attribute("lastmodified")))); @@ -93,7 +93,7 @@ MyMoneyAccount::MyMoneyAccount(const TQDomElement& node) : if(bOK) { setAccountType(static_cast(type)); } else { - qWarning("XMLREADER: Account %s had invalid or no account type information.", name().data()); + tqWarning("XMLREADER: Account %s had invalid or no account type information.", name().data()); } if(node.hasAttribute("openingbalance")) { @@ -105,7 +105,7 @@ MyMoneyAccount::MyMoneyAccount(const TQDomElement& node) : setDescription(node.attribute("description")); m_id = TQStringEmpty(node.attribute("id")); - // qDebug("Account %s has id of %s, type of %d, parent is %s.", acc.name().data(), id.data(), type, acc.parentAccountId().data()); + // tqDebug("Account %s has id of %s, type of %d, parent is %s.", acc.name().data(), id.data(), type, acc.parentAccountId().data()); // Process any Sub-Account information found inside the account entry. m_accountList.clear(); diff --git a/kmymoney2/mymoney/mymoneyexception.cpp b/kmymoney2/mymoney/mymoneyexception.cpp index 4ee0970..47d32fc 100644 --- a/kmymoney2/mymoney/mymoneyexception.cpp +++ b/kmymoney2/mymoney/mymoneyexception.cpp @@ -24,7 +24,7 @@ MyMoneyException::MyMoneyException(const TQString& msg, const TQString& file, const unsigned long line) { - // qDebug("MyMoneyException(%s,%s,%d)", msg.data(), file.data(), line); + // tqDebug("MyMoneyException(%s,%s,%d)", msg.data(), file.data(), line); m_msg = msg; m_file = file; m_line = line; diff --git a/kmymoney2/mymoney/mymoneyfile.cpp b/kmymoney2/mymoney/mymoneyfile.cpp index c59d577..2b7fdbc 100644 --- a/kmymoney2/mymoney/mymoneyfile.cpp +++ b/kmymoney2/mymoney/mymoneyfile.cpp @@ -739,7 +739,7 @@ const MyMoneyAccount MyMoneyFile::openingBalanceAccount(const MyMoneySecurity& s ft.commit(); } catch(MyMoneyException* e) { - qDebug("Unable to create opening balance account for security %s", security.id().data()); + tqDebug("Unable to create opening balance account for security %s", security.id().data()); delete e; } return acc; @@ -1099,10 +1099,10 @@ void MyMoneyFile::warningMissingRate(const TQString& fromId, const TQString& toI try { from = security(fromId); to = security(toId); - qWarning("Missing price info for conversion from %s to %s", from.name().latin1(), to.name().latin1()); + tqWarning("Missing price info for conversion from %s to %s", from.name().latin1(), to.name().latin1()); } catch(MyMoneyException *e) { - qFatal("Missing security caught in MyMoneyFile::warningMissingRate(): %s(%ld) %s", e->file().data(), e->line(), e->what().data()); + tqFatal("Missing security caught in MyMoneyFile::warningMissingRate(): %s(%ld) %s", e->file().data(), e->line(), e->what().data()); delete e; } } @@ -1399,7 +1399,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) toplevel = equity(); break; default: - qWarning("%s:%d This should never happen!", __FILE__ , __LINE__); + tqWarning("%s:%d This should never happen!", __FILE__ , __LINE__); break; } @@ -1810,7 +1810,7 @@ TQString MyMoneyFile::createCategory(const MyMoneyAccount& base, const TQString& } catch (MyMoneyException *e) { - qDebug("Unable to add account %s, %s, %s: %s", + tqDebug("Unable to add account %s, %s, %s: %s", categoryAccount.name().latin1(), parent.name().latin1(), categoryText.latin1(), diff --git a/kmymoney2/mymoney/mymoneymoney.cpp b/kmymoney2/mymoney/mymoneymoney.cpp index 2d380d3..6bbe013 100644 --- a/kmymoney2/mymoney/mymoneymoney.cpp +++ b/kmymoney2/mymoney/mymoneymoney.cpp @@ -156,10 +156,10 @@ MyMoneyMoney::MyMoneyMoney(const TQString& pszAmount) negChars += "()"; } validChars += negChars; - // qDebug("0: '%s'", validChars.data()); + // tqDebug("0: '%s'", validChars.data()); TQRegExp invChars(TQString("[^%1]").arg(validChars)); - // qDebug("1: '%s'", res.data()); + // tqDebug("1: '%s'", res.data()); res.remove(invChars); TQRegExp negCharSet(TQString("[%1]").arg(negChars)); @@ -168,10 +168,10 @@ MyMoneyMoney::MyMoneyMoney(const TQString& pszAmount) isNegative = true; res.remove(negCharSet); } - // qDebug("2: '%s' %s", res.data(), isNegative ? "(-)" : ""); + // tqDebug("2: '%s' %s", res.data(), isNegative ? "(-)" : ""); int pos; - // qDebug("3: '%s'", res.data()); + // tqDebug("3: '%s'", res.data()); if((pos = res.find(_decimalSeparator)) != -1) { // make sure, we get the denominator right m_denom = precToDenom(res.length() - pos - 1); @@ -179,7 +179,7 @@ MyMoneyMoney::MyMoneyMoney(const TQString& pszAmount) // now remove the decimal symbol res.remove(pos, 1); } - // qDebug("4: '%s'", res.data()); + // tqDebug("4: '%s'", res.data()); if(res.length() > 0) m_num = atoll( res ); @@ -353,13 +353,13 @@ TQDataStream &operator<<(TQDataStream &s, const MyMoneyMoney &_money) switch(MyMoneyMoney::_fileVersion) { case MyMoneyMoney::FILE_4_BYTE_VALUE: if(money.m_num & 0xffffffff00000000LL) - qWarning("Lost data while writing out MyMoneyMoney object using deprecated 4 byte writer"); + tqWarning("Lost data while writing out MyMoneyMoney object using deprecated 4 byte writer"); s << static_cast (money.m_num & 0xffffffff); break; default: - qDebug("Unknown file version while writing MyMoneyMoney object! Use FILE_8_BYTE_VALUE"); + tqDebug("Unknown file version while writing MyMoneyMoney object! Use FILE_8_BYTE_VALUE"); // tricky fall through here case MyMoneyMoney::FILE_8_BYTE_VALUE: @@ -381,7 +381,7 @@ TQDataStream &operator>>(TQDataStream &s, MyMoneyMoney &money) break; default: - qDebug("Unknown file version while writing MyMoneyMoney object! FILE_8_BYTE_VALUE assumed"); + tqDebug("Unknown file version while writing MyMoneyMoney object! FILE_8_BYTE_VALUE assumed"); // tricky fall through here case MyMoneyMoney::FILE_8_BYTE_VALUE: @@ -724,7 +724,7 @@ const MyMoneyMoney MyMoneyMoney::convert(const signed64 _denom, const roundingMe break; case RndNever: - qWarning("MyMoneyMoney: have remainder \"%Ld/%Ld\"->convert(%Ld, %d)", + tqWarning("MyMoneyMoney: have remainder \"%Ld/%Ld\"->convert(%Ld, %d)", m_num, m_denom, _denom, how); break; } diff --git a/kmymoney2/mymoney/mymoneyobjectcontainer.cpp b/kmymoney2/mymoney/mymoneyobjectcontainer.cpp index 9b54b1f..7517e17 100644 --- a/kmymoney2/mymoney/mymoneyobjectcontainer.cpp +++ b/kmymoney2/mymoney/mymoneyobjectcontainer.cpp @@ -190,7 +190,7 @@ void MyMoneyObjectContainer::refresh(const TQString& id) const MyMoneySchedule& s = m_storage->schedule(id); m_map[id] = new MyMoneySchedule(s); } else { - qWarning("Ooops, should preload an unknown object with id '%s'", id.data()); + tqWarning("Ooops, should preload an unknown object with id '%s'", id.data()); } return; } diff --git a/kmymoney2/mymoney/mymoneyprice.cpp b/kmymoney2/mymoney/mymoneyprice.cpp index 77054b5..a65ba65 100644 --- a/kmymoney2/mymoney/mymoneyprice.cpp +++ b/kmymoney2/mymoney/mymoneyprice.cpp @@ -56,7 +56,7 @@ MyMoneyPrice::MyMoneyPrice(const TQString& from, const TQString& to, const TQDom if(!m_rate.isZero()) m_invRate = MyMoneyMoney(1,1) / m_rate; else - qDebug("Price with zero value loaded"); + tqDebug("Price with zero value loaded"); } MyMoneyPrice::MyMoneyPrice(const TQString& from, const TQString& to, const TQDate& date, const MyMoneyMoney& rate, const TQString& source) : @@ -69,7 +69,7 @@ MyMoneyPrice::MyMoneyPrice(const TQString& from, const TQString& to, const TQDat if(!m_rate.isZero()) m_invRate = MyMoneyMoney(1,1) / m_rate; else - qDebug("Price with zero value created"); + tqDebug("Price with zero value created"); } MyMoneyPrice::~MyMoneyPrice() diff --git a/kmymoney2/mymoney/mymoneyscheduled.cpp b/kmymoney2/mymoney/mymoneyscheduled.cpp index a2eb6dd..745160c 100644 --- a/kmymoney2/mymoney/mymoneyscheduled.cpp +++ b/kmymoney2/mymoney/mymoneyscheduled.cpp @@ -618,7 +618,7 @@ MyMoneyAccount MyMoneySchedule::account(int cnt) const if(!cnt) return acc; } catch(MyMoneyException *e) { - qWarning("Schedule '%s' references unknown account '%s'", id().data(), (*it).accountId().data()); + tqWarning("Schedule '%s' references unknown account '%s'", id().data(), (*it).accountId().data()); delete e; return MyMoneyAccount(); } @@ -1062,7 +1062,7 @@ int MyMoneySchedule::eventsPerYear(MyMoneySchedule::occurenceE occurence) rc = 1; break; default: - qWarning("Occurence not supported by financial calculator"); + tqWarning("Occurence not supported by financial calculator"); } return rc; @@ -1120,7 +1120,7 @@ int MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::occurenceE occurence) rc = 360; break; default: - qWarning("Occurence not supported by financial calculator"); + tqWarning("Occurence not supported by financial calculator"); } return rc; diff --git a/kmymoney2/mymoney/mymoneysubject.cpp b/kmymoney2/mymoney/mymoneysubject.cpp index 37991d0..d7a4c40 100644 --- a/kmymoney2/mymoney/mymoneysubject.cpp +++ b/kmymoney2/mymoney/mymoneysubject.cpp @@ -50,7 +50,7 @@ void MyMoneySubject::notify(const TQString& id) for (i = ptrList.first(); i != 0; i = ptrList.next()) { // only call the observer if it did not detach in the meantime if(m_observers.findRef(i) != -1) { - // qDebug("call observer @ 0x%08lX with '%s'", (unsigned long)i, id.data()); + // tqDebug("call observer @ 0x%08lX with '%s'", (unsigned long)i, id.data()); i->update(id); } } diff --git a/kmymoney2/mymoney/mymoneytransaction.cpp b/kmymoney2/mymoney/mymoneytransaction.cpp index a46bb79..cc0f6d2 100644 --- a/kmymoney2/mymoney/mymoneytransaction.cpp +++ b/kmymoney2/mymoney/mymoneytransaction.cpp @@ -75,7 +75,7 @@ MyMoneyTransaction::MyMoneyTransaction(const TQDomElement& node, const bool forc if(!s.accountId().isEmpty()) addSplit(s); else - qDebug("Dropped split because it did not have an account id"); + tqDebug("Dropped split because it did not have an account id"); } } else if(c.tagName() == "KEYVALUEPAIRS") { diff --git a/kmymoney2/mymoney/mymoneytransactionfilter.cpp b/kmymoney2/mymoney/mymoneytransactionfilter.cpp index d80b8ac..2ef08e3 100644 --- a/kmymoney2/mymoney/mymoneytransactionfilter.cpp +++ b/kmymoney2/mymoney/mymoneytransactionfilter.cpp @@ -272,7 +272,7 @@ bool MyMoneyTransactionFilter::match(const MyMoneyTransaction& transaction) m_matchingSplits.clear(); - // qDebug("T: %s", transaction.id().data()); + // tqDebug("T: %s", transaction.id().data()); // if no filter is set, we can savely return a match // if we should report all splits, then we collect them if(!m_filterSet.allFilter) { @@ -372,7 +372,7 @@ bool MyMoneyTransactionFilter::match(const MyMoneyTransaction& transaction) sp = matchingSplits.next(); if(removeSplit) { - // qDebug(" S: %s", (*it).id().data()); + // tqDebug(" S: %s", (*it).id().data()); matchingSplits.remove(removeSplit); } } @@ -460,7 +460,7 @@ bool MyMoneyTransactionFilter::match(const MyMoneyTransaction& transaction) sp = matchingSplits.next(); if(removeSplit) { - // qDebug(" S: %s", (*it).id().data()); + // tqDebug(" S: %s", (*it).id().data()); matchingSplits.remove(removeSplit); } } @@ -474,7 +474,7 @@ bool MyMoneyTransactionFilter::match(const MyMoneyTransaction& transaction) } } // all filters passed, I guess we have a match - // qDebug(" C: %d", m_matchingSplits.count()); + // tqDebug(" C: %d", m_matchingSplits.count()); return matchingSplits.count() != 0; } @@ -835,7 +835,7 @@ bool MyMoneyTransactionFilter::translateDateRange(dateOptionE id, TQDate& start, end = TQDate::currentDate(); break; default: - qFatal("Unknown date identifier %d in MyMoneyTransactionFilter::translateDateRange()", id); + tqFatal("Unknown date identifier %d in MyMoneyTransactionFilter::translateDateRange()", id); rc = false; break; } @@ -845,13 +845,13 @@ bool MyMoneyTransactionFilter::translateDateRange(dateOptionE id, TQDate& start, void MyMoneyTransactionFilter::removeReference(const TQString& id) { if(m_accounts.find(id)) { - qDebug("%s", (TQString("Remove account '%1' from report").arg(id)).data()); + tqDebug("%s", (TQString("Remove account '%1' from report").arg(id)).data()); m_accounts.remove(id); } else if(m_categories.find(id)) { - qDebug("%s", (TQString("Remove category '%1' from report").arg(id)).data()); + tqDebug("%s", (TQString("Remove category '%1' from report").arg(id)).data()); m_categories.remove(id); } else if(m_payees.find(id)) { - qDebug("%s", (TQString("Remove payee '%1' from report").arg(id)).data()); + tqDebug("%s", (TQString("Remove payee '%1' from report").arg(id)).data()); m_payees.remove(id); } } diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp index 6324d4c..d4de685 100644 --- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp +++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp @@ -920,7 +920,7 @@ const MyMoneyMoney MyMoneyDatabaseMgr::balance(const TQString& id, const TQDate& MyMoneyAccount acc; TQMap accountList = m_sql->fetchAccounts(/*TQString(id)*/); //TQMap::const_iterator accpos = accountList.find(id); - if (date_ != TQDate()) qDebug ("request balance for %s at %s", id.data(), TQString(date_.toString(Qt::ISODate)).latin1()); + if (date_ != TQDate()) tqDebug ("request balance for %s at %s", id.data(), TQString(date_.toString(Qt::ISODate)).latin1()); // if(!date_.isValid() && MyMoneyFile::instance()->account(id).accountType() != MyMoneyAccount::Stock) { // if(accountList.find(id) != accountList.end()) // return accountList[id].balance(); @@ -980,7 +980,7 @@ const MyMoneyMoney MyMoneyDatabaseMgr::balance(const TQString& id, const TQDate& //FIXME: if(m_balanceCache[id].valid == true) //FIXME: result = m_balanceCache[id].balance; //FIXME: else -//FIXME: qDebug("Cache mishit should never happen at this point"); +//FIXME: tqDebug("Cache mishit should never happen at this point"); return result; } @@ -1216,10 +1216,10 @@ const TQValueList MyMoneyDatabaseMgr::scheduleList(const TQStri TQMap::ConstIterator pos; TQValueList list; - // qDebug("scheduleList()"); + // tqDebug("scheduleList()"); for(pos = scheduleList.begin(); pos != scheduleList.end(); ++pos) { - // qDebug(" '%s'", (*pos).id().data()); + // tqDebug(" '%s'", (*pos).id().data()); if(type != MyMoneySchedule::TYPE_ANY) { if(type != (*pos).type()) { @@ -1283,7 +1283,7 @@ const TQValueList MyMoneyDatabaseMgr::scheduleList(const TQStri */ } - // qDebug("Adding '%s'", (*pos).name().latin1()); + // tqDebug("Adding '%s'", (*pos).name().latin1()); list << *pos; } return list; @@ -1295,7 +1295,7 @@ const TQValueList MyMoneyDatabaseMgr::scheduleListEx( int sched TQDate startDate, const TQStringList& accounts) const { -// qDebug("scheduleListEx"); +// tqDebug("scheduleListEx"); TQMap scheduleList = m_sql->fetchSchedules(); TQMap::ConstIterator pos; TQValueList list; @@ -1329,7 +1329,7 @@ const TQValueList MyMoneyDatabaseMgr::scheduleListEx( int sched continue; } -// qDebug("\tAdding '%s'", (*pos).name().latin1()); +// tqDebug("\tAdding '%s'", (*pos).name().latin1()); list << *pos; } @@ -1581,7 +1581,7 @@ bool MyMoneyDatabaseMgr::isReferenced(const MyMoneyObject& obj, const MyMoneyFil //TQMap transactionList = m_sql->fetchTransactions(f); //rc = (transactionList.end() != std::find_if(transactionList.begin(), transactionList.end(), isReferencedHelper(id))); //if (rc != m_sql->isReferencedByTransaction(obj.id())) - // qDebug ("Transaction match inconsistency."); + // tqDebug ("Transaction match inconsistency."); rc = m_sql->isReferencedByTransaction(obj.id()); } } diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp index 30fe093..a171431 100644 --- a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp +++ b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp @@ -98,7 +98,7 @@ void MyMoneyDatabaseMgrTest::testCreateDb() { + *it + "&mode=single"; KSharedPtr sql = m->connectToDatabase(m_url); CPPUNIT_ASSERT(0 != sql); - //qDebug("Database driver is %s", sql->driverName().ascii()); + //tqDebug("Database driver is %s", sql->driverName().ascii()); // Clear the database, so there is a fresh start on each run. if (0 == sql->open(m_url, IO_WriteOnly, true)) { MyMoneyFile::instance()->attachStorage(m); @@ -839,19 +839,19 @@ void MyMoneyDatabaseMgrTest::testBalance() { m->addTransaction(t1); - //qDebug ("Balance of A000003 is 0 = %s", m->balance("A000003", TQDate()).toString().ascii()); + //tqDebug ("Balance of A000003 is 0 = %s", m->balance("A000003", TQDate()).toString().ascii()); CPPUNIT_ASSERT(m->balance("A000003", TQDate()).isZero()); - //qDebug ("Balance of A000001 is 1600 = %s", m->balance("A000001", TQDate()).toString().ascii()); + //tqDebug ("Balance of A000001 is 1600 = %s", m->balance("A000001", TQDate()).toString().ascii()); CPPUNIT_ASSERT(m->totalBalance("A000001", TQDate()) == MyMoneyMoney(1600)); - //qDebug ("Balance of A000006 is -11600 = %s", m->balance("A000006", TQDate(2002,5,9)).toString().ascii()); + //tqDebug ("Balance of A000006 is -11600 = %s", m->balance("A000006", TQDate(2002,5,9)).toString().ascii()); CPPUNIT_ASSERT(m->balance("A000006", TQDate(2002,5,9)) == MyMoneyMoney(-11600)); - //qDebug ("Balance of A000005 is -100000 = %s", m->balance("A000005", TQDate(2002,5,10)).toString().ascii()); + //tqDebug ("Balance of A000005 is -100000 = %s", m->balance("A000005", TQDate(2002,5,10)).toString().ascii()); CPPUNIT_ASSERT(m->balance("A000005", TQDate(2002,5,10)) == MyMoneyMoney(-100000)); - //qDebug ("Balance of A000006 is 88400 = %s", m->balance("A000006", TQDate(2002,5,10)).toString().ascii()); + //tqDebug ("Balance of A000006 is 88400 = %s", m->balance("A000006", TQDate(2002,5,10)).toString().ascii()); CPPUNIT_ASSERT(m->balance("A000006", TQDate(2002,5,10)) == MyMoneyMoney(88400)); } @@ -1731,7 +1731,7 @@ void MyMoneyDatabaseMgrTest::testScheduleList() { m->addSchedule(schedule3); m->addSchedule(schedule4); } catch(MyMoneyException *e) { - qDebug("Error: %s", e->what().latin1()); + tqDebug("Error: %s", e->what().latin1()); delete e; CPPUNIT_FAIL("Unexpected exception"); } diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp index 3ab0b72..6ebea3c 100644 --- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp +++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp @@ -870,7 +870,7 @@ const MyMoneyMoney MyMoneySeqAccessMgr::balance(const TQString& id, const TQDate { MyMoneyMoney result(0); MyMoneyAccount acc; - // if (date != TQDate()) qDebug ("request balance for %s at %s", id.data(), date.toString(Qt::ISODate).latin1()); + // if (date != TQDate()) tqDebug ("request balance for %s at %s", id.data(), date.toString(Qt::ISODate).latin1()); if(!date.isValid() && account(id).accountType() != MyMoneyAccount::Stock) { if(m_accountList.find(id) != m_accountList.end()) return m_accountList[id].balance(); @@ -923,7 +923,7 @@ const MyMoneyMoney MyMoneySeqAccessMgr::balance(const TQString& id, const TQDate if(m_balanceCache[id].valid == true) result = m_balanceCache[id].balance; else - qDebug("Cache mishit should never happen at this point"); + tqDebug("Cache mishit should never happen at this point"); return result; } @@ -1245,10 +1245,10 @@ const TQValueList MyMoneySeqAccessMgr::scheduleList( TQMap::ConstIterator pos; TQValueList list; - // qDebug("scheduleList()"); + // tqDebug("scheduleList()"); for(pos = m_scheduleList.begin(); pos != m_scheduleList.end(); ++pos) { - // qDebug(" '%s'", qPrintable((*pos).id())); + // tqDebug(" '%s'", qPrintable((*pos).id())); if(type != MyMoneySchedule::TYPE_ANY) { if(type != (*pos).type()) { @@ -1305,7 +1305,7 @@ const TQValueList MyMoneySeqAccessMgr::scheduleList( continue; } - // qDebug("Adding '%s'", (*pos).name().latin1()); + // tqDebug("Adding '%s'", (*pos).name().latin1()); list << *pos; } return list; @@ -1340,7 +1340,7 @@ const TQValueList MyMoneySeqAccessMgr::scheduleListEx(int sched TQDate date, const TQStringList& accounts) const { -// qDebug("scheduleListEx"); +// tqDebug("scheduleListEx"); TQMap::ConstIterator pos; TQValueList list; @@ -1374,7 +1374,7 @@ const TQValueList MyMoneySeqAccessMgr::scheduleListEx(int sched continue; } -// qDebug("\tAdding '%s'", (*pos).name().latin1()); +// tqDebug("\tAdding '%s'", (*pos).name().latin1()); list << *pos; } @@ -1436,7 +1436,7 @@ const MyMoneySecurity MyMoneySeqAccessMgr::security(const TQString& id) const const TQValueList MyMoneySeqAccessMgr::securityList(void) const { - //qDebug("securityList: Security list size is %d, this=%8p", m_equitiesList.size(), (void*)this); + //tqDebug("securityList: Security list size is %d, this=%8p", m_equitiesList.size(), (void*)this); return m_securitiesList.values(); } diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp index 9c36204..af05e16 100644 --- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp +++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp @@ -1384,7 +1384,7 @@ void MyMoneySeqAccessMgrTest::testScheduleList() { m->addSchedule(schedule3); m->addSchedule(schedule4); } catch(MyMoneyException *e) { - qDebug("Error: %s", e->what().latin1()); + tqDebug("Error: %s", e->what().latin1()); delete e; CPPUNIT_FAIL("Unexpected exception"); } diff --git a/kmymoney2/mymoney/storage/mymoneystoragedump.cpp b/kmymoney2/mymoney/storage/mymoneystoragedump.cpp index 73521b0..6dd8beb 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragedump.cpp +++ b/kmymoney2/mymoney/storage/mymoneystoragedump.cpp @@ -47,7 +47,7 @@ MyMoneyStorageDump::~MyMoneyStorageDump() void MyMoneyStorageDump::readStream(TQDataStream& /* s */, IMyMoneySerialize* /* storage */) { - qDebug("Reading not supported by MyMoneyStorageDump!!"); + tqDebug("Reading not supported by MyMoneyStorageDump!!"); } void MyMoneyStorageDump::writeStream(TQDataStream& _s, IMyMoneySerialize* _storage) diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp index e14f79e..fe8ac87 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp +++ b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp @@ -45,8 +45,8 @@ #define CATCH } catch (MyMoneyException *e) { #define PASS } catch (MyMoneyException *e) { throw; } #define ECATCH } -#define DBG(a) // qDebug(a) -//#define TRACE(a) qDebug(a) +#define DBG(a) // tqDebug(a) +//#define TRACE(a) tqDebug(a) #define TRACE(a) ::timetrace(a) //***************** THE CURRENT VERSION OF THE DATABASE LAYOUT **************** @@ -182,7 +182,7 @@ try { } break; default: - qFatal("%s", TQString("%1 - unknown open mode %2").arg(__func__).arg(openMode).data()); + tqFatal("%s", TQString("%1 - unknown open mode %2").arg(__func__).arg(openMode).data()); } if (rc != 0) return (rc); // bypass logon check if we are creating a database @@ -195,7 +195,7 @@ try { .arg(m_logonUser) .arg(m_logonAt.date().toString(Qt::ISODate)) .arg(m_logonAt.time().toString("hh.mm.ss")); - qDebug("%s", m_error.data()); + tqDebug("%s", m_error.data()); close(false); rc = -1; } else { @@ -205,7 +205,7 @@ try { } return(rc); } catch (TQString& s) { - qDebug("%s",s.data()); + tqDebug("%s",s.data()); return (1); } } @@ -321,7 +321,7 @@ int MyMoneyStorageSql::upgradeDb() { case 6: break; default: - qFatal("Unknown version number in database - %d", m_dbVersion); + tqFatal("Unknown version number in database - %d", m_dbVersion); } } // write updated version to DB @@ -349,7 +349,7 @@ bool MyMoneyStorageSql::addColumn if (c->name() == col) break; } - if (ft == t.end()) qFatal("addColumn - get it right"); + if (ft == t.end()) tqFatal("addColumn - get it right"); return (addColumn(t, *c, after)); } @@ -357,7 +357,7 @@ bool MyMoneyStorageSql::addColumn (const MyMoneyDbTable& t, const MyMoneyDbColumn& c, const TQString& after){ if ((m_dbType == Sqlite3) && (!after.isEmpty())) - qFatal("sqlite doesn't support 'AFTER'; use sqliteAlterTable"); + tqFatal("sqlite doesn't support 'AFTER'; use sqliteAlterTable"); if (record(t.name()).contains(c.name())) return (true); TQSqlQuery q(this); @@ -384,7 +384,7 @@ bool MyMoneyStorageSql::dropColumn bool MyMoneyStorageSql::dropColumn (const MyMoneyDbTable& t, const TQString& col){ if (m_dbType == Sqlite3) - qFatal("sqlite doesn't support 'DROP COLUMN'; use sqliteAlterTable"); + tqFatal("sqlite doesn't support 'DROP COLUMN'; use sqliteAlterTable"); if (!record(t.name()).contains(col)) return (true); TQSqlQuery q(this); @@ -400,7 +400,7 @@ bool MyMoneyStorageSql::dropColumn int MyMoneyStorageSql::upgradeToV1() { DBG("*** Entering MyMoneyStorageSql::upgradeToV1"); - if ((m_dbType == Sqlite) || (m_dbType == Sqlite3)) qFatal("SQLite upgrade NYI"); + if ((m_dbType == Sqlite) || (m_dbType == Sqlite3)) tqFatal("SQLite upgrade NYI"); startCommitUnit(__func__); MyMoneySqlQuery q(this); // change kmmSplits pkey to (transactionId, splitId) @@ -559,7 +559,7 @@ int MyMoneyStorageSql::upgradeToV1() { int MyMoneyStorageSql::upgradeToV2() { DBG("*** Entering MyMoneyStorageSql::upgradeToV2"); //SQLite3 now supports ALTER TABLE...ADD COLUMN, so only die if version < 3 - //if (m_dbType == Sqlite3) qFatal("SQLite upgrade NYI"); + //if (m_dbType == Sqlite3) tqFatal("SQLite upgrade NYI"); startCommitUnit(__func__); MyMoneySqlQuery q(this); // change kmmSplits add price fields @@ -576,7 +576,7 @@ int MyMoneyStorageSql::upgradeToV2() { int MyMoneyStorageSql::upgradeToV3() { DBG("*** Entering MyMoneyStorageSql::upgradeToV3"); //SQLite3 now supports ALTER TABLE...ADD COLUMN, so only die if version < 3 - //if (m_dbType == Sqlite3) qFatal("SQLite upgrade NYI"); + //if (m_dbType == Sqlite3) tqFatal("SQLite upgrade NYI"); startCommitUnit(__func__); MyMoneySqlQuery q(this); // The default value is given here to populate the column. @@ -740,7 +740,7 @@ long unsigned MyMoneyStorageSql::getRecCount (const TQString& table) const { q.prepare(TQString("SELECT COUNT(*) FROM %1;").arg(table)); if ((!q.exec()) || (!q.next())) { buildError (q, __func__, "error retrieving record count"); - qFatal("Error retrieving record count"); // definitely shouldn't happen + tqFatal("Error retrieving record count"); // definitely shouldn't happen } return ((unsigned long) q.value(0).toULongLong()); } @@ -921,7 +921,7 @@ bool MyMoneyStorageSql::endCommitUnit (const TQString& callingFunction) { // as value of this method. bool rc = true; if (callingFunction != m_commitUnitStack.top()) - qDebug("%s", TQString("%1 - %2 s/be %3").arg(__func__).arg(callingFunction).arg(m_commitUnitStack.top()).data()); + tqDebug("%s", TQString("%1 - %2 s/be %3").arg(__func__).arg(callingFunction).arg(m_commitUnitStack.top()).data()); m_commitUnitStack.pop(); if (m_commitUnitStack.isEmpty()) { if (!commit()) throw new MYMONEYEXCEPTION(buildError (MyMoneySqlQuery(), __func__, "ending commit unit")); @@ -932,7 +932,7 @@ bool MyMoneyStorageSql::endCommitUnit (const TQString& callingFunction) { void MyMoneyStorageSql::cancelCommitUnit (const TQString& callingFunction) { DBG("*** Entering MyMoneyStorageSql::cancelCommitUnit"); if (callingFunction != m_commitUnitStack.top()) - qDebug("%s", TQString("%1 - %2 s/be %3").arg(__func__).arg(callingFunction).arg(m_commitUnitStack.top()).data()); + tqDebug("%s", TQString("%1 - %2 s/be %3").arg(__func__).arg(callingFunction).arg(m_commitUnitStack.top()).data()); if (m_commitUnitStack.isEmpty()) return; m_commitUnitStack.clear(); if (!rollback()) throw new MYMONEYEXCEPTION(buildError (MyMoneySqlQuery(), __func__, "cancelling commit unit")); @@ -2752,7 +2752,7 @@ const TQMap MyMoneyStorageSql::fetchTransactions ( } if ((tidList.isEmpty()) && (dateClause.isEmpty())) { - //qDebug("setting full list read"); + //tqDebug("setting full list read"); } return txMap; } @@ -2917,7 +2917,7 @@ const TQMap MyMoneyStorageSql::fetchTransactions ( int obc = whereClause.contains('('); int cbc = whereClause.contains(')'); if (cbc > obc) { - qFatal("invalid where clause - %s", whereClause.latin1()); + tqFatal("invalid where clause - %s", whereClause.latin1()); } while (cbc < obc) { whereClause.append(")"); @@ -2927,14 +2927,14 @@ const TQMap MyMoneyStorageSql::fetchTransactions ( // it means we already have all the transactions for the specified filter // in memory, so just exit if ((splitFilterActive) && (whereClause.isEmpty())) { - qDebug("all transactions already in storage"); + tqDebug("all transactions already in storage"); return fetchTransactions(); } // if we have neither a split filter, nor a tx (date) filter // it's effectively a read all if ((!splitFilterActive) && (!txFilterActive)) { - //qDebug("reading all transactions"); + //tqDebug("reading all transactions"); return fetchTransactions(); } // build a date clause for the transaction table @@ -3008,7 +3008,7 @@ bool MyMoneyStorageSql::isReferencedByTransaction(const TQString& id) const { q.bindValue(":ID", id); if ((!q.exec()) || (!q.next())) { buildError (q, __func__, "error retrieving reference count"); - qFatal("Error retrieving reference count"); // definitely shouldn't happen + tqFatal("Error retrieving reference count"); // definitely shouldn't happen } return (0 != q.value(0).toULongLong()); } @@ -3797,7 +3797,7 @@ TQString& MyMoneyStorageSql::buildError (const TQSqlQuery& q, const TQString& fu s += TQString ("\nQuery error No %1: %2").arg(e.number()).arg(e.text()); const_cast (this)->m_error = s; - qDebug("%s", s.ascii()); + tqDebug("%s", s.ascii()); const_cast (this)->cancelCommitUnit(function); return (const_cast (this)->m_error); } diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.h b/kmymoney2/mymoney/storage/mymoneystoragesql.h index eb7b5a3..c5a2616 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragesql.h +++ b/kmymoney2/mymoney/storage/mymoneystoragesql.h @@ -767,7 +767,7 @@ private: */ // TQValueList m_payeeList; - void alert(TQString s) const {qDebug("%s", s.ascii());}; // FIXME: remove... + void alert(TQString s) const {tqDebug("%s", s.ascii());}; // FIXME: remove... /** The following keeps track of commitment units (known as transactions in SQL * though it would be confusing to use that term within KMM). It is implemented * as a stack for debug purposes. Long term, probably a count would suffice diff --git a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp index a95668f..063687a 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp +++ b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp @@ -107,31 +107,31 @@ MyMoneyXmlContentHandler::MyMoneyXmlContentHandler(MyMoneyStorageXML* reader) : bool MyMoneyXmlContentHandler::startDocument(void) { - qDebug("startDocument"); + tqDebug("startDocument"); return true; } bool MyMoneyXmlContentHandler::endDocument(void) { - qDebug("endDocument"); + tqDebug("endDocument"); return true; } bool MyMoneyXmlContentHandler::skippedEntity (const TQString & /* name */) { - // qDebug(TQString("Skipped entity '%1'").arg(name)); + // tqDebug(TQString("Skipped entity '%1'").arg(name)); return true; } bool MyMoneyXmlContentHandler::startPrefixMapping (const TQString& /*prefix */, const TQString & /* uri */) { - // qDebug(TQString("start prefix '%1', '%2'").arg(prefix).arg(uri)); + // tqDebug(TQString("start prefix '%1', '%2'").arg(prefix).arg(uri)); return true; } bool MyMoneyXmlContentHandler::endPrefixMapping (const TQString& /* prefix */) { - // qDebug(TQString("end prefix '%1'").arg(prefix)); + // tqDebug(TQString("end prefix '%1'").arg(prefix)); return true; } @@ -160,35 +160,35 @@ bool MyMoneyXmlContentHandler::startElement (const TQString& /* namespaceURI */, m_level = 1; } else if(s == "transactions") { - qDebug("reading transactions"); + tqDebug("reading transactions"); if(atts.count()) { int count = atts.value(TQString("count")).toUInt(); m_reader->signalProgress(0, count, i18n("Loading transactions...")); m_elementCount = 0; } } else if(s == "accounts") { - qDebug("reading accounts"); + tqDebug("reading accounts"); if(atts.count()) { int count = atts.value(TQString("count")).toUInt(); m_reader->signalProgress(0, count, i18n("Loading accounts...")); m_elementCount = 0; } } else if(s == "securities") { - qDebug("reading securities"); + tqDebug("reading securities"); if(atts.count()) { int count = atts.value(TQString("count")).toUInt(); m_reader->signalProgress(0, count, i18n("Loading securities...")); m_elementCount = 0; } } else if(s == "reports") { - qDebug("reading reports"); + tqDebug("reading reports"); if(atts.count()) { int count = atts.value(TQString("count")).toUInt(); m_reader->signalProgress(0, count, i18n("Loading reports...")); m_elementCount = 0; } } else if(s == "prices") { - qDebug("reading prices"); + tqDebug("reading prices"); m_elementCount = 0; } else if(s == "pricepair") { if(atts.count()) { @@ -385,7 +385,7 @@ void MyMoneyStorageXML::readFile(TQIODevice* pDevice, IMyMoneySerialize* storage m_doc = new TQDomDocument; TQ_CHECK_PTR(m_doc); - qDebug("reading file"); + tqDebug("reading file"); // creating the TQXmlInputSource object based on a TQIODevice object // reads all data of the underlying object into memory. I have not // found an object that reads on the fly. I tried to derive one myself, @@ -393,7 +393,7 @@ void MyMoneyStorageXML::readFile(TQIODevice* pDevice, IMyMoneySerialize* storage // blocks of data and not a stream. So I left it the way it is. (ipwizard) TQXmlInputSource xml(pDevice); - qDebug("start parsing file"); + tqDebug("start parsing file"); MyMoneyXmlContentHandler mmxml(this); TQXmlSimpleReader reader; reader.setContentHandler(&mmxml); @@ -431,7 +431,7 @@ void MyMoneyStorageXML::writeFile(TQIODevice* qf, IMyMoneySerialize* storage) } m_storage = storage; - // qDebug("XMLWRITER: Starting file write"); + // tqDebug("XMLWRITER: Starting file write"); m_doc = new TQDomDocument("KMYMONEY-FILE"); TQ_CHECK_PTR(m_doc); TQDomProcessingInstruction instruct = m_doc->createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\""); -- cgit v1.2.1