diff options
author | Joni Poikelin <joni.poikelin@qt.io> | 2015-05-05 13:32:42 +0300 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-10-15 12:30:04 +0000 |
commit | d88c65a532e99c1a5b1482d4798e3b024859b0cf (patch) | |
tree | dc5bb8d3f847fd413f6bf45a19ff0db25e2723fa | |
parent | c9aeb73fd198448b389d6366642be192b11094a1 (diff) | |
download | qtbase-d88c65a532e99c1a5b1482d4798e3b024859b0cf.tar.gz |
Qt 6: Change QMainWindow::toolBarArea to take const pointer instead
toolBarArea took non-const even though const would have been enough.
In the public API do this for Qt 6.
Fixes: QTBUG-45953
Change-Id: Ic99f4dd5a7f344d49d046e3b084b68120f8de3c0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r-- | src/widgets/widgets/qmainwindow.cpp | 6 | ||||
-rw-r--r-- | src/widgets/widgets/qmainwindow.h | 6 | ||||
-rw-r--r-- | src/widgets/widgets/qmainwindowlayout.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qmainwindowlayout_p.h | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qtoolbararealayout.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qtoolbararealayout_p.h | 2 |
6 files changed, 14 insertions, 6 deletions
diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp index aca38884a7..9172168761 100644 --- a/src/widgets/widgets/qmainwindow.cpp +++ b/src/widgets/widgets/qmainwindow.cpp @@ -863,7 +863,11 @@ void QMainWindow::removeToolBar(QToolBar *toolbar) \sa addToolBar(), addToolBarBreak(), Qt::ToolBarArea */ -Qt::ToolBarArea QMainWindow::toolBarArea(QToolBar *toolbar) const +Qt::ToolBarArea QMainWindow::toolBarArea( +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + const +#endif + QToolBar *toolbar) const { return d_func()->layout->toolBarArea(toolbar); } /*! diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h index 8f2a192446..85e3f87d77 100644 --- a/src/widgets/widgets/qmainwindow.h +++ b/src/widgets/widgets/qmainwindow.h @@ -158,7 +158,11 @@ public: bool unifiedTitleAndToolBarOnMac() const; - Qt::ToolBarArea toolBarArea(QToolBar *toolbar) const; + Qt::ToolBarArea toolBarArea( +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + const +#endif + QToolBar *toolbar) const; bool toolBarBreak(QToolBar *toolbar) const; #endif #if QT_CONFIG(dockwidget) diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index 053bfbf024..ed054c7e9a 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -1388,7 +1388,7 @@ void QMainWindowLayout::insertToolBar(QToolBar *before, QToolBar *toolbar) invalidate(); } -Qt::ToolBarArea QMainWindowLayout::toolBarArea(QToolBar *toolbar) const +Qt::ToolBarArea QMainWindowLayout::toolBarArea(const QToolBar *toolbar) const { QInternal::DockPosition pos = layoutState.toolBarAreaLayout.findToolBar(toolbar); switch (pos) { diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index 72cbec2350..a375d856bb 100644 --- a/src/widgets/widgets/qmainwindowlayout_p.h +++ b/src/widgets/widgets/qmainwindowlayout_p.h @@ -475,7 +475,7 @@ public: void addToolBar(Qt::ToolBarArea area, QToolBar *toolbar, bool needAddChildWidget = true); void insertToolBar(QToolBar *before, QToolBar *toolbar); - Qt::ToolBarArea toolBarArea(QToolBar *toolbar) const; + Qt::ToolBarArea toolBarArea(const QToolBar *toolbar) const; bool toolBarBreak(QToolBar *toolBar) const; void getStyleOptionInfo(QStyleOptionToolBar *option, QToolBar *toolBar) const; void removeToolBar(QToolBar *toolbar); diff --git a/src/widgets/widgets/qtoolbararealayout.cpp b/src/widgets/widgets/qtoolbararealayout.cpp index edf497111b..884eface3c 100644 --- a/src/widgets/widgets/qtoolbararealayout.cpp +++ b/src/widgets/widgets/qtoolbararealayout.cpp @@ -789,7 +789,7 @@ void QToolBarAreaLayout::deleteAllLayoutItems() } } -QInternal::DockPosition QToolBarAreaLayout::findToolBar(QToolBar *toolBar) const +QInternal::DockPosition QToolBarAreaLayout::findToolBar(const QToolBar *toolBar) const { for (int i = 0; i < QInternal::DockCount; ++i) { const QToolBarAreaLayoutInfo &dock = docks[i]; diff --git a/src/widgets/widgets/qtoolbararealayout_p.h b/src/widgets/widgets/qtoolbararealayout_p.h index dffbab1f21..17747ef29b 100644 --- a/src/widgets/widgets/qtoolbararealayout_p.h +++ b/src/widgets/widgets/qtoolbararealayout_p.h @@ -196,7 +196,7 @@ public: void insertItem(QInternal::DockPosition pos, QLayoutItem *item); void insertItem(QToolBar *before, QLayoutItem *item); - QInternal::DockPosition findToolBar(QToolBar *toolBar) const; + QInternal::DockPosition findToolBar(const QToolBar *toolBar) const; bool toolBarBreak(QToolBar *toolBar) const; void getStyleOptionInfo(QStyleOptionToolBar *option, QToolBar *toolBar) const; |