summaryrefslogtreecommitdiffstats
path: root/ark/rar.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-08 01:41:56 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-08 01:41:56 +0000
commit5c38d9128823cbfe93e04b6dac60cbf7d3ae208c (patch)
tree476f3c9ccdedf46fcf6e4dd6ca18590b4233af6c /ark/rar.cpp
parent8b9f540b428d5b2141c6f17893fc2cb0c9ecdbf2 (diff)
downloadtdeutils-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/rar.cpp')
-rw-r--r--ark/rar.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/ark/rar.cpp b/ark/rar.cpp
index 5219b08..2fbd91d 100644
--- a/ark/rar.cpp
+++ b/ark/rar.cpp
@@ -32,7 +32,6 @@
// QT includes
#include <tqfile.h>
#include <tqdir.h>
-#include <tqtextcodec.h>
// KDE includes
#include <kdebug.h>
@@ -97,7 +96,7 @@ bool RarArch::processLine( const TQCString &line )
if ( m_isFirstLine )
{
- m_entryFilename = TQString::fromLocal8Bit( unicode_line );
+ m_entryFilename = TQString::fromLocal8Bit( line );
m_entryFilename.remove( 0, 1 );
m_isFirstLine = false;
return true;
@@ -105,7 +104,7 @@ bool RarArch::processLine( const TQCString &line )
TQStringList list;
- TQStringList l2 = TQStringList::split( ' ', unicode_line );
+ TQStringList l2 = TQStringList::split( ' ', line );
list << m_entryFilename; // filename
list << l2[ 0 ]; // size
@@ -259,10 +258,8 @@ void RarArch::unarchFileInternal()
{
*kp << "-o-";
}
-
- TQTextCodec *codec = TQTextCodec::codecForLocale();
- *kp << codec->fromUnicode(m_filename);
+ *kp << m_filename;
// if the file list is empty, no filenames go on the command line,
// and we then extract everything in the archive.
@@ -271,11 +268,11 @@ void RarArch::unarchFileInternal()
TQStringList::Iterator it;
for ( it = m_fileList->begin(); it != m_fileList->end(); ++it )
{
- *kp << codec->fromUnicode(*it);
+ *kp << (*it);
}
}
- *kp << codec->fromUnicode(m_destDir);
+ *kp << m_destDir ;
connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ),
TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) );