Rename a number of old tq methods that are no longer tq specific

14 files changed, 99 insertions, 99 deletions

diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp
index 398f369..e06de07 100644
--- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp
@@ -25,7 +25,7 @@
 #include <tqlabel.h>
 #include <tqdir.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 // ----------------------------------------------------------------------------
 // KDE Includes
@@ -88,7 +88,7 @@ void KOfxDirectConnectDlg::init(void)
 
   TQDir homeDir(TQDir::home());
   if(homeDir.exists("ofxlog.txt")) {
-    d->m_fpTrace.setName(TQString("%1/ofxlog.txt").tqarg(TQDir::homeDirPath()));
+    d->m_fpTrace.setName(TQString("%1/ofxlog.txt").arg(TQDir::homeDirPath()));
     d->m_fpTrace.open(IO_WriteOnly | IO_Append);
   }
 
@@ -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...").arg(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;
@@ -133,13 +133,13 @@ void KOfxDirectConnectDlg::slotOfxConnected(KIO::Job*)
 {
   if ( m_tmpfile )
   {
-//     throw new MYMONEYEXCEPTION(TQString("Already connected, using %1.").tqarg(m_tmpfile->name()));
+//     throw new MYMONEYEXCEPTION(TQString("Already connected, using %1.").arg(m_tmpfile->name()));
     kdDebug(2) << "Already connected, using " << m_tmpfile->name() << endl;
     delete m_tmpfile; //delete otherwise we mem leak
   }
   m_tmpfile = new KTempFile();
-  settqStatus("Connection established, retrieving data...");
-  setDetails(TQString("Downloading data to %1...").tqarg(m_tmpfile->name()));
+  setStatus("Connection established, retrieving data...");
+  setDetails(TQString("Downloading data to %1...").arg(m_tmpfile->name()));
   kProgress1->advance(1);
 }
 
@@ -154,13 +154,13 @@ void KOfxDirectConnectDlg::slotOfxData(KIO::Job*,const TQByteArray& _ba)
     d->m_fpTrace.writeBlock(_ba, _ba.size());
   }
 
-  setDetails(TQString("Got %1 bytes").tqarg(_ba.size()));
+  setDetails(TQString("Got %1 bytes").arg(_ba.size()));
 }
 
 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..57cb5b1 100644
--- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlgdecl.ui
+++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlgdecl.ui
@@ -37,7 +37,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -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..100cbd1 100644
--- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui
+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui
@@ -58,7 +58,7 @@
                         <property name="text">
                             <string>Please select your financial institution from the list below...</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>WordBreak|AlignVCenter</set>
                         </property>
                     </widget>
@@ -111,7 +111,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout8</cstring>
+                                        <cstring>layout8</cstring>
                                     </property>
                                     <grid>
                                         <property name="name">
@@ -168,7 +168,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>90</height>
@@ -212,7 +212,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout6</cstring>
+                    <cstring>layout6</cstring>
                 </property>
                 <grid>
                     <property name="name">
@@ -228,7 +228,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>120</width>
                                 <height>21</height>
@@ -348,7 +348,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout29</cstring>
+                    <cstring>layout29</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -361,7 +361,7 @@
                         <property name="text">
                             <string>Please select the account from your financial institution from the list below which matches this account.</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>WordBreak|AlignVCenter</set>
                         </property>
                     </widget>
@@ -448,7 +448,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout6</cstring>
+                    <cstring>layout6</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -461,7 +461,7 @@
                         <property name="text">
                             <string>Congratulations!  You have successfully set up your bank for online banking via OFX.</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>WordBreak|AlignVCenter</set>
                         </property>
                     </widget>
diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp
index 7287c6a..bafde2e 100644
--- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp
@@ -22,10 +22,10 @@
 // ----------------------------------------------------------------------------
 // QT Includes
 
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqregexp.h>
 #include <tqcheckbox.h>
 #include <tqtabwidget.h>
