summaryrefslogtreecommitdiff
path: root/src/settingsdialog.cpp
diff options
context:
space:
mode:
authorTannin <devnull@localhost>2015-03-09 12:34:34 +0100
committerTannin <devnull@localhost>2015-03-09 12:34:34 +0100
commit7a1ae9b0f1560c9eda32e032796fbb3fd56ff236 (patch)
treedea71435ac1042cb008fcd9f7b1ec57e6ea91227 /src/settingsdialog.cpp
parentd45ebf134819e1559718681becca9c4139fb7151 (diff)
parentdb2954e8eb41da715b9e7d79a72e225797401413 (diff)
Merge with branch1.2
Diffstat (limited to 'src/settingsdialog.cpp')
-rw-r--r--src/settingsdialog.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index d1947b5a..765858f5 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -125,7 +125,7 @@ void SettingsDialog::on_resetDialogsButton_clicked()
void SettingsDialog::storeSettings(QListWidgetItem *pluginItem)
{
- if (pluginItem != NULL) {
+ if (pluginItem != nullptr) {
QMap<QString, QVariant> settings = pluginItem->data(Qt::UserRole + 1).toMap();
for (int i = 0; i < ui->pluginSettingsList->topLevelItemCount(); ++i) {