Rename clip() to clipData() to avoid confusion and warning

There are already a bunch of clip() functions in this class.
Rename the one for returning clip data to clipData() to make
it clearer. It also eliminate a warning when compiling with
clang.

Change-Id: I1f890ad6bf1c0274a0b38b3116a3ec3d2957d44a
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>

diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h
index 79ed03e..f1310a5 100644 (file)
--- a/src/gui/painting/qpaintengine_raster_p.h
+++ b/src/gui/painting/qpaintengine_raster_p.h
@@ -194,7 +194,7 @@ public:
     void clip(const QVectorPath &path, Qt::ClipOperation op);
     void clip(const QRect &rect, Qt::ClipOperation op);
     void clip(const QRegion &region, Qt::ClipOperation op);
-    inline const QClipData *clip() const;
+    inline const QClipData *clipData() const;
 
     void drawStaticTextItem(QStaticTextItem *textItem);
     virtual bool drawCachedGlyphs(int numGlyphs, const glyph_t *glyphs, const QFixedPoint *positions,
@@ -492,7 +492,7 @@ inline const QClipData *QRasterPaintEnginePrivate::clip() const {
     return baseClip.data();
 }
 
-inline const QClipData *QRasterPaintEngine::clip() const {
+inline const QClipData *QRasterPaintEngine::clipData() const {
     Q_D(const QRasterPaintEngine);
     if (state() && state()->clip && state()->clip->enabled)
         return state()->clip;