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/zip.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/zip.cpp')
-rw-r--r-- | ark/zip.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ark/zip.cpp b/ark/zip.cpp index ef66988..f223016 100644 --- a/ark/zip.cpp +++ b/ark/zip.cpp @@ -28,7 +28,6 @@ // Qt includes #include <tqdir.h> -#include <tqtextcodec.h> // KDE includes #include <kdebug.h> @@ -208,10 +207,8 @@ void ZipArch::unarchFileInternal() *kp << "-o"; else *kp << "-n"; - - TQTextCodec *codec = TQTextCodec::codecForLocale(); - *kp << codec->fromUnicode(m_filename); + *kp << m_filename; // if the list is empty, no filenames go on the command line, // and we then extract everything in the archive. @@ -221,12 +218,11 @@ void ZipArch::unarchFileInternal() for ( it = m_fileList->begin(); it != m_fileList->end(); ++it ) { - *kp << codec->fromUnicode(*it); + *kp << (*it); } } - *kp << "-d"; - *kp << codec->fromUnicode(m_destDir); + *kp << "-d" << m_destDir; connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); |