From fecb0e67b23e8b83ba7fc881bb57bc48c0852d62 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 5 Jul 2011 06:00:29 +0000 Subject: TQt4 port kmymoney This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmymoney@1239855 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmymoney2/mymoney/mymoneyutils.cpp | 48 +++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'kmymoney2/mymoney/mymoneyutils.cpp') diff --git a/kmymoney2/mymoney/mymoneyutils.cpp b/kmymoney2/mymoney/mymoneyutils.cpp index 3739f9a..b55c485 100644 --- a/kmymoney2/mymoney/mymoneyutils.cpp +++ b/kmymoney2/mymoney/mymoneyutils.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #ifdef _CHECK_MEMORY @@ -189,7 +189,7 @@ void operator delete(void *p) throw() { if(enable==true) { CheckMemoryTable::Iterator it; - it = chkmem.table.find(p); + it = chkmem.table.tqfind(p); if(it != chkmem.table.end()) { chkmem.table.remove(it); } @@ -201,7 +201,7 @@ void operator delete [] (void *p) throw() { if(enable==true) { CheckMemoryTable::Iterator it; - it = chkmem.table.find(p); + it = chkmem.table.tqfind(p); if(it != chkmem.table.end()) { chkmem.table.remove(it); } @@ -211,13 +211,13 @@ void operator delete [] (void *p) throw() #endif // _CHECK_MEMORY -QString MyMoneyUtils::getFileExtension(QString strFileName) +TQString MyMoneyUtils::getFileExtension(TQString strFileName) { - QString strTemp; + TQString strTemp; if(!strFileName.isEmpty()) { //find last . delminator - int nLoc = strFileName.findRev('.'); + int nLoc = strFileName.tqfindRev('.'); if(nLoc != -1) { strTemp = strFileName.right(strFileName.length() - (nLoc + 1)); @@ -233,27 +233,27 @@ int MyMoneyTracer::m_onoff = 0; MyMoneyTracer::MyMoneyTracer(const char* name) { if(m_onoff) { - QRegExp exp("(.*)::(.*)"); + TQRegExp exp("(.*)::(.*)"); if(exp.search(name) != -1) { m_className = exp.cap(1); m_memberName = exp.cap(2); } else { - m_className = QString(name); - m_memberName = QString(); + m_className = TQString(name); + m_memberName = TQString(); } - QString indent; + TQString indent; indent.fill(' ', m_indentLevel); std::cerr << indent.latin1() << "ENTER: " << m_className.latin1() << "::" << m_memberName.latin1() << std::endl; } m_indentLevel += 2; } -MyMoneyTracer::MyMoneyTracer(const QString& className, const QString& memberName) : +MyMoneyTracer::MyMoneyTracer(const TQString& className, const TQString& memberName) : m_className(className), m_memberName(memberName) { if(m_onoff) { - QString indent; + TQString indent; indent.fill(' ', m_indentLevel); std::cerr << indent.latin1() << "ENTER: " << m_className.latin1() << "::" << m_memberName.latin1() << std::endl; } @@ -264,7 +264,7 @@ MyMoneyTracer::~MyMoneyTracer() { m_indentLevel -= 2; if(m_onoff) { - QString indent; + TQString indent; indent.fill(' ', m_indentLevel); std::cerr << indent.latin1() << "LEAVE: " << m_className.latin1() << "::" << m_memberName.latin1() << std::endl; } @@ -275,7 +275,7 @@ void MyMoneyTracer::printf(const char *format, ...) const if(m_onoff) { va_list args; va_start(args, format); - QString indent; + TQString indent; indent.fill(' ', m_indentLevel); std::cerr << indent.latin1(); @@ -300,38 +300,38 @@ void MyMoneyTracer::off(void) m_onoff = 0; } -QString dateToString(const QDate& date) +TQString dateToString(const TQDate& date) { if(!date.isNull() && date.isValid()) return date.toString(Qt::ISODate); - return QString(); + return TQString(); } -QDate stringToDate(const QString& str) +TQDate stringToDate(const TQString& str) { if(str.length()) { - QDate date = QDate::fromString(str, Qt::ISODate); + TQDate date = TQDate::fromString(str, Qt::ISODate); if(!date.isNull() && date.isValid()) return date; } - return QDate(); + return TQDate(); } -QString QStringEmpty(const QString& val) +TQString TQStringEmpty(const TQString& val) { if(!val.isEmpty()) - return QString(val); + return TQString(val); - return QString(); + return TQString(); } -unsigned long extractId(const QString& txt) +unsigned long extractId(const TQString& txt) { int pos; unsigned long rc = 0; - pos = txt.find(QRegExp("\\d+"), 0); + pos = txt.tqfind(TQRegExp("\\d+"), 0); if(pos != -1) { rc = atol(txt.mid(pos)); } -- cgit v1.2.1