diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-06-25 07:33:13 (GMT) |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-06-25 07:33:13 (GMT) |
| commit | 5b52c348243e6459cc7faa4ee76a23c7fadcd299 (patch) | |
| tree | be4bee855e535651b5fa22e9554ce1732f6ece70 /src/gui/widgets/qdockarealayout_p.h | |
| parent | 2020c692803a8a7839d85860d05174a193d9a848 (diff) | |
| parent | 0362832c16f95c2909e2a68351e15242b7d1b795 (diff) | |
| download | Qt-5b52c348243e6459cc7faa4ee76a23c7fadcd299.zip Qt-5b52c348243e6459cc7faa4ee76a23c7fadcd299.tar.gz Qt-5b52c348243e6459cc7faa4ee76a23c7fadcd299.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/widgets/qdockarealayout_p.h')
| -rw-r--r-- | src/gui/widgets/qdockarealayout_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/widgets/qdockarealayout_p.h b/src/gui/widgets/qdockarealayout_p.h index 137aeba..771aa52 100644 --- a/src/gui/widgets/qdockarealayout_p.h +++ b/src/gui/widgets/qdockarealayout_p.h @@ -181,7 +181,7 @@ public: void paintSeparators(QPainter *p, QWidget *widget, const QRegion &clip, const QPoint &mouse) const; QRegion separatorRegion() const; - int separatorMove(int index, int delta, QVector<QLayoutStruct> *cache); + int separatorMove(int index, int delta); QLayoutItem *itemAt(int *x, int index) const; QLayoutItem *takeAt(int *x, int index); @@ -277,8 +277,7 @@ public: void paintSeparators(QPainter *p, QWidget *widget, const QRegion &clip, const QPoint &mouse) const; QRegion separatorRegion() const; - int separatorMove(QList<int> separator, const QPoint &origin, const QPoint &dest, - QVector<QLayoutStruct> *cache); + int separatorMove(QList<int> separator, const QPoint &origin, const QPoint &dest); void updateSeparatorWidgets() const; QLayoutItem *itemAt(int *x, int index) const; |