X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fnetworkmodelcontroller.cpp;h=0112ed18964c785e8be72c55cc632e8f78f7e133;hb=d89f4d9cdbc167112e64fca1931e81bc27d17319;hp=69797bc20fac7ac56c762c5318bb4cd27a883a14;hpb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f;p=quassel.git

diff --git a/src/uisupport/networkmodelcontroller.cpp b/src/uisupport/networkmodelcontroller.cpp
index 69797bc2..0112ed18 100644
--- a/src/uisupport/networkmodelcontroller.cpp
+++ b/src/uisupport/networkmodelcontroller.cpp
@@ -41,19 +41,12 @@
 
 NetworkModelController::NetworkModelController(QObject *parent)
     : QObject(parent),
-    _actionCollection(new ActionCollection(this)),
-    _messageFilter(nullptr),
-    _receiver(nullptr)
+    _actionCollection(new ActionCollection(this))
 {
     connect(_actionCollection, SIGNAL(actionTriggered(QAction *)), SLOT(actionTriggered(QAction *)));
 }
 
 
-NetworkModelController::~NetworkModelController()
-{
-}
-
-
 Action *NetworkModelController::registerAction(ActionType type, const QString &text, bool checkable)
 {
     return registerAction(type, QPixmap(), text, checkable);
@@ -128,7 +121,7 @@ bool NetworkModelController::checkRequirements(const QModelIndex &index, ItemAct
 
 QString NetworkModelController::nickName(const QModelIndex &index) const
 {
-    IrcUser *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
+    auto *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
     if (ircUser)
         return ircUser->nick();
 
@@ -146,11 +139,11 @@ BufferId NetworkModelController::findQueryBuffer(const QModelIndex &index, const
 {
     NetworkId networkId = index.data(NetworkModel::NetworkIdRole).value<NetworkId>();
     if (!networkId.isValid())
-        return BufferId();
+        return {};
 
     QString nick = predefinedNick.isEmpty() ? nickName(index) : predefinedNick;
     if (nick.isEmpty())
-        return BufferId();
+        return {};
 
     return findQueryBuffer(networkId, nick);
 }
@@ -494,7 +487,7 @@ void NetworkModelController::handleNickAction(ActionType type, QAction *action)
             break;
         case NickIgnoreUser:
         {
-            IrcUser *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
+            auto *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
             if (!ircUser)
                 break;
             Client::ignoreListManager()->requestAddIgnoreListItem(IgnoreListManager::SenderIgnore,
@@ -506,7 +499,7 @@ void NetworkModelController::handleNickAction(ActionType type, QAction *action)
         }
         case NickIgnoreHost:
         {
-            IrcUser *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
+            auto *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
             if (!ircUser)
                 break;
             Client::ignoreListManager()->requestAddIgnoreListItem(IgnoreListManager::SenderIgnore,
@@ -518,7 +511,7 @@ void NetworkModelController::handleNickAction(ActionType type, QAction *action)
         }
         case NickIgnoreDomain:
         {
-            IrcUser *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
+            auto *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
             if (!ircUser)
                 break;
             Client::ignoreListManager()->requestAddIgnoreListItem(IgnoreListManager::SenderIgnore,
@@ -555,7 +548,7 @@ NetworkModelController::JoinDlg::JoinDlg(const QModelIndex &index, QWidget *pare
     setWindowIcon(icon::get("irc-join-channel"));
     setWindowTitle(tr("Join Channel"));
 
-    QGridLayout *layout = new QGridLayout(this);
+    auto *layout = new QGridLayout(this);
     layout->addWidget(new QLabel(tr("Network:")), 0, 0);
     layout->addWidget(networks = new QComboBox, 0, 1);
     layout->addWidget(new QLabel(tr("Channel:")), 1, 0);