diff --git a/ground/gcs/src/plugins/config/configgadget.cpp b/ground/gcs/src/plugins/config/configgadget.cpp
index 8d67af9ce..60121bc2a 100644
--- 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
index a6e8d0ce1..5d8aa59b0 100644
--- a/ground/gcs/src/plugins/config/configgadget.h
+++ b/ground/gcs/src/plugins/config/configgadget.h
@@ -49,7 +49,7 @@ public:
 
     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
index e4a8e9da4..b8155f086 100644
--- 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
index 378b3a6f5..d31873e95 100644
--- a/ground/gcs/src/plugins/config/configgadgetwidget.h
+++ b/ground/gcs/src/plugins/config/configgadgetwidget.h
@@ -45,7 +45,7 @@ public:
 
     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
index c506ebbe4..ffad1e2a9 100644
--- 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
index fb80f605f..a9cc575ed 100644
--- a/ground/gcs/src/plugins/coreplugin/uavgadgetmanager/uavgadgetview.h
+++ b/ground/gcs/src/plugins/coreplugin/uavgadgetmanager/uavgadgetview.h
@@ -65,7 +65,7 @@ public:
 
     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
index 0e7a4b9fb..45a606251 100644
--- 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
index 96afaf98d..dd1cc1e2f 100644
--- a/ground/gcs/src/plugins/pfdqml/pfdqmlcontext.h
+++ b/ground/gcs/src/plugins/pfdqml/pfdqmlcontext.h
@@ -105,7 +105,7 @@ public:
     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
index 872b8bf05..cde4e4e4e 100644
--- 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
index 6b41f0510..6841ae9b5 100644
--- a/ground/gcs/src/plugins/pfdqml/pfdqmlgadget.h
+++ b/ground/gcs/src/plugins/pfdqml/pfdqmlgadget.h
@@ -46,7 +46,7 @@ public:
     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
index 11c75313c..54dac7f81 100644
--- 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
index 5feae2f93..a6d1d8bae 100644
--- a/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.h
+++ b/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.h
@@ -46,7 +46,7 @@ public:
     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
index 8f5c4a546..b3c8ac60a 100644
--- 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
index f7c52a30a..3b80a6355 100644
--- a/ground/gcs/src/plugins/scope/scopegadget.h
+++ b/ground/gcs/src/plugins/scope/scopegadget.h
@@ -63,7 +63,7 @@ public:
         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
index 48f08e906..09974e6a7 100644
--- 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
index 1ea292005..26169a6f1 100644
--- a/ground/gcs/src/plugins/scope/scopegadgetwidget.h
+++ b/ground/gcs/src/plugins/scope/scopegadgetwidget.h
@@ -100,7 +100,7 @@ public:
                       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();