Reviewed by Tim H.
authorthatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Oct 2006 20:36:10 +0000 (20:36 +0000)
committerthatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Oct 2006 20:36:10 +0000 (20:36 +0000)
        Fix Qt/Linux build by adapting the s/ScrollBar/Scrollbar/ patch.

        * platform/qt/PlatformScrollBar.h:
        * platform/qt/ScrollViewQt.cpp:
        (WebCore::ScrollView::hScrollbarMode):
        (WebCore::ScrollView::vScrollbarMode):
        (WebCore::ScrollView::suppressScrollbars):
        (WebCore::ScrollView::setHScrollbarMode):
        (WebCore::ScrollView::setVScrollbarMode):
        (WebCore::ScrollView::setScrollbarsMode):
        (WebCore::ScrollView::scrollbarUnderMouse):
        * platform/qt/TemporaryLinkStubs.cpp:
        (WebCore::Scrollbar::Scrollbar):
        (WebCore::Scrollbar::setSteps):
        (WebCore::Scrollbar::scroll):
        (WebCore::Scrollbar::setValue):
        (WebCore::Scrollbar::setProportion):
        (WebCore::PlatformScrollbar::PlatformScrollbar):
        (WebCore::PlatformScrollbar::~PlatformScrollbar):
        (WebCore::PlatformScrollbar::width):
        (WebCore::PlatformScrollbar::height):
        (WebCore::PlatformScrollbar::setEnabled):
        (WebCore::PlatformScrollbar::paint):
        (WebCore::PlatformScrollbar::updateThumbPosition):
        (WebCore::PlatformScrollbar::updateThumbProportion):
        (WebCore::PlatformScrollbar::setRect):
        (FrameView::passMousePressEventToScrollbar):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16856 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/qt/PlatformScrollBar.h
WebCore/platform/qt/ScrollViewQt.cpp
WebCore/platform/qt/TemporaryLinkStubs.cpp

index c07899e4a0b7bec0bd9455a21de3e281260a1532..9a1d47671fd734045426684a0c139f905a573780 100644 (file)
@@ -1,3 +1,35 @@
+2006-10-06  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Tim H.
+
+        Fix Qt/Linux build by adapting the s/ScrollBar/Scrollbar/ patch.
+
+        * platform/qt/PlatformScrollBar.h:
+        * platform/qt/ScrollViewQt.cpp:
+        (WebCore::ScrollView::hScrollbarMode):
+        (WebCore::ScrollView::vScrollbarMode):
+        (WebCore::ScrollView::suppressScrollbars):
+        (WebCore::ScrollView::setHScrollbarMode):
+        (WebCore::ScrollView::setVScrollbarMode):
+        (WebCore::ScrollView::setScrollbarsMode):
+        (WebCore::ScrollView::scrollbarUnderMouse):
+        * platform/qt/TemporaryLinkStubs.cpp:
+        (WebCore::Scrollbar::Scrollbar):
+        (WebCore::Scrollbar::setSteps):
+        (WebCore::Scrollbar::scroll):
+        (WebCore::Scrollbar::setValue):
+        (WebCore::Scrollbar::setProportion):
+        (WebCore::PlatformScrollbar::PlatformScrollbar):
+        (WebCore::PlatformScrollbar::~PlatformScrollbar):
+        (WebCore::PlatformScrollbar::width):
+        (WebCore::PlatformScrollbar::height):
+        (WebCore::PlatformScrollbar::setEnabled):
+        (WebCore::PlatformScrollbar::paint):
+        (WebCore::PlatformScrollbar::updateThumbPosition):
+        (WebCore::PlatformScrollbar::updateThumbProportion):
+        (WebCore::PlatformScrollbar::setRect):
+        (FrameView::passMousePressEventToScrollbar):
+
 2006-10-06  Sam Weinig  <sam.weinig@gmail.com>
 
         Reviewed by Tim H.
