modernize: Prefer default member init over ctor init

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

diff --git a/src/qtui/settingspages/bufferviewsettingspage.cpp b/src/qtui/settingspages/bufferviewsettingspage.cpp
index 4bfddc4..4a77807 100644 (file)
--- a/src/qtui/settingspages/bufferviewsettingspage.cpp
+++ b/src/qtui/settingspages/bufferviewsettingspage.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  *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *


@@ -20,32 +20,30 @@
 
 #include "bufferviewsettingspage.h"
 
 
 #include "bufferviewsettingspage.h"
 

-#include <QIcon>

 #include <QMessageBox>
 #include <QMessageBox>

+#include <utility>

 
 

-#include "client.h"
-#include "network.h"
+#include "buffermodel.h"

 #include "bufferviewconfig.h"
 #include "bufferviewfilter.h"
 #include "bufferviewconfig.h"
 #include "bufferviewfilter.h"

-#include "buffermodel.h"
+#include "client.h"

 #include "clientbufferviewmanager.h"
 #include "clientbufferviewmanager.h"

+#include "icon.h"
+#include "network.h"

 #include "networkmodel.h"
 #include "util.h"
 
 BufferViewSettingsPage::BufferViewSettingsPage(QWidget *parent)
 #include "networkmodel.h"
 #include "util.h"
 
 BufferViewSettingsPage::BufferViewSettingsPage(QWidget *parent)

-    : SettingsPage(tr("Interface"), tr("Custom Chat Lists"), parent),
-    _ignoreWidgetChanges(false),
-    _useBufferViewHint(false),
-    _bufferViewHint(0)
+    : SettingsPage(tr("Interface"), tr("Custom Chat Lists"), parent)

 {
     ui.setupUi(this);
     //Hide the hide inactive networks feature on older cores (which won't save the setting)
 {
     ui.setupUi(this);
     //Hide the hide inactive networks feature on older cores (which won't save the setting)

-    if (!(Client::coreFeatures() & Quassel::HideInactiveNetworks))
+    if (!Client::isCoreFeatureEnabled(Quassel::Feature::HideInactiveNetworks))

         ui.hideInactiveNetworks->hide();
 
         ui.hideInactiveNetworks->hide();
 

-    ui.renameBufferView->setIcon(QIcon::fromTheme("edit-rename"));
-    ui.addBufferView->setIcon(QIcon::fromTheme("list-add"));
-    ui.deleteBufferView->setIcon(QIcon::fromTheme("edit-delete"));
+    ui.renameBufferView->setIcon(icon::get("edit-rename"));
+    ui.addBufferView->setIcon(icon::get("list-add"));
+    ui.deleteBufferView->setIcon(icon::get("edit-delete"));

 
     reset();
 
 
     reset();
 


@@ -284,7 +282,7 @@ BufferViewConfig *BufferViewSettingsPage::bufferView(int listPos)
         return qobject_cast<BufferViewConfig *>(obj);
     }
     else {
         return qobject_cast<BufferViewConfig *>(obj);
     }
     else {

-        return 0;
+        return nullptr;

     }
 }
 
     }
 }
 


@@ -576,7 +574,7 @@ BufferViewConfig *BufferViewSettingsPage::configForDisplay(BufferViewConfig *con
 /**************************************************************************
  * BufferViewEditDlg
  *************************************************************************/
 /**************************************************************************
  * BufferViewEditDlg
  *************************************************************************/

-BufferViewEditDlg::BufferViewEditDlg(const QString &old, const QStringList &exist, QWidget *parent) : QDialog(parent), existing(exist)
+BufferViewEditDlg::BufferViewEditDlg(const QString &old, QStringList exist, QWidget *parent) : QDialog(parent), existing(std::move(exist))

 {
     ui.setupUi(this);
 
 {
     ui.setupUi(this);