aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2018-05-14 09:43:15 +0200
committerUlf Hermann <ulf.hermann@qt.io>2018-05-15 07:20:41 +0000
commit2522275b69f14ad0378ddbf42004c0b7104f3d73 (patch)
tree180e76876ea1d0d05d4b7e9869dcb2f625835469 /src
parente5e493c2915e4aca976b7bc464c52d27caf87b40 (diff)
Tracing: Untangle some includes
Forward declare in the header and include in the implementation where possible. Change-Id: Iea54f52fbf1deecab5f5a257821cd6383cf69a91 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/libs/tracing/timelinenotesmodel.cpp1
-rw-r--r--src/libs/tracing/timelinenotesmodel.h4
-rw-r--r--src/libs/tracing/timelinetracemanager.cpp1
-rw-r--r--src/libs/tracing/timelinetracemanager.h2
-rw-r--r--src/plugins/qmlprofiler/qmlprofilernotesmodel.cpp1
5 files changed, 7 insertions, 2 deletions
diff --git a/src/libs/tracing/timelinenotesmodel.cpp b/src/libs/tracing/timelinenotesmodel.cpp
index c73e55f07d..fcbb91d003 100644
--- a/src/libs/tracing/timelinenotesmodel.cpp
+++ b/src/libs/tracing/timelinenotesmodel.cpp
@@ -23,6 +23,7 @@
**
****************************************************************************/
+#include "timelinemodel.h"
#include "timelinenotesmodel_p.h"
namespace Timeline {
diff --git a/src/libs/tracing/timelinenotesmodel.h b/src/libs/tracing/timelinenotesmodel.h
index 6826ed4721..8db19e233d 100644
--- a/src/libs/tracing/timelinenotesmodel.h
+++ b/src/libs/tracing/timelinenotesmodel.h
@@ -25,10 +25,12 @@
#pragma once
-#include "timelinemodel.h"
+#include "tracing_global.h"
+#include <QObject>
namespace Timeline {
+class TimelineModel;
class TRACING_EXPORT TimelineNotesModel : public QObject
{
Q_OBJECT
diff --git a/src/libs/tracing/timelinetracemanager.cpp b/src/libs/tracing/timelinetracemanager.cpp
index dcc8d322b5..0482e6df2a 100644
--- a/src/libs/tracing/timelinetracemanager.cpp
+++ b/src/libs/tracing/timelinetracemanager.cpp
@@ -23,6 +23,7 @@
**
****************************************************************************/
+#include "timelinenotesmodel.h"
#include "timelinetracemanager.h"
#include "timelinetracefile.h"
diff --git a/src/libs/tracing/timelinetracemanager.h b/src/libs/tracing/timelinetracemanager.h
index fb8cd561d8..4b57a536d9 100644
--- a/src/libs/tracing/timelinetracemanager.h
+++ b/src/libs/tracing/timelinetracemanager.h
@@ -26,7 +26,6 @@
#pragma once
#include "tracing_global.h"
-#include "timelinenotesmodel.h"
#include "traceevent.h"
#include "traceeventtype.h"
@@ -60,6 +59,7 @@ public:
virtual bool replay(const std::function<bool(TraceEvent &&)> &receiver) const = 0;
};
+class TimelineNotesModel;
class TimelineTraceFile;
class TRACING_EXPORT TimelineTraceManager : public QObject
{
diff --git a/src/plugins/qmlprofiler/qmlprofilernotesmodel.cpp b/src/plugins/qmlprofiler/qmlprofilernotesmodel.cpp
index 337df16c01..35ac01a5ae 100644
--- a/src/plugins/qmlprofiler/qmlprofilernotesmodel.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilernotesmodel.cpp
@@ -25,6 +25,7 @@
#include "qmlprofilernotesmodel.h"
+#include <tracing/timelinemodel.h>
#include <utils/algorithm.h>
namespace QmlProfiler {