refactored slots in keyserverimportdialog.*

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

7 files changed, 26 insertions, 26 deletions

diff --git a/keymgmt.cpp b/keymgmt.cpp
index e944475..b97340d 100755
--- a/keymgmt.cpp
+++ b/keymgmt.cpp
@@ -74,7 +74,7 @@ void KeyMgmt::createActions()
     importKeyFromFileAct = new QAction(tr("&File"), this);
     importKeyFromFileAct->setIcon(QIcon(":import_key_from_file.png"));
     importKeyFromFileAct->setToolTip(tr("Import New Key From File"));
-    connect(importKeyFromFileAct, SIGNAL(triggered()), this, SLOT(SlotimportKeyFromFile()));
+    connect(importKeyFromFileAct, SIGNAL(triggered()), this, SLOT(slotimportKeyFromFile()));
 
     importKeyFromClipboardAct = new QAction(tr("&Clipboard"), this);
     importKeyFromClipboardAct->setIcon(QIcon(":import_key_from_clipboard.png"));
@@ -199,7 +199,7 @@ void KeyMgmt::slotImportDone(int result)
     import->deleteLater();
 }
 
-void KeyMgmt::SlotimportKeyFromFile()
+void KeyMgmt::slotimportKeyFromFile()
 {
     QString fileName = QFileDialog::getOpenFileName(this, tr("Open Key"), "", tr("Key Files") + " (*.asc *.txt);;"+tr("Keyring files")+" (*.gpg);;All Files (*)");
     if (! fileName.isNull()) {
diff --git a/keymgmt.h b/keymgmt.h
index 9ddcf41..3e3cf75 100755
--- a/keymgmt.h
+++ b/keymgmt.h
@@ -51,7 +51,7 @@ public:
     QAction *importKeyFromKeyServerAct;
 
 public slots:
-    void SlotimportKeyFromFile();
+    void slotimportKeyFromFile();
     void slotImportKeyFromClipboard();
     void slotImportKeyFromKeyServer();
     void slotImportKeys(QString text);
diff --git a/keyserverimportdialog.cpp b/keyserverimportdialog.cpp
index 877e5d5..138e27b 100644
--- a/keyserverimportdialog.cpp
+++ b/keyserverimportdialog.cpp
@@ -30,8 +30,8 @@ KeyServerImportDialog::KeyServerImportDialog(GpgME::GpgContext *ctx, KeyList *ke
     mKeyList = keyList;
     // Buttons
     closeButton = createButton(tr("&Close"), SLOT(close()));
-    importButton = createButton(tr("&Import"), SLOT(import()));
-    searchButton = createButton(tr("&Search"), SLOT(search()));
+    importButton = createButton(tr("&Import"), SLOT(slotImport()));
+    searchButton = createButton(tr("&Search"), SLOT(slotSearch()));
 
     // Line edit for search string
     searchLabel = new QLabel(tr("Search string:"));
@@ -116,7 +116,7 @@ void KeyServerImportDialog::createKeysTable()
     keysTable->verticalHeader()->hide();
 
     connect(keysTable, SIGNAL(cellActivated(int,int)),
-            this, SLOT(import()));
+            this, SLOT(slotImport()));
 }
 
 void KeyServerImportDialog::setMessage(const QString &text, bool error)
@@ -133,16 +133,16 @@ void KeyServerImportDialog::setMessage(const QString &text, bool error)
     }
 }
 
-void KeyServerImportDialog::search()
+void KeyServerImportDialog::slotSearch()
 {
     QUrl url = keyServerComboBox->currentText()+":11371/pks/lookup?search="+searchLineEdit->text()+"&op=index&options=mr";
     qnam = new QNetworkAccessManager(this);
     QNetworkReply* reply = qnam->get(QNetworkRequest(url));
     connect(reply, SIGNAL(finished()),
-            this, SLOT(searchFinished()));
+            this, SLOT(slotSearchFinished()));
 }
 
-void KeyServerImportDialog::searchFinished()
+void KeyServerImportDialog::slotSearchFinished()
 {
     QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
 
@@ -168,7 +168,7 @@ void KeyServerImportDialog::searchFinished()
             if (rx.exactMatch(query)) {
                setMessage(tr("No keys found, input may be kexId, retrying search with 0x."),true);
                searchLineEdit->setText(query.prepend("0x"));
-               this->search();
+               this->slotSearch();
             } else {
                 setMessage(tr("No keys found containing the search string!"),true);
             }
@@ -251,25 +251,25 @@ void KeyServerImportDialog::searchFinished()
     reply = 0;
 }
 
