diff options
Diffstat (limited to 'ark')
| -rw-r--r-- | ark/arch.h | 6 | ||||
| -rw-r--r-- | ark/arj.cpp | 6 | ||||
| -rw-r--r-- | ark/rar.cpp | 8 | ||||
| -rw-r--r-- | ark/sevenzip.cpp | 6 | ||||
| -rw-r--r-- | ark/tar.h | 1 | ||||
| -rw-r--r-- | ark/zip.cpp | 6 |
6 files changed, 16 insertions, 17 deletions
@@ -1,6 +1,6 @@ /* - ark -- archiver for the KDE project + ark -- archiver for the TDE project Copyright (C) @@ -152,7 +152,7 @@ class Arch : public TQObject const TQString &filename, const TQString &openAsMimeType = TQString() ); TQString password() { return m_password; } - void setPassword(const TQString & pw) { m_password = pw.local8Bit(); } + void setPassword(const TQString & pw) { m_password = pw; } virtual void createPassword() {} protected slots: @@ -206,7 +206,7 @@ class Arch : public TQObject TQStringList *m_fileList; TQString m_destDir; bool m_viewFriendly; - TQCString m_password; + TQString m_password; }; // Columns diff --git a/ark/arj.cpp b/ark/arj.cpp index 4a9ab44..7022b24 100644 --- a/ark/arj.cpp +++ b/ark/arj.cpp @@ -108,7 +108,7 @@ void ArjArch::addFile( const TQStringList & urls ) *kp << "-r"; if ( !m_password.isEmpty() ) - *kp << "-g"+m_password; + *kp << "-g"+m_password.local8Bit(); *kp << m_filename; @@ -221,7 +221,7 @@ void ArjArch::unarchFileInternal() *kp << "x"; if ( !m_password.isEmpty() ) - *kp << "-g" + m_password; + *kp << "-g" + m_password.local8Bit(); if ( ArkSettings::extractOverwrite() ) *kp << "-jyo"; @@ -306,7 +306,7 @@ void ArjArch::test() *kp << m_unarchiver_program << "t"; if ( !m_password.isEmpty() ) - *kp << "-g" + m_password; + *kp << "-g" + m_password.local8Bit(); *kp << m_filename; diff --git a/ark/rar.cpp b/ark/rar.cpp index 68aa604..3c5d8fa 100644 --- a/ark/rar.cpp +++ b/ark/rar.cpp @@ -205,7 +205,7 @@ void RarArch::open() *kp << m_unarchiver_program << "v" << "-c-"; if ( !m_password.isEmpty() ) - *kp << "-p" + m_password; + *kp << "-p" + m_password.local8Bit(); else *kp << "-p-"; @@ -283,7 +283,7 @@ void RarArch::addFile( const TQStringList & urls ) *kp << "-r"; if ( !m_password.isEmpty() ) - *kp << "-p"+m_password; + *kp << "-p"+m_password.local8Bit(); *kp << m_filename; @@ -326,7 +326,7 @@ void RarArch::unarchFileInternal() *kp << m_unarchiver_program << "x"; if ( !m_password.isEmpty() ) - *kp << "-p" + m_password; + *kp << "-p" + m_password.local8Bit(); else *kp << "-p-"; @@ -414,7 +414,7 @@ void RarArch::test() *kp << m_unarchiver_program << "t"; if ( !m_password.isEmpty() ) - *kp << "-p" + m_password; + *kp << "-p" + m_password.local8Bit(); *kp << m_filename; diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp index 287ec3b..e6823c0 100644 --- a/ark/sevenzip.cpp +++ b/ark/sevenzip.cpp @@ -136,7 +136,7 @@ void SevenZipArch::addFile( const TQStringList & urls ) *kp << m_archiver_program << "a" ; if ( !m_password.isEmpty() ) - *kp << "-p" + m_password; + *kp << "-p" + m_password.local8Bit(); KURL url( urls.first() ); TQDir::setCurrent( url.directory() ); @@ -232,7 +232,7 @@ void SevenZipArch::unarchFileInternal( ) *kp << "-y"; if ( !m_password.isEmpty() ) - *kp << "-p" + m_password; + *kp << "-p" + m_password.local8Bit(); *kp << m_filename; @@ -401,7 +401,7 @@ void SevenZipArch::test() *kp << m_unarchiver_program << "t"; if ( !m_password.isEmpty() ) - *kp << "-p" + m_password; + *kp << "-p" + m_password.local8Bit(); *kp << m_filename; @@ -108,7 +108,6 @@ class TarArch : public Arch void setHeaders(); void processDir( const KTarDirectory *tardir, const TQString & root ); void deleteOldFiles( const TQStringList &list, bool bAddOnlyNew ); - TQString getEntry( const TQString & filename ); private: // data // if the tar is compressed, this is the temporary uncompressed tar. diff --git a/ark/zip.cpp b/ark/zip.cpp index 4227ae5..392cc5c 100644 --- a/ark/zip.cpp +++ b/ark/zip.cpp @@ -144,7 +144,7 @@ void ZipArch::addFile( const TQStringList &urls ) *kp << m_archiver_program; if ( !m_password.isEmpty() ) - *kp << "-P" << m_password; + *kp << "-P" << m_password.local8Bit(); if ( ArkSettings::rarRecurseSubdirs() ) *kp << "-r"; @@ -202,7 +202,7 @@ void ZipArch::unarchFileInternal() *kp << m_unarchiver_program; if ( !m_password.isEmpty() ) - *kp << "-P" << m_password; + *kp << "-P" << m_password.local8Bit(); if ( ArkSettings::extractJunkPaths() && !m_viewFriendly ) *kp << "-j" ; @@ -292,7 +292,7 @@ void ZipArch::test() *kp << m_unarchiver_program << "-t"; if ( !m_password.isEmpty() ) - *kp << "-P" << m_password; + *kp << "-P" << m_password.local8Bit(); *kp << m_filename; |