Skip to content

Commit 1398a65

Browse files
committed
qt, refactor: Make AddressBookPage::deleteAction a local variable
1 parent 773f8c1 commit 1398a65

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/qt/addressbookpage.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,22 +116,23 @@ AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode,
116116
QAction *copyAddressAction = new QAction(tr("&Copy Address"), this);
117117
QAction *copyLabelAction = new QAction(tr("Copy &Label"), this);
118118
QAction *editAction = new QAction(tr("&Edit"), this);
119-
deleteAction = new QAction(ui->deleteAddress->text(), this);
120119

121120
// Build context menu
122121
contextMenu = new QMenu(this);
123122
contextMenu->addAction(copyAddressAction);
124123
contextMenu->addAction(copyLabelAction);
125124
contextMenu->addAction(editAction);
126-
if(tab == SendingTab)
125+
if (tab == SendingTab) {
126+
QAction* deleteAction = new QAction(ui->deleteAddress->text(), this);
127127
contextMenu->addAction(deleteAction);
128+
connect(deleteAction, &QAction::triggered, this, &AddressBookPage::on_deleteAddress_clicked);
129+
}
128130
contextMenu->addSeparator();
129131

130132
// Connect signals for context menu actions
131133
connect(copyAddressAction, &QAction::triggered, this, &AddressBookPage::on_copyAddress_clicked);
132134
connect(copyLabelAction, &QAction::triggered, this, &AddressBookPage::onCopyLabelAction);
133135
connect(editAction, &QAction::triggered, this, &AddressBookPage::onEditAction);
134-
connect(deleteAction, &QAction::triggered, this, &AddressBookPage::on_deleteAddress_clicked);
135136

136137
connect(ui->tableView, &QWidget::customContextMenuRequested, this, &AddressBookPage::contextualMenu);
137138

@@ -249,13 +250,11 @@ void AddressBookPage::selectionChanged()
249250
// In sending tab, allow deletion of selection
250251
ui->deleteAddress->setEnabled(true);
251252
ui->deleteAddress->setVisible(true);
252-
deleteAction->setEnabled(true);
253253
break;
254254
case ReceivingTab:
255255
// Deleting receiving addresses, however, is not allowed
256256
ui->deleteAddress->setEnabled(false);
257257
ui->deleteAddress->setVisible(false);
258-
deleteAction->setEnabled(false);
259258
break;
260259
}
261260
ui->copyAddress->setEnabled(true);

src/qt/addressbookpage.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public Q_SLOTS:
5555
QString returnValue;
5656
AddressBookSortFilterProxyModel *proxyModel;
5757
QMenu *contextMenu;
58-
QAction *deleteAction; // to be able to explicitly disable it
5958
QString newAddressToSelect;
6059

6160
private Q_SLOTS:

0 commit comments

Comments
 (0)