diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-01-09 13:01:23 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-10 16:11:59 +0100 |
| commit | c42a969b2fecc117f0c77fded008cc1b4f897bb3 (patch) | |
| tree | d878ef79cfbb024832537472f64eaa22d37ee2b7 /src/widgets/itemviews/qitemdelegate.h | |
| parent | c11cb16f3f4249347ea3db4e1586bc1dac3a7d39 (diff) | |
Rename internal method check to doCheck
Mac OSX has a check macro in /usr/include/AssertMacros.h which can
conflict with this API if used together.
http://boost.2283326.n4.nabble.com/Boost-with-Darwin-Mac-gcc-4-0-1-td2580330.html
Change-Id: I93ddd08fa2b51b198bbc02ce501d79ed97a32c34
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/itemviews/qitemdelegate.h')
| -rw-r--r-- | src/widgets/itemviews/qitemdelegate.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/itemviews/qitemdelegate.h b/src/widgets/itemviews/qitemdelegate.h index 9e21686b8b..5ea6b33f2d 100644 --- a/src/widgets/itemviews/qitemdelegate.h +++ b/src/widgets/itemviews/qitemdelegate.h @@ -120,7 +120,7 @@ protected: QPixmap decoration(const QStyleOptionViewItem &option, const QVariant &variant) const; QPixmap *selected(const QPixmap &pixmap, const QPalette &palette, bool enabled) const; - QRect check(const QStyleOptionViewItem &option, const QRect &bounding, + QRect doCheck(const QStyleOptionViewItem &option, const QRect &bounding, const QVariant &variant) const; QRect textRectangle(QPainter *painter, const QRect &rect, const QFont &font, const QString &text) const; |