rename function in settings handler

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 {

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 <b>%0</b> layout have changed. Do you want to apply the changes or discard them?").arg(layoutName);
 

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;

app/settings/exporttemplatedialog/appletsmodel.cpp

@@ -51,7 +51,7 @@ Applets::~Applets()
 {
 }
 
-bool Applets::dataAreChanged() const
+bool Applets::hasChangedData() const
 {
     return c_applets != o_applets;
 }

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;

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();
 }
 
 

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;

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;

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

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;
 

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();
 }

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;
 

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 <b>%0</b> 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;

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

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;
 

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;
 }

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;