summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/QtUI/QtHighlightNotificationConfigDialog.cpp')
-rw-r--r--Swift/QtUI/QtHighlightNotificationConfigDialog.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Swift/QtUI/QtHighlightNotificationConfigDialog.cpp b/Swift/QtUI/QtHighlightNotificationConfigDialog.cpp
index 19274a2..0521a2d 100644
--- a/Swift/QtUI/QtHighlightNotificationConfigDialog.cpp
+++ b/Swift/QtUI/QtHighlightNotificationConfigDialog.cpp
@@ -1,11 +1,11 @@
/*
- * Copyright (c) 2016-2017 Isode Limited.
+ * Copyright (c) 2016-2018 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swift/QtUI/QtHighlightNotificationConfigDialog.h>
#include <Swiften/Base/Log.h>
#include <Swift/Controllers/Highlighting/HighlightManager.h>
@@ -44,19 +44,19 @@ QtHighlightNotificationConfigDialog::QtHighlightNotificationConfigDialog(QtSetti
ui_.userHighlightTreeWidget->addTopLevelItem(item);
});
connect(ui_.removeUserHighlightPushButton, &QPushButton::clicked, [&](bool) {
auto currentItem = ui_.userHighlightTreeWidget->currentItem();
if (currentItem) {
ui_.userHighlightTreeWidget->takeTopLevelItem(ui_.userHighlightTreeWidget->indexOfTopLevelItem(currentItem));
}
});
connect(ui_.userHighlightTreeWidget, &QTreeWidget::currentItemChanged, [&](QTreeWidgetItem* current, QTreeWidgetItem* ) {
- ui_.removeUserHighlightPushButton->setEnabled(current != 0);
+ ui_.removeUserHighlightPushButton->setEnabled(current != nullptr);
});
// keyword highlight edit slots
connect(ui_.addKeywordHighlightPushButton, &QPushButton::clicked, [&](bool) {
auto item = new QTreeWidgetItem();
item->setFlags(Qt::ItemIsEditable | Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled);
item->setData(0, Qt::EditRole, "");
item->setData(1, QtCheckBoxStyledItemDelegate::DATA_ROLE, QVariant(false));
item->setData(2, QtColorSelectionStyledItemDelegate::DATA_ROLE, QColor("#000000"));
@@ -66,19 +66,19 @@ QtHighlightNotificationConfigDialog::QtHighlightNotificationConfigDialog(QtSetti
ui_.keywordHighlightTreeWidget->addTopLevelItem(item);
});
connect(ui_.removeKeywordHighlightPushButton, &QPushButton::clicked, [&](bool) {
auto currentItem = ui_.keywordHighlightTreeWidget->currentItem();
if (currentItem) {
ui_.keywordHighlightTreeWidget->takeTopLevelItem(ui_.keywordHighlightTreeWidget->indexOfTopLevelItem(currentItem));
}
});
connect(ui_.keywordHighlightTreeWidget, &QTreeWidget::currentItemChanged, [&](QTreeWidgetItem* current, QTreeWidgetItem* ) {
- ui_.removeKeywordHighlightPushButton->setEnabled(current != 0);
+ ui_.removeKeywordHighlightPushButton->setEnabled(current != nullptr);
});
// setup slots for main dialog buttons
connect(ui_.buttonBox, &QDialogButtonBox::clicked, [&](QAbstractButton* clickedButton) {
if (clickedButton == ui_.buttonBox->button(QDialogButtonBox::RestoreDefaults)) {
if (highlightManager_) {
highlightManager_->resetToDefaultConfiguration();
setHighlightConfigurationToDialog(*highlightManager_->getConfiguration());
}