From 9eebb1ff04b03df7963697cd3bef109c6bf48df6 Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Sat, 4 Mar 2023 09:32:57 +0000
Subject: [PATCH] Move CClient constructor body to .cpp

---
 include/znc/Client.h | 73 +-------------------------------------------
 src/Client.cpp       | 71 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/include/znc/Client.h b/include/znc/Client.h
index 2312698d..7afdcea3 100644
--- a/include/znc/Client.h
+++ b/include/znc/Client.h
@@ -98,78 +98,7 @@ class CClientAuth : public CAuthBase {
 
 class CClient : public CIRCSocket {
   public:
-    CClient()
-        : CIRCSocket(),
-          m_bGotPass(false),
-          m_bGotNick(false),
-          m_bGotUser(false),
-          m_uCapVersion(0),
-          m_bInCap(false),
-          m_bCapNotify(false),
-          m_bAwayNotify(false),
-          m_bAccountNotify(false),
-          m_bAccountTag(false),
-          m_bExtendedJoin(false),
-          m_bNamesx(false),
-          m_bUHNames(false),
-          m_bAway(false),
-          m_bServerTime(false),
-          m_bBatch(false),
-          m_bEchoMessage(false),
-          m_bSelfMessage(false),
-          m_bPlaybackActive(false),
-          m_pUser(nullptr),
-          m_pNetwork(nullptr),
-          m_sNick("unknown-nick"),
-          m_sPass(""),
-          m_sUser(""),
-          m_sNetwork(""),
-          m_sIdentifier(""),
-          m_spAuth(),
-          m_ssAcceptedCaps(),
-          m_ssSupportedTags(),
-          m_mCoreCaps({
-              {"multi-prefix",
-               {false, [this](bool bVal) { m_bNamesx = bVal; }}},
-              {"userhost-in-names",
-               {false, [this](bool bVal) { m_bUHNames = bVal; }}},
-              {"echo-message",
-               {false, [this](bool bVal) { m_bEchoMessage = bVal; }}},
-              {"server-time",
-               {false, [this](bool bVal) {
-                m_bServerTime = bVal;
-                SetTagSupport("time", bVal);
-               }}},
-              {"batch", {false, [this](bool bVal) {
-                m_bBatch = bVal;
-                SetTagSupport("batch", bVal);
-              }}},
-              {"cap-notify",
-               {false, [this](bool bVal) { m_bCapNotify = bVal; }}},
-              {"away-notify",
-               {true, [this](bool bVal) { m_bAwayNotify = bVal; }}},
-              {"account-notify",
-               {true, [this](bool bVal) { m_bAccountNotify = bVal; }}},
-              {"account-tag",
-               {true, [this](bool bVal) {
-                m_bAccountTag = bVal;
-                SetTagSupport("account", bVal);
-               }}},
-              {"extended-join",
-               {true, [this](bool bVal) { m_bExtendedJoin = bVal; }}},
-          }) {
-        EnableReadLine();
-        // RFC says a line can have 512 chars max, but we are
-        // a little more gentle ;)
-        SetMaxBufferThreshold(1024);
-
-        // For compatibility with older clients
-        m_mCoreCaps["znc.in/server-time-iso"] = m_mCoreCaps["server-time"];
-        m_mCoreCaps["znc.in/batch"] = m_mCoreCaps["batch"];
-        m_mCoreCaps["znc.in/self-message"] = {
-            false, [this](bool bVal) { m_bSelfMessage = bVal; }};
-    }
-
+    CClient();
     virtual ~CClient();
 
     CClient(const CClient&) = delete;
diff --git a/src/Client.cpp b/src/Client.cpp
index fd1e1655..1ba93631 100644
--- a/src/Client.cpp
+++ b/src/Client.cpp
@@ -75,6 +75,77 @@ using std::vector;
         }                                                                     \
     }
 
+CClient::CClient() : CIRCSocket(),
+      m_bGotPass(false),
+      m_bGotNick(false),
+      m_bGotUser(false),
+      m_uCapVersion(0),
+      m_bInCap(false),
+      m_bCapNotify(false),
+      m_bAwayNotify(false),
+      m_bAccountNotify(false),
+      m_bAccountTag(false),
+      m_bExtendedJoin(false),
+      m_bNamesx(false),
+      m_bUHNames(false),
+      m_bAway(false),
+      m_bServerTime(false),
+      m_bBatch(false),
+      m_bEchoMessage(false),
+      m_bSelfMessage(false),
+      m_bPlaybackActive(false),
+      m_pUser(nullptr),
+      m_pNetwork(nullptr),
+      m_sNick("unknown-nick"),
+      m_sPass(""),
+      m_sUser(""),
+      m_sNetwork(""),
+      m_sIdentifier(""),
+      m_spAuth(),
+      m_ssAcceptedCaps(),
+      m_ssSupportedTags(),
+      m_mCoreCaps({
+          {"multi-prefix",
+           {false, [this](bool bVal) { m_bNamesx = bVal; }}},
+          {"userhost-in-names",
+           {false, [this](bool bVal) { m_bUHNames = bVal; }}},
+          {"echo-message",
+           {false, [this](bool bVal) { m_bEchoMessage = bVal; }}},
+          {"server-time",
+           {false, [this](bool bVal) {
+            m_bServerTime = bVal;
+            SetTagSupport("time", bVal);
+           }}},
+          {"batch", {false, [this](bool bVal) {
+            m_bBatch = bVal;
+            SetTagSupport("batch", bVal);
+          }}},
+          {"cap-notify",
+           {false, [this](bool bVal) { m_bCapNotify = bVal; }}},
+          {"away-notify",
+           {true, [this](bool bVal) { m_bAwayNotify = bVal; }}},
+          {"account-notify",
+           {true, [this](bool bVal) { m_bAccountNotify = bVal; }}},
+          {"account-tag",
+           {true, [this](bool bVal) {
+            m_bAccountTag = bVal;
+            SetTagSupport("account", bVal);
+           }}},
+          {"extended-join",
+           {true, [this](bool bVal) { m_bExtendedJoin = bVal; }}},
+      }) {
+    EnableReadLine();
+    // RFC says a line can have 512 chars max, but we are
+    // a little more gentle ;)
+    SetMaxBufferThreshold(1024);
+
+    // For compatibility with older clients
+    m_mCoreCaps["znc.in/server-time-iso"] = m_mCoreCaps["server-time"];
+    m_mCoreCaps["znc.in/batch"] = m_mCoreCaps["batch"];
+    m_mCoreCaps["znc.in/self-message"] = {
+        false, [this](bool bVal) { m_bSelfMessage = bVal; }};
+}
+
 CClient::~CClient() {
     if (m_spAuth) {
         CClientAuth* pAuth = (CClientAuth*)&(*m_spAuth);