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

QmlProfiler: Add some consistency to input events model

Browse Source 
Methods that are public in the base class should also be public in the
derived class. Also, the accepted() method takes a type, not an event.

Change-Id: I086d382ffc2e71c7efda56b0dbf341942986582c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Ulf Hermann
2016-06-02 14:56:32 +02:00
parent b4462c2553
commit c3a873b906
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmlprofiler/inputeventsmodel.cpp
View File

@@ -167,10 +167,10 @@ void InputEventsModel::clear()
QmlProfilerTimelineModel::clear(); QmlProfilerTimelineModel::clear();
} }
bool InputEventsModel::accepted(const QmlEventType &event) const bool InputEventsModel::accepted(const QmlEventType &type) const
{ {
return QmlProfilerTimelineModel::accepted(event) && return QmlProfilerTimelineModel::accepted(type) &&
(event.detailType == Mouse || event.detailType == Key); (type.detailType == Mouse || type.detailType == Key);
} }
InputEventsModel::InputEvent::InputEvent(InputEventType type, int a, int b) : InputEventsModel::InputEvent::InputEvent(InputEventType type, int a, int b) :

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

@@ -34,12 +34,6 @@ class InputEventsModel : public QmlProfilerTimelineModel
{ {
Q_OBJECT Q_OBJECT
protected:
bool accepted(const QmlEventType &event) const override;
void loadEvent(const QmlEvent &event, const QmlEventType &type) override;
void finalize() override;
void clear() override;
public: public:
struct InputEvent { struct InputEvent {
InputEvent(InputEventType type = MaximumInputEventType, int a = 0, int b = 0); InputEvent(InputEventType type = MaximumInputEventType, int a = 0, int b = 0);
@@ -50,6 +44,11 @@ public:
InputEventsModel(QmlProfilerModelManager *manager, QObject *parent = 0); InputEventsModel(QmlProfilerModelManager *manager, QObject *parent = 0);
bool accepted(const QmlEventType &type) const override;
void loadEvent(const QmlEvent &event, const QmlEventType &type) override;
void finalize() override;
void clear() override;
int typeId(int index) const override; int typeId(int index) const override;
QColor color(int index) const override; QColor color(int index) const override;
QVariantList labels() const override; QVariantList labels() const override;