Use more STL containers instead of Qt containers

MKleusberg · MKleusberg · commit b803e3c49fa2 · 2019-05-02T17:02:59.000+02:00
diff --git a/src/Application.cpp b/src/Application.cpp
@@ -136,7 +136,7 @@ Application::Application(int& argc, char** argv) :
                             value = option.at(1).split(",");
                         else
                             value = option.at(1);
-                        Settings::setValue(setting.at(0), setting.at(1), value, !saveToDisk);
+                        Settings::setValue(setting.at(0).toStdString(), setting.at(1).toStdString(), value, !saveToDisk);
                     }
                 }
             }
diff --git a/src/ColumnDisplayFormatDialog.cpp b/src/ColumnDisplayFormatDialog.cpp
@@ -63,12 +63,11 @@ ColumnDisplayFormatDialog::ColumnDisplayFormatDialog(DBBrowserDB& db, const sqlb
     } else {
         // When it doesn't match any predefined format, it is considered custom
         QString formatName = "custom";
-        for(auto& formatKey : formatFunctions.keys()) {
-            if(current_format == formatFunctions.value(formatKey)) {
-                formatName = formatKey;
-                break;
-            }
-        }
+        auto it = std::find_if(formatFunctions.begin(), formatFunctions.end(), [current_format](const std::pair<std::string, QString>& s) {
+            return s.second == current_format;
+        });
+        if(it != formatFunctions.end())
+            formatName = QString::fromStdString(it->first);
         ui->comboDisplayFormat->setCurrentIndex(ui->comboDisplayFormat->findData(formatName));
         ui->editDisplayFormat->setText(current_format);
     }
@@ -89,12 +88,12 @@ QString ColumnDisplayFormatDialog::selectedDisplayFormat() const
 
 void ColumnDisplayFormatDialog::updateSqlCode()
 {
-    QString format = ui->comboDisplayFormat->currentData().toString();
+    std::string format = ui->comboDisplayFormat->currentData().toString().toStdString();
 
     if(format == "default")
         ui->editDisplayFormat->setText(sqlb::escapeIdentifier(column_name));
     else if(format != "custom")
-        ui->editDisplayFormat->setText(formatFunctions.value(format));
+        ui->editDisplayFormat->setText(formatFunctions.at(format));
 }
 
 void ColumnDisplayFormatDialog::accept()
diff --git a/src/ColumnDisplayFormatDialog.h b/src/ColumnDisplayFormatDialog.h
@@ -2,7 +2,8 @@
 #define COLUMNDISPLAYFORMATDIALOG_H
 
 #include <QDialog>
-#include <QMap>
+
+#include <unordered_map>
 
 #include "sql/ObjectIdentifier.h"
 
@@ -32,7 +33,7 @@ private slots:
 private:
     Ui::ColumnDisplayFormatDialog* ui;
     QString column_name;
-    QMap<QString, QString> formatFunctions;
+    std::unordered_map<std::string, QString> formatFunctions;
     DBBrowserDB& pdb;
     sqlb::ObjectIdentifier curTable;
 };
diff --git a/src/DbStructureModel.cpp b/src/DbStructureModel.cpp
@@ -7,6 +7,7 @@
 #include <QMimeData>
 #include <QMessageBox>
 #include <QApplication>
+#include <unordered_map>
 
 DbStructureModel::DbStructureModel(DBBrowserDB& db, QObject* parent)
     : QAbstractItemModel(parent),
