diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
| commit | 560378aaca1784ba19806a0414a32b20c744de39 (patch) | |
| tree | ce0dfd7c3febf2a1adc7603d1019a8be2083c415 /kdecore/kshortcut.cpp | |
| parent | d4d5af1cdbd3cc65d095e0afc5b1f4260091cf5d (diff) | |
| download | tdelibs-560378aaca1784ba19806a0414a32b20c744de39.tar.gz tdelibs-560378aaca1784ba19806a0414a32b20c744de39.zip | |
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/kshortcut.cpp')
| -rw-r--r-- | kdecore/kshortcut.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kdecore/kshortcut.cpp b/kdecore/kshortcut.cpp index 4847b8742..611f7924c 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::contains( const KKey& key ) const +bool KShortcut::tqcontains( const KKey& key ) const { - return contains( KKeySequence(key) ); + return tqcontains( KKeySequence(key) ); } -bool KShortcut::contains( const KKeyNative& keyNative ) const +bool KShortcut::tqcontains( const KKeyNative& keyNative ) const { KKey key = keyNative.key(); key.simplify(); @@ -545,7 +545,7 @@ bool KShortcut::contains( const KKeyNative& keyNative ) const return false; } -bool KShortcut::contains( const KKeySequence& seq ) const +bool KShortcut::tqcontains( 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 (!contains(cut.seq(i))) seqs++; + if (!tqcontains(cut.seq(i))) seqs++; } if( seqs > MAX_SEQUENCES ) return false; for( uint i=0; i<co; i++ ) { const KKeySequence& seq = cut.seq(i); - if(!contains(seq)) { + if(!tqcontains(seq)) { m_rgseq[m_nSeqs] = seq; m_nSeqs++; } |