refactored slots in verify* and wizard.*

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@986 34ebc366-c3a9-4b3c-9f84-69acf7962910

9 files changed, 28 insertions, 28 deletions

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 66585ae..abac5be 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1105,7 +1105,7 @@ void MainWindow::slotVerify()
     VerifyNotification *vn = new VerifyNotification(this, mCtx, mKeyList, edit->curTextPage());
 
     // if signing information is found, show the notification, otherwise close it
-    if (vn->refresh()) {
+    if (vn->slotRefresh()) {
         edit->curPage()->showNotificationWidget(vn, "verifyNotification");
     } else {
         vn->close();
diff --git a/verifydetailsdialog.cpp b/verifydetailsdialog.cpp
index f34d27b..55cd11c 100644
--- a/verifydetailsdialog.cpp
+++ b/verifydetailsdialog.cpp
@@ -32,17 +32,17 @@ VerifyDetailsDialog::VerifyDetailsDialog(QWidget *parent, GpgME::GpgContext* ctx
 
     this->setWindowTitle(tr("Signaturedetails"));
 
-    connect(mCtx, SIGNAL(keyDBChanged()), this, SLOT(refresh()));
+    connect(mCtx, SIGNAL(keyDBChanged()), this, SLOT(slotRefresh()));
     mainLayout = new QHBoxLayout();
     this->setLayout(mainLayout);
 
     mVbox = new QWidget();
-    refresh();
+    slotRefresh();
 
     this->exec();
 }
 
-void VerifyDetailsDialog::refresh()
+void VerifyDetailsDialog::slotRefresh()
 {
     mVbox->close();
 
diff --git a/verifydetailsdialog.h b/verifydetailsdialog.h
index 3bc0b40..814def2 100644
--- a/verifydetailsdialog.h
+++ b/verifydetailsdialog.h
@@ -33,7 +33,7 @@ public:
     explicit VerifyDetailsDialog(QWidget *parent, GpgME::GpgContext* ctx, KeyList* mKeyList, const QString &inputData, QByteArray* inputSignature = 0);
 
 private slots:
-    void refresh();
+    void slotRefresh();
     void slotVerifyDone(int result);
 
 private:
diff --git a/verifykeydetailbox.cpp b/verifykeydetailbox.cpp
index f1fbf80..a51f1d2 100644
--- a/verifykeydetailbox.cpp
+++ b/verifykeydetailbox.cpp
@@ -84,7 +84,7 @@ VerifyKeyDetailBox::VerifyKeyDetailBox(QWidget *parent, GpgME::GpgContext* ctx,
     this->setLayout(grid);
 }
 
-void VerifyKeyDetailBox::importFormKeyserver()
+void VerifyKeyDetailBox::slotImportFormKeyserver()
 {
     KeyServerImportDialog *importDialog =new KeyServerImportDialog(mCtx,mKeyList,this);
     importDialog->slotImport(QStringList(fpr));
diff --git a/verifykeydetailbox.h b/verifykeydetailbox.h
index 07bb247..d7a700c 100644
--- a/verifykeydetailbox.h
+++ b/verifykeydetailbox.h
@@ -35,7 +35,7 @@ public:
     explicit VerifyKeyDetailBox(QWidget *parent, GpgME::GpgContext* ctx, KeyList* mKeyList,  KGpgVerify signature);
 
 private slots:
-    void importFormKeyserver();
+    void slotImportFormKeyserver();
 
 private:
     GpgME::GpgContext* mCtx;
diff --git a/verifynotification.cpp b/verifynotification.cpp
index 6943391..25b3f0a 100644
--- a/verifynotification.cpp
+++ b/verifynotification.cpp
@@ -29,14 +29,14 @@ VerifyNotification::VerifyNotification(QWidget *parent, GpgME::GpgContext *ctx,
     mTextpage = edit;
     verifyLabel = new QLabel(this);
 
-    connect(mCtx, SIGNAL(keyDBChanged()), this, SLOT(refresh()));
+    connect(mCtx, SIGNAL(keyDBChanged()), this, SLOT(slotRefresh()));
     connect(edit, SIGNAL(textChanged()), this, SLOT(close()));
 
     importFromKeyserverAct = new QAction(tr("Import missing key from Keyserver"), this);
-    connect(importFromKeyserverAct, SIGNAL(triggered()), this, SLOT(importFromKeyserver()));
+    connect(importFromKeyserverAct, SIGNAL(triggered()), this, SLOT(slotImportFromKeyserver()));
 
     showVerifyDetailsAct = new QAction(tr("Show detailed verify information"), this);
-    connect(showVerifyDetailsAct, SIGNAL(triggered()), this, SLOT(showVerifyDetails()));
+    connect(showVerifyDetailsAct, SIGNAL(triggered()), this, SLOT(slotShowVerifyDetails()));
 
     detailMenu = new QMenu(this);
     detailMenu->addAction(showVerifyDetailsAct);
@@ -53,7 +53,7 @@ VerifyNotification::VerifyNotification(QWidget *parent, GpgME::GpgContext *ctx,
     this->setLayout(notificationWidgetLayout);
 }
 
-void VerifyNotification::importFromKeyserver()
+void VerifyNotification::slotImportFromKeyserver()
 {
     KeyServerImportDialog *importDialog =new KeyServerImportDialog(mCtx,mKeyList, this);
     importDialog->slotImport(*keysNotInList);
@@ -85,14 +85,14 @@ void VerifyNotification::showImportAction(bool visible)
     importFromKeyserverAct->setVisible(visible);
 }
 
-void VerifyNotification::showVerifyDetails()
+void VerifyNotification::slotShowVerifyDetails()
 {
     //QByteArray text = mTextpage->toPlainText().toUtf8();
     //mCtx->preventNoDataErr(&text);
     new VerifyDetailsDialog(this, mCtx, mKeyList, mTextpage->toPlainText());
 }
 
-bool VerifyNotification::refresh()
+bool VerifyNotification::slotRefresh()
 {
     verify_label_status verifyStatus=VERIFY_ERROR_OK;
 
diff --git a/verifynotification.h b/verifynotification.h
index 8b5e54e..cb94f65 100644
--- a/verifynotification.h
+++ b/verifynotification.h
@@ -84,17 +84,17 @@ public slots:
      * @details Import the keys contained in keysNotInList from keyserver
      *
      */
-    void importFromKeyserver();
+    void slotImportFromKeyserver();
 
     /**
      * @details Show a dialog with signing details.
      */
-    void showVerifyDetails();
+    void slotShowVerifyDetails();
 
     /**
      * @details Refresh the contents of dialog.
      */
-    bool refresh();
+    bool slotRefresh();
 
     void slotVerifyDone(int result);
 
diff --git a/wizard.cpp b/wizard.cpp
index 07734c4..2d7ac18 100644
--- a/wizard.cpp
+++ b/wizard.cpp
@@ -226,7 +226,7 @@ ImportFromGpg4usbPage::ImportFromGpg4usbPage(GpgME::GpgContext *ctx, KeyMgmt *ke
     QLabel *configLabel = new QLabel(tr("Configuration"));
 
     QPushButton *importFromGpg4usbButton = new QPushButton(tr("Import from gpg4usb"));
-    connect(importFromGpg4usbButton, SIGNAL(clicked()), this, SLOT(importFromOlderGpg4usb()));
+    connect(importFromGpg4usbButton, SIGNAL(clicked()), this, SLOT(slotImportFromOlderGpg4usb()));
 
     QGridLayout *gpg4usbLayout = new QGridLayout();
     gpg4usbLayout->addWidget(topLabel,1,1,1,2);
@@ -239,7 +239,7 @@ ImportFromGpg4usbPage::ImportFromGpg4usbPage(GpgME::GpgContext *ctx, KeyMgmt *ke
     this->setLayout(gpg4usbLayout);
 }
 
-void ImportFromGpg4usbPage::importFromOlderGpg4usb()
+void ImportFromGpg4usbPage::slotImportFromOlderGpg4usb()
 {
     QString dir = QFileDialog::getExistingDirectory(this,tr("Other gpg4usb directory"));
 
@@ -257,7 +257,7 @@ void ImportFromGpg4usbPage::importFromOlderGpg4usb()
 
     // try to import config, if appropriate box is checked
     if (gpg4usbConfigCheckBox->isChecked()) {
-        importConfFromGpg4usb(dir);
+        slotImportConfFromGpg4usb(dir);
 
         QSettings settings;
         settings.setValue("wizard/nextPage", this->nextId());
@@ -269,7 +269,7 @@ void ImportFromGpg4usbPage::importFromOlderGpg4usb()
     wizard()->next();
 }
 
-bool ImportFromGpg4usbPage::importConfFromGpg4usb(QString dir) {
+bool ImportFromGpg4usbPage::slotImportConfFromGpg4usb(QString dir) {
     QString path = dir+"/conf/gpg4usb.ini";
     QSettings oldconf(path, QSettings::IniFormat, this);
     QSettings actualConf;
@@ -297,7 +297,7 @@ ImportFromGnupgPage::ImportFromGnupgPage(GpgME::GpgContext *ctx, KeyMgmt *keyMgm
     gnupgLabel->setWordWrap(true);
 
     importFromGnupgButton = new QPushButton(tr("Import keys from GnuPG"));
-    connect(importFromGnupgButton, SIGNAL(clicked()), this, SLOT(importKeysFromGnupg()));
+    connect(importFromGnupgButton, SIGNAL(clicked()), this, SLOT(slotImportKeysFromGnupg()));
 
     QGridLayout *layout = new QGridLayout();
     layout->addWidget(gnupgLabel);
@@ -306,7 +306,7 @@ ImportFromGnupgPage::ImportFromGnupgPage(GpgME::GpgContext *ctx, KeyMgmt *keyMgm
     this->setLayout(layout);
 }
 
-void ImportFromGnupgPage::importKeysFromGnupg()
+void ImportFromGnupgPage::slotImportKeysFromGnupg()
 {
     // first get gnupghomedir and check, if it exists
     QString gnuPGHome = getGnuPGHome();
@@ -381,7 +381,7 @@ KeyGenPage::KeyGenPage(GpgME::GpgContext *ctx, QWidget *parent)
     layout->addWidget(topLabel);
     layout->addWidget(linkLabel);
     layout->addWidget(createKeyButtonBox);
-    connect(createKeyButton, SIGNAL(clicked()), this, SLOT(generateKeyDialog()));
+    connect(createKeyButton, SIGNAL(clicked()), this, SLOT(slotRenerateKeyDialog()));
 
     setLayout(layout);
 }
@@ -391,7 +391,7 @@ int KeyGenPage::nextId() const
     return Wizard::Page_Conclusion;
 }
 
-void KeyGenPage::generateKeyDialog()
+void KeyGenPage::slotRenerateKeyDialog()
 {
     KeyGenDialog *keyGenDialog = new KeyGenDialog(mCtx, this);
     keyGenDialog->exec();
diff --git a/wizard.h b/wizard.h
index 6cb3308..bc31df6 100644
--- a/wizard.h
+++ b/wizard.h
@@ -96,8 +96,8 @@ private slots:
     /**
       * @details  Import keys from gnupg-homedir, private or/and public depend on the checked boxes
       */
-    void importFromOlderGpg4usb();
-    bool importConfFromGpg4usb(QString dir);
+    void slotImportFromOlderGpg4usb();
+    bool slotImportConfFromGpg4usb(QString dir);
 
 private:
     int nextId() const;
@@ -119,7 +119,7 @@ private slots:
     /**
       * @details  Import keys from gnupg-homedir, private or/and public depend on the checked boxes
       */
-    void importKeysFromGnupg();
+    void slotImportKeysFromGnupg();
 
 private:
     KeyMgmt *mKeyMgmt;
@@ -145,7 +145,7 @@ public:
     int nextId() const;
 
 private slots:
-    void generateKeyDialog();
+    void slotRenerateKeyDialog();
 
 private:
     GpgME::GpgContext *mCtx;