Rename old tq methods that no longer need a unique name

11 files changed, 45 insertions, 45 deletions

diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp
index 398f369..4485be9 100644
--- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp
@@ -113,12 +113,12 @@ void KOfxDirectConnectDlg::init(void)
   connect(m_job,TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),this,TQT_SLOT(slotOfxData(KIO::Job*,const TQByteArray&)));
   connect(m_job,TQT_SIGNAL(connected(KIO::Job*)),this,TQT_SLOT(slotOfxConnected(KIO::Job*)));
 
-  settqStatus(TQString("Contacting %1...").tqarg(m_connector.url()));
+  setStatus(TQString("Contacting %1...").tqarg(m_connector.url()));
   kProgress1->setTotalSteps(3);
   kProgress1->setProgress(1);
 }
 
-void KOfxDirectConnectDlg::settqStatus(const TQString& _status)
+void KOfxDirectConnectDlg::setStatus(const TQString& _status)
 {
   textLabel1->setText(_status);
   kdDebug(2) << "STATUS: " << _status << endl;
@@ -138,7 +138,7 @@ void KOfxDirectConnectDlg::slotOfxConnected(KIO::Job*)
     delete m_tmpfile; //delete otherwise we mem leak
   }
   m_tmpfile = new KTempFile();
-  settqStatus("Connection established, retrieving data...");
+  setStatus("Connection established, retrieving data...");
   setDetails(TQString("Downloading data to %1...").tqarg(m_tmpfile->name()));
   kProgress1->advance(1);
 }
