diff --git a/src/common/Env.cpp b/src/common/Env.cpp index 8c580f5da..113a4b8d3 100644 --- a/src/common/Env.cpp +++ b/src/common/Env.cpp @@ -59,7 +59,11 @@ uint16_t readPortEnv(const char *envName, uint16_t defaultValue) return defaultValue; } -bool readBoolEnv(const char *envName, bool defaultValue) +} // namespace + +namespace env { + +bool readBool(const char *envName, bool defaultValue) { auto envString = qEnvironmentVariable(envName); if (!envString.isEmpty()) @@ -70,7 +74,7 @@ bool readBoolEnv(const char *envName, bool defaultValue) return defaultValue; } -} // namespace +} // namespace env Env::Env() : recentMessagesApiUrl( @@ -83,7 +87,8 @@ Env::Env() , twitchServerHost(qEnvironmentVariable("CHATTERINO2_TWITCH_SERVER_HOST", "irc.chat.twitch.tv")) , twitchServerPort(readPortEnv("CHATTERINO2_TWITCH_SERVER_PORT", 443)) - , twitchServerSecure(readBoolEnv("CHATTERINO2_TWITCH_SERVER_SECURE", true)) + , twitchServerSecure( + env::readBool("CHATTERINO2_TWITCH_SERVER_SECURE", true)) , proxyUrl(readOptionalStringEnv("CHATTERINO2_PROXY_URL")) , logToFile(qEnvironmentVariable(env::LOG_TO_FILE, "")) { diff --git a/src/common/Env.hpp b/src/common/Env.hpp index 1d610d972..545429f3e 100644 --- a/src/common/Env.hpp +++ b/src/common/Env.hpp @@ -15,6 +15,8 @@ namespace env { constexpr const char *LOG_TO_FILE = "CHATTERINO_LOG_TO_FILE"; +bool readBool(const char *envName, bool defaultValue); + } // namespace env class Env