Update various qt function definitions and static methods for tqt3

11 files changed, 36 insertions, 36 deletions

diff --git a/ChangeLog b/ChangeLog
index c996acb..4b85702 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7437,7 +7437,7 @@
     are found.
   * personal data dialog box had lower case "O" and "C" for the
     ok and cancel buttons, which is inconsistent.
-  * added some Q_CHECK_PTR() functions to check for invalid pointer values,
+  * added some TQ_CHECK_PTR() functions to check for invalid pointer values,
     which issues a warning to stderr.
   * added some Q_ASSERT checks in various places in the XML Reader/Writer code.
   * added a version field to keep track of different XML file versions,
diff --git a/acinclude.m4 b/acinclude.m4
index a2a9761..d90dd47 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1104,7 +1104,7 @@ EOF
 
 if test $kde_qtsubver -gt 0; then
 cat >> conftest.$ac_ext <<EOF
-#if QT_VERSION < 210
+#if TQT_VERSION < 210
 #error 1
 #endif
 EOF
@@ -1201,22 +1201,22 @@ fi
 if test -z "$3"; then
    if test $kde_qtver = 3; then
      if test $kde_qtsubver -gt 0; then
-       kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000"
+       kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
        qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
        kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
      else
-       kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000"
+       kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
      fi
    fi
    if test $kde_qtver = 2; then
      if test $kde_qtsubver -gt 0; then
-       kde_qt_verstring="QT_VERSION >= 222"
+       kde_qt_verstring="TQT_VERSION >= 222"
      else
-       kde_qt_verstring="QT_VERSION >= 200"
+       kde_qt_verstring="TQT_VERSION >= 200"
      fi
    fi
    if test $kde_qtver = 1; then
-    kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
+    kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200"
    fi
 else
    kde_qt_verstring="$3"
diff --git a/kdecompat.h b/kdecompat.h
index 05fb2ab..f66336a 100644
--- a/kdecompat.h
+++ b/kdecompat.h
@@ -28,7 +28,7 @@
 #endif
 
 #ifndef QT_IS_VERSION
-#define QT_IS_VERSION(a,b,c) (QT_VERSION >= TDE_MAKE_VERSION(a,b,c))
+#define QT_IS_VERSION(a,b,c) (TQT_VERSION >= TDE_MAKE_VERSION(a,b,c))
 #endif
 
 #if TDE_VERSION < TDE_MAKE_VERSION(3,2,0)