@@ -160,7 +160,7 @@ void KOfxDirectConnectDlg::slotOfxData(KIO::Job*,const TQByteArray& _ba)
 void KOfxDirectConnectDlg::slotOfxFinished(KIO::Job* /* e */)
 {
   kProgress1->advance(1);
-  settqStatus("Completed.");
+  setStatus("Completed.");
 
   if(d->m_fpTrace.isOpen()) {
     d->m_fpTrace.writeBlock("\nCompleted\n\n\n\n", 14);
diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h
index b07e191..1227a90 100644
--- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h
+++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h
@@ -70,7 +70,7 @@ protected slots:
   virtual void reject(void);
 
 protected:
-  void settqStatus(const TQString& _status);
+  void setStatus(const TQString& _status);
   void setDetails(const TQString& _details);
 
   KTempFile* m_tmpfile;
diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlgdecl.ui b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlgdecl.ui
index a7d73e4..b7ec364 100644
--- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlgdecl.ui
+++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlgdecl.ui
@@ -53,7 +53,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>51</width>
                             <height>20</height>
@@ -84,7 +84,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>61</width>
                             <height>20</height>
diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui
index a6bd384..a897869 100644
--- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui
+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui
@@ -168,7 +168,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>90</height>
@@ -228,7 +228,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>120</width>
                                 <height>21</height>
diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
index d2b9880..c010ab6 100644
--- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
@@ -48,16 +48,16 @@
 #include <libofx/libofx.h>
 #include "mymoneyofxconnector.h"
 
-KOnlineBankingtqStatus::KOnlineBankingtqStatus(const MyMoneyAccount& acc, TQWidget *parent, const char *name) :
+KOnlineBankingStatus::KOnlineBankingStatus(const MyMoneyAccount& acc, TQWidget *parent, const char *name) :
   KOnlineBankingStatusDecl(parent,name),
   m_appId(0)
 {
-  m_ledOnlinetqStatus->off();
+  m_ledOnlineStatus->off();
 
   // Set up online banking settings if applicable
   MyMoneyKeyValueContainer settings = acc.onlineBankingSettings();
-  m_textOnlinetqStatus->setText(i18n("Enabled & configured"));
-  m_ledOnlinetqStatus->on();
+  m_textOnlineStatus->setText(i18n("Enabled & configured"));
+  m_ledOnlineStatus->on();
 
   TQString account = settings.value("accountid");
   TQString bank = settings.value("bankname");
@@ -83,25 +83,25 @@ KOnlineBankingtqStatus::KOnlineBankingtqStatus(const MyMoneyAccount& acc, TQWidg
   if (!specificDate.isEmpty())
     m_specificDate->setDate(TQDate::fromString(specificDate));
   else
-    m_specificDate->setDate(TQDate::tqcurrentDate());
-  m_specificDate->setMaxValue(TQDate::tqcurrentDate());
+    m_specificDate->setDate(TQDate::currentDate());
+  m_specificDate->setMaxValue(TQDate::currentDate());
   m_payeeidRB->setChecked(settings.value("kmmofx-preferPayeeid").isEmpty() || settings.value("kmmofx-preferPayeeid").toInt() != 0);
   m_nameRB->setChecked(!settings.value("kmmofx-preferName").isEmpty() && settings.value("kmmofx-preferName").toInt() != 0);
 }
 
-KOnlineBankingtqStatus::~KOnlineBankingtqStatus()
+KOnlineBankingStatus::~KOnlineBankingStatus()
 {
   delete m_appId;
 }
 
-const TQString& KOnlineBankingtqStatus::appId(void) const
+const TQString& KOnlineBankingStatus::appId(void) const
 {
   if(m_appId)
     return m_appId->appId();
   return TQString();
 }
 
-TQString KOnlineBankingtqStatus::headerVersion(void) const
+TQString KOnlineBankingStatus::headerVersion(void) const
 {
   if(m_headerVersion)
     return m_headerVersion->headerVersion();
diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.h b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.h
index 52e43ee..3b04903 100644
--- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.h
+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.h
@@ -41,13 +41,13 @@ class OfxHeaderVersion;
   * @author Thomas Baumgart
   */
 
-class KOnlineBankingtqStatus : public KOnlineBankingStatusDecl
+class KOnlineBankingStatus : public KOnlineBankingStatusDecl
 {
   Q_OBJECT
   TQ_OBJECT
 public:
-  KOnlineBankingtqStatus(const MyMoneyAccount& acc, TQWidget *parent=0, const char *name=0);
-  ~KOnlineBankingtqStatus();
+  KOnlineBankingStatus(const MyMoneyAccount& acc, TQWidget *parent=0, const char *name=0);
+  ~KOnlineBankingStatus();
   const TQString& appId(void) const;
   TQString headerVersion(void) const;
 private:
diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatusdecl.ui b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatusdecl.ui
index 5f3af99..b7a4b9a 100644
--- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatusdecl.ui
+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatusdecl.ui
@@ -87,7 +87,7 @@
                         </property>
                         <widget class="KLed">
                             <property name="name">
-                                <cstring>m_ledOnlinetqStatus</cstring>
+                                <cstring>m_ledOnlineStatus</cstring>
                             </property>
                             <property name="state">
                                 <enum>Off</enum>
@@ -95,7 +95,7 @@
                         </widget>
                         <widget class="TQLabel">
                             <property name="name">
-                                <cstring>m_textOnlinetqStatus</cstring>
+                                <cstring>m_textOnlineStatus</cstring>
                             </property>
                             <property name="sizePolicy">
                                 <sizepolicy>
@@ -119,7 +119,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>41</width>
                                     <height>21</height>
@@ -188,7 +188,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>150</width>
                                     <height>21</height>
@@ -346,7 +346,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>41</width>
                                     <height>20</height>
@@ -435,7 +435,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>31</width>
                                     <height>20</height>
@@ -456,7 +456,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
diff --git a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
index 28f9e29..f5222dc 100644
--- a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
@@ -145,7 +145,7 @@ TQString MyMoneyOfxConnector::url(void) const { return m_fiSettings.value("url")
 TQDate MyMoneyOfxConnector::statementStartDate(void) const {
   if ((m_fiSettings.value("kmmofx-todayMinus").toInt() != 0) && !m_fiSettings.value("kmmofx-numRequestDays").isEmpty())
   {
-    return TQDate::tqcurrentDate().addDays(-m_fiSettings.value("kmmofx-numRequestDays").toInt());
+    return TQDate::currentDate().addDays(-m_fiSettings.value("kmmofx-numRequestDays").toInt());
   }
   else if ((m_fiSettings.value("kmmofx-lastUpdate").toInt() != 0) && !m_account.value("lastImportedTransactionDate").isEmpty())
   {
@@ -155,7 +155,7 @@ TQDate MyMoneyOfxConnector::statementStartDate(void) const {
   {
     return TQDate::fromString(m_fiSettings.value("kmmofx-specificDate"));
   }
-  return TQDate::tqcurrentDate().addMonths(-2);
+  return TQDate::currentDate().addMonths(-2);
 }
 
 #if LIBOFX_IS_VERSION(0,9,0)
@@ -356,7 +356,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::message(const TQString& _msgType,
 
 MyMoneyOfxConnector::Tag MyMoneyOfxConnector::investmentRequest(void) const
 {
-  TQString dtnow_string = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
+  TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
   TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
 
   return message("INVSTMT","INVSTMT",Tag("INVSTMTRQ")
@@ -387,7 +387,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::creditCardRequest(const TQDate& _d
 
 MyMoneyOfxConnector::Tag MyMoneyOfxConnector::signOn(void) const
 {
-  TQString dtnow_string = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
+  TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
 
   Tag fi("FI");
   fi.element("ORG",fiorg());
@@ -422,7 +422,7 @@ TQString MyMoneyOfxConnector::header(void)
 TQString MyMoneyOfxConnector::uuid(void)
 {
   static int id = 1;
-  return TQDateTime::tqcurrentDateTime().toString("yyyyMMdd-hhmmsszzz-") + TQString::number(id++);
+  return TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmsszzz-") + TQString::number(id++);
 }
 
 //
@@ -456,7 +456,7 @@ const TQByteArray MyMoneyOfxConnector::statementResponse(const TQDate& _dtstart)
 
 MyMoneyOfxConnector::Tag MyMoneyOfxConnector::signOnResponse(void) const
 {
-  TQString dtnow_string = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
+  TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
 
   Tag sonrs("SONRS");
   sonrs
@@ -495,12 +495,12 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::bankStatementResponse(const TQDate
   MyMoneyFile* file = MyMoneyFile::instance();
 
   TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
-  TQString dtnow_string = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
+  TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
 
   TQString transactionlist;
 
   MyMoneyTransactionFilter filter;
-  filter.setDateFilter(_dtstart,TQDate::tqcurrentDate());
+  filter.setDateFilter(_dtstart,TQDate::currentDate());
   filter.addAccount(m_account.id());
   TQValueList<MyMoneyTransaction> transactions = file->transactionList(filter);
   TQValueList<MyMoneyTransaction>::const_iterator it_transaction = transactions.begin();
@@ -522,12 +522,12 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::creditCardStatementResponse(const
   MyMoneyFile* file = MyMoneyFile::instance();
 
   TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
-  TQString dtnow_string = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
+  TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
 
   TQString transactionlist;
 
   MyMoneyTransactionFilter filter;
-  filter.setDateFilter(_dtstart,TQDate::tqcurrentDate());
+  filter.setDateFilter(_dtstart,TQDate::currentDate());
   filter.addAccount(m_account.id());
   TQValueList<MyMoneyTransaction> transactions = file->transactionList(filter);
   TQValueList<MyMoneyTransaction>::const_iterator it_transaction = transactions.begin();
@@ -549,12 +549,12 @@ TQString MyMoneyOfxConnector::investmentStatementResponse(const TQDate& _dtstart
   MyMoneyFile* file = MyMoneyFile::instance();
 
   TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
-  TQString dtnow_string = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
+  TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]"));
 
   TQString transactionlist;
 
   MyMoneyTransactionFilter filter;
-  filter.setDateFilter(_dtstart,TQDate::tqcurrentDate());
+  filter.setDateFilter(_dtstart,TQDate::currentDate());
   filter.addAccount(m_account.id());
   filter.addAccount(m_account.accountList());
   TQValueList<MyMoneyTransaction> transactions = file->transactionList(filter);
diff --git a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp
index 7755dc8..5ed6175 100644
--- a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp
+++ b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp
@@ -578,7 +578,7 @@ void OfxImporterPlugin::protocols(TQStringList& protocolList) const
 TQWidget* OfxImporterPlugin::accountConfigTab(const MyMoneyAccount& acc, TQString& name)
 {
   name = i18n("Online settings");
-  m_statusDlg = new KOnlineBankingtqStatus(acc, 0, 0);
+  m_statusDlg = new KOnlineBankingStatus(acc, 0, 0);
   return m_statusDlg;
 }
 
diff --git a/kmymoney2/plugins/ofximport/ofximporterplugin.h b/kmymoney2/plugins/ofximport/ofximporterplugin.h
index 2103ccb..04a4892 100644
--- a/kmymoney2/plugins/ofximport/ofximporterplugin.h
+++ b/kmymoney2/plugins/ofximport/ofximporterplugin.h
@@ -35,7 +35,7 @@
 // Project Includes
 
 #include "../kmymoneyplugin.h"
-class KOnlineBankingtqStatus;
+class KOnlineBankingStatus;
 
 /**
 @author Ace Jones
@@ -140,7 +140,7 @@ private:
   TQStringList m_infos;
   TQStringList m_warnings;
   TQStringList m_errors;
-  KOnlineBankingtqStatus* m_statusDlg;
+  KOnlineBankingStatus* m_statusDlg;
 };
 
 #endif
diff --git a/kmymoney2/plugins/ofximport/ofxpartner.cpp b/kmymoney2/plugins/ofximport/ofxpartner.cpp
index 804b542..651fd2a 100644
--- a/kmymoney2/plugins/ofximport/ofxpartner.cpp
+++ b/kmymoney2/plugins/ofximport/ofxpartner.cpp
@@ -67,7 +67,7 @@ void setDirectory(const TQString& dir)
 bool needReload(const TQFileInfo& i)
 {
   return ((!i.isReadable())
-  || (i.lastModified().addDays(7) < TQDateTime::tqcurrentDateTime())
+  || (i.lastModified().addDays(7) < TQDateTime::currentDateTime())
   || (i.size() < 1024));
 }
 
@@ -240,7 +240,7 @@ OfxFiServiceInfo ServiceInfo(const TQString& fipid)
   // Increasing to VER=9 solved the problem. This may happen again in the
   // future.
   TQFileInfo i(guidFile.path());
-  if(!i.isReadable() || i.lastModified().addDays(7) < TQDateTime::tqcurrentDateTime())
+  if(!i.isReadable() || i.lastModified().addDays(7) < TQDateTime::currentDateTime())
     get("", attr, KURL(TQString("http://moneycentral.msn.com/money/2005/mnynet/service/olsvcupd/OnlSvcBrandInfo.aspx?MSNGUID=&GUID=%1&SKU=3&VER=" VER).tqarg(fipid)), guidFile);
 
   TQFile f(guidFile.path());