Update upstream source from tag 'upstream/3.3.3+dfsg1'

Update to upstream version '3.3.3+dfsg1'
with Debian dir 9a301fff4922aed2fec0c04c7d011947168c42f1

1 files changed, 5 insertions, 4 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/sqliteextensioneditor.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/sqliteextensioneditor.cpp
index ca45eff..4351312 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/sqliteextensioneditor.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/sqliteextensioneditor.cpp
@@ -11,6 +11,7 @@
 #include "services/dbmanager.h"
 #include "services/notifymanager.h"
 #include "common/lazytrigger.h"
+#include "common/compatibility.h"
 #include <QDesktopServices>
 #include <QFileDialog>
 #include <QSortFilterProxyModel>
@@ -173,8 +174,8 @@ void SqliteExtensionEditor::extensionSelected(int row)
 
 void SqliteExtensionEditor::clearEdits()
 {
-    ui->fileEdit->setText(QString::null);
-    ui->initEdit->setText(QString::null);
+    ui->fileEdit->setText(QString());
+    ui->initEdit->setText(QString());
     ui->allDatabasesRadio->setChecked(true);
 }
 
@@ -220,7 +221,7 @@ bool SqliteExtensionEditor::validateExtension(int row)
 {
     QString filePath = model->getFilePath(row);
     QString initFunc = model->getInitFunction(row);
-    return validateExtension(filePath, initFunc);
+    return validateExtension(filePath, initFunc, nullptr, nullptr, new QString);
 }
 
 bool SqliteExtensionEditor::validateExtension(const QString& filePath, const QString& initFunc, bool* fileOk, bool* initOk, QString* fileError)
@@ -388,7 +389,7 @@ void SqliteExtensionEditor::updateModified()
         bool fileDiff = model->getFilePath(row) != ui->fileEdit->text();
         bool initDiff = model->getInitFunction(row) != ui->initEdit->text();
         bool allDatabasesDiff = model->getAllDatabases(row) != ui->allDatabasesRadio->isChecked();
-        bool dbDiff = getCurrentDatabases().toSet() != model->getDatabases(row).toSet(); // QSet to ignore order
+        bool dbDiff = toSet(getCurrentDatabases()) != toSet(model->getDatabases(row)); // QSet to ignore order
 
         currentModified = (fileDiff || initDiff || allDatabasesDiff || dbDiff);
     }