From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 19 Jan 2011 01:42:14 +0000
Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break
 compatibility with TQt for Qt3; if it does please fix it ASAP!

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kcontrol/locale/localemon.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'kcontrol/locale/localemon.cpp')

diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp
index 9fa1ad708..2c2fa37c5 100644
--- a/kcontrol/locale/localemon.cpp
+++ b/kcontrol/locale/localemon.cpp
@@ -111,8 +111,8 @@ KLocaleConfigMoney::KLocaleConfigMoney(KLocale *locale,
   int i = 5;
   while (i--)
   {
-    m_cmbMonPosMonSignPos->insertItem(TQString::null);
-    m_cmbMonNegMonSignPos->insertItem(TQString::null);
+    m_cmbMonPosMonSignPos->insertItem(TQString());
+    m_cmbMonNegMonSignPos->insertItem(TQString());
   }
 
   lay->setColStretch(1, 1);
@@ -131,7 +131,7 @@ void KLocaleConfigMoney::save()
   KConfigGroupSaver saver(config, "Locale");
 
   KSimpleConfig ent(locate("locale",
-                           TQString::fromLatin1("l10n/%1/entry.desktop")
+                           TQString::tqfromLatin1("l10n/%1/entry.desktop")
                            .arg(m_locale->country())), true);
   ent.setGroup("KCM Locale");
 
@@ -139,25 +139,25 @@ void KLocaleConfigMoney::save()
   int i;
   bool b;
 
-  str = ent.readEntry("CurrencySymbol", TQString::fromLatin1("$"));
+  str = ent.readEntry("CurrencySymbol", TQString::tqfromLatin1("$"));
   config->deleteEntry("CurrencySymbol", false, true);
   if (str != m_locale->currencySymbol())
     config->writeEntry("CurrencySymbol",
                        m_locale->currencySymbol(), true, true);
 
-  str = ent.readEntry("MonetaryDecimalSymbol", TQString::fromLatin1("."));
+  str = ent.readEntry("MonetaryDecimalSymbol", TQString::tqfromLatin1("."));
   config->deleteEntry("MonetaryDecimalSymbol", false, true);
   if (str != m_locale->monetaryDecimalSymbol())
     config->writeEntry("MonetaryDecimalSymbol",
                        m_locale->monetaryDecimalSymbol(), true, true);
 
-  str = ent.readEntry("MonetaryThousandsSeparator", TQString::fromLatin1(","));
-  str.replace(TQString::fromLatin1("$0"), TQString::null);
+  str = ent.readEntry("MonetaryThousandsSeparator", TQString::tqfromLatin1(","));
+  str.tqreplace(TQString::tqfromLatin1("$0"), TQString());
   config->deleteEntry("MonetaryThousandsSeparator", false, true);
   if (str != m_locale->monetaryThousandsSeparator())
     config->writeEntry("MonetaryThousandsSeparator",
-                       TQString::fromLatin1("$0%1$0")
-                       .arg(m_locale->monetaryThousandsSeparator()),
+                       TQString::tqfromLatin1("$0%1$0")
+                       .tqarg(m_locale->monetaryThousandsSeparator()),
                        true, true);
 
   i = ent.readNumEntry("FracDigits", 2);
@@ -260,8 +260,8 @@ void KLocaleConfigMoney::slotMonNegMonSignPosChanged(int i)
 void KLocaleConfigMoney::slotTranslate()
 {
   TQObjectList list;
-  list.append(m_cmbMonPosMonSignPos);
-  list.append(m_cmbMonNegMonSignPos);
+  list.append(TQT_TQOBJECT(m_cmbMonPosMonSignPos));
+  list.append(TQT_TQOBJECT(m_cmbMonNegMonSignPos));
 
   TQComboBox *wc;
   for (TQObjectListIt li(list) ; (wc = (TQComboBox *)li.current()) != 0; ++li)
-- 
cgit v1.2.3