@@ -134,7 +134,7 @@ bool KOnlineBankingSetupWizard::finishFiPage(void)
     {
       TQString bank = item->text(0);
       m_textDetails->clear();
-      m_textDetails->append(TQString("<p>Details for %1:</p>").tqarg(bank));
+      m_textDetails->append(TQString("<p>Details for %1:</p>").arg(bank));
       TQStringList fipids = OfxPartner::FipidForBank(bank);
       TQStringList::const_iterator it_fipid = fipids.begin();
       while ( it_fipid != fipids.end() )
@@ -143,14 +143,14 @@ bool KOnlineBankingSetupWizard::finishFiPage(void)
         info = OfxPartner::ServiceInfo(*it_fipid);
 
         // Print them to the text browser
-        TQString message = TQString("<p>Fipid: %1<br>").tqarg(*it_fipid);
+        TQString message = TQString("<p>Fipid: %1<br>").arg(*it_fipid);
 
         // If the bank supports retrieving statements
         if ( info.accountlist )
         {
           m_bankInfo.push_back(info);
 
-          message += TQString("URL: %1<br>Org: %2<br>Fid: %3<br>").tqarg(info.url,info.org,info.fid);
+          message += TQString("URL: %1<br>Org: %2<br>Fid: %3<br>").arg(info.url,info.org,info.fid);
           if ( info.statements )
             message += i18n("Supports online statements<br>");
           if ( info.investments )
@@ -180,7 +180,7 @@ bool KOnlineBankingSetupWizard::finishFiPage(void)
     }
 
     m_textDetails->clear();
-    m_textDetails->append(TQString("<p>Details for %1:</p>").tqarg(m_bankName->text()));
+    m_textDetails->append(TQString("<p>Details for %1:</p>").arg(m_bankName->text()));
 
     memset(&info, 0, sizeof(OfxFiServiceInfo));
     strncpy(info.fid, m_fid->text().ascii(), OFX_FID_LENGTH-1);
@@ -194,7 +194,7 @@ bool KOnlineBankingSetupWizard::finishFiPage(void)
     m_bankInfo.push_back(info);
 
     TQString message;
-    message += TQString("URL: %1<br>Org: %2<br>Fid: %3<br>").tqarg(info.url,info.org,info.fid);
+    message += TQString("URL: %1<br>Org: %2<br>Fid: %3<br>").arg(info.url,info.org,info.fid);
     if ( info.statements )
       message += i18n("Supports online statements<br>");
     if ( info.investments )
@@ -248,7 +248,7 @@ bool KOnlineBankingSetupWizard::finishLoginPage(void)
     // who owns this memory?!?!
     char* request = libofx_request_accountinfo( &fi );
 
-    KURL filename(TQString("%1response.ofx").tqarg(locateLocal("appdata", "")));
+    KURL filename(TQString("%1response.ofx").arg(locateLocal("appdata", "")));
     TQByteArray req;
     req.setRawData(request, strlen(request));
     OfxHttpsRequest("POST", (*m_it_info).url, req, TQMap<TQString, TQString>(), filename, true);
@@ -360,7 +360,7 @@ int KOnlineBankingSetupWizard::ofxAccountCallback(struct OfxAccountData data, vo
   if(/* !kvps.value("bankid").isEmpty()
   && */ !kvps.value("uniqueId").isEmpty()) {
 
-    kvps.setValue("kmmofx-acc-ref", TQString("%1-%2").tqarg(kvps.value("bankid"), kvps.value("uniqueId")));
+    kvps.setValue("kmmofx-acc-ref", TQString("%1-%2").arg(kvps.value("bankid"), kvps.value("uniqueId")));
   } else {
     qDebug("Cannot setup kmmofx-acc-ref for '%s'", kvps.value("bankname").data());
   }
@@ -379,11 +379,11 @@ int KOnlineBankingSetupWizard::ofxStatusCallback(struct OfxStatusData data, void
 
   if(data.code_valid==true)
   {
-    message += TQString("#%1 %2: \"%3\"\n").tqarg(data.code).tqarg(data.name,data.description);
+    message += TQString("#%1 %2: \"%3\"\n").arg(data.code).arg(data.name,data.description);
   }
 
   if(data.server_message_valid==true){
-    message += i18n("Server message: %1\n").tqarg(data.server_message);
+    message += i18n("Server message: %1\n").arg(data.server_message);
   }
 
   if(data.severity_valid==true){
@@ -391,10 +391,10 @@ int KOnlineBankingSetupWizard::ofxStatusCallback(struct OfxStatusData data, void
     case OfxStatusData::INFO :
       break;
     case OfxStatusData::WARN :
-      KMessageBox::detailedError( pthis, i18n("Your bank returned warnings when signing on"), i18n("WARNING %1").tqarg(message) );
+      KMessageBox::detailedError( pthis, i18n("Your bank returned warnings when signing on"), i18n("WARNING %1").arg(message) );
       break;
     case OfxStatusData::ERROR :
-      KMessageBox::detailedError( pthis, i18n("Error signing onto your bank"), i18n("ERROR %1").tqarg(message) );
+      KMessageBox::detailedError( pthis, i18n("Error signing onto your bank"), i18n("ERROR %1").arg(message) );
       break;
     default:
       break;
diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
index d2b9880..084d73c 100644
--- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
@@ -48,22 +48,22 @@
 #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");
-  TQString bankid = TQString("%1 %2").tqarg(settings.value("bankid")).tqarg(settings.value("branchid"));
+  TQString bankid = TQString("%1 %2").arg(settings.value("bankid")).arg(settings.value("branchid"));
   if ( bankid.length() > 1 )
-    bank += TQString(" (%1)").tqarg(bankid);
+    bank += TQString(" (%1)").arg(bankid);
   m_textBank->setText(bank);
   m_textOnlineAccount->setText(account);
 
@@ -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..e7d5cec 100644
--- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatusdecl.ui
+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatusdecl.ui
@@ -79,7 +79,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -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>
@@ -159,7 +159,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -188,7 +188,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>150</width>
                                     <height>21</height>
@@ -229,7 +229,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout17</cstring>
+                                <cstring>layout17</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -237,7 +237,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout8</cstring>
+                                        <cstring>layout8</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -274,7 +274,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout16</cstring>
+                                        <cstring>layout16</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -300,7 +300,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout7</cstring>
+                                        <cstring>layout7</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -346,7 +346,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>41</width>
                                     <height>20</height>
@@ -368,7 +368,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout11</cstring>
+                                <cstring>layout11</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -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..36a05b5 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());
@@ -416,13 +416,13 @@ TQString MyMoneyOfxConnector::header(void)
                  "COMPRESSION:NONE\r\n"
                  "OLDFILEUID:NONE\r\n"
                  "NEWFILEUID:%1\r\n"
-                 "\r\n").tqarg(uuid());
+                 "\r\n").arg(uuid());
 }
 
 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..390edaf 100644
--- a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp
+++ b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp
@@ -19,7 +19,7 @@
 // QT Includes
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
 #include <tqdatetimeedit.h>
@@ -74,7 +74,7 @@ void OfxImporterPlugin::slotImportFile(void)
     if ( isMyFormat(url.path()) ) {
       slotImportFile(url.path());
     } else {
-      KMessageBox::error( 0, i18n("Unable to import %1 using the OFX importer plugin.  This file is not the correct format.").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Incorrect format"));
+      KMessageBox::error( 0, i18n("Unable to import %1 using the OFX importer plugin.  This file is not the correct format.").arg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Incorrect format"));
     }
 
   }
@@ -351,7 +351,7 @@ int OfxImporterPlugin::ofxTransactionCallback(struct OfxTransactionData data, vo
       break;
     default:
       unhandledtype = true;
-      type = TQString("UNKNOWN %1").tqarg(data.invtransactiontype);
+      type = TQString("UNKNOWN %1").arg(data.invtransactiontype);
       break;
     }
   }
@@ -373,14 +373,14 @@ int OfxImporterPlugin::ofxTransactionCallback(struct OfxTransactionData data, vo
     double proper_total = t.m_dShares * data.unitprice + t.m_moneyFees;
     if ( proper_total != t.m_moneyAmount )
     {
-      pofx->addWarning(TQString("Transaction %1 has an incorrect total of %2. Using calculated total of %3 instead.").tqarg(t.m_strBankID).tqarg(t.m_moneyAmount).tqarg(proper_total));
+      pofx->addWarning(TQString("Transaction %1 has an incorrect total of %2. Using calculated total of %3 instead.").arg(t.m_strBankID).arg(t.m_moneyAmount).arg(proper_total));
       t.m_moneyAmount = proper_total;
     }
   }
 #endif
 
   if ( unhandledtype )
-    pofx->addWarning(TQString("Transaction %1 has an unsupported type (%2).").tqarg(t.m_strBankID,type));
+    pofx->addWarning(TQString("Transaction %1 has an unsupported type (%2).").arg(t.m_strBankID,type));
   else
     s.m_listTransactions += t;
 
@@ -482,7 +482,7 @@ int OfxImporterPlugin::ofxAccountCallback(struct OfxAccountData data, void * pv)
   }
 
   // ask KMyMoney for an account id
