LP-419 config: improve const correcteness of saveState() methods

filnet · filnet · commit ffc48dab65cb · 2017-08-28T21:48:38.000+02:00
diff --git a/ground/gcs/src/plugins/config/configgadget.cpp b/ground/gcs/src/plugins/config/configgadget.cpp
@@ -45,7 +45,7 @@ void ConfigGadget::loadConfiguration(IUAVGadgetConfiguration *config)
     Q_UNUSED(config);
 }
 
-void ConfigGadget::saveState(QSettings &settings)
+void ConfigGadget::saveState(QSettings &settings) const
 {
     m_widget->saveState(settings);
 }
diff --git a/ground/gcs/src/plugins/config/configgadget.h b/ground/gcs/src/plugins/config/configgadget.h
@@ -49,7 +49,7 @@ class ConfigGadget : public Core::IUAVGadget {
 
     void loadConfiguration(IUAVGadgetConfiguration *config);
 
-    void saveState(QSettings &settings);
+    void saveState(QSettings &settings) const;
     void restoreState(QSettings &settings);
 
 private:
diff --git a/ground/gcs/src/plugins/config/configgadgetwidget.cpp b/ground/gcs/src/plugins/config/configgadgetwidget.cpp
@@ -173,7 +173,7 @@ void ConfigGadgetWidget::startInputWizard()
     inputWidget->startInputWizard();
 }
 
-void ConfigGadgetWidget::saveState(QSettings &settings)
+void ConfigGadgetWidget::saveState(QSettings &settings) const
 {
     settings.setValue("currentIndex", stackWidget->currentIndex());
 }
diff --git a/ground/gcs/src/plugins/config/configgadgetwidget.h b/ground/gcs/src/plugins/config/configgadgetwidget.h
@@ -45,7 +45,7 @@ class ConfigGadgetWidget : public QWidget {
 
     void startInputWizard();
 
-    void saveState(QSettings &settings);
+    void saveState(QSettings &settings) const;
     void restoreState(QSettings &settings);
 
 protected:
diff --git a/ground/gcs/src/plugins/coreplugin/uavgadgetmanager/uavgadgetview.cpp b/ground/gcs/src/plugins/coreplugin/uavgadgetmanager/uavgadgetview.cpp
@@ -261,7 +261,7 @@ void UAVGadgetView::currentGadgetChanged(IUAVGadget *gadget)
     m_activeLabel->setVisible(m_uavGadget == gadget);
 }
 
-void UAVGadgetView::saveState(QSettings &settings)
+void UAVGadgetView::saveState(QSettings &settings) const
 {
     settings.setValue("type", "uavGadget");
     settings.setValue("classId", gadget()->classId());
diff --git a/ground/gcs/src/plugins/coreplugin/uavgadgetmanager/uavgadgetview.h b/ground/gcs/src/plugins/coreplugin/uavgadgetmanager/uavgadgetview.h
@@ -65,7 +65,7 @@ class UAVGadgetView : public QWidget {
 
     void showToolbar(bool show);
 
-    void saveState(QSettings &settings);
+    void saveState(QSettings &settings) const;
     void restoreState(QSettings &settings);
 
 public slots:
diff --git a/ground/gcs/src/plugins/pfdqml/pfdqmlcontext.cpp b/ground/gcs/src/plugins/pfdqml/pfdqmlcontext.cpp
@@ -310,7 +310,7 @@ void PfdQmlContext::loadConfiguration(PfdQmlGadgetConfiguration *config)
 }
 
 
-void PfdQmlContext::saveState(QSettings &settings)
+void PfdQmlContext::saveState(QSettings &settings) const
 {
     settings.setValue("modelFile", modelFile());
 }
diff --git a/ground/gcs/src/plugins/pfdqml/pfdqmlcontext.h b/ground/gcs/src/plugins/pfdqml/pfdqmlcontext.h
@@ -105,7 +105,7 @@ class PfdQmlContext : public QObject {
     Q_INVOKABLE void resetConsumedEnergy();
 
     void loadConfiguration(PfdQmlGadgetConfiguration *config);
-    void saveState(QSettings &);
+    void saveState(QSettings &) const;
     void restoreState(QSettings &);
 
     void apply(QQmlContext *context);
diff --git a/ground/gcs/src/plugins/pfdqml/pfdqmlgadget.cpp b/ground/gcs/src/plugins/pfdqml/pfdqmlgadget.cpp
@@ -52,7 +52,7 @@ void PfdQmlGadget::loadConfiguration(IUAVGadgetConfiguration *config)
     m_qmlGadgetWidget->loadConfiguration(m);
 }
 
-void PfdQmlGadget::saveState(QSettings &settings)
+void PfdQmlGadget::saveState(QSettings &settings) const
 {
     m_qmlGadgetWidget->saveState(settings);
 }
diff --git a/ground/gcs/src/plugins/pfdqml/pfdqmlgadget.h b/ground/gcs/src/plugins/pfdqml/pfdqmlgadget.h
@@ -46,7 +46,7 @@ class PfdQmlGadget : public Core::IUAVGadget {
     QWidget *widget();
 
     void loadConfiguration(IUAVGadgetConfiguration *config);
-    void saveState(QSettings &);
+    void saveState(QSettings &) const;
     void restoreState(QSettings &);
 
 private:
diff --git a/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp b/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp
@@ -93,7 +93,7 @@ void PfdQmlGadgetWidget::loadConfiguration(PfdQmlGadgetConfiguration *config)
     setQmlFile(config->qmlFile());
 }
 
-void PfdQmlGadgetWidget::saveState(QSettings &settings)
+void PfdQmlGadgetWidget::saveState(QSettings &settings) const
 {
     m_pfdQmlContext->saveState(settings);
 }
diff --git a/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.h b/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.h
@@ -46,7 +46,7 @@ class PfdQmlGadgetWidget : public QWidget {
     virtual ~PfdQmlGadgetWidget();
 
     void loadConfiguration(PfdQmlGadgetConfiguration *config);
-    void saveState(QSettings &);
+    void saveState(QSettings &) const;
     void restoreState(QSettings &);
 
 private:
diff --git a/ground/gcs/src/plugins/scope/scopegadget.cpp b/ground/gcs/src/plugins/scope/scopegadget.cpp
@@ -99,7 +99,7 @@ ScopeGadget::~ScopeGadget()
     delete m_widget;
 }
 
-void ScopeGadget::saveState(QSettings &settings)
+void ScopeGadget::saveState(QSettings &settings) const
 {
     m_widget->saveState(settings);
 }
diff --git a/ground/gcs/src/plugins/scope/scopegadget.h b/ground/gcs/src/plugins/scope/scopegadget.h
@@ -63,7 +63,7 @@ class ScopeGadget : public Core::IUAVGadget {
         return QString();
     }
 
-    void saveState(QSettings &settings);
+    void saveState(QSettings &settings) const;
     void restoreState(QSettings &settings);
 
 private:
diff --git a/ground/gcs/src/plugins/scope/scopegadgetwidget.cpp b/ground/gcs/src/plugins/scope/scopegadgetwidget.cpp
@@ -457,7 +457,7 @@ void ScopeGadgetWidget::clearCurvePlots()
     m_curvesData.clear();
 }
 
