feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

themeeditor: s/Q_DECL_OVERRIDE/override/g

Browse Source 
Change-Id: I81d4465ee89ac20f8d808bd8a74caafef436b79d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-06-03 15:33:14 +02:00
parent 6d6bb7a433
commit 47092d8e64
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/themeeditor/sectionedtablemodel.h
View File

@@ -50,16 +50,16 @@ public:
virtual Qt::ItemFlags sectionBodyFlags(int section, int row, int column) const = 0; virtual Qt::ItemFlags sectionBodyFlags(int section, int row, int column) const = 0;
virtual Qt::ItemFlags sectionHeaderFlags(int section) const = 0; virtual Qt::ItemFlags sectionHeaderFlags(int section) const = 0;
virtual int sectionCount() const = 0; virtual int sectionCount() const = 0;
QSize span(const QModelIndex &index) const Q_DECL_OVERRIDE; QSize span(const QModelIndex &index) const override;
int inSectionBody(int row) const; int inSectionBody(int row) const;
int modelToSectionRow(int row) const; int modelToSectionRow(int row) const;
int sectionHeader(int row) const; int sectionHeader(int row) const;
protected: protected:
int rowCount(const QModelIndex &index) const Q_DECL_OVERRIDE; int rowCount(const QModelIndex &index) const override;
QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; QVariant data(const QModelIndex &index, int role) const override;
Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; Qt::ItemFlags flags(const QModelIndex &index) const override;
}; };
} // namespace ThemeEditor } // namespace ThemeEditor

6
src/plugins/coreplugin/themeeditor/themesettingsitemdelegate.h
View File

@@ -58,9 +58,9 @@ class ThemeSettingsItemDelegate : public QStyledItemDelegate
public: public:
ThemeSettingsItemDelegate(QObject *parent); ThemeSettingsItemDelegate(QObject *parent);
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE; void setEditorData(QWidget *editor, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const Q_DECL_OVERRIDE; void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
void popupMenu(); void popupMenu();

18
src/plugins/coreplugin/themeeditor/themesettingstablemodel.h
View File

@@ -57,15 +57,15 @@ public:
ThemeSettingsTableModel(QObject *parent = 0); ThemeSettingsTableModel(QObject *parent = 0);
bool setData(const QModelIndex &index, const QVariant &value, int role) Q_DECL_OVERRIDE; bool setData(const QModelIndex &index, const QVariant &value, int role) override;
QVariant headerData(int section, Qt::Orientation orientation, int role) const Q_DECL_OVERRIDE; QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
int columnCount(const QModelIndex &index) const Q_DECL_OVERRIDE; int columnCount(const QModelIndex &index) const override;
int sectionRowCount(int section) const Q_DECL_OVERRIDE; int sectionRowCount(int section) const override;
QVariant sectionBodyData(int section, int row, int column, int role) const Q_DECL_OVERRIDE; QVariant sectionBodyData(int section, int row, int column, int role) const override;
QVariant sectionHeaderData(int section, int role) const Q_DECL_OVERRIDE; QVariant sectionHeaderData(int section, int role) const override;
Qt::ItemFlags sectionBodyFlags(int section, int row, int column) const Q_DECL_OVERRIDE; Qt::ItemFlags sectionBodyFlags(int section, int row, int column) const override;
Qt::ItemFlags sectionHeaderFlags(int section) const Q_DECL_OVERRIDE; Qt::ItemFlags sectionHeaderFlags(int section) const override;
int sectionCount() const Q_DECL_OVERRIDE; int sectionCount() const override;
ThemeColors::Ptr colors() const { return m_colors; } ThemeColors::Ptr colors() const { return m_colors; }