index 7bb00a3ceecfda2fd4af274fb6c7f83b803fae61..cea788170fe9292fa85f33cce49550e6f036089d 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef PlatformScrollBar_h
-#define PlatformScrollBar_h
+#ifndef PlatformScrollbar_h
+#define PlatformScrollbar_h
 
 #include "Widget.h"
 #include "ScrollBar.h"
 
 namespace WebCore {
 
-class PlatformScrollBar : public Widget, public ScrollBar {
+class PlatformScrollbar : public Widget, public Scrollbar {
 public:
-    PlatformScrollBar(ScrollBarClient*, ScrollBarOrientation, ScrollBarControlSize);
-    virtual ~PlatformScrollBar();
+    PlatformScrollbar(ScrollbarClient*, ScrollbarOrientation, ScrollbarControlSize);
+    virtual ~PlatformScrollbar();
 
     virtual bool isWidget() const { return true; }
 
@@ -51,4 +51,4 @@ protected:
 
 }
 
-#endif // PlatformScrollBar_h
+#endif // PlatformScrollbar_h
index fb637592de540420485cc17c85081fcf3f2afc74..9d58b464379036a1ef0d4e62e85ab4810777b353 100644 (file)
@@ -152,77 +152,77 @@ void ScrollView::scrollBy(int dx, int dy)
     m_area->verticalScrollBar()->setValue(m_area->verticalScrollBar()->value() + dy);
 }
 
-ScrollBarMode ScrollView::hScrollBarMode() const
+ScrollbarMode ScrollView::hScrollbarMode() const
 {
     switch (m_area->horizontalScrollBarPolicy())
     {
         case Qt::ScrollBarAsNeeded:
-            return ScrollBarAuto;
+            return ScrollbarAuto;
         case Qt::ScrollBarAlwaysOff:
-            return ScrollBarAlwaysOff;
+            return ScrollbarAlwaysOff;
         case Qt::ScrollBarAlwaysOn:
-            return ScrollBarAlwaysOn;
+            return ScrollbarAlwaysOn;
     }
 
-    return ScrollBarAuto;
+    return ScrollbarAuto;
 }
 
-ScrollBarMode ScrollView::vScrollBarMode() const
+ScrollbarMode ScrollView::vScrollbarMode() const
 {
     switch (m_area->verticalScrollBarPolicy())
     {
         case Qt::ScrollBarAsNeeded:
-            return ScrollBarAuto;
+            return ScrollbarAuto;
         case Qt::ScrollBarAlwaysOff:
-            return ScrollBarAlwaysOff;
+            return ScrollbarAlwaysOff;
         case Qt::ScrollBarAlwaysOn:
-            return ScrollBarAlwaysOn;
+            return ScrollbarAlwaysOn;
     }
 
-    return ScrollBarAuto;
+    return ScrollbarAuto;
 }
 
-void ScrollView::suppressScrollBars(bool suppressed, bool /* repaintOnSuppress */)
+void ScrollView::suppressScrollbars(bool suppressed, bool /* repaintOnSuppress */)
 {
-    setScrollBarsMode(suppressed ? ScrollBarAlwaysOff : ScrollBarAuto);
+    setScrollbarsMode(suppressed ? ScrollbarAlwaysOff : ScrollbarAuto);
 }
 
-void ScrollView::setHScrollBarMode(ScrollBarMode newMode)
+void ScrollView::setHScrollbarMode(ScrollbarMode newMode)
 {
     switch (newMode)
     {
-        case ScrollBarAuto:
+        case ScrollbarAuto:
             m_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
             break;
-        case ScrollBarAlwaysOff:
+        case ScrollbarAlwaysOff:
             m_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
             break;
-        case ScrollBarAlwaysOn:
+        case ScrollbarAlwaysOn:
             m_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
             break;
     }
 }
 
-void ScrollView::setVScrollBarMode(ScrollBarMode newMode)
+void ScrollView::setVScrollbarMode(ScrollbarMode newMode)
 {
     switch (newMode)
     {
-        case ScrollBarAuto:
+        case ScrollbarAuto:
             m_area->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
             break;
-        case ScrollBarAlwaysOff:
+        case ScrollbarAlwaysOff:
             m_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
             break;
-        case ScrollBarAlwaysOn:
+        case ScrollbarAlwaysOn:
             m_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
             break;
     }
 }
 
-void ScrollView::setScrollBarsMode(ScrollBarMode newMode)
+void ScrollView::setScrollbarsMode(ScrollbarMode newMode)
 {
-    setHScrollBarMode(newMode);
-    setVScrollBarMode(newMode);
+    setHScrollbarMode(newMode);
+    setVScrollbarMode(newMode);
 }
 
 void ScrollView::setStaticBackground(bool flag)
@@ -262,7 +262,7 @@ void ScrollView::wheelEvent(PlatformWheelEvent&)
     notImplemented();
 }
 