diff --git a/kmymoney2/converter/mymoneygncreader.cpp b/kmymoney2/converter/mymoneygncreader.cpp
index 924bda2..553362a 100644
--- a/kmymoney2/converter/mymoneygncreader.cpp
+++ b/kmymoney2/converter/mymoneygncreader.cpp
@@ -1042,8 +1042,8 @@ MyMoneyGncReader::~MyMoneyGncReader() {}
 #ifndef _GNCFILEANON
 void MyMoneyGncReader::readFile(TQIODevice* pDevice, IMyMoneySerialize* storage) {
 
-  Q_CHECK_PTR (pDevice);
-  Q_CHECK_PTR (storage);
+  TQ_CHECK_PTR (pDevice);
+  TQ_CHECK_PTR (storage);
 
   m_storage = dynamic_cast<IMyMoneyStorage *>(storage);
   qDebug ("Entering gnucash importer");
@@ -1130,7 +1130,7 @@ void MyMoneyGncReader::setFileHideFactor () {
 
 //********************************* convertCommodity *******************************************
 void MyMoneyGncReader::convertCommodity (const GncCommodity *gcm) {
-  Q_CHECK_PTR (gcm);
+  TQ_CHECK_PTR (gcm);
   MyMoneySecurity equ;
   if (m_commodityCount == 0) signalProgress (0, m_gncCommodityCount, i18n("Loading commodities..."));
   if (!gcm->isCurrency()) { // currencies should not be present here but...
@@ -1155,7 +1155,7 @@ void MyMoneyGncReader::convertCommodity (const GncCommodity *gcm) {
 
 //******************************* convertPrice ************************************************
 void MyMoneyGncReader::convertPrice (const GncPrice *gpr) {
-  Q_CHECK_PTR (gpr);
+  TQ_CHECK_PTR (gpr);
   // add this to our price history
   if (m_priceCount == 0) signalProgress (0, 1, i18n("Loading prices..."));
   MyMoneyMoney rate = convBadValue (gpr->value());
@@ -1178,7 +1178,7 @@ void MyMoneyGncReader::convertPrice (const GncPrice *gpr) {
 
 //*********************************convertAccount ****************************************
 void MyMoneyGncReader::convertAccount (const GncAccount* gac) {
-  Q_CHECK_PTR (gac);
+  TQ_CHECK_PTR (gac);
   TRY
   // we don't care about the GNC root account
   if("ROOT" == gac->type()) {
@@ -1321,7 +1321,7 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) {
 
 //********************************************** convertTransaction *****************************
 void MyMoneyGncReader::convertTransaction (const GncTransaction *gtx) {
-  Q_CHECK_PTR (gtx);
+  TQ_CHECK_PTR (gtx);
   MyMoneyTransaction tx;
   MyMoneySplit split;
   unsigned int i;
@@ -1385,7 +1385,7 @@ void MyMoneyGncReader::convertTransaction (const GncTransaction *gtx) {
 }
 //******************************************convertSplit********************************
 void MyMoneyGncReader::convertSplit (const GncSplit *gsp) {
-  Q_CHECK_PTR (gsp);
+  TQ_CHECK_PTR (gsp);
   MyMoneySplit split;
   MyMoneyAccount splitAccount;
   // find the kmm account id coresponding to the gnc id
@@ -1512,7 +1512,7 @@ void MyMoneyGncReader::convertSplit (const GncSplit *gsp) {
 //********************************* convertTemplateTransaction **********************************************
 MyMoneyTransaction MyMoneyGncReader::convertTemplateTransaction (const TQString& schedName, const GncTransaction *gtx) {
 
-  Q_CHECK_PTR (gtx);
+  TQ_CHECK_PTR (gtx);
   MyMoneyTransaction tx;
   MyMoneySplit split;
   unsigned int i;
@@ -1584,7 +1584,7 @@ MyMoneyTransaction MyMoneyGncReader::convertTemplateTransaction (const TQString&
 }
 //********************************* convertTemplateSplit ****************************************************
 void MyMoneyGncReader::convertTemplateSplit (const TQString& schedName, const GncTemplateSplit *gsp) {
-  Q_CHECK_PTR (gsp);
+  TQ_CHECK_PTR (gsp);
   // convertTemplateSplit
   MyMoneySplit split;
   MyMoneyAccount splitAccount;
@@ -1712,7 +1712,7 @@ void MyMoneyGncReader::convertTemplateSplit (const TQString& schedName, const Gn
 //********************************* convertSchedule  ********************************************************
 void MyMoneyGncReader::convertSchedule (const GncSchedule *gsc) {
   TRY
-  Q_CHECK_PTR (gsc);
+  TQ_CHECK_PTR (gsc);
   MyMoneySchedule sc;
   MyMoneyTransaction tx;
   m_suspectSchedule = false;
diff --git a/kmymoney2/mymoney/mymoneystatement.cpp b/kmymoney2/mymoney/mymoneystatement.cpp
index 2f8ea0e..80b2c48 100644
--- a/kmymoney2/mymoney/mymoneystatement.cpp
+++ b/kmymoney2/mymoney/mymoneystatement.cpp
@@ -250,7 +250,7 @@ void MyMoneyStatement::writeXMLFile( const MyMoneyStatement& _s, const TQString&
   }
 
   TQDomDocument* doc = new TQDomDocument("KMYMONEY-STATEMENT");
-  Q_CHECK_PTR(doc);
+  TQ_CHECK_PTR(doc);
 
   //writeStatementtoXMLDoc(_s,doc);
   TQDomProcessingInstruction instruct = doc->createProcessingInstruction(TQString("xml"), TQString("version=\"1.0\" encoding=\"utf-8\""));
diff --git a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
index da3ca93..a95668f 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
@@ -375,15 +375,15 @@ MyMoneyStorageXML::~MyMoneyStorageXML()
 // Function to read in the file, send to XML parser.
 void MyMoneyStorageXML::readFile(TQIODevice* pDevice, IMyMoneySerialize* storage)
 {
-  Q_CHECK_PTR(storage);
-  Q_CHECK_PTR(pDevice);
+  TQ_CHECK_PTR(storage);
+  TQ_CHECK_PTR(pDevice);
   if(!storage)
     return;
 
   m_storage = storage;
 
   m_doc = new TQDomDocument;
-  Q_CHECK_PTR(m_doc);
+  TQ_CHECK_PTR(m_doc);
 
   qDebug("reading file");
   // creating the TQXmlInputSource object based on a TQIODevice object
@@ -423,8 +423,8 @@ void MyMoneyStorageXML::readFile(TQIODevice* pDevice, IMyMoneySerialize* storage
 
 void MyMoneyStorageXML::writeFile(TQIODevice* qf, IMyMoneySerialize* storage)
 {
-  Q_CHECK_PTR(qf);
-  Q_CHECK_PTR(storage);
+  TQ_CHECK_PTR(qf);
+  TQ_CHECK_PTR(storage);
   if(!storage)
   {
     return;
@@ -433,7 +433,7 @@ void MyMoneyStorageXML::writeFile(TQIODevice* qf, IMyMoneySerialize* storage)
 
   // qDebug("XMLWRITER: Starting file write");
   m_doc = new TQDomDocument("KMYMONEY-FILE");
-  Q_CHECK_PTR(m_doc);
+  TQ_CHECK_PTR(m_doc);
   TQDomProcessingInstruction instruct = m_doc->createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\"");
   m_doc->appendChild(instruct);
 
diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp
index bdb0b23..5ac0f89 100644
--- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp
@@ -255,7 +255,7 @@ bool KOnlineBankingSetupWizard::finishLoginPage(void)
     req.resetRawData(request, strlen(request));
 
     LibofxContextPtr ctx = libofx_get_new_context();
-    Q_CHECK_PTR(ctx);
+    TQ_CHECK_PTR(ctx);
 
     ofx_set_account_cb(ctx, ofxAccountCallback, this);
     ofx_set_status_cb(ctx, ofxStatusCallback, this);
diff --git a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp
index a155ccc..d4d6244 100644
--- a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp
+++ b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp
@@ -135,7 +135,7 @@ bool OfxImporterPlugin::import( const TQString& filename )
   TQCString filename_deep( filename.utf8() );
 
   LibofxContextPtr ctx = libofx_get_new_context();
-  Q_CHECK_PTR(ctx);
+  TQ_CHECK_PTR(ctx);
 
   ofx_set_transaction_cb(ctx, ofxTransactionCallback, this);
   ofx_set_statement_cb(ctx, ofxStatementCallback, this);
diff --git a/kmymoney2/reports/reportstestcommon.cpp b/kmymoney2/reports/reportstestcommon.cpp
index 44f90df..a64f04e 100644
--- a/kmymoney2/reports/reportstestcommon.cpp
+++ b/kmymoney2/reports/reportstestcommon.cpp
@@ -390,7 +390,7 @@ void writeRCFtoXML( const MyMoneyReport& filter, const TQString& _filename )
   }
 
   TQDomDocument* doc = new TQDomDocument("KMYMONEY-FILE");
-  Q_CHECK_PTR(doc);
+  TQ_CHECK_PTR(doc);
 
   writeRCFtoXMLDoc(filter,doc);
 
@@ -466,7 +466,7 @@ void XMLandback( MyMoneyReport& filter )
   // & write methods are working correctly.
 
   TQDomDocument* doc = new TQDomDocument("KMYMONEY-FILE");
-  Q_CHECK_PTR(doc);
+  TQ_CHECK_PTR(doc);
 
   writeRCFtoXMLDoc(filter,doc);
   TQValueList<MyMoneyReport> list;
diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp
index 8745d64..bb13614 100644
--- a/kmymoney2/views/khomeview.cpp
+++ b/kmymoney2/views/khomeview.cpp
@@ -1131,19 +1131,19 @@ void KHomeView::slotOpenURL(const KURL &url, const KParts::URLArgs& /* args */)
       if(mode == "enter") {
         emit scheduleSelected(id);
         KMainWindow* mw = dynamic_cast<KMainWindow*>(tqApp->mainWidget());
-        Q_CHECK_PTR(mw);
+        TQ_CHECK_PTR(mw);
         TQTimer::singleShot(0, mw->actionCollection()->action("schedule_enter"), TQT_SLOT(activate()));
 
       } else if(mode == "edit") {
         emit scheduleSelected(id);
         KMainWindow* mw = dynamic_cast<KMainWindow*>(tqApp->mainWidget());
-        Q_CHECK_PTR(mw);
+        TQ_CHECK_PTR(mw);
         TQTimer::singleShot(0, mw->actionCollection()->action("schedule_edit"), TQT_SLOT(activate()));
 
       } else if(mode == "skip") {
         emit scheduleSelected(id);
         KMainWindow* mw = dynamic_cast<KMainWindow*>(tqApp->mainWidget());
-        Q_CHECK_PTR(mw);
+        TQ_CHECK_PTR(mw);
         TQTimer::singleShot(0, mw->actionCollection()->action("schedule_skip"), TQT_SLOT(activate()));
 
       } else if(mode == "full") {
@@ -1160,7 +1160,7 @@ void KHomeView::slotOpenURL(const KURL &url, const KParts::URLArgs& /* args */)
 
     } else if(view == VIEW_WELCOME) {
       KMainWindow* mw = dynamic_cast<KMainWindow*>(tqApp->mainWidget());
-      Q_CHECK_PTR(mw);
+      TQ_CHECK_PTR(mw);
       if ( mode == "whatsnew" )
       {
         TQString fname = KMyMoneyUtils::findResource("appdata",TQString("html/whats_new%1.html"));
@@ -1172,7 +1172,7 @@ void KHomeView::slotOpenURL(const KURL &url, const KParts::URLArgs& /* args */)
 
     } else if(view == "action") {
       KMainWindow* mw = dynamic_cast<KMainWindow*>(tqApp->mainWidget());
-      Q_CHECK_PTR(mw);
+      TQ_CHECK_PTR(mw);
       TQTimer::singleShot(0, mw->actionCollection()->action( id ), TQT_SLOT(activate()));
 
     } else if(view == VIEW_HOME) {
diff --git a/kmymoney2/widgets/kmymoneyselector.cpp b/kmymoney2/widgets/kmymoneyselector.cpp
index 9b1d819..4f8af45 100644
--- a/kmymoney2/widgets/kmymoneyselector.cpp
+++ b/kmymoney2/widgets/kmymoneyselector.cpp
@@ -468,7 +468,7 @@ void KMyMoneySelector::setSelected(const TQString& id, const bool state)
   while((it_v = it.current()) != 0) {
     if(it_v->rtti() == 1) {
       KMyMoneyCheckListItem* it_c = dynamic_cast<KMyMoneyCheckListItem*>(it_v);
-      Q_CHECK_PTR(it_c);
+      TQ_CHECK_PTR(it_c);
       if(it_c->type() == TQCheckListItem::CheckBox) {
         if(it_c->id() == id) {
           it_c->setOn(state);
@@ -479,7 +479,7 @@ void KMyMoneySelector::setSelected(const TQString& id, const bool state)
       }
     } else if(it_v->rtti() == 0) {
       KMyMoneyListViewItem* it_c = dynamic_cast<KMyMoneyListViewItem*>(it_v);
-      Q_CHECK_PTR(it_c);
+      TQ_CHECK_PTR(it_c);
       if(it_c->id() == id) {
         m_listView->setSelected(it_v, true);
         if(!it_visible)