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

QmlProfiler: Fix warnings about inconsistent use of overrides

Browse Source 
Change-Id: I325b5d4371fb662c13a131963b382c77976fc803
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Tobias Hunger
2016-05-24 14:03:39 +02:00
parent ab8006913a
commit e6a910bb3d
6 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmlprofiler/inputeventsmodel.h
View File

@@ -35,7 +35,7 @@ class InputEventsModel : public QmlProfilerTimelineModel
Q_OBJECT Q_OBJECT
protected: protected:
bool accepted(const QmlEventType &event) const; bool accepted(const QmlEventType &event) const override;
void loadEvent(const QmlEvent &event, const QmlEventType &type) override; void loadEvent(const QmlEvent &event, const QmlEventType &type) override;
void finalize() override; void finalize() override;
void clear() override; void clear() override;
@@ -50,12 +50,12 @@ public:
InputEventsModel(QmlProfilerModelManager *manager, QObject *parent = 0); InputEventsModel(QmlProfilerModelManager *manager, QObject *parent = 0);
int typeId(int index) const; int typeId(int index) const override;
QColor color(int index) const; QColor color(int index) const override;
QVariantList labels() const; QVariantList labels() const override;
QVariantMap details(int index) const; QVariantMap details(int index) const override;
int expandedRow(int index) const; int expandedRow(int index) const override;
int collapsedRow(int index) const; int collapsedRow(int index) const override;
private: private:
static QMetaEnum metaEnum(const char *name); static QMetaEnum metaEnum(const char *name);

18
src/plugins/qmlprofiler/memoryusagemodel.h
View File

@@ -55,18 +55,18 @@ public:
MemoryUsageModel(QmlProfilerModelManager *manager, QObject *parent = 0); MemoryUsageModel(QmlProfilerModelManager *manager, QObject *parent = 0);
int rowMaxValue(int rowNumber) const; int rowMaxValue(int rowNumber) const override;
int expandedRow(int index) const; int expandedRow(int index) const override;
int collapsedRow(int index) const; int collapsedRow(int index) const override;
int typeId(int index) const; int typeId(int index) const override;
QColor color(int index) const; QColor color(int index) const override;
float relativeHeight(int index) const; float relativeHeight(int index) const override;
QVariantMap location(int index) const; QVariantMap location(int index) const override;
QVariantList labels() const; QVariantList labels() const override;
QVariantMap details(int index) const; QVariantMap details(int index) const override;
protected: protected:
bool accepted(const QmlEventType &type) const override; bool accepted(const QmlEventType &type) const override;

16
src/plugins/qmlprofiler/pixmapcachemodel.h
View File

@@ -93,17 +93,17 @@ public:
PixmapCacheModel(QmlProfilerModelManager *manager, QObject *parent = 0); PixmapCacheModel(QmlProfilerModelManager *manager, QObject *parent = 0);
int rowMaxValue(int rowNumber) const; int rowMaxValue(int rowNumber) const override;
int expandedRow(int index) const; int expandedRow(int index) const override;
int collapsedRow(int index) const; int collapsedRow(int index) const override;
int typeId(int index) const; int typeId(int index) const override;
QColor color(int index) const; QColor color(int index) const override;
float relativeHeight(int index) const; float relativeHeight(int index) const override;
QVariantList labels() const; QVariantList labels() const override;
QVariantMap details(int index) const; QVariantMap details(int index) const override;
protected: protected:
void loadEvent(const QmlEvent &event, const QmlEventType &type) override; void loadEvent(const QmlEvent &event, const QmlEventType &type) override;

16
src/plugins/qmlprofiler/qmlprofileranimationsmodel.h
View File

@@ -52,17 +52,17 @@ public:
QmlProfilerAnimationsModel(QmlProfilerModelManager *manager, QObject *parent = 0); QmlProfilerAnimationsModel(QmlProfilerModelManager *manager, QObject *parent = 0);
int rowMaxValue(int rowNumber) const; int rowMaxValue(int rowNumber) const override;
int typeId(int index) const; int typeId(int index) const override;
Q_INVOKABLE int expandedRow(int index) const; Q_INVOKABLE int expandedRow(int index) const override;
Q_INVOKABLE int collapsedRow(int index) const; Q_INVOKABLE int collapsedRow(int index) const override;
QColor color(int index) const; QColor color(int index) const override;
float relativeHeight(int index) const; float relativeHeight(int index) const override;
QVariantList labels() const; QVariantList labels() const override;
QVariantMap details(int index) const; QVariantMap details(int index) const override;
protected: protected:
bool accepted(const QmlEventType &event) const override; bool accepted(const QmlEventType &event) const override;

20
src/plugins/qmlprofiler/qmlprofilerrangemodel.h
View File

@@ -59,19 +59,19 @@ public:
QmlProfilerRangeModel(QmlProfilerModelManager *manager, RangeType range, QObject *parent = 0); QmlProfilerRangeModel(QmlProfilerModelManager *manager, RangeType range, QObject *parent = 0);
Q_INVOKABLE int expandedRow(int index) const; Q_INVOKABLE int expandedRow(int index) const override;
Q_INVOKABLE int collapsedRow(int index) const; Q_INVOKABLE int collapsedRow(int index) const override;
int bindingLoopDest(int index) const; int bindingLoopDest(int index) const override;
QColor color(int index) const; QColor color(int index) const override;
QVariantList labels() const; QVariantList labels() const override;
QVariantMap details(int index) const; QVariantMap details(int index) const override;
QVariantMap location(int index) const; QVariantMap location(int index) const override;
int typeId(int index) const; int typeId(int index) const override;
int selectionIdForLocation(const QString &filename, int line, int column) const; int selectionIdForLocation(const QString &filename, int line, int column) const override;
virtual QList<const Timeline::TimelineRenderPass *> supportedRenderPasses() const; virtual QList<const Timeline::TimelineRenderPass *> supportedRenderPasses() const override;
protected: protected:
void loadEvent(const QmlEvent &event, const QmlEventType &type) override; void loadEvent(const QmlEvent &event, const QmlEventType &type) override;

12
src/plugins/qmlprofiler/scenegraphtimelinemodel.h
View File

@@ -85,14 +85,14 @@ public:
SceneGraphTimelineModel(QmlProfilerModelManager *manager, QObject *parent = 0); SceneGraphTimelineModel(QmlProfilerModelManager *manager, QObject *parent = 0);
int expandedRow(int index) const; int expandedRow(int index) const override;
int collapsedRow(int index) const; int collapsedRow(int index) const override;
int typeId(int index) const; int typeId(int index) const override;
QColor color(int index) const; QColor color(int index) const override;
QVariantList labels() const; QVariantList labels() const override;
QVariantMap details(int index) const; QVariantMap details(int index) const override;
protected: protected:
void loadEvent(const QmlEvent &event, const QmlEventType &type) override; void loadEvent(const QmlEvent &event, const QmlEventType &type) override;