summaryrefslogtreecommitdiffstats
path: root/konsole/konsole/keytrans.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
commit495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch)
treedaabcb652c07b9a17cad88ca50b63a2d91ead4a3 /konsole/konsole/keytrans.h
parent50001f1757f97510e80cb1990e2f2d5b00144c2a (diff)
downloadtdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz
tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'konsole/konsole/keytrans.h')
-rw-r--r--konsole/konsole/keytrans.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/konsole/konsole/keytrans.h b/konsole/konsole/keytrans.h
index 2ddf5f776..c5268c4fd 100644
--- a/konsole/konsole/keytrans.h
+++ b/konsole/konsole/keytrans.h
@@ -68,9 +68,9 @@ class KeyTrans
class KeyEntry
{
public:
- KeyEntry(int ref, int key, int bits, int mask, int cmd, TQString txt);
+ KeyEntry(int ref, int key, int bits, int tqmask, int cmd, TQString txt);
~KeyEntry();
- bool matches(int key, int bits, int mask);
+ bool matches(int key, int bits, int tqmask);
bool metaspecified(void);
bool anymodspecified(void);
TQString text();
@@ -78,14 +78,14 @@ class KeyTrans
private:
int key;
int bits;
- int mask;
+ int tqmask;
public:
int cmd;
TQString txt;
};
private:
- KeyEntry* addEntry(int ref, int key, int bits, int mask, int cmd, TQString txt);
+ KeyEntry* addEntry(int ref, int key, int bits, int tqmask, int cmd, TQString txt);
void addKeyTrans();
void readConfig();
TQPtrList<KeyEntry> tableX;