Make all uses/storages of Paths const

This commit is contained in:
Rasmus Karlsson 2024-01-15 22:51:17 +01:00
parent 7f935665f9
commit 0dcd189331
33 changed files with 40 additions and 37 deletions

View file

@ -107,7 +107,8 @@ IApplication::IApplication()
// It will create the instances of the major classes, and connect their signals
// to each other
Application::Application(Settings &_settings, Paths &_paths, const Args &_args)
Application::Application(Settings &_settings, const Paths &_paths,
const Args &_args)
: args_(_args)
, themes(&this->emplace<Theme>())
, fonts(&this->emplace<Fonts>())
@ -152,7 +153,7 @@ void Application::fakeDtor()
this->twitchPubSub.reset();
}
void Application::initialize(Settings &settings, Paths &paths)
void Application::initialize(Settings &settings, const Paths &paths)
{
assert(isAppInitialized == false);
isAppInitialized = true;
@ -340,7 +341,7 @@ void Application::save()
}
}
void Application::initNm(Paths &paths)
void Application::initNm(const Paths &paths)
{
(void)paths;

View file

@ -90,7 +90,7 @@ class Application : public IApplication
public:
static Application *instance;
Application(Settings &_settings, Paths &_paths, const Args &_args);
Application(Settings &_settings, const Paths &_paths, const Args &_args);
~Application() override;
Application(const Application &) = delete;
@ -104,7 +104,7 @@ public:
*/
void fakeDtor();
void initialize(Settings &settings, Paths &paths);
void initialize(Settings &settings, const Paths &paths);
void load();
void save();
@ -222,7 +222,7 @@ private:
void initPubSub();
void initBttvLiveUpdates();
void initSeventvEventAPI();
void initNm(Paths &paths);
void initNm(const Paths &paths);
template <typename T,
typename = std::enable_if_t<std::is_base_of<Singleton, T>::value>>

View file

@ -223,7 +223,8 @@ namespace {
}
} // namespace
void runGui(QApplication &a, Paths &paths, Settings &settings, const Args &args)
void runGui(QApplication &a, const Paths &paths, Settings &settings,
const Args &args)
{
initQt();
initResources();

View file

@ -8,7 +8,7 @@ class Args;
class Paths;
class Settings;
void runGui(QApplication &a, Paths &paths, Settings &settings,
void runGui(QApplication &a, const Paths &paths, Settings &settings,
const Args &args);
} // namespace chatterino

View file

@ -17,7 +17,7 @@ public:
Singleton(Singleton &&) = delete;
Singleton &operator=(Singleton &&) = delete;
virtual void initialize(Settings &settings, Paths &paths)
virtual void initialize(Settings &settings, const Paths &paths)
{
(void)(settings);
(void)(paths);

View file

@ -47,7 +47,7 @@ AccountController::AccountController()
});
}
void AccountController::initialize(Settings &settings, Paths &paths)
void AccountController::initialize(Settings &settings, const Paths &paths)
{
this->twitch.load();
}

View file

@ -21,7 +21,7 @@ public:
AccountModel *createModel(QObject *parent);
void initialize(Settings &settings, Paths &paths) override;
void initialize(Settings &settings, const Paths &paths) override;
TwitchAccountManager twitch;

View file

