diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-03-06 11:16:45 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-06 19:52:12 +0100 |
| commit | 69e2739c9a514aa27748f625c2d9218028adda98 (patch) | |
| tree | e72a8e73217ba621143357bbe13bd083f4cf8449 /src/widgets/styles | |
| parent | bbbe9dcb724e8d6101d205b14100dead36f611a2 (diff) | |
QAndroidStyle: Fix warnings and compilation on Windows.
Change-Id: I0ce4545bdc40a5e1a8297a225c2a656076df4580
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/widgets/styles')
| -rw-r--r-- | src/widgets/styles/qandroidstyle.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/widgets/styles/qandroidstyle.cpp b/src/widgets/styles/qandroidstyle.cpp index a3c1063b41..d82a06987a 100644 --- a/src/widgets/styles/qandroidstyle.cpp +++ b/src/widgets/styles/qandroidstyle.cpp @@ -792,8 +792,8 @@ void QAndroidStyle::Android9PatchDrawable::draw(QPainter * painter, const QStyle QRectF dst; QRectF src; - const int32_t x0 = m_chunkData.xDivs[0]; - const int32_t y0 = m_chunkData.yDivs[0]; + const qint32 x0 = m_chunkData.xDivs[0]; + const qint32 y0 = m_chunkData.yDivs[0]; const quint8 numXDivs = m_chunkData.xDivs.size(); const quint8 numYDivs = m_chunkData.yDivs.size(); int i; @@ -1272,15 +1272,15 @@ QAndroidStyle::AndroidControl::~AndroidControl() delete m_background; } -void QAndroidStyle::AndroidControl::drawControl(const QStyleOption *opt, QPainter *p, const QWidget */*w*/) +void QAndroidStyle::AndroidControl::drawControl(const QStyleOption *opt, QPainter *p, const QWidget * /* w */) { if (m_background) m_background->draw(p, opt); } -QRect QAndroidStyle::AndroidControl::subElementRect(QStyle::SubElement /*subElement*/, +QRect QAndroidStyle::AndroidControl::subElementRect(QStyle::SubElement /* subElement */, const QStyleOption *option, - const QWidget */*widget*/) const + const QWidget * /* widget */) const { if (const AndroidDrawable *drawable=m_background) { if (drawable->type() == State) @@ -1312,7 +1312,7 @@ QRect QAndroidStyle::AndroidControl::subControlRect(const QStyleOptionComplex *o QSize QAndroidStyle::AndroidControl::sizeFromContents(const QStyleOption *opt, const QSize &contentsSize, - const QWidget */*w*/) const + const QWidget * /* w */) const { QSize sz; if (const AndroidDrawable *drawable=m_background) { @@ -1418,7 +1418,7 @@ QAndroidStyle::AndroidProgressBarControl::~AndroidProgressBarControl() delete m_indeterminateDrawable; } -void QAndroidStyle::AndroidProgressBarControl::drawControl(const QStyleOption *option, QPainter *p, const QWidget */*w*/) +void QAndroidStyle::AndroidProgressBarControl::drawControl(const QStyleOption *option, QPainter *p, const QWidget * /* w */) { if (!m_progressDrawable) return; @@ -1476,7 +1476,7 @@ QRect QAndroidStyle::AndroidProgressBarControl::subElementRect(QStyle::SubElemen QSize QAndroidStyle::AndroidProgressBarControl::sizeFromContents(const QStyleOption *opt, const QSize &contentsSize, - const QWidget */*w*/) const + const QWidget * /* w */) const { QSize sz(contentsSize); if (sz.height() < m_minSize.height()) @@ -1516,7 +1516,7 @@ QAndroidStyle::AndroidSeekBarControl::~AndroidSeekBarControl() void QAndroidStyle::AndroidSeekBarControl::drawControl(const QStyleOption *option, QPainter *p, - const QWidget */*w*/) + const QWidget * /* w */) { if (!m_seekBarThumb || !m_progressDrawable) return; @@ -1562,7 +1562,7 @@ QSize QAndroidStyle::AndroidSeekBarControl::sizeFromContents(const QStyleOption QRect QAndroidStyle::AndroidSeekBarControl::subControlRect(const QStyleOptionComplex *option, SubControl sc, - const QWidget */*widget*/) const + const QWidget * /* widget */) const { const QStyleOptionSlider *styleOption = qstyleoption_cast<const QStyleOptionSlider *>(option); |