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/kernel | |
| 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/kernel')
| -rw-r--r-- | src/widgets/kernel/qgridlayout.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qlayoutengine.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/kernel/qwhatsthis.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/kernel/qgridlayout.cpp b/src/widgets/kernel/qgridlayout.cpp index 0e0c1588a1..85898ae86c 100644 --- a/src/widgets/kernel/qgridlayout.cpp +++ b/src/widgets/kernel/qgridlayout.cpp @@ -1275,7 +1275,7 @@ QSize QGridLayout::maximumSize() const */ bool QGridLayout::hasHeightForWidth() const { - return ((QGridLayout*)this)->d_func()->hasHeightForWidth(horizontalSpacing(), verticalSpacing()); + return const_cast<QGridLayout*>(this)->d_func()->hasHeightForWidth(horizontalSpacing(), verticalSpacing()); } /*! diff --git a/src/widgets/kernel/qlayoutengine.cpp b/src/widgets/kernel/qlayoutengine.cpp index ae10b84e81..f071ca567e 100644 --- a/src/widgets/kernel/qlayoutengine.cpp +++ b/src/widgets/kernel/qlayoutengine.cpp @@ -370,7 +370,7 @@ Q_WIDGETS_EXPORT QSize qSmartMinSize(const QSize &sizeHint, const QSize &minSize Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidgetItem *i) { - QWidget *w = ((QWidgetItem *)i)->widget(); + QWidget *w = const_cast<QWidgetItem *>(i)->widget(); return qSmartMinSize(w->sizeHint(), w->minimumSizeHint(), w->minimumSize(), w->maximumSize(), w->sizePolicy()); @@ -408,7 +408,7 @@ Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QSize &sizeHint, Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align) { - QWidget *w = ((QWidgetItem*)i)->widget(); + QWidget *w = const_cast<QWidgetItem*>(i)->widget(); return qSmartMaxSize(w->sizeHint().expandedTo(w->minimumSizeHint()), w->minimumSize(), w->maximumSize(), w->sizePolicy(), align); diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp index db9e09c8c2..5fb4695687 100644 --- a/src/widgets/kernel/qwhatsthis.cpp +++ b/src/widgets/kernel/qwhatsthis.cpp @@ -495,7 +495,7 @@ private slots: QWhatsThisAction::QWhatsThisAction(QObject *parent) : QAction(tr("What's This?"), parent) { #ifndef QT_NO_IMAGEFORMAT_XPM - QPixmap p((const char**)button_image); + QPixmap p(button_image); setIcon(p); #endif setCheckable(true); diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 1c86e8cf7a..559e4ae43f 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -4284,7 +4284,7 @@ QPoint QWidget::mapFromParent(const QPoint &pos) const QWidget *QWidget::window() const { - QWidget *w = (QWidget *)this; + QWidget *w = const_cast<QWidget *>(this); QWidget *p = w->parentWidget(); while (!w->isWindow() && p) { w = p; |