-void KeyServerImportDialog::import()
+void KeyServerImportDialog::slotImport()
 {
     if ( keysTable->currentRow() > -1 ) {
         QString keyid = keysTable->item(keysTable->currentRow(),2)->text();
         QUrl url = keyServerComboBox->currentText();
-        import(QStringList(keyid), url);
+        slotImport(QStringList(keyid), url);
    }
 }
 
-void KeyServerImportDialog::import(QStringList keyIds)
+void KeyServerImportDialog::slotImport(QStringList keyIds)
 {
     QSettings settings;
     QString keyserver=settings.value("keyserver/defaultKeyServer").toString();
     QUrl url(keyserver);
-    import(keyIds, url);
+    slotImport(keyIds, url);
 }
 
 
-void KeyServerImportDialog::import(QStringList keyIds, QUrl keyServerUrl)
+void KeyServerImportDialog::slotImport(QStringList keyIds, QUrl keyServerUrl)
 {
     foreach(QString keyId, keyIds) {
         QUrl reqUrl(keyServerUrl.scheme() + "://" + keyServerUrl.host() + ":11371/pks/lookup?op=get&search=0x"+keyId+"&options=mr");
@@ -277,11 +277,11 @@ void KeyServerImportDialog::import(QStringList keyIds, QUrl keyServerUrl)
         qnam = new QNetworkAccessManager(this);
         QNetworkReply *reply = qnam->get(QNetworkRequest(reqUrl));
         connect(reply, SIGNAL(finished()),
-                this, SLOT(importFinished()));
+                this, SLOT(slotImportFinished()));
     }
 }
 
-void KeyServerImportDialog::importFinished()
+void KeyServerImportDialog::slotImportFinished()
 {
     QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
 
diff --git a/keyserverimportdialog.h b/keyserverimportdialog.h
index 801a7df..903dfdc 100644
--- a/keyserverimportdialog.h
+++ b/keyserverimportdialog.h
@@ -53,15 +53,15 @@ class KeyServerImportDialog : public QDialog
 
 public:
     KeyServerImportDialog(GpgME::GpgContext *ctx, KeyList *keyList, QWidget *parent = 0);
-    void import(QStringList keyIds);
-    void import(QStringList keyIds, QUrl keyserverUrl);
+    void slotImport(QStringList keyIds);
+    void slotImport(QStringList keyIds, QUrl keyserverUrl);
 
 private slots:
-    void import();
+    void slotImport();
     void slotImportDone(int result);
-    void searchFinished();
-    void importFinished();
-    void search();
+    void slotSearchFinished();
+    void slotImportFinished();
+    void slotSearch();
 
 private:
     void createKeysTable();
diff --git a/mainwindow.cpp b/mainwindow.cpp
index b41c775..a9d9827 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1213,7 +1213,7 @@ void MainWindow::slotRefreshKeysFromKeyserver()
     }
 
     KeyServerImportDialog *ksid = new KeyServerImportDialog(mCtx,mKeyList,this);
-    ksid->import(*mKeyList->getSelected());
+    ksid->slotImport(*mKeyList->getSelected());
 }
 
 void MainWindow::slotUploadKeyToServer()
diff --git a/verifykeydetailbox.cpp b/verifykeydetailbox.cpp
index 8070ed9..f1fbf80 100644
--- a/verifykeydetailbox.cpp
+++ b/verifykeydetailbox.cpp
@@ -87,7 +87,7 @@ VerifyKeyDetailBox::VerifyKeyDetailBox(QWidget *parent, GpgME::GpgContext* ctx,
 void VerifyKeyDetailBox::importFormKeyserver()
 {
     KeyServerImportDialog *importDialog =new KeyServerImportDialog(mCtx,mKeyList,this);
-    importDialog->import(QStringList(fpr));
+    importDialog->slotImport(QStringList(fpr));
 }
 
 QString VerifyKeyDetailBox::beautifyFingerprint(QString fingerprint)
diff --git a/verifynotification.cpp b/verifynotification.cpp
index e2df2ba..6943391 100644
--- a/verifynotification.cpp
+++ b/verifynotification.cpp
@@ -56,7 +56,7 @@ VerifyNotification::VerifyNotification(QWidget *parent, GpgME::GpgContext *ctx,
 void VerifyNotification::importFromKeyserver()
 {
     KeyServerImportDialog *importDialog =new KeyServerImportDialog(mCtx,mKeyList, this);
-    importDialog->import(*keysNotInList);
+    importDialog->slotImport(*keysNotInList);
 }
 
 void VerifyNotification::setVerifyLabel(QString text, verify_label_status verifyLabelStatus)