1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
--- common/check_new_version.cpp 2015-07-06 22:36:39.000000000 +0200
+++ check_new_version.cpp 2016-01-30 15:42:09.306675200 +0100
@@ -1,5 +1,5 @@
#include "check_new_version.h"
-#include <QMessageBox>
+
#include <QUrl>
#include <QtGlobal>
#include <QStringList>
@@ -10,10 +10,10 @@
#include <QNetworkRequest>
#include <QNetworkReply>
-#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 @@
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 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 @@
if((sl.size()==3)&&(rx.cap(4)!=""))
newVersion = true;
}
-
-
}
if(newVersion == true)
|