diff options
author | Alexis Menard <alexis.menard@nokia.com> | 2009-12-07 13:55:23 +0100 |
---|---|---|
committer | Alexis Menard <alexis.menard@nokia.com> | 2009-12-07 13:55:23 +0100 |
commit | 211c0a1dd5c10c60c3383748b13e17e6bdeaea54 (patch) | |
tree | 268920a5f40744663dd4bf8d405d35d324926f95 /src/3rdparty/webkit/WebCore/rendering/RenderView.h | |
parent | fd44f52df9275e717292f5c7e90015fc9bf14603 (diff) | |
parent | 35a740fa663d4669a45ada9c37c46546e59bbb82 (diff) |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into widgets-ng
Diffstat (limited to 'src/3rdparty/webkit/WebCore/rendering/RenderView.h')
-rw-r--r-- | src/3rdparty/webkit/WebCore/rendering/RenderView.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderView.h b/src/3rdparty/webkit/WebCore/rendering/RenderView.h index 854a4214d..bc5db9e64 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderView.h +++ b/src/3rdparty/webkit/WebCore/rendering/RenderView.h @@ -205,16 +205,16 @@ private: #endif }; -inline RenderView* toRenderView(RenderObject* o) +inline RenderView* toRenderView(RenderObject* object) { - ASSERT(!o || o->isRenderView()); - return static_cast<RenderView*>(o); + ASSERT(!object || object->isRenderView()); + return static_cast<RenderView*>(object); } -inline const RenderView* toRenderView(const RenderObject* o) +inline const RenderView* toRenderView(const RenderObject* object) { - ASSERT(!o || o->isRenderView()); - return static_cast<const RenderView*>(o); + ASSERT(!object || object->isRenderView()); + return static_cast<const RenderView*>(object); } // This will catch anyone doing an unnecessary cast. |