From aa85254cd16cb870b8d1649ef1dbad09bd8491e8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:19:48 -0600 Subject: [PATCH] Rename additional global TQt functions --- ChangeLog | 6 +- ChangeLog.original | 2 +- kmymoney2/converter/mymoneygncreader.cpp | 136 +++---- kmymoney2/converter/mymoneyqifprofile.cpp | 14 +- kmymoney2/converter/mymoneyqifreader.cpp | 30 +- .../converter/mymoneystatementreader.cpp | 28 +- kmymoney2/converter/mymoneytemplate.cpp | 6 +- kmymoney2/converter/webpricequote.cpp | 2 +- kmymoney2/dialogs/investactivities.cpp | 4 +- kmymoney2/dialogs/investtransactioneditor.cpp | 2 +- kmymoney2/dialogs/kcurrencycalculator.cpp | 2 +- kmymoney2/dialogs/kcurrencyeditdlg.cpp | 6 +- kmymoney2/dialogs/keditloanwizard.cpp | 4 +- kmymoney2/dialogs/keditscheduledlg.cpp | 10 +- kmymoney2/dialogs/kendingbalancedlg.cpp | 4 +- kmymoney2/dialogs/kenterscheduledlg.cpp | 8 +- kmymoney2/dialogs/kequitypriceupdatedlg.cpp | 2 +- kmymoney2/dialogs/kexportdlg.cpp | 2 +- kmymoney2/dialogs/kmymoneypricedlg.cpp | 2 +- kmymoney2/dialogs/kmymoneysplittable.cpp | 8 +- kmymoney2/dialogs/knewaccountdlg.cpp | 18 +- kmymoney2/dialogs/knewloanwizard.cpp | 6 +- kmymoney2/dialogs/kreconciledlg.cpp | 2 +- kmymoney2/dialogs/ksplittransactiondlg.cpp | 2 +- kmymoney2/dialogs/settings/ksettingshome.cpp | 2 +- kmymoney2/dialogs/transactioneditor.cpp | 24 +- kmymoney2/kmymoney2.cpp | 50 +-- kmymoney2/kmymoneyutils.cpp | 8 +- kmymoney2/main.cpp | 10 +- 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 +- .../mymoney/mymoneytransactionfilter.cpp | 16 +- .../mymoney/storage/mymoneydatabasemgr.cpp | 16 +- .../storage/mymoneydatabasemgrtest.cpp | 14 +- .../mymoney/storage/mymoneyseqaccessmgr.cpp | 16 +- .../storage/mymoneyseqaccessmgrtest.cpp | 2 +- .../mymoney/storage/mymoneystoragedump.cpp | 2 +- .../mymoney/storage/mymoneystoragesql.cpp | 42 +- kmymoney2/mymoney/storage/mymoneystoragesql.h | 2 +- .../mymoney/storage/mymoneystoragexml.cpp | 26 +- .../interfaces/kmmstatementinterface.cpp | 2 +- kmymoney2/plugins/kmymoneyplugin.cpp | 6 +- .../dialogs/konlinebankingsetupwizard.cpp | 2 +- .../plugins/ofximport/ofximporterplugin.cpp | 4 +- kmymoney2/reports/objectinfotable.cpp | 2 +- kmymoney2/reports/pivottable.cpp | 12 +- kmymoney2/views/kgloballedgerview.cpp | 18 +- kmymoney2/views/khomeview.cpp | 22 +- kmymoney2/views/kinvestmentlistitem.cpp | 4 +- kmymoney2/views/kinvestmentview.cpp | 6 +- kmymoney2/views/kmymoneyview.cpp | 32 +- kmymoney2/views/kpayeesview.cpp | 4 +- kmymoney2/views/kreportsview.cpp | 6 +- kmymoney2/views/kscheduledlistitem.cpp | 2 +- kmymoney2/views/kscheduledview.cpp | 2 +- .../widgets/kaccounttemplateselector.cpp | 4 +- kmymoney2/widgets/kguiutils.cpp | 2 +- kmymoney2/widgets/kmymoneyaccountcombo.cpp | 2 +- kmymoney2/widgets/kmymoneydateinput.cpp | 2 +- kmymoney2/widgets/kmymoneypriceview.cpp | 2 +- kmymoney2/widgets/register.cpp | 34 +- kmymoney2/widgets/transaction.cpp | 8 +- .../newaccountwizard/knewaccountwizard.cpp | 4 +- libkdchart/KDChart.cpp | 32 +- libkdchart/KDChartAxesPainter.cpp | 380 +++++++++--------- libkdchart/KDChartAxisParams.cpp | 10 +- libkdchart/KDChartBWPainter.cpp | 2 +- libkdchart/KDChartBarPainter.cpp | 62 +-- libkdchart/KDChartCustomBox.cpp | 50 +-- libkdchart/KDChartDataRegion.h | 2 +- libkdchart/KDChartEnums.cpp | 2 +- libkdchart/KDChartEnums.h | 4 +- libkdchart/KDChartGlobal.h | 4 +- libkdchart/KDChartHiLoPainter.cpp | 16 +- libkdchart/KDChartLinesPainter.cpp | 50 +-- libkdchart/KDChartPainter.cpp | 36 +- libkdchart/KDChartParams.cpp | 20 +- libkdchart/KDChartParams_frame.cpp | 2 +- libkdchart/KDChartParams_io.cpp | 72 ++-- libkdchart/KDChartPolarPainter.cpp | 4 +- libkdchart/KDChartPropertySet.cpp | 2 +- libkdchart/KDChartRingPainter.cpp | 2 +- libkdchart/KDChartTableBase.cpp | 8 +- libkdchart/KDChartTextPiece.cpp | 16 +- libkdchart/KDDrawText.cpp | 22 +- libkdchart/KDFrame.cpp | 16 +- libkdchart/KDFrameProfileSection.cpp | 2 +- libkdchart/KDXMLTools.cpp | 14 +- libkgpgfile/kgpgfile.cpp | 72 ++-- 96 files changed, 836 insertions(+), 836 deletions(-) diff --git a/ChangeLog b/ChangeLog index d78f2ad..3cac010 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4804,7 +4804,7 @@ 2005-12-17 Thomas Baumgart * changed readXML methods to a constructor of the resp. MyMoneyXXX object * adopted testcases - * Fixed argument to qDebug call in MyMoneyStorageSQL + * Fixed argument to tqDebug call in MyMoneyStorageSQL * Added patch supplied by Bjorn Helgaas to preset the default currency when creating a file * Removed some unused code @@ -7433,7 +7433,7 @@ 2004-01-04 Kevin Tambascio * removed the "nextid" attribute from some of the top-level XML attributes. - * added qWarnings and qError statements when irregularities in the file + * added tqWarnings and qError statements when irregularities in the file are found. * personal data dialog box had lower case "O" and "C" for the ok and cancel buttons, which is inconsistent. @@ -9158,7 +9158,7 @@ * Wrapped all user visible text in i18n. * Removed all sprintfs to aid internationalisation. * Removed all latin1() calls to aid in internationaliastion. latin1 calls - now only exist in qDebug calls which should be changed to kdDebug calls anyway. + now only exist in tqDebug calls which should be changed to kdDebug calls anyway. * Updated kmymoney2.pot file. 2001-08-20 Michael Edwardes diff --git a/ChangeLog.original b/ChangeLog.original index 01aec47..933e010 100644 --- a/ChangeLog.original +++ b/ChangeLog.original @@ -26,7 +26,7 @@ 0.3.1 Fixed the bank/account enabling in kmymoney2.cpp. Cleaned up the dialogs a little, in respect to the tab orders. - Be aware that there are quite a few qDebug statements so expect some output whilst running. + Be aware that there are quite a few tqDebug statements so expect some output whilst running. Cleaned up the transaction engine a bit and changed the API (so MyMoneyFile knows nothing but it's own banks). Removed the accounts view and merged it into the banks view like gnu cash et al. diff --git a/kmymoney2/converter/mymoneygncreader.cpp b/kmymoney2/converter/mymoneygncreader.cpp index 553362a..0c3981e 100644 --- a/kmymoney2/converter/mymoneygncreader.cpp +++ b/kmymoney2/converter/mymoneygncreader.cpp @@ -233,9 +233,9 @@ TQString GncObject::hide (TQString data, unsigned int anonClass) { // dump current object data values // only called if gncdebug set void GncObject::debugDump () { uint i; - qDebug ("Object %s", m_elementName.latin1()); + tqDebug ("Object %s", m_elementName.latin1()); for (i = 0; i < m_dataElementListCount; i++) { - qDebug ("%s = %s", m_dataElementList[i].latin1(), m_v.at(i)->latin1()); + tqDebug ("%s = %s", m_dataElementList[i].latin1(), m_v.at(i)->latin1()); } } //***************************************************************** @@ -255,7 +255,7 @@ GncFile::~GncFile () {} GncObject *GncFile::startSubEl() { TRY - if (pMain->xmldebug) qDebug ("File start subel m_state %d", m_state); + if (pMain->xmldebug) tqDebug ("File start subel m_state %d", m_state); GncObject *next = 0; switch (m_state) { case BOOK: @@ -279,7 +279,7 @@ GncObject *GncFile::startSubEl() { } void GncFile::endSubEl(GncObject *subObj) { - if (pMain->xmldebug) qDebug ("File end subel"); + if (pMain->xmldebug) tqDebug ("File end subel"); if (!m_processingTemplates) delete subObj; // template txs must be saved awaiting schedules m_dataPtr = 0; return ; @@ -349,7 +349,7 @@ void GncKvp::dataEl (const TQXmlAttributes& elAttrs) { } GncObject *GncKvp::startSubEl() { - if (pMain->xmldebug) qDebug ("Kvp start subel m_state %d", m_state); + if (pMain->xmldebug) tqDebug ("Kvp start subel m_state %d", m_state); TRY GncObject *next = 0; switch (m_state) { @@ -361,7 +361,7 @@ GncObject *GncKvp::startSubEl() { } void GncKvp::endSubEl(GncObject *subObj) { - if (pMain->xmldebug) qDebug ("Kvp end subel"); + if (pMain->xmldebug) tqDebug ("Kvp end subel"); m_kvpList.append (subObj); m_dataPtr = 0; return ; @@ -406,7 +406,7 @@ void GncCountData::terminate () { if (i != 0) { if (m_countType == "budget") pMain->setBudgetsFound(true); else if (m_countType.left(7) == "gnc:Gnc") pMain->setSmallBusinessFound(true); - else if (pMain->xmldebug) qDebug ("Unknown count type %s", m_countType.latin1()); + else if (pMain->xmldebug) tqDebug ("Unknown count type %s", m_countType.latin1()); } return ; } @@ -502,7 +502,7 @@ GncAccount::~GncAccount () { GncObject *GncAccount::startSubEl() { TRY - if (pMain->xmldebug) qDebug ("Account start subel m_state %d", m_state); + if (pMain->xmldebug) tqDebug ("Account start subel m_state %d", m_state); GncObject *next = 0; switch (m_state) { case CMDTY: next = new GncCmdtySpec; break; @@ -517,7 +517,7 @@ GncObject *GncAccount::startSubEl() { } void GncAccount::endSubEl(GncObject *subObj) { - if (pMain->xmldebug) qDebug ("Account end subel"); + if (pMain->xmldebug) tqDebug ("Account end subel"); switch (m_state) { case CMDTY: m_vpCommodity = static_cast(subObj); break; case KVP: m_kvpList.append (subObj); @@ -556,7 +556,7 @@ GncTransaction::~GncTransaction () { GncObject *GncTransaction::startSubEl() { TRY - if (pMain->xmldebug) qDebug ("Transaction start subel m_state %d", m_state); + if (pMain->xmldebug) tqDebug ("Transaction start subel m_state %d", m_state); GncObject *next = 0; switch (m_state) { case CURRCY: next = new GncCmdtySpec; break; @@ -578,7 +578,7 @@ GncObject *GncTransaction::startSubEl() { } void GncTransaction::endSubEl(GncObject *subObj) { - if (pMain->xmldebug) qDebug ("Transaction end subel"); + if (pMain->xmldebug) tqDebug ("Transaction end subel"); switch (m_state) { case CURRCY: m_vpCurrency = static_cast(subObj); break; case POSTED: m_vpDatePosted = static_cast(subObj); break; @@ -630,7 +630,7 @@ GncObject *GncSplit::startSubEl () { } void GncSplit::endSubEl(GncObject *subObj) { - if (pMain->xmldebug) qDebug ("Split end subel"); + if (pMain->xmldebug) tqDebug ("Split end subel"); switch (m_state) { case RECDATE: m_vpDateReconciled = static_cast(subObj); break; } @@ -654,7 +654,7 @@ GncTemplateSplit::GncTemplateSplit () { GncTemplateSplit::~GncTemplateSplit () {} GncObject *GncTemplateSplit::startSubEl() { - if (pMain->xmldebug) qDebug ("TemplateSplit start subel m_state %d", m_state); + if (pMain->xmldebug) tqDebug ("TemplateSplit start subel m_state %d", m_state); TRY GncObject *next = 0; switch (m_state) { @@ -666,7 +666,7 @@ GncObject *GncTemplateSplit::startSubEl() { } void GncTemplateSplit::endSubEl(GncObject *subObj) { - if (pMain->xmldebug) qDebug ("TemplateSplit end subel"); + if (pMain->xmldebug) tqDebug ("TemplateSplit end subel"); m_kvpList.append (subObj); m_dataPtr = 0; return ; @@ -697,7 +697,7 @@ GncSchedule::~GncSchedule () { } GncObject *GncSchedule::startSubEl() { - if (pMain->xmldebug) qDebug ("Schedule start subel m_state %d", m_state); + if (pMain->xmldebug) tqDebug ("Schedule start subel m_state %d", m_state); TRY GncObject *next = 0; switch (m_state) { @@ -714,7 +714,7 @@ GncObject *GncSchedule::startSubEl() { } void GncSchedule::endSubEl(GncObject *subObj) { - if (pMain->xmldebug) qDebug ("Schedule end subel"); + if (pMain->xmldebug) tqDebug ("Schedule end subel"); switch (m_state) { case STARTDATE: m_vpStartDate = static_cast(subObj); break; case LASTDATE: m_vpLastDate = static_cast(subObj); break; @@ -751,7 +751,7 @@ GncFreqSpec::~GncFreqSpec () {} GncObject *GncFreqSpec::startSubEl() { TRY - if (pMain->xmldebug) qDebug ("FreqSpec start subel m_state %d", m_state); + if (pMain->xmldebug) tqDebug ("FreqSpec start subel m_state %d", m_state); GncObject *next = 0; switch (m_state) { @@ -763,7 +763,7 @@ GncObject *GncFreqSpec::startSubEl() { } void GncFreqSpec::endSubEl(GncObject *subObj) { - if (pMain->xmldebug) qDebug ("FreqSpec end subel"); + if (pMain->xmldebug) tqDebug ("FreqSpec end subel"); switch (m_state) { case COMPO: m_fsList.append (subObj); break; } @@ -794,7 +794,7 @@ GncRecurrence::~GncRecurrence () { GncObject *GncRecurrence::startSubEl() { TRY - if (pMain->xmldebug) qDebug ("Recurrence start subel m_state %d", m_state); + if (pMain->xmldebug) tqDebug ("Recurrence start subel m_state %d", m_state); GncObject *next = 0; switch (m_state) { @@ -806,7 +806,7 @@ GncObject *GncRecurrence::startSubEl() { } void GncRecurrence::endSubEl(GncObject *subObj) { - if (pMain->xmldebug) qDebug ("Recurrence end subel"); + if (pMain->xmldebug) tqDebug ("Recurrence end subel"); switch (m_state) { case STARTDATE: m_vpStartDate = static_cast(subObj); break; } @@ -884,7 +884,7 @@ bool XmlReader::startDocument() { bool XmlReader::startElement (const TQString&, const TQString&, const TQString& elName , const TQXmlAttributes& elAttrs) { try { - if (pMain->gncdebug) qDebug ("XML start - %s", elName.latin1()); + if (pMain->gncdebug) tqDebug ("XML start - %s", elName.latin1()); #ifdef _GNCFILEANON int i; TQString spaces; @@ -935,9 +935,9 @@ bool XmlReader::startElement (const TQString&, const TQString&, const TQString& #ifndef _GNCFILEANON // we can't pass on exceptions here coz the XML reader won't catch them and we just abort KMessageBox::error(0, i18n("Import failed:\n\n%1").arg(e->what()), PACKAGE); - qFatal ("%s", e->what().latin1()); + tqFatal ("%s", e->what().latin1()); #else - qFatal ("%s", e->latin1()); + tqFatal ("%s", e->latin1()); #endif // _GNCFILEANON } return true; // to keep compiler happy @@ -945,7 +945,7 @@ bool XmlReader::startElement (const TQString&, const TQString&, const TQString& bool XmlReader::endElement( const TQString&, const TQString&, const TQString&elName ) { try { - if (pMain->xmldebug) qDebug ("XML end - %s", elName.latin1()); + if (pMain->xmldebug) tqDebug ("XML end - %s", elName.latin1()); #ifdef _GNCFILEANON TQString spaces; switch (lastType) { @@ -970,19 +970,19 @@ bool XmlReader::endElement( const TQString&, const TQString&, const TQString&elN #ifndef _GNCFILEANON // we can't pass on exceptions here coz the XML reader won't catch them and we just abort KMessageBox::error(0, i18n("Import failed:\n\n%1").arg(e->what()), PACKAGE); - qFatal ("%s", e->what().latin1()); + tqFatal ("%s", e->what().latin1()); #else - qFatal ("%s", e->latin1()); + tqFatal ("%s", e->latin1()); #endif // _GNCFILEANON } return (true); // to keep compiler happy } bool XmlReader::characters (const TQString &data) { - if (pMain->xmldebug) qDebug ("XML Data received - %d bytes", data.length()); + if (pMain->xmldebug) tqDebug ("XML Data received - %d bytes", data.length()); TQString pData = data.stripWhiteSpace(); // data may contain line feeds and indentation spaces if (!pData.isEmpty()) { - if (pMain->developerDebug) qDebug ("XML Data - %s", pData.latin1()); + if (pMain->developerDebug) tqDebug ("XML Data - %s", pData.latin1()); m_co->storeData (pData); //go store it #ifdef _GNCFILEANON TQString anonData = m_co->getData (); @@ -1046,7 +1046,7 @@ void MyMoneyGncReader::readFile(TQIODevice* pDevice, IMyMoneySerialize* storage) TQ_CHECK_PTR (storage); m_storage = dynamic_cast(storage); - qDebug ("Entering gnucash importer"); + tqDebug ("Entering gnucash importer"); setOptions (); // get a file anonymization factor from the user if (bAnonymize) setFileHideFactor (); @@ -1060,20 +1060,20 @@ void MyMoneyGncReader::readFile(TQIODevice* pDevice, IMyMoneySerialize* storage) ft.commit(); } catch (MyMoneyException *e) { KMessageBox::error(0, i18n("Import failed:\n\n%1").arg(e->what()), PACKAGE); - qFatal ("%s", e->what().latin1()); + tqFatal ("%s", e->what().latin1()); } // end catch signalProgress (0, 1, i18n("Import complete")); // switch off progress bar delete m_xr; - qDebug ("Exiting gnucash importer"); + tqDebug ("Exiting gnucash importer"); return ; } #else // Control code for the file anonymizer void MyMoneyGncReader::readFile(TQString in, TQString out) { TQFile pDevice (in); - if (!pDevice.open (IO_ReadOnly)) qFatal ("Can't open input file"); + if (!pDevice.open (IO_ReadOnly)) tqFatal ("Can't open input file"); TQFile outFile (out); - if (!outFile.open (IO_WriteOnly)) qFatal ("Can't open output file"); + if (!outFile.open (IO_WriteOnly)) tqFatal ("Can't open output file"); oStream.setDevice (&outFile); bAnonymize = true; // get a file anonymization factor from the user @@ -1082,7 +1082,7 @@ void MyMoneyGncReader::readFile(TQString in, TQString out) { try { m_xr->processFile (&pDevice); } catch (MyMoneyException *e) { - qFatal ("%s", e->latin1()); + tqFatal ("%s", e->latin1()); } // end catch delete m_xr; pDevice.close(); @@ -1103,7 +1103,7 @@ int main (int argc, char ** argv) { "Gnucash files(*.nc *)", 0); } - if (inFile.isEmpty()) qFatal ("Input file required"); + if (inFile.isEmpty()) tqFatal ("Input file required"); if (outFile.isEmpty()) outFile = inFile + ".anon"; m.readFile (inFile, outFile); exit (0); @@ -1146,7 +1146,7 @@ void MyMoneyGncReader::convertCommodity (const GncCommodity *gcm) { m_storage->addSecurity(equ); //assign the gnucash id as the key into the map to find our id - if (gncdebug) qDebug ("mapping, key = %s, id = %s", gcm->id().latin1(), equ.id().data()); + if (gncdebug) tqDebug ("mapping, key = %s, id = %s", gcm->id().latin1(), equ.id().data()); m_mapEquities[gcm->id().utf8()] = equ.id(); } signalProgress (++m_commodityCount, 0); @@ -1165,7 +1165,7 @@ void MyMoneyGncReader::convertPrice (const GncPrice *gpr) { m_storage->addPrice (exchangeRate); } else { MyMoneySecurity e = m_storage->security(m_mapEquities[gpr->commodity()->id().utf8()]); - if (gncdebug) qDebug ("Searching map, key = %s, found id = %s", + if (gncdebug) tqDebug ("Searching map, key = %s, found id = %s", gpr->commodity()->id().latin1(), e.id().data()); e.setTradingCurrency (gpr->currency()->id().utf8()); MyMoneyPrice stockPrice(e.id(), gpr->currency()->id().utf8(), gpr->priceDate(), rate, i18n("Imported History")); @@ -1269,12 +1269,12 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) { m_stockList.append (gac->id()); // set the equity type MyMoneySecurity e = m_storage->security (m_mapEquities[gac->commodity()->id().utf8()]); - if (gncdebug) qDebug ("Acct equity search, key = %s, found id = %s", + if (gncdebug) tqDebug ("Acct equity search, key = %s, found id = %s", gac->commodity()->id().latin1(), e.id().data()); acc.setCurrencyId (e.id()); // actually, the security id if ("MUTUAL" == gac->type()) { e.setSecurityType (MyMoneySecurity::SECURITY_MUTUALFUND); - if (gncdebug) qDebug ("Setting %s to mutual", e.name().latin1()); + if (gncdebug) tqDebug ("Setting %s to mutual", e.name().latin1()); m_storage->modifySecurity (e); } // See if he wants online quotes for this account @@ -1310,7 +1310,7 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) { m_storage->addAccount(acc); m_mapIds[gac->id().utf8()] = acc.id(); // to link gnucash id to ours for tx posting - if (gncdebug) qDebug("Gnucash account %s has id of %s, type of %s, parent is %s", + if (gncdebug) tqDebug("Gnucash account %s has id of %s, type of %s, parent is %s", gac->id().latin1(), acc.id().data(), KMyMoneyUtils::accountTypeToString(acc.accountType()).latin1(), acc.parentAccountId().data()); @@ -1400,7 +1400,7 @@ void MyMoneyGncReader::convertSplit (const GncSplit *gsp) { splitAccount = m_storage->account (kmmAccountId); // print some data so we can maybe identify this split later // TODO : prints personal data - //if (gncdebug) qDebug ("Split data - gncid %s, kmmid %s, memo %s, value %s, recon state %s", + //if (gncdebug) tqDebug ("Split data - gncid %s, kmmid %s, memo %s, value %s, recon state %s", // gsp->acct().latin1(), kmmAccountId.data(), gsp->memo().latin1(), gsp->value().latin1(), // gsp->recon().latin1()); // payee id @@ -1464,7 +1464,7 @@ void MyMoneyGncReader::convertSplit (const GncSplit *gsp) { // we can't use m_storage->security coz security list is not built yet m_storage->currency(m_txCommodity); // will throw exception if not currency e.setTradingCurrency (m_txCommodity); - if (gncdebug) qDebug ("added price for %s, %s date %s", + if (gncdebug) tqDebug ("added price for %s, %s date %s", e.name().latin1(), newPrice.toString().latin1(), TQString(m_txDatePosted.toString(Qt::ISODate)).latin1()); m_storage->modifySecurity(e); @@ -1628,7 +1628,7 @@ void MyMoneyGncReader::convertTemplateSplit (const TQString& schedName, const Gn } // all data read, now check we have everything if ((bFoundStringCreditFormula) && (bFoundStringDebitFormula) && (bFoundGuidAccountId)) { - if (gncdebug) qDebug ("Found valid slot; credit %s, debit %s, acct %s", + if (gncdebug) tqDebug ("Found valid slot; credit %s, debit %s, acct %s", gncCreditFormula.latin1(), gncDebitFormula.latin1(), gncAccountId.latin1()); validSlotCount++; } @@ -1654,7 +1654,7 @@ void MyMoneyGncReader::convertTemplateSplit (const TQString& schedName, const Gn exFormula = numericTest; } } else { - if (gncdebug) qDebug ("%s is not numeric", numericTest.latin1()); + if (gncdebug) tqDebug ("%s is not numeric", numericTest.latin1()); nonNumericFormula = true; } split.setValue (exFormula); @@ -1783,7 +1783,7 @@ void MyMoneyGncReader::convertSchedule (const GncSchedule *gsc) { unknownOccurs = true; } else { const GncRecurrence *gre = gsc->m_vpRecurrence.first(); - //qDebug (TQString("Sched %1, pt %2, mu %3, sd %4").arg(gsc->name()).arg(gre->periodType()) + //tqDebug (TQString("Sched %1, pt %2, mu %3, sd %4").arg(gsc->name()).arg(gre->periodType()) // .arg(gre->mult()).arg(gre->startDate().toString(Qt::ISODate))); frequency = gre->getFrequency(); schedEnabled = gsc->enabled(); @@ -1853,9 +1853,9 @@ void MyMoneyGncReader::convertSchedule (const GncSchedule *gsc) { sc.setPaymentType((MyMoneySchedule::paymentTypeE)MyMoneySchedule::STYPE_OTHER); sc.setFixed (!m_suspectSchedule); // if any probs were found, set it as variable so user will always be prompted // we don't currently have a 'disable' option, but just make sure auto-enter is off if not enabled - //qDebug(TQString("%1 and %2").arg(gsc->autoCreate()).arg(schedEnabled)); + //tqDebug(TQString("%1 and %2").arg(gsc->autoCreate()).arg(schedEnabled)); sc.setAutoEnter ((gsc->autoCreate() == "y") && (schedEnabled == "y")); - //qDebug(TQString("autoEnter set to %1").arg(sc.autoEnter())); + //tqDebug(TQString("autoEnter set to %1").arg(sc.autoEnter())); // type TQString actionType = tx.splits().first().action(); if (actionType == MyMoneySplit::ActionDeposit) { @@ -1896,9 +1896,9 @@ void MyMoneyGncReader::terminate () { TRY // All data has been converted and added to storage // this code is just temporary to show us what is in the file. - if (gncdebug) qDebug("%d accounts found in the GnuCash file", (unsigned int)m_mapIds.count()); + if (gncdebug) tqDebug("%d accounts found in the GnuCash file", (unsigned int)m_mapIds.count()); for (map_accountIds::Iterator it = m_mapIds.begin(); it != m_mapIds.end(); ++it) { - if (gncdebug) qDebug("key = %s, value = %s", it.key().data(), it.data().data()); + if (gncdebug) tqDebug("key = %s, value = %s", it.key().data(), it.data().data()); } // first step is to implement the users investment option, now we // have all the accounts available @@ -1916,33 +1916,33 @@ void MyMoneyGncReader::terminate () { 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()); + if (gncdebug) tqDebug("Account id %s is a child of the main asset account", (*acc).id().data()); } 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()); + if (gncdebug) tqDebug("Account id %s is a child of the main liability account", (*acc).id().data()); } 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()); + if (gncdebug) tqDebug("Account id %s is a child of the main income account", (*acc).id().data()); } 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()); + if (gncdebug) tqDebug("Account id %s is a child of the main expense account", (*acc).id().data()); } 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()); + if (gncdebug) tqDebug("Account id %s is a child of the main equity account", (*acc).id().data()); } else if ((*acc).parentAccountId() == m_rootId) { - if (gncdebug) qDebug("Account id %s is a child of root", (*acc).id().data()); + if (gncdebug) tqDebug("Account id %s is a child of root", (*acc).id().data()); } else { // it is not under one of the main accounts, so find gnucash parent TQString parentKey = (*acc).parentAccountId(); - if (gncdebug) qDebug ("acc %s, parent %s", (*acc).id().data(), + if (gncdebug) tqDebug ("acc %s, parent %s", (*acc).id().data(), (*acc).parentAccountId().data()); map_accountIds::Iterator id = m_mapIds.find(parentKey); if (id != m_mapIds.end()) { - if (gncdebug) qDebug("Setting account id %s's parent account id to %s", + if (gncdebug) tqDebug("Setting account id %s's parent account id to %s", (*acc).id().data(), id.data().data()); MyMoneyAccount parent = m_storage->account(id.data()); parent = checkConsistency (parent, (*acc)); @@ -2071,12 +2071,12 @@ TQString MyMoneyGncReader::buildReportSection (const TQString& source) { } if (more) s.append (i18n("\n\nPress More for further information")); } else { // we need to retrieve the posted messages for this source - if (gncdebug) qDebug("Building messages for source %s", source.latin1()); + if (gncdebug) tqDebug("Building messages for source %s", source.latin1()); unsigned int i, j; for (i = 0; i < m_messageList.count(); i++) { GncMessageArgs *m = m_messageList.at(i); if (m->source == source) { - if (gncdebug) qDebug("%s", TQString("build text source %1, code %2, argcount %3") + if (gncdebug) tqDebug("%s", TQString("build text source %1, code %2, argcount %3") .arg(m->source).arg(m->code).arg(m->args.count()).data()); TQString ss = GncMessages::text (m->source, m->code); // add variable args. the .arg function seems always to replace the @@ -2087,7 +2087,7 @@ TQString MyMoneyGncReader::buildReportSection (const TQString& source) { } } } - if (gncdebug) qDebug ("%s", s.latin1()); + if (gncdebug) tqDebug ("%s", s.latin1()); return (static_cast(s)); PASS } @@ -2217,9 +2217,9 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) { invAcc.setParentAccountId (parentKey); // intersperse it between old parent and child stock acct m_storage->addAccount (invAcc); 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, parent %s", invAcc.name().data(), invAcc.id().data(), + if (gncdebug) tqDebug ("Created investment account %s as id %s, parent %s", invAcc.name().data(), invAcc.id().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()); + if (gncdebug) tqDebug ("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); // investment option 1 creates a single investment account for all stocks @@ -2240,7 +2240,7 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) { singleInvAcc.setParentAccountId (m_storage->asset().id()); m_storage->addAccount (singleInvAcc); 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, parent %s, reparenting stock", + if (gncdebug) tqDebug ("Created investment account %s as id %s, parent %s, reparenting stock", singleInvAcc.name().data(), singleInvAcc.id().data(), singleInvAcc.parentAccountId().data()); singleInvAccId = singleInvAcc.id(); } else { // the account has already been created @@ -2263,7 +2263,7 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) { // if (((*acc).accountGroup() == MyMoneyAccount::Asset) && ((*acc).accountType() != MyMoneyAccount::Stock)) accList.append ((*acc).name()); if ((*acc).accountType() == MyMoneyAccount::Investment) accList.append ((*acc).name()); } - //if (accList.isEmpty()) qFatal ("No available accounts"); + //if (accList.isEmpty()) tqFatal ("No available accounts"); bool ok = false; while (!ok) { // keep going till we have a valid investment parent TQString invAccName = TQInputDialog::getItem ( @@ -2300,7 +2300,7 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) { ok = false; break; default: // convert it - but what if it has splits??? - qFatal ("Not yet implemented"); + tqFatal ("Not yet implemented"); ok = true; break; } @@ -2308,7 +2308,7 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) { switch(KMessageBox::questionYesNo(0, i18n ("%1 is not an Investment Account. Do you wish to make it one?").arg(invAcc.name(), PACKAGE))) { case KMessageBox::Yes: // convert it - but what if it has splits??? - qFatal ("Not yet implemented"); + tqFatal ("Not yet implemented"); ok = true; break; default: @@ -2321,7 +2321,7 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) { 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); + tqFatal ("Invalid investment option %d", m_investmentOption); } } @@ -2394,7 +2394,7 @@ void MyMoneyGncReader::postMessage (const TQString& source, const unsigned int c // get the number of args this message requires const unsigned int argCount = GncMessages::argCount (source, code); if ((gncdebug) && (argCount != argList.count())) - qDebug("%s", TQString("MyMoneyGncReader::postMessage debug: Message %1, code %2, requires %3 arguments, got %4") + tqDebug("%s", TQString("MyMoneyGncReader::postMessage debug: Message %1, code %2, requires %3 arguments, got %4") .arg(source).arg(code).arg(argCount).arg(argList.count()).data()); // store the arguments for (i = 0; i < argCount; i++) { diff --git a/kmymoney2/converter/mymoneyqifprofile.cpp b/kmymoney2/converter/mymoneyqifprofile.cpp index 880b1c2..f0533db 100644 --- a/kmymoney2/converter/mymoneyqifprofile.cpp +++ b/kmymoney2/converter/mymoneyqifprofile.cpp @@ -473,7 +473,7 @@ const TQDate MyMoneyQifProfile::date(const TQString& datein) const } } if(j == 13) { - qWarning("Unknown month '%s'", scannedParts[d->m_partPos['m']].data()); + tqWarning("Unknown month '%s'", scannedParts[d->m_partPos['m']].data()); return TQDate(); } } @@ -501,7 +501,7 @@ const TQDate MyMoneyQifProfile::date(const TQString& datein) const if(m_dateFormat[i] == '%') { ++part; if(part == 3) { - qWarning("MyMoneyQifProfile::date(const TQString& datein) Too many parts in date format"); + tqWarning("MyMoneyQifProfile::date(const TQString& datein) Too many parts in date format"); return TQDate(); } ++i; @@ -517,14 +517,14 @@ const TQDate MyMoneyQifProfile::date(const TQString& datein) const case '.': case '\'': if(delim == 2) { - qWarning("MyMoneyQifProfile::date(const TQString& datein) Too many delimiters in date format"); + tqWarning("MyMoneyQifProfile::date(const TQString& datein) Too many delimiters in date format"); return TQDate(); } formatDelim[delim] = m_dateFormat[i]; ++delim; break; default: - qWarning("MyMoneyQifProfile::date(const TQString& datein) Invalid char in date format"); + tqWarning("MyMoneyQifProfile::date(const TQString& datein) Invalid char in date format"); return TQDate(); } } @@ -540,7 +540,7 @@ const TQDate MyMoneyQifProfile::date(const TQString& datein) const case '-': case '\'': if(delim == 2) { - qWarning("MyMoneyQifProfile::date(const TQString& datein) Too many delimiters in date field"); + tqWarning("MyMoneyQifProfile::date(const TQString& datein) Too many delimiters in date field"); return TQDate(); } scannedDelim[delim] = datein[i]; @@ -569,7 +569,7 @@ const TQDate MyMoneyQifProfile::date(const TQString& datein) const for(i = 0; i < 2; ++i) { if(scannedDelim[i] != formatDelim[i] && scannedDelim[i] != TQChar('\'')) { - qWarning("MyMoneyQifProfile::date(const TQString& datein) Invalid delimiter '%s' when '%s' was expected", + tqWarning("MyMoneyQifProfile::date(const TQString& datein) Invalid delimiter '%s' when '%s' was expected", scannedDelim[i].latin1(), formatDelim[i].latin1()); return TQDate(); } @@ -654,7 +654,7 @@ const TQDate MyMoneyQifProfile::date(const TQString& datein) const break; } if(!msg.isEmpty()) { - qWarning("MyMoneyQifProfile::date(const TQString& datein) %s",msg.latin1()); + tqWarning("MyMoneyQifProfile::date(const TQString& datein) %s",msg.latin1()); return TQDate(); } } diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp index a974e8f..3161a0b 100644 --- a/kmymoney2/converter/mymoneyqifreader.cpp +++ b/kmymoney2/converter/mymoneyqifreader.cpp @@ -129,7 +129,7 @@ void MyMoneyQifReader::Private::finishStatement(void) // in case we have collected any data in the statement, we keep it if((st.m_listTransactions.count() + st.m_listPrices.count() + st.m_listSecurities.count()) > 0) { statements += st; - qDebug("Statement with %d transactions, %d prices and %d securities added to the statement list", + tqDebug("Statement with %d transactions, %d prices and %d securities added to the statement list", st.m_listTransactions.count(), st.m_listPrices.count(), st.m_listSecurities.count()); } // start with a fresh statement @@ -288,7 +288,7 @@ void MyMoneyQifReader::slotSendDataToFilter(void) } else { len = m_file->readBlock(m_buffer, sizeof(m_buffer)); if(len == -1) { - qWarning("Failed to read block from TQIF import file"); + tqWarning("Failed to read block from TQIF import file"); m_filter.closeStdin(); m_filter.kill(); } else { @@ -301,7 +301,7 @@ void MyMoneyQifReader::slotReceivedErrorFromFilter(KProcess* /* proc */, char *b { TQByteArray data; data.duplicate(buff, len); - qWarning("%s",static_cast(data)); + tqWarning("%s",static_cast(data)); } void MyMoneyQifReader::slotReceivedDataFromFilter(KProcess* /* proc */, char *buff, int len) @@ -332,7 +332,7 @@ void MyMoneyQifReader::slotImportFinished(void) if(!m_lineBuffer.isEmpty()) { m_qifLines << TQString::fromUtf8(m_lineBuffer.stripWhiteSpace()); } - qDebug("Read %d bytes", m_pos); + tqDebug("Read %d bytes", m_pos); TQTimer::singleShot(0, this, TQT_SLOT(slotProcessData())); } @@ -361,13 +361,13 @@ void MyMoneyQifReader::slotProcessData(void) m_qifProfile.setInputDateFormat(list.first()); - qDebug("Selected date format: '%s'", list.first().data()); + tqDebug("Selected date format: '%s'", list.first().data()); signalProgress(0, m_qifLines.count(), i18n("Importing TQIF ...")); TQStringList::iterator it; for(it = m_qifLines.begin(); m_userAbort == false && it != m_qifLines.end(); ++it) { ++m_linenumber; - // qDebug("Proc: '%s'", (*it).data()); + // tqDebug("Proc: '%s'", (*it).data()); if((*it).startsWith("!")) { processQifSpecial(*it); m_qifEntry.clear(); @@ -383,7 +383,7 @@ void MyMoneyQifReader::slotProcessData(void) } d->finishStatement(); - qDebug("%d lines processed", m_linenumber); + tqDebug("%d lines processed", m_linenumber); signalProgress(-1, -1); emit importFinished(); @@ -419,7 +419,7 @@ bool MyMoneyQifReader::startImport(void) while(!m_file->atEnd()) { len = m_file->readBlock(m_buffer, sizeof(m_buffer)); if(len == -1) { - qWarning("Failed to read block from TQIF import file"); + tqWarning("Failed to read block from TQIF import file"); } else { slotReceivedDataFromFilter(0, m_buffer, len); } @@ -443,7 +443,7 @@ bool MyMoneyQifReader::startImport(void) slotSendDataToFilter(); rc = true; } else { - qDebug("starting filter failed :-("); + tqDebug("starting filter failed :-("); } #endif } @@ -493,7 +493,7 @@ bool MyMoneyQifReader::finishImport(void) signalProgress(-1, -1); rc = !m_userAbort && m_filter.normalExit(); } else { - qWarning("MyMoneyQifReader::finishImport() must not be called while the filter\n\tprocess is still running."); + tqWarning("MyMoneyQifReader::finishImport() must not be called while the filter\n\tprocess is still running."); } #endif @@ -617,7 +617,7 @@ void MyMoneyQifReader::processQifSpecial(const TQString& _line) m_entryType = EntrySkip; } else { - qWarning("Unknown export header '!Type:%s' in TQIF file on line %d: Skipping section.", line.data(), m_linenumber); + tqWarning("Unknown export header '!Type:%s' in TQIF file on line %d: Skipping section.", line.data(), m_linenumber); m_entryType = EntrySkip; } @@ -1990,7 +1990,7 @@ TQString MyMoneyQifReader::processAccountEntry(bool resetAccountId) TQString tmp; account.setName(extractLine('N')); - // qDebug("Process account '%s'", account.name().data()); + // tqDebug("Process account '%s'", account.name().data()); account.setDescription(extractLine('D')); @@ -2047,7 +2047,7 @@ TQString MyMoneyQifReader::processAccountEntry(bool resetAccountId) parentAccount = file->asset(); kmymoney2->createAccount(acc, parentAccount, brokerage, MyMoneyMoney()); parentAccount = acc; - qDebug("We still need to create the stock account in MyMoneyQifReader::processAccountEntry()"); + tqDebug("We still need to create the stock account in MyMoneyQifReader::processAccountEntry()"); } else { // setup parent according the type of the account switch(account.accountGroup()) { @@ -2073,9 +2073,9 @@ TQString MyMoneyQifReader::processAccountEntry(bool resetAccountId) } kmymoney2->createAccount(account, parentAccount, brokerage, balance); acc = account; - // qDebug("Account created"); + // tqDebug("Account created"); } else { - // qDebug("Existing account found"); + // tqDebug("Existing account found"); } if(resetAccountId) { diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp index c08dcff..8d26a1b 100644 --- a/kmymoney2/converter/mymoneystatementreader.cpp +++ b/kmymoney2/converter/mymoneystatementreader.cpp @@ -233,7 +233,7 @@ bool MyMoneyStatementReader::import(const MyMoneyStatement& s, TQStringList& mes try { m_account = MyMoneyFile::instance()->account(s.m_accountId); } catch(MyMoneyException* e) { - qDebug("Received reference '%s' to unknown account in statement", s.m_accountId.data()); + tqDebug("Received reference '%s' to unknown account in statement", s.m_accountId.data()); delete e; } } @@ -284,7 +284,7 @@ bool MyMoneyStatementReader::import(const MyMoneyStatement& s, TQStringList& mes try { MyMoneyFile::instance()->modifyAccount(m_account); } catch(MyMoneyException* e) { - qDebug("Updating account in MyMoneyStatementReader::startImport failed"); + tqDebug("Updating account in MyMoneyStatementReader::startImport failed"); delete e; } } @@ -295,7 +295,7 @@ bool MyMoneyStatementReader::import(const MyMoneyStatement& s, TQStringList& mes else if(s.m_listTransactions.count() == 0) messages += i18n("Importing statement without transactions"); - qDebug("Importing statement for '%s'", m_account.name().data()); + tqDebug("Importing statement for '%s'", m_account.name().data()); // // Process the securities @@ -318,7 +318,7 @@ bool MyMoneyStatementReader::import(const MyMoneyStatement& s, TQStringList& mes if ( !m_userAbort ) { try { - qDebug("Processing transactions (%s)", m_account.name().data()); + tqDebug("Processing transactions (%s)", m_account.name().data()); signalProgress(0, s.m_listTransactions.count(), "Importing Statement ..."); int progress = 0; TQValueList::const_iterator it_t = s.m_listTransactions.begin(); @@ -328,13 +328,13 @@ bool MyMoneyStatementReader::import(const MyMoneyStatement& s, TQStringList& mes signalProgress(++progress, 0); ++it_t; } - qDebug("Processing transactions done (%s)", m_account.name().data()); + tqDebug("Processing transactions done (%s)", m_account.name().data()); } catch(MyMoneyException* e) { if(e->what() == "USERABORT") m_userAbort = true; else - qDebug("Caught exception from processTransactionEntry() not caused by USERABORT: %s", e->what().data()); + tqDebug("Caught exception from processTransactionEntry() not caused by USERABORT: %s", e->what().data()); delete e; } signalProgress(-1, -1); @@ -365,7 +365,7 @@ bool MyMoneyStatementReader::import(const MyMoneyStatement& s, TQStringList& mes if(e->what() == "USERABORT") m_userAbort = true; else - qDebug("Caught exception from processPriceEntry() not caused by USERABORT: %s", e->what().data()); + tqDebug("Caught exception from processPriceEntry() not caused by USERABORT: %s", e->what().data()); delete e; } signalProgress(-1, -1); @@ -419,7 +419,7 @@ bool MyMoneyStatementReader::import(const MyMoneyStatement& s, TQStringList& mes delete m_ft; m_ft = 0; - qDebug("Importing statement for '%s' done", m_account.name().data()); + tqDebug("Importing statement for '%s' done", m_account.name().data()); return rc; } @@ -501,7 +501,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra #if 0 TQString dbgMsg; dbgMsg = TQString("Process %1, '%3', %2").arg(t_in.m_datePosted.toString(Qt::ISODate)).arg(t_in.m_amount.formatMoney("", 2)).arg(t_in.m_strBankID); - qDebug("%s", dbgMsg.data()); + tqDebug("%s", dbgMsg.data()); #endif // mark it imported for the view @@ -958,7 +958,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra try { file->addPayee(payee); - qDebug("Payee '%s' created", payee.name().data()); + tqDebug("Payee '%s' created", payee.name().data()); d->payees << payee; payeeid = payee.id(); s1.setPayeeId(payeeid); @@ -1157,7 +1157,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra break; case TransactionMatcher::matched: case TransactionMatcher::matchedExact: - qDebug("Detected as match to transaction '%s'", tm.id().data()); + tqDebug("Detected as match to transaction '%s'", tm.id().data()); matcher.match(tm, matchedSplit, t, s1, true); d->transactionsMatched++; break; @@ -1221,12 +1221,12 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra } } else { d->transactionsDuplicate++; - qDebug("Detected as duplicate"); + tqDebug("Detected as duplicate"); } delete o; } catch (MyMoneyException *e) { TQString message(i18n("Problem adding or matching imported transaction with id '%1': %2").arg(t_in.m_strBankID).arg(e->what())); - qDebug("%s", message.data()); + tqDebug("%s", message.data()); delete e; int result = KMessageBox::warningContinueCancel(0, message); @@ -1325,7 +1325,7 @@ bool MyMoneyStatementReader::selectOrCreateAccount(const SelectCreateMode /*mode ft.commit(); accname = account.name(); } catch(MyMoneyException* e) { - qDebug("Updating account in MyMoneyStatementReader::selectOrCreateAccount failed"); + tqDebug("Updating account in MyMoneyStatementReader::selectOrCreateAccount failed"); delete e; } } diff --git a/kmymoney2/converter/mymoneytemplate.cpp b/kmymoney2/converter/mymoneytemplate.cpp index 1bbd7c6..553e682 100644 --- a/kmymoney2/converter/mymoneytemplate.cpp +++ b/kmymoney2/converter/mymoneytemplate.cpp @@ -57,7 +57,7 @@ bool MyMoneyTemplate::loadTemplate(const KURL& url) TQString filename; if(!url.isValid()) { - qDebug("Invalid template URL '%s'", url.url().latin1()); + tqDebug("Invalid template URL '%s'", url.url().latin1()); return false; } @@ -125,7 +125,7 @@ bool MyMoneyTemplate::loadDescription(void) TQDomNode child = rootElement.firstChild(); while(!child.isNull() && child.isElement()) { TQDomElement childElement = child.toElement(); - // qDebug("MyMoneyTemplate::import: Processing child node %s", childElement.tagName().data()); + // tqDebug("MyMoneyTemplate::import: Processing child node %s", childElement.tagName().data()); if(childElement.tagName() == "accounts") { m_accounts = childElement.firstChild(); validMask |= validAccount; @@ -385,7 +385,7 @@ bool MyMoneyTemplate::saveTemplate(const KURL& url) TQString filename; if(!url.isValid()) { - qDebug("Invalid template URL '%s'", url.url().latin1()); + tqDebug("Invalid template URL '%s'", url.url().latin1()); return false; } diff --git a/kmymoney2/converter/webpricequote.cpp b/kmymoney2/converter/webpricequote.cpp index 7f43686..87fe9ec 100644 --- a/kmymoney2/converter/webpricequote.cpp +++ b/kmymoney2/converter/webpricequote.cpp @@ -833,7 +833,7 @@ void FinanceQuoteProcess::launch (const TQString& scriptPath) { arguments.append(TQCString("perl")); arguments.append (TQCString(scriptPath)); arguments.append (TQCString("-l")); - if (!start(KProcess::NotifyOnExit, KProcess::Stdout)) qFatal ("Unable to start FQ script"); + if (!start(KProcess::NotifyOnExit, KProcess::Stdout)) tqFatal ("Unable to start FQ script"); return; } diff --git a/kmymoney2/dialogs/investactivities.cpp b/kmymoney2/dialogs/investactivities.cpp index 75081b7..c5adc66 100644 --- a/kmymoney2/dialogs/investactivities.cpp +++ b/kmymoney2/dialogs/investactivities.cpp @@ -155,7 +155,7 @@ void Activity::setLabelText(const TQString& idx, const TQString& txt) const if(w) { w->setText(txt); } else { - qDebug("Unknown TQLabel named '%s'", idx.data()); + tqDebug("Unknown TQLabel named '%s'", idx.data()); } } @@ -484,7 +484,7 @@ bool Reinvest::createTransaction(MyMoneyTransaction& t, MyMoneySplit& s0, MyMone return false; if(interestSplits.count() != 1) { - qDebug("more or less than one interest split in Reinvest::createTransaction. Not created."); + tqDebug("more or less than one interest split in Reinvest::createTransaction. Not created."); return false; } diff --git a/kmymoney2/dialogs/investtransactioneditor.cpp b/kmymoney2/dialogs/investtransactioneditor.cpp index 1f6f6da..b46e9d1 100644 --- a/kmymoney2/dialogs/investtransactioneditor.cpp +++ b/kmymoney2/dialogs/investtransactioneditor.cpp @@ -362,7 +362,7 @@ int InvestTransactionEditor::editSplits(const TQString& categoryWidgetName, cons d->m_phonyAccount.setCurrencyId(m_transaction.commodity()); d->m_phonyAccount.fraction(MyMoneyFile::instance()->security(m_transaction.commodity())); } catch(MyMoneyException *e) { - qDebug("Unable to setup precision"); + tqDebug("Unable to setup precision"); delete e; } diff --git a/kmymoney2/dialogs/kcurrencycalculator.cpp b/kmymoney2/dialogs/kcurrencycalculator.cpp index 0ecd16e..54e6f6e 100644 --- a/kmymoney2/dialogs/kcurrencycalculator.cpp +++ b/kmymoney2/dialogs/kcurrencycalculator.cpp @@ -287,7 +287,7 @@ void KCurrencyCalculator::accept(void) MyMoneyFile::instance()->addPrice(pr); ft.commit(); } catch(MyMoneyException *e) { - qDebug("Cannot add price"); + tqDebug("Cannot add price"); delete e; } } diff --git a/kmymoney2/dialogs/kcurrencyeditdlg.cpp b/kmymoney2/dialogs/kcurrencyeditdlg.cpp index d902941..d7add09 100644 --- a/kmymoney2/dialogs/kcurrencyeditdlg.cpp +++ b/kmymoney2/dialogs/kcurrencyeditdlg.cpp @@ -175,7 +175,7 @@ void KCurrencyEditDlg::updateCurrency(void) MyMoneyFile::instance()->modifyCurrency(m_currency); ft.commit(); } catch(MyMoneyException *e) { - qWarning("Updateing the currency failed!"); + tqWarning("Updateing the currency failed!"); delete e; } } @@ -257,7 +257,7 @@ void KCurrencyEditDlg::slotRenameCurrency(TQListViewItem* item, int /* col */, c try { if(txt != m_currency.name()) { - qDebug("Renaming"); + tqDebug("Renaming"); MyMoneySecurity currency = file->currency(p->id()); currency.setName(txt); MyMoneyFileTransaction ft; @@ -266,7 +266,7 @@ void KCurrencyEditDlg::slotRenameCurrency(TQListViewItem* item, int /* col */, c m_currency = currency; ft.commit(); } catch(MyMoneyException* e) { - qDebug("Renaming currency failed"); + tqDebug("Renaming currency failed"); delete e; } } diff --git a/kmymoney2/dialogs/keditloanwizard.cpp b/kmymoney2/dialogs/keditloanwizard.cpp index 6350845..b9a2fcc 100644 --- a/kmymoney2/dialogs/keditloanwizard.cpp +++ b/kmymoney2/dialogs/keditloanwizard.cpp @@ -172,7 +172,7 @@ void KEditLoanWizard::loadWidgets(const MyMoneyAccount& /* account */) m_payeeEdit->setSelectedItem(payee.id()); } catch(MyMoneyException *e) { delete e; - qWarning("Payee for schedule has been deleted"); + tqWarning("Payee for schedule has been deleted"); } } @@ -318,7 +318,7 @@ void KEditLoanWizard::next() setFinishEnabled(m_summaryPage, true); } else { - qFatal("%s,%d: This should never happen", __FILE__, __LINE__); + tqFatal("%s,%d: This should never happen", __FILE__, __LINE__); } m_lastSelection = m_selectionButtonGroup->id(m_selectionButtonGroup->selected()); diff --git a/kmymoney2/dialogs/keditscheduledlg.cpp b/kmymoney2/dialogs/keditscheduledlg.cpp index 195a232..1ee14db 100644 --- a/kmymoney2/dialogs/keditscheduledlg.cpp +++ b/kmymoney2/dialogs/keditscheduledlg.cpp @@ -358,7 +358,7 @@ const MyMoneySchedule& KEditScheduleDlg::schedule(void) const break; } } else { - qDebug("No tabbar found in KEditScheduleDlg::schedule(). Defaulting type to BILL"); + tqDebug("No tabbar found in KEditScheduleDlg::schedule(). Defaulting type to BILL"); } d->m_schedule.setAutoEnter(m_autoEnterEdit->isChecked()); @@ -389,16 +389,16 @@ bool KEditScheduleDlg::focusNextPrevChild(bool next) { bool rc = false; - // qDebug("KEditScheduleDlg::focusNextPrevChild(editmode=%s)", m_inEditMode ? "true" : "false"); + // tqDebug("KEditScheduleDlg::focusNextPrevChild(editmode=%s)", m_inEditMode ? "true" : "false"); TQWidget *w = 0; TQWidget *currentWidget; w = tqApp->focusWidget(); while(w && d->m_tabOrderWidgets.find(w) == -1) { - // qDebug("'%s' not in list, use parent", w->className()); + // tqDebug("'%s' not in list, use parent", w->className()); w = w->parentWidget(); } - // if(w) qDebug("tab order is at '%s'", w->className()); + // if(w) tqDebug("tab order is at '%s'", w->className()); currentWidget = d->m_tabOrderWidgets.current(); w = next ? d->m_tabOrderWidgets.next() : d->m_tabOrderWidgets.prev(); @@ -410,7 +410,7 @@ bool KEditScheduleDlg::focusNextPrevChild(bool next) if(w != currentWidget && ((w->focusPolicy() & TQ_TabFocus) == TQ_TabFocus) && w->isVisible() && w->isEnabled()) { - // qDebug("Selecting '%s' as focus", w->className()); + // tqDebug("Selecting '%s' as focus", w->className()); w->setFocus(); rc = true; break; diff --git a/kmymoney2/dialogs/kendingbalancedlg.cpp b/kmymoney2/dialogs/kendingbalancedlg.cpp index 0195e48..5361613 100644 --- a/kmymoney2/dialogs/kendingbalancedlg.cpp +++ b/kmymoney2/dialogs/kendingbalancedlg.cpp @@ -362,7 +362,7 @@ bool KEndingBalanceDlg::createTransaction(MyMoneyTransaction &t, const int sign, t.modifySplit(s2); } catch(MyMoneyException *e) { - qDebug("%s", e->what().data()); + tqDebug("%s", e->what().data()); delete e; t = MyMoneyTransaction(); return false; @@ -590,7 +590,7 @@ const MyMoneyTransaction KEndingBalanceLoanDlg::adjustmentTransaction(void) cons t.setPostDate(m_endDateEdit->date()); } catch(MyMoneyException *e) { - qDebug("Unable to create adjustment transaction for loan reconciliation: %s", e->what().data()); + tqDebug("Unable to create adjustment transaction for loan reconciliation: %s", e->what().data()); delete e; return MyMoneyTransaction(); } diff --git a/kmymoney2/dialogs/kenterscheduledlg.cpp b/kmymoney2/dialogs/kenterscheduledlg.cpp index c225de5..79616cb 100644 --- a/kmymoney2/dialogs/kenterscheduledlg.cpp +++ b/kmymoney2/dialogs/kenterscheduledlg.cpp @@ -285,16 +285,16 @@ bool KEnterScheduleDlg::focusNextPrevChild(bool next) { bool rc = false; - // qDebug("KGlobalLedgerView::focusNextPrevChild(editmode=%s)", m_inEditMode ? "true" : "false"); + // tqDebug("KGlobalLedgerView::focusNextPrevChild(editmode=%s)", m_inEditMode ? "true" : "false"); TQWidget *w = 0; TQWidget *currentWidget; w = tqApp->focusWidget(); while(w && d->m_tabOrderWidgets.find(w) == -1) { - // qDebug("'%s' not in list, use parent", w->className()); + // tqDebug("'%s' not in list, use parent", w->className()); w = w->parentWidget(); } - // if(w) qDebug("tab order is at '%s'", w->className()); + // if(w) tqDebug("tab order is at '%s'", w->className()); currentWidget = d->m_tabOrderWidgets.current(); w = next ? d->m_tabOrderWidgets.next() : d->m_tabOrderWidgets.prev(); @@ -306,7 +306,7 @@ bool KEnterScheduleDlg::focusNextPrevChild(bool next) if(w != currentWidget && ((w->focusPolicy() & TQ_TabFocus) == TQ_TabFocus) && w->isVisible() && w->isEnabled()) { - // qDebug("Selecting '%s' as focus", w->className()); + // tqDebug("Selecting '%s' as focus", w->className()); w->setFocus(); rc = true; break; diff --git a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp index ada2c25..de48ec7 100644 --- a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp +++ b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp @@ -365,7 +365,7 @@ void KEquityPriceUpdateDlg::storePrices(void) ft.commit(); } catch(MyMoneyException *e) { - qDebug("Unable to add price information for %s", name.data()); + tqDebug("Unable to add price information for %s", name.data()); delete e; } } diff --git a/kmymoney2/dialogs/kexportdlg.cpp b/kmymoney2/dialogs/kexportdlg.cpp index 3332c0d..d71a95c 100644 --- a/kmymoney2/dialogs/kexportdlg.cpp +++ b/kmymoney2/dialogs/kexportdlg.cpp @@ -234,7 +234,7 @@ void KExportDlg::loadAccounts(void) addCategories(strList, file->asset().id(), TQString()); } catch (MyMoneyException *e) { - qDebug("Exception '%s' thrown in %s, line %ld caught in KExportDlg::loadAccounts:%d", + tqDebug("Exception '%s' thrown in %s, line %ld caught in KExportDlg::loadAccounts:%d", e->what().latin1(), e->file().latin1(), e->line(), __LINE__); delete e; } diff --git a/kmymoney2/dialogs/kmymoneypricedlg.cpp b/kmymoney2/dialogs/kmymoneypricedlg.cpp index 5e5e268..c77028a 100644 --- a/kmymoney2/dialogs/kmymoneypricedlg.cpp +++ b/kmymoney2/dialogs/kmymoneypricedlg.cpp @@ -204,7 +204,7 @@ void KMyMoneyPriceDlg::slotDeletePrice(void) MyMoneyFile::instance()->removePrice(item->price()); ft.commit(); } catch(MyMoneyException *e) { - qDebug("Cannot delete price"); + tqDebug("Cannot delete price"); delete e; } } diff --git a/kmymoney2/dialogs/kmymoneysplittable.cpp b/kmymoney2/dialogs/kmymoneysplittable.cpp index 922b342..405a8f7 100644 --- a/kmymoney2/dialogs/kmymoneysplittable.cpp +++ b/kmymoney2/dialogs/kmymoneysplittable.cpp @@ -554,7 +554,7 @@ void kMyMoneySplitTable::slotUpdateData(const MyMoneyTransaction& t) try { colText = MyMoneyFile::instance()->accountToCategory((*it).accountId()); } catch(MyMoneyException *e) { - qDebug("Unexpected exception in kMyMoneySplitTable::slotUpdateData()"); + tqDebug("Unexpected exception in kMyMoneySplitTable::slotUpdateData()"); delete e; } } @@ -636,7 +636,7 @@ void kMyMoneySplitTable::slotDuplicateSplit(void) m_transaction.addSplit(split); emit transactionChanged(m_transaction); } catch(MyMoneyException *e) { - qDebug("Cannot duplicate split: %s", e->what().latin1()); + tqDebug("Cannot duplicate split: %s", e->what().latin1()); delete e; } } @@ -662,7 +662,7 @@ void kMyMoneySplitTable::slotDeleteSplit(void) setCurrentCell(m_currentRow, 0); emit transactionChanged(m_transaction); } catch(MyMoneyException *e) { - qDebug("Cannot remove split: %s", e->what().latin1()); + tqDebug("Cannot remove split: %s", e->what().latin1()); delete e; } } @@ -781,7 +781,7 @@ void kMyMoneySplitTable::endEdit(bool keyBoardDriven) } emit transactionChanged(m_transaction); } catch(MyMoneyException *e) { - qDebug("Cannot add/modify split: %s", e->what().latin1()); + tqDebug("Cannot add/modify split: %s", e->what().latin1()); delete e; } } diff --git a/kmymoney2/dialogs/knewaccountdlg.cpp b/kmymoney2/dialogs/knewaccountdlg.cpp index 5f085aa..0f54394 100644 --- a/kmymoney2/dialogs/knewaccountdlg.cpp +++ b/kmymoney2/dialogs/knewaccountdlg.cpp @@ -345,7 +345,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo } catch (MyMoneyException *e) { - qDebug("exception in init for account dialog: %s", e->what().latin1()); + tqDebug("exception in init for account dialog: %s", e->what().latin1()); delete e; } @@ -502,7 +502,7 @@ void KNewAccountDlg::okClicked() } catch (MyMoneyException *e) { - qDebug("Exception in account institution set: %s", e->what().latin1()); + tqDebug("Exception in account institution set: %s", e->what().latin1()); delete e; } } @@ -700,7 +700,7 @@ const MyMoneyAccount& KNewAccountDlg::parentAccount(void) m_parentAccount = file->equity(); break; default: - qDebug("Seems we have an account that hasn't been mapped to the top five"); + tqDebug("Seems we have an account that hasn't been mapped to the top five"); if(m_categoryEditor) m_parentAccount = file->income(); else @@ -916,7 +916,7 @@ void KNewAccountDlg::initParentWidget(TQString parentId, const TQString& account } catch (MyMoneyException *e) { - qDebug("Exception in assets account refresh: %s", e->what().latin1()); + tqDebug("Exception in assets account refresh: %s", e->what().latin1()); delete e; } @@ -974,7 +974,7 @@ void KNewAccountDlg::slotSelectionChanged(TQListViewItem *item) { MyMoneyFile *file = MyMoneyFile::instance(); - //qDebug("Selected account id: %s", accountItem->accountID().data()); + //tqDebug("Selected account id: %s", accountItem->accountID().data()); m_parentAccount = file->account(accountItem->id()); m_subAccountLabel->setText(i18n("Is a sub account of %1").arg(m_parentAccount.name())); if(m_qlistviewParentAccounts->isEnabled()) { @@ -983,7 +983,7 @@ void KNewAccountDlg::slotSelectionChanged(TQListViewItem *item) } catch (MyMoneyException *e) { - qDebug("This shouldn't happen! : %s", e->what().latin1()); + tqDebug("This shouldn't happen! : %s", e->what().latin1()); delete e; } } @@ -1054,7 +1054,7 @@ void KNewAccountDlg::slotLoadInstitutions(const TQString& name) } catch (MyMoneyException *e) { - qDebug("Exception in institution load: %s", e->what().latin1()); + tqDebug("Exception in institution load: %s", e->what().latin1()); delete e; } } @@ -1109,7 +1109,7 @@ void KNewAccountDlg::slotAccountTypeChanged(const TQString& typeStr) parentId = file->income().id(); break; default: - qWarning("Unknown account group in KNewAccountDlg::slotAccountTypeChanged()"); + tqWarning("Unknown account group in KNewAccountDlg::slotAccountTypeChanged()"); break; } initParentWidget(parentId, TQString()); @@ -1117,7 +1117,7 @@ void KNewAccountDlg::slotAccountTypeChanged(const TQString& typeStr) } } catch(MyMoneyException *e) { delete e; - qWarning("Unexpected exception in KNewAccountDlg::slotAccountTypeChanged()"); + tqWarning("Unexpected exception in KNewAccountDlg::slotAccountTypeChanged()"); } } diff --git a/kmymoney2/dialogs/knewloanwizard.cpp b/kmymoney2/dialogs/knewloanwizard.cpp index 87baaf9..105e2d3 100644 --- a/kmymoney2/dialogs/knewloanwizard.cpp +++ b/kmymoney2/dialogs/knewloanwizard.cpp @@ -445,7 +445,7 @@ void KNewLoanWizard::updateSummary(void) MyMoneyAccount acc = MyMoneyFile::instance()->account(sel.first()); m_summaryInterestCategory->setText(acc.name()); } catch(MyMoneyException *e) { - qWarning("Unable to determine interest category for loan account creation"); + tqWarning("Unable to determine interest category for loan account creation"); delete e; } m_summaryAdditionalFees->setText(m_additionalCost->text()); @@ -459,7 +459,7 @@ void KNewLoanWizard::updateSummary(void) MyMoneyAccount acc = MyMoneyFile::instance()->account(sel.first()); m_summaryPaymentAccount->setText(acc.name()); } catch(MyMoneyException *e) { - qWarning("Unable to determine payment account for loan account creation"); + tqWarning("Unable to determine payment account for loan account creation"); delete e; } } @@ -789,7 +789,7 @@ int KNewLoanWizard::calculateLoan(void) if((m_borrowButton->isChecked() && val < 0 && fabsl(val) > fabsl(calc.payment())) || (m_lendButton->isChecked() && val > 0 && fabs(val) > fabs(calc.payment()))) { // case a) - qDebug("Future Value is %Lf", val); + tqDebug("Future Value is %Lf", val); throw new MYMONEYEXCEPTION("incorrect fincancial calculation"); } else if((m_borrowButton->isChecked() && val < 0 && fabsl(val) <= fabsl(calc.payment())) diff --git a/kmymoney2/dialogs/kreconciledlg.cpp b/kmymoney2/dialogs/kreconciledlg.cpp index 9c18d68..a3d0553 100644 --- a/kmymoney2/dialogs/kreconciledlg.cpp +++ b/kmymoney2/dialogs/kreconciledlg.cpp @@ -273,7 +273,7 @@ void KReconcileDlg::finishClicked(void) void KReconcileDlg::updateData(void) { // Simply reload the list clearing the status. - qDebug("In updateData"); + tqDebug("In updateData"); m_reconciledTransactions.clear(); m_debitsTQList.clear(); m_creditsTQList.clear(); diff --git a/kmymoney2/dialogs/ksplittransactiondlg.cpp b/kmymoney2/dialogs/ksplittransactiondlg.cpp index 907f927..a31693a 100644 --- a/kmymoney2/dialogs/ksplittransactiondlg.cpp +++ b/kmymoney2/dialogs/ksplittransactiondlg.cpp @@ -221,7 +221,7 @@ int KSplitTransactionDlg::exec(void) break; case 2: // distribute difference - qDebug("distribution of difference not yet supported in KSplitTransactionDlg::slotFinishClicked()"); + tqDebug("distribution of difference not yet supported in KSplitTransactionDlg::slotFinishClicked()"); break; case 3: // leave unassigned diff --git a/kmymoney2/dialogs/settings/ksettingshome.cpp b/kmymoney2/dialogs/settings/ksettingshome.cpp index 44bd10b..afdb28b 100644 --- a/kmymoney2/dialogs/settings/ksettingshome.cpp +++ b/kmymoney2/dialogs/settings/ksettingshome.cpp @@ -105,7 +105,7 @@ void KSettingsHome::slotLoadItems(void) if(last) item->moveItem(last); - // qDebug("Adding %s", item->text(0).latin1()); + // tqDebug("Adding %s", item->text(0).latin1()); item->setOn(enabled); if(item->width(fm, m_homePageList, 0) > w) w = item->width(fm, m_homePageList, 0); diff --git a/kmymoney2/dialogs/transactioneditor.cpp b/kmymoney2/dialogs/transactioneditor.cpp index cdc111a..bffcbe8 100644 --- a/kmymoney2/dialogs/transactioneditor.cpp +++ b/kmymoney2/dialogs/transactioneditor.cpp @@ -281,7 +281,7 @@ int TransactionEditor::slotEditSplits(void) *m_transactionPtr = k; } } catch(MyMoneyException *e) { - qDebug("Unable to update commodity to second splits currency in %s: '%s'", m_transaction.id().data(), e->what().data()); + tqDebug("Unable to update commodity to second splits currency in %s: '%s'", m_transaction.id().data(), e->what().data()); delete e; } @@ -357,7 +357,7 @@ bool TransactionEditor::fixTransactionCommodity(const MyMoneyAccount& account) (*it_t).transaction().modifySplit(splitB); } catch(MyMoneyException *e) { - qDebug("Unable to update commodity to second splits currency in %s: '%s'", (*it_t).transaction().id().data(), e->what().data()); + tqDebug("Unable to update commodity to second splits currency in %s: '%s'", (*it_t).transaction().id().data(), e->what().data()); delete e; } break; @@ -394,7 +394,7 @@ bool TransactionEditor::fixTransactionCommodity(const MyMoneyAccount& account) (*it_t).transaction().modifySplit(splitB); } catch(MyMoneyException *e) { - qDebug("Unable to update commodity to second splits currency in %s: '%s'", (*it_t).transaction().id().data(), e->what().data()); + tqDebug("Unable to update commodity to second splits currency in %s: '%s'", (*it_t).transaction().id().data(), e->what().data()); delete e; } break; @@ -440,7 +440,7 @@ bool TransactionEditor::fixTransactionCommodity(const MyMoneyAccount& account) } } } catch(MyMoneyException *e) { - qDebug("Unable to update commodity of split currency in %s: '%s'", (*it_t).transaction().id().data(), e->what().data()); + tqDebug("Unable to update commodity of split currency in %s: '%s'", (*it_t).transaction().id().data(), e->what().data()); delete e; } break; @@ -707,7 +707,7 @@ bool TransactionEditor::enterTransactions(TQString& newId, bool askForSchedule, } } } catch(MyMoneyException * e) { - qDebug("Unable to store transaction within engine: %s", e->what().latin1()); + tqDebug("Unable to store transaction within engine: %s", e->what().latin1()); delete e; newTransactionCreated = false; } @@ -748,7 +748,7 @@ bool StdTransactionEditor::eventFilter(TQObject* o, TQEvent* e) if((e->type() == TQEvent::FocusOut) && (haveWidget("payee") == dynamic_cast(o))) { // loosing the focus on the payee widget? - qDebug("Loosing focus on payee"); + tqDebug("Loosing focus on payee"); KMyMoneyPayeeCombo* p = dynamic_cast(haveWidget("payee")); if(!p->selectedItem().isEmpty()) slotUpdatePayee(p->selectedItem()); @@ -1421,7 +1421,7 @@ void StdTransactionEditor::slotUpdateCashFlow(KMyMoneyRegister::CashFlowDirectio { TQLabel* categoryLabel = dynamic_cast(haveWidget("category-label")); - // qDebug("Update cashflow to %d", dir); + // tqDebug("Update cashflow to %d", dir); if(categoryLabel) { TabBar* tabbar = dynamic_cast(haveWidget("tabbar")); if(categoryLabel->text() != i18n("Category")) { @@ -1443,7 +1443,7 @@ void StdTransactionEditor::slotUpdateCashFlow(KMyMoneyRegister::CashFlowDirectio void StdTransactionEditor::slotUpdateCategory(const TQString& id) { TQLabel *categoryLabel = dynamic_cast(haveWidget("category-label")); - // qDebug("Update category to %s", id.data()); + // tqDebug("Update category to %s", id.data()); if(categoryLabel) { TabBar* tabbar = dynamic_cast(haveWidget("tabbar")); @@ -1522,7 +1522,7 @@ void StdTransactionEditor::slotUpdateDeposit(const TQString& txt) void StdTransactionEditor::slotUpdateAmount(const TQString& txt) { - // qDebug("Update amount to %s", txt.data()); + // tqDebug("Update amount to %s", txt.data()); MyMoneyMoney val(txt); updateAmount(val); updateVAT(true); @@ -1645,7 +1645,7 @@ bool StdTransactionEditor::addVatSplit(MyMoneyTransaction& tr, const MyMoneyMone const MyMoneySecurity& csec = file->security(category.currencyId()); const MyMoneySecurity& vsec = file->security(vatAcc.currencyId()); if(asec.id() != csec.id() || asec.id() != vsec.id()) { - qDebug("Auto VAT assignment only works if all three accounts use the same currency."); + tqDebug("Auto VAT assignment only works if all three accounts use the same currency."); return false; } @@ -1657,7 +1657,7 @@ bool StdTransactionEditor::addVatSplit(MyMoneyTransaction& tr, const MyMoneyMone tax.setAccountId(vatAcc.id()); - // qDebug("vat amount is '%s'", category.value("VatAmount").latin1()); + // tqDebug("vat amount is '%s'", category.value("VatAmount").latin1()); if(category.value("VatAmount").lower() != TQString("net")) { // split value is the gross value gv = amount; @@ -1857,7 +1857,7 @@ int StdTransactionEditor::slotEditSplits(void) } } if(!deposit || !payment) { - qDebug("Internal error: deposit(%p) & payment(%p) widgets not found but required", deposit, payment); + tqDebug("Internal error: deposit(%p) & payment(%p) widgets not found but required", deposit, payment); return rc; } } diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp index e47cc76..289933d 100644 --- a/kmymoney2/kmymoney2.cpp +++ b/kmymoney2/kmymoney2.cpp @@ -518,7 +518,7 @@ KAction* KMyMoney2App::action(const TQString& actionName) const if(p) return p; - qWarning("Action with name '%s' not found!", actionName.latin1()); + tqWarning("Action with name '%s' not found!", actionName.latin1()); return &dummyAction; } @@ -532,13 +532,13 @@ KToggleAction* KMyMoney2App::toggleAction(const TQString& actionName) const if(q) { KToggleAction* p = dynamic_cast(q); if(!p) { - qWarning("Action '%s' is not of type KToggleAction", actionName.latin1()); + tqWarning("Action '%s' is not of type KToggleAction", actionName.latin1()); p = &dummyAction; } return p; } - qWarning("Action with name '%s' not found!", actionName.latin1()); + tqWarning("Action with name '%s' not found!", actionName.latin1()); return &dummyAction; } @@ -648,7 +648,7 @@ void KMyMoney2App::slotPerformanceTest(void) TQTime timer; MyMoneyAccount acc; - qDebug("--- Starting performance tests ---"); + tqDebug("--- Starting performance tests ---"); // AccountList MyMoneyFile::instance()->preloadCache(); @@ -939,7 +939,7 @@ void KMyMoney2App::slotFileOpenRecent(const KURL& url) KMyMoney2App_stub* remoteApp = new KMyMoney2App_stub(kapp->dcopClient(), (*it), "kmymoney2app"); TQString remoteFile = remoteApp->filename(); if(!remoteApp->ok()) { - qDebug("DCOP error while calling app->filename()"); + tqDebug("DCOP error while calling app->filename()"); } else { if(remoteFile == url.url()) { duplicate = true; @@ -2036,7 +2036,7 @@ void KMyMoney2App::slotProcessExited(void) ready(); } } else { - qDebug("cp exit status is %d", proc.exitStatus()); + tqDebug("cp exit status is %d", proc.exitStatus()); m_backupResult = 1; KMessageBox::information(this, i18n("Error copying file to device"), i18n("Backup")); @@ -2073,7 +2073,7 @@ void KMyMoney2App::slotProcessExited(void) break; default: - qWarning("Unknown state for backup operation!"); + tqWarning("Unknown state for backup operation!"); progressCallback(-1, -1, TQString()); ready(); break; @@ -2614,7 +2614,7 @@ void KMyMoney2App::slotManualPriceUpdate(void) // The dialog takes care of adding the price if necessary calc.exec(); } catch(MyMoneyException* e) { - qDebug("Error in price update: %s", e->what().data()); + tqDebug("Error in price update: %s", e->what().data()); delete e; } } @@ -3059,13 +3059,13 @@ void KMyMoney2App::slotAccountEdit(void) file->addSchedule(sch); ft.commit(); } catch (MyMoneyException *f) { - qDebug("Cannot add schedule: '%s'", f->what().data()); + tqDebug("Cannot add schedule: '%s'", f->what().data()); delete f; } delete e; } } catch(MyMoneyException *e) { - qDebug("Unable to modify account %s: '%s'", m_selectedAccount.name().data(), + tqDebug("Unable to modify account %s: '%s'", m_selectedAccount.name().data(), e->what().data()); delete e; } @@ -3145,7 +3145,7 @@ void KMyMoney2App::slotAccountReconcileStart(void) ft.commit(); } catch(MyMoneyException *e) { - qWarning("interest transaction not stored: '%s'", e->what().data()); + tqWarning("interest transaction not stored: '%s'", e->what().data()); delete e; } @@ -3257,7 +3257,7 @@ void KMyMoney2App::slotAccountReconcileFinish(void) transactionList); } catch(MyMoneyException *e) { - qDebug("Unexpected exception when setting cleared to reconcile"); + tqDebug("Unexpected exception when setting cleared to reconcile"); delete e; } } @@ -3288,7 +3288,7 @@ void KMyMoney2App::slotAccountReconcilePostpone(void) m_reconciliationAccount = MyMoneyAccount(); slotUpdateActions(); } catch(MyMoneyException *e) { - qDebug("Unexpected exception when setting last reconcile info into account"); + tqDebug("Unexpected exception when setting last reconcile info into account"); delete e; ft.rollback(); m_reconciliationAccount = file->account(m_reconciliationAccount.id()); @@ -4456,7 +4456,7 @@ void KMyMoney2App::slotTransactionsNew(void) void KMyMoney2App::slotTransactionsEdit(void) { - // qDebug("KMyMoney2App::slotTransactionsEdit()"); + // tqDebug("KMyMoney2App::slotTransactionsEdit()"); // since we jump here via code, we have to make sure to react only // if the action is enabled if(kmymoney2->action("transaction_edit")->isEnabled()) { @@ -4513,7 +4513,7 @@ void KMyMoney2App::slotTransactionsCancel(void) if(kmymoney2->action("transaction_cancel")->isEnabled()) { // make sure, we block the enter function action("transaction_enter")->setEnabled(false); - // qDebug("KMyMoney2App::slotTransactionsCancel"); + // tqDebug("KMyMoney2App::slotTransactionsCancel"); deleteTransactionEditor(); slotUpdateActions(); } @@ -4524,7 +4524,7 @@ void KMyMoney2App::slotTransactionsEnter(void) // since we jump here via code, we have to make sure to react only // if the action is enabled if(kmymoney2->action("transaction_enter")->isEnabled()) { - // qDebug("KMyMoney2App::slotTransactionsEnter"); + // tqDebug("KMyMoney2App::slotTransactionsEnter"); if(m_transactionEditor) { TQString accountId = m_selectedAccount.id(); TQString newId; @@ -4550,7 +4550,7 @@ void KMyMoney2App::slotTransactionsCancelOrEnter(bool& okToSelect) if(!oneTime) { oneTime = true; TQString dontShowAgain = "CancelOrEditTransaction"; - // qDebug("KMyMoney2App::slotCancelOrEndEdit"); + // tqDebug("KMyMoney2App::slotCancelOrEndEdit"); if(m_transactionEditor) { if(KMyMoneyGlobalSettings::focusChangeIsEnter() && kmymoney2->action("transaction_enter")->isEnabled()) { slotTransactionsEnter(); @@ -4788,7 +4788,7 @@ void KMyMoney2App::slotTransactionAssignNumber(void) void KMyMoney2App::slotTransactionCombine(void) { - qDebug("slotTransactionCombine() not implemented yet"); + tqDebug("slotTransactionCombine() not implemented yet"); } void KMyMoney2App::slotMoveToAccount(const TQString& id) @@ -5045,7 +5045,7 @@ void KMyMoney2App::slotShowScheduleContextMenu(void) void KMyMoney2App::slotShowAccountContextMenu(const MyMoneyObject& obj) { -// qDebug("KMyMoney2App::slotShowAccountContextMenu"); +// tqDebug("KMyMoney2App::slotShowAccountContextMenu"); if(typeid(obj) != typeid(MyMoneyAccount)) return; @@ -5461,7 +5461,7 @@ void KMyMoney2App::slotUpdateActions(void) action("investment_online_price_update")->setEnabled(true); } catch(MyMoneyException *e) { - qDebug("Error retrieving security for investment %s: %s", m_selectedInvestment.name().data(), e->what().data()); + tqDebug("Error retrieving security for investment %s: %s", m_selectedInvestment.name().data(), e->what().data()); delete e; } if(m_selectedInvestment.isClosed()) @@ -5622,7 +5622,7 @@ void KMyMoney2App::slotSelectInstitution(const MyMoneyObject& institution) return; m_selectedInstitution = dynamic_cast(institution); - // qDebug("slotSelectInstitution('%s')", m_selectedInstitution.name().data()); + // tqDebug("slotSelectInstitution('%s')", m_selectedInstitution.name().data()); slotUpdateActions(); emit institutionSelected(m_selectedInstitution); } @@ -5637,7 +5637,7 @@ void KMyMoney2App::slotSelectAccount(const MyMoneyObject& obj) if(!acc.isInvest()) m_selectedAccount = acc; - // qDebug("slotSelectAccount('%s')", m_selectedAccount.name().data()); + // tqDebug("slotSelectAccount('%s')", m_selectedAccount.name().data()); slotUpdateActions(); emit accountSelected(m_selectedAccount); } @@ -5647,7 +5647,7 @@ void KMyMoney2App::slotSelectInvestment(const MyMoneyObject& obj) if(typeid(obj) != typeid(MyMoneyAccount)) return; - // qDebug("slotSelectInvestment('%s')", account.name().data()); + // tqDebug("slotSelectInvestment('%s')", account.name().data()); m_selectedInvestment = MyMoneyAccount(); const MyMoneyAccount& acc = dynamic_cast(obj); if(acc.isInvest()) @@ -5659,7 +5659,7 @@ void KMyMoney2App::slotSelectInvestment(const MyMoneyObject& obj) void KMyMoney2App::slotSelectSchedule(const MyMoneySchedule& schedule) { - // qDebug("slotSelectSchedule('%s')", schedule.name().data()); + // tqDebug("slotSelectSchedule('%s')", schedule.name().data()); m_selectedSchedule = schedule; slotUpdateActions(); emit scheduleSelected(m_selectedSchedule); @@ -6198,7 +6198,7 @@ void KMyMoney2App::Private::unlinkStatementXML(void) { TQDir d("/home/thb", "kmm-statement*"); for(int i=0; i < d.count(); ++i) { - qDebug("Remove %s", d[i].data()); + tqDebug("Remove %s", d[i].data()); d.remove(TQString("/home/thb/%1").arg(d[i])); } statementXMLindex = 0; diff --git a/kmymoney2/kmymoneyutils.cpp b/kmymoney2/kmymoneyutils.cpp index 4516413..c2e41ca 100644 --- a/kmymoney2/kmymoneyutils.cpp +++ b/kmymoney2/kmymoneyutils.cpp @@ -281,7 +281,7 @@ TQString KMyMoneyUtils::findResource(const char* type, const TQString& filename) // check that the placeholder is present if(!filename.find("%1")) { - qWarning("%%1 not found in '%s'", filename.latin1()); + tqWarning("%%1 not found in '%s'", filename.latin1()); return filename; } @@ -293,7 +293,7 @@ TQString KMyMoneyUtils::findResource(const char* type, const TQString& filename) rc = KGlobal::dirs()->findResource(type, mask.arg(language)); } if(rc.isEmpty()) { - // qDebug(TQString("html/home_%1.html not found").arg(country).latin1()); + // tqDebug(TQString("html/home_%1.html not found").arg(country).latin1()); rc = KGlobal::dirs()->findResource(type, mask.arg(country)); } if(rc.isEmpty()) { @@ -301,7 +301,7 @@ TQString KMyMoneyUtils::findResource(const char* type, const TQString& filename) } if(rc.isEmpty()) { - qWarning("No resource found for (%s,%s)", type, filename.latin1()); + tqWarning("No resource found for (%s,%s)", type, filename.latin1()); } return rc; } @@ -432,7 +432,7 @@ MyMoneyTransaction KMyMoneyUtils::scheduledTransaction(const MyMoneySchedule& sc calculateAutoLoan(schedule, t, TQMap()); } } catch (MyMoneyException* e) { - qDebug("Unable to load schedule details for '%s' during transaction match: %s", schedule.name().data(), e->what().data()); + tqDebug("Unable to load schedule details for '%s' during transaction match: %s", schedule.name().data(), e->what().data()); delete e; } diff --git a/kmymoney2/main.cpp b/kmymoney2/main.cpp index 63f8ce4..01f807b 100644 --- a/kmymoney2/main.cpp +++ b/kmymoney2/main.cpp @@ -155,7 +155,7 @@ int main(int argc, char *argv[]) TQCString language = args->getOption("lang"); if(!language.isEmpty()) { if(!KGlobal::locale()->setLanguage(language)) { - qWarning("Unable to select language '%s'. This has one of two reasons:\n\ta) the standard KDE message catalogue is not installed\n\tb) the KMyMoney message catalogue is not installed", language.data()); + tqWarning("Unable to select language '%s'. This has one of two reasons:\n\ta) the standard KDE message catalogue is not installed\n\tb) the KMyMoney message catalogue is not installed", language.data()); } } @@ -212,7 +212,7 @@ int main(int argc, char *argv[]) arg << url.path(); arg << kapp->startupId(); if (!client->send(primary, "kmymoney2app", "webConnect(TQString,TQCString)",data)) - qDebug("Unable to launch WebConnect via DCOP."); + tqDebug("Unable to launch WebConnect via DCOP."); // Before we delete the application, we make sure that we destroy all // widgets by running the event loop for some time to catch all those @@ -233,7 +233,7 @@ int main(int argc, char *argv[]) } } } else { - qDebug("DCOP registration failed. Some functions are not available."); + tqDebug("DCOP registration failed. Some functions are not available."); } kmymoney2->show(); @@ -300,7 +300,7 @@ void timestamp(char *txt) { if(timersOn) { - qDebug("Time(%s): %d", txt, timer.elapsed()); + tqDebug("Time(%s): %d", txt, timer.elapsed()); } } @@ -308,7 +308,7 @@ void timetrace(const char *txt) { if(timersOn) { - qDebug("Timer(%s): %d elapsed", txt, timer.elapsed()); + tqDebug("Timer(%s): %d elapsed", txt, timer.elapsed()); timer.restart(); } } 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\""); diff --git a/kmymoney2/plugins/interfaces/kmmstatementinterface.cpp b/kmymoney2/plugins/interfaces/kmmstatementinterface.cpp index 7fcefb0..eead74b 100644 --- a/kmymoney2/plugins/interfaces/kmmstatementinterface.cpp +++ b/kmymoney2/plugins/interfaces/kmmstatementinterface.cpp @@ -39,7 +39,7 @@ KMyMoneyPlugin::KMMStatementInterface::KMMStatementInterface(KMyMoney2App* app, bool KMyMoneyPlugin::KMMStatementInterface::import(const MyMoneyStatement& s) { - qDebug("KMyMoneyPlugin::KMMStatementInterface::import start"); + tqDebug("KMyMoneyPlugin::KMMStatementInterface::import start"); return m_app->slotStatementImport(s); } diff --git a/kmymoney2/plugins/kmymoneyplugin.cpp b/kmymoney2/plugins/kmymoneyplugin.cpp index add4588..db57abd 100644 --- a/kmymoney2/plugins/kmymoneyplugin.cpp +++ b/kmymoney2/plugins/kmymoneyplugin.cpp @@ -49,7 +49,7 @@ KAction* KMyMoneyPlugin::Plugin::action(const TQString& actionName) const if(p) return p; - qWarning("Action with name '%s' not found!", actionName.latin1()); + tqWarning("Action with name '%s' not found!", actionName.latin1()); return &dummyAction; } @@ -63,13 +63,13 @@ KToggleAction* KMyMoneyPlugin::Plugin::toggleAction(const TQString& actionName) if(q) { KToggleAction* p = dynamic_cast(q); if(!p) { - qWarning("Action '%s' is not of type KToggleAction", actionName.latin1()); + tqWarning("Action '%s' is not of type KToggleAction", actionName.latin1()); p = &dummyAction; } return p; } - qWarning("Action with name '%s' not found!", actionName.latin1()); + tqWarning("Action with name '%s' not found!", actionName.latin1()); return &dummyAction; } diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp index 5ac0f89..a61ad77 100644 --- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp +++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp @@ -362,7 +362,7 @@ int KOnlineBankingSetupWizard::ofxAccountCallback(struct OfxAccountData data, vo 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()); + tqDebug("Cannot setup kmmofx-acc-ref for '%s'", kvps.value("bankname").data()); } kvps.setValue("protocol","OFX"); diff --git a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp index d4d6244..b9c4f5e 100644 --- a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp +++ b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp @@ -560,7 +560,7 @@ int OfxImporterPlugin::ofxStatusCallback(struct OfxStatusData data, void * pv) bool OfxImporterPlugin::importStatement(const MyMoneyStatement& s) { - qDebug("OfxImporterPlugin::importStatement start"); + tqDebug("OfxImporterPlugin::importStatement start"); return statementInterface()->import(s); } @@ -670,7 +670,7 @@ bool OfxImporterPlugin::storeStatements(TQValueList& statement abort = true; }*/ - qDebug("OfxImporterPlugin::storeStatements() with %d statements called", static_cast(statements.count())); + tqDebug("OfxImporterPlugin::storeStatements() with %d statements called", static_cast(statements.count())); TQValueList::const_iterator it_s = statements.begin(); while ( it_s != statements.end() && !abort ) { ok = ok && importStatement((*it_s)); diff --git a/kmymoney2/reports/objectinfotable.cpp b/kmymoney2/reports/objectinfotable.cpp index f99c115..ef4af13 100644 --- a/kmymoney2/reports/objectinfotable.cpp +++ b/kmymoney2/reports/objectinfotable.cpp @@ -357,7 +357,7 @@ MyMoneyMoney ObjectInfoTable::investmentBalance(const MyMoneyAccount& acc) val = val.convert(acc.fraction()); value += val; } catch(MyMoneyException* e) { - qWarning("%s", (TQString("cannot convert stock balance of %1 to base currency: %2").arg(stock.name(), e->what())).data()); + tqWarning("%s", (TQString("cannot convert stock balance of %1 to base currency: %2").arg(stock.name(), e->what())).data()); delete e; } } diff --git a/kmymoney2/reports/pivottable.cpp b/kmymoney2/reports/pivottable.cpp index b75ffb9..7846d93 100644 --- a/kmymoney2/reports/pivottable.cpp +++ b/kmymoney2/reports/pivottable.cpp @@ -72,7 +72,7 @@ Debug::Debug( const TQString& _name ): m_methodName( _name ), m_enabled( m_sEnab if (m_enabled) { - qDebug( "%s%s(): ENTER", m_sTabs.latin1(), m_methodName.latin1() ); + tqDebug( "%s%s(): ENTER", m_sTabs.latin1(), m_methodName.latin1() ); m_sTabs.append("--"); } } @@ -82,7 +82,7 @@ Debug::~Debug() if ( m_enabled ) { m_sTabs.remove(0,2); - qDebug( "%s%s(): EXIT", m_sTabs.latin1(), m_methodName.latin1() ); + tqDebug( "%s%s(): EXIT", m_sTabs.latin1(), m_methodName.latin1() ); if (m_methodName == m_sEnableKey) m_enabled = false; @@ -92,7 +92,7 @@ Debug::~Debug() void Debug::output( const TQString& _text ) { if ( m_enabled ) - qDebug( "%s%s(): %s", m_sTabs.latin1(), m_methodName.latin1(), _text.latin1() ); + tqDebug( "%s%s(): %s", m_sTabs.latin1(), m_methodName.latin1(), _text.latin1() ); } PivotTable::PivotTable( const MyMoneyReport& _config_f ): @@ -190,7 +190,7 @@ void PivotTable::init(void) try { transactions = file->transactionList(m_config_f); } catch(MyMoneyException *e) { - qDebug("ERR: %s thrown in %s(%ld)", e->what().data(), e->file().data(), e->line()); + tqDebug("ERR: %s thrown in %s(%ld)", e->what().data(), e->file().data(), e->line()); throw e; } DEBUG_OUTPUT(TQString("Found %1 matching transactions").arg(transactions.count())); @@ -332,7 +332,7 @@ void PivotTable::init(void) if(value != MyMoneyMoney::autoCalc) { value = value * reverse; } else { - qDebug("PivotTable::PivotTable(): This must not happen"); + tqDebug("PivotTable::PivotTable(): This must not happen"); value = MyMoneyMoney(); // keep it 0 so far } @@ -761,7 +761,7 @@ void PivotTable::calculateRunningSums( void ) MyMoneyMoney PivotTable::cellBalance(const TQString& outergroup, const ReportAccount& _row, unsigned _column, bool budget) { if(m_runningSumsCalculated) { - qDebug("You must not call PivotTable::cellBalance() after calling PivotTable::calculateRunningSums()"); + tqDebug("You must not call PivotTable::cellBalance() after calling PivotTable::calculateRunningSums()"); throw new MYMONEYEXCEPTION(TQString("You must not call PivotTable::cellBalance() after calling PivotTable::calculateRunningSums()")); } diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp index e82459a..6806ea7 100644 --- a/kmymoney2/views/kgloballedgerview.cpp +++ b/kmymoney2/views/kgloballedgerview.cpp @@ -847,7 +847,7 @@ void KGlobalLedgerView::loadAccounts(void) try { d->m_precision = MyMoneyMoney::denomToPrec(m_account.fraction()); } catch(MyMoneyException *e) { - qDebug("Security %s for account %s not found", m_account.currencyId().data(), m_account.name().data()); + tqDebug("Security %s for account %s not found", m_account.currencyId().data(), m_account.name().data()); delete e; d->m_precision = 2; } @@ -956,7 +956,7 @@ bool KGlobalLedgerView::slotSelectAccount(const TQString& id, const TQString& tr m_newAccountLoaded = true; slotLoadView(); } catch(MyMoneyException* e) { - qDebug("Unable to retrieve account %s", id.data()); + tqDebug("Unable to retrieve account %s", id.data()); delete e; rc = false; } @@ -1207,17 +1207,17 @@ bool KGlobalLedgerView::focusNextPrevChild(bool next) { bool rc = false; - // qDebug("KGlobalLedgerView::focusNextPrevChild(editmode=%s)", m_inEditMode ? "true" : "false"); + // tqDebug("KGlobalLedgerView::focusNextPrevChild(editmode=%s)", m_inEditMode ? "true" : "false"); if(m_inEditMode) { TQWidget *w = 0; TQWidget *currentWidget; w = tqApp->focusWidget(); while(w && m_tabOrderWidgets.find(w) == -1) { - // qDebug("'%s' not in list, use parent", w->className()); + // tqDebug("'%s' not in list, use parent", w->className()); w = w->parentWidget(); } - // if(w) qDebug("tab order is at '%s'", w->className()); + // if(w) tqDebug("tab order is at '%s'", w->className()); currentWidget = m_tabOrderWidgets.current(); w = next ? m_tabOrderWidgets.next() : m_tabOrderWidgets.prev(); @@ -1229,7 +1229,7 @@ bool KGlobalLedgerView::focusNextPrevChild(bool next) if(w != currentWidget && ((w->focusPolicy() & TQ_TabFocus) == TQ_TabFocus) && w->isVisible() && w->isEnabled()) { - // qDebug("Selecting '%s' as focus", w->className()); + // tqDebug("Selecting '%s' as focus", w->className()); w->setFocus(); rc = true; break; @@ -1270,14 +1270,14 @@ bool KGlobalLedgerView::eventFilter(TQObject* o, TQEvent* e) if(e->type() == TQEvent::KeyPress) { TQKeyEvent *k = TQT_TQKEYEVENT(e); if(m_inEditMode) { - // qDebug("object = %s, key = %d", o->className(), k->key()); + // tqDebug("object = %s, key = %d", o->className(), k->key()); if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_register)) { // we hide all key press events from the register // while editing a transaction rc = true; } } else { - // qDebug("object = %s, key = %d", o->className(), k->key()); + // tqDebug("object = %s, key = %d", o->className(), k->key()); if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_register)) { if((k->state() & TQt::KeyButtonMask) == 0) { switch(k->key()) { @@ -1333,7 +1333,7 @@ void KGlobalLedgerView::slotSortOptions(void) MyMoneyFile::instance()->modifyAccount(m_account); ft.commit(); } catch(MyMoneyException* e) { - qDebug("Unable to update sort order for account '%s': %s", m_account.name().latin1(), e->what().latin1()); + tqDebug("Unable to update sort order for account '%s': %s", m_account.name().latin1(), e->what().latin1()); delete e; } } diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp index bb13614..2469ed3 100644 --- a/kmymoney2/views/khomeview.cpp +++ b/kmymoney2/views/khomeview.cpp @@ -181,20 +181,20 @@ void KHomeView::loadView(void) DOM::Element e = m_part->document().getElementById("test"); if ( e.isNull() ) { - qDebug("Element id=test not found"); + tqDebug("Element id=test not found"); } else { - qDebug("Element id=test found!"); + tqDebug("Element id=test found!"); TQString tagname = e.tagName().string(); - qDebug("%s",tagname.latin1()); - qDebug("%s id=%s",e.tagName().string().latin1(),e.getAttribute("id").string().latin1()); + tqDebug("%s",tagname.latin1()); + tqDebug("%s id=%s",e.tagName().string().latin1(),e.getAttribute("id").string().latin1()); // Find the character data node DOM::Node n = e.firstChild(); while (!n.isNull()) { - qDebug("Child type %u",static_cast(n.nodeType())); + tqDebug("Child type %u",static_cast(n.nodeType())); if ( n.nodeType() == DOM::Node::TEXT_NODE ) { DOM::Text t = n; @@ -204,7 +204,7 @@ void KHomeView::loadView(void) m_part->document().importNode(e,true); m_part->document().updateRendering(); - qDebug("Data is now %s",t.data().string().latin1()); + tqDebug("Data is now %s",t.data().string().latin1()); } n = n.nextSibling(); } @@ -682,12 +682,12 @@ void KHomeView::showPaymentEntry(const MyMoneySchedule& sched, int cnt) tmp += showColoredAmount(balance, balanceAfter.isNegative()); tmp += ""; - // qDebug("paymentEntry = '%s'", tmp.latin1()); + // tqDebug("paymentEntry = '%s'", tmp.latin1()); m_part->write(tmp); } } } catch(MyMoneyException* e) { - qDebug("Unable to display schedule entry: %s", e->what().data()); + tqDebug("Unable to display schedule entry: %s", e->what().data()); delete e; } } @@ -868,7 +868,7 @@ void KHomeView::showAccountEntry(const MyMoneyAccount& acc, const MyMoneyMoney& tmp += TQString("%1").arg(showColoredAmount(amountToMinBal, valueToMinBal.isNegative())); } } - // qDebug("accountEntry = '%s'", tmp.latin1()); + // tqDebug("accountEntry = '%s'", tmp.latin1()); m_part->write(tmp); } @@ -893,7 +893,7 @@ MyMoneyMoney KHomeView::investmentBalance(const MyMoneyAccount& acc) val = val.convert(acc.fraction()); value += val; } catch(MyMoneyException* e) { - qWarning("%s", (TQString("cannot convert stock balance of %1 to base currency: %2").arg(stock.name(), e->what())).data()); + tqWarning("%s", (TQString("cannot convert stock balance of %1 to base currency: %2").arg(stock.name(), e->what())).data()); delete e; } } @@ -1184,7 +1184,7 @@ void KHomeView::slotOpenURL(const KURL &url, const KParts::URLArgs& /* args */) loadView(); } else { - qDebug("Unknown view '%s' in KHomeView::slotOpenURL()", view.latin1()); + tqDebug("Unknown view '%s' in KHomeView::slotOpenURL()", view.latin1()); } } } diff --git a/kmymoney2/views/kinvestmentlistitem.cpp b/kmymoney2/views/kinvestmentlistitem.cpp index d13f5d3..a2a7723 100644 --- a/kmymoney2/views/kinvestmentlistitem.cpp +++ b/kmymoney2/views/kinvestmentlistitem.cpp @@ -183,7 +183,7 @@ const TQString KInvestmentListItem::calculateGain(const equity_price_history& hi return TQString("0.0%"); } - //qDebug("Current date/value to use is %s/%s, Previous is %s/%s", tempDate.toString().data(), currentValue.toString().data(), comparisonDate.toString().data(), comparisonValue.toString().data()); + //tqDebug("Current date/value to use is %s/%s, Previous is %s/%s", tempDate.toString().data(), currentValue.toString().data(), comparisonDate.toString().data(), comparisonValue.toString().data()); //compute the percentage difference if(comparisonValue != currentValue) @@ -201,7 +201,7 @@ const TQString KInvestmentListItem::calculateGain(const equity_price_history& hi /*MyMoneyMoney result = (currentValue / comparisonValue); result = result * 100; result = result - 100; - qDebug("final result = %s", result.toString().data()); + tqDebug("final result = %s", result.toString().data()); return TQString(result.formatMoney("", 3) + "%");*/ } } diff --git a/kmymoney2/views/kinvestmentview.cpp b/kmymoney2/views/kinvestmentview.cpp index ba1876f..57d7aa8 100644 --- a/kmymoney2/views/kinvestmentview.cpp +++ b/kmymoney2/views/kinvestmentview.cpp @@ -182,7 +182,7 @@ void KInvestmentView::loadAccounts(void) try { d->m_precision = MyMoneyMoney::denomToPrec(d->m_account.fraction()); } catch(MyMoneyException *e) { - qDebug("Security %s for account %s not found", d->m_account.currencyId().data(), d->m_account.name().data()); + tqDebug("Security %s for account %s not found", d->m_account.currencyId().data(), d->m_account.name().data()); delete e; d->m_precision = 2; } @@ -231,7 +231,7 @@ bool KInvestmentView::slotSelectAccount(const TQString& id, const TQString& tran } } catch(MyMoneyException* e) { - qDebug("Unable to retrieve account %s", id.data()); + tqDebug("Unable to retrieve account %s", id.data()); delete e; rc = false; } @@ -295,7 +295,7 @@ void KInvestmentView::loadView(void) new KInvestmentListItem(m_table, acc); } } catch(MyMoneyException* e) { - qDebug("KInvestmentView::loadView() - selected account does not exist anymore"); + tqDebug("KInvestmentView::loadView() - selected account does not exist anymore"); d->m_account = MyMoneyAccount(); delete e; } diff --git a/kmymoney2/views/kmymoneyview.cpp b/kmymoney2/views/kmymoneyview.cpp index 3b60c49..e622260 100644 --- a/kmymoney2/views/kmymoneyview.cpp +++ b/kmymoney2/views/kmymoneyview.cpp @@ -483,11 +483,11 @@ void KMyMoneyView::slotLedgerSelected(const TQString& _accId, const TQString& tr case MyMoneyAccount::CertificateDep: case MyMoneyAccount::MoneyMarket: case MyMoneyAccount::Currency: - qDebug("No ledger view available for account type %d", acc.accountType()); + tqDebug("No ledger view available for account type %d", acc.accountType()); break; default: - qDebug("Unknown account type %d in KMyMoneyView::slotLedgerSelected", acc.accountType()); + tqDebug("Unknown account type %d in KMyMoneyView::slotLedgerSelected", acc.accountType()); break; } } @@ -559,7 +559,7 @@ bool KMyMoneyView::readFile(const KURL& url) #else if(url.isMalformed()) { #endif - qDebug("Invalid URL '%s'", url.url().latin1()); + tqDebug("Invalid URL '%s'", url.url().latin1()); return false; } @@ -911,7 +911,7 @@ bool KMyMoneyView::initializeStorage() // Check if we have to modify the file before we allow to work with it IMyMoneyStorage* s = MyMoneyFile::instance()->storage(); while (s->fileFixVersion() < s->currentFixVersion()) { - qDebug("%s", (TQString("testing fileFixVersion %1 < %2").arg(s->fileFixVersion()).arg(s->currentFixVersion())).data()); + tqDebug("%s", (TQString("testing fileFixVersion %1 < %2").arg(s->fileFixVersion()).arg(s->currentFixVersion())).data()); switch (s->fileFixVersion()) { case 0: fixFile_0(); @@ -941,7 +941,7 @@ bool KMyMoneyView::initializeStorage() return false; } } else { - qDebug("Skipping automatic transaction fix!"); + tqDebug("Skipping automatic transaction fix!"); } MyMoneyFile::instance()->blockSignals(blocked); @@ -1308,7 +1308,7 @@ void KMyMoneyView::selectBaseCurrency(void) file->modifyAccount(*it); ft.commit(); } catch(MyMoneyException *e) { - qDebug("Unable to setup base currency in account %s (%s): %s", (*it).name().latin1(), (*it).id().data(), e->what().latin1()); + tqDebug("Unable to setup base currency in account %s (%s): %s", (*it).name().latin1(), (*it).id().data(), e->what().latin1()); delete e; } } @@ -1336,7 +1336,7 @@ void KMyMoneyView::loadDefaultCurrency(const MyMoneySecurity& currency, const bo } ft.commit(); } catch (MyMoneyException* e) { - qDebug("Error %s loading default currency", e->what().data()); + tqDebug("Error %s loading default currency", e->what().data()); delete e; } } @@ -1536,7 +1536,7 @@ void KMyMoneyView::loadAncientCurrency(const TQString& id, const TQString& name, } ft.commit(); } catch(MyMoneyException *e) { - qDebug("Error loading currency: %s", e->what().data()); + tqDebug("Error loading currency: %s", e->what().data()); delete e; } } @@ -1683,7 +1683,7 @@ void KMyMoneyView::fixFile_2(void) } } } - qDebug("%d transactions fixed in fixFile_2", count); + tqDebug("%d transactions fixed in fixFile_2", count); } void KMyMoneyView::fixFile_1(void) @@ -1866,7 +1866,7 @@ void KMyMoneyView::fixSchedule_0(MyMoneySchedule sched) MyMoneyFile::instance()->modifySchedule(sched); } } catch(MyMoneyException *e) { - qWarning("Unable to update broken schedule: %s", e->what().latin1()); + tqWarning("Unable to update broken schedule: %s", e->what().latin1()); delete e; } } @@ -2082,7 +2082,7 @@ void KMyMoneyView::fixTransactions_0(void) file->modifyTransaction(*it_t); } splits = (*it_t).splits(); // update local copy - qDebug("Fixed credit card assignment in %s", (*it_t).id().data()); + tqDebug("Fixed credit card assignment in %s", (*it_t).id().data()); } #endif @@ -2104,7 +2104,7 @@ void KMyMoneyView::fixTransactions_0(void) (*it_s).setAction(MyMoneySplit::ActionInterest); (*it_t).modifySplit(*it_s); file->modifyTransaction(*it_t); - qDebug("Fixed interest action in %s", (*it_t).id().data()); + tqDebug("Fixed interest action in %s", (*it_t).id().data()); } // if it does not reference an interest account, it must not be // of type ActionInterest @@ -2114,7 +2114,7 @@ void KMyMoneyView::fixTransactions_0(void) (*it_s).setAction(defaultAction); (*it_t).modifySplit(*it_s); file->modifyTransaction(*it_t); - qDebug("Fixed interest action in %s", (*it_t).id().data()); + tqDebug("Fixed interest action in %s", (*it_t).id().data()); } } @@ -2134,14 +2134,14 @@ void KMyMoneyView::fixTransactions_0(void) try { int fract = splitAccount.fraction(); if((*it_s).shares() != (*it_s).shares().convert(fract)) { - qDebug("adjusting fraction in %s,%s", (*it_t).id().data(), (*it_s).id().data()); + tqDebug("adjusting fraction in %s,%s", (*it_t).id().data(), (*it_s).id().data()); (*it_s).setShares((*it_s).shares().convert(fract)); (*it_s).setValue((*it_s).value().convert(fract)); (*it_t).modifySplit(*it_s); file->modifyTransaction(*it_t); } } catch(MyMoneyException* e) { - qDebug("Missing security '%s', split not altered", splitAccount.currencyId().data()); + tqDebug("Missing security '%s', split not altered", splitAccount.currencyId().data()); delete e; } } @@ -2164,7 +2164,7 @@ void KMyMoneyView::fixTransactions_0(void) void KMyMoneyView::fixDuplicateAccounts_0(MyMoneyTransaction& t) { - qDebug("Duplicate account in transaction %s", t.id().data()); + tqDebug("Duplicate account in transaction %s", t.id().data()); } void KMyMoneyView::slotPrintView(void) diff --git a/kmymoney2/views/kpayeesview.cpp b/kmymoney2/views/kpayeesview.cpp index 11326da..4e21042 100644 --- a/kmymoney2/views/kpayeesview.cpp +++ b/kmymoney2/views/kpayeesview.cpp @@ -637,7 +637,7 @@ void KPayeesView::slotSelectPayee(void) showTransactions(); } catch(MyMoneyException *e) { - qDebug("exception during display of payee: %s at %s:%ld", e->what().latin1(), e->file().latin1(), e->line()); + tqDebug("exception during display of payee: %s at %s:%ld", e->what().latin1(), e->file().latin1(), e->line()); m_transactionView->clear(); m_payee = MyMoneyPayee(); delete e; @@ -1083,7 +1083,7 @@ void KPayeesView::slotSelectPayeeAndTransaction(const TQString& payeeId, const T } } catch(MyMoneyException *e) { - qWarning("Unexpected exception in KPayeesView::slotSelectPayeeAndTransaction"); + tqWarning("Unexpected exception in KPayeesView::slotSelectPayeeAndTransaction"); delete e; } } diff --git a/kmymoney2/views/kreportsview.cpp b/kmymoney2/views/kreportsview.cpp index 8b43f5f..8046efa 100755 --- a/kmymoney2/views/kreportsview.cpp +++ b/kmymoney2/views/kreportsview.cpp @@ -551,10 +551,10 @@ void KReportsView::slotOpenURL(const KURL &url, const KParts::URLArgs& /* args * else if ( command == "delete" ) slotDelete(); else - qDebug("Unknown command '%s' in KReportsView::slotOpenURL()", static_cast(command)); + tqDebug("Unknown command '%s' in KReportsView::slotOpenURL()", static_cast(command)); } else { - qDebug("Unknown view '%s' in KReportsView::slotOpenURL()", view.latin1()); + tqDebug("Unknown view '%s' in KReportsView::slotOpenURL()", view.latin1()); } } @@ -673,7 +673,7 @@ void KReportsView::slotDuplicate(void) new KReportListItem( m_reportListView, dupe ); addReportTab(dupe); } catch(MyMoneyException* e) { - qDebug("Cannot add report"); + tqDebug("Cannot add report"); delete e; } } diff --git a/kmymoney2/views/kscheduledlistitem.cpp b/kmymoney2/views/kscheduledlistitem.cpp index b055b25..849b0c8 100644 --- a/kmymoney2/views/kscheduledlistitem.cpp +++ b/kmymoney2/views/kscheduledlistitem.cpp @@ -88,7 +88,7 @@ KScheduledListItem::KScheduledListItem(KScheduledListItem *parent, const MyMoney } } if(it_s == transaction.splits().end()) { - qFatal("Split for payment account not found in %s:%d.", __FILE__, __LINE__); + tqFatal("Split for payment account not found in %s:%d.", __FILE__, __LINE__); } break; diff --git a/kmymoney2/views/kscheduledview.cpp b/kmymoney2/views/kscheduledview.cpp index 07c8d57..dcf8052 100644 --- a/kmymoney2/views/kscheduledview.cpp +++ b/kmymoney2/views/kscheduledview.cpp @@ -484,7 +484,7 @@ void KScheduledView::slotSetSelectedItem(TQListViewItem* item) emit scheduleSelected(schedule); m_selectedSchedule = schedItem->scheduleId(); } catch(MyMoneyException* e) { - qDebug("KScheduledView::slotSetSelectedItem: %s", e->what().data()); + tqDebug("KScheduledView::slotSetSelectedItem: %s", e->what().data()); delete e; } } diff --git a/kmymoney2/widgets/kaccounttemplateselector.cpp b/kmymoney2/widgets/kaccounttemplateselector.cpp index 9b26503..430c2dc 100644 --- a/kmymoney2/widgets/kaccounttemplateselector.cpp +++ b/kmymoney2/widgets/kaccounttemplateselector.cpp @@ -184,7 +184,7 @@ void KAccountTemplateSelector::slotLoadTemplateList(void) TQStringList::iterator it; for(it = d->dirlist.begin(); it != d->dirlist.end(); ++it) { TQDir dir(*it); - // qDebug("Reading dir '%s' with %d entries", (*it).data(), dir.count()); + // tqDebug("Reading dir '%s' with %d entries", (*it).data(), dir.count()); dirs = dir.entryList("*", TQDir::Dirs); TQStringList::iterator it_d; for(it_d= dirs.begin(); it_d != dirs.end(); ++it_d) { @@ -214,7 +214,7 @@ void KAccountTemplateSelector::slotLoadTemplateList(void) TQString country = KGlobal::locale()->twoAlphaToCountryName((*it_d).upper()); d->countries[country] = *it_d; } else { - qDebug("'%s/%s' not scanned", (*it).data(), (*it_d).data()); + tqDebug("'%s/%s' not scanned", (*it).data(), (*it_d).data()); } } } diff --git a/kmymoney2/widgets/kguiutils.cpp b/kmymoney2/widgets/kguiutils.cpp index e8e8d3f..24bf3f6 100644 --- a/kmymoney2/widgets/kguiutils.cpp +++ b/kmymoney2/widgets/kguiutils.cpp @@ -82,7 +82,7 @@ void kMandatoryFieldGroup::add(TQWidget *widget) this, TQT_SLOT(changed())); else { - qWarning("MandatoryFieldGroup: unsupported class %s", + tqWarning("MandatoryFieldGroup: unsupported class %s", widget->className()); return; } diff --git a/kmymoney2/widgets/kmymoneyaccountcombo.cpp b/kmymoney2/widgets/kmymoneyaccountcombo.cpp index e37311c..3278db5 100644 --- a/kmymoney2/widgets/kmymoneyaccountcombo.cpp +++ b/kmymoney2/widgets/kmymoneyaccountcombo.cpp @@ -86,7 +86,7 @@ void KMyMoneyAccountCombo::setSelected(const TQString& id) MyMoneyAccount acc = MyMoneyFile::instance()->account(id); setSelected(acc); } catch(MyMoneyException *e) { - qDebug("Account '%s' not found in %s(%d)", id.data(), __FILE__, __LINE__); + tqDebug("Account '%s' not found in %s(%d)", id.data(), __FILE__, __LINE__); delete e; } } else { diff --git a/kmymoney2/widgets/kmymoneydateinput.cpp b/kmymoney2/widgets/kmymoneydateinput.cpp index 9203a76..9ae13ec 100644 --- a/kmymoney2/widgets/kmymoneydateinput.cpp +++ b/kmymoney2/widgets/kmymoneydateinput.cpp @@ -230,7 +230,7 @@ void kMyMoneyDateInput::resizeEvent(TQResizeEvent* ev) m_dateButton->setMaximumWidth(ev->size().height()); dateEdit->setMaximumHeight(ev->size().height()); - // qDebug("Received resize-event %d,%d", ev->size().width(), ev->size().height()); + // tqDebug("Received resize-event %d,%d", ev->size().width(), ev->size().height()); } diff --git a/kmymoney2/widgets/kmymoneypriceview.cpp b/kmymoney2/widgets/kmymoneypriceview.cpp index 091e255..851ca02 100644 --- a/kmymoney2/widgets/kmymoneypriceview.cpp +++ b/kmymoney2/widgets/kmymoneypriceview.cpp @@ -312,7 +312,7 @@ void KMyMoneyPriceView::slotDeletePrice(void) MyMoneyFile::instance()->removePrice(item->price()); ft.commit(); } catch(MyMoneyException *e) { - qDebug("Cannot delete price"); + tqDebug("Cannot delete price"); delete e; } } diff --git a/kmymoney2/widgets/register.cpp b/kmymoney2/widgets/register.cpp index ef1c956..5a0148c 100644 --- a/kmymoney2/widgets/register.cpp +++ b/kmymoney2/widgets/register.cpp @@ -204,7 +204,7 @@ bool ItemPtrVector::item_cmp(RegisterItem* i1, RegisterItem* i2) break; default: - qDebug("Invalid sort key %d", *it); + tqDebug("Invalid sort key %d", *it); break; } @@ -449,7 +449,7 @@ TypeGroupMarker::TypeGroupMarker(Register* parent, CashFlowDirection dir, MyMone } break; default: - qDebug("Unknown CashFlowDirection %d for TypeGroupMarker constructor", dir); + tqDebug("Unknown CashFlowDirection %d for TypeGroupMarker constructor", dir); break; } } @@ -511,7 +511,7 @@ void RegisterToolTip::maybeTip(const TQPoint& pos) return; TQPoint cpos = m_register->viewportToContents(pos); - // qDebug("RegisterToolTip::mayBeTip(%d,%d)", cpos.x(), cpos.y()); + // tqDebug("RegisterToolTip::mayBeTip(%d,%d)", cpos.x(), cpos.y()); int row = m_register->rowAt(cpos.y()); int col = m_register->columnAt(cpos.x()); RegisterItem* item = m_register->itemAtRow(row); @@ -521,8 +521,8 @@ void RegisterToolTip::maybeTip(const TQPoint& pos) TQPoint relPos(cpos.x() - m_register->columnPos(0), cpos.y() - m_register->rowPos(item->startRow())); row = row - item->startRow(); - // qDebug("row = %d, col = %d", row, col); - // qDebug("relpos = %d,%d", relPos.x(), relPos.y()); + // tqDebug("row = %d, col = %d", row, col); + // tqDebug("relpos = %d,%d", relPos.x(), relPos.y()); TQString msg; TQRect rect; if(!item->maybeTip(cpos, row, col, rect, msg)) @@ -625,15 +625,15 @@ void Register::dragMoveEvent(TQDragMoveEvent* event) void Register::dropEvent(TQDropEvent* event) { - qDebug("Register::dropEvent"); + tqDebug("Register::dropEvent"); if ( KURLDrag::canDecode(event) ) { event->ignore(); Transaction* t = dropTransaction(event->pos()); if(t && !t->isScheduled()) { - qDebug("Drop was ok"); + tqDebug("Drop was ok"); KURL::List urls; KURLDrag::decode(event, urls); - qDebug("List is '%s'", urls.toStringList().join(";").data()); + tqDebug("List is '%s'", urls.toStringList().join(";").data()); event->accept(); } } @@ -667,7 +667,7 @@ void Register::slotAutoColumnSizing(int section) } size += TQString("%1").arg((columnWidth(i) * 100) / w); } - qDebug("size = %s", size.data()); + tqDebug("size = %s", size.data()); m_account.setValue("kmm-ledger-column-width", size); } #endif @@ -1180,7 +1180,7 @@ void Register::updateRegister(bool forceUpdateRowHeight) int Register::rowHeightHint(void) const { if(!m_rowHeightHint) { - qDebug("Register::rowHeightHint(): m_rowHeightHint is zero!!"); + tqDebug("Register::rowHeightHint(): m_rowHeightHint is zero!!"); } return m_rowHeightHint; } @@ -1189,11 +1189,11 @@ void Register::paintCell(TQPainter* painter, int row, int col, const TQRect& r, { // determine the item that we need to paint in the row and call it's paintRegisterCell() method if((row < 0) || ((unsigned)row > m_itemIndex.size())) { - qDebug("Register::paintCell: row %d out of bounds %d", row, (int)m_itemIndex.size()); + tqDebug("Register::paintCell: row %d out of bounds %d", row, (int)m_itemIndex.size()); return; } - // qDebug("paintCell(%d,%d)", row, col); + // tqDebug("paintCell(%d,%d)", row, col); RegisterItem* const item = m_itemIndex[row]; item->paintRegisterCell(painter, row - item->startRow(), col, r, selected, cg); } @@ -1415,7 +1415,7 @@ void Register::repaintItems(RegisterItem* first, RegisterItem* last) if(last == 0) last = first; - // qDebug("repaintItems from row %d to row %d", first->startRow(), last->startRow()+last->numRowsRegister()-1); + // tqDebug("repaintItems from row %d to row %d", first->startRow(), last->startRow()+last->numRowsRegister()-1); // the following code is based on code I found in // TQTable::cellGeometry() and TQTable::updateCell() (ipwizard) @@ -1877,7 +1877,7 @@ TQWidget* Register::cellWidget(int row, int col) const if(row > numRows() - 1 || col > numCols() - 1) { if(numRows() && numCols()) - qWarning("Register::cellWidget(%d,%d) out of bounds (%d,%d)", row, col, numRows(), numCols()); + tqWarning("Register::cellWidget(%d,%d) out of bounds (%d,%d)", row, col, numRows(), numCols()); return 0; } @@ -1897,7 +1897,7 @@ TQWidget* Register::cellWidget(int row, int col) const void Register::insertWidget(int row, int col, TQWidget* w) { if(row < 0 || col < 0 || row > numRows() - 1 || col > numCols() - 1) { - qWarning("Register::insertWidget(%d,%d) out of bounds", row, col); + tqWarning("Register::insertWidget(%d,%d) out of bounds", row, col); return; } @@ -1908,7 +1908,7 @@ void Register::insertWidget(int row, int col, TQWidget* w) void Register::clearCellWidget(int row, int col) { if(row < 0 || col < 0 || row > numRows() - 1 || col > numCols() - 1) { - qWarning("Register::clearCellWidget(%d,%d) out of bounds", row, col); + tqWarning("Register::clearCellWidget(%d,%d) out of bounds", row, col); return; } @@ -2243,7 +2243,7 @@ Transaction* Register::transactionFactory(Register *parent, const MyMoneyTransac case MyMoneyAccount::MoneyMarket: case MyMoneyAccount::Stock: default: - qDebug("Register::transactionFactory: invalid accountTypeE %d", parent->account().accountType()); + tqDebug("Register::transactionFactory: invalid accountTypeE %d", parent->account().accountType()); break; } return t; diff --git a/kmymoney2/widgets/transaction.cpp b/kmymoney2/widgets/transaction.cpp index b4ac7cd..00d0f56 100644 --- a/kmymoney2/widgets/transaction.cpp +++ b/kmymoney2/widgets/transaction.cpp @@ -615,7 +615,7 @@ void Transaction::arrangeWidget(TQTable* tbl, int row, int col, TQWidget* w) con // events will be directed to the edit widget w->removeEventFilter(tbl); } else - qDebug("No widget for %d,%d", row, col); + tqDebug("No widget for %d,%d", row, col); } bool Transaction::haveNumberField(void) const @@ -658,10 +658,10 @@ bool Transaction::maybeTip(const TQPoint& cpos, int row, int col, TQRect& r, TQS // check for detail column in row 0 of the transaction for a possible exclamation mark r = m_parent->cellGeometry(m_startRow + 0, col); - // qDebug("r is %d,%d,%d,%d", r.x(), r.y(), r.width(), r.height()); + // tqDebug("r is %d,%d,%d,%d", r.x(), r.y(), r.width(), r.height()); r.setBottomLeft(TQPoint(r.x() + (r.width() - h), r.y() + h)); - // qDebug("r is %d,%d,%d,%d", r.x(), r.y(), r.width(), r.height()); - // qDebug("p is in r = %d", r.contains(cpos)); + // tqDebug("r is %d,%d,%d,%d", r.x(), r.y(), r.width(), r.height()); + // tqDebug("p is in r = %d", r.contains(cpos)); if(r.contains(cpos) && m_erronous) { if(m_transaction.splits().count() < 2) { msg = TQString("%1").arg(i18n("Transaction is missing a category assignment.")); diff --git a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp index 9d9b109..6d3bcdc 100644 --- a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp +++ b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp @@ -1039,7 +1039,7 @@ void LoanDetailsPage::slotCalculate(void) if((moneyBorrowed && val < 0 && fabsl(val) > fabsl(calc.payment())) || (moneyLend && val > 0 && fabs(val) > fabs(calc.payment()))) { // case a) - qDebug("Future Value is %Lf", val); + tqDebug("Future Value is %Lf", val); throw new MYMONEYEXCEPTION("incorrect fincancial calculation"); } else if((moneyBorrowed && val < 0 && fabsl(val) <= fabsl(calc.payment())) @@ -1100,7 +1100,7 @@ int LoanDetailsPage::term(void) const break; default: - qDebug("Unknown term unit %d in LoanDetailsPage::term(). Using payments.", m_termUnit->currentItem()); + tqDebug("Unknown term unit %d in LoanDetailsPage::term(). Using payments.", m_termUnit->currentItem()); // tricky fall through here case MyMoneySchedule::OCCUR_ONCE: // payments diff --git a/libkdchart/KDChart.cpp b/libkdchart/KDChart.cpp index 4d8fd0c..ab83da2 100644 --- a/libkdchart/KDChart.cpp +++ b/libkdchart/KDChart.cpp @@ -98,7 +98,7 @@ bool hasCartesianAxes( KDChartParams::ChartType chartType ) case KDChartParams::Polar: return false; // Polar axes are NO cartesian axes! case KDChartParams::BoxWhisker: return true; default: - qDebug("\n\n\n\nKDCHART ERROR: Type missing in KDChart.cpp hasCartesianAxes()\n" + tqDebug("\n\n\n\nKDCHART ERROR: Type missing in KDChart.cpp hasCartesianAxes()\n" "=============================================================\n" "=============================================================\n\n\n\n"); } @@ -129,7 +129,7 @@ bool KDChart::painterToDrawRect( TQPainter* painter, TQRect& drawRect ) return true; }else{ drawRect = TQRect( TQPoint(0,0), TQSize(0,0) ); - qDebug("ERROR: KDChartPainter::painterToDrawRect() was called with *no* painter."); + tqDebug("ERROR: KDChartPainter::painterToDrawRect() was called with *no* painter."); return false; } } @@ -158,13 +158,13 @@ bool KDChart::setupGeometry( TQPainter* painter, KDChartTableDataBase* data, const TQRect& drawRect ) { -//qDebug("INVOKING: KDChart::setupGeometry()"); +//tqDebug("INVOKING: KDChart::setupGeometry()"); if( !params ){ - qDebug("ERROR: setupGeometry::paint() was called with *no* params."); + tqDebug("ERROR: setupGeometry::paint() was called with *no* params."); return false; } if( !data ){ - qDebug("ERROR: setupGeometry::paint() was called with *no* data."); + tqDebug("ERROR: setupGeometry::paint() was called with *no* data."); return false; } // don't crash due to memory problems when running on windows @@ -178,7 +178,7 @@ bool KDChart::setupGeometry( TQPainter* painter, static bool bFirstCleanUpInstall = true; if( bFirstCleanUpInstall ) { bFirstCleanUpInstall = false; - qAddPostRoutine( cleanupPainter ); + tqAddPostRoutine( cleanupPainter ); } // Check whether last call of this methode gave us the same params pointer. @@ -260,7 +260,7 @@ void KDChart::paint( TQPainter* painter, const TQRect* rect, bool mustCalculateGeometry ) { -//qDebug("KDChart::paint() mustCalculateGeometry: "+TQString(mustCalculateGeometry?"TRUE":"FALSE") ); +//tqDebug("KDChart::paint() mustCalculateGeometry: "+TQString(mustCalculateGeometry?"TRUE":"FALSE") ); #if defined KDAB_EVAL EvalDialog::checkEvalLicense( "KD Chart" ); #endif @@ -272,9 +272,9 @@ void KDChart::paint( TQPainter* painter, KDChartParams* params = paraParams; KDChartTableDataBase* data = paraData; if( !paraParams && !paraData ){ - qDebug("-----"); - qDebug("Note: KDChart::paint() was called without \"params\" and without \"data\"."); - qDebug("----- Showing a default bar chart."); + tqDebug("-----"); + tqDebug("Note: KDChart::paint() was called without \"params\" and without \"data\"."); + tqDebug("----- Showing a default bar chart."); params = new KDChartParams(); params->setDatasetGap(3 * params->valueBlockGap()); params->setPrintDataValues( false ); @@ -297,19 +297,19 @@ void KDChart::paint( TQPainter* painter, if( rect ) drawRect = *rect; else if( !painterToDrawRect( painter, drawRect ) ){ - qDebug("ERROR: KDChart::paint() could not calculate a drawing area."); + tqDebug("ERROR: KDChart::paint() could not calculate a drawing area."); bOk = false; } - //qDebug("xxx" ); + //tqDebug("xxx" ); if( (params || data) && !setupGeometry( painter, params, data, drawRect ) ){ - qDebug("ERROR: KDChart::paint() could not calculate the chart geometry."); + tqDebug("ERROR: KDChart::paint() could not calculate the chart geometry."); bOk = false; } }else{ drawRect = cpainter->outermostRect(); } - //qDebug("yyy" ); + //tqDebug("yyy" ); if( bOk ){ // Note: the following *must* paint the main-chart first @@ -320,7 +320,7 @@ void KDChart::paint( TQPainter* painter, bool paintFirst = true; bool paintLast = ! ( cpainter && cpainter2 ); if ( cpainter ) { // can be 0 if no exceptions are used - //qDebug("zzz" ); + //tqDebug("zzz" ); cpainter->paint( painter, data, paintFirst, paintLast, regions, &drawRect, false ); paintFirst = false; @@ -478,7 +478,7 @@ TQString KDChart::globals() globals += TQString::number( it2.data().blue() ); globals += TQString::fromLatin1( " );\n" ); } - //qDebug( "%s",globals.latin1() ); + //tqDebug( "%s",globals.latin1() ); return globals; } diff --git a/libkdchart/KDChartAxesPainter.cpp b/libkdchart/KDChartAxesPainter.cpp index ee9dc87..24f5b91 100644 --- a/libkdchart/KDChartAxesPainter.cpp +++ b/libkdchart/KDChartAxesPainter.cpp @@ -174,7 +174,7 @@ bool KDChartAxesPainter::calculateAllAxesLabelTextsAndCalcValues( { uint iAxis; double averageValueP1000 = TQMIN(areaWidthP1000, areaHeightP1000);//( areaWidthP1000 + areaHeightP1000 ) / 2.0; - //qDebug("KChart::KDChartAxesPainter::calculateAllAxesLabelTextsAndCalcValues() averageValueP1000: %f", averageValueP1000); + //tqDebug("KChart::KDChartAxesPainter::calculateAllAxesLabelTextsAndCalcValues() averageValueP1000: %f", averageValueP1000); // length of little delimiter-marks indicating axis scaling delimLen = 20.0 * averageValueP1000; // per mille of area @@ -286,8 +286,8 @@ bool KDChartAxesPainter::calculateAllAxesLabelTextsAndCalcValues( && cv2.bSteadyCalc && ( fabs(cv2.nDelta) != fabs(nDelta) || fabs(cv2.nDeltaPix) != fabs(nDeltaPix) ) ){ - //qDebug("\nrecalculating scale for axis %x", iAxis2); - //qDebug("cv2.nDelta %f cv2.nDeltaPix %f nDelta %f nDeltaPix %f\n", + //tqDebug("\nrecalculating scale for axis %x", iAxis2); + //tqDebug("cv2.nDelta %f cv2.nDeltaPix %f nDelta %f nDeltaPix %f\n", // cv2.nDelta,cv2.nDeltaPix,nDelta,nDeltaPix); if( (cv2.nDelta >= 0.0) == (nDelta >= 0.0) ) cv2.nDelta = nDelta; @@ -321,7 +321,7 @@ bool KDChartAxesPainter::calculateAllAxesLabelTextsAndCalcValues( || ( cv2.nDelta == cv.nDelta && cv2.nDeltaPix < cv.nDeltaPix ) ){ // adjust this axis - //qDebug("recalculating scale for this axis %x", iAxis); + //tqDebug("recalculating scale for this axis %x", iAxis); cv.nDelta = cv2.nDelta; cv.nDeltaPix = cv2.nDeltaPix; reCalculateLabelTexts( @@ -335,8 +335,8 @@ bool KDChartAxesPainter::calculateAllAxesLabelTextsAndCalcValues( cv.nSubDelimFactor = cv2.nSubDelimFactor; }else{ // adjust the other axis - //qDebug("\nrecalculating scale for other axis %x", isoRef); - //qDebug("cv2.nDelta %f cv2.nDeltaPix %f cv.nDelta %f cv.nDeltaPix %f", + //tqDebug("\nrecalculating scale for other axis %x", isoRef); + //tqDebug("cv2.nDelta %f cv2.nDeltaPix %f cv.nDelta %f cv.nDeltaPix %f", // cv2.nDelta,cv2.nDeltaPix,cv.nDelta,cv.nDeltaPix); cv2.nDelta = cv.nDelta; cv2.nDeltaPix = cv.nDeltaPix; @@ -380,7 +380,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, // length of little delimiter-marks indicating axis scaling double delimLen; -//qDebug("-------------------------------------------------------------------------------------"); +//tqDebug("-------------------------------------------------------------------------------------"); calculateAllAxesLabelTextsAndCalcValues( painter, data, areaWidthP1000, areaHeightP1000, delimLen ); @@ -539,7 +539,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, // calculate font size const double minTextHeight = para.axisLabelsFontMinSize(); - //qDebug("KChart::KDChartAxesPainter::paintAxes() cv.nTxtHeight: %f minTextHeight: %f", cv.nTxtHeight, minTextHeight); + //tqDebug("KChart::KDChartAxesPainter::paintAxes() cv.nTxtHeight: %f minTextHeight: %f", cv.nTxtHeight, minTextHeight); if ( minTextHeight > cv.nTxtHeight ) cv.nTxtHeight = minTextHeight; TQFont actFont( para.axisLabelsFont() ); @@ -557,8 +557,8 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, TQString commonDtHeader; if( cv.autoDtLabels ){ cv.textAlign = TQt::AlignCenter; - //qDebug(dtLow.toString("\nd.MM.yyyy - h:mm:ss" )); - //qDebug(dtHigh.toString( "d.MM.yyyy - h:mm:ss" )); + //tqDebug(dtLow.toString("\nd.MM.yyyy - h:mm:ss" )); + //tqDebug(dtHigh.toString( "d.MM.yyyy - h:mm:ss" )); const TQDate& dLow = cv.dtLow.date(); const TQTime& tLow = cv.dtLow.time(); const TQDate& dHigh = cv.dtHigh.date(); @@ -619,7 +619,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, else if( sameYear ) commonDtHeader = TQString::number( dLow.year() ); //if( !commonDtHeader.isEmpty() ) - // qDebug(commonDtHeader); + // tqDebug(commonDtHeader); }else{ // make sure all label texts fit into their space // by rotating and/or shrinking the texts @@ -710,15 +710,15 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, < params()->globalLeadingLeft()+1 ){ textsMatching = false; textsDontFitIntoArea = true; - //qDebug("too wide"); + //tqDebug("too wide"); } - //qDebug("nRotation: %i",nRotation); + //tqDebug("nRotation: %i",nRotation); TQRegion sectReg; if( nRotation ){ - //qDebug("test 1"); + //tqDebug("test 1"); sectReg = infosKDD.region.intersect( unitedRegions ); }else{ - //qDebug("test 2"); + //tqDebug("test 2"); TQRect rect( infosKDD.region.boundingRect() ); rect.addCoords(-2,-2,2,2); TQRegion biggerRegion( rect ); @@ -729,7 +729,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, else { textsMatching = false; textsOverlapping = true; - //qDebug("label regions are intersecting"); + //tqDebug("label regions are intersecting"); break; } } @@ -737,9 +737,9 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, /* if(!iAxis){ - qDebug("nTxtHeight: "+TQString::number(cv.nTxtHeight)+" nRotation: "+TQString::number(nRotation)+ + tqDebug("nTxtHeight: "+TQString::number(cv.nTxtHeight)+" nRotation: "+TQString::number(nRotation)+ " matching: "+TQString(textsMatching ? "TRUE":"FALSE")); - qDebug("nUsableAxisHeight: %f, unitedRegions.boundingRect().height(): %i ", + tqDebug("nUsableAxisHeight: %f, unitedRegions.boundingRect().height(): %i ", nUsableAxisHeight, unitedRegions.boundingRect().height()); } */ @@ -750,18 +750,18 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, } } else { if( nUsableAxisWidth < unitedRegions.boundingRect().width() ){ - //qDebug("textsMatching: %s",textsMatching ? "TRUE" : "FALSE"); + //tqDebug("textsMatching: %s",textsMatching ? "TRUE" : "FALSE"); textsMatching = false; textsDontFitIntoArea = true; - //qDebug("too wide"); + //tqDebug("too wide"); } - //else qDebug("not too wide"); + //else tqDebug("not too wide"); } /* if(textsMatching && !iAxis){ - qDebug("--------------------------"); - qDebug("nTxtHeight: "+TQString::number(cv.nTxtHeight)+" nRotation: "+TQString::number(nRotation)); - qDebug("matching"); + tqDebug("--------------------------"); + tqDebug("nTxtHeight: "+TQString::number(cv.nTxtHeight)+" nRotation: "+TQString::number(nRotation)); + tqDebug("matching"); } */ if( !textsMatching ) { @@ -771,7 +771,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, // we try to rotate the texts in 5 steps. // This is done for Abscissa axes only. if ( tryRotating ) { - //qDebug("try rotating"); + //tqDebug("try rotating"); // The following is designed for horizontal axes // since we currently don't support label rotating // on vertical axes. (khz, 2002/08/15) @@ -781,7 +781,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, nRotation = nInitialRotation; } rotatingDoesNotHelp = true; - //qDebug("rotating does not help (a)"); + //tqDebug("rotating does not help (a)"); } else{ if( nRotation ) { @@ -795,7 +795,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, else nRotation = 0; // reset rotation to ZERO rotatingDoesNotHelp = true; - //qDebug("rotating does not help (b)"); + //tqDebug("rotating does not help (b)"); } } else { if( nInitialRotation ) @@ -811,7 +811,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, // rotating them did not help or is forbidden // we try to reduce the font size. if ( tryShrinking && (minTextHeight < cv.nTxtHeight) ) { - //qDebug("try shrinking"); + //tqDebug("try shrinking"); cv.nTxtHeight -= 1.0; if ( minTextHeight > cv.nTxtHeight ) cv.nTxtHeight = minTextHeight; @@ -823,9 +823,9 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, if( tryLeavingOut && textsOverlapping && (nLeaveOut+1 < static_cast < int > ( nLabels ) ) ) { - //qDebug("try leaving out"); + //tqDebug("try leaving out"); ++iStepsLeaveOut; - //if(!iAxis)qDebug("iStepsLeaveOut: %i", iStepsLeaveOut); + //if(!iAxis)tqDebug("iStepsLeaveOut: %i", iStepsLeaveOut); nLeaveOut = iStepsLeaveOut*stepWidthLeaveOut - 1; if( tryShrinking ) @@ -836,13 +836,13 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, } if( tryShrinking ) { actFont.setPixelSize( static_cast < int > ( cv.nTxtHeight ) ); - //qDebug("axis: cv.nTxtHeight: %f", iAxis, cv.nTxtHeight); + //tqDebug("axis: cv.nTxtHeight: %f", iAxis, cv.nTxtHeight); painter->setFont( actFont ); fm = painter->fontMetrics(); } } } -//qDebug("nLeaveOut: %i",nLeaveOut); +//tqDebug("nLeaveOut: %i",nLeaveOut); } while( !textsMatching ); if( nRotation ){ @@ -871,9 +871,9 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, painter->setBrush(oldBrush); */ /*if(!iAxis){ - qDebug("=========================="); - qDebug("nTxtHeight: "+TQString::number(nTxtHeight)+" nRotation: "+TQString::number(nRotation)); - qDebug(textsMatching ? "matching":"not matching"); + tqDebug("=========================="); + tqDebug("nTxtHeight: "+TQString::number(nTxtHeight)+" nRotation: "+TQString::number(nRotation)); + tqDebug(textsMatching ? "matching":"not matching"); }*/ } @@ -986,7 +986,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, double nSubDelim = ( labelTexts->count() - 1 ) / cv.nSubDelimFactor; - //qDebug("subDelim: %f", + //tqDebug("subDelim: %f", modf( nSubDelim, &nSubDelim ); int logarithCnt = 1; @@ -1137,14 +1137,14 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, if( cv.autoDtLabels ) { /* - qDebug("\ndtLow: %i %i %i %i:%i:%i", + tqDebug("\ndtLow: %i %i %i %i:%i:%i", dtLow.date().year(), dtLow.date().month(), dtLow.date().day(), dtLow.time().hour(), dtLow.time().minute(), dtLow.time().second()); - qDebug("dtHigh: %i %i %i %i:%i:%i", + tqDebug("dtHigh: %i %i %i %i:%i:%i", dtHigh.date().year(), dtHigh.date().month(), dtHigh.date().day(), @@ -1253,10 +1253,10 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, ? cv.dtHigh : newDt ); /* - qDebug(" dt: %i %i %i %i:%i:%i", + tqDebug(" dt: %i %i %i %i:%i:%i", newDt.date().year(),newDt.date().month(),newDt.date().day(), newDt.time().hour(),newDt.time().minute(),newDt.time().second()); - qDebug("testDt: %i %i %i %i:%i:%i", + tqDebug("testDt: %i %i %i %i:%i:%i", testDt.date().year(),testDt.date().month(),testDt.date().day(), testDt.time().hour(),testDt.time().minute(),testDt.time().second()); */ @@ -1412,18 +1412,18 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, TQPoint( static_cast( p2X + pXD ), static_cast( p2Y + pYD ) ) ); /* - qDebug("line"); - qDebug("pXDelta / 2.0 : %f", pXDelta/2.0); - qDebug("p2X - pHourX : %f", p2X - pHourX); + tqDebug("line"); + tqDebug("pXDelta / 2.0 : %f", pXDelta/2.0); + tqDebug("p2X - pHourX : %f", p2X - pHourX); */ if( (pXDelta/2.0 < p2X - pHourX) || (pYDelta/2.0 < p2Y - pHourY) ){ /* - qDebug("pHourX %f", pHourX ); - qDebug(" +pXD %i", pXD ); - qDebug(" -orgXD %i", orgXD); - qDebug("pHourY %f", pHourY ); - qDebug(" +pYD %i", pYD ); - qDebug(" -orgYD %i", orgYD); + tqDebug("pHourX %f", pHourX ); + tqDebug(" +pXD %i", pXD ); + tqDebug(" -orgXD %i", orgXD); + tqDebug("pHourY %f", pHourY ); + tqDebug(" +pYD %i", pYD ); + tqDebug(" -orgYD %i", orgYD); */ TQPen oldPen( painter->pen() ); painter->setPen( TQPen( labelsColor ) ); @@ -1852,7 +1852,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, y -= mult * pYDelta; axisZeroLineStartX = x; axisZeroLineStartY = y; - //qDebug( "axisZeroLineStartX %f, axisZeroLineStartY %f", + //tqDebug( "axisZeroLineStartX %f, axisZeroLineStartY %f", // axisZeroLineStartX, axisZeroLineStartY ); } @@ -1913,7 +1913,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, + xFactor * _dataRect.width() ), static_cast( para.axisZeroLineStartY() + yFactor * _dataRect.height() ) ); - //qDebug("------"); + //tqDebug("------"); saveDrawLine( *painter, pZ0, pZ, @@ -1935,7 +1935,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, internal__KDChart__CalcValues& cv2 = calcVal[ KDChartAxisParams::AxisPosBottom ]; const KDChartAxisParams& pa1 = params()->axisParams( KDChartAxisParams::AxisPosLeft ); const KDChartAxisParams& pa2 = params()->axisParams( KDChartAxisParams::AxisPosBottom ); -qDebug("\n\nx1: %i y1: %i w1: %i\nx2: %i y2: %i w2: %i", +tqDebug("\n\nx1: %i y1: %i w1: %i\nx2: %i y2: %i w2: %i", cv1.orig.x(), cv1.orig.y(), pa1.axisTrueLineWidth(), cv2.orig.x(), cv2.orig.y(), pa2.axisTrueLineWidth() ); if( cv1.orig == cv2.orig ){ @@ -1953,7 +1953,7 @@ cv2.orig.x(), cv2.orig.y(), pa2.axisTrueLineWidth() ); TQPointArray a; a.putPoints( 0, 3, pA.x(),pA.y(), pB.x(),pB.y(), pC.x(),pC.y() ); painter->drawPolyline( a ); -qDebug("done\n" ); +tqDebug("done\n" ); } */ // 2. draw the axes using their normal color @@ -2048,7 +2048,7 @@ void KDChartAxesPainter::calculateLabelTexts( double trueDelta, double trueDeltaPix ) { -//qDebug("\nentering KDChartAxesPainter::calculateLabelTexts() : nTxtHeight: "+TQString::number(nTxtHeight)); +//tqDebug("\nentering KDChartAxesPainter::calculateLabelTexts() : nTxtHeight: "+TQString::number(nTxtHeight)); const KDChartAxisParams & para = params.axisParams( axisNumber ); // store whether the labels are to be drawn in reverted order @@ -2072,9 +2072,9 @@ void KDChartAxesPainter::calculateLabelTexts( : para.axisTrueAreaRect().topRight(); pYDelimDeltaFaktor = 1.0; pXDeltaFactor = bDecreasing ? -1.0 : 1.0; - //qDebug("\nsetting pXDeltaFactor for axis %x", axisNumber); - //qDebug(bDecreasing ? "bDecreasing = TRUE" : "bDecreasing = FALSE"); - //qDebug("pXDeltaFactor = %f\n",pXDeltaFactor); + //tqDebug("\nsetting pXDeltaFactor for axis %x", axisNumber); + //tqDebug(bDecreasing ? "bDecreasing = TRUE" : "bDecreasing = FALSE"); + //tqDebug("pXDeltaFactor = %f\n",pXDeltaFactor); } break; case KDChartAxisParams::AxisPosLeft: { @@ -2115,7 +2115,7 @@ void KDChartAxesPainter::calculateLabelTexts( break; default: { axisLength = 0; - qDebug( "IMPLEMENTATION ERROR: KDChartAxesPainter::paintAxes() unhandled enum value." ); + tqDebug( "IMPLEMENTATION ERROR: KDChartAxesPainter::paintAxes() unhandled enum value." ); } break; } @@ -2126,7 +2126,7 @@ void KDChartAxesPainter::calculateLabelTexts( dataset = KDCHART_ALL_DATASETS; dataset2 = KDCHART_ALL_DATASETS; chart = 0; - //qDebug("\nautomatic set values: chart: %u,\ndataset: %u, dataset2: %u", + //tqDebug("\nautomatic set values: chart: %u,\ndataset: %u, dataset2: %u", //chart, dataset, dataset2); } // which dataset(s) with mode DataEntry (or mode ExtraLinesAnchor, resp.) @@ -2166,20 +2166,20 @@ void KDChartAxesPainter::calculateLabelTexts( } else { // Should not happen - qDebug( "IMPLEMENTATION ERROR: findDatasets( DataEntry, ExtraLinesAnchor ) should *always* return true. (b)" ); + tqDebug( "IMPLEMENTATION ERROR: findDatasets( DataEntry, ExtraLinesAnchor ) should *always* return true. (b)" ); dataDataset = KDCHART_ALL_DATASETS; } - //qDebug("\naxisNumber: %x\nchart: %x\ndataset: %x, dataset2: %x,\ndataDataset: %x, dataDataset2: %x", + //tqDebug("\naxisNumber: %x\nchart: %x\ndataset: %x, dataset2: %x,\ndataDataset: %x, dataDataset2: %x", //axisNumber, chart, dataset, dataset2, dataDataset, dataDataset2); if ( para.axisLabelsFontUseRelSize() ){ nTxtHeight = para.axisLabelsFontRelSize() * averageValueP1000; -//qDebug("using rel. size in KDChartAxesPainter::calculateLabelTexts() : nTxtHeight: "+TQString::number(nTxtHeight)); +//tqDebug("using rel. size in KDChartAxesPainter::calculateLabelTexts() : nTxtHeight: "+TQString::number(nTxtHeight)); }else { TQFontInfo info( para.axisLabelsFont() ); nTxtHeight = info.pointSize(); -//qDebug("using FIXED size in KDChartAxesPainter::calculateLabelTexts() : nTxtHeight: "+TQString::number(nTxtHeight)); +//tqDebug("using FIXED size in KDChartAxesPainter::calculateLabelTexts() : nTxtHeight: "+TQString::number(nTxtHeight)); } const KDChartEnums::NumberNotation notation = para.axisLabelsNotation(); @@ -2248,7 +2248,7 @@ void KDChartAxesPainter::calculateLabelTexts( } default: // Should not happen - qDebug( "KDChart: Unknown label texts source" ); + tqDebug( "KDChart: Unknown label texts source" ); } // if necessary adjust text params *including* the steady value calc setting @@ -2280,8 +2280,8 @@ void KDChartAxesPainter::calculateLabelTexts( (KDChartParams::Line == params_chartType) && (KDChartAxisParams::AxisCalcLogarithmic == para.axisCalcMode()); - //qDebug(bSteadyCalc ? "bSteadyCalc":"NOT bSteadyCalc"); - //qDebug(isLogarithmic? "isLogarithmic":"NOT isLogarithmic"); + //tqDebug(bSteadyCalc ? "bSteadyCalc":"NOT bSteadyCalc"); + //tqDebug(isLogarithmic? "isLogarithmic":"NOT isLogarithmic"); // store whether this is a vertical axis or a horizontal axis const bool bVertAxis = (KDChartAxisParams::AxisPosLeft == basicPos) || @@ -2346,9 +2346,9 @@ void KDChartAxesPainter::calculateLabelTexts( double nVal = nLow; bDone = false; bool bShowVeryLastLabel = false; - //qDebug("\n nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta ); + //tqDebug("\n nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta ); while( bShowVeryLastLabel || (upwards ? (nVal <= nHigh) : (nVal >= nHigh)) ){ - //qDebug("nVal : %f", nVal ); + //tqDebug("nVal : %f", nVal ); labelTexts.append( applyLabelsFormat( nVal, divPow10, behindComma, @@ -2363,7 +2363,7 @@ void KDChartAxesPainter::calculateLabelTexts( padFill, blockAlign ) ); nVal += nDelta; - //qDebug("nVal-neu: %f", nVal ); + //tqDebug("nVal-neu: %f", nVal ); if( ! (upwards ? (nVal <= nHigh) : (nVal >= nHigh)) ){ // work around a rounding error: show the last label, even if not nVal == nHigh is not matching exactly if( bShowVeryLastLabel ) @@ -2396,13 +2396,13 @@ void KDChartAxesPainter::calculateLabelTexts( padFill, blockAlign ) ); bShowVeryLastLabel = (sValue == sHigh); - //qDebug("test: sHigh: "+sHigh+" sValue: "+sValue ); + //tqDebug("test: sHigh: "+sHigh+" sValue: "+sValue ); } } bDone = true; } ( ( KDChartAxisParams& ) para ).setTrueAxisLowHighDelta( nLow, nHigh, nDelta ); - //qDebug("\n[Z-0] nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta ); + //tqDebug("\n[Z-0] nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta ); } // look if a string list was specified else if ( para.axisLabelStringCount() ) { int nLabels = bSteadyCalc @@ -2542,7 +2542,7 @@ void KDChartAxesPainter::calculateLabelTexts( // find out if the associated dataset contains only strings // if yes, we will take these as label texts uint dset = ( dataset == KDCHART_ALL_DATASETS ) ? 0 : dataset; - //qDebug("\ndset: %u", dset); + //tqDebug("\ndset: %u", dset); bDone = false; TQVariant value; for ( uint col = 0; col < data.usedCols(); ++col ) { @@ -2638,7 +2638,7 @@ void KDChartAxesPainter::calculateLabelTexts( break; default: { // Should not happen - qDebug( "IMPLEMENTATION ERROR: Unknown params_chartType in calculateLabelTexts()" ); + tqDebug( "IMPLEMENTATION ERROR: Unknown params_chartType in calculateLabelTexts()" ); mode = Normal; } } @@ -2654,7 +2654,7 @@ void KDChartAxesPainter::calculateLabelTexts( nDelta = fabs( trueDelta ); pDelimDelta = trueDeltaPix; nLow = TQMIN( para.trueAxisLow(), para.trueAxisHigh() ); - //qDebug("\nsearching: para.trueAxisLow() %f para.trueAxisHigh() %f",para.trueAxisLow(),para.trueAxisHigh()); + //tqDebug("\nsearching: para.trueAxisLow() %f para.trueAxisHigh() %f",para.trueAxisLow(),para.trueAxisHigh()); double orgLow( nLow ); modf( nLow / nDelta, &nLow ); nLow *= nDelta; @@ -2709,7 +2709,7 @@ void KDChartAxesPainter::calculateLabelTexts( nSubDelimFactor = 0.25; bOrdFactorsOk = true; }else{ - //qDebug("\ngo: nLow: %f nHigh: %f", nLow, nHigh ); + //tqDebug("\ngo: nLow: %f nHigh: %f", nLow, nHigh ); // get the raw start value const bool bStackedMode = (mode == Stacked); if( bAutoCalcStart ){ @@ -2719,7 +2719,7 @@ void KDChartAxesPainter::calculateLabelTexts( ? TQMIN( data.minColSum(), 0.0 ) : data.minValue( coordinate, isLogarithmic ); - //qDebug("\n1: nLow: %f", nLow ); + //tqDebug("\n1: nLow: %f", nLow ); }else{ dtLow = data.minDtValue( coordinate ); @@ -2768,7 +2768,7 @@ void KDChartAxesPainter::calculateLabelTexts( dtHigh = data.maxDtInRows( dataDataset,dataDataset2, coordinate ); } - //qDebug("\nbAutoCalcEnd:\n nLow: %f\n nHigh: %f", nLow, nHigh ); + //tqDebug("\nbAutoCalcEnd:\n nLow: %f\n nHigh: %f", nLow, nHigh ); }else{ if( bIsDouble ){ if( TQVariant::Double == para.axisValueEnd().type() ) @@ -2781,20 +2781,20 @@ void KDChartAxesPainter::calculateLabelTexts( } - //qDebug("\nnew: nLow: %f nHigh: %f", nLow, nHigh ); + //tqDebug("\nnew: nLow: %f nHigh: %f", nLow, nHigh ); if( bIsDouble ) { if( DBL_MAX == nLow || ( ( 0.0 == nHigh || 0 == nHigh ) && ( 0.0 == nLow || 0 == nLow ) ) ) { - // qDebug("NO values or all values have ZERO value, showing 0.0 - 10.0 span"); + // tqDebug("NO values or all values have ZERO value, showing 0.0 - 10.0 span"); nLow = 0.0; nHigh = 10.0; nDist = 10.0; nDelta = 1.0; nSubDelimFactor = 0.5; bOrdFactorsOk = true; - //qDebug("nLow: %f, nHigh: %f", nLow, nHigh); + //tqDebug("nLow: %f, nHigh: %f", nLow, nHigh); }else if( nLow == nHigh ){ // if both values are equal, but NOT Zero // -> move the appropriate one to Zero @@ -2802,7 +2802,7 @@ void KDChartAxesPainter::calculateLabelTexts( nHigh = 0.0; else nLow = 0.0; - //qDebug("nLow: %f, nHigh: %f", nLow, nHigh); + //tqDebug("nLow: %f, nHigh: %f", nLow, nHigh); }else if( nHigh < nLow ){ // make sure nLow is <= nHigh double nTmp = nLow; @@ -2881,7 +2881,7 @@ void KDChartAxesPainter::calculateLabelTexts( bool gotoEndOfMonth = false; switch( dtDeltaScale ) { case KDChartAxisParams::ValueScaleSecond: - //qDebug("\nKDChartAxisParams::ValueScaleSecond"); + //tqDebug("\nKDChartAxisParams::ValueScaleSecond"); if( 5.0 < aDist ){ secondLowD = secondLow % 5; if( secondHigh % 5 ) @@ -2889,19 +2889,19 @@ void KDChartAxesPainter::calculateLabelTexts( } break; case KDChartAxisParams::ValueScaleMinute: - //qDebug("\nKDChartAxisParams::ValueScaleMinute"); + //tqDebug("\nKDChartAxisParams::ValueScaleMinute"); secondLowD = secondLow; secondHighD = 59-secondHigh; break; case KDChartAxisParams::ValueScaleHour: - //qDebug("\nKDChartAxisParams::ValueScaleHour"); + //tqDebug("\nKDChartAxisParams::ValueScaleHour"); minuteLowD = minuteLow; secondLowD = secondLow; minuteHighD = 59-minuteHigh; secondHighD = 59-secondHigh; break; case KDChartAxisParams::ValueScaleDay: - //qDebug("\nKDChartAxisParams::ValueScaleDay"); + //tqDebug("\nKDChartAxisParams::ValueScaleDay"); hourLowD = hourLow; minuteLowD = minuteLow; secondLowD = secondLow; @@ -2910,7 +2910,7 @@ void KDChartAxesPainter::calculateLabelTexts( secondHighD = 59-secondHigh; break; case KDChartAxisParams::ValueScaleWeek: - //qDebug("\nKDChartAxisParams::ValueScaleWeek"); + //tqDebug("\nKDChartAxisParams::ValueScaleWeek"); // khz: week scaling is disabled at the moment /* dayLowD = dowLow - 1; @@ -2922,7 +2922,7 @@ void KDChartAxesPainter::calculateLabelTexts( */ break; case KDChartAxisParams::ValueScaleMonth: - //qDebug("\nKDChartAxisParams::ValueScaleMonth"); + //tqDebug("\nKDChartAxisParams::ValueScaleMonth"); if( 1 < dayLow ) dayLowD = dayLow - 1; hourLowD = hourLow; @@ -2931,7 +2931,7 @@ void KDChartAxesPainter::calculateLabelTexts( gotoEndOfMonth = true; break; case KDChartAxisParams::ValueScaleQuarter: - //qDebug("\nKDChartAxisParams::ValueScaleQuarter"); + //tqDebug("\nKDChartAxisParams::ValueScaleQuarter"); monthLowD = ( monthLow - 1 ) % 3; dayLowD = dayLow; hourLowD = hourLow; @@ -2942,7 +2942,7 @@ void KDChartAxesPainter::calculateLabelTexts( gotoEndOfMonth = true; break; case KDChartAxisParams::ValueScaleYear: - //qDebug("\nKDChartAxisParams::ValueScaleYear"); + //tqDebug("\nKDChartAxisParams::ValueScaleYear"); monthLowD = monthLow; dayLowD = dayLow; hourLowD = hourLow; @@ -2995,7 +2995,7 @@ void KDChartAxesPainter::calculateLabelTexts( // that may to contain NO data entries) int maxEmpty = para.axisMaxEmptyInnerSpan(); if( bAutoCalcStart ) { - //qDebug("\nbAutoCalcStart:\n nLow: %f\n nHigh: %f", nLow, nHigh ); + //tqDebug("\nbAutoCalcStart:\n nLow: %f\n nHigh: %f", nLow, nHigh ); if( 0.0 < nLow ) { if( maxEmpty == KDCHART_AXIS_IGNORE_EMPTY_INNER_SPAN || maxEmpty > ( nLow / nHigh * 100.0 ) ) @@ -3006,10 +3006,10 @@ void KDChartAxesPainter::calculateLabelTexts( else if( nDist / 100.0 < fabs( nLow ) ) nLow -= nDist / 100.0; // shift lowest value nDist = nHigh - nLow; - //qDebug("* nLow: %f\n nHigh: %f", nLow, nHigh ); + //tqDebug("* nLow: %f\n nHigh: %f", nLow, nHigh ); } if( bAutoCalcEnd ) { - //qDebug("\nbAutoCalcEnd:\n nLow: %f\n nHigh: %f", nLow, nHigh ); + //tqDebug("\nbAutoCalcEnd:\n nLow: %f\n nHigh: %f", nLow, nHigh ); if( 0.0 > nHigh ) { if( maxEmpty == KDCHART_AXIS_IGNORE_EMPTY_INNER_SPAN || maxEmpty > ( nHigh / nLow * 100.0 ) ) @@ -3020,7 +3020,7 @@ void KDChartAxesPainter::calculateLabelTexts( else if( nDist / 100.0 < fabs( nHigh ) ) nHigh += nDist / 100.0; // shift highest value nDist = nHigh - nLow; - //qDebug("* nLow: %f\n nHigh: %f\n\n", nLow, nHigh ); + //tqDebug("* nLow: %f\n nHigh: %f\n\n", nLow, nHigh ); } } } @@ -3028,7 +3028,7 @@ void KDChartAxesPainter::calculateLabelTexts( if( isLogarithmic ){ if( bIsDouble ) { - //qDebug("\n[L--] nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta ); + //tqDebug("\n[L--] nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta ); if( 0.0 == TQABS( nLow ) ) nLow = -5; else{ @@ -3040,10 +3040,10 @@ void KDChartAxesPainter::calculateLabelTexts( } nHigh = log10( TQABS( nHigh ) ); - //qDebug("[L-0] nLow: %f, nHigh: %f", nLow, nHigh ); + //tqDebug("[L-0] nLow: %f, nHigh: %f", nLow, nHigh ); double intPart=0.0; // initialization necessary for Borland C++ double fractPart = modf( nLow, &intPart ); - //qDebug(" intPart: %f\nfractPart: %f", intPart, fractPart ); + //tqDebug(" intPart: %f\nfractPart: %f", intPart, fractPart ); if( 0.0 > nLow && 0.0 != fractPart ) nLow = intPart - 1.0; else @@ -3055,7 +3055,7 @@ void KDChartAxesPainter::calculateLabelTexts( nDist = nHigh - nLow; nDelta = 1.0; nSubDelimFactor = 0.1; - //qDebug("\n[L-1] nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta ); + //tqDebug("\n[L-1] nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta ); bOrdFactorsOk = true; } } @@ -3067,7 +3067,7 @@ void KDChartAxesPainter::calculateLabelTexts( double nDivisor; double nRound; nDist = nHigh - nLow; - //qDebug("* nLow: %f\n nHigh: %f nDist: %f\n\n", nLow, nHigh, nDist ); + //tqDebug("* nLow: %f\n nHigh: %f nDist: %f\n\n", nLow, nHigh, nDist ); // find out factors and adjust nLow and nHigh orgLow = nLow; orgHigh = nHigh; @@ -3077,17 +3077,17 @@ void KDChartAxesPainter::calculateLabelTexts( nLow, nHigh ); nLabels = params.roundVal( nDist / nDelta ); - //qDebug("\n0. nOrgHigh: %f\n nOrgLow: %f", + //tqDebug("\n0. nOrgHigh: %f\n nOrgLow: %f", // orgHigh, orgLow); - //qDebug("\n nDist: %f\n nHigh: %f\n nLow: %f", + //tqDebug("\n nDist: %f\n nHigh: %f\n nLow: %f", // nDist, nHigh, nLow); - //qDebug(" nDelta: %f", nDelta); - //qDebug(" nRound: %f", nRound); - //qDebug(" nLabels: %u", nLabels); + //tqDebug(" nDelta: %f", nDelta); + //tqDebug(" nRound: %f", nRound); + //tqDebug(" nLabels: %u", nLabels); if( para.axisSteadyValueCalc() ) { ++nLabels; - //qDebug("* nLabels: %u", nLabels ); + //tqDebug("* nLabels: %u", nLabels ); } } @@ -3100,13 +3100,13 @@ void KDChartAxesPainter::calculateLabelTexts( nDelta = para.axisValueDelta(); nLabels = params.roundVal( nDist / nDelta ); - //qDebug("\nI nLow: %f\n nHigh: %f\n nDelta: %f\n nLabels: %u", + //tqDebug("\nI nLow: %f\n nHigh: %f\n nDelta: %f\n nLabels: %u", // nLow, nHigh, nDelta, nLabels ); if( para.axisSteadyValueCalc() ) { ++nLabels; - //qDebug("* nLabels: %u", nLabels ); + //tqDebug("* nLabels: %u", nLabels ); } } @@ -3120,10 +3120,10 @@ void KDChartAxesPainter::calculateLabelTexts( //make sure to avoid inf double areaHeight = para.axisTrueAreaRect().height()>0?para.axisTrueAreaRect().height():1.0; double widthHeight = areaWidth / areaHeight; - //qDebug( "widthHeight %f, nDelta %f", widthHeight, nDelta); - //qDebug( "maxValue %f", data.maxValue()); - //qDebug( "maxColSum %f", data.maxColSum()); - //qDebug( "axisValueEnd() %f", para.axisValueEnd().toDouble()); + //tqDebug( "widthHeight %f, nDelta %f", widthHeight, nDelta); + //tqDebug( "maxValue %f", data.maxValue()); + //tqDebug( "maxColSum %f", data.maxColSum()); + //tqDebug( "axisValueEnd() %f", para.axisValueEnd().toDouble()); double nDivisor; double nRound; orgLow = nLow; @@ -3145,7 +3145,7 @@ void KDChartAxesPainter::calculateLabelTexts( } else { orgHigh = nHigh = para.axisValueEnd().toDouble(); } - //qDebug("\ncalc ordinate 0. nDist: %f\n nLow: %f\n nHigh: %f\n nDelta: %f\n nLabels: %u", nDist, nLow, nHigh, nDelta, nLabels ); + //tqDebug("\ncalc ordinate 0. nDist: %f\n nLow: %f\n nHigh: %f\n nDelta: %f\n nLabels: %u", nDist, nLow, nHigh, nDelta, nLabels ); bool bTryNext = false; uint minLabels = para.axisSteadyValueCalc() ? 3 : 2; // the following must be processed at least twice - to avoid rounding errors @@ -3155,7 +3155,7 @@ void KDChartAxesPainter::calculateLabelTexts( nLow = orgLow; nHigh = orgHigh; /* - qDebug("\n=============================================================================\ncalc ordinate 1. nDist: %f\n nLow: %f\n nHigh: %f\n nDelta: %f\n nLabels: %u", + tqDebug("\n=============================================================================\ncalc ordinate 1. nDist: %f\n nLow: %f\n nHigh: %f\n nDelta: %f\n nLabels: %u", nDist, nLow, nHigh, nDelta, nLabels ); */ calculateOrdinateFactors( para, isLogarithmic, @@ -3165,23 +3165,23 @@ void KDChartAxesPainter::calculateLabelTexts( bTryNext ); nLabels = params.roundVal( nDist / nDelta ); - //qDebug("\ncalc ordinate 2. nDist: %f\n+ nLow: %f\n nHigh: %f\n nDelta: %f\n nLabels: %u", + //tqDebug("\ncalc ordinate 2. nDist: %f\n+ nLow: %f\n nHigh: %f\n nDelta: %f\n nLabels: %u", //nDist, nLow, nHigh, nDelta, nLabels ); //TQString sDelta;sDelta.setNum( nDelta, 'f', 24 ); //TQString sLow; sLow.setNum( nLow, 'f', 24 ); - //qDebug("nLow: %f, sLow: %s, sDelta: %s", nLow, sLow.latin1(), sDelta.latin1()); + //tqDebug("nLow: %f, sLow: %s, sDelta: %s", nLow, sLow.latin1(), sDelta.latin1()); // special case: End values was set by the user, but no Detla values was set. if( !bAutoCalcEnd && orgHigh > nLow + nLabels * nDelta ) { ++nLabels; - //qDebug("\nnLabels: %u\n", nLabels ); + //tqDebug("\nnLabels: %u\n", nLabels ); } if( para.axisSteadyValueCalc() ) { ++nLabels; - //qDebug("\nnLabels: %u\n", nLabels ); + //tqDebug("\nnLabels: %u\n", nLabels ); } - //qDebug("calc ordinate n. nDist = nHigh - nLow: %f = %f - %f",nDist, nHigh, nLow); - //qDebug(" nRound: %f\n", nRound); + //tqDebug("calc ordinate n. nDist = nHigh - nLow: %f = %f - %f",nDist, nHigh, nLow); + //tqDebug(" nRound: %f\n", nRound); bTryNext = true; ++pass; }while ( ( pass < 2 ) @@ -3229,13 +3229,13 @@ void KDChartAxesPainter::calculateLabelTexts( } // save our true Low and High value - //qDebug(para.axisSteadyValueCalc()?"\ntrue " : "\nfalse"); - //qDebug("nVal: %f, nDelta: %f", nVal, nDelta ); + //tqDebug(para.axisSteadyValueCalc()?"\ntrue " : "\nfalse"); + //tqDebug("nVal: %f, nDelta: %f", nVal, nDelta ); if ( para.axisSteadyValueCalc() ) { nHigh = nVal - nDelta; } ( ( KDChartAxisParams& ) para ).setTrueAxisLowHighDelta( nLow, nHigh, nDelta ); - //qDebug("[Z] nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta ); + //tqDebug("[Z] nLow: %f, nHigh: %f, nDelta: %f", nLow, nHigh, nDelta ); } else { bool goDown = dtLow > dtHigh; @@ -3243,29 +3243,29 @@ void KDChartAxesPainter::calculateLabelTexts( TQDateTime dt( dtLow ); nLabels = 0; /* - qDebug("dtLow: "); - qDebug(dtLow.toString( Qt::ISODate )); - qDebug("dtHigh: "); - qDebug(dtHigh.toString( Qt::ISODate )); + tqDebug("dtLow: "); + tqDebug(dtLow.toString( Qt::ISODate )); + tqDebug("dtHigh: "); + tqDebug(dtHigh.toString( Qt::ISODate )); */ bool bDone=false; while( !bDone ) { /* - qDebug("dtLow: %i %i %i %i:%i:%i", + tqDebug("dtLow: %i %i %i %i:%i:%i", dtLow.date().year(), dtLow.date().month(), dtLow.date().day(), dtLow.time().hour(), dtLow.time().minute(), dtLow.time().second()); - qDebug("dtHigh: %i %i %i %i:%i:%i", + tqDebug("dtHigh: %i %i %i %i:%i:%i", dtHigh.date().year(), dtHigh.date().month(), dtHigh.date().day(), dtHigh.time().hour(), dtHigh.time().minute(), dtHigh.time().second()); - qDebug("dt: %i %i %i %i:%i:%i", + tqDebug("dt: %i %i %i %i:%i:%i", dt.date().year(), dt.date().month(), dt.date().day(), @@ -3336,15 +3336,15 @@ void KDChartAxesPainter::calculateLabelTexts( : (data.usedCols() ? data.usedCols() : 1); //double start( 1.0 ); double start( 1.0 + (bSteadyCalc ? 0.0 : static_cast < double >(data.colsScrolledBy())) ); -//qDebug("colsScrolledBy: %i", data.colsScrolledBy()); +//tqDebug("colsScrolledBy: %i", data.colsScrolledBy()); //if(bVertAxis) -//qDebug("vert nVal starting: %f",start); +//tqDebug("vert nVal starting: %f",start); //else -//qDebug("horz nVal starting: %f",start); +//tqDebug("horz nVal starting: %f",start); //if(bSteadyCalc) -//qDebug("bSteadyCalc"); +//tqDebug("bSteadyCalc"); //else -//qDebug("not bSteadyCalc"); +//tqDebug("not bSteadyCalc"); double delta( 1.0 ); double finis( start + delta * ( count - 1 ) ); const bool startIsDouble = TQVariant::Double == para.axisValueStart().type(); @@ -3362,7 +3362,7 @@ void KDChartAxesPainter::calculateLabelTexts( if( endIsDouble ){ finis = para.axisValueEnd().toDouble(); start = finis - delta * ( count - 1 ); -//qDebug("1 changing: start: %f",start); +//tqDebug("1 changing: start: %f",start); } else { // // @@ -3374,7 +3374,7 @@ void KDChartAxesPainter::calculateLabelTexts( }else{ if ( startIsDouble ) { start = para.axisValueStart().toDouble() + (bSteadyCalc ? 0.0 : static_cast < double >(data.colsScrolledBy())); -//qDebug("2 changing: start: %f",start); +//tqDebug("2 changing: start: %f",start); } else { // // @@ -3416,7 +3416,7 @@ void KDChartAxesPainter::calculateLabelTexts( : para.axisDigitsBehindComma(); double s = start; double f = finis; -//qDebug("label loop: s: %f f: %f",s,f); +//tqDebug("label loop: s: %f f: %f",s,f); bool up = ( 0.0 < delta ); // check the text widths of one large(?) entry // and hope all the entries will @@ -3506,17 +3506,17 @@ void KDChartAxesPainter::calculateLabelTexts( ( ( KDChartAxisParams& ) para ).setTrueAxisDeltaPixels( pDelimDelta ); - //qDebug("\nsetting: para.trueAxisLow() %f para.trueAxisHigh() %f",para.trueAxisLow(),para.trueAxisHigh()); - //qDebug("\npDelimDelta: %f", pDelimDelta ); + //tqDebug("\nsetting: para.trueAxisLow() %f para.trueAxisHigh() %f",para.trueAxisLow(),para.trueAxisHigh()); + //tqDebug("\npDelimDelta: %f", pDelimDelta ); /* - qDebug( "Found label texts:" ); + tqDebug( "Found label texts:" ); for ( TQStringList::Iterator it = labelTexts.begin(); it != labelTexts.end(); ++it ) - qDebug( ">>> %s", (*it).latin1() ); - qDebug( "\n" ); + tqDebug( ">>> %s", (*it).latin1() ); + tqDebug( "\n" ); */ -//qDebug("\nleaving KDChartAxesPainter::calculateLabelTexts() : nTxtHeight: "+TQString::number(nTxtHeight)); +//tqDebug("\nleaving KDChartAxesPainter::calculateLabelTexts() : nTxtHeight: "+TQString::number(nTxtHeight)); } @@ -3575,7 +3575,7 @@ void KDChartAxesPainter::calculateBasicTextFactors( double nTxtHeight, + delimLen * 1.33; textAlign = TQt::AlignHCenter | TQt::AlignTop; /* - qDebug("pTextsW %f wid %f nLabels %u", pTextsW, wid, nLabels ); + tqDebug("pTextsW %f wid %f nLabels %u", pTextsW, wid, nLabels ); */ } break; @@ -3626,7 +3626,7 @@ void KDChartAxesPainter::calculateBasicTextFactors( double nTxtHeight, } break; default: { - qDebug( "IMPLEMENTATION ERROR: KDChartAxesPainter::calculateBasicTextFactors() unhandled enum value." ); + tqDebug( "IMPLEMENTATION ERROR: KDChartAxesPainter::calculateBasicTextFactors() unhandled enum value." ); // NOOP since the 'basicPos' does not support more that these four values. } break; @@ -3660,8 +3660,8 @@ TQString KDChartAxesPainter::truncateBehindComma( const double nVal, TQString sVal; sVal.setNum( nVal, 'f', bUseAutoDigits ? nTrustedPrecision : TQMIN(behindComma, nTrustedPrecision) ); - //qDebug("nVal: %f sVal: "+sVal, nVal ); - //qDebug( TQString(" %1").arg(sVal)); + //tqDebug("nVal: %f sVal: "+sVal, nVal ); + //tqDebug( TQString(" %1").arg(sVal)); if ( bUseAutoDigits ) { int comma = sVal.find( '.' ); if ( -1 < comma ) { @@ -3697,7 +3697,7 @@ TQString KDChartAxesPainter::truncateBehindComma( const double nVal, } } } - //qDebug( TQString(" - %1").arg(trueBehindComma)); + //tqDebug( TQString(" - %1").arg(trueBehindComma)); return sVal; } @@ -3742,16 +3742,16 @@ TQString KDChartAxesPainter::applyLabelsFormat( const double nVal_, if( notation == KDChartEnums::NumberNotationScientific || notation == KDChartEnums::NumberNotationScientificBig ){ valLog10 = (nVal != 0.0) ? trunc( log10(TQABS(nVal)) ) : 0.0; - //qDebug("nVal old: %f valLog10: %f",nVal,valLog10); + //tqDebug("nVal old: %f valLog10: %f",nVal,valLog10); nVal /= fastPow10( valLog10 ); nDelta /= fastPow10( valLog10 ); - //qDebug("nVal new: %f",nVal); + //tqDebug("nVal new: %f",nVal); } TQString sVal = truncateBehindComma( nVal, behindComma, nDelta, trueBehindComma ); - //qDebug("sVal : "+sVal+" behindComma: %i",behindComma); + //tqDebug("sVal : "+sVal+" behindComma: %i",behindComma); int posComma = sVal.find( '.' ); if( 0 <= posComma ){ @@ -3890,12 +3890,12 @@ void KDChartAxesPainter::calculateOrdinateFactors( nDelta *= -1.0; /* - qDebug(" n D i s t : %f", nDist ); - qDebug(" n D i v i s o r : %f", nDivisor); - qDebug(" n R o u n d : %f", nRound ); - qDebug(" n D e l t a : %f", nDelta ); - qDebug(" nHigh : %f", nHigh ); - qDebug(" nLow : %f", nLow ); + tqDebug(" n D i s t : %f", nDist ); + tqDebug(" n D i v i s o r : %f", nDivisor); + tqDebug(" n R o u n d : %f", nRound ); + tqDebug(" n D e l t a : %f", nDelta ); + tqDebug(" nHigh : %f", nHigh ); + tqDebug(" nLow : %f", nLow ); */ if( KDCHART_AXIS_LABELS_AUTO_LIMIT == para.axisValueStart() || !para.axisValueStartIsExact() ) { @@ -3931,8 +3931,8 @@ void KDChartAxesPainter::calculateOrdinateFactors( } } - //qDebug(" n H i g h : %f", nHigh ); - //qDebug(" n L o w : %f\n\n", nLow ); + //tqDebug(" n H i g h : %f", nHigh ); + //tqDebug(" n L o w : %f\n\n", nLow ); if ( 1.0 == nRound ) nSubDelimFactor = 0.5; @@ -3947,7 +3947,7 @@ void KDChartAxesPainter::calculateOrdinateFactors( nSubDelimFactor = 0.2; else { // Should not happen - qDebug( "IMPLEMENTATION ERROR: Unknown nRound in calculateOrdinateFactors()" ); + tqDebug( "IMPLEMENTATION ERROR: Unknown nRound in calculateOrdinateFactors()" ); nSubDelimFactor = 1.0; } @@ -3974,7 +3974,7 @@ void KDChartAxesPainter::saveDrawLine( TQPainter& painter, /**** static ****/ void KDChartAxesPainter::dtAddSecs( const TQDateTime& org, const int secs, TQDateTime& dest ) { - //qDebug("entering KDChartAxesPainter::dtAddSecs() .."); + //tqDebug("entering KDChartAxesPainter::dtAddSecs() .."); int s = org.time().second(); int m = org.time().minute(); int h = org.time().hour(); @@ -4003,13 +4003,13 @@ void KDChartAxesPainter::dtAddSecs( const TQDateTime& org, const int secs, TQDat dest.setDate( org.date() ); if( days ) dtAddDays( dest, days, dest ); - //qDebug(".. KDChartAxesPainter::dtAddSecs() done."); + //tqDebug(".. KDChartAxesPainter::dtAddSecs() done."); } /**** static ****/ void KDChartAxesPainter::dtAddDays( const TQDateTime& org, const int days, TQDateTime& dest ) { - //qDebug("entering KDChartAxesPainter::dtAddDays() .."); + //tqDebug("entering KDChartAxesPainter::dtAddDays() .."); int d = org.date().day(); int m = org.date().month(); int y = org.date().year(); @@ -4041,13 +4041,13 @@ void KDChartAxesPainter::dtAddDays( const TQDateTime& org, const int days, TQDat di += dd; } dest = TQDateTime( TQDate( y,m,d ), org.time() ); - //qDebug(".. KDChartAxesPainter::dtAddDays() done."); + //tqDebug(".. KDChartAxesPainter::dtAddDays() done."); } /**** static ****/ void KDChartAxesPainter::dtAddMonths( const TQDateTime& org, const int months, TQDateTime& dest ) { - //qDebug("entering KDChartAxesPainter::dtAddMonths() .."); + //tqDebug("entering KDChartAxesPainter::dtAddMonths() .."); int d = org.date().day(); int m = org.date().month(); int y = org.date().year(); @@ -4067,13 +4067,13 @@ void KDChartAxesPainter::dtAddMonths( const TQDateTime& org, const int months, T // TQMIN takes care for intercalary day dest = TQDateTime( TQDate( y,m,TQMIN( d, TQDate( y,m,1 ).daysInMonth() ) ), org.time() ); - //qDebug(".. KDChartAxesPainter::dtAddMonths() done."); + //tqDebug(".. KDChartAxesPainter::dtAddMonths() done."); } /**** static ****/ void KDChartAxesPainter::dtAddYears( const TQDateTime& org, const int years, TQDateTime& dest ) { - //qDebug("entering KDChartAxesPainter::dtAddYears() .."); + //tqDebug("entering KDChartAxesPainter::dtAddYears() .."); int d = org.date().day(); int m = org.date().month(); int y = org.date().year() + years; @@ -4081,7 +4081,7 @@ void KDChartAxesPainter::dtAddYears( const TQDateTime& org, const int years, TQD // TQMIN takes care for intercalary day dest = TQDateTime( TQDate( y,m,TQMIN( d, TQDate( y,m,d ).daysInMonth() ) ), org.time() ); - //qDebug(".. KDChartAxesPainter::dtAddYears() done."); + //tqDebug(".. KDChartAxesPainter::dtAddYears() done."); } @@ -4160,9 +4160,9 @@ void KDChartAxesPainter::calculateAbscissaInfos( const KDChartParams& params, ? ( infos.abscissaSpan / infos.numLabels ) : infos.abscissaSpan ); - //qDebug( bAbscissaDecreasing ? "bAbscissaDecreasing = TRUE" : "bAbscissaDecreasing = FALSE"); - //qDebug( abscissaHasTrueAxisValues ? "abscissaHasTrueAxisValues = TRUE" : "abscissaHasTrueAxisValues = FALSE"); - //qDebug( "abscissaDelta = %f", abscissaDelta); + //tqDebug( bAbscissaDecreasing ? "bAbscissaDecreasing = TRUE" : "bAbscissaDecreasing = FALSE"); + //tqDebug( abscissaHasTrueAxisValues ? "abscissaHasTrueAxisValues = TRUE" : "abscissaHasTrueAxisValues = FALSE"); + //tqDebug( "abscissaDelta = %f", abscissaDelta); infos.bAbscissaHasTrueAxisDtValues = (TQVariant::DateTime == type2Ref) && @@ -4205,10 +4205,10 @@ void KDChartAxesPainter::calculateAbscissaInfos( const KDChartParams& params, infos.abscissaDtEnd.time().minute(), infos.abscissaDtEnd.time().second(), 999 ) ); - //qDebug( infos.abscissaPara->trueAxisDtLow().toString("yyyy-MM-dd-hh:mm:ss.zzz")); - //qDebug( infos.abscissaPara->trueAxisDtHigh().toString("yyyy-MM-dd-hh:mm:ss.zzz")); - //qDebug(infos.abscissaDtStart.toString("yyyy-MM-dd-hh:mm:ss.zzz")); - //qDebug(infos.abscissaDtEnd.toString("yyyy-MM-dd-hh:mm:ss.zzz")); + //tqDebug( infos.abscissaPara->trueAxisDtLow().toString("yyyy-MM-dd-hh:mm:ss.zzz")); + //tqDebug( infos.abscissaPara->trueAxisDtHigh().toString("yyyy-MM-dd-hh:mm:ss.zzz")); + //tqDebug(infos.abscissaDtStart.toString("yyyy-MM-dd-hh:mm:ss.zzz")); + //tqDebug(infos.abscissaDtEnd.toString("yyyy-MM-dd-hh:mm:ss.zzz")); /* infos.bScaleLessThanDay = ( infos.bAbscissaHasTrueAxisDtValues ? infos.abscissaPara->trueAxisDtDeltaScale() @@ -4265,19 +4265,19 @@ void KDChartAxesPainter::calculateAbscissaInfos( const KDChartParams& params, //const double infos.abscissaZeroPos2 = -1.0 * infos.abscissaPixelsPerUnit * infos.abscissaStart; infos.abscissaZeroPos = infos.abscissaPara->axisZeroLineStartX() - dataRect.x(); - //qDebug("abscissaZeroPos %f abscissaZeroPos2 %f",abscissaZeroPos,abscissaZeroPos2); + //tqDebug("abscissaZeroPos %f abscissaZeroPos2 %f",abscissaZeroPos,abscissaZeroPos2); /* - qDebug(abscissaPara ? + tqDebug(abscissaPara ? "\nabscissaPara: OK" : "\nabscissaPara: leer"); - qDebug(abscissaHasTrueAxisValues ? + tqDebug(abscissaHasTrueAxisValues ? "abscissaHasTrueAxisValues: TRUE" : "abscissaHasTrueAxisValues: FALSE"); - qDebug("abscissaStart: %f", abscissaStart); - qDebug("abscissaEnd : %f", abscissaEnd); - qDebug("abscissaPara->trueAxisDelta(): %f", abscissaPara->trueAxisDelta()); - qDebug("numValues : %u, numLabels : %u", numValues, numLabels); + tqDebug("abscissaStart: %f", abscissaStart); + tqDebug("abscissaEnd : %f", abscissaEnd); + tqDebug("abscissaPara->trueAxisDelta(): %f", abscissaPara->trueAxisDelta()); + tqDebug("numValues : %u, numLabels : %u", numValues, numLabels); */ } @@ -4309,7 +4309,7 @@ bool KDChartAxesPainter::calculateAbscissaAxisValue( const TQVariant& value, ? ai.abscissaDtStart.secsTo( dtVal ) : ai.abscissaDtStart.daysTo( dtVal ); /* - qDebug("abscissaDtStart: %i %i %i %i:%i:%i.%i", + tqDebug("abscissaDtStart: %i %i %i %i:%i:%i.%i", ai.abscissaDtStart.date().year(), ai.abscissaDtStart.date().month(), ai.abscissaDtStart.date().day(), @@ -4318,10 +4318,10 @@ bool KDChartAxesPainter::calculateAbscissaAxisValue( const TQVariant& value, ai.abscissaDtStart.time().second(), ai.abscissaDtStart.time().msec()); */ - //qDebug("days to = %f",dT); + //tqDebug("days to = %f",dT); /* - qDebug(" dtVal: %i %i %i %i:%i:%i.%i", + tqDebug(" dtVal: %i %i %i %i:%i:%i.%i", dtVal.date().year(), dtVal.date().month(), dtVal.date().day(), @@ -4336,7 +4336,7 @@ bool KDChartAxesPainter::calculateAbscissaAxisValue( const TQVariant& value, / ( ai.bScaleLessThanDay ? 1000.0 : (1000.0 * 86400.0) ); - //qDebug("xValue: %f",xValue); + //tqDebug("xValue: %f",xValue); if( !ai.bScaleLessThanDay ){ if( dtVal.time().second() ) xValue += (ai.abscissaDtPixelsPerScaleUnit * dtVal.time().second()) @@ -4350,7 +4350,7 @@ bool KDChartAxesPainter::calculateAbscissaAxisValue( const TQVariant& value, } xValue *= ai.bAbscissaDecreasing ? -1.0 : 1.0; xValue += ai.dtLowPos; - // qDebug("xValue = dtLowPos + abscissaDtPixelsPerScaleUnit * dT\n%f = %f + %f * %f", + // tqDebug("xValue = dtLowPos + abscissaDtPixelsPerScaleUnit * dT\n%f = %f + %f * %f", // xValue, dtLowPos, abscissaDtPixelsPerScaleUnit, dT); } else @@ -4482,19 +4482,19 @@ void KDChartAxesPainter::paintData( TQPainter* painter, datasetEnd = chartDatasetEnd; } - //qDebug("\n==========================================================" + //tqDebug("\n==========================================================" // "\naxis %u axisDatasetStart %u axisDatasetEnd %u / chartDatasetStart %u chartDatasetEnd %u", //axis, axisDatasetStart, axisDatasetEnd, chartDatasetStart, chartDatasetEnd ); double logHeight = axisPara->axisTrueAreaRect().height(); double axisYOffset = axisPara->axisTrueAreaRect().y() - _dataRect.y(); - //qDebug("\n==========================================================\naxis %u logHeight %f axisDatasetStart %u chartDatasetStart %u axisDatasetEnd %u chartDatasetEnd %u", + //tqDebug("\n==========================================================\naxis %u logHeight %f axisDatasetStart %u chartDatasetStart %u axisDatasetEnd %u chartDatasetEnd %u", //axis, logHeight, axisDatasetStart, chartDatasetStart, axisDatasetEnd, chartDatasetEnd ); //if( KDCHART_ALL_DATASETS == axisDatasetStart ) - // qDebug(" ALL DATASETS"); + // tqDebug(" ALL DATASETS"); //if( KDCHART_NO_DATASET == axisDatasetStart ) - // qDebug(" N O DATESETS"); + // tqDebug(" N O DATESETS"); double maxColumnValue = axisPara->trueAxisHigh(); double minColumnValue = axisPara->trueAxisLow(); diff --git a/libkdchart/KDChartAxisParams.cpp b/libkdchart/KDChartAxisParams.cpp index b24892b..66dbc45 100644 --- a/libkdchart/KDChartAxisParams.cpp +++ b/libkdchart/KDChartAxisParams.cpp @@ -389,7 +389,7 @@ KDChartAxisParams::AxisPos KDChartAxisParams::basicAxisPos( uint pos ) ret = AxisPosLeft; break; default: { - qDebug( "IMPLEMENTATION ERROR: type missing in KDChartAxisParams::basicAxisPos()" ); + tqDebug( "IMPLEMENTATION ERROR: type missing in KDChartAxisParams::basicAxisPos()" ); Q_ASSERT( ret != AxisPos( pos ) ); } } @@ -485,7 +485,7 @@ TQString KDChartAxisParams::axisAreaModeToString( AxisAreaMode mode ) { case AxisAreaModeMinMaxSize: return "MinMaxSize"; default: // should not happen - qDebug( "Unknown axis area mode" ); + tqDebug( "Unknown axis area mode" ); return "AxisAreaMode"; } } @@ -730,7 +730,7 @@ TQString KDChartAxisParams::axisCalcModeToString( AxisCalcMode mode ) { case AxisCalcLogarithmic: return "Logarithmic"; default: // should not happen - qDebug( "Unknown axis calc mode" ); + tqDebug( "Unknown axis calc mode" ); return "Linear"; } } @@ -1583,7 +1583,7 @@ TQString KDChartAxisParams::labelsFromDataRowToString( LabelsFromDataRow mode ) case LabelsFromDataRowGuess: return "Guess"; default: // should not happen - qDebug( "Unknown labels from data row mode" ); + tqDebug( "Unknown labels from data row mode" ); return "Guess"; } } @@ -2885,7 +2885,7 @@ TQString KDChartAxisParams::axisTypeToString( AxisType type ) { case AxisUP: return "Up"; default: // should not happen - qDebug( "Unknown axis type" ); + tqDebug( "Unknown axis type" ); return "Unknown"; } } diff --git a/libkdchart/KDChartBWPainter.cpp b/libkdchart/KDChartBWPainter.cpp index 7fed752..b7b5789 100644 --- a/libkdchart/KDChartBWPainter.cpp +++ b/libkdchart/KDChartBWPainter.cpp @@ -172,7 +172,7 @@ int KDChartBWPainter::calculateStats( KDChartTableDataBase& data, stats[ KDChartParams::Quartile3 ] = values[ nLastQ3 ]; } else{ - //qDebug(" "+TQString::number(nLastQ3)+" "+TQString::number(KDChartParams::Quartile3) + //tqDebug(" "+TQString::number(nLastQ3)+" "+TQString::number(KDChartParams::Quartile3) // +" "+TQString::number(nUsed)+" "+TQString::number(TQMIN(nLastQ3+1, nUsed-1))); stats[ KDChartParams::Quartile3 ] = (values[ nLastQ3 ] + values[ TQMIN(nLastQ3+1, nUsed-1) ]) /2; diff --git a/libkdchart/KDChartBarPainter.cpp b/libkdchart/KDChartBarPainter.cpp index 8bfe1a7..dbf6394 100644 --- a/libkdchart/KDChartBarPainter.cpp +++ b/libkdchart/KDChartBarPainter.cpp @@ -165,7 +165,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, if( !data ) return; - // qDebug("datasetStart: %i datasetEnd: %i", datasetStart, datasetEnd); + // tqDebug("datasetStart: %i datasetEnd: %i", datasetStart, datasetEnd); const TQPen defaultOutlinePen( params()->outlineDataColor(), params()->outlineDataLineWidth(), params()->outlineDataLineStyle() ); @@ -243,7 +243,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, spaceBetweenDatasets = 0; // always 0 when stacked/percent/multi-rows break; default: - qFatal( "Unsupported bar chart type" ); + tqFatal( "Unsupported bar chart type" ); }; double barWidth = 0.0; @@ -270,8 +270,8 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, ; /* Debug space available - qDebug ( " logWidth %f" , logWidth ); - qDebug ( "compare value %f", barWidth*totalNumberOfBars + spaceBetweenValueBlocks + datasetGap * ( totalNumberOfBars - numValues ) ); + tqDebug ( " logWidth %f" , logWidth ); + tqDebug ( "compare value %f", barWidth*totalNumberOfBars + spaceBetweenValueBlocks + datasetGap * ( totalNumberOfBars - numValues ) ); */ } else if( 0 > params()->barWidth() ) barWidth = params()->barWidth() * -areaWidthP1000; @@ -297,8 +297,8 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, if ( logWidth < totalSpaceOccupied) { sideBarWidth -= (totalSpaceOccupied /*+ spaceBetweenDatasets + spaceBetweenValueBlocks*/ - logWidth)/totalNumberOfBars; - //qDebug ( "logWidth %f", logWidth ); - //qDebug ( "totalSpaceOccupied %f", totalSpaceOccupied ); + //tqDebug ( "logWidth %f", logWidth ); + //tqDebug ( "totalSpaceOccupied %f", totalSpaceOccupied ); } const double sideBarHeight = sideBarWidth; @@ -309,10 +309,10 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, if ( params()->barChartSubType() != KDChartParams::BarPercent ) // not used for percent pixelsPerUnit = logHeight / ( columnValueDistance ? columnValueDistance : 10 ); - //qDebug("\nordinatePara->trueAxisLow() = %f", ordinatePara->trueAxisLow()); - //qDebug( "ordinatePara->trueAxisHigh() = %f", ordinatePara->trueAxisHigh()); - //qDebug( "sideBarHeight = %f", sideBarHeight); - //qDebug( "pixelsPerUnit = %f", pixelsPerUnit); + //tqDebug("\nordinatePara->trueAxisLow() = %f", ordinatePara->trueAxisLow()); + //tqDebug( "ordinatePara->trueAxisHigh() = %f", ordinatePara->trueAxisHigh()); + //tqDebug( "sideBarHeight = %f", sideBarHeight); + //tqDebug( "pixelsPerUnit = %f", pixelsPerUnit); double zeroXAxisI; if ( params()->barChartSubType() == KDChartParams::BarPercent ) { @@ -400,7 +400,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, = ordinateIsLogarithmic ? log10( vVal.toDouble() ) : vVal.toDouble(); - //qDebug("value %u dataset %u logHeight %f", value,dataset,logHeight); + //tqDebug("value %u dataset %u logHeight %f", value,dataset,logHeight); if( bFirstValidValueUnknown ){ firstValidValue = dataset; @@ -418,7 +418,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, } } - //qDebug("shiftMyPainter( (numChartDataEntryDatasets-1)*nShiftX, (numChartDataEntryDatasets-1)*-nShiftY );"); + //tqDebug("shiftMyPainter( (numChartDataEntryDatasets-1)*nShiftX, (numChartDataEntryDatasets-1)*-nShiftY );"); shiftMyPainter( (numChartDataEntryDatasets-1)*nShiftX, (numChartDataEntryDatasets-1)*-nShiftY ); // iterate over all datasets of this chart: @@ -431,7 +431,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, bMultiRows ? --dataset : ++dataset ) { - //qDebug("value %u dataset %u logHeight %f", value,dataset,logHeight); + //tqDebug("value %u dataset %u logHeight %f", value,dataset,logHeight); const bool bDataEntrySourceMode = (params()->chartSourceMode( dataset ) == KDChartParams::DataEntry); @@ -447,7 +447,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, = ordinateIsLogarithmic ? log10( coord1.toDouble() ) : coord1.toDouble(); - //qDebug("b"); + //tqDebug("b"); // there is a numeric value double barHeight; @@ -474,7 +474,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, // draw only the bars belonging to the axis // which we are processing currently if( dataset >= datasetStart && dataset <= datasetEnd ) { - //qDebug("b2"); + //tqDebug("b2"); // calculate Abscissa axis value, if there are X coordinates // --------------------------------------------------------- @@ -919,8 +919,8 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, /* if ( cellValue != 0 ) { pt1Y = static_cast (cellValue * pixelsPerUnit * -2); - qDebug( "value %s",TQString::number(static_cast (cellValue)).latin1()); - qDebug( "pt1Y %s", TQString::number(static_cast (cellValue * pixelsPerUnit * -2)).latin1()); + tqDebug( "value %s",TQString::number(static_cast (cellValue)).latin1()); + tqDebug( "pt1Y %s", TQString::number(static_cast (cellValue * pixelsPerUnit * -2)).latin1()); } else pt1Y = static_cast < int > ( yZero - barHeight); @@ -1041,10 +1041,10 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, double minValueYPos = minColumnValue * pixelsPerUnit; double minDataValueYPos = maxValueYPos - minValueYPos; double yZero = yposPositives - zeroXAxisI; - //qDebug( "yposPositives %f - zeroXAxisI %f = %f" , yposPositives, zeroXAxisI, yZero ); - //qDebug( "yZero %s", TQString::number( yZero ).latin1()); - //qDebug( "minDataValueYPos = %s", TQString::number( minDataValueYPos).latin1()); - //qDebug( "positive value %s", TQString::number( cellValue).latin1()); + //tqDebug( "yposPositives %f - zeroXAxisI %f = %f" , yposPositives, zeroXAxisI, yZero ); + //tqDebug( "yZero %s", TQString::number( yZero ).latin1()); + //tqDebug( "minDataValueYPos = %s", TQString::number( minDataValueYPos).latin1()); + //tqDebug( "positive value %s", TQString::number( cellValue).latin1()); //Pending Michel: draw the default split excess arrows //when the front top of the 3d chart reach the max Y value @@ -1366,7 +1366,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, } if( 1.5 > frontBarWidth ){ - //qDebug("1.5 > frontBarWidth "); + //tqDebug("1.5 > frontBarWidth "); TQPen oldPen( painter->pen() ); painter->setPen( TQPen(painter->brush().color(), 0) ); painter->drawLine(pt1, TQPoint(pt1.x(),pt2.y())); @@ -1504,11 +1504,11 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, // the value labels closer to the corner of the front bar. if ( pointArrayList && !tooHigh && !tooLow && params()->barChartSubType() != KDChartParams::BarPercent ) { TQPointArray points2cpy( points.copy() ); - //qDebug("g2"); + //tqDebug("g2"); points2cpy.translate( _dataRect.x(), _dataRect.y()); - //qDebug("g3"); + //tqDebug("g3"); pointArrayList->append( points2cpy ); - //qDebug("g4"); + //tqDebug("g4"); } // drawing the top, but only for the topmost piece for stacked and percent @@ -1616,7 +1616,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, TQT_TQRECT_OBJECT(pointArrayList->first().boundingRect()) ); delete pointArrayList; } - /*qDebug("KDChartDataRegion stored! x: %i y: %i w: %i h: %i", + /*tqDebug("KDChartDataRegion stored! x: %i y: %i w: %i h: %i", region->rect().x(),region->rect().y(), region->rect().width(),region->rect().height());*/ regions->append( region ); @@ -1673,7 +1673,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, xpos += datasetGap; } if( bAdvanceToNextValue || bMultiRows ){ - //qDebug("shiftMyPainter( -nShiftX, nShiftY );"); + //tqDebug("shiftMyPainter( -nShiftX, nShiftY );"); shiftMyPainter( -nShiftX, nShiftY ); } bIsVeryFirstBar = false; @@ -1685,17 +1685,17 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, if ( bNormalMode ){ // skip gap between value blocks, don't worry about last one here xpos += valueBlockGap; - //qDebug("**************************** xpos: %f + valueBlockGap: %f = %f", xpos, valueBlockGap, xpos+valueBlockGap); + //tqDebug("**************************** xpos: %f + valueBlockGap: %f = %f", xpos, valueBlockGap, xpos+valueBlockGap); }else{ // skip gap between value blocks xpos += valueBlockGap + barWidth; - //qDebug ( "2/ barWidth %f", barWidth ); - //qDebug ( " valueBlockGap %f", valueBlockGap ); + //tqDebug ( "2/ barWidth %f", barWidth ); + //tqDebug ( " valueBlockGap %f", valueBlockGap ); // start at bottom with next value group yposPositives = yposPositivesStart; yposNegatives = yposNegativesStart; } - //qDebug("shiftMyPainterBack"); + //tqDebug("shiftMyPainterBack"); shiftMyPainterBack(); } diff --git a/libkdchart/KDChartCustomBox.cpp b/libkdchart/KDChartCustomBox.cpp index 9b4d785..c8c51c6 100644 --- a/libkdchart/KDChartCustomBox.cpp +++ b/libkdchart/KDChartCustomBox.cpp @@ -98,22 +98,22 @@ float KDChartCustomBox::trueFontSize( double areaWidthP1000, TQFont font( content().font() ); font.setPointSizeFloat( size ); TQFontMetrics fm( font ); - //qDebug(TQString("\nsize : ")+TQString::number(size)); - //qDebug(TQString("(float)rectHeight : ")+TQString::number((float)rectHeight)); - //qDebug(TQString("(float)fm.lineSpacing(): ")+TQString::number((float)fm.lineSpacing())); + //tqDebug(TQString("\nsize : ")+TQString::number(size)); + //tqDebug(TQString("(float)rectHeight : ")+TQString::number((float)rectHeight)); + //tqDebug(TQString("(float)fm.lineSpacing(): ")+TQString::number((float)fm.lineSpacing())); size *= targetLineSpacing / fm.lineSpacing(); - //qDebug(TQString("size : ")+TQString::number(size)); + //tqDebug(TQString("size : ")+TQString::number(size)); // step #2 - make sure the font size is not too big: font.setPointSizeFloat( size ); TQFontMetrics fm2( font ); size *= targetLineSpacing / fm2.lineSpacing(); - //qDebug(TQString("(float)rectHeight : ")+TQString::number((float)rectHeight)); - //qDebug(TQString("(float)fm.lineSpacing(): ")+TQString::number((float)fm.lineSpacing())); - //qDebug(TQString("size : ")+TQString::number(size)); + //tqDebug(TQString("(float)rectHeight : ")+TQString::number((float)rectHeight)); + //tqDebug(TQString("(float)fm.lineSpacing(): ")+TQString::number((float)fm.lineSpacing())); + //tqDebug(TQString("size : ")+TQString::number(size)); } } else { -//qDebug(TQString("\n_fontsize: ")+TQString::number(_fontSize)); +//tqDebug(TQString("\n_fontsize: ")+TQString::number(_fontSize)); if( _fontSize ) size = _fontSize; else{ @@ -151,10 +151,10 @@ void KDChartCustomBox::getTrueShift( double areaWidthP1000, y = (0 > _deltaY) ? static_cast < int > ( -areaHeightP1000 * _deltaY ) : _deltaY; }else{ int fontHeight = trueFontLineSpacing( areaWidthP1000, areaHeightP1000, rectHeight ); - //qDebug("\nfontHeight %i",fontHeight); + //tqDebug("\nfontHeight %i",fontHeight); x = (0 > _deltaX) ? static_cast < int > ( fontHeight * _deltaX / -100.0 ) : _deltaX; y = (0 > _deltaY) ? static_cast < int > ( fontHeight * _deltaY / -100.0 ) : _deltaY; - //qDebug("y %i",y); + //tqDebug("y %i",y); } uint deltaAlign = (KDCHART_AlignAuto == _deltaAlign) ? _anchorAlign : _deltaAlign; if ( TQt::AlignLeft == (TQt::AlignLeft & deltaAlign) ) @@ -175,7 +175,7 @@ void KDChartCustomBox::getTrueShift( double areaWidthP1000, TQRect KDChartCustomBox::trueRect( TQPainter * /*painter*/, TQPoint /*anchor*/, double /*areaWidthP1000*/, double /*areaHeightP1000*/ ) const { //temporary allow KDC_Presentation to compile - qDebug( "Sorry, not implemented yet: KDChartCustomBox::trueRect()" ); + tqDebug( "Sorry, not implemented yet: KDChartCustomBox::trueRect()" ); return TQRect( 1, 1, 2, 2 ); } @@ -188,7 +188,7 @@ TQRect KDChartCustomBox::trueRect( TQPoint anchor, double areaWidthP1000, double int w = (0 > _width ) ? static_cast < int > ( -areaWidthP1000 * _width ) : _width; int h = (0 > _height) ? static_cast < int > ( -areaHeightP1000 * _height ) : _height; - //qDebug("w: %i h: %i", w,h ); + //tqDebug("w: %i h: %i", w,h ); if( _fontScaleGlobal && 0 == w && 0 == h ){ //Now calculate the size of the box based upon the content! @@ -198,7 +198,7 @@ TQRect KDChartCustomBox::trueRect( TQPoint anchor, double areaWidthP1000, double (0 > _fontSize) ? (_fontSize * TQMIN(areaWidthP1000, areaHeightP1000) * -1.0)//(areaWidthP1000 + areaHeightP1000) / -2.0 : _fontSize ); - //qDebug("\n_fontSize * TQMIN(areaWidthP1000, areaHeightP1000) %i * TQMIN(%f, %f) text: %s", _fontSize , areaWidthP1000, areaHeightP1000, content().text().latin1()); + //tqDebug("\n_fontSize * TQMIN(areaWidthP1000, areaHeightP1000) %i * TQMIN(%f, %f) text: %s", _fontSize , areaWidthP1000, areaHeightP1000, content().text().latin1()); } TQString txt( content().text() ); TQString txtTest( txt.stripWhiteSpace().lower() ); @@ -207,7 +207,7 @@ TQRect KDChartCustomBox::trueRect( TQPoint anchor, double areaWidthP1000, double if( !txtTest.endsWith( "") ) txt.append( ""); - //qDebug("\nw: %i h: %i", w,h ); + //tqDebug("\nw: %i h: %i", w,h ); TQSimpleRichText tmpContent( txt, font ); // tmpContent.setWidth(pdWidth); // tmpContent.setHeight(pdHeight); @@ -218,11 +218,11 @@ TQRect KDChartCustomBox::trueRect( TQPoint anchor, double areaWidthP1000, double // } w = tmpContent.widthUsed(); h = tmpContent.height(); - //qDebug("pdWidth: %i w: %i h %i",pdWidth,w,h); - //qDebug("w: %i h: %i", w,h ); + //tqDebug("pdWidth: %i w: %i h %i",pdWidth,w,h); + //tqDebug("w: %i h: %i", w,h ); } - //qDebug("\nw: %i h: %i", w,h ); + //tqDebug("\nw: %i h: %i", w,h ); int x,y; if ( TQt::AlignLeft == (TQt::AlignLeft & _anchorAlign) ) x = 0; @@ -240,7 +240,7 @@ TQRect KDChartCustomBox::trueRect( TQPoint anchor, double areaWidthP1000, double int dX,dY; getTrueShift( areaWidthP1000, areaHeightP1000, h, dX, dY ); - //qDebug("trueRect: x %i y %i w %i h %i text: %s", anchor.x()+x+dX, anchor.y()+y+dY, w,h, content().text().latin1()); + //tqDebug("trueRect: x %i y %i w %i h %i text: %s", anchor.x()+x+dX, anchor.y()+y+dY, w,h, content().text().latin1()); return TQRect( anchor.x()+x+dX, anchor.y()+y+dY, w, h ); } @@ -294,29 +294,29 @@ TQPaintDeviceMetrics metrics(painter->device()); int pdWidth = metrics.width(); int dpiY = metrics.logicalDpiY(); int dpiX = metrics.logicalDpiX(); -qDebug("dpiY: %i dpiX: %i",dpiY,dpiX); -qDebug("pdWidth: %i box myRect w: %i h %i",pdWidth,myRect.width(),myRect.height()); +tqDebug("dpiY: %i dpiX: %i",dpiY,dpiX); +tqDebug("pdWidth: %i box myRect w: %i h %i",pdWidth,myRect.width(),myRect.height()); */ //myRect.setSize(myRect.size()*6); TQRect myFrameRect( frameRect ); if ( myRect.isValid() ) { -//qDebug("box myRect center: x %i y %i",myRect.center().x(),myRect.center().y()); +//tqDebug("box myRect center: x %i y %i",myRect.center().x(),myRect.center().y()); if( _rotation ){ getTrueShift( areaWidthP1000, areaHeightP1000, myRect.height(), rotDX, rotDY ); myRect.moveBy( -rotDX, -rotDY ); if( frame ) myFrameRect.moveBy( -rotDX, -rotDY ); -//qDebug("\nrotDelta: x %i y %i",rotDX,rotDY); -//qDebug("\nbox myRect center: x %i y %i",myRect.center().x(),myRect.center().y()); +//tqDebug("\nrotDelta: x %i y %i",rotDX,rotDY); +//tqDebug("\nbox myRect center: x %i y %i",myRect.center().x(),myRect.center().y()); myRect.moveCenter( TQPoint( anchor.x() - trueRectAlignX(myRect), anchor.y() - trueRectAlignY(myRect) ) ); if( frame ) myFrameRect.moveCenter( TQPoint( anchor.x() - trueRectAlignX(myFrameRect), anchor.y() - trueRectAlignY(myFrameRect) ) ); -//qDebug("box myRect center: x %i y %i",myRect.center().x(),myRect.center().y()); +//tqDebug("box myRect center: x %i y %i",myRect.center().x(),myRect.center().y()); painter->translate( anchor.x(), anchor.y() ); painter->rotate( _rotation ); painter->translate( rotDX, rotDY ); @@ -452,7 +452,7 @@ bool KDChartCustomBox::readCustomBoxNode( const TQDomElement& element, } else if ( tagName == "ParentAxisArea" ) { ok = ok & KDXML::readIntNode( element, tempParentAxisArea ); } else { - qDebug( "Unknown tag in custom box" ); + tqDebug( "Unknown tag in custom box" ); } } node = node.nextSibling(); diff --git a/libkdchart/KDChartDataRegion.h b/libkdchart/KDChartDataRegion.h index c86d0bd..0854a86 100644 --- a/libkdchart/KDChartDataRegion.h +++ b/libkdchart/KDChartDataRegion.h @@ -86,7 +86,7 @@ struct KDCHART_EXPORT KDChartDataRegion ~KDChartDataRegion() { - //qDebug ("~KDChartDataRegion"); + //tqDebug ("~KDChartDataRegion"); if( pPointArrayList ) delete pPointArrayList; if( pRegion ) diff --git a/libkdchart/KDChartEnums.cpp b/libkdchart/KDChartEnums.cpp index 917136f..e361ace 100644 --- a/libkdchart/KDChartEnums.cpp +++ b/libkdchart/KDChartEnums.cpp @@ -22,7 +22,7 @@ TQString KDChartEnums::positionFlagToString( PositionFlag type ) case PosBottomRight: return "BottomRight"; default: // should not happen - qDebug( "Unknown content position" ); + tqDebug( "Unknown content position" ); return "TopLeft"; } } diff --git a/libkdchart/KDChartEnums.h b/libkdchart/KDChartEnums.h index 8876fb8..712aedb 100644 --- a/libkdchart/KDChartEnums.h +++ b/libkdchart/KDChartEnums.h @@ -90,7 +90,7 @@ public: case LayoutPolicyShrinkFontSize: return "ShrinkFontSize"; default: // should not happen - qDebug( "Unknown text layout policy" ); + tqDebug( "Unknown text layout policy" ); return "JustOverwrite"; } } @@ -125,7 +125,7 @@ public: case NumberNotationScientificBig: return "NumberNotationScientificBig"; default: // should not happen - qDebug( "Unknown text number notation" ); + tqDebug( "Unknown text number notation" ); return "NumberNotationDecimal"; } } diff --git a/libkdchart/KDChartGlobal.h b/libkdchart/KDChartGlobal.h index 868dfa3..ab7750e 100644 --- a/libkdchart/KDChartGlobal.h +++ b/libkdchart/KDChartGlobal.h @@ -83,9 +83,9 @@ #if !defined(Q_ASSERT) #if defined(TQT_CHECK_STATE) #if defined(TQT_FATAL_ASSERT) -#define Q_ASSERT(x) ((x) ? (void)0 : qFatal("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) +#define Q_ASSERT(x) ((x) ? (void)0 : tqFatal("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) #else -#define Q_ASSERT(x) ((x) ? (void)0 : qWarning("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) +#define Q_ASSERT(x) ((x) ? (void)0 : tqWarning("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) #endif #else #define Q_ASSERT(x) diff --git a/libkdchart/KDChartHiLoPainter.cpp b/libkdchart/KDChartHiLoPainter.cpp index d8f766c..6073994 100644 --- a/libkdchart/KDChartHiLoPainter.cpp +++ b/libkdchart/KDChartHiLoPainter.cpp @@ -144,12 +144,12 @@ void KDChartHiLoPainter::specificPaintData( TQPainter* painter, if( (numValues < 2) || ((params()->hiLoChartSubType() == KDChartParams::HiLoClose) && (numValues < 3)) || ((params()->hiLoChartSubType() == KDChartParams::HiLoOpenClose) && (numValues < 4)) ){ - qDebug( "\nNot enough data to display a High/Low Chart!\n" ); - qDebug( "type requiring" ); - qDebug( "---- ---------" ); - qDebug( "High/Low 2 data cells per series" ); - qDebug( "High/Low/Close 3 data cells per series" ); - qDebug( "High/Low/open/Close 4 data cells per series\n" ); + tqDebug( "\nNot enough data to display a High/Low Chart!\n" ); + tqDebug( "type requiring" ); + tqDebug( "---- ---------" ); + tqDebug( "High/Low 2 data cells per series" ); + tqDebug( "High/Low/Close 3 data cells per series" ); + tqDebug( "High/Low/open/Close 4 data cells per series\n" ); return; // PENDING(kalle) Throw exception? } @@ -261,8 +261,8 @@ void KDChartHiLoPainter::specificPaintData( TQPainter* painter, // Check whether there is enough space below the data display int valX = 0, valY = 0; - //qDebug("\nzeroXAxisI %f lowDrawValue %f height %i logHeight %f _dataRect.y() %i axisYOffset %f",zeroXAxisI,highDrawValue,height,logHeight,_dataRect.y(),axisYOffset); - //qDebug("zeroXAxisI - lowDrawValue + height %f < axisYOffset + logHeight %f", + //tqDebug("\nzeroXAxisI %f lowDrawValue %f height %i logHeight %f _dataRect.y() %i axisYOffset %f",zeroXAxisI,highDrawValue,height,logHeight,_dataRect.y(),axisYOffset); + //tqDebug("zeroXAxisI - lowDrawValue + height %f < axisYOffset + logHeight %f", //zeroXAxisI - lowDrawValue + height, axisYOffset+logHeight); if( zeroXAxisI - lowDrawValue + height < axisYOffset+logHeight ) { // enough space diff --git a/libkdchart/KDChartLinesPainter.cpp b/libkdchart/KDChartLinesPainter.cpp index 9f0995e..c25abd8 100644 --- a/libkdchart/KDChartLinesPainter.cpp +++ b/libkdchart/KDChartLinesPainter.cpp @@ -223,7 +223,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, && (0.0 != ordinatePara->trueAxisDelta())) ? ordinatePara->trueAxisDeltaPixels() / ordinatePara->trueAxisDelta() : logHeight / columnValueDistance;; - //qDebug("ordinatePixelsPerUnit: %f",ordinatePixelsPerUnit); + //tqDebug("ordinatePixelsPerUnit: %f",ordinatePixelsPerUnit); const bool showThreeDLines = !mIsArea && params()->threeDLines(); @@ -245,7 +245,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, && ( params()->areaChartSubType() == KDChartParams::AreaPercent ) ) ) mode = Percent; else - qDebug( "Internal error in KDChartLinesPainter::paintDataInternal(): Unknown subtype" ); + tqDebug( "Internal error in KDChartLinesPainter::paintDataInternal(): Unknown subtype" ); TQMap < int, double > currentValueSums; @@ -334,7 +334,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, if( data->cellContent( dataset, value, vValY, vValX, cellPropID ) && TQVariant::Double == vValY.type() && ( !ai.bCellsHaveSeveralCoordinates || TQVariant::Invalid != vValX.type() ) ){ - //qDebug("a. cellPropID: %i",cellPropID); + //tqDebug("a. cellPropID: %i",cellPropID); // calculate Ordinate axis value // ----------------------------- @@ -352,11 +352,11 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, drawValue = log10( cellValue ) * ordinatePixelsPerUnit; else drawValue = -10250.0; - //qDebug("\nlogarithmic calc - cellValue: %f drawValue: %f", + //tqDebug("\nlogarithmic calc - cellValue: %f drawValue: %f", // cellValue, drawValue ); }else{ drawValue = cellValue * ordinatePixelsPerUnit * (bOrdinateDecreasing ? -1.0 : 1.0); - //qDebug("\nlinear calc - cellValue: %f\n - drawValue: %f", + //tqDebug("\nlinear calc - cellValue: %f\n - drawValue: %f", // cellValue, drawValue ); } } @@ -388,12 +388,12 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, allPoints[ static_cast < int > ( datasetEnd-dataset ) * arrayNumValues + value ].setSkipThis( true ); skipMe = true; - //qDebug("skipped"); + //tqDebug("skipped"); }else{ // use typecast to make it compile on windows using qt232 allPoints[ static_cast < int > ( datasetEnd-dataset ) * arrayNumValues + value ].set( myPointX, myPointY, cellValue ); - //qDebug("ok"); + //tqDebug("ok"); } if( !skipMe ){ // -------------------------------------------------------- @@ -401,15 +401,15 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, // by traversing the property set chain (if necessary) // -------------------------------------------------------- if( cellPropID != curPropSetId ){ - //qDebug("b. ( curPropSetId: %i )",curPropSetId); - //qDebug("b. cellPropID: %i",cellPropID); - //qDebug(curPropSet.name().latin1()); + //tqDebug("b. ( curPropSetId: %i )",curPropSetId); + //tqDebug("b. cellPropID: %i",cellPropID); + //tqDebug(curPropSet.name().latin1()); if( cellPropID != KDChartPropertySet::UndefinedID && params()->calculateProperties( cellPropID, curPropSet ) ){ curPropSetId = cellPropID; - //qDebug("c. curPropSetId: %i",curPropSetId); - //qDebug(curPropSet.name().latin1()); + //tqDebug("c. curPropSetId: %i",curPropSetId); + //tqDebug(curPropSet.name().latin1()); }else{ curPropSetId = KDChartPropertySet::UndefinedID; } @@ -520,7 +520,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, const MyPoint& mp = allPoints[iVec]; - //qDebug("\np.x() %i p.y() %i", p.x(), p.y() ); + //tqDebug("\np.x() %i p.y() %i", p.x(), p.y() ); // For 3D lines, we need two points (that lie // behind each other on the Z axis). For 2D lines and // areas, we need only one point. @@ -678,13 +678,13 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, // remove the last two points added point -= 2; */ - //qDebug("\n111"); + //tqDebug("\n111"); } // if ( mode == Normal || dataset == (int)datasetEnd ) else { // don't mess around with the original array; we'll need // that for the next time through. - //qDebug("222"); + //tqDebug("222"); // no 3d handling for areas yet TQPointArray thisSection = points[0]->copy(); @@ -695,8 +695,8 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, for ( unsigned int i = 0; i < previousPoints.size(); ++i ) { thisSection.setPoint( point + i, previousPoints.point( previousPoints.size() - i - 1 ) ); - //qDebug("\nx: %i",previousPoints.point( previousPoints.size() - i - 1 ).x()); - //qDebug("y: %i",previousPoints.point( previousPoints.size() - i - 1 ).y()); + //tqDebug("\nx: %i",previousPoints.point( previousPoints.size() - i - 1 ).x()); + //tqDebug("y: %i",previousPoints.point( previousPoints.size() - i - 1 ).y()); } painter->drawPolygon( thisSection ); } @@ -733,7 +733,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, for ( int value = 0; value < point-1; ++value ) { // if( data->cell( dataset, value ).hasValue() && // data->cell( dataset, value+1 ).hasValue() ) { - // qDebug( "Draw a segment in dataset %d from %d to %d", dataset, value, value+1 ); + // tqDebug( "Draw a segment in dataset %d from %d to %d", dataset, value, value+1 ); //store the rotated points ( see project() ) TQPointArray rotatedSegment( 4 ); @@ -772,7 +772,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, // } else - // qDebug( "Can't draw a segment in dataset %d from %d to %d", dataset, value, value+1 ); + // tqDebug( "Can't draw a segment in dataset %d from %d to %d", dataset, value, value+1 ); } } else { TQPoint p1, p2; @@ -903,7 +903,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, int iVec = static_cast < int > ( datasetEnd-dataset ) * arrayNumValues + value; if( allPoints[ iVec ].bValid ){ const MyPoint& mp = allPoints[iVec]; - //qDebug("\np.x() %i p.y() %i", p.x(), p.y() ); + //tqDebug("\np.x() %i p.y() %i", p.x(), p.y() ); // -------------------------------------------------------- // determine any 'extra' properties assigned to this cell @@ -936,9 +936,9 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, } } } - //qDebug(const_cast < KDChartParams* > ( params() )->properties( KDCHART_PROPSET_NORMAL_DATA )->name().latin1()); - //qDebug(const_cast < KDChartParams* > ( params() )->properties( KDCHART_PROPSET_TRANSPARENT_DATA )->name().latin1()); - //qDebug(const_cast < KDChartParams* > ( params() )->properties( KDCHART_PROPSET_HORI_LINE )->name().latin1()); - //qDebug(const_cast < KDChartParams* > ( params() )->properties( KDCHART_PROPSET_VERT_LINE )->name().latin1()); - //qDebug("--"); + //tqDebug(const_cast < KDChartParams* > ( params() )->properties( KDCHART_PROPSET_NORMAL_DATA )->name().latin1()); + //tqDebug(const_cast < KDChartParams* > ( params() )->properties( KDCHART_PROPSET_TRANSPARENT_DATA )->name().latin1()); + //tqDebug(const_cast < KDChartParams* > ( params() )->properties( KDCHART_PROPSET_HORI_LINE )->name().latin1()); + //tqDebug(const_cast < KDChartParams* > ( params() )->properties( KDCHART_PROPSET_VERT_LINE )->name().latin1()); + //tqDebug("--"); } diff --git a/libkdchart/KDChartPainter.cpp b/libkdchart/KDChartPainter.cpp index 849d2b2..03df77a 100644 --- a/libkdchart/KDChartPainter.cpp +++ b/libkdchart/KDChartPainter.cpp @@ -192,7 +192,7 @@ void KDChartPainter::registerPainter( const TQString& /*painterName*/, KDChartPainter* /*painter*/ ) { // PENDING(kalle) Implement this - qDebug( "Sorry, not implemented: KDChartPainter::registerPainter()" ); + tqDebug( "Sorry, not implemented: KDChartPainter::registerPainter()" ); } @@ -208,7 +208,7 @@ void KDChartPainter::registerPainter( const TQString& /*painterName*/, void KDChartPainter::unregisterPainter( const TQString& /*painterName*/ ) { // PENDING(kalle) Implement this - qDebug( "Sorry, not implemented: KDChartPainter::unregisterPainter()" ); + tqDebug( "Sorry, not implemented: KDChartPainter::unregisterPainter()" ); } @@ -247,7 +247,7 @@ void KDChartPainter::paint( TQPainter* painter, if( rect ) drawRect = *rect; else if( !KDChart::painterToDrawRect( painter, drawRect ) ){ - qDebug("ERROR: KDChartPainter::paint() could not calculate the drawing area."); + tqDebug("ERROR: KDChartPainter::paint() could not calculate the drawing area."); return; } setupGeometry( painter, data, drawRect ); @@ -255,7 +255,7 @@ void KDChartPainter::paint( TQPainter* painter, else drawRect = _outermostRect; - //qDebug("A2: _legendRect:\n%i,%i\n%i,%i", _legendRect.left(),_legendRect.top(),_legendRect.right(),_legendRect.bottom() ); + //tqDebug("A2: _legendRect:\n%i,%i\n%i,%i", _legendRect.left(),_legendRect.top(),_legendRect.right(),_legendRect.bottom() ); // Note: In addition to the below paintArea calls there might be several @@ -628,11 +628,11 @@ void KDChartPainter::paintDataValues( TQPainter* painter, if(anchor.x() < -250){ anchor.setX(-250); - //qDebug("!! bad negative x position in KDChartPainter::paintDataValues() !!"); + //tqDebug("!! bad negative x position in KDChartPainter::paintDataValues() !!"); } if(anchor.y() < -2500){ anchor.setY(-2500); - //qDebug("!! bad negative y position in KDChartPainter::paintDataValues() !!"); + //tqDebug("!! bad negative y position in KDChartPainter::paintDataValues() !!"); } int rotation( params()->dataValuesRotation( region->chart, @@ -1358,7 +1358,7 @@ TQFont KDChartPainter::trueLegendTitleFont() const static_cast < int > ( params()->legendTitleFontRelSize() * averageValueP1000 ); font.setPixelSize( nTxtHeight ); - // qDebug("l-t-height %i",nTxtHeight); + // tqDebug("l-t-height %i",nTxtHeight); } return font; } @@ -1394,8 +1394,8 @@ void KDChartPainter::paintLegend( TQPainter* painter, painter->drawRect( _legendRect ); } */ - //qDebug("B: _legendRect:\n %i,%i\n %i,%i", _legendRect.left(),_legendRect.top(),_legendRect.right(),_legendRect.bottom() ); - //qDebug("B: legendArea():\n %i,%i\n %i,%i\n", _params->legendArea().left(),_params->legendArea().top(),_params->legendArea().right(),_params->legendArea().bottom() ); + //tqDebug("B: _legendRect:\n %i,%i\n %i,%i", _legendRect.left(),_legendRect.top(),_legendRect.right(),_legendRect.bottom() ); + //tqDebug("B: legendArea():\n %i,%i\n %i,%i\n", _params->legendArea().left(),_params->legendArea().top(),_params->legendArea().right(),_params->legendArea().bottom() ); const int em2 = 2 * _legendEMSpace; const int em4 = 4 * _legendEMSpace; @@ -1879,7 +1879,7 @@ void KDChartPainter::calculateAllAxesRects( // iterate over all axes uint iAxis; for ( iAxis = 0; iAxis < KDCHART_MAX_AXES; ++iAxis ) { - //qDebug( "iAxis %i", iAxis ); + //tqDebug( "iAxis %i", iAxis ); const KDChartAxisParams& para = params()->axisParams( iAxis ); int areaSize = 0; @@ -1917,7 +1917,7 @@ void KDChartPainter::calculateAllAxesRects( dataDataset, dataDataset2, KDCHART_ALL_CHARTS ) ) { - qDebug( "IMPLEMENTATION ERROR: findDataset( DataEntry, ... ) should *always* return true. (a)" ); + tqDebug( "IMPLEMENTATION ERROR: findDataset( DataEntry, ... ) should *always* return true. (a)" ); dataDataset = KDCHART_ALL_DATASETS; } TQVariant::Type valType = TQVariant::Invalid; @@ -1987,7 +1987,7 @@ void KDChartPainter::calculateAllAxesRects( break; case KDChartAxisParams::AxisAreaModeMinMaxSize: { - qDebug( "Sorry, not implemented: AxisAreaModeMinMaxSize" ); + tqDebug( "Sorry, not implemented: AxisAreaModeMinMaxSize" ); } // @@ -2157,7 +2157,7 @@ void KDChartPainter::setupGeometry( TQPainter* painter, KDChartTableDataBase* data, const TQRect& drawRect ) { - //qDebug("INVOKING: KDChartPainter::setupGeometry()"); + //tqDebug("INVOKING: KDChartPainter::setupGeometry()"); // avoid recursion from repaint() being called due to params() changed signals... const bool oldBlockSignalsState = params()->signalsBlocked(); const_cast < KDChartParams* > ( params() )->blockSignals( true ); @@ -2248,7 +2248,7 @@ void KDChartPainter::setupGeometry( TQPainter* painter, font ); _legendTitleWidth = _legendTitle->width(); _legendTitleHeight = _legendTitle->height(); - // qDebug("1. _legendTitleHeight %i",_legendTitleHeight); + // tqDebug("1. _legendTitleHeight %i",_legendTitleHeight); } painter->setFont( trueLegendFont() ); @@ -2284,7 +2284,7 @@ void KDChartPainter::setupGeometry( TQPainter* painter, // have some space before the boundary line comes). sizeX = TQMAX( sizeX, _legendTitleWidth + _legendEMSpace*2 ); - //qDebug("setupGeometry mustDrawVerticalLegend: %s", mustDrawVerticalLegend() ? "YES":"NO "); + //tqDebug("setupGeometry mustDrawVerticalLegend: %s", mustDrawVerticalLegend() ? "YES":"NO "); // PENDING Michel: do that after having calculated the position if( !mustDrawVerticalLegend() ){ @@ -2303,7 +2303,7 @@ void KDChartPainter::setupGeometry( TQPainter* painter, _legendRect = TQRect( xposLeft + ( (xposRight-xposLeft) - sizeX ) / 2, yposTop, sizeX, sizeY ); yposTop = _legendRect.bottom() + params()->legendSpacing(); - //qDebug("A: _legendRect:\n%i,%i\n%i,%i", _legendRect.left(),_legendRect.top(),_legendRect.right(),_legendRect.bottom() ); + //tqDebug("A: _legendRect:\n%i,%i\n%i,%i", _legendRect.left(),_legendRect.top(),_legendRect.right(),_legendRect.bottom() ); break; case KDChartParams::LegendBottom: if ( params()->showGrid() ) @@ -2413,7 +2413,7 @@ void KDChartPainter::setupGeometry( TQPainter* painter, break; default: // Should not be able to happen - qDebug( "KDChart: Unknown legend position" ); + tqDebug( "KDChart: Unknown legend position" ); } _params->setLegendArea( _legendRect ); @@ -2517,7 +2517,7 @@ void KDChartPainter::findLegendTexts( KDChartTableDataBase* data ) } default: // Should not happen - qDebug( "KDChart: Unknown legend source" ); + tqDebug( "KDChart: Unknown legend source" ); } } diff --git a/libkdchart/KDChartParams.cpp b/libkdchart/KDChartParams.cpp index e59443f..efc2362 100644 --- a/libkdchart/KDChartParams.cpp +++ b/libkdchart/KDChartParams.cpp @@ -628,9 +628,9 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet ) rSet.deepCopy( &startSet ); // reset all properties of rSet to the default !! -//qDebug("in KDChartParams::calculateProperties():"); -//qDebug(" startId: %i",startId); -//qDebug(" startSet: %s",startSet.name().latin1()); +//tqDebug("in KDChartParams::calculateProperties():"); +//tqDebug(" startId: %i",startId); +//tqDebug(" startSet: %s",startSet.name().latin1()); bool bOk = properties(startId, startSet); if( bOk ){ @@ -1273,7 +1273,7 @@ void KDChartParams::setPrintDataValues( bool active, break; default: { - qDebug( "IMPLEMENTATION ERROR: Unknown chartType in setPrintDataValues()" ); + tqDebug( "IMPLEMENTATION ERROR: Unknown chartType in setPrintDataValues()" ); finished = false; // use build-in default params, see KDChartParams.h::setPrintDataValues() } } @@ -1661,7 +1661,7 @@ bool KDChartParams::findDatasets( SourceMode modeA, dataset2 = TQMAX(dsA2, dsB2); res = true; }else{ - qDebug("ERROR in KDChartParams::findDatasets(): Datasets found are *not* a contiguous series."); + tqDebug("ERROR in KDChartParams::findDatasets(): Datasets found are *not* a contiguous series."); } }else{ dataset = foundA ? dsA1 : dsB1; @@ -2005,7 +2005,7 @@ void KDChartParams::setDefaultAxesTypes() setAxisLabelsTouchEdges( i, false ); break; default: { - qDebug( "IMPLEMENTATION ERROR: axis type missing in KDChartParams::setDefaultAxesTypes()" ); + tqDebug( "IMPLEMENTATION ERROR: axis type missing in KDChartParams::setDefaultAxesTypes()" ); Q_ASSERT( !this ); } } @@ -2170,7 +2170,7 @@ void KDChartParams::setDefaultAxesTypes() setPolarRotateCircularLabels( false ); break; default: { - qDebug( "IMPLEMENTATION ERROR: type missing in KDChartParams::setDefaultAxesTypes()" ); + tqDebug( "IMPLEMENTATION ERROR: type missing in KDChartParams::setDefaultAxesTypes()" ); Q_ASSERT( !this ); } } @@ -2241,7 +2241,7 @@ void KDChartParams::activateDefaultAxes() // by default there are no axes defined for pie, ring, and polar charts break; default: { - qDebug( "IMPLEMENTATION ERROR: type missing in KDChartParams::activateDefaultAxes()" ); + tqDebug( "IMPLEMENTATION ERROR: type missing in KDChartParams::activateDefaultAxes()" ); Q_ASSERT( !this ); } } @@ -9291,7 +9291,7 @@ void KDChartParams::setAxisTitle( uint n, const TQString& axisTitle ) box->content().font() ); box->setContent( textPiece ); - //qDebug ("old Axis Title updated"); + //tqDebug ("old Axis Title updated"); bDone = true; } } @@ -9302,7 +9302,7 @@ void KDChartParams::setAxisTitle( uint n, const TQString& axisTitle ) false, TQFont(), false, false, false, 0 ); - //qDebug("new Axis Title Box inserted"); + //tqDebug("new Axis Title Box inserted"); } emit changed(); } diff --git a/libkdchart/KDChartParams_frame.cpp b/libkdchart/KDChartParams_frame.cpp index 2c8d92e..60dc529 100644 --- a/libkdchart/KDChartParams_frame.cpp +++ b/libkdchart/KDChartParams_frame.cpp @@ -160,7 +160,7 @@ bool KDChartParams::KDChartFrameSettings::readFrameSettingsNode( const TQDomElem } else if( tagName == "AddFrameHeightToLayout" ) { ok = ok & KDXML::readBoolNode( element, tempAddFrameHeightToLayout ); } else { - qDebug( "Unknown tag in frame settings" ); + tqDebug( "Unknown tag in frame settings" ); } } node = node.nextSibling(); diff --git a/libkdchart/KDChartParams_io.cpp b/libkdchart/KDChartParams_io.cpp index 86f37d6..19b5c39 100644 --- a/libkdchart/KDChartParams_io.cpp +++ b/libkdchart/KDChartParams_io.cpp @@ -1339,7 +1339,7 @@ void KDChartParams::loadAxesFormXML(int& curAxisSettings, TQDomElement& element) if( KDXML::readBoolNode( element, blockAlign ) ) axisSettings->_axisLabelsBlockAlign = blockAlign; } else { - qDebug( "Unknown subelement of AxisSettings found: %s", tagName.latin1() ); + tqDebug( "Unknown subelement of AxisSettings found: %s", tagName.latin1() ); } } node = node.nextSibling(); @@ -1395,7 +1395,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) _dataSourceModeAndChart[dataset] = KDChartParams::ModeAndChart( sourceMode, chart ); } } else { - qDebug( "Unknown subelement of ModeAndChartMap found: %s", tagName.latin1() ); + tqDebug( "Unknown subelement of ModeAndChartMap found: %s", tagName.latin1() ); } } node = node.nextSibling(); @@ -1462,7 +1462,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) if( element.hasAttribute( "Style" ) ) _outlineDataLineStyle = KDXML::stringToPenStyle( element.attribute( "Style" ) ); } else { - qDebug( "!!!Unknown subelement of ColorSettings found: %s", tagName.latin1() ); + tqDebug( "!!!Unknown subelement of ColorSettings found: %s", tagName.latin1() ); } } node = node.nextSibling(); @@ -1510,7 +1510,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) if( KDXML::readBoolNode( element, solidExcessArrows ) ) _solidExcessArrows = solidExcessArrows; } else { - qDebug( "Unknown subelement of BarSettings found: %s", tagName.latin1() ); + tqDebug( "Unknown subelement of BarSettings found: %s", tagName.latin1() ); } } node = node.nextSibling(); @@ -1599,7 +1599,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) if( KDXML::readIntNode( element, rotation ) ) _threeDLineYRotation = rotation; } else { - qDebug( "Unknown subelement of LineSettings found: %s", tagName.latin1() ); + tqDebug( "Unknown subelement of LineSettings found: %s", tagName.latin1() ); } } node = node.nextSibling(); @@ -1619,7 +1619,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) if( KDXML::readStringNode( element, string ) ) _areaLocation = KDChartParams::stringToAreaLocation( string ); } else { - qDebug( "Unknown subelement of AreaSettings found: %s", tagName.latin1() ); + tqDebug( "Unknown subelement of AreaSettings found: %s", tagName.latin1() ); } } node = node.nextSibling(); @@ -1666,7 +1666,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) if( KDXML::readBoolNode( element, relativeRingThickness ) ) _relativeRingThickness = relativeRingThickness; } else { - qDebug( "Unknown subelement of PieRingSettings found: %s", tagName.latin1() ); + tqDebug( "Unknown subelement of PieRingSettings found: %s", tagName.latin1() ); } } node = node.nextSibling(); @@ -1734,7 +1734,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) if( KDXML::readColorNode( element, color ) ) _hiLoChartCloseValuesColor = color; } else { - qDebug( "Unknown subelement of HiLoSettings found: %s", tagName.latin1() ); + tqDebug( "Unknown subelement of HiLoSettings found: %s", tagName.latin1() ); } } node = node.nextSibling(); @@ -1803,15 +1803,15 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) if( KDXML::readBrushNode( element, brush ) ) _BWChartStatistics[ i ].brush = brush; } else { - qDebug( "Unknown subelement of BoxAndWhiskerSettings found: %s", tagName.latin1() ); + tqDebug( "Unknown subelement of BoxAndWhiskerSettings found: %s", tagName.latin1() ); } } } } else { - qDebug( "Unknown subelement of BoxAndWhiskerSettings found: %s", tagName.latin1() ); + tqDebug( "Unknown subelement of BoxAndWhiskerSettings found: %s", tagName.latin1() ); } } else { - qDebug( "Unknown subelement of BoxAndWhiskerSettings found: %s", tagName.latin1() ); + tqDebug( "Unknown subelement of BoxAndWhiskerSettings found: %s", tagName.latin1() ); } } node = node.nextSibling(); @@ -1864,7 +1864,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) if( KDXML::readIntNode( element, polarLineWidth ) ) _polarLineWidth = polarLineWidth; } else { - qDebug( "Unknown subelement of PolarSettings found: %s", tagName.latin1() ); + tqDebug( "Unknown subelement of PolarSettings found: %s", tagName.latin1() ); } } node = node.nextSibling(); @@ -1931,7 +1931,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) if( KDXML::readIntNode( element, spacing ) ) _legendSpacing = spacing; } else { - qDebug( "Unknown subelement of LegendSettings found: %s", tagName.latin1() ); + tqDebug( "Unknown subelement of LegendSettings found: %s", tagName.latin1() ); } } node = node.nextSibling(); @@ -1962,7 +1962,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) if( KDXML::readColorNode( element, color ) ) hfSettings->_color = color; } else { - qDebug( "Unknown subelement of HeaderFooterSettings found: %s", tagName.latin1() ); + tqDebug( "Unknown subelement of HeaderFooterSettings found: %s", tagName.latin1() ); } } node = node.nextSibling(); @@ -1994,7 +1994,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) if( KDXML::readIntNode( element, value ) ) _globalLeadingBottom = value; } else { - qDebug( "Unknown subelement of GlobalLeading found: %s", tagName.latin1() ); + tqDebug( "Unknown subelement of GlobalLeading found: %s", tagName.latin1() ); } } node = node.nextSibling(); @@ -2076,7 +2076,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) } else if( tagName == "ShowInfinite" ) { KDXML::readBoolNode( element, _printDataValuesSettings._dataValuesShowInfinite ); } else { - qDebug( "Unknown subelement of DataValuesSettings1 found: %s", tagName.latin1() ); + tqDebug( "Unknown subelement of DataValuesSettings1 found: %s", tagName.latin1() ); } } node = node.nextSibling(); @@ -2158,7 +2158,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) } else if( tagName == "ShowInfinite" ) { KDXML::readBoolNode( element, _printDataValuesSettings2._dataValuesShowInfinite ); } else { - qDebug( "Unknown subelement of DataValuesSettings2 found: %s", tagName.latin1() ); + tqDebug( "Unknown subelement of DataValuesSettings2 found: %s", tagName.latin1() ); } } node = node.nextSibling(); @@ -2175,7 +2175,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) _allowOverlappingDataValueTexts = value; } else - qDebug( "Unknown subelement of DataValuesGlobalSettings found: %s", tagName.latin1() ); + tqDebug( "Unknown subelement of DataValuesGlobalSettings found: %s", tagName.latin1() ); // do _not_ return false here (to enable future extentions) } node = node.nextSibling(); @@ -2204,7 +2204,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) } } else - qDebug( "Unknown tag in AreaMap found: %s", tagName.latin1() ); + tqDebug( "Unknown tag in AreaMap found: %s", tagName.latin1() ); // do _not_ return false here (to enable future extentions) } node = node.nextSibling(); @@ -2226,12 +2226,12 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) _customBoxDict.insert( curNumber, customBox.clone() ); } else - qDebug( "Unknown tag in CustomBoxMap found: %s", tagName.latin1() ); + tqDebug( "Unknown tag in CustomBoxMap found: %s", tagName.latin1() ); } node = node.nextSibling(); } } else { - qDebug( "Unknown second-level element found: %s", tagName.latin1() ); + tqDebug( "Unknown second-level element found: %s", tagName.latin1() ); // NOTE: We do *not* 'return false' here but continue normal operation // since additional elements might have been added in future versions } @@ -2400,7 +2400,7 @@ bool KDChartParams::readColorMapNode( const TQDomElement& element, KDXML::readColorNode( element, color ); value->insert( curDataset, color ); } else { - qDebug( "Unknown tag in color map" ); + tqDebug( "Unknown tag in color map" ); } } node = node.nextSibling(); @@ -2434,7 +2434,7 @@ bool KDChartParams::readDoubleMapNode( const TQDomElement& element, KDXML::readDoubleNode( element, doubleValue ); value->insert( curValue, doubleValue ); } else { - qDebug( "Unknown tag in double map" ); + tqDebug( "Unknown tag in double map" ); } } node = node.nextSibling(); @@ -2480,7 +2480,7 @@ bool KDChartParams::readChartFontNode( const TQDomElement& element, } else if( tagName == "MinFontSize" ) { ok = ok & KDXML::readIntNode( element, tempMinFontSize ); } else { - qDebug( "Unknown tag in color map" ); + tqDebug( "Unknown tag in color map" ); } } node = node.nextSibling(); @@ -2632,7 +2632,7 @@ TQString KDChartParams::markerStyleToString( int style ) case LineMarkerFastCross: return "fast Cross"; default: // should not happen - qDebug( "Unknown marker style" ); + tqDebug( "Unknown marker style" ); return "Circle"; } } @@ -2656,7 +2656,7 @@ TQString KDChartParams::markerStyleToStringTr( int style ) case LineMarkerFastCross: return tr( "fast Cross" ); default: // should not happen - qDebug( "Unknown line marker style!" ); + tqDebug( "Unknown line marker style!" ); return tr( "Circle" ); } } @@ -2722,7 +2722,7 @@ TQString KDChartParams::barChartSubTypeToString( BarChartSubType type ) { case BarMultiRows: return "BarMultiRows"; default: // should not happen - qDebug( "Unknown bar type" ); + tqDebug( "Unknown bar type" ); return "BarNormal"; } } @@ -2783,7 +2783,7 @@ TQString KDChartParams::lineChartSubTypeToString( LineChartSubType type ) { case LinePercent: return "LinePercent"; default: // should not happen - qDebug( "Unknown bar type" ); + tqDebug( "Unknown bar type" ); return "LineNormal"; } } @@ -2854,7 +2854,7 @@ TQString KDChartParams::areaChartSubTypeToString( AreaChartSubType type ) { case AreaPercent: return "AreaPercent"; default: // should not happen - qDebug( "Unknown area chart subtype" ); + tqDebug( "Unknown area chart subtype" ); return "AreaNormal"; } } @@ -2891,7 +2891,7 @@ TQString KDChartParams::areaLocationToString( AreaLocation type ) { case AreaBelow: return "Below"; default: // should not happen - qDebug( "Unknown area location" ); + tqDebug( "Unknown area location" ); return "Below"; } } @@ -2946,7 +2946,7 @@ TQString KDChartParams::polarChartSubTypeToString( PolarChartSubType type ) { case LinePercent: return "PolarPercent"; default: // should not happen - qDebug( "Unknown polar type" ); + tqDebug( "Unknown polar type" ); return "PolarNormal"; } } @@ -3018,7 +3018,7 @@ TQString KDChartParams::hiLoChartSubTypeToString( HiLoChartSubType type ) { case HiLoOpenClose: return "HiLoOpenClose"; default: // should not happen - qDebug( "Unknown HiLo chart subtype" ); + tqDebug( "Unknown HiLo chart subtype" ); return "HiLoNormal"; } } @@ -3084,7 +3084,7 @@ TQString KDChartParams::bWChartStatValToString( BWStatVal type ) { case MinValue: return "MinValue"; default: // should not happen - qDebug( "Unknown BoxWhisker statistical value type" ); + tqDebug( "Unknown BoxWhisker statistical value type" ); return "unknown"; } } @@ -3164,7 +3164,7 @@ TQString KDChartParams::legendPositionToString( LegendPosition pos ) { case LegendBottomRightRight: return "LegendBottomRightRight"; default: // should not happen - qDebug( "Unknown legend position" ); + tqDebug( "Unknown legend position" ); return "LegendLeft"; } } @@ -3230,7 +3230,7 @@ TQString KDChartParams::legendSourceToString( LegendSource source ) { case LegendAutomatic: return "Automatic"; default: // should not happen - qDebug( "Unknown legend source" ); + tqDebug( "Unknown legend source" ); return "Automatic"; } } @@ -3326,7 +3326,7 @@ TQString KDChartParams::bWChartSubTypeToString( BWChartSubType type ) { case BWSimple: return "BWSimple"; default: // should not happen - qDebug( "Unknown BoxWhisker chart subtype" ); + tqDebug( "Unknown BoxWhisker chart subtype" ); return "BWNormal"; } } diff --git a/libkdchart/KDChartPolarPainter.cpp b/libkdchart/KDChartPolarPainter.cpp index 99cee95..4bf6ca0 100644 --- a/libkdchart/KDChartPolarPainter.cpp +++ b/libkdchart/KDChartPolarPainter.cpp @@ -256,11 +256,11 @@ void KDChartPolarPainter::paintData( TQPainter* painter, dtDeltaScale ); labelTexts = ( TQStringList* ) paraCircular.axisLabelTexts(); if( paraCircular.axisLabelsVisible() ) { -//qDebug("\nnTxtHeight: "+TQString::number(nTxtHeight)); +//tqDebug("\nnTxtHeight: "+TQString::number(nTxtHeight)); // calculate font size actFont = paraCircular.axisLabelsFont(); if ( paraCircular.axisLabelsFontUseRelSize() ) { -//qDebug("paraCircular.axisLabelsFontUseRelSize() is TRUE"); +//tqDebug("paraCircular.axisLabelsFontUseRelSize() is TRUE"); actFont.setPointSizeFloat( nTxtHeight ); } TQFontMetrics fm( actFont ); diff --git a/libkdchart/KDChartPropertySet.cpp b/libkdchart/KDChartPropertySet.cpp index 247a918..f2b65ac 100644 --- a/libkdchart/KDChartPropertySet.cpp +++ b/libkdchart/KDChartPropertySet.cpp @@ -371,7 +371,7 @@ bool KDChartPropertySet::loadXML( const TQDomElement& element, KDChartPropertySe set.mExtraMarkersStyle = KDChartParams::stringToLineMarkerStyle( element.attribute( "Style" ) ); } else { - qDebug( "Unknown subelement of KDChartPropertySet found: %s", tagName.latin1() ); + tqDebug( "Unknown subelement of KDChartPropertySet found: %s", tagName.latin1() ); } } node = node.nextSibling(); diff --git a/libkdchart/KDChartRingPainter.cpp b/libkdchart/KDChartRingPainter.cpp index ba1e6fe..68462b8 100644 --- a/libkdchart/KDChartRingPainter.cpp +++ b/libkdchart/KDChartRingPainter.cpp @@ -342,7 +342,7 @@ void KDChartRingPainter::drawOneSegment( TQPainter* painter, painter->drawEllipse( datReg->points[ KDChartEnums::PosBottomLeft ].x() - 2, datReg->points[ KDChartEnums::PosBottomLeft ].y() - 2, 5, 5); - qDebug( "\ncenter: (%i, %i)", + tqDebug( "\ncenter: (%i, %i)", datReg->points[ KDChartEnums::PosCenter ].x(), datReg->points[ KDChartEnums::PosCenter ].y() ); painter->drawEllipse( datReg->points[ KDChartEnums::PosTopCenter ].x() - 2, diff --git a/libkdchart/KDChartTableBase.cpp b/libkdchart/KDChartTableBase.cpp index fcec2c5..fddb6c9 100644 --- a/libkdchart/KDChartTableBase.cpp +++ b/libkdchart/KDChartTableBase.cpp @@ -593,12 +593,12 @@ double KDChartTableDataBase::maxInRows( uint row, uint row2, int coordinate ) co if ( 0 < usedRows() ) { uint a = row; uint z = row2; - // qDebug("KDChartTableDataBase::maxInRows() (1) a: %u z: %u", a, z); + // tqDebug("KDChartTableDataBase::maxInRows() (1) a: %u z: %u", a, z); if ( usedRows() <= a ) a = usedRows() - 1; if ( usedRows() <= z ) z = usedRows() - 1; - // qDebug("KDChartTableDataBase::maxInRows() (2) a: %u z: %u", a, z); + // tqDebug("KDChartTableDataBase::maxInRows() (2) a: %u z: %u", a, z); for ( uint row = a; row <= z; ++row ) { TQVariant value; double dVal; @@ -628,12 +628,12 @@ double KDChartTableDataBase::minInRows( uint row, uint row2, int coordinate, boo if ( 0 < usedRows() ) { uint a = row; uint z = row2; - // qDebug("KDChartTableDataBase::minInRows() (1) a: %u z: %u", a, z); + // tqDebug("KDChartTableDataBase::minInRows() (1) a: %u z: %u", a, z); if ( usedRows() <= a ) a = usedRows() - 1; if ( usedRows() <= z ) z = usedRows() - 1; - //qDebug("KDChartTableDataBase::minInRows() (2) a: %u z: %u", a, z); + //tqDebug("KDChartTableDataBase::minInRows() (2) a: %u z: %u", a, z); for ( uint row = a; row <= z; ++row ) { TQVariant value; double dVal; diff --git a/libkdchart/KDChartTextPiece.cpp b/libkdchart/KDChartTextPiece.cpp index b95165f..ddb9c0f 100644 --- a/libkdchart/KDChartTextPiece.cpp +++ b/libkdchart/KDChartTextPiece.cpp @@ -76,11 +76,11 @@ KDChartTextPiece::KDChartTextPiece( TQPainter *p, const TQString& text, const TQ if( TQStyleSheet::mightBeRichText( text ) ) { _isRichText = true; _richText = new TQSimpleRichText( text, font ); - //qDebug( "richtext width %s", TQString::number(_richText->width()).latin1()); - //qDebug( "richtext height %s", TQString::number(_richText->height()).latin1()); + //tqDebug( "richtext width %s", TQString::number(_richText->width()).latin1()); + //tqDebug( "richtext height %s", TQString::number(_richText->height()).latin1()); _richText->adjustSize(); - //qDebug( "richtext width %s", TQString::number(_richText->width()).latin1()); - //qDebug( "richtext height %s", TQString::number(_richText->height()).latin1()); + //tqDebug( "richtext width %s", TQString::number(_richText->width()).latin1()); + //tqDebug( "richtext height %s", TQString::number(_richText->height()).latin1()); } else { _isRichText = false; @@ -91,13 +91,13 @@ KDChartTextPiece::KDChartTextPiece( TQPainter *p, const TQString& text, const TQ _dirtyMetrics = (p == 0); if( _dirtyMetrics ) { _metrics = new TQFontMetrics( font ); - //qDebug("dirty metrics text: %s", text.latin1()); + //tqDebug("dirty metrics text: %s", text.latin1()); } else{ p->save(); p->setFont( font ); _metrics = new TQFontMetrics( p->fontMetrics() ); - //qDebug ( "drawing metrics text: %s", text.latin1() ); + //tqDebug ( "drawing metrics text: %s", text.latin1() ); //p->drawRect( _metrics->boundingRect( text) ); //p->drawText( _metrics->boundingRect(text).bottomRight(), text); p->restore(); @@ -160,12 +160,12 @@ int KDChartTextPiece::height() const { if( _isRichText ) { - //qDebug ("_richText height %s", TQString::number(_richText->height()).latin1()); + //tqDebug ("_richText height %s", TQString::number(_richText->height()).latin1()); return _richText->height(); } else { - //qDebug ("_metrics height %s", TQString::number(_metrics->height()).latin1()); + //tqDebug ("_metrics height %s", TQString::number(_metrics->height()).latin1()); return _metrics->height(); } } diff --git a/libkdchart/KDDrawText.cpp b/libkdchart/KDDrawText.cpp index c098513..09c0bb7 100644 --- a/libkdchart/KDDrawText.cpp +++ b/libkdchart/KDDrawText.cpp @@ -124,7 +124,7 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter, { // showAnchor=true; - //qDebug("\nanchor: "+ text + " / "+TQString::number(anchor.x()) + //tqDebug("\nanchor: "+ text + " / "+TQString::number(anchor.x()) // +" / "+TQString::number(anchor.y())); bool useInfos = doNotCalculate && infos; bool fontChanged = ( 0 != font ); @@ -219,11 +219,11 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter, } int x = useInfos ? infos->x : pos.x(); int y = useInfos ? infos->y : pos.y(); - //qDebug("1.: (x / y) :" + text + " / "+TQString::number(x) + //tqDebug("1.: (x / y) :" + text + " / "+TQString::number(x) // +" / "+TQString::number(y)); - //qDebug("2.: (posx / posy) :" + text ); - // qDebug ( "%d", pos.x() ); qDebug ( "%d", pos.y() ); - //qDebug("3.: (infosx / infosy) :" + text + " / "+TQString::number(infos->x) + //tqDebug("2.: (posx / posy) :" + text ); + // tqDebug ( "%d", pos.x() ); tqDebug ( "%d", pos.y() ); + //tqDebug("3.: (infosx / infosy) :" + text + " / "+TQString::number(infos->x) // +" / "+TQString::number(infos->y)); if( !useInfos && !optimizeOutputForScreen ) { @@ -231,7 +231,7 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter, case TQt::AlignLeft: break; case TQt::AlignRight: -//qDebug( TQPaintDeviceMetrics::logicalDpiX() ); +//tqDebug( TQPaintDeviceMetrics::logicalDpiX() ); x -= txtWidth; break; case TQt::AlignHCenter: @@ -254,11 +254,11 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter, infos->x = x - 4; infos->y = y - 4; //PENDING Michel updating info using x , y from pos - //qDebug("4.: (infosx / infosy) :" + text + " / "+TQString::number(infos->x) + //tqDebug("4.: (infosx / infosy) :" + text + " / "+TQString::number(infos->x) //+" / "+TQString::number(infos->y)); - //qDebug("5.: (x / y) :" + text + " / "+TQString::number(x) + //tqDebug("5.: (x / y) :" + text + " / "+TQString::number(x) // +" / "+TQString::number(y)); - //qDebug("6.: (anchorx /anchory) :" + text + " / "+TQString::number(x) + //tqDebug("6.: (anchorx /anchory) :" + text + " / "+TQString::number(x) // +" / "+TQString::number(y)); TQRect rect( painter->boundingRect( x, y, txtWidth, txtHeight, @@ -312,7 +312,7 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter, } if( !calculateOnly ){ - //qDebug("txtWidth: %i txtHeight: %i", txtWidth, txtHeight); + //tqDebug("txtWidth: %i txtHeight: %i", txtWidth, txtHeight); if( !optimizeOutputForScreen ){ /* painter->drawText( x, y, @@ -464,7 +464,7 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter, } break; } - //qDebug("2.: (x / y) : "+TQString::number(x) + //tqDebug("2.: (x / y) : "+TQString::number(x) // +" / "+TQString::number(y)); painter->drawPixmap( TQPoint( x - pixPoint.x(), y - pixPoint.y() ), diff --git a/libkdchart/KDFrame.cpp b/libkdchart/KDFrame.cpp index 3904bf1..7a21930 100644 --- a/libkdchart/KDFrame.cpp +++ b/libkdchart/KDFrame.cpp @@ -127,9 +127,9 @@ void KDFrame::paintEdges( TQPainter& painter, const TQRect& innerRect ) const TQPen thePen; thePen = section->pen(); int penWidth = TQMAX(thePen.width(), 1) * TQMAX(section->width(), 1); -//qDebug("paintEdges: thePen.width() = %i", thePen.width()); -//qDebug("paintEdges: section->width() = %i", section->width()); -//qDebug("paintEdges: penWidth = %i", penWidth); +//tqDebug("paintEdges: thePen.width() = %i", thePen.width()); +//tqDebug("paintEdges: section->width() = %i", section->width()); +//tqDebug("paintEdges: penWidth = %i", penWidth); thePen.setWidth( penWidth ); painter.setPen( thePen ); painter.setBrush( TQt::NoBrush ); @@ -262,13 +262,13 @@ void KDFrame::setSimpleFrame( SimpleFrame frame, _backPixmap = backPixmap ? *backPixmap : TQPixmap(); _backPixmapMode = backPixmapMode; if( FrameFlat == frame ) { - //qDebug("_profileSections.count() before = %i", _profileSections.count()); + //tqDebug("_profileSections.count() before = %i", _profileSections.count()); KDFrameProfileSection* newsection = new KDFrameProfileSection( KDFrameProfileSection::DirPlain, KDFrameProfileSection::CvtPlain, lineWidth, pen ); _profileSections.append( newsection ); - //qDebug( "_profileSections.count() after = %i, lineWidth = %i", + //tqDebug( "_profileSections.count() after = %i, lineWidth = %i", // _profileSections.count(), // lineWidth ); _topProfile.append( newsection ); @@ -526,7 +526,7 @@ bool KDFrame::readFrameNode( const TQDomElement& element, KDFrame& frame ) ok = ok & KDFrameCorner::readFrameCornerNode( element, tempCornerBR ); } else { - qDebug( "Unknown tag in frame" ); + tqDebug( "Unknown tag in frame" ); } } node = node.nextSibling(); @@ -567,7 +567,7 @@ bool KDFrame::readFrameProfileNode( const TQDomElement& element, section ); profile.append( section ); } else { - qDebug( "Unknown tag in double map" ); + tqDebug( "Unknown tag in double map" ); return false; } } @@ -600,7 +600,7 @@ bool KDFrame::KDFrameCorner::readFrameCornerNode( const TQDomElement& element, KDFrameProfile profile; ok = ok & readFrameProfileNode( element, profile ); } else { - qDebug( "Unknown tag in frame" ); + tqDebug( "Unknown tag in frame" ); } } node = node.nextSibling(); diff --git a/libkdchart/KDFrameProfileSection.cpp b/libkdchart/KDFrameProfileSection.cpp index 38c6fa4..a8b69e8 100644 --- a/libkdchart/KDFrameProfileSection.cpp +++ b/libkdchart/KDFrameProfileSection.cpp @@ -78,7 +78,7 @@ bool KDFrameProfileSection::readFrameProfileSectionNode( const TQDomElement& ele } else if( tagName == "Style" || tagName == "Pen" ) { ok = ok & KDXML::readPenNode( element, tempPen ); } else { - qDebug( "Unknown tag in frame" ); + tqDebug( "Unknown tag in frame" ); } } node = node.nextSibling(); diff --git a/libkdchart/KDXMLTools.cpp b/libkdchart/KDXMLTools.cpp index bf03b36..21c4159 100644 --- a/libkdchart/KDXMLTools.cpp +++ b/libkdchart/KDXMLTools.cpp @@ -458,7 +458,7 @@ namespace KDXML { } else if( tagName == "Pixmap" ) { ok = ok & readPixmapNode( element, tempPixmap ); } else { - qDebug( "Unknown tag in brush" ); + tqDebug( "Unknown tag in brush" ); } } node = node.nextSibling(); @@ -490,7 +490,7 @@ namespace KDXML { ok = ok & readStringNode( element, formatName ); #ifndef NDEBUG if( formatName != "XPM.GZ" ) - qDebug( "Unsupported pixmap format in XML file" ); + tqDebug( "Unsupported pixmap format in XML file" ); #endif } else if( tagName == "Length" ) { int itempLength; @@ -499,7 +499,7 @@ namespace KDXML { } else if( tagName == "Data" ) { ok = ok & readStringNode( element, tempData ); } else { - qDebug( "Unknown tag in Pixmap" ); + tqDebug( "Unknown tag in Pixmap" ); } } node = node.nextSibling(); @@ -565,7 +565,7 @@ namespace KDXML { ok = ok & readStringNode( element, value ); tempStyle = stringToPenStyle( value ); } else { - qDebug( "Unknown tag in brush" ); + tqDebug( "Unknown tag in brush" ); } } node = node.nextSibling(); @@ -603,7 +603,7 @@ namespace KDXML { } else if( tagName == "CharSet" ) { ok = ok & readIntNode( element, charSet ); } else { - qDebug( "Unknown tag in color map" ); + tqDebug( "Unknown tag in color map" ); } } node = node.nextSibling(); @@ -641,7 +641,7 @@ namespace KDXML { } else if( tagName == "Y" ) { ok = ok & readIntNode( element, y ); } else { - qDebug( "Unknown tag in rect" ); + tqDebug( "Unknown tag in rect" ); } } node = node.nextSibling(); @@ -674,7 +674,7 @@ namespace KDXML { } else if( tagName == "Time" ) { ok = ok & readTimeNode( element, tempTime ); } else { - qDebug( "Unknown tag in datetime" ); + tqDebug( "Unknown tag in datetime" ); } } node = node.nextSibling(); diff --git a/libkgpgfile/kgpgfile.cpp b/libkgpgfile/kgpgfile.cpp index 56f3dd5..0cf449f 100644 --- a/libkgpgfile/kgpgfile.cpp +++ b/libkgpgfile/kgpgfile.cpp @@ -74,7 +74,7 @@ KGPGFile::KGPGFile(const TQString& fn, const TQString& homedir, const TQString& setName(fn); m_exitStatus = -2; m_comment = "created by KGPGFile"; - // qDebug("ungetchbuffer %d", m_ungetchBuffer.length()); + // tqDebug("ungetchbuffer %d", m_ungetchBuffer.length()); } KGPGFile::~KGPGFile() @@ -99,7 +99,7 @@ void KGPGFile::setName(const TQString& fn) TQDir dir(fn); m_fn = dir.absPath(); } - // qDebug("setName: '%s'", m_fn.data()); + // tqDebug("setName: '%s'", m_fn.data()); } void KGPGFile::flush(void) @@ -121,30 +121,30 @@ bool KGPGFile::open(int mode, const TQString& cmdArgs, bool skipPasswd) { bool useOwnPassphrase = (getenv("GPG_AGENT_INFO") == 0); - // qDebug("KGPGFile::open(%d)", mode); + // tqDebug("KGPGFile::open(%d)", mode); m_errmsg.resize(1); if(isOpen()) { - // qDebug("File already open"); + // tqDebug("File already open"); return false; } - // qDebug("check filename empty"); + // tqDebug("check filename empty"); if(m_fn.isEmpty()) return false; - // qDebug("setup file structures"); + // tqDebug("setup file structures"); init(); setMode(mode); - // qDebug("check valid access mode"); + // tqDebug("check valid access mode"); if(!(isReadable() || isWritable())) return false; if(isWritable()) { - // qDebug("check recipient count"); + // tqDebug("check recipient count"); if(m_recipient.count() == 0) return false; - // qDebug("check access rights"); + // tqDebug("check access rights"); if(!checkAccess(m_fn, W_OK)) return false; } @@ -191,11 +191,11 @@ bool KGPGFile::open(int mode, const TQString& cmdArgs, bool skipPasswd) pwd = TQCString(dlg.password()); } - // qDebug("starting GPG process"); + // tqDebug("starting GPG process"); if(!startProcess(args)) return false; - // qDebug("check GPG process running"); + // tqDebug("check GPG process running"); if(!m_process) { // if the process is not present anymore, we have to check // if it was a read operation and we might already have data @@ -209,9 +209,9 @@ bool KGPGFile::open(int mode, const TQString& cmdArgs, bool skipPasswd) } if(isReadable() && useOwnPassphrase && !skipPasswd) { - // qDebug("Passphrase is '%s'", pwd.data()); + // tqDebug("Passphrase is '%s'", pwd.data()); if(_writeBlock(pwd.data(), pwd.length()) == -1) { - // qDebug("Sending passphrase failed"); + // tqDebug("Sending passphrase failed"); return false; } m_process->closeStdin(); @@ -219,7 +219,7 @@ bool KGPGFile::open(int mode, const TQString& cmdArgs, bool skipPasswd) setState( IO_Open ); at( 0 ); - // qDebug("File open"); + // tqDebug("File open"); return true; } @@ -231,7 +231,7 @@ bool KGPGFile::startProcess(const TQStringList& args) *m_process << args; // TQString arglist = args.join(":"); - // qDebug("gpg '%s'", arglist.data()); + // tqDebug("gpg '%s'", arglist.data()); connect(m_process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotGPGExited(KProcess *))); @@ -246,7 +246,7 @@ bool KGPGFile::startProcess(const TQStringList& args) this, TQT_SLOT(slotSendDataToGPG(KProcess *))); if(!m_process->start(KProcess::NotifyOnExit, (KProcess::Communication)(KProcess::Stdin|KProcess::Stdout|KProcess::Stderr))) { - // qDebug("m_process->start failed"); + // tqDebug("m_process->start failed"); delete m_process; m_process = 0; return false; @@ -259,16 +259,16 @@ bool KGPGFile::startProcess(const TQStringList& args) void KGPGFile::close(void) { - // qDebug("KGPGFile::close()"); + // tqDebug("KGPGFile::close()"); if(!isOpen()) { - // qDebug("File not open"); + // tqDebug("File not open"); return; } // finish the KProcess and clean up things if(m_process) { if(isWritable()) { - // qDebug("Finish writing"); + // tqDebug("Finish writing"); if(m_process->isRunning()) { m_process->closeStdin(); // now wait for GPG to finish @@ -278,7 +278,7 @@ void KGPGFile::close(void) m_process->kill(); } else if(isReadable()) { - // qDebug("Finish reading"); + // tqDebug("Finish reading"); if(m_process->isRunning()) { m_process->closeStdout(); // now wait for GPG to finish @@ -291,7 +291,7 @@ void KGPGFile::close(void) m_ungetchBuffer = TQCString(); setState(0); m_recipient.clear(); - // qDebug("File closed"); + // tqDebug("File closed"); } int KGPGFile::getch(void) @@ -312,7 +312,7 @@ int KGPGFile::getch(void) ch = (readBlock(buf,1) == 1) ? (buf[0] & 0xff) : EOF; } - // qDebug("getch returns 0x%02X", ch); + // tqDebug("getch returns 0x%02X", ch); return ch; } @@ -324,7 +324,7 @@ int KGPGFile::ungetch(int ch) return EOF; if(ch != EOF) { - // qDebug("store 0x%02X in ungetchbuffer", ch & 0xff); + // tqDebug("store 0x%02X in ungetchbuffer", ch & 0xff); m_ungetchBuffer.insert(0, ch & 0xff); } @@ -391,7 +391,7 @@ TQ_LONG KGPGFile::readBlock(char *data, TQ_ULONG maxlen) m_ungetchBuffer.remove(0, l); if(!m_process) { - // qDebug("read %d bytes from unget buffer", nread); + // tqDebug("read %d bytes from unget buffer", nread); // dumpBuffer(oridata, nread); return nread; } @@ -399,7 +399,7 @@ TQ_LONG KGPGFile::readBlock(char *data, TQ_ULONG maxlen) // check for EOF if(!m_process) { - // qDebug("EOF (no process)"); + // tqDebug("EOF (no process)"); return EOF; } @@ -412,10 +412,10 @@ TQ_LONG KGPGFile::readBlock(char *data, TQ_ULONG maxlen) } // if nothing has been read (maxlen-m_readRemain == 0) then we assume EOF if((maxlen - m_readRemain) == 0) { - // qDebug("EOF (nothing read)"); + // tqDebug("EOF (nothing read)"); return EOF; } - // qDebug("return %d bytes", maxlen - m_readRemain); + // tqDebug("return %d bytes", maxlen - m_readRemain); // dumpBuffer(oridata, maxlen - m_readRemain); return maxlen - m_readRemain; } @@ -439,7 +439,7 @@ TQByteArray KGPGFile::readAll(void) void KGPGFile::slotGPGExited(KProcess* ) { - // qDebug("GPG finished"); + // tqDebug("GPG finished"); if(m_process) { if(m_process->normalExit()) { m_exitStatus = m_process->exitStatus(); @@ -460,7 +460,7 @@ void KGPGFile::slotGPGExited(KProcess* ) void KGPGFile::slotDataFromGPG(KProcess* proc, char* buf, int len) { - // qDebug("Received %d bytes on stdout", len); + // tqDebug("Received %d bytes on stdout", len); // copy current buffer to application int copylen; @@ -487,12 +487,12 @@ void KGPGFile::slotDataFromGPG(KProcess* proc, char* buf, int len) tqApp->exit_loop(); } } - // qDebug("end slotDataFromGPG"); + // tqDebug("end slotDataFromGPG"); } void KGPGFile::slotErrorFromGPG(KProcess *, char *buf, int len) { - // qDebug("Received %d bytes on stderr", len); + // tqDebug("Received %d bytes on stderr", len); TQCString msg; msg.setRawData(buf, len); m_errmsg += msg; @@ -501,7 +501,7 @@ void KGPGFile::slotErrorFromGPG(KProcess *, char *buf, int len) void KGPGFile::slotSendDataToGPG(KProcess *) { - // qDebug("wrote stdin"); + // tqDebug("wrote stdin"); if(m_needExitLoop) { m_needExitLoop = false; tqApp->exit_loop(); @@ -562,7 +562,7 @@ void KGPGFile::publicKeyList(TQStringList& list, const TQString& pattern) TQStringList::iterator it; TQString currentKey; for(it = lines.begin(); it != lines.end(); ++it) { - // qDebug("Parsing: '%s'", (*it).data()); + // tqDebug("Parsing: '%s'", (*it).data()); TQStringList fields = TQStringList::split(":", (*it), true); TQString val; if(fields[0] == "pub") { @@ -572,7 +572,7 @@ void KGPGFile::publicKeyList(TQStringList& list, const TQString& pattern) val = TQString("%1:%2").arg(currentKey).arg(fields[9]); map[val] = val; } else { - qDebug("'%s' is expired", fields[9].data()); + tqDebug("'%s' is expired", fields[9].data()); } } else if(fields[0] == "uid") { val = TQString("%1:%2").arg(currentKey).arg(fields[9]); @@ -610,7 +610,7 @@ void KGPGFile::secretKeyList(TQStringList& list) TQStringList::iterator it; TQString currentKey; for(it = lines.begin(); it != lines.end(); ++it) { - // qDebug("Parsing: '%s'", (*it).data()); + // tqDebug("Parsing: '%s'", (*it).data()); TQStringList fields = TQStringList::split(":", (*it), true); if(fields[0] == "sec") { currentKey = fields[4]; @@ -663,7 +663,7 @@ void KGPGFile::dumpBuffer(char *s, int len) const while(1) { if(addr && !(addr & 0x0f)) { - qDebug("%s %s", data.data(), chars.data()); + tqDebug("%s %s", data.data(), chars.data()); if(!len) break; }