diff --git a/src/lib/gui/config/Screen.cpp b/src/lib/gui/config/Screen.cpp index ae09db66c..6a9835259 100644 --- a/src/lib/gui/config/Screen.cpp +++ b/src/lib/gui/config/Screen.cpp @@ -15,20 +15,9 @@ using enum ScreenConfig::Fix; Screen::Screen(const QString &name) { - init(); setName(name); } -void Screen::init() -{ - m_Name.clear(); - m_Aliases.clear(); - m_SwitchCornerSize = 0; - m_Modifiers.fill(0, static_cast(NumModifiers)); - m_SwitchCorners.fill(false, static_cast(NumSwitchCorners)); - m_Fixes.fill(false, static_cast(NumFixes)); -} - void Screen::loadSettings(QSettingsProxy &settings) { setName(settings.value("name").toString()); diff --git a/src/lib/gui/config/Screen.h b/src/lib/gui/config/Screen.h index 438e22d7d..154506133 100644 --- a/src/lib/gui/config/Screen.h +++ b/src/lib/gui/config/Screen.h @@ -115,8 +115,6 @@ public: bool operator==(const Screen &screen) const; protected: - void init(); - QStringList &aliases() { return m_Aliases; @@ -160,12 +158,12 @@ protected: private: QPixmap m_Pixmap = QIcon::fromTheme("video-display").pixmap(QSize(96, 96)); - QString m_Name; - QStringList m_Aliases; - QList m_Modifiers; - QList m_SwitchCorners; + QString m_Name = {}; + QStringList m_Aliases = {}; + QList m_Modifiers = {0, 1, 2, 3, 4, 5}; + QList m_SwitchCorners = {false, false, false, false}; int m_SwitchCornerSize = 0; - QList m_Fixes; + QList m_Fixes{false, false, false, false}; bool m_Swapped = false; bool m_isServer = false; }; diff --git a/src/lib/gui/dialogs/ScreenSettingsDialog.cpp b/src/lib/gui/dialogs/ScreenSettingsDialog.cpp index a1a6c3c82..ffa755a6e 100644 --- a/src/lib/gui/dialogs/ScreenSettingsDialog.cpp +++ b/src/lib/gui/dialogs/ScreenSettingsDialog.cpp @@ -79,8 +79,6 @@ void ScreenSettingsDialog::accept() return; } - m_pScreen->init(); - m_pScreen->setName(ui_->m_pLineEditName->text()); for (int i = 0; i < ui_->m_pListAliases->count(); i++) {