chatterino2
Code Issues

fix: Fixed some compiler warnings (#5028)

Browse Source 
* fix(C4101): unreferenced local variable

* fix(C4189): variable initialized but not referenced

* fix(C4305): narrowing from double to float

* fix(C4457): declaration hiding function parameter

* fix(C4456): shadowing declaration

* fix(C4996): remove deprecations

* chore: add changelog entry

* fix: Remove more unused variables

* fix: removed unused lambda captures

* Update changelog entry

---------

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
This commit is contained in:
nerix
2023-12-16 12:24:28 +01:00
committed by GitHub
parent 434487750f
commit 66f4480371
27 changed files with 75 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/Env.cpp
+21 -41
View File
@@ -3,6 +3,7 @@
#include "common/QLogging.hpp"
#include "util/TypeName.hpp"
#include <QtGlobal>
#include <QVariant>
namespace chatterino {
@@ -10,16 +11,8 @@ namespace chatterino {
namespace {
template <typename T>
void warn(const char *envName, T defaultValue)
void warn(const char *envName, const QString &envString, T defaultValue)
{
auto *envString = std::getenv(envName);
if (!envString)
{
// This function is not supposed to be used for non-existant
// environment variables.
return;
}
const auto typeName = QString::fromStdString(
std::string(type_name<decltype(defaultValue)>()));
@@ -33,23 +26,12 @@ namespace {
.arg(defaultValue);
}
QString readStringEnv(const char *envName, QString defaultValue)
{
auto envString = std::getenv(envName);
if (envString != nullptr)
{
return QString(envString);
}
return defaultValue;
}
std::optional<QString> readOptionalStringEnv(const char *envName)
{
auto envString = std::getenv(envName);
if (envString != nullptr)
auto envString = qEnvironmentVariable(envName);
if (!envString.isEmpty())
{
return QString(envString);
return envString;
}
return std::nullopt;
@@ -57,30 +39,28 @@ namespace {
uint16_t readPortEnv(const char *envName, uint16_t defaultValue)
{
auto envString = std::getenv(envName);
if (envString != nullptr)
auto envString = qEnvironmentVariable(envName);
if (!envString.isEmpty())
{
bool ok;
auto val = QString(envString).toUShort(&ok);
bool ok = false;
auto val = envString.toUShort(&ok);
if (ok)
{
return val;
}
else
{
warn(envName, defaultValue);
}
warn(envName, envString, defaultValue);
}
return defaultValue;
}
uint16_t readBoolEnv(const char *envName, bool defaultValue)
bool readBoolEnv(const char *envName, bool defaultValue)
{
auto envString = std::getenv(envName);
if (envString != nullptr)
auto envString = qEnvironmentVariable(envName);
if (!envString.isEmpty())
{
return QVariant(QString(envString)).toBool();
return QVariant(envString).toBool();
}
return defaultValue;
@@ -90,14 +70,14 @@ namespace {
Env::Env()
: recentMessagesApiUrl(
readStringEnv("CHATTERINO2_RECENT_MESSAGES_URL",
"https://recent-messages.robotty.de/api/v2/"
"recent-messages/%1"))
, linkResolverUrl(readStringEnv(
qEnvironmentVariable("CHATTERINO2_RECENT_MESSAGES_URL",
"https://recent-messages.robotty.de/api/v2/"
"recent-messages/%1"))
, linkResolverUrl(qEnvironmentVariable(
"CHATTERINO2_LINK_RESOLVER_URL",
"https://braize.pajlada.com/chatterino/link_resolver/%1"))
, twitchServerHost(
readStringEnv("CHATTERINO2_TWITCH_SERVER_HOST", "irc.chat.twitch.tv"))
, twitchServerHost(qEnvironmentVariable("CHATTERINO2_TWITCH_SERVER_HOST",
"irc.chat.twitch.tv"))
, twitchServerPort(readPortEnv("CHATTERINO2_TWITCH_SERVER_PORT", 443))
, twitchServerSecure(readBoolEnv("CHATTERINO2_TWITCH_SERVER_SECURE", true))
, proxyUrl(readOptionalStringEnv("CHATTERINO2_PROXY_URL"))