common: Make SyncableObject non-copyable

[quassel.git] / src / qtui / settingspages / aliasessettingspage.cpp

diff --git a/src/qtui/settingspages/aliasessettingspage.cpp b/src/qtui/settingspages/aliasessettingspage.cpp
index 57ea793..80e5c0f 100644 (file)
--- a/src/qtui/settingspages/aliasessettingspage.cpp
+++ b/src/qtui/settingspages/aliasessettingspage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,15 +21,16 @@
 #include "aliasessettingspage.h"
 
 #include <QHeaderView>
-#include <QIcon>
 #include <QItemSelectionModel>
 
-AliasesSettingsPage::AliasesSettingsPage(QWidget *parent)
+#include "icon.h"
+
+AliasesSettingsPage::AliasesSettingsPage(QWidget* parent)
     : SettingsPage(tr("IRC"), tr("Aliases"), parent)
 {
     ui.setupUi(this);
-    ui.newAliasButton->setIcon(QIcon::fromTheme("list-add"));
-    ui.deleteAliasButton->setIcon(QIcon::fromTheme("edit-delete"));
+    ui.newAliasButton->setIcon(icon::get("list-add"));
+    ui.deleteAliasButton->setIcon(icon::get("edit-delete"));
 
     ui.aliasesView->setSelectionBehavior(QAbstractItemView::SelectRows);
     ui.aliasesView->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -40,35 +41,31 @@ AliasesSettingsPage::AliasesSettingsPage(QWidget *parent)
     ui.aliasesView->verticalHeader()->hide();
     ui.aliasesView->horizontalHeader()->setStretchLastSection(true);
 
-    connect(ui.newAliasButton, SIGNAL(clicked()), &_aliasesModel, SLOT(newAlias()));
-    connect(ui.deleteAliasButton, SIGNAL(clicked()), this, SLOT(deleteSelectedAlias()));
-    connect(&_aliasesModel, SIGNAL(configChanged(bool)), this, SLOT(setChangedState(bool)));
-    connect(&_aliasesModel, SIGNAL(modelReady(bool)), this, SLOT(enableDialog(bool)));
+    connect(ui.newAliasButton, &QAbstractButton::clicked, &_aliasesModel, &AliasesModel::newAlias);
+    connect(ui.deleteAliasButton, &QAbstractButton::clicked, this, &AliasesSettingsPage::deleteSelectedAlias);
+    connect(&_aliasesModel, &AliasesModel::configChanged, this, &AliasesSettingsPage::setChangedState);
+    connect(&_aliasesModel, &AliasesModel::modelReady, this, &AliasesSettingsPage::enableDialog);
 
     enableDialog(_aliasesModel.isReady());
 }
 
-
 void AliasesSettingsPage::load()
 {
-    if (_aliasesModel.configChanged())
+    if (_aliasesModel.hasConfigChanged())
         _aliasesModel.revert();
 }
 
-
 void AliasesSettingsPage::defaults()
 {
     _aliasesModel.loadDefaults();
 }
 
-
 void AliasesSettingsPage::save()
 {
-    if (_aliasesModel.configChanged())
+    if (_aliasesModel.hasConfigChanged())
         _aliasesModel.commit();
 }
 
-
 void AliasesSettingsPage::enableDialog(bool enabled)
 {
     ui.newAliasButton->setEnabled(enabled);
@@ -76,7 +73,6 @@ void AliasesSettingsPage::enableDialog(bool enabled)
     setEnabled(enabled);
 }
 
-
 void AliasesSettingsPage::deleteSelectedAlias()
 {
     if (!ui.aliasesView->selectionModel()->hasSelection())