@@ -303,7 +304,7 @@ bool DbStructureModel::dropMimeData(const QMimeData* data, Qt::DropAction action
 void DbStructureModel::buildTree(QTreeWidgetItem* parent, const std::string& schema)
 {
     // Build a map from object type to tree node to simplify finding the correct tree node later
-    QMap<std::string, QTreeWidgetItem*> typeToParentItem;
+    std::unordered_map<std::string, QTreeWidgetItem*> typeToParentItem;
 
     // Get object map for the given schema
     objectMap objmap = m_db.schemata[schema];
@@ -312,22 +313,22 @@ void DbStructureModel::buildTree(QTreeWidgetItem* parent, const std::string& sch
     QTreeWidgetItem* itemTables = new QTreeWidgetItem(parent);
     itemTables->setIcon(ColumnName, QIcon(QString(":/icons/table")));
     itemTables->setText(ColumnName, tr("Tables (%1)").arg(objmap.values("table").count()));
-    typeToParentItem.insert("table", itemTables);
+    typeToParentItem.insert({"table", itemTables});
 
     QTreeWidgetItem* itemIndices = new QTreeWidgetItem(parent);
     itemIndices->setIcon(ColumnName, QIcon(QString(":/icons/index")));
     itemIndices->setText(ColumnName, tr("Indices (%1)").arg(objmap.values("index").count()));
-    typeToParentItem.insert("index", itemIndices);
+    typeToParentItem.insert({"index", itemIndices});
 
     QTreeWidgetItem* itemViews = new QTreeWidgetItem(parent);
     itemViews->setIcon(ColumnName, QIcon(QString(":/icons/view")));
     itemViews->setText(ColumnName, tr("Views (%1)").arg(objmap.values("view").count()));
-    typeToParentItem.insert("view", itemViews);
+    typeToParentItem.insert({"view", itemViews});
 
     QTreeWidgetItem* itemTriggers = new QTreeWidgetItem(parent);
     itemTriggers->setIcon(ColumnName, QIcon(QString(":/icons/trigger")));
     itemTriggers->setText(ColumnName, tr("Triggers (%1)").arg(objmap.values("trigger").count()));
-    typeToParentItem.insert("trigger", itemTriggers);
+    typeToParentItem.insert({"trigger", itemTriggers});
 
     // Get all database objects and sort them by their name
     QMultiMap<std::string, sqlb::ObjectPtr> dbobjs;
@@ -338,7 +339,7 @@ void DbStructureModel::buildTree(QTreeWidgetItem* parent, const std::string& sch
     for(auto it : dbobjs)
     {
         // Object node
-        QTreeWidgetItem* item = addNode(typeToParentItem.value(sqlb::Object::typeToString(it->type())), it, schema);
+        QTreeWidgetItem* item = addNode(typeToParentItem.at(sqlb::Object::typeToString(it->type())), it, schema);
 
         // If it is a table or view add the field nodes, add an extra node for the browsable section
         if(it->type() == sqlb::Object::Types::Table || it->type() == sqlb::Object::Types::View)
diff --git a/src/EditIndexDialog.cpp b/src/EditIndexDialog.cpp
@@ -19,7 +19,7 @@ EditIndexDialog::EditIndexDialog(DBBrowserDB& db, const sqlb::ObjectIdentifier&
     ui->sqlTextEdit->setReadOnly(true);
 
     // Get list of tables, sort it alphabetically and fill the combobox
-    QMap<std::string, sqlb::ObjectIdentifier> dbobjs;  // Map from display name to full object identifier
+    std::map<std::string, sqlb::ObjectIdentifier> dbobjs;  // Map from display name to full object identifier
     if(newIndex)        // If this is a new index, offer all tables of all database schemata
     {
         for(auto it=pdb.schemata.constBegin();it!=pdb.schemata.constEnd();++it)
@@ -29,7 +29,7 @@ EditIndexDialog::EditIndexDialog(DBBrowserDB& db, const sqlb::ObjectIdentifier&
             {
                 // Only show the schema name for non-main schemata
                 sqlb::ObjectIdentifier obj(it.key(), (*jt)->name());
-                dbobjs.insert(obj.toDisplayString(), obj);
+                dbobjs.insert({obj.toDisplayString(), obj});
             }
         }
     } else {            // If this is an existing index, only offer tables of the current database schema
@@ -38,12 +38,12 @@ EditIndexDialog::EditIndexDialog(DBBrowserDB& db, const sqlb::ObjectIdentifier&
         {
             // Only show the schema name for non-main schemata
             sqlb::ObjectIdentifier obj(curIndex.schema(), it->name());
-            dbobjs.insert(obj.toDisplayString(), obj);
+            dbobjs.insert({obj.toDisplayString(), obj});
         }
     }
     ui->comboTableName->blockSignals(true);
-    for(auto it=dbobjs.constBegin();it!=dbobjs.constEnd();++it)
-        ui->comboTableName->addItem(QIcon(QString(":icons/table")), QString::fromStdString(it.key()), QString::fromStdString(it.value().toSerialised()));
+    for(auto it=dbobjs.cbegin();it!=dbobjs.cend();++it)
+        ui->comboTableName->addItem(QIcon(QString(":icons/table")), QString::fromStdString(it->first), QString::fromStdString(it->second.toSerialised()));
     ui->comboTableName->blockSignals(false);
 
     QHeaderView *tableHeaderView = ui->tableIndexColumns->horizontalHeader();
diff --git a/src/EditTableDialog.cpp b/src/EditTableDialog.cpp
@@ -277,7 +277,7 @@ void EditTableDialog::checkInput()
     if (normTableName != m_table.name()) {
         const std::string oldTableName = m_table.name();
         m_table.setName(normTableName);
-        m_fkEditorDelegate->updateTablesList(QString::fromStdString(oldTableName));
+        m_fkEditorDelegate->updateTablesList(oldTableName);
 
         // update fk's that refer to table itself recursively
         const auto& fields = m_table.fields;
diff --git a/src/ExtendedScintilla.cpp b/src/ExtendedScintilla.cpp
@@ -111,7 +111,7 @@ void ExtendedScintilla::dropEvent(QDropEvent* e)
     f.close();
 }
 
-void ExtendedScintilla::setupSyntaxHighlightingFormat(QsciLexer *lexer, const QString& settings_name, int style)
+void ExtendedScintilla::setupSyntaxHighlightingFormat(QsciLexer* lexer, const std::string& settings_name, int style)
 {
     lexer->setColor(QColor(Settings::getValue("syntaxhighlighter", settings_name + "_colour").toString()), style);
 
diff --git a/src/ExtendedScintilla.h b/src/ExtendedScintilla.h
@@ -42,7 +42,7 @@ public slots:
 protected:
     void dropEvent(QDropEvent* e) override;
 
-    void setupSyntaxHighlightingFormat(QsciLexer *lexer, const QString& settings_name, int style);
+    void setupSyntaxHighlightingFormat(QsciLexer* lexer, const std::string& settings_name, int style);
     void reloadLexerSettings(QsciLexer *lexer);
     void reloadCommonSettings();
 
diff --git a/src/ExtendedTableWidget.cpp b/src/ExtendedTableWidget.cpp
@@ -110,9 +110,9 @@ UniqueFilterModel::UniqueFilterModel(QObject* parent)
 bool UniqueFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
 {
     QModelIndex index = sourceModel()->index(sourceRow, filterKeyColumn(), sourceParent);
-    const QString& value = index.data(Qt::EditRole).toString();
+    const std::string value = index.data(Qt::EditRole).toString().toStdString();
 
-    if (!value.isEmpty() && !m_uniqueValues.contains(value)) {
+    if (!value.empty() && m_uniqueValues.find(value) == m_uniqueValues.end()) {
         const_cast<UniqueFilterModel*>(this)->m_uniqueValues.insert(value);
         return true;
     }
@@ -834,7 +834,7 @@ void ExtendedTableWidget::vscrollbarChanged(int value)
     }
 }
 
-int ExtendedTableWidget::numVisibleRows()
+int ExtendedTableWidget::numVisibleRows() const
 {
     // Get the row numbers of the rows currently visible at the top and the bottom of the widget
     int row_top = rowAt(0) == -1 ? 0 : rowAt(0);
@@ -844,9 +844,9 @@ int ExtendedTableWidget::numVisibleRows()
     return row_bottom - row_top;
 }
 
-QSet<int> ExtendedTableWidget::selectedCols()
+std::unordered_set<int> ExtendedTableWidget::selectedCols() const
 {
-    QSet<int> selectedCols;
+    std::unordered_set<int> selectedCols;
     for(const QModelIndex & idx : selectedIndexes())
         selectedCols.insert(idx.column());
     return selectedCols;
diff --git a/src/ExtendedTableWidget.h b/src/ExtendedTableWidget.h
@@ -2,9 +2,9 @@
 #define EXTENDEDTABLEWIDGET_H
 
 #include <QTableView>
-#include <QSet>
 #include <QStyledItemDelegate>
 #include <QSortFilterProxyModel>
+#include <unordered_set>
 
 #include "sql/Query.h"
 
@@ -25,7 +25,7 @@ class UniqueFilterModel : public QSortFilterProxyModel
     explicit UniqueFilterModel(QObject* parent = nullptr);
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
  private:
-    QSet<QString> m_uniqueValues;
+    std::unordered_set<std::string> m_uniqueValues;
 };
 
 // We use this class to provide editor widgets for the ExtendedTableWidget. It's used for every cell in the table view.
@@ -52,8 +52,8 @@ class ExtendedTableWidget : public QTableView
     FilterTableHeader* filterHeader() { return m_tableHeader; }
 
 public:
-    QSet<int> selectedCols();
-    int numVisibleRows();
+    std::unordered_set<int> selectedCols() const;
+    int numVisibleRows() const;
 
     void sortByColumns(const std::vector<sqlb::SortedColumn>& columns);
 
diff --git a/src/ForeignKeyEditorDelegate.cpp b/src/ForeignKeyEditorDelegate.cpp
@@ -86,10 +86,7 @@ ForeignKeyEditorDelegate::ForeignKeyEditorDelegate(const DBBrowserDB& db, sqlb::
         for(auto jt=it->constBegin();jt!=it->constEnd();++jt)
         {
             if((*jt)->type() == sqlb::Object::Types::Table)
-            {
-                QString tableName = QString::fromStdString((*jt)->name());
-                m_tablesIds.insert(tableName, std::dynamic_pointer_cast<sqlb::Table>(*jt)->fieldNames());
-            }
+                m_tablesIds.insert({(*jt)->name(), std::dynamic_pointer_cast<sqlb::Table>(*jt)->fieldNames()});
         }
     }
 }
@@ -108,13 +105,14 @@ QWidget* ForeignKeyEditorDelegate::createEditor(QWidget* parent, const QStyleOpt
         QComboBox* box = editor->idsComboBox;
         box->clear();
         box->addItem(QString());                // for those heroes who don't like to specify key explicitly
-        for(const auto& n : m_tablesIds[tableName])
+        for(const auto& n : m_tablesIds[tableName.toStdString()])
             box->addItem(QString::fromStdString(n));
         box->setCurrentIndex(0);
     });
 
     editor->tablesComboBox->clear();
-    editor->tablesComboBox->addItems(m_tablesIds.keys());
+    for(const auto& i : m_tablesIds)
+        editor->tablesComboBox->addItem(QString::fromStdString(i.first));
 
     return editor;
 }
@@ -176,12 +174,12 @@ void ForeignKeyEditorDelegate::updateEditorGeometry(QWidget* editor, const QStyl
     editor->setGeometry(option.rect);
 }
 
-void ForeignKeyEditorDelegate::updateTablesList(const QString& oldTableName)
+void ForeignKeyEditorDelegate::updateTablesList(const std::string& oldTableName)
 {
     // this is used for recursive table constraints when
     // table column references column within same table
-    m_tablesIds.remove(oldTableName);
-    m_tablesIds.insert(QString::fromStdString(m_table.name()), m_table.fieldNames());
+    m_tablesIds.erase(oldTableName);
+    m_tablesIds.insert({m_table.name(), m_table.fieldNames()});
 }
 
 #include "ForeignKeyEditorDelegate.moc"
diff --git a/src/ForeignKeyEditorDelegate.h b/src/ForeignKeyEditorDelegate.h
@@ -2,6 +2,7 @@
 #define FOREIGNKEYDELEGATE_H
 
 #include <QStyledItemDelegate>
+#include <unordered_map>
 #include <vector>
 #include <string>
 
@@ -24,12 +25,12 @@ class ForeignKeyEditorDelegate : public QStyledItemDelegate
     void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;
     void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
-    void updateTablesList(const QString& oldTableName);
+    void updateTablesList(const std::string& oldTableName);
 
 private:
     const DBBrowserDB& m_db;
     sqlb::Table& m_table;
-    mutable QMap<QString, std::vector<std::string>> m_tablesIds;
+    mutable std::unordered_map<std::string, std::vector<std::string>> m_tablesIds;
 };
 
 #endif // FOREIGNKEYDELEGATE_H
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -2619,10 +2619,10 @@ void MainWindow::on_actionDonatePatreon_triggered()
 
 void MainWindow::updateBrowseDataColumnWidth(int section, int /*old_size*/, int new_size)
 {
-    QSet<int> selectedCols(ui->dataTable->selectedCols());
+    std::unordered_set<int> selectedCols = ui->dataTable->selectedCols();
     sqlb::ObjectIdentifier tableName = currentlyBrowsedTableName();
 
-    if (!selectedCols.contains(section))
+    if (selectedCols.find(section) == selectedCols.end())
     {
         if (browseTableSettings[tableName].columnWidths[section] != new_size) {
             isProjectModified = true;
@@ -3668,13 +3668,15 @@ void MainWindow::hideColumns(int column, bool hide)
     sqlb::ObjectIdentifier tableName = currentlyBrowsedTableName();
 
     // Select columns to (un)hide
-    QSet<int> columns;
+    std::unordered_set<int> columns;
     if(column == -1)
     {
          if(ui->dataTable->selectedCols().size() == 0)
              columns.insert(ui->actionBrowseTableEditDisplayFormat->property("clicked_column").toInt());
-         else
-             columns += ui->dataTable->selectedCols();
+         else {
+             auto cols = ui->dataTable->selectedCols();
+             columns.insert(cols.begin(), cols.end());
+         }
     } else {
         columns.insert(column);
     }
diff --git a/src/PreferencesDialog.cpp b/src/PreferencesDialog.cpp
@@ -114,7 +114,7 @@ void PreferencesDialog::loadSettings()
 
     for(int i=0; i < ui->treeSyntaxHighlighting->topLevelItemCount(); ++i)
     {
-        QString name = ui->treeSyntaxHighlighting->topLevelItem(i)->text(0);
+        std::string name = ui->treeSyntaxHighlighting->topLevelItem(i)->text(0).toStdString();
         QString colorname = Settings::getValue("syntaxhighlighter", name + "_colour").toString();
         QColor color = QColor(colorname);
         ui->treeSyntaxHighlighting->topLevelItem(i)->setTextColor(2, color);
@@ -230,7 +230,7 @@ void PreferencesDialog::saveSettings()
 
     for(int i=0; i < ui->treeSyntaxHighlighting->topLevelItemCount(); ++i)
     {
-        QString name = ui->treeSyntaxHighlighting->topLevelItem(i)->text(0);
+        std::string name = ui->treeSyntaxHighlighting->topLevelItem(i)->text(0).toStdString();
         Settings::setValue("syntaxhighlighter", name + "_colour", ui->treeSyntaxHighlighting->topLevelItem(i)->text(2));
         Settings::setValue("syntaxhighlighter", name + "_bold", ui->treeSyntaxHighlighting->topLevelItem(i)->checkState(3) == Qt::Checked);
         Settings::setValue("syntaxhighlighter", name + "_italic", ui->treeSyntaxHighlighting->topLevelItem(i)->checkState(4) == Qt::Checked);
@@ -466,7 +466,7 @@ void PreferencesDialog::fillLanguageBox()
     ui->languageComboBox->setCurrentIndex(0);
 }
 
-void PreferencesDialog::loadColorSetting(QFrame *frame, const QString & settingName)
+void PreferencesDialog::loadColorSetting(QFrame *frame, const std::string& settingName)
 {
     QColor color = QColor(Settings::getValue("databrowser", settingName + "_colour").toString());
     setColorSetting(frame, color);
@@ -519,7 +519,7 @@ void PreferencesDialog::setColorSetting(QFrame *frame, const QColor &color)
                                                                        palette.color(line->backgroundRole()).name()));
 }
 
-void PreferencesDialog::saveColorSetting(QFrame *frame, const QString & settingName)
+void PreferencesDialog::saveColorSetting(QFrame* frame, const std::string& settingName)
 {
     Settings::setValue("databrowser", settingName + "_colour",
         frame->palette().color(frame->backgroundRole()));
@@ -537,7 +537,7 @@ void PreferencesDialog::adjustColorsToStyle(int style)
 
     for(int i=0; i < ui->treeSyntaxHighlighting->topLevelItemCount(); ++i)
     {
-        QString name = ui->treeSyntaxHighlighting->topLevelItem(i)->text(0);
+        std::string name = ui->treeSyntaxHighlighting->topLevelItem(i)->text(0).toStdString();
         QColor color = Settings::getDefaultColorValue("syntaxhighlighter", name + "_colour", appStyle);
         ui->treeSyntaxHighlighting->topLevelItem(i)->setTextColor(2, color);
         ui->treeSyntaxHighlighting->topLevelItem(i)->setBackgroundColor(2, color);
diff --git a/src/PreferencesDialog.h b/src/PreferencesDialog.h
@@ -54,9 +54,9 @@ private slots:
     QStringList m_dbFileExtensions;
 
     void fillLanguageBox();
-    void loadColorSetting(QFrame *frame, const QString &name);
-    void setColorSetting(QFrame *frame, const QColor &color);
-    void saveColorSetting(QFrame *frame, const QString &name);
+    void loadColorSetting(QFrame *frame, const std::string& name);
+    void setColorSetting(QFrame* frame, const QColor &color);
+    void saveColorSetting(QFrame* frame, const std::string& name);
     void addClientCertToTable(const QString& path, const QSslCertificate& cert);
 
 protected:
diff --git a/src/Settings.cpp b/src/Settings.cpp
diff --git a/src/Settings.h b/src/Settings.h

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ Application::Application(int& argc, char** argv) :`
`136`	`136`	`value = option.at(1).split(",");`
`137`	`137`	`else`
`138`	`138`	`value = option.at(1);`
`139`		`- Settings::setValue(setting.at(0), setting.at(1), value, !saveToDisk);`
	`139`	`+ Settings::setValue(setting.at(0).toStdString(), setting.at(1).toStdString(), value, !saveToDisk);`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ EditIndexDialog::EditIndexDialog(DBBrowserDB& db, const sqlb::ObjectIdentifier&`
`19`	`19`	`ui->sqlTextEdit->setReadOnly(true);`
`20`	`20`
`21`	`21`	`// Get list of tables, sort it alphabetically and fill the combobox`
`22`		`- QMap<std::string, sqlb::ObjectIdentifier> dbobjs; // Map from display name to full object identifier`
	`22`	`+ std::map<std::string, sqlb::ObjectIdentifier> dbobjs; // Map from display name to full object identifier`
`23`	`23`	`if(newIndex) // If this is a new index, offer all tables of all database schemata`
`24`	`24`	`{`
`25`	`25`	`for(auto it=pdb.schemata.constBegin();it!=pdb.schemata.constEnd();++it)`
`@@ -29,7 +29,7 @@ EditIndexDialog::EditIndexDialog(DBBrowserDB& db, const sqlb::ObjectIdentifier&`
`29`	`29`	`{`
`30`	`30`	`// Only show the schema name for non-main schemata`
`31`	`31`	`sqlb::ObjectIdentifier obj(it.key(), (*jt)->name());`
`32`		`- dbobjs.insert(obj.toDisplayString(), obj);`
	`32`	`+ dbobjs.insert({obj.toDisplayString(), obj});`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`} else { // If this is an existing index, only offer tables of the current database schema`
`@@ -38,12 +38,12 @@ EditIndexDialog::EditIndexDialog(DBBrowserDB& db, const sqlb::ObjectIdentifier&`
`38`	`38`	`{`
`39`	`39`	`// Only show the schema name for non-main schemata`
`40`	`40`	`sqlb::ObjectIdentifier obj(curIndex.schema(), it->name());`
`41`		`- dbobjs.insert(obj.toDisplayString(), obj);`
	`41`	`+ dbobjs.insert({obj.toDisplayString(), obj});`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`ui->comboTableName->blockSignals(true);`
`45`		`- for(auto it=dbobjs.constBegin();it!=dbobjs.constEnd();++it)`
`46`		`- ui->comboTableName->addItem(QIcon(QString(":icons/table")), QString::fromStdString(it.key()), QString::fromStdString(it.value().toSerialised()));`
	`45`	`+ for(auto it=dbobjs.cbegin();it!=dbobjs.cend();++it)`
	`46`	`+ ui->comboTableName->addItem(QIcon(QString(":icons/table")), QString::fromStdString(it->first), QString::fromStdString(it->second.toSerialised()));`
`47`	`47`	`ui->comboTableName->blockSignals(false);`
`48`	`48`
`49`	`49`	`QHeaderView *tableHeaderView = ui->tableIndexColumns->horizontalHeader();`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ void ExtendedScintilla::dropEvent(QDropEvent* e)`
`111`	`111`	`f.close();`
`112`	`112`	`}`
`113`	`113`
`114`		`-void ExtendedScintilla::setupSyntaxHighlightingFormat(QsciLexer *lexer, const QString& settings_name, int style)`
	`114`	`+void ExtendedScintilla::setupSyntaxHighlightingFormat(QsciLexer* lexer, const std::string& settings_name, int style)`
`115`	`115`	`{`
`116`	`116`	`lexer->setColor(QColor(Settings::getValue("syntaxhighlighter", settings_name + "_colour").toString()), style);`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -110,9 +110,9 @@ UniqueFilterModel::UniqueFilterModel(QObject* parent)`
`110`	`110`	`bool UniqueFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const`
`111`	`111`	`{`
`112`	`112`	`QModelIndex index = sourceModel()->index(sourceRow, filterKeyColumn(), sourceParent);`
`113`		`- const QString& value = index.data(Qt::EditRole).toString();`
	`113`	`+ const std::string value = index.data(Qt::EditRole).toString().toStdString();`
`114`	`114`
`115`		`- if (!value.isEmpty() && !m_uniqueValues.contains(value)) {`
	`115`	`+ if (!value.empty() && m_uniqueValues.find(value) == m_uniqueValues.end()) {`
`116`	`116`	`const_cast<UniqueFilterModel*>(this)->m_uniqueValues.insert(value);`
`117`	`117`	`return true;`
`118`	`118`	`}`
`@@ -834,7 +834,7 @@ void ExtendedTableWidget::vscrollbarChanged(int value)`
`834`	`834`	`}`
`835`	`835`	`}`
`836`	`836`
`837`		`-int ExtendedTableWidget::numVisibleRows()`
	`837`	`+int ExtendedTableWidget::numVisibleRows() const`
`838`	`838`	`{`
`839`	`839`	`// Get the row numbers of the rows currently visible at the top and the bottom of the widget`
`840`	`840`	`int row_top = rowAt(0) == -1 ? 0 : rowAt(0);`
`@@ -844,9 +844,9 @@ int ExtendedTableWidget::numVisibleRows()`
`844`	`844`	`return row_bottom - row_top;`
`845`	`845`	`}`
`846`	`846`
`847`		`-QSet<int> ExtendedTableWidget::selectedCols()`
	`847`	`+std::unordered_set<int> ExtendedTableWidget::selectedCols() const`
`848`	`848`	`{`
`849`		`- QSet<int> selectedCols;`
	`849`	`+ std::unordered_set<int> selectedCols;`
`850`	`850`	`for(const QModelIndex & idx : selectedIndexes())`
`851`	`851`	`selectedCols.insert(idx.column());`
`852`	`852`	`return selectedCols;`