@ -261,7 +261,7 @@ const std::unordered_map<QString, VariableReplacer> COMMAND_VARS{
namespace chatterino {
void CommandController::initialize(Settings &, Paths &paths)
void CommandController::initialize(Settings &, const Paths &paths)
{
// Update commands map when the vector of commands has been updated
auto addFirstMatchToMap = [this](auto args) {

View file

@ -33,7 +33,7 @@ public:
bool dryRun);
QStringList getDefaultChatterinoCommandList();
void initialize(Settings &, Paths &paths) override;
void initialize(Settings &, const Paths &paths) override;
void save() override;
CommandModel *createModel(QObject *parent);

View file

@ -440,7 +440,8 @@ std::ostream &operator<<(std::ostream &os, const HighlightResult &result)
return os;
}
void HighlightController::initialize(Settings &settings, Paths & /*paths*/)
void HighlightController::initialize(Settings &settings,
const Paths & /*paths*/)
{
this->rebuildListener_.addSetting(settings.enableSelfHighlight);
this->rebuildListener_.addSetting(settings.enableSelfHighlightSound);

View file

@ -86,7 +86,7 @@ struct HighlightCheck {
class HighlightController final : public Singleton
{
public:
void initialize(Settings &settings, Paths &paths) override;
void initialize(Settings &settings, const Paths &paths) override;
/**
* @brief Checks the given message parameters if it matches our internal checks, and returns a result

View file

@ -26,7 +26,7 @@
namespace chatterino {
void NotificationController::initialize(Settings &settings, Paths &paths)
void NotificationController::initialize(Settings &settings, const Paths &paths)
{
this->initialized_ = true;
for (const QString &channelName : this->twitchSetting_.getValue())

View file

@ -20,7 +20,7 @@ enum class Platform : uint8_t {
class NotificationController final : public Singleton, private QObject
{
public:
void initialize(Settings &settings, Paths &paths) override;
void initialize(Settings &settings, const Paths &paths) override;
bool isChannelNotified(const QString &channelName, Platform p);
void updateChannelNotification(const QString &channelName, Platform p);

View file

@ -68,7 +68,7 @@ namespace chatterino {
// NUM_SOUNDS specifies how many simultaneous default ping sounds & decoders to create
constexpr const auto NUM_SOUNDS = 4;
void MiniaudioBackend::initialize(Settings &settings, Paths &paths)
void MiniaudioBackend::initialize(Settings &settings, const Paths &paths)
{
(void)(settings);
(void)(paths);

View file

@ -25,7 +25,7 @@ namespace chatterino {
**/
class MiniaudioBackend : public ISoundController
{
void initialize(Settings &settings, Paths &paths) override;
void initialize(Settings &settings, const Paths &paths) override;
public:
MiniaudioBackend();

View file

@ -11,7 +11,7 @@
#include <QUrl>
namespace chatterino {
void ChatterinoBadges::initialize(Settings &settings, Paths &paths)
void ChatterinoBadges::initialize(Settings &settings, const Paths &paths)
{
this->loadChatterinoBadges();
}

View file

@ -18,7 +18,7 @@ using EmotePtr = std::shared_ptr<const Emote>;
class ChatterinoBadges : public Singleton
{
public:
void initialize(Settings &settings, Paths &paths) override;
void initialize(Settings &settings, const Paths &paths) override;
ChatterinoBadges();
std::optional<EmotePtr> getBadge(const UserId &id);

View file

@ -16,7 +16,7 @@
namespace chatterino {
void FfzBadges::initialize(Settings &settings, Paths &paths)
void FfzBadges::initialize(Settings &settings, const Paths &paths)
{
this->load();
}

View file

@ -21,7 +21,7 @@ using EmotePtr = std::shared_ptr<const Emote>;
class FfzBadges : public Singleton
{
public:
void initialize(Settings &settings, Paths &paths) override;
void initialize(Settings &settings, const Paths &paths) override;
FfzBadges() = default;
struct Badge {

View file

@ -64,7 +64,7 @@ TwitchIrcServer::TwitchIrcServer()
// false);
}
void TwitchIrcServer::initialize(Settings &settings, Paths &paths)
void TwitchIrcServer::initialize(Settings &settings, const Paths &paths)
{
getApp()->accounts->twitch.currentUserChanged.connect([this]() {
postToThread([this] {

View file

@ -43,7 +43,7 @@ public:
TwitchIrcServer();
~TwitchIrcServer() override = default;
void initialize(Settings &settings, Paths &paths) override;
void initialize(Settings &settings, const Paths &paths) override;
void forEachChannelAndSpecialChannels(std::function<void(ChannelPtr)> func);

View file

@ -128,7 +128,7 @@ namespace chatterino {
using namespace std::string_literals;
void CrashHandler::initialize(Settings & /*settings*/, Paths &paths)
void CrashHandler::initialize(Settings & /*settings*/, const Paths &paths)
{
auto optSettings = readRecoverySettings(paths);
if (optSettings)

View file

@ -25,7 +25,7 @@ public:
/// Sets and saves whether Chatterino should restart on a crash
void saveShouldRecover(bool value);
void initialize(Settings &settings, Paths &paths) override;
void initialize(Settings &settings, const Paths &paths) override;
private:
bool shouldRecover_ = false;

View file

@ -6,7 +6,7 @@ Emotes::Emotes()
{
}
void Emotes::initialize(Settings &settings, Paths &paths)
void Emotes::initialize(Settings &settings, const Paths &paths)
{
this->emojis.load();

View file

@ -25,7 +25,7 @@ class Emotes final : public IEmotes, public Singleton
public:
Emotes();
void initialize(Settings &settings, Paths &paths) override;
void initialize(Settings &settings, const Paths &paths) override;
bool isIgnoredEmote(const QString &emote);

View file

@ -79,7 +79,7 @@ Fonts::Fonts()
this->fontsByType_.resize(size_t(FontStyle::EndType));
}
void Fonts::initialize(Settings &, Paths &)
void Fonts::initialize(Settings &, const Paths &)
{
this->chatFontFamily.connect(
[this]() {

View file

@ -43,7 +43,7 @@ class Fonts final : public Singleton
public:
Fonts();
void initialize(Settings &settings, Paths &paths) override;
void initialize(Settings &settings, const Paths &paths) override;
// font data gets set in createFontData(...)

View file

@ -38,7 +38,7 @@ bool Paths::isPortable()
return Modes::instance().isPortable;
}
QString Paths::cacheDirectory()
QString Paths::cacheDirectory() const
{
static const auto pathSetting = [] {
QStringSetting cachePathSetting("/cache/path");

View file

@ -44,7 +44,7 @@ public:
bool createFolder(const QString &folderPath);
bool isPortable();
QString cacheDirectory();
QString cacheDirectory() const;
private:
void initAppFilePathHash();

View file

@ -219,7 +219,7 @@ bool Theme::isLightTheme() const
return this->isLight_;
}
void Theme::initialize(Settings &settings, Paths &paths)
void Theme::initialize(Settings &settings, const Paths &paths)
{
this->themeName.connect(
[this](auto themeName) {

View file

@ -43,7 +43,7 @@ public:
static const int AUTO_RELOAD_INTERVAL_MS = 500;
void initialize(Settings &settings, Paths &paths) final;
void initialize(Settings &settings, const Paths &paths) final;
bool isLightTheme() const;

View file

@ -338,7 +338,7 @@ void WindowManager::setEmotePopupPos(QPoint pos)
this->emotePopupPos_ = pos;
}
void WindowManager::initialize(Settings &settings, Paths &paths)
void WindowManager::initialize(Settings &settings, const Paths &paths)
{
(void)paths;
assertInGuiThread();

View file

@ -93,7 +93,7 @@ public:
QPoint emotePopupPos();
void setEmotePopupPos(QPoint pos);
void initialize(Settings &settings, Paths &paths) override;
void initialize(Settings &settings, const Paths &paths) override;
void save() override;
void closeAll();