GeezerVison is showing github.com — Remove some virtuals and add some overrides · sqlitebrowser/sqlitebrowser@fb1eba1
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: src/AddRecordDialog.cpp +4-4Lines changed: 4 additions & 4 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -65,7 +65,7 @@ class NullLineEdit: public QLineEdit { | 65 | 65 | class NoEditDelegate: public QStyledItemDelegate { | 66 | 66 | public: | 67 | 67 | NoEditDelegate(QObject* parent=nullptr): QStyledItemDelegate(parent) {} | 68 | | - virtual QWidget* createEditor(QWidget* /* parent */, const QStyleOptionViewItem& /* option */, const QModelIndex& /* index */) const { | | 68 | + QWidget* createEditor(QWidget* /* parent */, const QStyleOptionViewItem& /* option */, const QModelIndex& /* index */) const override { | 69 | 69 | return nullptr; | 70 | 70 | } | 71 | 71 | }; | @@ -75,11 +75,11 @@ class EditDelegate: public QStyledItemDelegate { | 75 | 75 |
| 76 | 76 | public: | 77 | 77 | EditDelegate(QObject* parent=nullptr): QStyledItemDelegate(parent) {} | 78 | | - virtual QWidget* createEditor(QWidget *parent, const QStyleOptionViewItem& /* option */, const QModelIndex& /* index */) const { | | 78 | + QWidget* createEditor(QWidget *parent, const QStyleOptionViewItem& /* option */, const QModelIndex& /* index */) const override { | 79 | 79 | return new NullLineEdit(parent); | 80 | 80 | } | 81 | 81 |
| 82 | | - virtual void setEditorData(QWidget *editor, const QModelIndex &index) const { | | 82 | + void setEditorData(QWidget *editor, const QModelIndex &index) const override { | 83 | 83 |
| 84 | 84 | NullLineEdit* lineEditor = dynamic_cast<NullLineEdit*>(editor); | 85 | 85 | // Set the editor in the null state (unless the user has actually written NULL) | @@ -91,7 +91,7 @@ class EditDelegate: public QStyledItemDelegate { | 91 | 91 | lineEditor->setNull(false); | 92 | 92 | } | 93 | 93 | } | 94 | | - virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const { | | 94 | + void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override { | 95 | 95 |
| 96 | 96 | NullLineEdit* lineEditor = dynamic_cast<NullLineEdit*>(editor); | 97 | 97 | // Restore NULL text (unless the user has already modified the value) | |
Collapse file Copy file name to clipboardExpand all lines: src/AddRecordDialog.h +3-3Lines changed: 3 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -20,10 +20,10 @@ class AddRecordDialog : public QDialog | 20 | 20 |
| 21 | 21 | public: | 22 | 22 | explicit AddRecordDialog(DBBrowserDB& pdb, const sqlb::ObjectIdentifier& tableName, QWidget* parent = nullptr); | 23 | | - ~AddRecordDialog(); | | 23 | + ~AddRecordDialog() override; | 24 | 24 |
| 25 | 25 | protected: | 26 | | - void keyPressEvent(QKeyEvent *evt); | | 26 | + void keyPressEvent(QKeyEvent *evt) override; | 27 | 27 |
| 28 | 28 | private: | 29 | 29 | enum Columns { | @@ -37,7 +37,7 @@ class AddRecordDialog : public QDialog | 37 | 37 | void setDefaultsStyle(QTreeWidgetItem* item); | 38 | 38 |
| 39 | 39 | private slots: | 40 | | - virtual void accept(); | | 40 | + void accept() override; | 41 | 41 | void itemChanged(QTreeWidgetItem* item, int column); | 42 | 42 | void help(); | 43 | 43 | void on_buttonBox_clicked(QAbstractButton* button); | |
Collapse file Copy file name to clipboardExpand all lines: src/Application.h +2-2Lines changed: 2 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -12,7 +12,7 @@ class Application : public QApplication | 12 | 12 |
| 13 | 13 | public: | 14 | 14 | explicit Application(int& argc, char** argv); | 15 | | - virtual ~Application(); | | 15 | + ~Application() override; | 16 | 16 |
| 17 | 17 | bool dontShowMainWindow() { return m_dontShowMainWindow; } | 18 | 18 |
| @@ -21,7 +21,7 @@ class Application : public QApplication | 21 | 21 | static QString versionString(); | 22 | 22 |
| 23 | 23 | protected: | 24 | | - bool event(QEvent* event); | | 24 | + bool event(QEvent* event) override; | 25 | 25 |
| 26 | 26 | private: | 27 | 27 | bool m_dontShowMainWindow; | |
Collapse file Copy file name to clipboardExpand all lines: src/CipherDialog.h +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -19,7 +19,7 @@ class CipherDialog : public QDialog | 19 | 19 | // Set the encrypt parameter to true when the dialog is used to encrypt a database; | 20 | 20 | // set it to false if the dialog is used to ask the user for the key to decrypt a file. | 21 | 21 | explicit CipherDialog(QWidget* parent, bool encrypt); | 22 | | - ~CipherDialog(); | | 22 | + ~CipherDialog() override; | 23 | 23 |
| 24 | 24 | CipherSettings getCipherSettings() const; | 25 | 25 |
| |
Collapse file Copy file name to clipboardExpand all lines: src/ColumnDisplayFormatDialog.h +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -15,7 +15,7 @@ class ColumnDisplayFormatDialog : public QDialog | 15 | 15 |
| 16 | 16 | public: | 17 | 17 | explicit ColumnDisplayFormatDialog(const QString& colname, QString current_format, QWidget* parent = nullptr); | 18 | | - ~ColumnDisplayFormatDialog(); | | 18 | + ~ColumnDisplayFormatDialog() override; | 19 | 19 |
| 20 | 20 | QString selectedDisplayFormat() const; | 21 | 21 |
| |
Collapse file Copy file name to clipboardExpand all lines: src/DbStructureModel.h +13-13Lines changed: 13 additions & 13 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -14,19 +14,19 @@ class DbStructureModel : public QAbstractItemModel | 14 | 14 |
| 15 | 15 | public: | 16 | 16 | explicit DbStructureModel(DBBrowserDB& db, QObject* parent = nullptr); | 17 | | - ~DbStructureModel(); | | 17 | + ~DbStructureModel() override; | 18 | 18 |
| 19 | | - QVariant data(const QModelIndex& index, int role) const; | 20 | | - Qt::ItemFlags flags(const QModelIndex& index) const; | 21 | | - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; | 22 | | - QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const; | 23 | | - QModelIndex parent(const QModelIndex& index) const; | 24 | | - int rowCount(const QModelIndex& parent = QModelIndex()) const; | 25 | | - int columnCount(const QModelIndex& = QModelIndex()) const; | | 19 | + QVariant data(const QModelIndex& index, int role) const override; | | 20 | + Qt::ItemFlags flags(const QModelIndex& index) const override; | | 21 | + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; | | 22 | + QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override; | | 23 | + QModelIndex parent(const QModelIndex& index) const override; | | 24 | + int rowCount(const QModelIndex& parent = QModelIndex()) const override; | | 25 | + int columnCount(const QModelIndex& = QModelIndex()) const override; | 26 | 26 |
| 27 | | - QStringList mimeTypes() const; | 28 | | - QMimeData* mimeData(const QModelIndexList& indices) const; | 29 | | - bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent); | | 27 | + QStringList mimeTypes() const override; | | 28 | + QMimeData* mimeData(const QModelIndexList& indices) const override; | | 29 | + bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override; | 30 | 30 |
| 31 | 31 | enum Columns | 32 | 32 | { | @@ -39,8 +39,8 @@ class DbStructureModel : public QAbstractItemModel | 39 | 39 |
| 40 | 40 | public slots: | 41 | 41 | void reloadData(); | 42 | | - void setDropQualifiedNames(bool value) { m_dropQualifiedNames = value; }; | 43 | | - void setDropEnquotedNames(bool value) { m_dropEnquotedNames = value; }; | | 42 | + void setDropQualifiedNames(bool value) { m_dropQualifiedNames = value; } | | 43 | + void setDropEnquotedNames(bool value) { m_dropEnquotedNames = value; } | 44 | 44 |
| 45 | 45 | signals: | 46 | 46 | void structureUpdated(); | |
Collapse file Copy file name to clipboardExpand all lines: src/EditDialog.h +5-5Lines changed: 5 additions & 5 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -17,25 +17,25 @@ class EditDialog : public QDialog | 17 | 17 |
| 18 | 18 | public: | 19 | 19 | explicit EditDialog(QWidget* parent = nullptr); | 20 | | - ~EditDialog(); | | 20 | + ~EditDialog() override; | 21 | 21 |
| 22 | 22 | void setCurrentIndex(const QModelIndex& idx); | 23 | 23 |
| 24 | 24 | public slots: | 25 | | - virtual void setFocus(); | 26 | | - virtual void reject(); | | 25 | + void setFocus(); | | 26 | + void reject() override; | 27 | 27 | void setReadOnly(bool ro); | 28 | 28 | void reloadSettings(); | 29 | 29 |
| 30 | 30 | protected: | 31 | | - virtual void showEvent(QShowEvent* ev); | | 31 | + void showEvent(QShowEvent* ev) override; | 32 | 32 |
| 33 | 33 | private slots: | 34 | 34 | void importData(); | 35 | 35 | void exportData(); | 36 | 36 | void setNull(); | 37 | 37 | void updateApplyButton(); | 38 | | - virtual void accept(); | | 38 | + void accept() override; | 39 | 39 | void loadData(const QByteArray& data); | 40 | 40 | void toggleOverwriteMode(); | 41 | 41 | void editModeChanged(int newMode); | |
Collapse file Copy file name to clipboardExpand all lines: src/EditIndexDialog.h +3-3Lines changed: 3 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -18,11 +18,11 @@ class EditIndexDialog : public QDialog | 18 | 18 |
| 19 | 19 | public: | 20 | 20 | explicit EditIndexDialog(DBBrowserDB& db, const sqlb::ObjectIdentifier& indexName, bool createIndex, QWidget* parent = nullptr); | 21 | | - ~EditIndexDialog(); | | 21 | + ~EditIndexDialog() override; | 22 | 22 |
| 23 | 23 | private slots: | 24 | | - void accept(); | 25 | | - void reject(); | | 24 | + void accept() override; | | 25 | + void reject() override; | 26 | 26 |
| 27 | 27 | void tableChanged(const QString& new_table, bool initialLoad = false); | 28 | 28 | void checkInput(); | |
Collapse file Copy file name to clipboardExpand all lines: src/EditTableDialog.h +5-5Lines changed: 5 additions & 5 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -19,10 +19,10 @@ class EditTableDialog : public QDialog | 19 | 19 |
| 20 | 20 | public: | 21 | 21 | explicit EditTableDialog(DBBrowserDB& pdb, const sqlb::ObjectIdentifier& tableName, bool createTable, QWidget* parent = nullptr); | 22 | | - ~EditTableDialog(); | | 22 | + ~EditTableDialog() override; | 23 | 23 |
| 24 | 24 | protected: | 25 | | - void keyPressEvent(QKeyEvent *evt); | | 25 | + void keyPressEvent(QKeyEvent *evt) override; | 26 | 26 |
| 27 | 27 | private: | 28 | 28 | enum Columns { | @@ -47,12 +47,12 @@ private slots: | 47 | 47 | void addField(); | 48 | 48 | void removeField(); | 49 | 49 | void fieldSelectionChanged(); | 50 | | - virtual void accept(); | 51 | | - virtual void reject(); | | 50 | + void accept() override; | | 51 | + void reject() override; | 52 | 52 | void checkInput(); | 53 | 53 | void itemChanged(QTreeWidgetItem* item, int column); | 54 | 54 | void updateTypes(QObject *object); | 55 | | - bool eventFilter(QObject *object, QEvent *event); | | 55 | + bool eventFilter(QObject *object, QEvent *event) override; | 56 | 56 | void updateTypes(); | 57 | 57 | void moveUp(); | 58 | 58 | void moveDown(); | |
Collapse file Copy file name to clipboardExpand all lines: src/ExportDataDialog.h +2-2Lines changed: 2 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -24,10 +24,10 @@ class ExportDataDialog : public QDialog | 24 | 24 |
| 25 | 25 | explicit ExportDataDialog(DBBrowserDB& db, ExportFormats format, QWidget* parent = nullptr, | 26 | 26 | const QString& query = "", const sqlb::ObjectIdentifier& selection = sqlb::ObjectIdentifier()); | 27 | | - ~ExportDataDialog(); | | 27 | + ~ExportDataDialog() override; | 28 | 28 |
| 29 | 29 | private slots: | 30 | | - virtual void accept(); | | 30 | + void accept() override; | 31 | 31 | void showCustomCharEdits(); | 32 | 32 |
| 33 | 33 | private: | |
|