-void ScopeGadgetWidget::saveState(QSettings &settings)
+void ScopeGadgetWidget::saveState(QSettings &settings) const
 {
     // plot state
     int i = 1;
diff --git a/ground/gcs/src/plugins/scope/scopegadgetwidget.h b/ground/gcs/src/plugins/scope/scopegadgetwidget.h
@@ -100,7 +100,7 @@ class ScopeGadgetWidget : public QwtPlot {
                       QString mathFunction = "None", QPen pen = QPen(Qt::black), bool antialiased = true);
     void clearCurvePlots();
 
-    void saveState(QSettings &settings);
+    void saveState(QSettings &settings) const;
     void restoreState(QSettings &settings);
 
     int csvLoggingStart();

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ void ConfigGadget::loadConfiguration(IUAVGadgetConfiguration *config)`
`45`	`45`	`Q_UNUSED(config);`
`46`	`46`	`}`
`47`	`47`
`48`		`-void ConfigGadget::saveState(QSettings &settings)`
	`48`	`+void ConfigGadget::saveState(QSettings &settings) const`
`49`	`49`	`{`
`50`	`50`	`m_widget->saveState(settings);`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ void ConfigGadgetWidget::startInputWizard()`
`173`	`173`	`inputWidget->startInputWizard();`
`174`	`174`	`}`
`175`	`175`
`176`		`-void ConfigGadgetWidget::saveState(QSettings &settings)`
	`176`	`+void ConfigGadgetWidget::saveState(QSettings &settings) const`
`177`	`177`	`{`
`178`	`178`	`settings.setValue("currentIndex", stackWidget->currentIndex());`
`179`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ void UAVGadgetView::currentGadgetChanged(IUAVGadget *gadget)`
`261`	`261`	`m_activeLabel->setVisible(m_uavGadget == gadget);`
`262`	`262`	`}`
`263`	`263`
`264`		`-void UAVGadgetView::saveState(QSettings &settings)`
	`264`	`+void UAVGadgetView::saveState(QSettings &settings) const`
`265`	`265`	`{`
`266`	`266`	`settings.setValue("type", "uavGadget");`
`267`	`267`	`settings.setValue("classId", gadget()->classId());`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ void PfdQmlContext::loadConfiguration(PfdQmlGadgetConfiguration *config)`
`310`	`310`	`}`
`311`	`311`
`312`	`312`
`313`		`-void PfdQmlContext::saveState(QSettings &settings)`
	`313`	`+void PfdQmlContext::saveState(QSettings &settings) const`
`314`	`314`	`{`
`315`	`315`	`settings.setValue("modelFile", modelFile());`
`316`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ void PfdQmlGadget::loadConfiguration(IUAVGadgetConfiguration *config)`
`52`	`52`	`m_qmlGadgetWidget->loadConfiguration(m);`
`53`	`53`	`}`
`54`	`54`
`55`		`-void PfdQmlGadget::saveState(QSettings &settings)`
	`55`	`+void PfdQmlGadget::saveState(QSettings &settings) const`
`56`	`56`	`{`
`57`	`57`	`m_qmlGadgetWidget->saveState(settings);`
`58`	`58`	`}`