New upstream version 3.3.3+dfsg1.upstream/3.3.3+dfsg1

1 files changed, 11 insertions, 10 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/db/invaliddb.cpp b/SQLiteStudio3/coreSQLiteStudio/db/invaliddb.cpp
index 5e210f2..e7acb7b 100644
--- a/SQLiteStudio3/coreSQLiteStudio/db/invaliddb.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/db/invaliddb.cpp
@@ -27,14 +27,9 @@ quint8 InvalidDb::getVersion() const
     return 0;
 }
 
-Dialect InvalidDb::getDialect() const
-{
-    return Dialect::Sqlite3;
-}
-
 QString InvalidDb::getEncoding()
 {
-    return QString::null;
+    return QString();
 }
 
 QHash<QString, QVariant>& InvalidDb::getConnectionOptions()
@@ -67,6 +62,12 @@ int InvalidDb::getTimeout() const
     return timeout;
 }
 
+QList<AliasedColumn> InvalidDb::columnsForQuery(const QString& query)
+{
+    UNUSED(query);
+    return QList<AliasedColumn>();
+}
+
 SqlQueryPtr InvalidDb::exec(const QString& query, const QList<QVariant>& args, Db::Flags flags)
 {
     UNUSED(query);
@@ -196,13 +197,13 @@ QString InvalidDb::attach(Db* otherDb, bool silent)
 {
     UNUSED(otherDb);
     UNUSED(silent);
-    return QString::null;
+    return QString();
 }
 
 AttachGuard InvalidDb::guardedAttach(Db* otherDb, bool silent)
 {
     UNUSED(silent);
-    return AttachGuard::create(this, otherDb, QString::null);
+    return AttachGuard::create(this, otherDb, QString());
 }
 
 void InvalidDb::detach(Db* otherDb)
@@ -227,12 +228,12 @@ QSet<QString> InvalidDb::getAllAttaches()
 QString InvalidDb::getUniqueNewObjectName(const QString& attachedDbName)
 {
     UNUSED(attachedDbName);
-    return QString::null;
+    return QString();
 }
 
 QString InvalidDb::getErrorText()
 {
-    return QString::null;
+    return QString();
 }
 
 int InvalidDb::getErrorCode()