diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-05 22:25:45 -0800 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-17 01:26:00 +0000 |
commit | 4cdff7a0ea95a881bba859157e6eb847f6c10dc5 (patch) | |
tree | d6eeffb4d847e1e0c9eee2d26e0713c985d979c4 /src/widgets/widgets | |
parent | 4da46bbb9a1b97759f3552c58e1b6d48e290e8ef (diff) |
QtWidgets: Fix const correctness in old style casts
Found with GCC's -Wcast-qual.
Change-Id: Ia0aac2f09e9245339951ffff13c94684f8498f21
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/widgets/widgets')
-rw-r--r-- | src/widgets/widgets/qdockwidget.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qtabwidget.cpp | 6 | ||||
-rw-r--r-- | src/widgets/widgets/qtoolbox.cpp | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index bee12f2d85..db8d167b0d 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -790,7 +790,7 @@ bool QDockWidgetPrivate::isAnimating() const if (mainWinLayout == 0) return false; - return (void*)mainWinLayout->pluggingWidget == (void*)q; + return (const void*)mainWinLayout->pluggingWidget == (const void*)q; } bool QDockWidgetPrivate::mousePressEvent(QMouseEvent *event) diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp index 707c430aa8..8ca5f0dc01 100644 --- a/src/widgets/widgets/qtabwidget.cpp +++ b/src/widgets/widgets/qtabwidget.cpp @@ -826,7 +826,7 @@ QSize QTabWidget::sizeHint() const if(d->rightCornerWidget) rc = d->rightCornerWidget->sizeHint(); if (!d->dirty) { - QTabWidget *that = (QTabWidget*)this; + QTabWidget *that = const_cast<QTabWidget*>(this); that->setUpLayout(true); } QSize s(d->stack->sizeHint()); @@ -858,7 +858,7 @@ QSize QTabWidget::minimumSizeHint() const if(d->rightCornerWidget) rc = d->rightCornerWidget->minimumSizeHint(); if (!d->dirty) { - QTabWidget *that = (QTabWidget*)this; + QTabWidget *that = const_cast<QTabWidget*>(this); that->setUpLayout(true); } QSize s(d->stack->minimumSizeHint()); @@ -894,7 +894,7 @@ int QTabWidget::heightForWidth(int width) const if(d->rightCornerWidget) rc = d->rightCornerWidget->sizeHint(); if (!d->dirty) { - QTabWidget *that = (QTabWidget*)this; + QTabWidget *that = const_cast<QTabWidget*>(this); that->setUpLayout(true); } QSize t(d->tabs->sizeHint()); diff --git a/src/widgets/widgets/qtoolbox.cpp b/src/widgets/widgets/qtoolbox.cpp index 0127e0766a..32fcdc3665 100644 --- a/src/widgets/widgets/qtoolbox.cpp +++ b/src/widgets/widgets/qtoolbox.cpp @@ -111,7 +111,7 @@ public: void _q_buttonClicked(); void _q_widgetDestroyed(QObject*); - Page *page(QWidget *widget) const; + const Page *page(QWidget *widget) const; const Page *page(int index) const; Page *page(int index); @@ -123,14 +123,14 @@ public: Page *currentPage; }; -QToolBoxPrivate::Page *QToolBoxPrivate::page(QWidget *widget) const +const QToolBoxPrivate::Page *QToolBoxPrivate::page(QWidget *widget) const { if (!widget) return 0; for (PageList::ConstIterator i = pageList.constBegin(); i != pageList.constEnd(); ++i) if ((*i).widget == widget) - return (Page*) &(*i); + return (const Page*) &(*i); return 0; } @@ -448,7 +448,7 @@ void QToolBoxPrivate::_q_widgetDestroyed(QObject *object) // no verification - vtbl corrupted already QWidget *p = (QWidget*)object; - QToolBoxPrivate::Page *c = page(p); + const QToolBoxPrivate::Page *c = page(p); if (!p || !c) return; @@ -550,7 +550,7 @@ QWidget *QToolBox::widget(int index) const int QToolBox::indexOf(QWidget *widget) const { Q_D(const QToolBox); - QToolBoxPrivate::Page *c = (widget ? d->page(widget) : 0); + const QToolBoxPrivate::Page *c = (widget ? d->page(widget) : 0); return c ? d->pageList.indexOf(*c) : -1; } |