-  s.m_accountId = pofx->account("kmmofx-acc-ref", TQString("%1-%2").tqarg(s.m_strRoutingNumber, s.m_strAccountNumber)).id();
+  s.m_accountId = pofx->account("kmmofx-acc-ref", TQString("%1-%2").arg(s.m_strRoutingNumber, s.m_strAccountNumber)).id();
 
   // copy over the securities
   s.m_listSecurities = pofx->m_securitylist;
@@ -527,13 +527,13 @@ int OfxImporterPlugin::ofxStatusCallback(struct OfxStatusData data, void * pv)
   pofx->m_fatalerror = "No accounts found.";
 
   if(data.ofx_element_name_valid==true)
-    message.prepend(TQString("%1: ").tqarg(data.ofx_element_name));
+    message.prepend(TQString("%1: ").arg(data.ofx_element_name));
 
   if(data.code_valid==true)
-    message += TQString("%1 (Code %2): %3").tqarg(data.name).tqarg(data.code).tqarg(data.description);
+    message += TQString("%1 (Code %2): %3").arg(data.name).arg(data.code).arg(data.description);
 
   if(data.server_message_valid==true)
-    message += TQString(" (%1)").tqarg(data.server_message);
+    message += TQString(" (%1)").arg(data.server_message);
 
   if(data.severity_valid==true){
     switch(data.severity){
@@ -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;
 }
 
@@ -636,7 +636,7 @@ bool OfxImporterPlugin::updateAccount(const MyMoneyAccount& acc, bool moreAccoun
       dlg.exec();
     }
   } catch (MyMoneyException *e) {
-    KMessageBox::information(0 ,i18n("Error connecting to bank: %1").tqarg(e->what()));
+    KMessageBox::information(0 ,i18n("Error connecting to bank: %1").arg(e->what()));
     delete e;
   }
 
