diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/extcap_argument.cpp | 4 | ||||
| -rw-r--r-- | ui/qt/extcap_argument.h | 2 | ||||
| -rw-r--r-- | ui/qt/extcap_options_dialog.cpp | 7 |
3 files changed, 6 insertions, 7 deletions
diff --git a/ui/qt/extcap_argument.cpp b/ui/qt/extcap_argument.cpp index 3200a7e1d6..c4e14039d4 100644 --- a/ui/qt/extcap_argument.cpp +++ b/ui/qt/extcap_argument.cpp @@ -593,12 +593,12 @@ QString ExtcapArgument::defaultValue() return QString(); } -QString ExtcapArgument::prefKey() +QString ExtcapArgument::prefKey(const QString & device_name) { if ( ! _argument->save ) return QString(); - return QString(_argument->call).replace("-", ""); + return QString(extcap_settings_key(device_name.toStdString().c_str(), _argument->call)); } bool ExtcapArgument::isRequired() diff --git a/ui/qt/extcap_argument.h b/ui/qt/extcap_argument.h index 2d605d2881..084b3336f1 100644 --- a/ui/qt/extcap_argument.h +++ b/ui/qt/extcap_argument.h @@ -98,7 +98,7 @@ public: bool isValid(); bool isRequired(); - QString prefKey(); + QString prefKey(const QString & device_name); virtual QString prefValue(); static ExtcapArgument * create(extcap_arg * argument = 0); diff --git a/ui/qt/extcap_options_dialog.cpp b/ui/qt/extcap_options_dialog.cpp index ed7a0150e4..07c0523628 100644 --- a/ui/qt/extcap_options_dialog.cpp +++ b/ui/qt/extcap_options_dialog.cpp @@ -373,16 +373,15 @@ void ExtcapOptionsDialog::storeValues() else value = (*iter)->prefValue(); - QString prefKey = QString("%1.%2").arg(device_name).arg(argument->prefKey()); - if ( prefKey.length() > 0 ) + QString key = argument->prefKey(device_name); + if (key.length() > 0) { - gchar * key = g_strdup(prefKey.toStdString().c_str()); gchar * val = g_strdup(value.length() == 0 ? " " : value.toStdString().c_str()); /* Setting the internally stored value for the preference to the new value */ (*iter)->argument()->storeval = g_strdup(val); - g_hash_table_insert(entries, key, val); + g_hash_table_insert(entries, g_strdup(key.toStdString().c_str()), val); } } |