gpsbabelfe_disable_version_check

Disable version mismatch check.

Gbp-Pq: Name gpsbabelfe_disable_version_check

diff --git a/gui/babeldata.h b/gui/babeldata.h
index 198f88893ed5a72858b76f7412d2be317b619911..3bde8ffe104a44903387ada87e054d012821c0fd 100644 (file)
--- a/gui/babeldata.h
+++ b/gui/babeldata.h
@@ -67,7 +67,7 @@ public:
     startupVersionCheck_(true),
     reportStatistics_(true),
     allowBetaUpgrades_(false),
-    ignoreVersionMismatch_(false),
+    ignoreVersionMismatch_(true),
     disableDonateDialog_(false),
     donateSplashed_(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0)))
   {

diff --git a/gui/preferences.cc b/gui/preferences.cc
index fbed65695a56844669b0274464f9508102c82d85..e1da2bec7f11f5494cc2a7d1e5e04ea7780c85cb 100644 (file)
--- a/gui/preferences.cc
+++ b/gui/preferences.cc
@@ -43,7 +43,6 @@ Preferences::Preferences(QWidget* parent, QList<Format>& formatList,
 
   ui_.startupCheck->setChecked(babelData_.startupVersionCheck_);
   ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_);
-  ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_);
   // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1.
   if (VERSION == QString("1.4.1")) {
     babelData_.ignoreVersionMismatch_ = false;
@@ -87,7 +86,6 @@ void Preferences::acceptClicked()
 
   babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked();
   babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked();
-  babelData_.ignoreVersionMismatch_ = ui_.ignoreVersionMismatchCheck->isChecked();
   accept();
 }
 

diff --git a/gui/preferences.ui b/gui/preferences.ui
index 3bea6c2cac8c5d733090e82829bdfc0900703f5d..ac671d7d9357d98d07ac68eb8e680f0aab570bda 100644 (file)
--- a/gui/preferences.ui
+++ b/gui/preferences.ui
@@ -53,13 +53,6 @@
           </property>
          </widget>
         </item>
-        <item>
-         <widget class="QCheckBox" name="ignoreVersionMismatchCheck">
-          <property name="text">
-           <string>Ignore mismatch between command line and GUI version.</string>
-          </property>
-         </widget>
-        </item>
        </layout>
       </widget>
      </widget>