[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 9:47:12
Message-ID: 1200908832.106726.13591.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 764197 by dakon:

clean up KgpgSelectPublicKeyDlg to have only actually used stuff in interface

 M  +3 -3      kgpg.cpp  
 M  +1 -1      kgpglibrary.cpp  
 M  +1 -1      kgpgview.cpp  
 M  +3 -13     selectpublickeydialog.cpp  
 M  +1 -1      selectpublickeydialog.h  


--- branches/work/kgpg2/kgpg.cpp #764196:764197
@@ -153,7 +153,7 @@
         KPassivePopup::message(i18n("Clipboard is empty."), QString(), \
Images::kgpg(), trayIcon);  else
     {
-        KgpgSelectPublicKeyDlg *dialog = new KgpgSelectPublicKeyDlg(0, 0, false, \
goDefaultKey); +        KgpgSelectPublicKeyDlg *dialog = new \
KgpgSelectPublicKeyDlg(0, 0, goDefaultKey);  if (dialog->exec() == KDialog::Accepted)
         {
             QStringList options;
@@ -231,7 +231,7 @@
         return;
 
     /*
-    KgpgSelectPublicKeyDlg *dialog = new KgpgSelectPublicKeyDlg(0, 0, false, true, \
goDefaultKey); +    KgpgSelectPublicKeyDlg *dialog = new KgpgSelectPublicKeyDlg(0, 0, \
true, goDefaultKey);  if (dialog->exec() == KDialog::Accepted)
     {
         QStringList options;
@@ -250,7 +250,7 @@
 
 
     // TODO !!! CHANGE dialog, remove connect
-    dialog = new KgpgSelectPublicKeyDlg(0, droppedUrls.first().fileName(), true, \
goDefaultKey); +    dialog = new KgpgSelectPublicKeyDlg(0, \
droppedUrls.first().fileName(), goDefaultKey);  
     KHBox *bGroup = new KHBox(dialog->optionsbox);
 
--- branches/work/kgpg2/kgpglibrary.cpp #764196:764197
@@ -62,7 +62,7 @@
             if (urls.count() > 1)
                 fileNames += ",...";
 
-            KgpgSelectPublicKeyDlg *dialog = new KgpgSelectPublicKeyDlg(0, \
fileNames, true, goDefaultKey); +            KgpgSelectPublicKeyDlg *dialog = new \
KgpgSelectPublicKeyDlg(0, fileNames, goDefaultKey);  if (dialog->exec() == \
KDialog::Accepted)  {
                 QStringList options;
--- branches/work/kgpg2/kgpgview.cpp #764196:764197
@@ -105,7 +105,7 @@
 void KgpgTextEdit::slotEncode()
 {
     // TODO : goDefaultKey shortcut
-    KgpgSelectPublicKeyDlg *dialog = new KgpgSelectPublicKeyDlg(this, 0, false, \
KShortcut(QKeySequence(Qt::CTRL + Qt::Key_Home)), true); +    KgpgSelectPublicKeyDlg \
*dialog = new KgpgSelectPublicKeyDlg(this, 0, KShortcut(QKeySequence(Qt::CTRL + \
Qt::Key_Home)), true);  if (dialog->exec() == KDialog::Accepted)
     {
         QStringList options;
--- branches/work/kgpg2/selectpublickeydialog.cpp #764196:764197
@@ -80,18 +80,8 @@
 class KgpgListViewSearchLine : public K3ListViewSearchLine
 {
 public:
-    KgpgListViewSearchLine (QWidget *parent = 0, KgpgSelectPublicKeyDlg *dialog = 0, \
K3ListView *listView = 0) : K3ListViewSearchLine(parent, listView) +    \
KgpgListViewSearchLine (QWidget *parent = 0, KgpgSelectPublicKeyDlg *dialog = 0) : \
K3ListViewSearchLine(parent, 0)  {
-        setDialog(dialog);
-    }
-
-    KgpgListViewSearchLine (QWidget *parent, const QList<K3ListView*> &listViews, \
                KgpgSelectPublicKeyDlg *dialog = 0) : K3ListViewSearchLine(parent, \
                listViews)
-    {
-        setDialog(dialog);
-    }
-
-    void setDialog(KgpgSelectPublicKeyDlg *dialog)
-    {
         m_dialog = dialog;
     }
 
@@ -117,7 +107,7 @@
     KgpgSelectPublicKeyDlg *m_dialog;
 };
 
-KgpgSelectPublicKeyDlg::KgpgSelectPublicKeyDlg(QWidget *parent, const QString \
&sfile, const bool &filemode, const KShortcut &goDefaultKey, const bool \
&hideasciioption) +KgpgSelectPublicKeyDlg::KgpgSelectPublicKeyDlg(QWidget *parent, \
const QString &sfile, const KShortcut &goDefaultKey, const bool &hideasciioption)  : \
KDialog(parent)  {
     setCaption(i18n("Select Public Key"));
@@ -125,7 +115,7 @@
     setDefaultButton(Ok);
     setButtonText(Details, i18n("O&ptions"));
 
-    m_fmode = filemode;
+    m_fmode = (sfile != NULL);
     if (m_fmode)
         setCaption(i18n("Select Public Key for %1", sfile));
 
--- branches/work/kgpg2/selectpublickeydialog.h #764196:764197
@@ -43,7 +43,7 @@
     /* TODO: the goDefaultKey shortcut should be stored in a way it can be accessed \
                from everywhere. So we don't have to pass it as an argument.
      */
 
-    explicit KgpgSelectPublicKeyDlg(QWidget *parent = 0, const QString &sfile = "", \
const bool &filemode = false, const KShortcut &goDefaultKey = \
KShortcut(QKeySequence(Qt::CTRL + Qt::Key_Home)), const bool &hideasciioption = \
false); +    explicit KgpgSelectPublicKeyDlg(QWidget *parent = 0, const QString \
&sfile = "", const KShortcut &goDefaultKey = KShortcut(QKeySequence(Qt::CTRL + \
Qt::Key_Home)), const bool &hideasciioption = false);  
     QStringList selectedKeys() const;
     QString getCustomOptions() const;


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