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, 8 insertions, 8 deletions

diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp
index 2519ea794..4650e6a23 100644
--- a/kcontrol/locale/localetime.cpp
+++ b/kcontrol/locale/localetime.cpp
@@ -253,28 +253,28 @@ void KLocaleConfigTime::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");
 
   TQString str;
 
-  str = ent.readEntry("CalendarSystem", TQString::fromLatin1("gregorian"));
+  str = ent.readEntry("CalendarSystem", TQString::tqfromLatin1("gregorian"));
   config->deleteEntry("CalendarSystem", false, true);
   if (str != m_locale->calendarType())
     config->writeEntry("CalendarSystem", m_locale->calendarType(), true, true);
 
-  str = ent.readEntry("TimeFormat", TQString::fromLatin1("%H:%M:%S"));
+  str = ent.readEntry("TimeFormat", TQString::tqfromLatin1("%H:%M:%S"));
   config->deleteEntry("TimeFormat", false, true);
   if (str != m_locale->timeFormat())
     config->writeEntry("TimeFormat", m_locale->timeFormat(), true, true);
 
-  str = ent.readEntry("DateFormat", TQString::fromLatin1("%A %d %B %Y"));
+  str = ent.readEntry("DateFormat", TQString::tqfromLatin1("%A %d %B %Y"));
   config->deleteEntry("DateFormat", false, true);
   if (str != m_locale->dateFormat())
     config->writeEntry("DateFormat", m_locale->dateFormat(), true, true);
 
-  str = ent.readEntry("DateFormatShort", TQString::fromLatin1("%Y-%m-%d"));
+  str = ent.readEntry("DateFormatShort", TQString::tqfromLatin1("%Y-%m-%d"));
   config->deleteEntry("DateFormatShort", false, true);
   if (str != m_locale->dateFormatShort())
     config->writeEntry("DateFormatShort",
@@ -345,7 +345,7 @@ void KLocaleConfigTime::slotLocaleChanged()
   TQString calendarType = m_locale->calendarType();
   int calendarSystem = 0;
 
-  CalendarVector::iterator it = qFind(calendars.begin(), calendars.end(),
+  CalendarVector::iterator it = tqFind(calendars.begin(), calendars.end(),
 calendarType);
   if ( it != calendars.end() )
     calendarSystem = it - calendars.begin();
@@ -371,7 +371,7 @@ calendarType);
   kdDebug(173) << storeToUser(timeMap(),
 			   m_locale->timeFormat()) << endl;
   kdDebug(173) << userToStore(timeMap(),
-			   TQString::fromLatin1("HH:MM:SS AMPM test")) << endl;
+			   TQString::tqfromLatin1("HH:MM:SS AMPM test")) << endl;
 
 }
 
@@ -416,7 +416,7 @@ void KLocaleConfigTime::slotTranslate()
 {
   TQString str;
 
-  TQString sep = TQString::fromLatin1("\n");
+  TQString sep = TQString::tqfromLatin1("\n");
 
   TQString old;