From c57a69ae050d8cf692bd01b534e24c6f74d457d5 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Wed, 10 Feb 2021 19:10:24 +0200 Subject: [PATCH] rename function in settings handler --- app/settings/detailsdialog/detailsdialog.cpp | 2 +- app/settings/detailsdialog/detailshandler.cpp | 6 +++--- app/settings/detailsdialog/detailshandler.h | 2 +- app/settings/exporttemplatedialog/appletsmodel.cpp | 2 +- app/settings/exporttemplatedialog/appletsmodel.h | 2 +- .../exporttemplatedialog/exporttemplatehandler.cpp | 6 +++--- .../exporttemplatedialog/exporttemplatehandler.h | 2 +- app/settings/generic/generichandler.h | 2 +- app/settings/settingsdialog/layoutscontroller.cpp | 4 ++-- app/settings/settingsdialog/layoutscontroller.h | 2 +- app/settings/settingsdialog/layoutsmodel.cpp | 2 +- app/settings/settingsdialog/layoutsmodel.h | 2 +- app/settings/settingsdialog/settingsdialog.cpp | 12 ++++++------ app/settings/settingsdialog/tablayoutshandler.cpp | 4 ++-- app/settings/settingsdialog/tablayoutshandler.h | 2 +- .../settingsdialog/tabpreferenceshandler.cpp | 2 +- app/settings/settingsdialog/tabpreferenceshandler.h | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/app/settings/detailsdialog/detailsdialog.cpp b/app/settings/detailsdialog/detailsdialog.cpp index ab6bbf566..bdceddc95 100644 --- a/app/settings/detailsdialog/detailsdialog.cpp +++ b/app/settings/detailsdialog/detailsdialog.cpp @@ -76,7 +76,7 @@ Latte::Corona *DetailsDialog::corona() const void DetailsDialog::updateApplyButtonsState() { - if (m_handler->dataAreChanged()) { + if (m_handler->hasChangedData()) { m_ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true); m_ui->buttonBox->button(QDialogButtonBox::Reset)->setEnabled(true); } else { diff --git a/app/settings/detailsdialog/detailshandler.cpp b/app/settings/detailsdialog/detailshandler.cpp index 7d1b109a4..5d847fd71 100644 --- a/app/settings/detailsdialog/detailshandler.cpp +++ b/app/settings/detailsdialog/detailshandler.cpp @@ -200,7 +200,7 @@ Latte::Data::Layout DetailsHandler::currentData() const return c_data; } -bool DetailsHandler::dataAreChanged() const +bool DetailsHandler::hasChangedData() const { return o_data != c_data; } @@ -249,7 +249,7 @@ void DetailsHandler::onCurrentLayoutIndexChanged(int row) { bool switchtonewlayout{true}; - if (dataAreChanged()) { + if (hasChangedData()) { int result = saveChanges(); if (result == QMessageBox::Apply) { @@ -395,7 +395,7 @@ void DetailsHandler::updateWindowTitle() int DetailsHandler::saveChanges() { - if (dataAreChanged()) { + if (hasChangedData()) { QString layoutName = c_data.name; QString saveChangesText = i18n("The settings of %0 layout have changed. Do you want to apply the changes or discard them?").arg(layoutName); diff --git a/app/settings/detailsdialog/detailshandler.h b/app/settings/detailsdialog/detailshandler.h index 7b3044b72..5e58e0349 100644 --- a/app/settings/detailsdialog/detailshandler.h +++ b/app/settings/detailsdialog/detailshandler.h @@ -66,7 +66,7 @@ public: DetailsHandler(Dialog::DetailsDialog *parentDialog); ~DetailsHandler(); - bool dataAreChanged() const override; + bool hasChangedData() const override; bool inDefaultValues() const override; void reset() override; diff --git a/app/settings/exporttemplatedialog/appletsmodel.cpp b/app/settings/exporttemplatedialog/appletsmodel.cpp index 831dac00f..dc98bddff 100644 --- a/app/settings/exporttemplatedialog/appletsmodel.cpp +++ b/app/settings/exporttemplatedialog/appletsmodel.cpp @@ -51,7 +51,7 @@ Applets::~Applets() { } -bool Applets::dataAreChanged() const +bool Applets::hasChangedData() const { return c_applets != o_applets; } diff --git a/app/settings/exporttemplatedialog/appletsmodel.h b/app/settings/exporttemplatedialog/appletsmodel.h index 7e0b3f3c0..386f15f68 100644 --- a/app/settings/exporttemplatedialog/appletsmodel.h +++ b/app/settings/exporttemplatedialog/appletsmodel.h @@ -56,7 +56,7 @@ public: explicit Applets(QObject *parent); ~Applets(); - bool dataAreChanged() const; + bool hasChangedData() const; int rowCount() const; int rowCount(const QModelIndex &parent) const override; diff --git a/app/settings/exporttemplatedialog/exporttemplatehandler.cpp b/app/settings/exporttemplatedialog/exporttemplatehandler.cpp index 05cd1d259..eff5a0e28 100644 --- a/app/settings/exporttemplatedialog/exporttemplatehandler.cpp +++ b/app/settings/exporttemplatedialog/exporttemplatehandler.cpp @@ -121,14 +121,14 @@ void ExportTemplateHandler::onDeselectAll() m_appletsModel->deselectAll(); } -bool ExportTemplateHandler::dataAreChanged() const +bool ExportTemplateHandler::hasChangedData() const { - return m_appletsModel->dataAreChanged(); + return m_appletsModel->hasChangedData(); } bool ExportTemplateHandler::inDefaultValues() const { - return !dataAreChanged(); + return !hasChangedData(); } diff --git a/app/settings/exporttemplatedialog/exporttemplatehandler.h b/app/settings/exporttemplatedialog/exporttemplatehandler.h index 5b7ad2f48..e238fe629 100644 --- a/app/settings/exporttemplatedialog/exporttemplatehandler.h +++ b/app/settings/exporttemplatedialog/exporttemplatehandler.h @@ -68,7 +68,7 @@ public: ExportTemplateHandler(Dialog::ExportTemplateDialog *parentDialog, Latte::View *view); ~ExportTemplateHandler(); - bool dataAreChanged() const override; + bool hasChangedData() const override; bool inDefaultValues() const override; void reset() override; diff --git a/app/settings/generic/generichandler.h b/app/settings/generic/generichandler.h index 539298adc..4574423b0 100644 --- a/app/settings/generic/generichandler.h +++ b/app/settings/generic/generichandler.h @@ -57,7 +57,7 @@ public: Generic(Dialog::GenericDialog *parent); Generic(Dialog::GenericDialog *parentDialog, QObject *parent); - virtual bool dataAreChanged() const = 0; + virtual bool hasChangedData() const = 0; virtual bool inDefaultValues() const = 0; virtual void reset() = 0; diff --git a/app/settings/settingsdialog/layoutscontroller.cpp b/app/settings/settingsdialog/layoutscontroller.cpp index cc175b41d..29cba37e3 100644 --- a/app/settings/settingsdialog/layoutscontroller.cpp +++ b/app/settings/settingsdialog/layoutscontroller.cpp @@ -154,9 +154,9 @@ void Layouts::initView() connect(m_view, &QObject::destroyed, this, &Controller::Layouts::storeColumnWidths); } -bool Layouts::dataAreChanged() const +bool Layouts::hasChangedData() const { - return m_model->dataAreChanged(); + return m_model->hasChangedData(); } bool Layouts::layoutsAreChanged() const diff --git a/app/settings/settingsdialog/layoutscontroller.h b/app/settings/settingsdialog/layoutscontroller.h index 0ec1a121e..3898784a0 100644 --- a/app/settings/settingsdialog/layoutscontroller.h +++ b/app/settings/settingsdialog/layoutscontroller.h @@ -64,7 +64,7 @@ public: QAbstractItemModel *baseModel() const; QTableView *view() const; - bool dataAreChanged() const; + bool hasChangedData() const; bool layoutsAreChanged() const; bool modeIsChanged() const; diff --git a/app/settings/settingsdialog/layoutsmodel.cpp b/app/settings/settingsdialog/layoutsmodel.cpp index e15b57ce7..48f0a7bfd 100644 --- a/app/settings/settingsdialog/layoutsmodel.cpp +++ b/app/settings/settingsdialog/layoutsmodel.cpp @@ -71,7 +71,7 @@ bool Layouts::containsCurrentName(const QString &name) const return m_layoutsTable.containsName(name); } -bool Layouts::dataAreChanged() const +bool Layouts::hasChangedData() const { return modeIsChanged() || layoutsAreChanged(); } diff --git a/app/settings/settingsdialog/layoutsmodel.h b/app/settings/settingsdialog/layoutsmodel.h index 5decc9f5f..e6aaf41d9 100644 --- a/app/settings/settingsdialog/layoutsmodel.h +++ b/app/settings/settingsdialog/layoutsmodel.h @@ -86,7 +86,7 @@ public: bool containsCurrentName(const QString &name) const; - bool dataAreChanged() const; + bool hasChangedData() const; bool layoutsAreChanged() const; bool modeIsChanged() const; diff --git a/app/settings/settingsdialog/settingsdialog.cpp b/app/settings/settingsdialog/settingsdialog.cpp index 5925d696e..fca101256 100644 --- a/app/settings/settingsdialog/settingsdialog.cpp +++ b/app/settings/settingsdialog/settingsdialog.cpp @@ -441,8 +441,8 @@ void SettingsDialog::updateApplyButtonsState() //! Ok, Apply Buttons - if ((currentPage() == LayoutPage && m_tabLayoutsHandler->dataAreChanged()) - ||(currentPage() == PreferencesPage && m_tabPreferencesHandler->dataAreChanged())) { + if ((currentPage() == LayoutPage && m_tabLayoutsHandler->hasChangedData()) + ||(currentPage() == PreferencesPage && m_tabPreferencesHandler->hasChangedData())) { changed = true; } @@ -471,8 +471,8 @@ void SettingsDialog::updateApplyButtonsState() bool SettingsDialog::saveChanges() { - if ((m_acceptedPage == LayoutPage && m_tabLayoutsHandler->dataAreChanged()) - || (m_acceptedPage == PreferencesPage && m_tabPreferencesHandler->dataAreChanged())) { + if ((m_acceptedPage == LayoutPage && m_tabLayoutsHandler->hasChangedData()) + || (m_acceptedPage == PreferencesPage && m_tabPreferencesHandler->hasChangedData())) { QString tabName = m_ui->tabWidget->tabBar()->tabText(m_acceptedPage).remove("&"); QString saveChangesText = i18n("The settings of %0 tab have changed. Do you want to apply the changes or discard them?").arg(tabName); @@ -495,8 +495,8 @@ void SettingsDialog::onCurrentTabChanged(int index) { //! Before switching into a new tab the user must confirm first if the data should be saved or not - if ((m_acceptedPage == LayoutPage && m_tabLayoutsHandler->dataAreChanged()) - || (m_acceptedPage == PreferencesPage && m_tabPreferencesHandler->dataAreChanged())) { + if ((m_acceptedPage == LayoutPage && m_tabLayoutsHandler->hasChangedData()) + || (m_acceptedPage == PreferencesPage && m_tabPreferencesHandler->hasChangedData())) { if (index != m_acceptedPage) { m_nextPage = index; diff --git a/app/settings/settingsdialog/tablayoutshandler.cpp b/app/settings/settingsdialog/tablayoutshandler.cpp index accb0be12..79b639fc9 100644 --- a/app/settings/settingsdialog/tablayoutshandler.cpp +++ b/app/settings/settingsdialog/tablayoutshandler.cpp @@ -270,9 +270,9 @@ Ui::SettingsDialog *TabLayouts::ui() const return m_ui; } -bool TabLayouts::dataAreChanged() const +bool TabLayouts::hasChangedData() const { - return m_layoutsController->dataAreChanged(); + return m_layoutsController->hasChangedData(); } bool TabLayouts::inDefaultValues() const diff --git a/app/settings/settingsdialog/tablayoutshandler.h b/app/settings/settingsdialog/tablayoutshandler.h index 352bb8120..0e2fbacdd 100644 --- a/app/settings/settingsdialog/tablayoutshandler.h +++ b/app/settings/settingsdialog/tablayoutshandler.h @@ -65,7 +65,7 @@ public: TabLayouts(Dialog::SettingsDialog *parent); ~TabLayouts(); - bool dataAreChanged() const override; + bool hasChangedData() const override; bool inDefaultValues() const override; bool isCurrentTab() const; diff --git a/app/settings/settingsdialog/tabpreferenceshandler.cpp b/app/settings/settingsdialog/tabpreferenceshandler.cpp index 074734d2c..bb14d3150 100644 --- a/app/settings/settingsdialog/tabpreferenceshandler.cpp +++ b/app/settings/settingsdialog/tabpreferenceshandler.cpp @@ -149,7 +149,7 @@ void TabPreferences::updateUi() emit dataChanged(); } -bool TabPreferences::dataAreChanged() const +bool TabPreferences::hasChangedData() const { return o_preferences != m_preferences; } diff --git a/app/settings/settingsdialog/tabpreferenceshandler.h b/app/settings/settingsdialog/tabpreferenceshandler.h index b6adf21e1..eb7ecdaf8 100644 --- a/app/settings/settingsdialog/tabpreferenceshandler.h +++ b/app/settings/settingsdialog/tabpreferenceshandler.h @@ -58,7 +58,7 @@ class TabPreferences : public Generic public: TabPreferences(Latte::Settings::Dialog::SettingsDialog *parent); - bool dataAreChanged() const override; + bool hasChangedData() const override; bool inDefaultValues() const override; void reset() override;