[Webkit-unassigned] [Bug 29678] Conditionally guard cursor code with !QT_NO_CURSOR

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=29678


Simon Hausmann <hausmann at webkit.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #39991|review?                     |review-
               Flag|                            |




--- Comment #2 from Simon Hausmann <hausmann at webkit.org>  2009-09-23 06:15:31 PDT ---
(From update of attachment 39991)

> Index: WebKit/qt/Api/qwebgraphicsitem.cpp
> ===================================================================
> --- WebKit/qt/Api/qwebgraphicsitem.cpp	(revision 48670)
> +++ WebKit/qt/Api/qwebgraphicsitem.cpp	(working copy)
> @@ -95,12 +95,16 @@ void QWebGraphicsItemPrivate::update(con
>  
>  QCursor QWebGraphicsItemPrivate::cursor() const
>  {
> +#ifndef QT_NO_CURSOR
>      return q->cursor();
> +#endif
>  }
>  
>  void QWebGraphicsItemPrivate::updateCursor(const QCursor& cursor)
>  {
> +#ifndef QT_NO_CURSOR
>      q->setCursor(cursor);
> +#endif
>  }

The patch looks good to me, expect for these two hunks. Instead of placing the
#ifdef into the function it should be placed
around the definition/declaration. In other words: If QT_NO_CURSOR is defined,
then those functions not not be declared
in the first place, similar to the guards around QWidget::setCursor()/cursor()
in qwidget.h.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.