aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--keylist.cpp12
-rw-r--r--keylist.h6
-rwxr-xr-xkeymgmt.cpp40
-rwxr-xr-xkeymgmt.h20
-rw-r--r--wizard.cpp2
5 files changed, 40 insertions, 40 deletions
diff --git a/keylist.cpp b/keylist.cpp
index d5c9d61..9f4c4fb 100644
--- a/keylist.cpp
+++ b/keylist.cpp
@@ -58,12 +58,12 @@ KeyList::KeyList(GpgME::GpgContext *ctx, QWidget *parent)
setLayout(layout);
popupMenu = new QMenu(this);
- connect(mCtx, SIGNAL(keyDBChanged()), this, SLOT(refresh()));
+ connect(mCtx, SIGNAL(keyDBChanged()), this, SLOT(slotRefresh()));
setAcceptDrops(true);
- refresh();
+ slotRefresh();
}
-void KeyList::refresh()
+void KeyList::slotRefresh()
{
QStringList *keyList;
keyList = getChecked();
@@ -265,7 +265,7 @@ void KeyList::importKeys(QByteArray inBuffer)
// new KeyImportDetailDialog(mCtx, result, this);
}
-void KeyList::uploadKeyToServer(QByteArray *keys)
+void KeyList::slotUploadKeyToServer(QByteArray *keys)
{
QUrl reqUrl("http://localhost:11371/pks/add");
qnam = new QNetworkAccessManager(this);
@@ -286,12 +286,12 @@ void KeyList::uploadKeyToServer(QByteArray *keys)
QNetworkReply *reply = qnam->post(req,params.encodedQuery());
connect(reply, SIGNAL(finished()),
- this, SLOT(uploadFinished()));
+ this, SLOT(slotUploadFinished()));
qDebug() << "REQURL: " << reqUrl;
qDebug() << "PARAMS.ENCODED: " << params.toEncoded();
}
-void KeyList::uploadFinished()
+void KeyList::slotUploadFinished()
{
QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
diff --git a/keylist.h b/keylist.h
index 6c383d3..f7c739a 100644
--- a/keylist.h
+++ b/keylist.h
@@ -54,8 +54,8 @@ public:
bool containsPrivateKeys();
public slots:
- void refresh();
- void uploadKeyToServer(QByteArray *keys);
+ void slotRefresh();
+ void slotUploadKeyToServer(QByteArray *keys);
private:
void importKeys(QByteArray inBuffer);
@@ -65,7 +65,7 @@ private:
QNetworkAccessManager *qnam;
private slots:
- void uploadFinished();
+ void slotUploadFinished();
protected:
void contextMenuEvent(QContextMenuEvent *event);
diff --git a/keymgmt.cpp b/keymgmt.cpp
index d3882ee..e944475 100755
--- a/keymgmt.cpp
+++ b/keymgmt.cpp
@@ -74,45 +74,45 @@ 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(importKeyFromFile()));
+ connect(importKeyFromFileAct, SIGNAL(triggered()), this, SLOT(SlotimportKeyFromFile()));
importKeyFromClipboardAct = new QAction(tr("&Clipboard"), this);
importKeyFromClipboardAct->setIcon(QIcon(":import_key_from_clipboard.png"));
importKeyFromClipboardAct->setToolTip(tr("Import New Key From Clipboard"));
- connect(importKeyFromClipboardAct, SIGNAL(triggered()), this, SLOT(importKeyFromClipboard()));
+ connect(importKeyFromClipboardAct, SIGNAL(triggered()), this, SLOT(slotImportKeyFromClipboard()));
importKeyFromKeyServerAct = new QAction(tr("&Keyserver"), this);
importKeyFromKeyServerAct->setIcon(QIcon(":import_key_from_server.png"));
importKeyFromKeyServerAct->setToolTip(tr("Import New Key From Keyserver"));
- connect(importKeyFromKeyServerAct, SIGNAL(triggered()), this, SLOT(importKeyFromKeyServer()));
+ connect(importKeyFromKeyServerAct, SIGNAL(triggered()), this, SLOT(slotImportKeyFromKeyServer()));
exportKeyToClipboardAct = new QAction(tr("Export To &Clipboard"), this);
exportKeyToClipboardAct->setIcon(QIcon(":export_key_to_clipboard.png"));
exportKeyToClipboardAct->setToolTip(tr("Export Selected Key(s) To Clipboard"));
- connect(exportKeyToClipboardAct, SIGNAL(triggered()), this, SLOT(exportKeyToClipboard()));
+ connect(exportKeyToClipboardAct, SIGNAL(triggered()), this, SLOT(slotExportKeyToClipboard()));
exportKeyToFileAct = new QAction(tr("Export To &File"), this);
exportKeyToFileAct->setIcon(QIcon(":export_key_to_file.png"));
exportKeyToFileAct->setToolTip(tr("Export Selected Key(s) To File"));
- connect(exportKeyToFileAct, SIGNAL(triggered()), this, SLOT(exportKeyToFile()));
+ connect(exportKeyToFileAct, SIGNAL(triggered()), this, SLOT(slotExportKeyToFile()));
deleteSelectedKeysAct = new QAction(tr("Delete Selected Key(s)"), this);
deleteSelectedKeysAct->setToolTip(tr("Delete the Selected keys"));
- connect(deleteSelectedKeysAct, SIGNAL(triggered()), this, SLOT(deleteSelectedKeys()));
+ connect(deleteSelectedKeysAct, SIGNAL(triggered()), this, SLOT(slotDeleteSelectedKeys()));
deleteCheckedKeysAct = new QAction(tr("Delete Checked Key(s)"), this);
deleteCheckedKeysAct->setToolTip(tr("Delete the Checked keys"));
deleteCheckedKeysAct->setIcon(QIcon(":button_cancel.png"));
- connect(deleteCheckedKeysAct, SIGNAL(triggered()), this, SLOT(deleteCheckedKeys()));
+ connect(deleteCheckedKeysAct, SIGNAL(triggered()), this, SLOT(slotDeleteCheckedKeys()));
generateKeyDialogAct = new QAction(tr("Generate Key"), this);
generateKeyDialogAct->setToolTip(tr("Generate New Key"));
generateKeyDialogAct->setIcon(QIcon(":key_generate.png"));
- connect(generateKeyDialogAct, SIGNAL(triggered()), this, SLOT(generateKeyDialog()));
+ connect(generateKeyDialogAct, SIGNAL(triggered()), this, SLOT(slotGenerateKeyDialog()));
showKeyDetailsAct = new QAction(tr("Show Keydetails"), this);
showKeyDetailsAct->setToolTip(tr("Show Details for this Key"));
- connect(showKeyDetailsAct, SIGNAL(triggered()), this, SLOT(showKeyDetails()));
+ connect(showKeyDetailsAct, SIGNAL(triggered()), this, SLOT(slotShowKeyDetails()));
}
void KeyMgmt::createMenus()
@@ -157,7 +157,7 @@ void KeyMgmt::createToolBars()
// import for text based keys
-void KeyMgmt::importKeys(QString text)
+void KeyMgmt::slotImportKeys(QString text)
{
KGpgImport *imp = new KGpgImport(this, text);
connect(imp, SIGNAL(done(int)), SLOT(slotImportDone(int)));
@@ -199,7 +199,7 @@ void KeyMgmt::slotImportDone(int result)
import->deleteLater();
}
-void KeyMgmt::importKeyFromFile()
+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()) {
@@ -213,24 +213,24 @@ void KeyMgmt::importKeyFromFile()
}
}
-void KeyMgmt::importKeyFromKeyServer()
+void KeyMgmt::slotImportKeyFromKeyServer()
{
importDialog = new KeyServerImportDialog(mCtx, mKeyList, this);
importDialog->show();
}
-void KeyMgmt::importKeyFromClipboard()
+void KeyMgmt::slotImportKeyFromClipboard()
{
QClipboard *cb = QApplication::clipboard();
- importKeys(cb->text(QClipboard::Clipboard).toAscii());
+ slotImportKeys(cb->text(QClipboard::Clipboard).toAscii());
}
-void KeyMgmt::deleteSelectedKeys()
+void KeyMgmt::slotDeleteSelectedKeys()
{
deleteKeysWithWarning(mKeyList->getSelected());
}
-void KeyMgmt::deleteCheckedKeys()
+void KeyMgmt::slotDeleteCheckedKeys()
{
deleteKeysWithWarning(mKeyList->getChecked());
}
@@ -281,7 +281,7 @@ void KeyMgmt::slotKeyDeleted(int retcode)
delkey->deleteLater();
}
-void KeyMgmt::showKeyDetails()
+void KeyMgmt::slotShowKeyDetails()
{
if (mKeyList->getSelected()->isEmpty()) {
return;
@@ -293,7 +293,7 @@ void KeyMgmt::showKeyDetails()
new KeyDetailsDialog(mCtx, key);
}
-void KeyMgmt::exportKeyToFile()
+void KeyMgmt::slotExportKeyToFile()
{
// TODO
/* QByteArray *keyArray = new QByteArray();
@@ -315,7 +315,7 @@ void KeyMgmt::exportKeyToFile()
*/
}
-void KeyMgmt::exportKeyToClipboard()
+void KeyMgmt::slotExportKeyToClipboard()
{
// TODO
/* QByteArray *keyArray = new QByteArray();
@@ -328,7 +328,7 @@ void KeyMgmt::exportKeyToClipboard()
*/
}
-void KeyMgmt::generateKeyDialog()
+void KeyMgmt::slotGenerateKeyDialog()
{
KeyGenDialog *keyGenDialog = new KeyGenDialog(mCtx,this);
keyGenDialog->show();
diff --git a/keymgmt.h b/keymgmt.h
index 4a130fe..9ddcf41 100755
--- a/keymgmt.h
+++ b/keymgmt.h
@@ -51,17 +51,17 @@ public:
QAction *importKeyFromKeyServerAct;
public slots:
- void importKeyFromFile();
- void importKeyFromClipboard();
- void importKeyFromKeyServer();
- void importKeys(QString text);
+ void SlotimportKeyFromFile();
+ void slotImportKeyFromClipboard();
+ void slotImportKeyFromKeyServer();
+ void slotImportKeys(QString text);
void slotImportDone(int result);
- void exportKeyToFile();
- void exportKeyToClipboard();
- void deleteSelectedKeys();
- void deleteCheckedKeys();
- void generateKeyDialog();
- void showKeyDetails();
+ void slotExportKeyToFile();
+ void slotExportKeyToClipboard();
+ void slotDeleteSelectedKeys();
+ void slotDeleteCheckedKeys();
+ void slotGenerateKeyDialog();
+ void slotShowKeyDetails();
void slotKeyDeleted(int retcode);
signals:
diff --git a/wizard.cpp b/wizard.cpp
index a7e19e0..07734c4 100644
--- a/wizard.cpp
+++ b/wizard.cpp
@@ -98,7 +98,7 @@ bool Wizard::importPubAndSecKeysFromDir(const QString dir, KeyMgmt *keyMgmt)
inBuffer.append(pubRingFile.readAll());
pubRingFile.close();
}
- keyMgmt->importKeys(inBuffer);
+ keyMgmt->slotImportKeys(inBuffer);
inBuffer.clear();
return true;