Fix merge: Auto-config flights.

src/dl_fldigi/flights.cxx

@@ -763,7 +763,6 @@ static void autoconfigure_rtty(const Json::Value &settings)
 
 static void autoconfigure_rtty_shift(const Json::Value &value)
 {
-#if 0
     if (!value.isNumeric())
         return;
 
@@ -777,7 +776,7 @@ static void autoconfigure_rtty_shift(const Json::Value &value)
         /* I love floats :-( */
         if (diff < 0.1 && diff > -0.1)
         {
-            selShift->value(search);
+            selShift->index(search);
             selCustomShift->deactivate();
             progdefaults.rtty_shift = search;
             return;
@@ -786,17 +785,15 @@ static void autoconfigure_rtty_shift(const Json::Value &value)
 
     /* If not found (i.e., we found the terminating 0, and haven't returned)
      * then search == the index of the "Custom" menu item */
-    selShift->value(search);
+    selShift->index(search);
     selCustomShift->activate();
     progdefaults.rtty_shift = -1;
     selCustomShift->value(shift);
     progdefaults.rtty_custom_shift = shift;
-#endif
 }
 
 static void autoconfigure_rtty_baud(const Json::Value &value)
 {
-#if 0
     if (!value.isNumeric())
         return;
 
@@ -807,17 +804,15 @@ static void autoconfigure_rtty_baud(const Json::Value &value)
         double diff = rtty::BAUD[search] - baud;
         if (diff < 0.01 && diff > -0.01)
         {
-            selBaud->value(search);
+            selBaud->index(search);
             progdefaults.rtty_baud = search;
             return;
         }
     }
-#endif
 }
 
 static void autoconfigure_rtty_encoding(const Json::Value &value)
 {
-#if 0
     if (!value.isString())
         return;
 
@@ -834,21 +829,19 @@ static void autoconfigure_rtty_encoding(const Json::Value &value)
     else
         return;
 
-    selBits->value(select);
+    selBits->index(select);
     progdefaults.rtty_bits = select;
 
     /* From selBits' callback */
     if (select == 0)
     {
         progdefaults.rtty_parity = RTTY_PARITY_NONE;
-        selParity->value(RTTY_PARITY_NONE);
+        selParity->index(RTTY_PARITY_NONE);
     }
-#endif
 }
 
 static void autoconfigure_rtty_parity(const Json::Value &value)
 {
-#if 0
     if (!value.isString())
         return;
 
@@ -872,14 +865,12 @@ static void autoconfigure_rtty_parity(const Json::Value &value)
     else
         return;
 
-    selParity->value(select);
+    selParity->index(select);
     progdefaults.rtty_parity = select;
-#endif
 }
 
 static void autoconfigure_rtty_stop(const Json::Value &value)
 {
-#if 0
     if (!value.isNumeric())
         return;
 
@@ -908,8 +899,7 @@ static void autoconfigure_rtty_stop(const Json::Value &value)
         return;
 
     progdefaults.rtty_stop = select;
-    selStopBits->value(select);
-#endif
+    selStopBits->index(select);
 }
 
 static void autoconfigure_dominoex(const Json::Value &settings)