Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


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

1 files changed, 27 insertions, 27 deletions

diff --git a/kxkb/rules.cpp b/kxkb/rules.cpp
index 940b2db35..dbf5b823d 100644
--- a/kxkb/rules.cpp
+++ b/kxkb/rules.cpp
@@ -15,8 +15,8 @@
 #include "rules.h"
 
 
-XkbRules::XkbRules(bool tqlayoutsOnly):
-    m_tqlayouts(90)
+XkbRules::XkbRules(bool layoutsOnly):
+    m_layouts(90)
 {
 	X11_DIR = X11Helper::findX11Dir();
 
@@ -34,23 +34,23 @@ XkbRules::XkbRules(bool tqlayoutsOnly):
 		return;
 	}
 
-	loadRules(rulesFile, tqlayoutsOnly);
+	loadRules(rulesFile, layoutsOnly);
 	loadOldLayouts(rulesFile);
 	loadGroups(::locate("config", "kxkb_groups"));
 }
 
 
-void XkbRules::loadRules(TQString file, bool tqlayoutsOnly)
+void XkbRules::loadRules(TQString file, bool layoutsOnly)
 {
-	RulesInfo* rules = X11Helper::loadRules(file, tqlayoutsOnly);
+	RulesInfo* rules = X11Helper::loadRules(file, layoutsOnly);
 
 	if (rules == NULL) {
 		kdDebug() << "Unable to load rules" << endl;
 		return;
 	}
 
-	m_tqlayouts= rules->tqlayouts;
-	if( tqlayoutsOnly == false ) {
+	m_layouts= rules->layouts;
+	if( layoutsOnly == false ) {
 		m_models = rules->models;
 		m_options = rules->options;
 	}
@@ -65,7 +65,7 @@ void XkbRules::loadRules(TQString file, bool tqlayoutsOnly)
 // // the rule file wasn't found
 // 	static struct {
 // 		const char * locale;
-// 		const char * tqlayout;
+// 		const char * layout;
 // 	} fixedLayouts[] = {
 // 		{ "ben", "Bengali" },
 // 		{ "ar", "Arabic" },
@@ -73,21 +73,21 @@ void XkbRules::loadRules(TQString file, bool tqlayoutsOnly)
 // 		{ 0, 0 }
 // 	};
 // 	
-// 	for(int i=0; fixedLayouts[i].tqlayout != 0; i++ ) {
-// 		if( m_tqlayouts.find(fixedLayouts[i].locale) == 0 )
-// 			m_tqlayouts.insert(fixedLayouts[i].locale, fixedLayouts[i].tqlayout);
+// 	for(int i=0; fixedLayouts[i].layout != 0; i++ ) {
+// 		if( m_layouts.find(fixedLayouts[i].locale) == 0 )
+// 			m_layouts.insert(fixedLayouts[i].locale, fixedLayouts[i].layout);
 // 	}
 // }
 
-bool XkbRules::isSingleGroup(const TQString& tqlayout)
+bool XkbRules::isSingleGroup(const TQString& layout)
 {
 	  return X11Helper::areSingleGroupsSupported()
-			  && !m_oldLayouts.tqcontains(tqlayout)
-			  && !m_nonLatinLayouts.tqcontains(tqlayout);
+			  && !m_oldLayouts.contains(layout)
+			  && !m_nonLatinLayouts.contains(layout);
 }
 
 
-// check $oldtqlayouts and $nonlatin groups for XFree 4.3 and later
+// check $oldlayouts and $nonlatin groups for XFree 4.3 and later
 void XkbRules::loadOldLayouts(TQString rulesFile)
 {
 	OldLayouts* oldLayoutsStruct = X11Helper::loadOldLayouts( rulesFile );
@@ -95,8 +95,8 @@ void XkbRules::loadOldLayouts(TQString rulesFile)
 	m_nonLatinLayouts = oldLayoutsStruct->nonLatinLayouts;
 }
 
-// for multi-group tqlayouts in XFree 4.2 and older
-//    or if tqlayout is present in $oldtqlayout or $nonlatin groups
+// for multi-group layouts in XFree 4.2 and older
+//    or if layout is present in $oldlayout or $nonlatin groups
 void XkbRules::loadGroups(TQString file)
 {
   TQFile f(file);
@@ -121,35 +121,35 @@ void XkbRules::loadGroups(TQString file)
 }
 
 unsigned int 
-XkbRules::getDefaultGroup(const TQString& tqlayout, const TQString& includeGroup)
+XkbRules::getDefaultGroup(const TQString& layout, const TQString& includeGroup)
 {
-// check for new one-group tqlayouts in XFree 4.3 and older
-    if( isSingleGroup(tqlayout) ) {
+// check for new one-group layouts in XFree 4.3 and older
+    if( isSingleGroup(layout) ) {
 		if( includeGroup.isEmpty() == false )
 			return 1;
 		else
 			return 0;
     }
     
-    TQMap<TQString, unsigned int>::iterator it = m_initialGroups.find(tqlayout);
+    TQMap<TQString, unsigned int>::iterator it = m_initialGroups.find(layout);
     return it == m_initialGroups.end() ? 0 : it.data();
 }
 
 
 QStringList
-XkbRules::getAvailableVariants(const TQString& tqlayout)
+XkbRules::getAvailableVariants(const TQString& layout)
 {
-    if( tqlayout.isEmpty() || !tqlayouts().find(tqlayout) )
+    if( layout.isEmpty() || !layouts().find(layout) )
 	return TQStringList();
 
-    TQStringList* result1 = m_varLists[tqlayout];
+    TQStringList* result1 = m_varLists[layout];
     if( result1 )
         return *result1;
 
-    bool oldLayouts = m_oldLayouts.tqcontains(tqlayout);
-    TQStringList* result = X11Helper::getVariants(tqlayout, X11_DIR, oldLayouts);
+    bool oldLayouts = m_oldLayouts.contains(layout);
+    TQStringList* result = X11Helper::getVariants(layout, X11_DIR, oldLayouts);
 
-    m_varLists.insert(tqlayout, result);
+    m_varLists.insert(layout, result);
 
     return *result;
 }