[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:       2008-01-21 18:08:37
Message-ID: 1200938917.972446.4789.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 764417 by dakon:

Comment cleanup

Remove some code commented out for ages and comments where it is already 
obvious what we're going to do.


 M  +0 -38     keysmanager.cpp  
 M  +0 -30     kgpg.cpp  


--- branches/work/kgpg2/keysmanager.cpp #764416:764417
@@ -1011,44 +1011,6 @@
         kaddressbook.call( "addEmail", nd->getName() + " <" + email + '>');
 }
 
-/*
-void KeysManager::allToKAB()
-{
-        KABC::Key key;
-        QString email;
-        QStringList keylist;
-        KABC::Addressee a;
-
-        KABC::AddressBook *ab = KABC::StdAddressBook::self();
-        if ( !ab->load() ) {
-                KMessageBox::sorry(this,i18n("Unable to contact the address book. \
                Please check your installation."));
-                return;
-        }
-
-        KeyListViewItem * myChild = keysList2->firstChild();
-        while( myChild ) {
-                //email=extractKeyMail(myChild).simplified();
-                email=myChild->text(1);
-                KABC::Addressee::List addressees = ab->findByEmail( email );
-                if (addressees.count()==1) {
-                        a=addressees.first();
-                        KgpgInterface *ks=new KgpgInterface();
-                        key.setTextData(ks->getKey(myChild->text(6),true));
-                        a.insertKey(key);
-                        ab->insertAddressee(a);
-                        keylist<<myChild->text(6)+": "+email;
-                }
-                //            doSomething( myChild );
-                myChild = myChild->nextSibling();
-        }
-        KABC::StdAddressBook::save();
-        if (!keylist.isEmpty())
-                KMessageBox::informationList(this,i18n("The following keys were \
                exported to the address book:"),keylist);
-        else
-                KMessageBox::sorry(this,i18n("No entry matching your keys were found \
                in the address book."));
-}
-*/
-
 void KeysManager::slotManpage()
 {
     KToolInvocation::startServiceByDesktopName("khelpcenter", QString("man:/gpg"), \
                0, 0, 0, "", true);
--- branches/work/kgpg2/kgpg.cpp #764416:764417
@@ -31,7 +31,6 @@
 #include <QLayout>
 #include <QCursor>
 #include <QLabel>
-#include <QMovie>
 #include <QFile>
 #include <Q3TextDrag>
 #include <QtDBus>
@@ -230,26 +229,6 @@
     if (KMessageBox::warningContinueCancel(0, i18n("<qt>KGpg will now create a \
temporary archive file:<br /><b>%1</b> to process the encryption. The file will be \
deleted after the encryption is finished.</qt>", kgpgfoldertmp->fileName()), \
i18n("Temporary File Creation"), KStandardGuiItem::cont(), \
KStandardGuiItem::cancel(), "FolderTmpFile") == KMessageBox::Cancel)  return;
 
-    /*
-    KgpgSelectPublicKeyDlg *dialog = new KgpgSelectPublicKeyDlg(0, 0, true, \
                goDefaultKey);
-    if (dialog->exec() == KDialog::Accepted)
-    {
-        QStringList options;
-        if (dialog->getUntrusted()) options << "--always-trust";
-        if (dialog->getArmor())     options << "--armor";
-        if (dialog->getHideId())    options << "--throw-keyid";
-
-        if (!dialog->getCustomOptions().isEmpty())
-            if (KGpgSettings::allowCustomEncryptionOptions())
-                options << dialog->getCustomOptions().split(" ", \
                QString::SkipEmptyParts);
-
-        encryptClipboard(dialog->selectedKeys(), options, dialog->getSymmetric());
-    }
-    */
-
-
-
-    // TODO !!! CHANGE dialog, remove connect
     dialog = new KgpgSelectPublicKeyDlg(0, droppedUrls.first().fileName(), \
goDefaultKey);  
     KHBox *bGroup = new KHBox(dialog->optionsbox);
@@ -384,19 +363,10 @@
     {
         openTasks++;
         trayIcon->setToolTip(mssge);
-
-#if 0
-//TODO: is it necessary?
-        QMovie *movie = new QMovie(KStandardDirs::locate("appdata", \
                "pics/kgpg_docked.gif"));
-        setMovie(movie);
-        delete movie;
-#endif
     }
     else
         openTasks--;
 
-    //kDebug(2100) << "Emit message: " << openTasks ;
-
     if (openTasks <= 0)
     {
         trayIcon->setIcon(KIcon("kgpg_docked"));


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