diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-08 01:41:56 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-08 01:41:56 +0000 |
commit | 5c38d9128823cbfe93e04b6dac60cbf7d3ae208c (patch) | |
tree | 476f3c9ccdedf46fcf6e4dd6ca18590b4233af6c /ark/arch.cpp | |
parent | 8b9f540b428d5b2141c6f17893fc2cb0c9ecdbf2 (diff) | |
download | tdeutils-5c38d9128823cbfe93e04b6dac60cbf7d3ae208c.tar.gz tdeutils-5c38d9128823cbfe93e04b6dac60cbf7d3ae208c.zip |
Revert Chakra unicode patch as it both causes a FTBFS and seems to duplicate functionality already present
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1172772 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ark/arch.cpp')
-rw-r--r-- | ark/arch.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ark/arch.cpp b/ark/arch.cpp index 92e7424..a08484c 100644 --- a/ark/arch.cpp +++ b/ark/arch.cpp @@ -33,7 +33,6 @@ // QT includes #include <tqapplication.h> #include <tqfile.h> -#include <tqtextcodec.h> // KDE includes #include <kdebug.h> @@ -331,20 +330,15 @@ void Arch::slotReceivedTOC( KProcess*, char* data, int length ) bool Arch::processLine( const TQCString &line ) { TQString columns[ 11 ]; - TQString unicode_line; unsigned int pos = 0; int strpos, len; - TQTextCodec *codec = TQTextCodec::codecForLocale(); - unicode_line = codec->toUnicode( line ); - - // Go through our columns, try to pick out data, return silently on failure for ( TQPtrListIterator <ArchColumns>col( m_archCols ); col.current(); ++col ) { ArchColumns *curCol = *col; - strpos = curCol->pattern.search( unicode_line, pos ); + strpos = curCol->pattern.search( line, pos ); len = curCol->pattern.matchedLength(); if ( ( strpos == -1 ) || ( len > curCol->maxLength ) ) @@ -360,7 +354,7 @@ bool Arch::processLine( const TQCString &line ) pos = strpos + len; - columns[curCol->colRef] = TQString::fromLocal8Bit( unicode_line.mid(strpos, len) ); + columns[curCol->colRef] = TQString::fromLocal8Bit( line.mid(strpos, len) ); } |