refactor: Remove most raw accesses into Application (#5104)

This commit is contained in:
pajlada
2024-01-19 17:59:55 +01:00
committed by GitHub
parent 326a402710
commit 4380ef8c5f
82 changed files with 552 additions and 452 deletions
+14 -14
View File
@@ -61,7 +61,7 @@ Window::Window(WindowType type, QWidget *parent)
#endif
this->bSignals_.emplace_back(
getApp()->accounts->twitch.currentUserChanged.connect([this] {
getIApp()->getAccounts()->twitch.currentUserChanged.connect([this] {
this->onAccountSelected();
}));
this->onAccountSelected();
@@ -75,7 +75,7 @@ Window::Window(WindowType type, QWidget *parent)
this->resize(int(300 * this->scale()), int(500 * this->scale()));
}
this->signalHolder_.managedConnect(getApp()->hotkeys->onItemsUpdated,
this->signalHolder_.managedConnect(getIApp()->getHotkeys()->onItemsUpdated,
[this]() {
this->clearShortcuts();
this->addShortcuts();
@@ -105,7 +105,7 @@ bool Window::event(QEvent *event)
switch (event->type())
{
case QEvent::WindowActivate: {
getApp()->windows->selectedWindow_ = this;
getIApp()->getWindows()->selectedWindow_ = this;
break;
}
@@ -136,15 +136,14 @@ void Window::closeEvent(QCloseEvent *)
{
if (this->type_ == WindowType::Main)
{
auto *app = getApp();
app->windows->save();
app->windows->closeAll();
getIApp()->getWindows()->save();
getIApp()->getWindows()->closeAll();
}
// Ensure selectedWindow_ is never an invalid pointer.
// WindowManager will return the main window if no window is pointed to by
// `selectedWindow_`.
getApp()->windows->selectedWindow_ = nullptr;
getIApp()->getWindows()->selectedWindow_ = nullptr;
this->closed.invoke();
@@ -181,7 +180,7 @@ void Window::addCustomTitlebarButtons()
// settings
this->addTitleBarButton(TitleBarButtonStyle::Settings, [this] {
getApp()->windows->showSettingsDialog(this);
getIApp()->getWindows()->showSettingsDialog(this);
});
// updates
@@ -191,15 +190,16 @@ void Window::addCustomTitlebarButtons()
// account
this->userLabel_ = this->addTitleBarLabel([this] {
getApp()->windows->showAccountSelectPopup(this->userLabel_->mapToGlobal(
this->userLabel_->rect().bottomLeft()));
getIApp()->getWindows()->showAccountSelectPopup(
this->userLabel_->mapToGlobal(
this->userLabel_->rect().bottomLeft()));
});
this->userLabel_->setMinimumWidth(20 * scale());
// streamer mode
this->streamerModeTitlebarIcon_ =
this->addTitleBarButton(TitleBarButtonStyle::StreamerMode, [this] {
getApp()->windows->showSettingsDialog(
getIApp()->getWindows()->showSettingsDialog(
this, SettingsDialogPreference::StreamerMode);
});
this->signalHolder_.managedConnect(getApp()->streamerModeChanged, [this]() {
@@ -489,7 +489,7 @@ void Window::addShortcuts()
{"toggleLocalR9K",
[](std::vector<QString>) -> QString {
getSettings()->hideSimilar.setValue(!getSettings()->hideSimilar);
getApp()->windows->forceLayoutChannelViews();
getIApp()->getWindows()->forceLayoutChannelViews();
return "";
}},
{"openQuickSwitcher",
@@ -690,7 +690,7 @@ void Window::addShortcuts()
this->addDebugStuff(actions);
this->shortcuts_ = getApp()->hotkeys->shortcutsForCategory(
this->shortcuts_ = getIApp()->getHotkeys()->shortcutsForCategory(
HotkeyCategory::Window, actions, this);
}
@@ -725,7 +725,7 @@ void Window::addMenuBar()
void Window::onAccountSelected()
{
auto user = getApp()->accounts->twitch.getCurrent();
auto user = getIApp()->getAccounts()->twitch.getCurrent();
// update title (also append username on Linux and MacOS)
QString windowTitle = Version::instance().fullVersion();