Merge tag 'upstream/3.0.2'

Upstream version 3.0.2

# gpg: Signature made Fri 30 Jan 2015 05:00:11 PM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"

1 files changed, 26 insertions, 2 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/services/extralicensemanager.h b/SQLiteStudio3/coreSQLiteStudio/services/extralicensemanager.h
index fcf1203..c8da6f9 100644
--- a/SQLiteStudio3/coreSQLiteStudio/services/extralicensemanager.h
+++ b/SQLiteStudio3/coreSQLiteStudio/services/extralicensemanager.h
@@ -8,14 +8,38 @@
 class API_EXPORT ExtraLicenseManager
 {
     public:
+        enum class Type
+        {
+            FILE,
+            CONTENTS
+        };
+
+        struct License
+        {
+            QString title;
+            QString data;
+            Type type;
+            QString violationMessage;
+            bool violated = false;
+        };
+
         ExtraLicenseManager();
+        virtual ~ExtraLicenseManager();
 
         bool addLicense(const QString& title, const QString& filePath);
+        bool addLicenseContents(const QString& title, const QString& contents);
+        void setViolatedLicense(const QString& title, const QString& violationMessage);
+        void unsetViolatedLicense(const QString& title);
+        bool isViolatedLicense(const QString& title);
+        QString getViolationMessage(const QString& title);
         bool removeLicense(const QString& title);
-        const QHash<QString,QString>& getLicenses() const;
+        QHash<QString,QString> getLicensesContents() const;
 
     private:
-        QHash<QString,QString> licenses;
+        bool addLicense(const QString& title, const QString& data, Type type);
+        QString readLicenseFile(const QString& path) const;
+
+        QHash<QString,License*> licenses;
 };
 
 #endif // EXTRALISENCEMANAGER_H