From aa85254cd16cb870b8d1649ef1dbad09bd8491e8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:19:48 -0600 Subject: Rename additional global TQt functions --- kmymoney2/mymoney/storage/mymoneystoragesql.cpp | 42 ++++++++++++------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'kmymoney2/mymoney/storage/mymoneystoragesql.cpp') 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); } -- cgit v1.2.1