diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-07 22:57:14 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-07 22:57:14 +0000 |
| commit | 8b9f540b428d5b2141c6f17893fc2cb0c9ecdbf2 (patch) | |
| tree | 67f26e6c80e5c4904cf644b1d543358271593e36 /ark/zip.cpp | |
| parent | 7cdaac30f5b4aa1d38a7e003963df3fc48576537 (diff) | |
| download | tdeutils-8b9f540b428d5b2141c6f17893fc2cb0c9ecdbf2.tar.gz tdeutils-8b9f540b428d5b2141c6f17893fc2cb0c9ecdbf2.zip | |
* Merged bugfix patches from Chakra project
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1172733 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ark/zip.cpp')
| -rw-r--r-- | ark/zip.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ark/zip.cpp b/ark/zip.cpp index f223016..ef66988 100644 --- a/ark/zip.cpp +++ b/ark/zip.cpp @@ -28,6 +28,7 @@ // Qt includes #include <tqdir.h> +#include <tqtextcodec.h> // KDE includes #include <kdebug.h> @@ -207,8 +208,10 @@ void ZipArch::unarchFileInternal() *kp << "-o"; else *kp << "-n"; + + TQTextCodec *codec = TQTextCodec::codecForLocale(); - *kp << m_filename; + *kp << codec->fromUnicode(m_filename); // if the list is empty, no filenames go on the command line, // and we then extract everything in the archive. @@ -218,11 +221,12 @@ void ZipArch::unarchFileInternal() for ( it = m_fileList->begin(); it != m_fileList->end(); ++it ) { - *kp << (*it); + *kp << codec->fromUnicode(*it); } } - *kp << "-d" << m_destDir; + *kp << "-d"; + *kp << codec->fromUnicode(m_destDir); connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); |