From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 18 Jun 2018 18:19:26 +0000 (+0200)
Subject: identd: Remove unneeded strict attribute
X-Git-Tag: 0.13-rc1~42
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=5fc6f7e2d63b45770574260afd6ce535e9548d23;hp=e212eabe53878a8fa6ecb15909a325ed7dd63283

identd: Remove unneeded strict attribute

Strictness is now handled in CoreSession, so the attribute is no
longer used.
---

diff --git a/src/core/core.cpp b/src/core/core.cpp
index e3c79314..d596344c 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -224,7 +224,7 @@ bool Core::init()
 
 
         if (Quassel::isOptionSet("ident-daemon")) {
-            _identServer = new IdentServer(_strictIdentEnabled, this);
+            _identServer = new IdentServer(this);
         }
 
         Quassel::registerReloadHandler([]() {
diff --git a/src/core/identserver.cpp b/src/core/identserver.cpp
index c68d119e..c3be8f51 100644
--- a/src/core/identserver.cpp
+++ b/src/core/identserver.cpp
@@ -24,9 +24,8 @@
 #include "identserver.h"
 #include "logger.h"
 
-IdentServer::IdentServer(bool strict, QObject *parent)
+IdentServer::IdentServer(QObject *parent)
     : QObject(parent)
-    , _strict(strict)
 {
     connect(&_server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
     connect(&_v6server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
diff --git a/src/core/identserver.h b/src/core/identserver.h
index fac112c6..3723c252 100644
--- a/src/core/identserver.h
+++ b/src/core/identserver.h
@@ -51,7 +51,7 @@ class IdentServer : public QObject
     Q_OBJECT
 
 public:
-    IdentServer(bool strict, QObject *parent = nullptr);
+    IdentServer(QObject *parent = nullptr);
 
     bool startListening();
     void stopListening(const QString &msg);
@@ -76,8 +76,6 @@ private:
 
     QTcpServer _server, _v6server;
 
-    bool _strict;
-
     QHash<uint16_t, QString> _connections;
     std::list<Request> _requestQueue;
     std::list<qint64> _waiting;