@@ -647,7 +647,7 @@ void OfxImporterPlugin::slotImportFile(const TQString& url)
 {
 
   if(!import(url)) {
-    KMessageBox::error( 0, TQString("<qt>%1</qt>").tqarg(i18n("Unable to import %1 using the OFX importer plugin.  The plugin returned the following error:<p>%2").tqarg(url, lastError())), i18n("Importing error"));
+    KMessageBox::error( 0, TQString("<qt>%1</qt>").arg(i18n("Unable to import %1 using the OFX importer plugin.  The plugin returned the following error:<p>%2").arg(url, lastError())), i18n("Importing error"));
   }
 }
 
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..29765f4 100644
--- a/kmymoney2/plugins/ofximport/ofxpartner.cpp
+++ b/kmymoney2/plugins/ofximport/ofxpartner.cpp
@@ -31,7 +31,7 @@
 #include <tqdom.h>
 #include <tqregexp.h>
 #include <tqdir.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 // ----------------------------------------------------------------------------
 // KDE Includes
@@ -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));
 }
 
@@ -233,15 +233,15 @@ OfxFiServiceInfo ServiceInfo(const TQString& fipid)
   attr["content-type"] = "application/x-www-form-urlencoded";
   attr["accept"] = "*/*";
 
-  KURL guidFile(TQString("%1fipid-%2.xml").tqarg(directory).tqarg(fipid));
+  KURL guidFile(TQString("%1fipid-%2.xml").arg(directory).arg(fipid));
 
   // Apparently at some point in time, for VER=6 msn returned an online URL
   // to a static error page (http://moneycentral.msn.com/cust404.htm).
   // 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())
-    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);
+  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).arg(fipid)), guidFile);
 
   TQFile f(guidFile.path());
   if(f.open(IO_ReadOnly)) {
@@ -299,7 +299,7 @@ OfxHttpsRequest::OfxHttpsRequest(const TQString& type, const KURL &url, const TQ
 {
   TQDir homeDir(TQDir::home());
   if(homeDir.exists("ofxlog.txt")) {
-    d->m_fpTrace.setName(TQString("%1/ofxlog.txt").tqarg(TQDir::homeDirPath()));
+    d->m_fpTrace.setName(TQString("%1/ofxlog.txt").arg(TQDir::homeDirPath()));
     d->m_fpTrace.open(IO_WriteOnly | IO_Append);
   }
 
@@ -407,7 +407,7 @@ OfxHttpRequest::OfxHttpRequest(const TQString& type, const KURL &url, const TQBy
     delete m_job;
   } else {
     m_error = TQHttp::Aborted;
-    errorMsg = i18n("Cannot open file %1 for writing").tqarg(dst.path());
+    errorMsg = i18n("Cannot open file %1 for writing").arg(dst.path());
   }
 
   if(m_error != TQHttp::NoError) {
diff --git a/kmymoney2/plugins/pluginloader.cpp b/kmymoney2/plugins/pluginloader.cpp
index 5e1dcc6..1ffb8bb 100644
--- a/kmymoney2/plugins/pluginloader.cpp
+++ b/kmymoney2/plugins/pluginloader.cpp
@@ -20,7 +20,7 @@
 
 #include <tqstringlist.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // ----------------------------------------------------------------------------
 // KDE Includes
diff --git a/kmymoney2/plugins/viewinterface.h b/kmymoney2/plugins/viewinterface.h
index 620cef1..06b7d9d 100644
--- a/kmymoney2/plugins/viewinterface.h
+++ b/kmymoney2/plugins/viewinterface.h
@@ -68,7 +68,7 @@ public:
   virtual KMyMoneyViewBase* addPage(const TQString& item, const TQString& icon) = 0;
 
   /**
-    * This method adds a widget to the tqlayout of the view
+    * This method adds a widget to the layout of the view
     * created with addPage()
     *
     * @param view pointer to view widget