Allow kdebase to (mostly) function correctly with TQt for Qt4

Fix kicker tackbar handling under Classic mode (thanks to Ilya Chernykh for the patch)
Fix a newly invalidated section of code under GCC 4.5.2 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47723#c6)


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1220927 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 10 insertions, 10 deletions

diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp
index a192bf608..81b899caa 100644
--- a/kcontrol/locale/kcmlocale.cpp
+++ b/kcontrol/locale/kcmlocale.cpp
@@ -174,12 +174,12 @@ void KLocaleConfig::slotAddLanguage(const TQString & code)
   // If it's already in list, just move it (delete the old, then insert a new)
   int oldPos = languageList.tqfindIndex( code );
   if ( oldPos != -1 )
-    languageList.remove( languageList.at(oldPos) );
+    languageList.remove( languageList.tqat(oldPos) );
 
   if ( oldPos != -1 && oldPos < pos )
     --pos;
 
-  TQStringList::Iterator it = languageList.at( pos );
+  TQStringList::Iterator it = languageList.tqat( pos );
 
   languageList.insert( it, code );
 
@@ -195,7 +195,7 @@ void KLocaleConfig::slotRemoveLanguage()
   TQStringList languageList = m_locale->languageList();
   int pos = m_languages->currentItem();
 
-  TQStringList::Iterator it = languageList.at( pos );
+  TQStringList::Iterator it = languageList.tqat( pos );
 
   if ( it != languageList.end() )
     {
@@ -214,8 +214,8 @@ void KLocaleConfig::slotLanguageUp()
   TQStringList languageList = m_locale->languageList();
   int pos = m_languages->currentItem();
 
-  TQStringList::Iterator it1 = languageList.at( pos - 1 );
-  TQStringList::Iterator it2 = languageList.at( pos );
+  TQStringList::Iterator it1 = languageList.tqat( pos - 1 );
+  TQStringList::Iterator it2 = languageList.tqat( pos );
 
   if ( it1 != languageList.end() && it2 != languageList.end()  )
   {
@@ -236,8 +236,8 @@ void KLocaleConfig::slotLanguageDown()
   TQStringList languageList = m_locale->languageList();
   int pos = m_languages->currentItem();
 
-  TQStringList::Iterator it1 = languageList.at( pos );
-  TQStringList::Iterator it2 = languageList.at( pos + 1 );
+  TQStringList::Iterator it1 = languageList.tqat( pos );
+  TQStringList::Iterator it2 = languageList.tqat( pos + 1 );
 
   if ( it1 != languageList.end() && it2 != languageList.end()  )
     {
diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp
index 4650e6a23..7832d90d6 100644
--- a/kcontrol/locale/localetime.cpp
+++ b/kcontrol/locale/localetime.cpp
@@ -150,7 +150,7 @@ TQString KLocaleConfigTime::userToStore(const TQValueList<StringPair> & list,
 
       if ( !bFound )
 	{
-	  TQChar c = userFormat.at( pos );
+	  TQChar c = userFormat.tqat( pos );
 	  if ( c == '%' )
 	    result += c;
 
@@ -169,7 +169,7 @@ TQString KLocaleConfigTime::storeToUser(const TQValueList<StringPair> & list,
   bool escaped = false;
   for ( uint pos = 0; pos < storeFormat.length(); ++pos )
     {
-      TQChar c = storeFormat.at(pos);
+      TQChar c = storeFormat.tqat(pos);
       if ( escaped )
 	{
 	  StringPair it = StringPair::find( list, c );
@@ -323,7 +323,7 @@ void KLocaleConfigTime::slotCalendarSystemChanged(int calendarSystem)
 
   TQString calendarType;
   bool ok;
-  calendarType = calendars.at(calendarSystem, &ok);
+  calendarType = calendars.tqat(calendarSystem, &ok);
   if ( !ok )
     calendarType = calendars.first();