khtmlview.cpp - correctly places ifdefs ?

[Rafael Fernández López-3]

Hi,

I attach a patch because reading some code to fix couple bugs I hit  
the next code:

     if ( linkCursor!=LINK_NORMAL && isVisible() && hasFocus() ) {
#ifdef Q_WS_X11
        code

#if 0
        code
#endif

         if( !d->cursor_icon_widget ) {
#ifdef Q_WS_X11
        code
#else
        code
#endif
         }

        code
#ifdef Q_WS_X11
        code
#elif defined(Q_WS_WIN)
        code
#else
         //TODO?
#endif
        code
#endif
     }

And since I saw #ifdef foo inside #ifdef foo I thought the outmost  
#endif was misplaced. Here is a patch... I just don't know the logic,  
just that I thought having if(foo) insnide if(foo) isn't very common  
or useful, so probably that #endif was meant to be before.


Regards,
Rafael Fernandez Lopez.

[kdelibs-khtmlview.diff]

---

diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
index 92fd3c7..153cba9 100644
--- a/khtml/khtmlview.cpp
+++ b/khtml/khtmlview.cpp
@@ -1441,6 +1441,7 @@ void KHTMLView::mouseMoveEvent( QMouseEvent * _mouse )
           default:              cursorIcon = "dialog-error";     break;
  }
         QPixmap icon_pixmap = KHTMLGlobal::iconLoader()->loadIcon( cursorIcon, KIconLoader::Small, 0, KIconLoader::DefaultState, QStringList(), 0, true );
+#endif
 
 #if 0
  if (d->cursor_icon_widget)
@@ -1485,7 +1486,6 @@ void KHTMLView::mouseMoveEvent( QMouseEvent * _mouse )
         //TODO?
 #endif
         d->cursor_icon_widget->show();
-#endif
     }
     else if ( d->cursor_icon_widget )
         d->cursor_icon_widget->hide();

---