Changeset 5092 in ntrip for trunk

Timestamp:

Apr 12, 2013, 2:45:52 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter/inpedit

Files:

• keyword.cpp (modified) (5 diffs)
• keyword.h (modified) (2 diffs)

trunk/GnssCenter/inpedit/keyword.cpp

@@ -29 +29 @@
 
   _ok     = false;
-  _type   = e_type_max;
   _widget = 0;  // do not delete (it is owned by layout)
 
@@ -67 +66 @@
           QString descVal = rx.cap(2).trimmed();
           _desc[descKey]  = descVal;
-          if (descKey == "widget") {
-            if      (descVal == "checkbox") {
-              _type = checkbox;
-            }
-            else if (descVal == "combobox") {
-              _type = combobox;
-            }
-            else if (descVal == "lineedit") {
-              _type = lineedit;
-            }
-            else if (descVal == "radiobutton") {
-              _type = radiobutton;
-            }
-            else if (descVal == "selwin") {
-              _type = selwin;
-            }
-            else if (descVal == "spinbox") {
-              _type = spinbox;
-            }
-            else if (descVal == "uniline") {
-              _type = uniline;
-            }
-          }
         }
       }
@@ -113 +89 @@
   }
 
-  if      (_type == checkbox) {
+  QString widgetType = _desc.value("widget");
+
+  if      (widgetType == "checkbox") {
     QCheckBox* chBox = new QCheckBox(); 
     if (_values.size() && _values[0] == "1") {
@@ -120 +98 @@
     _widget = chBox;
   }
-  else if (_type == combobox) {
+  else if (widgetType == "combobox") {
     QComboBox* cmbBox = new QComboBox();
     _widget = cmbBox;
   }
-  else if (_type == lineedit) {
+  else if (widgetType == "lineedit") {
     t_lineEdit* lineEdit = new t_lineEdit();
     if (_values.size()) {
@@ -131 +109 @@
     _widget = lineEdit;
   }
-  else if (_type == radiobutton) {
+  else if (widgetType == "radiobutton") {
     _widget = new QRadioButton();
   }
-  else if (_type == selwin) {
+  else if (widgetType == "selwin") {
     _widget = new t_selWin();
   }
-  else if (_type == spinbox) {
+  else if (widgetType == "spinbox") {
     _widget = new QSpinBox();
   }
-  else if (_type == uniline) {
+  else if (widgetType == "uniline") {
     _widget = new t_uniLine(fldMask, this);
   }

trunk/GnssCenter/inpedit/keyword.h

@@ -8 +8 @@
 class t_keyword {
  public:
-  enum e_type {checkbox, combobox, lineedit, radiobutton, 
-               selwin, spinbox, uniline, e_type_max};
-
   t_keyword(QString line, QTextStream& inStream);
   ~t_keyword();
@@ -23 +20 @@
   QString                _name;
   QStringList            _values;
-  e_type                 _type;
   QWidget*               _widget;
   QMap<QString, QString> _desc;