diff options
6 files changed, 31 insertions, 31 deletions
diff --git a/src/plugins/resourceeditor/qrceditor/qrceditor.h b/src/plugins/resourceeditor/qrceditor/qrceditor.h index 4f31bd24bc..3fd83b7447 100644 --- a/src/plugins/resourceeditor/qrceditor/qrceditor.h +++ b/src/plugins/resourceeditor/qrceditor/qrceditor.h @@ -40,7 +40,7 @@ class QrcEditor : public QWidget public: QrcEditor(RelativeResourceModel *model, QWidget *parent = 0); - virtual ~QrcEditor(); + ~QrcEditor() override; void loaded(bool success); diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile_p.h b/src/plugins/resourceeditor/qrceditor/resourcefile_p.h index f50ee9556a..9b78e35169 100644 --- a/src/plugins/resourceeditor/qrceditor/resourcefile_p.h +++ b/src/plugins/resourceeditor/qrceditor/resourcefile_p.h @@ -202,12 +202,12 @@ public: explicit ResourceModel(QObject *parent = 0); QModelIndex index(int row, int column, - const QModelIndex &parent = QModelIndex()) const; - QModelIndex parent(const QModelIndex &index) const; - int rowCount(const QModelIndex &parent) const; - int columnCount(const QModelIndex &parent) const; - bool hasChildren(const QModelIndex &parent) const; - Qt::ItemFlags flags(const QModelIndex &index) const; + const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &index) const override; + int rowCount(const QModelIndex &parent) const override; + int columnCount(const QModelIndex &parent) const override; + bool hasChildren(const QModelIndex &parent) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; void refresh(); @@ -216,8 +216,8 @@ public: QList<QModelIndex> nonExistingFiles() const; protected: - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - bool setData(const QModelIndex &index, const QVariant &value, int role); + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role) override; public: QString fileName() const { return m_resource_file.fileName(); } @@ -261,7 +261,7 @@ public: void setDirty(bool b); private: - virtual QMimeData *mimeData (const QModelIndexList & indexes) const; + QMimeData *mimeData (const QModelIndexList & indexes) const override; static bool iconFileExtension(const QString &path); static QString resourcePath(const QString &prefix, const QString &file); @@ -302,7 +302,7 @@ class RelativeResourceModel : public ResourceModel public: RelativeResourceModel(QObject *parent = 0); - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override { if (!index.isValid()) return QVariant(); @@ -318,7 +318,7 @@ public: void setResourceDragEnabled(bool e) { m_resourceDragEnabled = e; } bool resourceDragEnabled() const { return m_resourceDragEnabled; } - virtual Qt::ItemFlags flags(const QModelIndex &index) const; + Qt::ItemFlags flags(const QModelIndex &index) const override; EntryBackup * removeEntry(const QModelIndex &index); diff --git a/src/plugins/resourceeditor/qrceditor/resourceview.h b/src/plugins/resourceeditor/qrceditor/resourceview.h index d15a638993..b9f4ec5c0c 100644 --- a/src/plugins/resourceeditor/qrceditor/resourceview.h +++ b/src/plugins/resourceeditor/qrceditor/resourceview.h @@ -52,7 +52,7 @@ public: }; explicit ResourceView(RelativeResourceModel *model, QUndoStack *history, QWidget *parent = 0); - ~ResourceView(); + ~ResourceView() override; QString fileName() const; @@ -92,7 +92,7 @@ signals: void contextMenuShown(const QPoint &globalPos, const QString &fileName); protected: - void keyPressEvent(QKeyEvent *e); + void keyPressEvent(QKeyEvent *e) override; private: void onItemActivated(const QModelIndex &index); diff --git a/src/plugins/resourceeditor/qrceditor/undocommands_p.h b/src/plugins/resourceeditor/qrceditor/undocommands_p.h index fac2a2d05d..aa871e32cb 100644 --- a/src/plugins/resourceeditor/qrceditor/undocommands_p.h +++ b/src/plugins/resourceeditor/qrceditor/undocommands_p.h @@ -48,7 +48,7 @@ protected: ResourceView *m_view; ViewCommand(ResourceView *view); - virtual ~ViewCommand(); + ~ViewCommand() override; }; /*! @@ -64,7 +64,7 @@ class ModelIndexViewCommand : public ViewCommand protected: ModelIndexViewCommand(ResourceView *view); - virtual ~ModelIndexViewCommand(); + ~ModelIndexViewCommand() override; void storeIndex(const QModelIndex &index); QModelIndex makeIndex() const; }; @@ -87,10 +87,10 @@ public: const QString &after = QString()); private: - int id() const { return m_mergeId; } - bool mergeWith(const QUndoCommand * command); - void undo(); - void redo(); + int id() const override { return m_mergeId; } + bool mergeWith(const QUndoCommand * command) override; + void undo() override; + void redo() override; }; /*! @@ -105,11 +105,11 @@ class RemoveEntryCommand : public ModelIndexViewCommand public: RemoveEntryCommand(ResourceView *view, const QModelIndex &index); - ~RemoveEntryCommand(); + ~RemoveEntryCommand() override; private: - void redo(); - void undo(); + void redo() override; + void undo() override; void freeEntry(); }; @@ -124,7 +124,7 @@ class RemoveMultipleEntryCommand : public QUndoCommand public: // list must be in view order RemoveMultipleEntryCommand(ResourceView *view, const QList<QModelIndex> &list); - ~RemoveMultipleEntryCommand(); + ~RemoveMultipleEntryCommand() override; private: void redo() override; void undo() override; @@ -149,8 +149,8 @@ public: const QStringList &fileNames); private: - void redo(); - void undo(); + void redo() override; + void undo() override; }; /*! @@ -166,8 +166,8 @@ public: AddEmptyPrefixCommand(ResourceView *view); private: - void redo(); - void undo(); + void redo() override; + void undo() override; }; } // namespace Internal diff --git a/src/plugins/resourceeditor/resourceeditorfactory.h b/src/plugins/resourceeditor/resourceeditorfactory.h index 3b954df68f..ed15110d2f 100644 --- a/src/plugins/resourceeditor/resourceeditorfactory.h +++ b/src/plugins/resourceeditor/resourceeditorfactory.h @@ -42,7 +42,7 @@ class ResourceEditorFactory : public Core::IEditorFactory public: explicit ResourceEditorFactory(ResourceEditorPlugin *plugin); - Core::IEditor *createEditor(); + Core::IEditor *createEditor() override; private: ResourceEditorPlugin *m_plugin; diff --git a/src/plugins/resourceeditor/resourceeditorplugin.h b/src/plugins/resourceeditor/resourceeditorplugin.h index 6da0079463..ad2432a42b 100644 --- a/src/plugins/resourceeditor/resourceeditorplugin.h +++ b/src/plugins/resourceeditor/resourceeditorplugin.h @@ -48,8 +48,8 @@ public: ResourceEditorPlugin(); // IPlugin - bool initialize(const QStringList &arguments, QString *errorMessage = 0); - void extensionsInitialized(); + bool initialize(const QStringList &arguments, QString *errorMessage = 0) override; + void extensionsInitialized() override; private slots: void onUndo(); |