From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 7 Jan 2011 03:45:53 +0000
Subject: 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/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdecore/kshortcut.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'kdecore/kshortcut.cpp')

diff --git a/kdecore/kshortcut.cpp b/kdecore/kshortcut.cpp
index 611f7924c..4847b8742 100644
--- a/kdecore/kshortcut.cpp
+++ b/kdecore/kshortcut.cpp
@@ -526,12 +526,12 @@ int KShortcut::compare( const KShortcut& cut ) const
 	return m_nSeqs - cut.m_nSeqs;
 }
 
-bool KShortcut::tqcontains( const KKey& key ) const
+bool KShortcut::contains( const KKey& key ) const
 {
-	return tqcontains( KKeySequence(key) );
+	return contains( KKeySequence(key) );
 }
 
-bool KShortcut::tqcontains( const KKeyNative& keyNative ) const
+bool KShortcut::contains( const KKeyNative& keyNative ) const
 {
 	KKey key = keyNative.key();
 	key.simplify();
@@ -545,7 +545,7 @@ bool KShortcut::tqcontains( const KKeyNative& keyNative ) const
 	return false;
 }
 
-bool KShortcut::tqcontains( const KKeySequence& seq ) const
+bool KShortcut::contains( const KKeySequence& seq ) const
 {
 	for( uint i = 0; i < count(); i++ ) {
 		if( !m_rgseq[i].isNull() && m_rgseq[i] == seq )
@@ -607,13 +607,13 @@ bool KShortcut::append( const KShortcut& cut )
 {
 	uint seqs = m_nSeqs, co = cut.count();
 	for( uint i=0; i<co; i++ ) {
-	    if (!tqcontains(cut.seq(i))) seqs++;
+	    if (!contains(cut.seq(i))) seqs++;
 	}
 	if( seqs > MAX_SEQUENCES ) return false;
 
 	for( uint i=0; i<co; i++ ) {
 		const KKeySequence& seq = cut.seq(i);
-		if(!tqcontains(seq)) {
+		if(!contains(seq)) {
 			m_rgseq[m_nSeqs] = seq;
 			m_nSeqs++;
 		}
-- 
cgit v1.2.1