diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
commit | 8155225c9be993acc0512956416d195edfef4eb9 (patch) | |
tree | de4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /konsole/konsole/keytrans.cpp | |
parent | 364641b8e0279758d236af39abd138d379328a19 (diff) | |
download | tdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip |
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
Diffstat (limited to 'konsole/konsole/keytrans.cpp')
-rw-r--r-- | konsole/konsole/keytrans.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp index 36e299bc0..de35d49ff 100644 --- a/konsole/konsole/keytrans.cpp +++ b/konsole/konsole/keytrans.cpp @@ -90,10 +90,10 @@ KeyTrans::KeyTrans(const TQString& path) else { m_id = m_path; - int i = m_id.findRev('/'); + int i = m_id.tqfindRev('/'); if (i > -1) m_id = m_id.mid(i+1); - i = m_id.findRev('.'); + i = m_id.tqfindRev('.'); if (i > -1) m_id = m_id.left(i); } @@ -360,11 +360,11 @@ void KeyTrans::readConfig() TQCString txt = #include "default.keytab.h" ; - buf=new TQBuffer(txt); + buf=TQT_TQIODEVICE(new TQBuffer(txt)); } else { - buf=new TQFile(m_path); + buf=TQT_TQIODEVICE(new TQFile(m_path)); }; KeytabReader ktr(m_path,*buf); ktr.parseTo(this); @@ -533,8 +533,8 @@ void KeyTransSymbols::defKeySyms() defKeySym("Up", Qt::Key_Up ); defKeySym("Right", Qt::Key_Right ); defKeySym("Down", Qt::Key_Down ); - defKeySym("Prior", Qt::Key_Prior ); - defKeySym("Next", Qt::Key_Next ); + defKeySym("Prior", TQt::Key_Prior ); + defKeySym("Next", TQt::Key_Next ); defKeySym("Shift", Qt::Key_Shift ); defKeySym("Control", Qt::Key_Control ); defKeySym("Meta", Qt::Key_Meta ); @@ -670,8 +670,8 @@ static TQIntDict<KeyTrans> * numb2keymap = 0L; KeyTrans* KeyTrans::find(int numb) { - KeyTrans* res = numb2keymap->find(numb); - return res ? res : numb2keymap->find(0); + KeyTrans* res = numb2keymap->tqfind(numb); + return res ? res : numb2keymap->tqfind(0); } KeyTrans* KeyTrans::find(const TQString &id) @@ -683,7 +683,7 @@ KeyTrans* KeyTrans::find(const TQString &id) return it.current(); ++it; } - return numb2keymap->find(0); + return numb2keymap->tqfind(0); } int KeyTrans::count() |