From 799cb10c026016bad7441580344c27c64e59e44b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Wed, 6 Jan 2016 10:55:25 +0100 Subject: [PATCH] fixed greedy regular expresions in HttpVersionChecker --- common/check_new_version.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/common/check_new_version.cpp b/common/check_new_version.cpp index 6454c980..56089a3d 100644 --- a/common/check_new_version.cpp +++ b/common/check_new_version.cpp @@ -10,10 +10,10 @@ #include #include -#define PREVIOUS_VERSION "6.0.0" +#define PREVIOUS_VERSION_TESTING "6.0.0" HttpVersionChecker::HttpVersionChecker() - :HttpWorker("https://bitbucket.org/luisangelsm/yacreader/wiki/Home") + :HttpWorker("https://bitbucket.org/luisangelsm/yacreader/wiki/Home") { connect(this,SIGNAL(dataReady(const QByteArray &)),this,SLOT(checkNewVersion(const QByteArray &))); } @@ -26,15 +26,15 @@ void HttpVersionChecker::checkNewVersion(const QByteArray & data) bool HttpVersionChecker::checkNewVersion(QString sourceContent) { #ifdef Q_OS_WIN32 - QRegExp rx(".*YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}win32.*"); + QRegExp rx("YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}win32"); #endif #if defined Q_OS_UNIX && !defined Q_OS_MAC - QRegExp rx(".*YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}X11.*"); + QRegExp rx("YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}X11"); #endif #ifdef Q_OS_MAC - QRegExp rx(".*YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}Mac.*"); + QRegExp rx("YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}Mac"); #endif int index = 0; @@ -42,9 +42,9 @@ bool HttpVersionChecker::checkNewVersion(QString sourceContent) bool sameVersion = true; //bool currentVersionIsNewer = false; #ifdef QT_DEBUG - QString version(PREVIOUS_VERSION); + QString version(PREVIOUS_VERSION_TESTING); #else - QString version(VERSION); + QString version(VERSION); #endif QStringList sl = version.split("."); if((index = rx.indexIn(sourceContent))!=-1) @@ -68,8 +68,6 @@ bool HttpVersionChecker::checkNewVersion(QString sourceContent) if((sl.size()==3)&&(rx.cap(4)!="")) newVersion = true; } - - } if(newVersion == true)