X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Faliasessettingspage.cpp;h=20aa1a8b04168a3915261426ff2071f016ab16ae;hb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;hp=57ea7938565b1e9f39472ea91b2c987993daa539;hpb=0a43227b8cd44625f4881cc1545d42c8c8a4876c;p=quassel.git

diff --git a/src/qtui/settingspages/aliasessettingspage.cpp b/src/qtui/settingspages/aliasessettingspage.cpp
index 57ea7938..20aa1a8b 100644
--- 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-2018 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>
 
+#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,10 +41,10 @@ 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());
 }
@@ -51,7 +52,7 @@ AliasesSettingsPage::AliasesSettingsPage(QWidget *parent)
 
 void AliasesSettingsPage::load()
 {
-    if (_aliasesModel.configChanged())
+    if (_aliasesModel.hasConfigChanged())
         _aliasesModel.revert();
 }
 
@@ -64,7 +65,7 @@ void AliasesSettingsPage::defaults()
 
 void AliasesSettingsPage::save()
 {
-    if (_aliasesModel.configChanged())
+    if (_aliasesModel.hasConfigChanged())
         _aliasesModel.commit();
 }