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

Timeline: Remove TimelineModel ctor with private object

Browse Source 
Change-Id: Ie4e50c08f77cd710f067f1c5e33a1656878e0640
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Ulf Hermann
2016-08-10 17:48:09 +02:00
parent c5da4a3df8
commit 51e074b0b7
4 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/timeline/timelinemodel.cpp
View File

@@ -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) : TimelineModel::TimelineModel(int modelId, QObject *parent) :
QObject(parent), d_ptr(new TimelineModelPrivate(modelId)) QObject(parent), d_ptr(new TimelineModelPrivate(modelId))
{ {

4
src/libs/timeline/timelinemodel.h
View File

@@ -138,10 +138,8 @@ protected:
virtual void clear(); virtual void clear();
explicit TimelineModel(TimelineModelPrivate &dd, QObject *parent);
TimelineModelPrivate *d_ptr;
private: private:
TimelineModelPrivate *d_ptr;
Q_DECLARE_PRIVATE(TimelineModel) Q_DECLARE_PRIVATE(TimelineModel)
}; };

1
src/libs/timeline/timelinemodel_p.h
View File

@@ -63,7 +63,6 @@ public:
}; };
TimelineModelPrivate(int modelId); TimelineModelPrivate(int modelId);
void init(TimelineModel *q);
int firstIndexNoParents(qint64 startTime) const; int firstIndexNoParents(qint64 startTime) const;

8
tests/auto/timeline/timelinemodel/tst_timelinemodel.cpp
View File

@@ -31,12 +31,6 @@ static const int NumItems = 32;
static const qint64 ItemDuration = 1 << 19; static const qint64 ItemDuration = 1 << 19;
static const qint64 ItemSpacing = 1 << 20; 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 class DummyModel : public Timeline::TimelineModel
{ {
Q_OBJECT Q_OBJECT
@@ -86,7 +80,7 @@ private slots:
}; };
DummyModel::DummyModel(int modelId) : DummyModel::DummyModel(int modelId) :
Timeline::TimelineModel(*new DummyModelPrivate(modelId), 0) Timeline::TimelineModel(modelId, 0)
{ {
} }