aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGravatar Sadie Powell2024-09-03 11:09:54 +0100
committerGravatar Sadie Powell2024-09-03 11:09:54 +0100
commit591cb8e0b9dc49753143d35e26251ea4a24b0e8f (patch)
treec164a4b573717d7ad53e3bb9e1afa91fa8491016 /include
parentFix mkdescriptions when parsing docs containing Jinja variables. (diff)
Const correct the xline header.
Diffstat (limited to 'include')
-rw-r--r--include/xline.h34
1 files changed, 15 insertions, 19 deletions
diff --git a/include/xline.h b/include/xline.h
index 6c205ce23..b9e0027e8 100644
--- a/include/xline.h
+++ b/include/xline.h
@@ -195,9 +195,8 @@ public:
: XLine(s_time, d, src, re, "K")
, usermask(user)
, hostmask(host)
+ , matchtext(INSP_FORMAT("{}@{}", user, host))
{
- matchtext = this->usermask;
- matchtext.append("@").append(this->hostmask);
}
bool Matches(User* u) const override;
@@ -211,12 +210,12 @@ public:
bool IsBurstable() override;
/** Username pattern to match. */
- std::string usermask;
+ const std::string usermask;
/** Hostname pattern to match. */
- std::string hostmask;
+ const std::string hostmask;
- std::string matchtext;
+ const std::string matchtext;
};
/** GLine class
@@ -237,9 +236,8 @@ public:
: XLine(s_time, d, src, re, "G")
, usermask(user)
, hostmask(host)
+ , matchtext(INSP_FORMAT("{}@{}", user, host))
{
- matchtext = this->usermask;
- matchtext.append("@").append(this->hostmask);
}
bool Matches(User* u) const override;
@@ -251,12 +249,12 @@ public:
const std::string& Displayable() const override;
/** Username pattern to match. */
- std::string usermask;
+ const std::string usermask;
/** Hostname pattern to match. */
- std::string hostmask;
+ const std::string hostmask;
- std::string matchtext;
+ const std::string matchtext;
};
/** ELine class
@@ -277,9 +275,8 @@ public:
: XLine(s_time, d, src, re, "E")
, usermask(user)
, hostmask(host)
+ , matchtext(INSP_FORMAT("{}@{}", user, host))
{
- matchtext = this->usermask;
- matchtext.append("@").append(this->hostmask);
}
bool Matches(User* u) const override;
@@ -293,12 +290,12 @@ public:
const std::string& Displayable() const override;
/** Username pattern to match. */
- std::string usermask;
+ const std::string usermask;
/** Hostname pattern to match. */
- std::string hostmask;
+ const std::string hostmask;
- std::string matchtext;
+ const std::string matchtext;
};
/** ZLine class
@@ -330,7 +327,7 @@ public:
/** IP mask (no user part)
*/
- std::string ipaddr;
+ const std::string ipaddr;
};
/** QLine class
@@ -362,7 +359,7 @@ public:
/** Nickname mask
*/
- std::string nick;
+ const std::string nick;
};
/** XLineFactory is used to generate an XLine pointer, given just the
@@ -375,8 +372,7 @@ public:
class CoreExport XLineFactory
{
protected:
-
- std::string type;
+ const std::string type;
public: