diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2017-02-09 04:37:26 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2017-02-09 04:37:26 -0500 |
| commit | c9d6debf9015b7853c3e061bbc64a555d85e2fcd (patch) | |
| tree | 53341bc57ae9fbad2beb5b6c08d97a68bee0ec8e /Plugins/DbSqlite2/dbsqlite2.h | |
| parent | d5caba2b1f36dc3b92fa705a06097d0597fa2ddd (diff) | |
| parent | d9aa870e5d509cc7309ab82dd102a937ab58613a (diff) | |
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
Diffstat (limited to 'Plugins/DbSqlite2/dbsqlite2.h')
| -rw-r--r-- | Plugins/DbSqlite2/dbsqlite2.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Plugins/DbSqlite2/dbsqlite2.h b/Plugins/DbSqlite2/dbsqlite2.h index c428031..a52fc26 100644 --- a/Plugins/DbSqlite2/dbsqlite2.h +++ b/Plugins/DbSqlite2/dbsqlite2.h @@ -2,10 +2,10 @@ #define DBSQLITE2_H #include "dbsqlite2_global.h" -#include "plugins/dbplugin.h" +#include "plugins/dbpluginstdfilebase.h" #include "plugins/genericplugin.h" -class DBSQLITE2SHARED_EXPORT DbSqlite2 : public GenericPlugin, public DbPlugin +class DBSQLITE2SHARED_EXPORT DbSqlite2 : public GenericPlugin, public DbPluginStdFileBase { Q_OBJECT SQLITESTUDIO_PLUGIN("dbsqlite2.json") @@ -15,9 +15,10 @@ class DBSQLITE2SHARED_EXPORT DbSqlite2 : public GenericPlugin, public DbPlugin 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); + + protected: + Db *newInstance(const QString &name, const QString &path, const QHash<QString, QVariant> &options); }; #endif // DBSQLITE2_H |