extcap: Cleanup complex types and add save option

Cleanup handling of complex data types and use only
glib defined datatypes while handling argument values.

Add a save parameter, which (additionally) can set, that
a parameter is not saved in a configuration file. Passwords
are by default not saved, which may be overwritten using
this parameter

Change-Id: I67eff0f3286170f082d532e806a39511c40df647
Reviewed-on: https://code.wireshark.org/review/13573
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>

1 files changed, 2 insertions, 14 deletions

diff --git a/ui/qt/extcap_argument_multiselect.cpp b/ui/qt/extcap_argument_multiselect.cpp
index fc01dfb351..221f0f240b 100644
--- a/ui/qt/extcap_argument_multiselect.cpp
+++ b/ui/qt/extcap_argument_multiselect.cpp
@@ -119,8 +119,8 @@ QWidget * ExtArgMultiSelect::createEditor(QWidget * parent)
     if (items.length() == 0)
         return new QWidget();
 
-    if ( _default != 0 )
-        defaults = _default->toString().split(",", QString::SkipEmptyParts);
+    if ( defaultValue().length() > 0 )
+        defaults = defaultValue().split(",", QString::SkipEmptyParts);
 
     viewModel = new QStandardItemModel();
     QList<QStandardItem *>::const_iterator iter = items.constBegin();
@@ -173,18 +173,6 @@ QString ExtArgMultiSelect::value()
     return result.join(QString(","));
 }
 
-QString ExtArgMultiSelect::defaultValue()
-{
-    if ( _argument != 0 && _argument->default_complex != 0)
-    {
-        gchar * str = extcap_get_complex_as_string(_argument->default_complex);
-        if ( str != 0 )
-            return QString(str);
-    }
-
-    return QString();
-}
-
 void ExtArgMultiSelect::selectionChanged(const QItemSelection &, const QItemSelection &)
 {
     emit valueChanged();