diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-13 16:03:27 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-13 16:03:27 (GMT) |
| commit | 149b13bdec3802a80e86a0de77837d7e9cbab8af (patch) | |
| tree | 41a76edb43874b11d36f53c745a3e40393feb52f /src/gui/widgets/qtoolbararealayout_p.h | |
| parent | cf44101e03eb33caa7c37fbd8023c2948b7f0249 (diff) | |
| parent | 0c52573b646d8f139f37c26c954d03061ddb485a (diff) | |
| download | Qt-149b13bdec3802a80e86a0de77837d7e9cbab8af.zip Qt-149b13bdec3802a80e86a0de77837d7e9cbab8af.tar.gz Qt-149b13bdec3802a80e86a0de77837d7e9cbab8af.tar.bz2 | |
Merge branch '4.6'
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; |