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

List:       kde-commits
Subject:    branches/work/kgpg2
From:       Rolf Eike Beer <kde () opensource ! sf-tec ! de>
Date:       2007-12-05 18:13:38
Message-ID: 1196878418.319846.20935.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 745198 by dakon:

rework r742665

This was totally overcomplicated


 M  +2 -1      kgpg.cpp  
 M  +1 -4      kgpginterface.cpp  
 M  +1 -5      kgpginterface.h  


--- branches/work/kgpg2/kgpg.cpp #745197:745198
@@ -350,11 +350,12 @@
 
     arch->addLocalDirectory(droppedUrls.first().path(), \
droppedUrls.first().fileName());  arch->close();
+    delete arch;
 
     KgpgInterface *folderprocess = new KgpgInterface();
     connect(folderprocess, SIGNAL(fileEncryptionFinished(KUrl, KgpgInterface*)), \
                this, SLOT(slotFolderFinished(KUrl, KgpgInterface*)));
     connect(folderprocess, SIGNAL(errorMessage(const QString &, KgpgInterface*)), \
                this, SLOT(slotFolderFinishedError(const QString &, \
                KgpgInterface*)));
-    folderprocess->encryptFile(selec, KUrl(kgpgfoldertmp->fileName()), \
encryptedFile, encryptOptions, symetric, arch); +    \
folderprocess->encryptFile(selec, KUrl(kgpgfoldertmp->fileName()), encryptedFile, \
encryptOptions, symetric);  }
 
 void MyView::slotFolderFinished(const KUrl &, KgpgInterface *iface)
--- branches/work/kgpg2/kgpginterface.cpp #745197:745198
@@ -36,7 +36,6 @@
 #include <KDebug>
 #include <KGlobal>
 #include <KUrl>
-#include <KArchive>
 
 #include "detailedconsole.h"
 #include "kgpgsettings.h"
@@ -1359,7 +1358,7 @@
     }
 }
 
-void KgpgInterface::encryptFile(const QStringList &encryptkeys, const KUrl &srcurl, \
const KUrl &desturl, const QStringList &options, const bool &symetrical, KArchive \
*ar) +void KgpgInterface::encryptFile(const QStringList &encryptkeys, const KUrl \
&srcurl, const KUrl &desturl, const QStringList &options, const bool &symetrical)  {
     m_partialline.clear();
     m_ispartial = false;
@@ -1367,7 +1366,6 @@
     sourceFile = srcurl;
     message.clear();
 
-    arch = ar;
     K3ProcIO *process = gpgProc(2, 0);
     process->setParent(this);
 
@@ -1456,7 +1454,6 @@
 void KgpgInterface::fileEncryptFin(K3Process *p)
 {
     delete p;
-    delete arch;
     if (encok)
         emit fileEncryptionFinished(sourceFile, this);
     else
--- branches/work/kgpg2/kgpginterface.h #745197:745198
@@ -31,7 +31,6 @@
 class K3ProcIO;
 class KProcess;
 class GPGProc;
-class KArchive;
 
 /**
  * This class is the interface for gpg.
@@ -262,9 +261,6 @@
      */
     void fileEncryptionFinished(KUrl, KgpgInterface*);
 
-private:
-    KArchive *arch;
-
 public slots:
     /**
      * Encrypt file function
@@ -274,7 +270,7 @@
      * @param Options String List with the wanted gpg options. ex: "--armor"
      * @param symetrical bool whether the encryption should be symmetrical.
      */
-    void encryptFile(const QStringList &encryptkeys, const KUrl &srcurl, const KUrl \
&desturl, const QStringList &options = QStringList(), const bool &symetrical = false, \
KArchive *ar = NULL); +    void encryptFile(const QStringList &encryptkeys, const \
KUrl &srcurl, const KUrl &desturl, const QStringList &options = QStringList(), const \
bool &symetrical = false);  
 private slots:
     /**


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