chatterino2
Code Issues

chore: remove Singleton & replace getIApp with getApp (#5514)

Browse Source
This commit is contained in:
pajlada
2024-07-21 15:09:59 +02:00
committed by GitHub
parent 21186df058
commit 5deec1f02f
145 changed files with 802 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/Window.cpp
+25 -26
View File
@@ -64,7 +64,7 @@ Window::Window(WindowType type, QWidget *parent)
#endif
this->bSignals_.emplace_back(
getIApp()->getAccounts()->twitch.currentUserChanged.connect([this] {
getApp()->getAccounts()->twitch.currentUserChanged.connect([this] {
this->onAccountSelected();
}));
this->onAccountSelected();
@@ -78,7 +78,7 @@ Window::Window(WindowType type, QWidget *parent)
this->resize(int(300 * this->scale()), int(500 * this->scale()));
}
this->signalHolder_.managedConnect(getIApp()->getHotkeys()->onItemsUpdated,
this->signalHolder_.managedConnect(getApp()->getHotkeys()->onItemsUpdated,
[this]() {
this->clearShortcuts();
this->addShortcuts();
@@ -108,7 +108,7 @@ bool Window::event(QEvent *event)
switch (event->type())
{
case QEvent::WindowActivate: {
getIApp()->getWindows()->selectedWindow_ = this;
getApp()->getWindows()->selectedWindow_ = this;
break;
}
@@ -145,14 +145,14 @@ void Window::closeEvent(QCloseEvent *)
{
if (this->type_ == WindowType::Main)
{
getIApp()->getWindows()->save();
getIApp()->getWindows()->closeAll();
getApp()->getWindows()->save();
getApp()->getWindows()->closeAll();
}
// Ensure selectedWindow_ is never an invalid pointer.
// WindowManager will return the main window if no window is pointed to by
// `selectedWindow_`.
getIApp()->getWindows()->selectedWindow_ = nullptr;
getApp()->getWindows()->selectedWindow_ = nullptr;
this->closed.invoke();
@@ -189,7 +189,7 @@ void Window::addCustomTitlebarButtons()
// settings
this->addTitleBarButton(TitleBarButtonStyle::Settings, [this] {
getIApp()->getWindows()->showSettingsDialog(this);
getApp()->getWindows()->showSettingsDialog(this);
});
// updates
@@ -199,7 +199,7 @@ void Window::addCustomTitlebarButtons()
// account
this->userLabel_ = this->addTitleBarLabel([this] {
getIApp()->getWindows()->showAccountSelectPopup(
getApp()->getWindows()->showAccountSelectPopup(
this->userLabel_->mapToGlobal(
this->userLabel_->rect().bottomLeft()));
});
@@ -208,11 +208,11 @@ void Window::addCustomTitlebarButtons()
// streamer mode
this->streamerModeTitlebarIcon_ =
this->addTitleBarButton(TitleBarButtonStyle::StreamerMode, [this] {
getIApp()->getWindows()->showSettingsDialog(
getApp()->getWindows()->showSettingsDialog(
this, SettingsDialogPreference::StreamerMode);
});
QObject::connect(getIApp()->getStreamerMode(), &IStreamerMode::changed,
this, &Window::updateStreamerModeIcon);
QObject::connect(getApp()->getStreamerMode(), &IStreamerMode::changed, this,
&Window::updateStreamerModeIcon);
// Update initial state
this->updateStreamerModeIcon();
@@ -240,7 +240,7 @@ void Window::updateStreamerModeIcon()
getResources().buttons.streamerModeEnabledDark);
}
this->streamerModeTitlebarIcon_->setVisible(
getIApp()->getStreamerMode()->isEnabled());
getApp()->getStreamerMode()->isEnabled());
#else
// clang-format off
assert(false && "Streamer mode TitleBar icon should not exist on non-Windows OSes");
@@ -261,7 +261,7 @@ void Window::addDebugStuff(HotkeyController::HotkeyMap &actions)
const auto &messages = getSampleMiscMessages();
static int index = 0;
const auto &msg = messages[index++ % messages.size()];
getIApp()->getTwitchAbstract()->addFakeMessage(msg);
getApp()->getTwitchAbstract()->addFakeMessage(msg);
return "";
});
@@ -269,7 +269,7 @@ void Window::addDebugStuff(HotkeyController::HotkeyMap &actions)
const auto &messages = getSampleCheerMessages();
static int index = 0;
const auto &msg = messages[index++ % messages.size()];
getIApp()->getTwitchAbstract()->addFakeMessage(msg);
getApp()->getTwitchAbstract()->addFakeMessage(msg);
return "";
});
@@ -277,13 +277,12 @@ void Window::addDebugStuff(HotkeyController::HotkeyMap &actions)
const auto &messages = getSampleLinkMessages();
static int index = 0;
const auto &msg = messages[index++ % messages.size()];
getIApp()->getTwitchAbstract()->addFakeMessage(msg);
getApp()->getTwitchAbstract()->addFakeMessage(msg);
return "";
});
actions.emplace("addRewardMessage", [=](std::vector<QString>) -> QString {
rapidjson::Document doc;
auto app = getApp();
static bool alt = true;
if (alt)
{
@@ -293,9 +292,9 @@ void Window::addDebugStuff(HotkeyController::HotkeyMap &actions)
oMessage->toInner<PubSubMessageMessage>()
->toInner<PubSubCommunityPointsChannelV1Message>();
getIApp()->getTwitchAbstract()->addFakeMessage(
getApp()->getTwitchAbstract()->addFakeMessage(
getSampleChannelRewardIRCMessage());
getIApp()->getTwitchPubSub()->pointReward.redeemed.invoke(
getApp()->getTwitchPubSub()->pointReward.redeemed.invoke(
oInnerMessage->data.value("redemption").toObject());
alt = !alt;
}
@@ -306,7 +305,7 @@ void Window::addDebugStuff(HotkeyController::HotkeyMap &actions)
auto oInnerMessage =
oMessage->toInner<PubSubMessageMessage>()
->toInner<PubSubCommunityPointsChannelV1Message>();
getIApp()->getTwitchPubSub()->pointReward.redeemed.invoke(
getApp()->getTwitchPubSub()->pointReward.redeemed.invoke(
oInnerMessage->data.value("redemption").toObject());
alt = !alt;
}
@@ -317,7 +316,7 @@ void Window::addDebugStuff(HotkeyController::HotkeyMap &actions)
const auto &messages = getSampleEmoteTestMessages();
static int index = 0;
const auto &msg = messages[index++ % messages.size()];
getIApp()->getTwitchAbstract()->addFakeMessage(msg);
getApp()->getTwitchAbstract()->addFakeMessage(msg);
return "";
});
@@ -325,7 +324,7 @@ void Window::addDebugStuff(HotkeyController::HotkeyMap &actions)
const auto &messages = getSampleSubMessages();
static int index = 0;
const auto &msg = messages[index++ % messages.size()];
getIApp()->getTwitchAbstract()->addFakeMessage(msg);
getApp()->getTwitchAbstract()->addFakeMessage(msg);
return "";
});
#endif
@@ -488,7 +487,7 @@ void Window::addShortcuts()
splitContainer = this->notebook_->getOrAddSelectedPage();
}
Split *split = new Split(splitContainer);
split->setChannel(getIApp()->getTwitchAbstract()->getOrAddChannel(
split->setChannel(getApp()->getTwitchAbstract()->getOrAddChannel(
si.channelName));
split->setFilters(si.filters);
splitContainer->insertSplit(split);
@@ -499,7 +498,7 @@ void Window::addShortcuts()
{"toggleLocalR9K",
[](std::vector<QString>) -> QString {
getSettings()->hideSimilar.setValue(!getSettings()->hideSimilar);
getIApp()->getWindows()->forceLayoutChannelViews();
getApp()->getWindows()->forceLayoutChannelViews();
return "";
}},
{"openQuickSwitcher",
@@ -619,7 +618,7 @@ void Window::addShortcuts()
}
else if (mode == 2)
{
if (getIApp()->getStreamerMode()->isEnabled())
if (getApp()->getStreamerMode()->isEnabled())
{
getSettings()->enableStreamerMode.setValue(
StreamerModeSetting::Disabled);
@@ -685,7 +684,7 @@ void Window::addShortcuts()
this->addDebugStuff(actions);
this->shortcuts_ = getIApp()->getHotkeys()->shortcutsForCategory(
this->shortcuts_ = getApp()->getHotkeys()->shortcutsForCategory(
HotkeyCategory::Window, actions, this);
}
@@ -756,7 +755,7 @@ void Window::addMenuBar()
void Window::onAccountSelected()
{
auto user = getIApp()->getAccounts()->twitch.getCurrent();
auto user = getApp()->getAccounts()->twitch.getCurrent();
// update title (also append username on Linux and MacOS)
QString windowTitle = Version::instance().fullVersion();