Skip to content

Commit cf74719

Browse files
committed
LP-565 pfd gadget: simplify insert/removeDataPath related code
1 parent 01c87ce commit cf74719

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

ground/gcs/src/plugins/pfdqml/pfdqmlgadgetconfiguration.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,10 @@ PfdQmlGadgetConfiguration::PfdQmlGadgetConfiguration(QString classId, QSettings
6868
// model
6969
m_modelEnabled = settings.value("modelEnabled").toBool();
7070
m_modelSelectionMode = static_cast<ModelSelectionMode::Enum>(settings.value("modelSelectionMode", ModelSelectionMode::Auto).toUInt());
71-
m_modelFile = settings.value("modelFile", "Unknown").toString();
72-
m_modelFile = Utils::InsertDataPath(m_modelFile);
71+
m_modelFile = Utils::InsertDataPath(settings.value("modelFile", "Unknown").toString());
7372

7473
// background image
75-
m_backgroundImageFile = settings.value("backgroundImageFile", "Unknown").toString();
76-
m_backgroundImageFile = Utils::InsertDataPath(m_backgroundImageFile);
74+
m_backgroundImageFile = Utils::InsertDataPath(settings.value("backgroundImageFile", "Unknown").toString());
7775

7876
// gstreamer pipeline
7977
m_gstPipeline = settings.value("gstPipeline").toString();
@@ -153,12 +151,10 @@ void PfdQmlGadgetConfiguration::saveConfig(QSettings &settings) const
153151
// model
154152
settings.setValue("modelEnabled", m_modelEnabled);
155153
settings.setValue("modelSelectionMode", static_cast<uint>(m_modelSelectionMode));
156-
QString modelFile = Utils::RemoveDataPath(m_modelFile);
157-
settings.setValue("modelFile", modelFile);
154+
settings.setValue("modelFile", Utils::RemoveDataPath(m_modelFile));
158155

159156
// background image
160-
QString backgroundImageFile = Utils::RemoveDataPath(m_backgroundImageFile);
161-
settings.setValue("backgroundImageFile", backgroundImageFile);
157+
settings.setValue("backgroundImageFile", Utils::RemoveDataPath(m_backgroundImageFile));
162158

163159
// gstreamer pipeline
164160
settings.setValue("gstPipeline", m_gstPipeline);

0 commit comments

Comments
 (0)