HeeroYui-deprecated/QSimpleUpdater
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/alex-97/QSimpleUpdater

Browse Source 
Conflicts:
	QSimpleUpdater/src/qsimpleupdater.cpp
	QSimpleUpdater/src/qsimpleupdater.h
This commit is contained in:
Alex Spataru 2014-11-06 18:59:44 -06:00
commit 163e26fbc3
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
QSimpleUpdater/src/qsimpleupdater.cpp Executable file → Normal file
View File

@ -14,7 +14,10 @@ QSimpleUpdater::QSimpleUpdater(QObject *parent)
, m_version_check_finished(false) , m_version_check_finished(false)
, m_new_version_available(false) , m_new_version_available(false)
{ {
<<<<<<< HEAD
m_downloadDialog = new DownloadDialog(); m_downloadDialog = new DownloadDialog();
=======
>>>>>>> FETCH_HEAD
} }
@ -54,6 +57,7 @@ void QSimpleUpdater::checkForUpdates() {
} }
} }
<<<<<<< HEAD
void QSimpleUpdater::openDownloadLink() { void QSimpleUpdater::openDownloadLink() {
// Open the download URL in a web browser // Open the download URL in a web browser
if (!m_download_url.isEmpty()) { if (!m_download_url.isEmpty()) {
@ -64,9 +68,19 @@ void QSimpleUpdater::openDownloadLink() {
else { else {
qWarning() << "QSimpleUpdater: cannot download latest version," qWarning() << "QSimpleUpdater: cannot download latest version,"
<< "did you call setDownloadUrl() and checkForUpdates()?"; << "did you call setDownloadUrl() and checkForUpdates()?";
=======
// Return the application version referenced by the string
// that we downloaded
QString QSimpleUpdater::latestVersion() const {
if (m_latest_version.isEmpty()) {
qWarning() << "QSimpleUpdater: latest version is empty,"
<< "did you call checkForUpdates() and setReferenceUrl()?";
>>>>>>> FETCH_HEAD
} }
return m_latest_version;
} }
<<<<<<< HEAD
// Return the application version referenced by the string // Return the application version referenced by the string
// that we downloaded // that we downloaded
QString QSimpleUpdater::latestVersion() const { QString QSimpleUpdater::latestVersion() const {
@ -77,6 +91,8 @@ QString QSimpleUpdater::latestVersion() const {
return m_latest_version; return m_latest_version;
} }
=======
>>>>>>> FETCH_HEAD
// Return the string issued by the user in the setApplicationVersion() function // Return the string issued by the user in the setApplicationVersion() function
QString QSimpleUpdater::installedVersion() const { QString QSimpleUpdater::installedVersion() const {
if (m_installed_version.isEmpty()) { if (m_installed_version.isEmpty()) {

3
QSimpleUpdater/src/qsimpleupdater.h Executable file → Normal file
View File

@ -23,7 +23,10 @@ public:
QString changeLog() const; QString changeLog() const;
void checkForUpdates(); void checkForUpdates();
<<<<<<< HEAD
void openDownloadLink(); void openDownloadLink();
=======
>>>>>>> FETCH_HEAD
QString latestVersion() const; QString latestVersion() const;
QString installedVersion() const; QString installedVersion() const;
void downloadLatestVersion(); void downloadLatestVersion();