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

This reverts commit 252fce5a2a5384702fbcc1c9987284d7bd2e6943.

1 files changed, 18 insertions, 18 deletions

diff --git a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp
index c943d10..4121abd 100644
--- a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp
+++ b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp
@@ -28,9 +28,9 @@
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqtimer.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 // ----------------------------------------------------------------------------
 // KDE Includes
@@ -104,7 +104,7 @@ KEquityPriceUpdateDlg::KEquityPriceUpdateDlg(TQWidget *parent, const TQString& s
     if ( file->security( pair.first ).isCurrency() && ( securityId.isEmpty() || ( pair == currencyIds ) ) )
     {
       const MyMoneyPriceEntries& entries = (*it_price);
-      if(entries.count() > 0 && entries.begin().key() <= TQDate::currentDate()) {
+      if(entries.count() > 0 && entries.begin().key() <= TQDate::tqcurrentDate()) {
         addPricePair(pair);
         btnUpdateAll->setEnabled(true);
       }
@@ -157,7 +157,7 @@ KEquityPriceUpdateDlg::KEquityPriceUpdateDlg(TQWidget *parent, const TQString& s
   {
     btnUpdateSelected->hide();
     btnUpdateAll->hide();
-    // delete layout1;
+    // delete tqlayout1;
 
     TQTimer::singleShot(100,this,TQT_SLOT(slotUpdateAllClicked()));
   }
@@ -183,8 +183,8 @@ void KEquityPriceUpdateDlg::addPricePair(const MyMoneySecurityPair& pair, bool d
 {
   MyMoneyFile* file = MyMoneyFile::instance();
 
-  TQString symbol = TQString("%1 > %2").arg(pair.first,pair.second);
-  TQString id = TQString("%1 %2").arg(pair.first,pair.second);
+  TQString symbol = TQString("%1 > %2").tqarg(pair.first,pair.second);
+  TQString id = TQString("%1 %2").tqarg(pair.first,pair.second);
   if ( ! lvEquityList->findItem(id,ID_COL,TQt::ExactMatch) )
   {
     MyMoneyPrice pr = file->price(pair.first,pair.second);
@@ -219,7 +219,7 @@ void KEquityPriceUpdateDlg::addPricePair(const MyMoneySecurityPair& pair, bool d
       if(keep) {
         KListViewItem* item = new KListViewItem(lvEquityList,
           symbol,
-          i18n("%1 units in %2").arg(pair.first,pair.second));
+          i18n("%1 units in %2").tqarg(pair.first,pair.second));
         if(pr.isValid()) {
           item->setText(PRICE_COL, pr.rate(pair.second).formatMoney(file->currency(pair.second).tradingSymbol(), KMyMoneyGlobalSettings::pricePrecision()));
           item->setText(DATE_COL, pr.date().toString(Qt::ISODate));
@@ -260,7 +260,7 @@ void KEquityPriceUpdateDlg::addInvestment(const MyMoneySecurity& inv)
       }
       item->setText(ID_COL,id);
       if (inv.value("kmm-online-quote-system") == "Finance::Quote")
-        item->setText(SOURCE_COL, TQString("Finance::Quote %1").arg( inv.value("kmm-online-source")));
+        item->setText(SOURCE_COL, TQString("Finance::Quote %1").tqarg( inv.value("kmm-online-source")));
       else
         item->setText(SOURCE_COL, inv.value("kmm-online-source"));
 
@@ -282,7 +282,7 @@ void KEquityPriceUpdateDlg::logErrorMessage(const TQString& message)
 
 void KEquityPriceUpdateDlg::logStatusMessage(const TQString& message)
 {
-  lbStatus->append(message);
+  lbtqStatus->append(message);
 }
 
 MyMoneyPrice KEquityPriceUpdateDlg::price(const TQString& id) const
@@ -342,7 +342,7 @@ void KEquityPriceUpdateDlg::storePrices(void)
           TQStringList ids = TQStringList::split(" ",TQString(id));
           TQString fromid = ids[0].utf8();
           TQString toid = ids[1].utf8();
-          name = TQString("%1 --> %2").arg(fromid).arg(toid);
+          name = TQString("%1 --> %2").tqarg(fromid).tqarg(toid);
           MyMoneyPrice price(fromid,toid,TQDate().fromString(item->text(DATE_COL), Qt::ISODate),rate,item->text(SOURCE_COL));
           file->addPrice(price);
         }
@@ -422,9 +422,9 @@ void KEquityPriceUpdateDlg::slotQuoteFailed(const TQString& _id, const TQString&
   // Give the user some options
   int result;
   if(_id.contains(" ")) {
-    result = KMessageBox::warningContinueCancel(this, i18n("Failed to retrieve an exchange rate for %1 from %2. It will be skipped this time.").arg(_symbol, item->text(SOURCE_COL)), i18n("Price Update  Failed"));
+    result = KMessageBox::warningContinueCancel(this, i18n("Failed to retrieve an exchange rate for %1 from %2. It will be skipped this time.").tqarg(_symbol, item->text(SOURCE_COL)), i18n("Price Update  Failed"));
   } else {
-    result = KMessageBox::questionYesNoCancel(this, TQString("<qt>%1</qt>").arg(i18n("Failed to retrieve a quote for %1 from %2.  Press <b>No</b> to remove the online price source from this security permanently, <b>Yes</b> to continue updating this security during future price updates or <b>Cancel</b> to stop the current update operation.").arg(_symbol, item->text(SOURCE_COL))), i18n("Price Update Failed"), KStdGuiItem::yes(), KStdGuiItem::no());
+    result = KMessageBox::questionYesNoCancel(this, TQString("<qt>%1</qt>").tqarg(i18n("Failed to retrieve a quote for %1 from %2.  Press <b>No</b> to remove the online price source from this security permanently, <b>Yes</b> to continue updating this security during future price updates or <b>Cancel</b> to stop the current update operation.").tqarg(_symbol, item->text(SOURCE_COL))), i18n("Price Update Failed"), KStdGuiItem::yes(), KStdGuiItem::no());
   }
 
   if ( result == KMessageBox::No )
@@ -444,7 +444,7 @@ void KEquityPriceUpdateDlg::slotQuoteFailed(const TQString& _id, const TQString&
       MyMoneyFile::instance()->modifySecurity(security);
       ft.commit();
     } catch(MyMoneyException* e) {
-      KMessageBox::error(this, TQString("<qt>")+i18n("Cannot update security <b>%1</b>: %2").arg(_symbol, e->what())+TQString("</qt>"), i18n("Price Update Failed"));
+      KMessageBox::error(this, TQString("<qt>")+i18n("Cannot update security <b>%1</b>: %2").tqarg(_symbol, e->what())+TQString("</qt>"), i18n("Price Update Failed"));
       delete e;
     }
   }
@@ -492,8 +492,8 @@ void KEquityPriceUpdateDlg::slotReceivedQuote(const TQString& _id, const TQStrin
     if ( _price > 0.0f && _date.isValid() )
     {
       TQDate date = _date;
-      if ( date > TQDate::currentDate() )
-        date = TQDate::currentDate();
+      if ( date > TQDate::tqcurrentDate() )
+        date = TQDate::tqcurrentDate();
 
       double price = _price;
       TQString id = _id.utf8();
@@ -525,13 +525,13 @@ void KEquityPriceUpdateDlg::slotReceivedQuote(const TQString& _id, const TQStrin
       }
       item->setText(PRICE_COL, KGlobal::locale()->formatMoney(price, sec.tradingSymbol(), KMyMoneyGlobalSettings::pricePrecision()));
       item->setText(DATE_COL, date.toString(Qt::ISODate));
-      logStatusMessage(i18n("Price for %1 updated (id %2)").arg(_symbol,_id));
+      logStatusMessage(i18n("Price for %1 updated (id %2)").tqarg(_symbol,_id));
       // make sure to make OK button available
       btnOK->setEnabled(true);
     }
     else
     {
-      logErrorMessage(i18n("Received an invalid price for %1, unable to update.").arg(_symbol));
+      logErrorMessage(i18n("Received an invalid price for %1, unable to update.").tqarg(_symbol));
     }
 
     prgOnlineProgress->advance(1);
@@ -551,7 +551,7 @@ void KEquityPriceUpdateDlg::slotReceivedQuote(const TQString& _id, const TQStrin
   }
   else
   {
-    logErrorMessage(i18n("Received a price for %1 (id %2), but this symbol is not on the list!  Aborting entire update.").arg(_symbol,_id));
+    logErrorMessage(i18n("Received a price for %1 (id %2), but this symbol is not on the list!  Aborting entire update.").tqarg(_symbol,_id));
   }
 
   if (next)