diff --git a/src/libs/timeline/timelinemodel.cpp b/src/libs/timeline/timelinemodel.cpp index f1746a4e265..d11fef6deac 100644 --- a/src/libs/timeline/timelinemodel.cpp +++ b/src/libs/timeline/timelinemodel.cpp @@ -157,11 +157,6 @@ TimelineModel::TimelineModelPrivate::TimelineModelPrivate(int modelId) : { } -TimelineModel::TimelineModel(TimelineModelPrivate &dd, QObject *parent) : - QObject(parent), d_ptr(&dd) -{ -} - TimelineModel::TimelineModel(int modelId, QObject *parent) : QObject(parent), d_ptr(new TimelineModelPrivate(modelId)) { diff --git a/src/libs/timeline/timelinemodel.h b/src/libs/timeline/timelinemodel.h index c525281510e..acf40f7a724 100644 --- a/src/libs/timeline/timelinemodel.h +++ b/src/libs/timeline/timelinemodel.h @@ -138,10 +138,8 @@ protected: virtual void clear(); - explicit TimelineModel(TimelineModelPrivate &dd, QObject *parent); - TimelineModelPrivate *d_ptr; - private: + TimelineModelPrivate *d_ptr; Q_DECLARE_PRIVATE(TimelineModel) }; diff --git a/src/libs/timeline/timelinemodel_p.h b/src/libs/timeline/timelinemodel_p.h index 8d422de4fe6..421dd44c93b 100644 --- a/src/libs/timeline/timelinemodel_p.h +++ b/src/libs/timeline/timelinemodel_p.h @@ -63,7 +63,6 @@ public: }; TimelineModelPrivate(int modelId); - void init(TimelineModel *q); int firstIndexNoParents(qint64 startTime) const; diff --git a/tests/auto/timeline/timelinemodel/tst_timelinemodel.cpp b/tests/auto/timeline/timelinemodel/tst_timelinemodel.cpp index d317169e18a..cd96a2772e4 100644 --- a/tests/auto/timeline/timelinemodel/tst_timelinemodel.cpp +++ b/tests/auto/timeline/timelinemodel/tst_timelinemodel.cpp @@ -31,12 +31,6 @@ static const int NumItems = 32; static const qint64 ItemDuration = 1 << 19; static const qint64 ItemSpacing = 1 << 20; -class DummyModelPrivate : public Timeline::TimelineModel::TimelineModelPrivate { -public: - DummyModelPrivate(int modelId) : Timeline::TimelineModel::TimelineModelPrivate(modelId) - {} -}; - class DummyModel : public Timeline::TimelineModel { Q_OBJECT @@ -86,7 +80,7 @@ private slots: }; DummyModel::DummyModel(int modelId) : - Timeline::TimelineModel(*new DummyModelPrivate(modelId), 0) + Timeline::TimelineModel(modelId, 0) { }