[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdeutils/ark
From:       Charis Kouzinopoulos <haris () mpa ! gr>
Date:       2006-04-29 0:15:35
Message-ID: 1146269735.078292.22145.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 535252 by charis:

Check for unarchiver program too. verifyCompressUtilityIsAvailable needs a second \
argument to indicate if compression utility can do uncompressing as well Also fixed \
some indentations while i was there :)

BUG: 126051



 M  +3 -2      ar.cpp  
 M  +2 -2      arch.cpp  
 M  +2 -2      arch.h  
 M  +2 -2      compressedfile.cpp  
 M  +1 -1      lha.cpp  
 M  +2 -2      tar.cpp  
 M  +2 -2      zip.cpp  
 M  +1 -1      zoo.cpp  


--- branches/KDE/3.5/kdeutils/ark/ar.cpp #535251:535252
@@ -48,8 +48,9 @@
 ArArch::ArArch( ArkWidget *_gui, const QString & _fileName )
   : Arch(_gui, _fileName )
 {
-  m_archiver_program = "ar";
-  verifyCompressUtilityIsAvailable(m_archiver_program);
+  m_archiver_program = m_unarchiver_program = "ar";
+  verifyCompressUtilityIsAvailable( m_archiver_program );
+  verifyUncompressUtilityIsAvailable( m_unarchiver_program );
 
   // Do not set headerString - there is none for Ar
   m_numCols = 5;
--- branches/KDE/3.5/kdeutils/ark/arch.cpp #535251:535252
@@ -83,7 +83,7 @@
 }
 
 //Check if a compress utility exists
-void Arch::verifyCompressUtilityIsAvailable(const QString &utility)
+void Arch::verifyCompressUtilityIsAvailable( const QString &utility )
 {
   // see if the utility is in the PATH of the user.
   QString cmd = KGlobal::dirs()->findExe( utility );
@@ -91,7 +91,7 @@
 }
 
 //Check if a utility can uncompress files
-void Arch::verifyUncompressUtilityIsAvailable(const QString &utility)
+void Arch::verifyUncompressUtilityIsAvailable( const QString &utility )
 {
   // see if the utility is in the PATH of the user.
   QString cmd = KGlobal::dirs()->findExe( utility );
--- branches/KDE/3.5/kdeutils/ark/arch.h #535251:535252
@@ -130,9 +130,9 @@
     void verifyUtilityIsAvailable( const QString &,
                                    const QString & = QString::null );
 
-    void verifyCompressUtilityIsAvailable(const QString &utility);
+    void verifyCompressUtilityIsAvailable( const QString &utility );
 
-    void verifyUncompressUtilityIsAvailable(const QString &utility);
+    void verifyUncompressUtilityIsAvailable( const QString &utility );
 
     bool archUtilityIsAvailable() { return m_bArchUtilityIsAvailable; }
 
--- branches/KDE/3.5/kdeutils/ark/compressedfile.cpp #535251:535252
@@ -64,8 +64,8 @@
   m_tempDirectory->setAutoDelete( true );
   m_tmpdir = m_tempDirectory->name();
   initData();
-  verifyCompressUtilityIsAvailable(m_archiver_program);
-  verifyUncompressUtilityIsAvailable(m_unarchiver_program);
+  verifyCompressUtilityIsAvailable( m_archiver_program );
+  verifyUncompressUtilityIsAvailable( m_unarchiver_program );
 
   if (!QFile::exists(_fileName))
   {
--- branches/KDE/3.5/kdeutils/ark/lha.cpp #535251:535252
@@ -56,7 +56,7 @@
   : Arch( _gui, _fileName )
 {
   m_archiver_program = "lha";
-  verifyCompressUtilityIsAvailable( m_archiver_program);
+  verifyCompressUtilityIsAvailable( m_archiver_program );
 
   m_headerString = "----";
 }
--- branches/KDE/3.5/kdeutils/ark/tar.cpp #535251:535252
@@ -82,8 +82,8 @@
 {
     m_filesToAdd = m_filesToRemove = QStringList();
     m_archiver_program = m_unarchiver_program = ArkSettings::tarExe();
-    verifyCompressUtilityIsAvailable(m_archiver_program);
-    verifyUncompressUtilityIsAvailable(m_unarchiver_program);
+    verifyCompressUtilityIsAvailable( m_archiver_program );
+    verifyUncompressUtilityIsAvailable( m_unarchiver_program );
 
     m_fileMimeType = _openAsMimeType;
     if ( m_fileMimeType.isNull() )
--- branches/KDE/3.5/kdeutils/ark/zip.cpp #535251:535252
@@ -46,8 +46,8 @@
 {
   m_archiver_program = "zip";
   m_unarchiver_program = "unzip";
-  verifyCompressUtilityIsAvailable( m_archiver_program);
-  verifyUncompressUtilityIsAvailable( m_unarchiver_program);
+  verifyCompressUtilityIsAvailable( m_archiver_program );
+  verifyUncompressUtilityIsAvailable( m_unarchiver_program );
 
   m_headerString = "----";
   m_repairYear = 9; m_fixMonth = 7; m_fixDay = 8; m_fixTime = 10;
--- branches/KDE/3.5/kdeutils/ark/zoo.cpp #535251:535252
@@ -55,7 +55,7 @@
   : Arch( gui, fileName )
 {
   m_archiver_program = "zoo";
-  verifyCompressUtilityIsAvailable( m_archiver_program);
+  verifyCompressUtilityIsAvailable( m_archiver_program );
 
   m_headerString = "----";
 }


[prev in list] [next in list] [prev in thread] [next in thread]