From 4cd97e1cc7b5d8fee0847e2e2b1350ea15163835 Mon Sep 17 00:00:00 2001 From: nils Date: Mon, 22 Sep 2008 18:49:59 +0000 Subject: changed names of functions deletekey and deletekeys to deleteSelectedKeys and deleteCheckedKeys git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@172 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- keylist.cpp | 14 +++++++------- keylist.h | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/keylist.cpp b/keylist.cpp index f75b2fd..9ebcbee 100644 --- a/keylist.cpp +++ b/keylist.cpp @@ -41,7 +41,7 @@ KeyList::KeyList(QWidget *parent) m_deleteButton = new QPushButton(tr("Delete Checked Keys")); - connect(m_deleteButton, SIGNAL(clicked()), this, SLOT(deleteKeys())); + connect(m_deleteButton, SIGNAL(clicked()), this, SLOT(deleteCheckedKeys())); QVBoxLayout *layout = new QVBoxLayout; layout->addWidget(m_keyList); @@ -65,7 +65,7 @@ void KeyList::setIconPath(QString path) void KeyList::contextMenuEvent(QContextMenuEvent *event) { QMenu menu(this); - menu.addAction(deleteKeyAct); + menu.addAction(deleteSelectedKeysAct); menu.exec(event->globalPos()); } @@ -131,7 +131,7 @@ QList *KeyList::getSelected() return ret; } -void KeyList::deleteKeys() +void KeyList::deleteCheckedKeys() { m_ctx->deleteKeys(getChecked()); @@ -139,7 +139,7 @@ void KeyList::deleteKeys() } -void KeyList::deleteKey() +void KeyList::deleteSelectedKeys() { m_ctx->deleteKeys(getSelected()); @@ -149,7 +149,7 @@ void KeyList::deleteKey() void KeyList::createActions() { - deleteKeyAct = new QAction(tr("Delete Key"), this); - deleteKeyAct->setStatusTip(tr("Delete the checked keys")); - connect(deleteKeyAct, SIGNAL(triggered()), this, SLOT(deleteKey())); + deleteSelectedKeysAct = new QAction(tr("Delete Key"), this); + deleteSelectedKeysAct->setStatusTip(tr("Delete the selected keys")); + connect(deleteSelectedKeysAct, SIGNAL(triggered()), this, SLOT(deleteSelectedKeys())); } diff --git a/keylist.h b/keylist.h index bc7ffdf..d5ddbe1 100644 --- a/keylist.h +++ b/keylist.h @@ -22,6 +22,8 @@ #ifndef __KEYLIST_H__ #define __KEYLIST_H__ +#include "context.h" + class QWidget; class QVBoxLayout; class QTableWidgetItem; @@ -30,8 +32,6 @@ class QMessageBox; class QtGui; class QTableWidget; class QPushButton; -#include "context.h" - class QMenu; class KeyList : public QWidget @@ -39,8 +39,8 @@ class KeyList : public QWidget Q_OBJECT public slots: - void deleteKeys(); - void deleteKey(); + void deleteCheckedKeys(); + void deleteSelectedKeys(); public: KeyList(QWidget *parent = 0); @@ -54,7 +54,7 @@ private: GpgME::Context *m_ctx; QTableWidget *m_keyList; QPushButton *m_deleteButton; - QAction *deleteKeyAct; + QAction *deleteSelectedKeysAct; void createActions(); QString iconPath; -- cgit v1.2.3