From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Mon, 21 Jun 2010 03:45:10 +0000 (+0000)
Subject: Constant string thrashing for Windows version check.
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~11^2~967
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9fe299c79490c920113b0bf1515d719345a51edc;p=gpsbabel.git

Constant string thrashing for Windows version check.
---

diff --git a/gpsbabel/gui/mainwindow.cpp b/gpsbabel/gui/mainwindow.cpp
index ea9a5368f..4f40b437b 100644
--- a/gpsbabel/gui/mainwindow.cpp
+++ b/gpsbabel/gui/mainwindow.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-// $Id: mainwindow.cpp,v 1.22 2010-06-20 04:16:21 robertl Exp $
+// $Id: mainwindow.cpp,v 1.23 2010-06-21 03:45:10 robertl Exp $
 //------------------------------------------------------------------------
 //
 //  Copyright (C) 2009  S. Khai Mong <khai@mangrai.com>.
@@ -60,8 +60,11 @@ QString MainWindow::findBabelVersion()
 
   QString str = babel.readAll();
   is_beta = str.contains("-beta");
+  str.replace("Version",  "");
+  str.replace("GPSBabel",  "");
   str.replace(QRegExp("^[\\s]*"),  "");
   str.replace(QRegExp("[\\s]+$"),  "");
+  str = str.simplified();
   return str;
 }
 
@@ -199,7 +202,7 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
   }
 
   if (!bd.ignoreVersionMismatch && babelVersion != VERSION) {
-    VersionMismatch vm(0, babelVersion, QString(appName) + QString(" Version " VERSION));
+    VersionMismatch vm(0, babelVersion, QString(VERSION));
 
     vm.exec();
     bd.ignoreVersionMismatch = vm.neverAgain();