-PlatformScrollBar* ScrollView::scrollbarUnderMouse(const PlatformMouseEvent& mouseEvent)
+PlatformScrollbar* ScrollView::scrollbarUnderMouse(const PlatformMouseEvent& mouseEvent)
 {
     // Probably don't care about this.
     return 0;
index d5e85281e21a7c5d977794151dce6ee52d9d1609..f90c33e6e1a3869f0a909100535e75e2d048134d 100644 (file)
@@ -121,21 +121,21 @@ void Slider::setFont(WebCore::Font const&) { notImplemented(); }
 double Slider::value() const { notImplemented(); return 0; }
 Widget::FocusPolicy Slider::focusPolicy() const { notImplemented(); return NoFocus; }
 
-ScrollBar::ScrollBar(ScrollBarClient*, ScrollBarOrientation, ScrollBarControlSize) { notImplemented(); }
-void ScrollBar::setSteps(int, int) { notImplemented(); }
-bool ScrollBar::scroll(ScrollDirection, ScrollGranularity, float) { notImplemented(); return 0; }
-bool ScrollBar::setValue(int) { notImplemented(); return 0; }
-void ScrollBar::setProportion(int, int) { notImplemented(); }
-
-PlatformScrollBar::PlatformScrollBar(ScrollBarClient* client, ScrollBarOrientation orientation, ScrollBarControlSize controlSize) : ScrollBar(client, orientation, controlSize) { notImplemented(); }
-PlatformScrollBar::~PlatformScrollBar() { notImplemented(); }
-int PlatformScrollBar::width() const { notImplemented(); return 0; }
-int PlatformScrollBar::height() const { notImplemented(); return 0; }
-void PlatformScrollBar::setEnabled(bool) { notImplemented(); }
-void PlatformScrollBar::paint(GraphicsContext*, const IntRect& damageRect) { notImplemented(); }
-void PlatformScrollBar::updateThumbPosition() { notImplemented(); }
-void PlatformScrollBar::updateThumbProportion() { notImplemented(); }
-void PlatformScrollBar::setRect(const IntRect&) { notImplemented(); }
+Scrollbar::Scrollbar(ScrollbarClient*, ScrollbarOrientation, ScrollbarControlSize) { notImplemented(); }
+void Scrollbar::setSteps(int, int) { notImplemented(); }
+bool Scrollbar::scroll(ScrollDirection, ScrollGranularity, float) { notImplemented(); return 0; }
+bool Scrollbar::setValue(int) { notImplemented(); return 0; }
+void Scrollbar::setProportion(int, int) { notImplemented(); }
+
+PlatformScrollbar::PlatformScrollbar(ScrollbarClient* client, ScrollbarOrientation orientation, ScrollbarControlSize controlSize) : Scrollbar(client, orientation, controlSize) { notImplemented(); }
+PlatformScrollbar::~PlatformScrollbar() { notImplemented(); }
+int PlatformScrollbar::width() const { notImplemented(); return 0; }
+int PlatformScrollbar::height() const { notImplemented(); return 0; }
+void PlatformScrollbar::setEnabled(bool) { notImplemented(); }
+void PlatformScrollbar::paint(GraphicsContext*, const IntRect& damageRect) { notImplemented(); }
+void PlatformScrollbar::updateThumbPosition() { notImplemented(); }
+void PlatformScrollbar::updateThumbProportion() { notImplemented(); }
+void PlatformScrollbar::setRect(const IntRect&) { notImplemented(); }
 
 PlatformMouseEvent::PlatformMouseEvent(const CurrentEventTag&) { notImplemented(); }
 
@@ -179,7 +179,7 @@ bool FrameView::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev,
 bool FrameView::passMouseMoveEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe) { return true; }
 bool FrameView::passMouseReleaseEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe) { return true; }
 bool FrameView::passWheelEventToSubframe(PlatformWheelEvent& e, Frame* subframe) { return false; }
-bool FrameView::passMousePressEventToScrollbar(MouseEventWithHitTestResults& mev, PlatformScrollBar*) { return false; }
+bool FrameView::passMousePressEventToScrollbar(MouseEventWithHitTestResults& mev, PlatformScrollbar*) { return false; }
 
 bool AXObjectCache::gAccessibilityEnabled = false;