diff options
| author |   Unit 193 <unit193@unit193.net> | 2021-12-17 07:06:30 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@unit193.net> | 2021-12-17 07:06:30 -0500 |
| commit | 1fdc150116cad39aae5c5da407c3312b47a59e3a (patch) | |
| tree | 123c79a4d7ad2d45781ba03ce939f7539fb428d8 /SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp | |
| parent | feda8a7db8d1d7c5439aa8f8feef7cc0dd2b59a0 (diff) | |
New upstream version 3.3.3+dfsg1.upstream/3.3.3+dfsg1
Diffstat (limited to 'SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp')
| -rw-r--r-- | SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp index 9894098..3ac32ac 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp @@ -2,6 +2,7 @@ #include "ui_functionseditor.h" #include "common/unused.h" #include "common/utils.h" +#include "common/compatibility.h" #include "uiutils.h" #include "functionseditormodel.h" #include "services/pluginmanager.h" @@ -178,8 +179,8 @@ void FunctionsEditor::functionDeselected(int row) } else { - model->setInitCode(row, QString::null); - model->setFinalCode(row, QString::null); + model->setInitCode(row, QString()); + model->setFinalCode(row, QString()); } if (!ui->undefArgsCheck->isChecked()) @@ -239,9 +240,9 @@ void FunctionsEditor::functionSelected(int row) void FunctionsEditor::clearEdits() { - ui->nameEdit->setText(QString::null); - ui->mainCodeEdit->setPlainText(QString::null); - ui->langCombo->setCurrentText(QString::null); + ui->nameEdit->setText(QString()); + ui->mainCodeEdit->setPlainText(QString()); + ui->langCombo->setCurrentText(QString()); ui->undefArgsCheck->setChecked(true); ui->argsList->clear(); ui->allDatabasesRadio->setChecked(true); @@ -371,7 +372,7 @@ void FunctionsEditor::updateModified() bool undefArgsDiff = model->getUndefinedArgs(row) != ui->undefArgsCheck->isChecked(); bool allDatabasesDiff = model->getAllDatabases(row) != ui->allDatabasesRadio->isChecked(); bool argDiff = getCurrentArgList() != model->getArguments(row); - bool dbDiff = getCurrentDatabases().toSet() != model->getDatabases(row).toSet(); // QSet to ignore order + bool dbDiff = toSet(getCurrentDatabases()) != toSet(model->getDatabases(row)); // QSet to ignore order bool typeDiff = model->getType(row) != getCurrentFunctionType(); currentModified = (nameDiff || codeDiff || typeDiff || langDiff || undefArgsDiff || allDatabasesDiff || argDiff || dbDiff || |