From 1fdc150116cad39aae5c5da407c3312b47a59e3a Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Fri, 17 Dec 2021 07:06:30 -0500 Subject: New upstream version 3.3.3+dfsg1. --- SQLiteStudio3/guiSQLiteStudio/windows/sqliteextensioneditor.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'SQLiteStudio3/guiSQLiteStudio/windows/sqliteextensioneditor.cpp') 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 #include #include @@ -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); } -- cgit v1.2.3