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/TEmulation.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/TEmulation.cpp')
-rw-r--r-- | konsole/konsole/TEmulation.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/konsole/konsole/TEmulation.cpp b/konsole/konsole/TEmulation.cpp index 39aeab542..e136c3c38 100644 --- a/konsole/konsole/TEmulation.cpp +++ b/konsole/konsole/TEmulation.cpp @@ -251,7 +251,7 @@ int TEmulation::keymapNo() */ void TEmulation::onRcvChar(int c) -// process application unicode input to terminal +// process application tqunicode input to terminal // this is a trivial scanner { c &= 0xff; @@ -284,10 +284,10 @@ void TEmulation::onKeyPress( TQKeyEvent* ev ) scr->setHistCursor(scr->getHistLines()); if (!ev->text().isEmpty()) { // A block of text - // Note that the text is proper unicode. + // Note that the text is proper tqunicode. // We should do a conversion here, but since this // routine will never be used, we simply emit plain ascii. - emit sndBlock(ev->text().ascii(),ev->text().length()); + emit sndBlock(TQString(ev->text()).ascii(),ev->text().length()); } else if (ev->ascii()>0) { unsigned char c[1]; @@ -299,7 +299,7 @@ void TEmulation::onKeyPress( TQKeyEvent* ev ) // Unblocking, Byte to Unicode translation --------------------------------- -- /* - We are doing code conversion from locale to unicode first. + We are doing code conversion from locale to tqunicode first. */ void TEmulation::onRcvBlock(const char *s, int len) @@ -345,7 +345,7 @@ void TEmulation::onRcvBlock(const char *s, int len) if (r[j].category() == TQChar::Mark_NonSpacing) scr->compose(r.mid(j,1)); else - onRcvChar(r[j].unicode()); + onRcvChar(r[j].tqunicode()); } i = l; } @@ -418,9 +418,9 @@ bool TEmulation::findTextNext( const TQString &str, bool forward, bool caseSensi for (int i = (m_findPos==-1?0:m_findPos+1); i<(scr->getHistLines()+scr->getLines()); i++) { string = scr->getHistoryLine(i); if (regExp) - pos = string.find( TQRegExp(str,caseSensitive) ); + pos = string.tqfind( TQRegExp(str,caseSensitive) ); else - pos = string.find(str, 0, caseSensitive); + pos = string.tqfind(str, 0, caseSensitive); if(pos!=-1) { m_findPos=i; if(i>scr->getHistLines()) @@ -436,9 +436,9 @@ bool TEmulation::findTextNext( const TQString &str, bool forward, bool caseSensi for(int i = (m_findPos==-1?(scr->getHistLines()+scr->getLines()):m_findPos-1); i>=0; i--) { string = scr->getHistoryLine(i); if (regExp) - pos = string.find( TQRegExp(str,caseSensitive) ); + pos = string.tqfind( TQRegExp(str,caseSensitive) ); else - pos = string.find(str, 0, caseSensitive); + pos = string.tqfind(str, 0, caseSensitive); if(pos!=-1) { m_findPos=i; if(i>scr->getHistLines()) |