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

1 files changed, 7 insertions, 7 deletions

diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp
index bf4cc8b32..69c92abc7 100644
--- a/kcontrol/locale/klocalesample.cpp
+++ b/kcontrol/locale/klocalesample.cpp
@@ -45,7 +45,7 @@ KLocaleSample::KLocaleSample(KLocale *locale,
   lay->setAutoAdd(TRUE);
 
   // Whatever the color scheme is, we want black text
-  TQColorGroup a = palette().active();
+  TQColorGroup a = tqpalette().active();
   a.setColor(TQColorGroup::Foreground, Qt::black);
   TQPalette pal(a, a, a);
 
@@ -88,21 +88,21 @@ KLocaleSample::~KLocaleSample()
 
 void KLocaleSample::slotUpdateTime()
 {
-  TQDateTime dt = TQDateTime::currentDateTime();
+  TQDateTime dt = TQDateTime::tqcurrentDateTime();
 
-  m_dateSample->setText(m_locale->formatDate(dt.date(), false));
-  m_dateShortSample->setText(m_locale->formatDate(dt.date(), true));
-  m_timeSample->setText(m_locale->formatTime(dt.time(), true));
+  m_dateSample->setText(m_locale->formatDate(TQT_TQDATE_OBJECT(dt.date()), false));
+  m_dateShortSample->setText(m_locale->formatDate(TQT_TQDATE_OBJECT(dt.date()), true));
+  m_timeSample->setText(m_locale->formatTime(TQT_TQTIME_OBJECT(dt.time()), true));
 }
 
 void KLocaleSample::slotLocaleChanged()
 {
   m_numberSample->setText(m_locale->formatNumber(1234567.89) +
-                          TQString::fromLatin1(" / ") +
+                          TQString::tqfromLatin1(" / ") +
                           m_locale->formatNumber(-1234567.89));
 
   m_moneySample->setText(m_locale->formatMoney(123456789.00) +
-                         TQString::fromLatin1(" / ") +
+                         TQString::tqfromLatin1(" / ") +
                          m_locale->formatMoney(-123456789.00));
 
   slotUpdateTime();