From adada0b95d022b841a03080f332fb961b89de278 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@digia.com>
Date: Mon, 17 Feb 2014 16:32:08 +0100
Subject: [PATCH] QmlProfiler: Unify handling of category labels

Change-Id: I32ab2e354d3e45653e8dcb2cf8b0195d199786a6
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
 src/plugins/qmlprofiler/abstracttimelinemodel.cpp         | 8 ++++++++
 src/plugins/qmlprofiler/abstracttimelinemodel.h           | 2 +-
 .../qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp      | 8 --------
 .../qmlprofiler/qmlprofilerpainteventsmodelproxy.h        | 1 -
 src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp | 8 --------
 src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h   | 1 -
 6 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/plugins/qmlprofiler/abstracttimelinemodel.cpp b/src/plugins/qmlprofiler/abstracttimelinemodel.cpp
index 53277f78e96..1d6f70b0ca3 100644
--- a/src/plugins/qmlprofiler/abstracttimelinemodel.cpp
+++ b/src/plugins/qmlprofiler/abstracttimelinemodel.cpp
@@ -44,6 +44,14 @@ void AbstractTimelineModel::setModelManager(QmlProfilerModelManager *modelManage
     m_modelId = modelManager->registerModelProxy();
 }
 
+QStringList AbstractTimelineModel::categoryTitles() const
+{
+    QStringList retString;
+    for (int i = 0; i < categories(); i++)
+        retString << categoryLabel(i);
+    return retString;
+}
+
 qint64 AbstractTimelineModel::traceStartTime() const
 {
     return m_modelManager->traceTime()->startTime();
diff --git a/src/plugins/qmlprofiler/abstracttimelinemodel.h b/src/plugins/qmlprofiler/abstracttimelinemodel.h
index 8841e844f91..43f73e38904 100644
--- a/src/plugins/qmlprofiler/abstracttimelinemodel.h
+++ b/src/plugins/qmlprofiler/abstracttimelinemodel.h
@@ -51,7 +51,7 @@ public:
     void setModelManager(QmlProfilerModelManager *modelManager);
 
     virtual int categories() const = 0;
-    virtual QStringList categoryTitles() const = 0;
+    QStringList categoryTitles() const;
     virtual QString name() const = 0;
     virtual int count() const = 0;
 
diff --git a/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp b/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp
index 4d584ba906d..03a9bddf5ec 100644
--- a/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp
@@ -82,14 +82,6 @@ int PaintEventsModelProxy::categories() const
     return categoryCount();
 }
 
-QStringList PaintEventsModelProxy::categoryTitles() const
-{
-    QStringList retString;
-    for (int i=0; i<categories(); i++)
-        retString << categoryLabel(i);
-    return retString;
-}
-
 QString PaintEventsModelProxy::name() const
 {
     return QLatin1String("PaintEventsModelProxy");
diff --git a/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.h b/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.h
index 9d362fc79bf..165c6801700 100644
--- a/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.h
+++ b/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.h
@@ -65,7 +65,6 @@ public:
 
 
     int categories() const;
-    QStringList categoryTitles() const;
     QString name() const;
 
     void loadData();
diff --git a/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp b/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
index 93441580703..9700fdf8329 100644
--- a/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
@@ -89,14 +89,6 @@ int BasicTimelineModel::categories() const
     return categoryCount();
 }
 
-QStringList BasicTimelineModel::categoryTitles() const
-{
-    QStringList retString;
-    for (int i=0; i<categories(); i++)
-        retString << categoryLabel(i);
-    return retString;
-}
-
 QString BasicTimelineModel::name() const
 {
     return QLatin1String("BasicTimelineModel");
diff --git a/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h b/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h
index cf13b94959e..ceaf54c9c74 100644
--- a/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h
+++ b/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h
@@ -84,7 +84,6 @@ public:
 
 
     int categories() const;
-    QStringList categoryTitles() const;
     QString name() const;
 
     void loadData();