diff options
Diffstat (limited to 'SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp')
| -rw-r--r-- | SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp index 5d36683..5cf5be4 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp @@ -1,6 +1,7 @@ #include "collationseditor.h" #include "ui_collationseditor.h" #include "common/unused.h" +#include "common/compatibility.h" #include "selectabledbmodel.h" #include "dbtree/dbtree.h" #include "dbtree/dbtreemodel.h" @@ -163,9 +164,9 @@ void CollationsEditor::collationSelected(int row) void CollationsEditor::clearEdits() { - ui->nameEdit->setText(QString::null); - ui->codeEdit->setPlainText(QString::null); - ui->langCombo->setCurrentText(QString::null); + ui->nameEdit->setText(QString()); + ui->codeEdit->setPlainText(QString()); + ui->langCombo->setCurrentText(QString()); ui->allDatabasesRadio->setChecked(true); ui->langCombo->setCurrentIndex(-1); } @@ -350,7 +351,7 @@ void CollationsEditor::updateModified() bool codeDiff = model->getCode(row) != ui->codeEdit->toPlainText(); bool langDiff = model->getLang(row) != ui->langCombo->currentText(); 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 = (nameDiff || codeDiff || langDiff || allDatabasesDiff || dbDiff); } |