diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-11-16 12:00:14 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-11-16 12:00:14 (GMT) |
| commit | 6df2f295c7efddac12de87f8bfa347ab28761a6b (patch) | |
| tree | 10c66cf4e407b3c05ba96b441b72bb00b7be1fc4 /src/gui/widgets/qtoolbararealayout_p.h | |
| parent | 15e2b2d753250bbe01a78d9ece37f0f0b08cd21c (diff) | |
| parent | 2b60b542a5f51cb983e4ad99c5fdf4e962b59b89 (diff) | |
| download | Qt-6df2f295c7efddac12de87f8bfa347ab28761a6b.zip Qt-6df2f295c7efddac12de87f8bfa347ab28761a6b.tar.gz Qt-6df2f295c7efddac12de87f8bfa347ab28761a6b.tar.bz2 | |
Merge commit 's60/4.6' into mmfphonon
Diffstat (limited to 'src/gui/widgets/qtoolbararealayout_p.h')
| -rw-r--r-- | src/gui/widgets/qtoolbararealayout_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/widgets/qtoolbararealayout_p.h b/src/gui/widgets/qtoolbararealayout_p.h index 1e113b7..f0ab80c 100644 --- a/src/gui/widgets/qtoolbararealayout_p.h +++ b/src/gui/widgets/qtoolbararealayout_p.h @@ -155,8 +155,6 @@ public: class QToolBarAreaLayoutInfo { public: - enum { EmptyDockAreaSize = 80 }; // when a dock area is empty, how "wide" is it? - QToolBarAreaLayoutInfo(QInternal::DockPosition pos = QInternal::TopDock); QList<QToolBarAreaLayoutLine> lines; @@ -173,11 +171,11 @@ public: void removeToolBarBreak(QToolBar *before); void moveToolBar(QToolBar *toolbar, int pos); - QList<int> gapIndex(const QPoint &pos) const; + QList<int> gapIndex(const QPoint &pos, int *maxDistance) const; bool insertGap(const QList<int> &path, QLayoutItem *item); void clear(); QRect itemRect(const QList<int> &path) const; - QRect appendLineDropRect() const; + int distance(const QPoint &pos) const; QRect rect; Qt::Orientation o; |