Skip to content

Commit 402e06c

Browse files
author
ThePBone
committed
Fix default spectrum.device key
1 parent 79a27d1 commit 402e06c

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

config/appconfigwrapper.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,7 @@ void AppConfigWrapper::setSpectrumInput(const QString& npath){
195195
saveAppConfig();
196196
}
197197
QString AppConfigWrapper::getSpectrumInput(){
198-
QString in = appconf->getString("visualizer.spectrum.device",true);
199-
if(in.length() < 1)
200-
return QString("viper.monitor");
201-
return in;
198+
return appconf->getString("visualizer.spectrum.device",true,"viper.monitor");
202199
}
203200
int AppConfigWrapper::getSpectrumRefresh(){
204201
return appconf->getInt("visualizer.spectrum.interval");

config/container.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ QVariant ConfigContainer::getVariant(const QString& key){
1414
}
1515
return map.find(key).value();
1616
}
17-
QString ConfigContainer::getString(const QString& key,bool setToDefaultIfMissing){
17+
QString ConfigContainer::getString(const QString& key,bool setToDefaultIfMissing, QString alternative){
1818
if(!map.contains(key)){
1919
qWarning().noquote().nospace() << "[W] Requested key '" << key << "' not found";
20-
if(setToDefaultIfMissing)map[key] = "";
21-
return "";
20+
if(setToDefaultIfMissing)map[key] = alternative;
21+
return alternative;
2222
}
2323
return getVariant(key).toString();
2424
}

config/container.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class ConfigContainer
2424
ConfigContainer();
2525
void setValue(const QString& key,QVariant value);
2626
QVariant getVariant(const QString& key);
27-
QString getString(const QString& key,bool setToDefaultIfMissing=true);
27+
QString getString(const QString& key,bool setToDefaultIfMissing=true, QString alternative="");
2828
int getInt(const QString& key, int alternative = 0);
2929
float getFloat(const QString& key);
3030
bool getBool(const QString& key, bool setToDefaultIfMissing=true, bool alternative=false);

mainwindow.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<item>
118118
<widget class="QStackedWidget" name="tabhost">
119119
<property name="currentIndex">
120-
<number>3</number>
120+
<number>0</number>
121121
</property>
122122
<widget class="QWidget" name="tabhostPage1">
123123
<layout class="QVBoxLayout" name="verticalLayout_6">

0 commit comments

Comments
 (0)