Minor changes

Authors.txt

@@ -1,4 +0,0 @@
-QSIMPLEUPDATER AUTHORS
-----------------------
-
-Alex Spataru <alex_spataru@outlook.com>

QSimpleUpdater/src/dialogs/download_dialog.cpp

@@ -1,10 +1,17 @@
-//
+/*
-//  This file is part of QSimpleUpdater
+ * (C) Copyright 2014 Alex Spataru
-//
+ *
-//  Copyright (c) 2014 Alex Spataru <alex_spataru@gmail.com>
+ * All rights reserved. This program and the accompanying materials
-//
+ * are made available under the terms of the GNU Lesser General Public License
-//  Please check the license.txt file for more information.
+ * (LGPL) version 2.1 which accompanies this distribution, and is available at
-//
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
 
 #include "download_dialog.h"
 #include "ui_download_dialog.h"
@@ -66,9 +73,6 @@ void DownloadDialog::openDownload(void) {
 
         QDesktopServices::openUrl (url);
     }
-
-    else
-        qWarning() << "QSimpleUpdater: cannot open downloaded file!";
 }
 
 void DownloadDialog::cancelDownload(void) {
@@ -105,15 +109,9 @@ void DownloadDialog::downloadFinished(void) {
             m_path = file.fileName();
         }
 
-        else
-            qWarning() << "QSimpleUpdater: cannot write downloaded data!";
-
         file.close();
         openDownload();
     }
-
-    else
-        qWarning() << "QSimpleUpdater: invalid download data!";
 }
 
 void DownloadDialog::updateProgress (qint64 received, qint64 total) {

QSimpleUpdater/src/dialogs/download_dialog.h

@@ -1,10 +1,23 @@
+/*
+ * (C) Copyright 2014 Alex Spataru
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser General Public License
+ * (LGPL) version 2.1 which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
 #ifndef DOWNLOAD_DIALOG_H
 #define DOWNLOAD_DIALOG_H
 
 #include <QDir>
 #include <QIcon>
-#include <QDebug>
-#include <QWidget>
 #include <QDateTime>
 #include <QMessageBox>
 #include <QNetworkReply>

QSimpleUpdater/src/qsimpleupdater.cpp

@@ -1,10 +1,17 @@
-//
+/*
-//  This file is part of QSimpleUpdater
+ * (C) Copyright 2014 Alex Spataru
-//
+ *
-//  Copyright (c) 2014 Alex Spataru <alex_spataru@gmail.com>
+ * All rights reserved. This program and the accompanying materials
-//
+ * are made available under the terms of the GNU Lesser General Public License
-//  Please check the license.txt file for more information.
+ * (LGPL) version 2.1 which accompanies this distribution, and is available at
-//
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
 
 #include "qsimpleupdater.h"
 
@@ -16,12 +23,7 @@ QSimpleUpdater::QSimpleUpdater (QObject *parent)
     m_downloadDialog = new DownloadDialog();
 }
 
-QString QSimpleUpdater::changeLog(void) const {
+QString QSimpleUpdater::changeLog() const {    
-    if (m_changelog.isEmpty()) {
-        qDebug() << "QSimpleUpdater: change log is empty,"
-                 << "did you call setChangelogUrl() and checkForUpdates()?";
-    }
-
     return m_changelog;
 }
 
@@ -45,83 +47,43 @@ void QSimpleUpdater::checkForUpdates(void) {
 void QSimpleUpdater::openDownloadLink(void) {
     if (!m_download_url.isEmpty())
         QDesktopServices::openUrl (m_download_url);
-
-    else {
-        qDebug() << "QSimpleUpdater: cannot download latest version,"
-                 << "did you call setDownloadUrl() and checkForUpdates()?";
-    }
 }
 
-QString QSimpleUpdater::latestVersion(void) const {
+QString QSimpleUpdater::latestVersion() const {
-    if (m_latest_version.isEmpty()) {
-        qDebug() << "QSimpleUpdater: latest version is empty,"
-                 << "did you call checkForUpdates() and setReferenceUrl()?";
-    }
-
     return m_latest_version;
 }
 
-QString QSimpleUpdater::installedVersion(void) const {
+QString QSimpleUpdater::installedVersion() const {
-    if (m_installed_version.isEmpty()) {
-        qDebug() << "QSimpleUpdater: installed version is empty,"
-                 << "did you call setApplicationVersion()?";
-    }
-
     return m_installed_version;
 }
 
 void QSimpleUpdater::downloadLatestVersion(void) {
     if (!m_download_url.isEmpty())
         m_downloadDialog->beginDownload (m_download_url);
-
-    else {
-        qDebug() << "QSimpleUpdater: cannot download latest version,"
-                 << "did you call setDownloadUrl() and checkForUpdates()?";
-    }
 }
 
-bool QSimpleUpdater::newerVersionAvailable(void) const {
+bool QSimpleUpdater::newerVersionAvailable() const {
     return m_new_version_available;
 }
 
 void QSimpleUpdater::setDownloadUrl (const QString& url) {
     Q_ASSERT (!url.isEmpty());
-
+    m_download_url.setUrl (url);
-    if (!url.isEmpty())
-        m_download_url.setUrl (url);
-
-    else
-        qDebug() << "QSimpleUpdater: input URL cannot be empty!";
 }
 
 void QSimpleUpdater::setReferenceUrl (const QString& url) {
     Q_ASSERT (!url.isEmpty());
-
+    m_reference_url.setUrl (url);
-    if (!url.isEmpty())
-        m_reference_url.setUrl (url);
-
-    else
-        qDebug() << "QSimpleUpdater: input URL cannot be empty!";
 }
 
 void QSimpleUpdater::setChangelogUrl (const QString& url) {
     Q_ASSERT (!url.isEmpty());
-
+    m_changelog_url.setUrl (url);
-    if (!url.isEmpty())
-        m_changelog_url.setUrl (url);
-
-    else
-        qDebug() << "QSimpleUpdater: input URL cannot be empty!";
 }
 
 void QSimpleUpdater::setApplicationVersion (const QString& version) {
     Q_ASSERT (!version.isEmpty());
-
+    m_installed_version = version;
-    if (!version.isEmpty())
-        m_installed_version = version;
-
-    else
-        qDebug() << "QSimpleUpdater: input string cannot be empty!";
 }
 
 void QSimpleUpdater::checkDownloadedVersion (QNetworkReply *reply) {
@@ -186,15 +148,12 @@ void QSimpleUpdater::processDownloadedChangelog (QNetworkReply *reply) {
         emit changelogDownloadFinished();
     }
 
-    else
-        qDebug() << "QSimpleUpdater: downloaded change log is empty!";
-
     emit checkingFinished();
 }
 
 void QSimpleUpdater::ignoreSslErrors (QNetworkReply *reply,
                                       const QList<QSslError>& error) {
-#ifndef Q_OS_IOS
+#if SUPPORTS_SSL
     reply->ignoreSslErrors (error);
 #else
     Q_UNUSED (reply);

QSimpleUpdater/src/qsimpleupdater.h

@@ -1,19 +1,35 @@
+/*
+ * (C) Copyright 2014 Alex Spataru
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser General Public License
+ * (LGPL) version 2.1 which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
 #ifndef Q_SIMPLE_UPDATER_H
 #define Q_SIMPLE_UPDATER_H
 
-#include <QSsl>
+#define SUPPORTS_SSL !defined(Q_OS_IOS)
+
 #include <QUrl>
-#include <QDebug>
-#include <QString>
-#include <QSslError>
-#include <QByteArray>
-#include <QStringList>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QDesktopServices>
-#include <QSslConfiguration>
 #include <QNetworkAccessManager>
 
+#if SUPPORTS_SSL
+#include <QSsl>
+#include <QSslError>
+#include <QSslConfiguration>
+#endif
+
 #include "dialogs/download_dialog.h"
 
 class QSimpleUpdater : public QObject {
@@ -23,17 +39,17 @@ public:
     QSimpleUpdater (QObject *parent = 0);
 
     /// Returns the downloaded change log
-    QString changeLog(void) const;
+    QString changeLog() const;
 
     /// Returns the downloaded version string
-    QString latestVersion(void) const;
+    QString latestVersion() const;
 
     /// Returns the local version, referenced by
     /// the setApplicationVersion() function
-    QString installedVersion(void) const;
+    QString installedVersion() const;
 
     /// Returns \c true if there's a newer version available
-    bool newerVersionAvailable(void) const;
+    bool newerVersionAvailable() const;
 
     /// Checks for updates and calls the appropriate
     /// signals when finished

lgpl3.txt

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.