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
---
 kxkb/rules.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'kxkb/rules.cpp')

diff --git a/kxkb/rules.cpp b/kxkb/rules.cpp
index dbf5b823d..2abe3f154 100644
--- a/kxkb/rules.cpp
+++ b/kxkb/rules.cpp
@@ -74,7 +74,7 @@ void XkbRules::loadRules(TQString file, bool layoutsOnly)
 // 	};
 // 	
 // 	for(int i=0; fixedLayouts[i].layout != 0; i++ ) {
-// 		if( m_layouts.find(fixedLayouts[i].locale) == 0 )
+// 		if( m_layouts.tqfind(fixedLayouts[i].locale) == 0 )
 // 			m_layouts.insert(fixedLayouts[i].locale, fixedLayouts[i].layout);
 // 	}
 // }
@@ -82,8 +82,8 @@ void XkbRules::loadRules(TQString file, bool layoutsOnly)
 bool XkbRules::isSingleGroup(const TQString& layout)
 {
 	  return X11Helper::areSingleGroupsSupported()
-			  && !m_oldLayouts.contains(layout)
-			  && !m_nonLatinLayouts.contains(layout);
+			  && !m_oldLayouts.tqcontains(layout)
+			  && !m_nonLatinLayouts.tqcontains(layout);
 }
 
 
@@ -131,22 +131,22 @@ XkbRules::getDefaultGroup(const TQString& layout, const TQString& includeGroup)
 			return 0;
     }
     
-    TQMap<TQString, unsigned int>::iterator it = m_initialGroups.find(layout);
+    TQMap<TQString, unsigned int>::iterator it = m_initialGroups.tqfind(layout);
     return it == m_initialGroups.end() ? 0 : it.data();
 }
 
 
-QStringList
+TQStringList
 XkbRules::getAvailableVariants(const TQString& layout)
 {
-    if( layout.isEmpty() || !layouts().find(layout) )
+    if( layout.isEmpty() || !layouts().tqfind(layout) )
 	return TQStringList();
 
     TQStringList* result1 = m_varLists[layout];
     if( result1 )
         return *result1;
 
-    bool oldLayouts = m_oldLayouts.contains(layout);
+    bool oldLayouts = m_oldLayouts.tqcontains(layout);
     TQStringList* result = X11Helper::getVariants(layout, X11_DIR, oldLayouts);
 
     m_varLists.insert(layout, result);
-- 
cgit v1.2.1