From a553069ad068dcab541282df24dbe12591153af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 17 Mar 2022 09:54:21 +0100 Subject: Replace the use of the old API TQString::data(). The definition of -UTQT_NO_COMPAT is no longer needed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit eeae53f59df4d79d0399c2217a165ff2fab754db) --- kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp | 8 ++++---- kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp | 8 ++++---- kmymoney2/mymoney/storage/mymoneystoragesql.cpp | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'kmymoney2/mymoney/storage') diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp index 4386f63..98b6286 100644 --- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp +++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp @@ -925,7 +925,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()) tqDebug ("request balance for %s at %s", id.data(), TQString(date_.toString(Qt::ISODate)).latin1()); + if (date_ != TQDate()) tqDebug (TQString("request balance for %1 at %2").arg(id).arg(date_.toString(Qt::ISODate))); // if(!date_.isValid() && MyMoneyFile::instance()->account(id).accountType() != MyMoneyAccount::Stock) { // if(accountList.find(id) != accountList.end()) // return accountList[id].balance(); @@ -1224,7 +1224,7 @@ const TQValueList MyMoneyDatabaseMgr::scheduleList(const TQStri // tqDebug("scheduleList()"); for(pos = scheduleList.begin(); pos != scheduleList.end(); ++pos) { - // tqDebug(" '%s'", (*pos).id().data()); + // tqDebug(TQString(" '%1'").arg((*pos).id())); if(type != MyMoneySchedule::TYPE_ANY) { if(type != (*pos).type()) { @@ -1288,7 +1288,7 @@ const TQValueList MyMoneyDatabaseMgr::scheduleList(const TQStri */ } - // tqDebug("Adding '%s'", (*pos).name().latin1()); + // tqDebug(TQString("Adding '%1'").arg((*pos).name())); list << *pos; } return list; @@ -1334,7 +1334,7 @@ const TQValueList MyMoneyDatabaseMgr::scheduleListEx( int sched continue; } -// tqDebug("\tAdding '%s'", (*pos).name().latin1()); +// tqDebug(TQString("\tAdding '%1'").arg((*pos).name()); list << *pos; } diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp index 92db207..869e2e4 100644 --- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp +++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp @@ -874,7 +874,7 @@ const MyMoneyMoney MyMoneySeqAccessMgr::balance(const TQString& id, const TQDate { MyMoneyMoney result(0); MyMoneyAccount acc; - // if (date != TQDate()) tqDebug ("request balance for %s at %s", id.data(), date.toString(Qt::ISODate).latin1()); + // if (date != TQDate()) tqDebug(TQString("request balance for %1 at %2").arg(id).arg(date.toString(Qt::ISODate))); if(!date.isValid() && account(id).accountType() != MyMoneyAccount::Stock) { if(m_accountList.find(id) != m_accountList.end()) return m_accountList[id].balance(); @@ -1252,7 +1252,7 @@ const TQValueList MyMoneySeqAccessMgr::scheduleList( // tqDebug("scheduleList()"); for(pos = m_scheduleList.begin(); pos != m_scheduleList.end(); ++pos) { - // tqDebug(" '%s'", qPrintable((*pos).id())); + // tqDebug(TQString(" '%1'").arg(qPrintable((*pos).id()))); if(type != MyMoneySchedule::TYPE_ANY) { if(type != (*pos).type()) { @@ -1309,7 +1309,7 @@ const TQValueList MyMoneySeqAccessMgr::scheduleList( continue; } - // tqDebug("Adding '%s'", (*pos).name().latin1()); + // tqDebug(TQString("Adding '%1'").arg((*pos).name())); list << *pos; } return list; @@ -1378,7 +1378,7 @@ const TQValueList MyMoneySeqAccessMgr::scheduleListEx(int sched continue; } -// tqDebug("\tAdding '%s'", (*pos).name().latin1()); +// tqDebug(TQString("\tAdding '%1'").arg((*pos).name())); list << *pos; } diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp index 5a9dc95..1b8e694 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp +++ b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp @@ -186,7 +186,7 @@ try { } break; default: - tqFatal("%s", TQString("%1 - unknown open mode %2").arg(__func__).arg(openMode).data()); + tqFatal(TQString("%1 - unknown open mode %2").arg(__func__).arg(openMode)); } if (rc != 0) return (rc); // bypass logon check if we are creating a database @@ -199,7 +199,7 @@ try { .arg(m_logonUser) .arg(m_logonAt.date().toString(Qt::ISODate)) .arg(m_logonAt.time().toString("hh.mm.ss")); - tqDebug("%s", m_error.data()); + tqDebug(m_error); close(false); rc = -1; } else { @@ -209,7 +209,7 @@ try { } return(rc); } catch (TQString& s) { - tqDebug("%s",s.data()); + tqDebug(s); return (1); } } @@ -925,7 +925,7 @@ bool MyMoneyStorageSql::endCommitUnit (const TQString& callingFunction) { // as value of this method. bool rc = true; if (callingFunction != m_commitUnitStack.top()) - tqDebug("%s", TQString("%1 - %2 s/be %3").arg(__func__).arg(callingFunction).arg(m_commitUnitStack.top()).data()); + tqDebug(TQString("%1 - %2 s/be %3").arg(__func__).arg(callingFunction).arg(m_commitUnitStack.top())); m_commitUnitStack.pop(); if (m_commitUnitStack.isEmpty()) { if (!commit()) throw new MYMONEYEXCEPTION(buildError (MyMoneySqlQuery(), __func__, "ending commit unit")); @@ -936,7 +936,7 @@ bool MyMoneyStorageSql::endCommitUnit (const TQString& callingFunction) { void MyMoneyStorageSql::cancelCommitUnit (const TQString& callingFunction) { DBG("*** Entering MyMoneyStorageSql::cancelCommitUnit"); if (callingFunction != m_commitUnitStack.top()) - tqDebug("%s", TQString("%1 - %2 s/be %3").arg(__func__).arg(callingFunction).arg(m_commitUnitStack.top()).data()); + tqDebug(TQString("%1 - %2 s/be %3").arg(__func__).arg(callingFunction).arg(m_commitUnitStack.top())); if (m_commitUnitStack.isEmpty()) return; m_commitUnitStack.clear(); if (!rollback()) throw new MYMONEYEXCEPTION(buildError (MyMoneySqlQuery(), __func__, "cancelling commit unit")); @@ -2921,7 +2921,7 @@ const TQMap MyMoneyStorageSql::fetchTransactions ( int obc = whereClause.contains('('); int cbc = whereClause.contains(')'); if (cbc > obc) { - tqFatal("invalid where clause - %s", whereClause.latin1()); + tqFatal(TQString("invalid where clause - %1").arg(whereClause)); } while (cbc < obc) { whereClause.append(")"); @@ -3801,7 +3801,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; - tqDebug("%s", s.ascii()); + tqDebug(s); const_cast (this)->cancelCommitUnit(function); return (const_cast (this)->m_error); } -- cgit v1.2.1