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, 32 deletions

diff --git a/Plugins/DbSqliteCipher/dbsqlitecipher.cpp b/Plugins/DbSqliteCipher/dbsqlitecipher.cpp
index 13fa346..fd6c909 100644
--- a/Plugins/DbSqliteCipher/dbsqlitecipher.cpp
+++ b/Plugins/DbSqliteCipher/dbsqlitecipher.cpp
@@ -20,32 +20,6 @@ bool DbSqliteCipher::checkIfDbServedByPlugin(Db* db) const
     return (db && dynamic_cast<DbSqliteCipherInstance*>(db));
 }
 
-Db* DbSqliteCipher::getInstance(const QString& name, const QString& path, const QHash<QString, QVariant>& options, QString* errorMessage)
-{
-    UNUSED(errorMessage);
-
-    if (!initValid)
-        return nullptr;
-
-    Db* db = new DbSqliteCipherInstance(name, path, options);
-
-    if (!db->openForProbing())
-    {
-        delete db;
-        return nullptr;
-    }
-
-    SqlQueryPtr results = db->exec("SELECT * FROM sqlite_master");
-    if (results->isError())
-    {
-        delete db;
-        return nullptr;
-    }
-
-    db->closeQuiet();
-    return db;
-}
-
 QList<DbPluginOption> DbSqliteCipher::getOptionsList() const
 {
     static const QStringList ciphers = {"aes-128-cbc", "aes-128-cfb", "aes-128-cfb1", "aes-128-cfb8", "aes-128-ctr", "aes-128-ecb", "aes-128-gcm", "aes-128-ofb",
@@ -108,12 +82,6 @@ QList<DbPluginOption> DbSqliteCipher::getOptionsList() const
     return opts;
 }
 
-QString DbSqliteCipher::generateDbName(const QVariant& baseValue)
-{
-    QFileInfo file(baseValue.toString());
-    return file.baseName();
-}
-
 bool DbSqliteCipher::init()
 {
     Q_INIT_RESOURCE(dbsqlitecipher);
@@ -139,3 +107,8 @@ void DbSqliteCipher::deinit()
     SQLITESTUDIO->getExtraLicenseManager()->removeLicense(LICENSE_TITLE);
     Q_CLEANUP_RESOURCE(dbsqlitecipher);
 }
+
+Db *DbSqliteCipher::newInstance(const QString &name, const QString &path, const QHash<QString, QVariant> &options)
+{
+    return new DbSqliteCipherInstance(name, path, options);
+}