diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2016-05-02 12:18:57 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-05-03 15:00:50 +0000 |
commit | e5a38bacc4bcfd770f56122b86233ff35b0579ac (patch) | |
tree | db03f5112d616cbab6f5b9401cf296fa759fa54b /src/plugins/qmlprofiler/memoryusagemodel.h | |
parent | 08655de4a5891ab3a8fe07970c826958be7c52fc (diff) |
Move QmlProfiler specific files from qmldebug to qmlprofiler
These file were not used anywhere else and had no business to be in
qmldebug to begin with. Moving them allows us to drop a number of
namespace qualifications and forces us to rename a few local symbols
in other classes in order to avoid name clashes.
Change-Id: I658ed455eec027cbaddacf2980d2ea6827ae6205
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmlprofiler/memoryusagemodel.h')
-rw-r--r-- | src/plugins/qmlprofiler/memoryusagemodel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmlprofiler/memoryusagemodel.h b/src/plugins/qmlprofiler/memoryusagemodel.h index c8a834567be..a8748cc2400 100644 --- a/src/plugins/qmlprofiler/memoryusagemodel.h +++ b/src/plugins/qmlprofiler/memoryusagemodel.h @@ -39,7 +39,7 @@ class MemoryUsageModel : public QmlProfilerTimelineModel Q_OBJECT public: - struct MemoryAllocation { + struct MemoryAllocationItem { int typeId; qint64 size; qint64 allocated; @@ -48,7 +48,7 @@ public: int deallocations; int originTypeIndex; - MemoryAllocation(int typeId = -1, qint64 baseAmount = 0, int originTypeIndex = -1); + MemoryAllocationItem(int typeId = -1, qint64 baseAmount = 0, int originTypeIndex = -1); void update(qint64 amount); }; @@ -74,7 +74,7 @@ protected: private: static QString memoryTypeName(int type); - QVector<MemoryAllocation> m_data; + QVector<MemoryAllocationItem> m_data; qint64 m_maxSize; }; |