diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2020-05-26 01:30:17 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2020-05-26 01:30:17 +0200 |
commit | 5004b40e99036a0d9346dba6b5e6a4553de5a65e (patch) | |
tree | d7f9d99920bfff3b4a5719446ead1c3951ec5399 /src/frontend.cpp | |
parent | 8bc51aef53e4d9de236ca4f19806b32da1cc0525 (diff) | |
download | kscope-5004b40e99036a0d9346dba6b5e6a4553de5a65e.tar.gz kscope-5004b40e99036a0d9346dba6b5e6a4553de5a65e.zip |
Fix missing or incorrect ascii conversions when retrieving process output.
Added controlled conversions to char* instead of automatic ascii conversions.
The definition of -UTQT_NO_ASCII_CAST is no longer needed.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'src/frontend.cpp')
-rw-r--r-- | src/frontend.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/frontend.cpp b/src/frontend.cpp index 1bcace8..ab12459 100644 --- a/src/frontend.cpp +++ b/src/frontend.cpp @@ -231,12 +231,12 @@ bool Frontend::tokenize(char** ppBuf, int* pBufSize, TQString& sResult, // Either a token was found, or the search through the buffer was // finished without a delimiter character if (bFoundToken) { - sResult = *ppBuf; + sResult = TQString::fromLocal8Bit(*ppBuf); *ppBuf = pBuf; *pBufSize = nSize; } else if (m_bInToken) { - sResult = TQString::fromLatin1(*ppBuf, *pBufSize); + sResult = TQString::fromLocal8Bit(*ppBuf, *pBufSize); } else { sResult = TQString::null; @@ -358,7 +358,7 @@ void Frontend::slotReadStderr(TDEProcess*, char* pBuffer, int nSize) if (m_bKilled) return; - sBuf.setLatin1(pBuffer, nSize); + sBuf = TQString::fromLocal8Bit(pBuffer, nSize); parseStderr(sBuf); } |