cmake: avoid de-duplication of user's CXXFLAGS

[quassel.git] / src / common / signalproxy.cpp

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index bfaa78e..e6ac40c 100644 (file)
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2020 by the Quassel Project                        *
+ *   Copyright (C) 2005-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -25,12 +25,9 @@
 #include <QHostAddress>
 #include <QMetaMethod>
 #include <QMetaProperty>
+#include <QSslSocket>
 #include <QThread>
 
-#ifdef HAVE_SSL
-#    include <QSslSocket>
-#endif
-
 #include "peer.h"
 #include "protocol.h"
 #include "signalproxy.h"
@@ -193,7 +190,7 @@ bool SignalProxy::addPeer(Peer* peer)
 void SignalProxy::removeAllPeers()
 {
     Q_ASSERT(proxyMode() == Server || peerCount() <= 1);
-    // wee need to copy that list since we modify it in the loop
+    // we need to copy that list since we modify it in the loop
     QList<Peer*> peers = _peerMap.values();
     for (auto peer : peers) {
         removePeer(peer);
@@ -659,7 +656,7 @@ QVariantList SignalProxy::peerData()
         QVariantMap data;
         data["id"] = peer->id();
         data["clientVersion"] = peer->clientVersion();
-        // We explicitly rename this, as, due to the Debian reproducability changes, buildDate isn’t actually the build
+        // We explicitly rename this, as, due to the Debian reproducibility changes, buildDate isn’t actually the build
         // date anymore, but on newer clients the date of the last git commit
         data["clientVersionDate"] = peer->buildDate();
         data["remoteAddress"] = peer->address();