From d83b597c75efb68aa7864219550b101bb737e074 Mon Sep 17 00:00:00 2001 From: fourtf Date: Fri, 28 Feb 2020 19:12:22 +0100 Subject: [PATCH] removed unused function in SettingsDialog --- src/widgets/dialogs/SettingsDialog.cpp | 7 ------- src/widgets/dialogs/SettingsDialog.hpp | 5 +---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/widgets/dialogs/SettingsDialog.cpp b/src/widgets/dialogs/SettingsDialog.cpp index a9ca54324..7effdb892 100644 --- a/src/widgets/dialogs/SettingsDialog.cpp +++ b/src/widgets/dialogs/SettingsDialog.cpp @@ -20,8 +20,6 @@ namespace chatterino { -SettingsDialog *SettingsDialog::instance_ = nullptr; - SettingsDialog::SettingsDialog() : BaseWindow(BaseWindow::DisableCustomScaling) { @@ -138,11 +136,6 @@ void SettingsDialog::filterElements(const QString &text) } } -SettingsDialog *SettingsDialog::instance() -{ - return SettingsDialog::instance_; -} - void SettingsDialog::addTabs() { this->ui_.tabContainer->setMargin(0); diff --git a/src/widgets/dialogs/SettingsDialog.hpp b/src/widgets/dialogs/SettingsDialog.hpp index 5dbef8b60..0d08f7c9f 100644 --- a/src/widgets/dialogs/SettingsDialog.hpp +++ b/src/widgets/dialogs/SettingsDialog.hpp @@ -34,7 +34,6 @@ class SettingsDialog : public BaseWindow public: SettingsDialog(); - static SettingsDialog *instance(); // may be NULL static void showDialog(SettingsDialogPreference preferredTab = SettingsDialogPreference::NoPreference); @@ -44,18 +43,16 @@ protected: virtual void showEvent(QShowEvent *) override; private: - static SettingsDialog *instance_; - void refresh(); void initUi(); + SettingsDialogTab *tab(SettingsTabId id); void addTabs(); void addTab(std::function page, const QString &name, const QString &iconPath, SettingsTabId id = {}, Qt::Alignment alignment = Qt::AlignTop); void selectTab(SettingsDialogTab *tab, const bool byUser = true); void selectTab(SettingsTabId id); - SettingsDialogTab *tab(SettingsTabId id); void filterElements(const QString &query); void onOkClicked();