Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

1 files changed, 5 insertions, 4 deletions

diff --git a/Plugins/DbSqliteCipher/dbsqlitecipher.h b/Plugins/DbSqliteCipher/dbsqlitecipher.h
index ef2ffea..903acce 100644
--- a/Plugins/DbSqliteCipher/dbsqlitecipher.h
+++ b/Plugins/DbSqliteCipher/dbsqlitecipher.h
@@ -2,10 +2,10 @@
 #define DBSQLITECIPHER_H
 
 #include "dbsqlitecipher_global.h"
-#include "plugins/dbplugin.h"
+#include "plugins/dbpluginstdfilebase.h"
 #include "plugins/genericplugin.h"
 
-class DBSQLITECIPHERSHARED_EXPORT DbSqliteCipher : public GenericPlugin, public DbPlugin
+class DBSQLITECIPHERSHARED_EXPORT DbSqliteCipher : public GenericPlugin, public DbPluginStdFileBase
 {
     Q_OBJECT
     SQLITESTUDIO_PLUGIN("dbsqlitecipher.json")
@@ -15,9 +15,7 @@ class DBSQLITECIPHERSHARED_EXPORT DbSqliteCipher : public GenericPlugin, public
 
         QString getLabel() const;
         bool checkIfDbServedByPlugin(Db* db) const;
-        Db* getInstance(const QString& name, const QString& path, const QHash<QString, QVariant>& options, QString* errorMessage);
         QList<DbPluginOption> getOptionsList() const;
-        QString generateDbName(const QVariant& baseValue);
         bool init();
         void deinit();
 
@@ -30,6 +28,9 @@ class DBSQLITECIPHERSHARED_EXPORT DbSqliteCipher : public GenericPlugin, public
         static const int DEF_KDF_ITER = 64000;
         static_char* DEF_CIPHER = "aes-256-cbc";
 
+    protected:
+        Db *newInstance(const QString &name, const QString &path, const QHash<QString, QVariant> &options);
+
     private:
         bool initValid = false;