- fix the Qt build

        * platform/qt/EditorClientQt.cpp:
        (WebCore::EditorClientQt::shouldShowDeleteInterface):
        * platform/qt/EditorClientQt.h:
        * platform/qt/FrameQt.cpp:

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e857e3a6a398fe2a761bb750ded92164e3dd92dd..6e221c349e6a6d1fa350773951647578ec85c326 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-21  Darin Adler  <darin@apple.com>
+
+        - fix the Qt build
+
+        * platform/qt/EditorClientQt.cpp:
+        (WebCore::EditorClientQt::shouldShowDeleteInterface):
+        * platform/qt/EditorClientQt.h:
+        * platform/qt/FrameQt.cpp:
+
 2006-10-21  Darin Adler  <darin@apple.com>
 
         Reviewed by Adele.

diff --git a/WebCore/platform/qt/EditorClientQt.cpp b/WebCore/platform/qt/EditorClientQt.cpp
index b58481baa5c91d58c1e8b633c1ab4c1b483919ea..c4ee49db6496b7c1c16e3c37fdafd8b93e5c9b51 100644 (file)
--- a/WebCore/platform/qt/EditorClientQt.cpp
+++ b/WebCore/platform/qt/EditorClientQt.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
+ * Copyright (C) 2006 Apple Computer, Inc.
  * 
  * All rights reserved.
  *
@@ -40,6 +41,11 @@ bool EditorClientQt::shouldDeleteRange(Range*)
     return false;
 }
 
+bool EditorClientQt::shouldShowDeleteInterface(HTMLElement*)
+{
+    return false;
+}
+
 }
 
 // vim: ts=4 sw=4 et

diff --git a/WebCore/platform/qt/EditorClientQt.h b/WebCore/platform/qt/EditorClientQt.h
index c63aa54dffaf63bc1a3d788b15f71b846067262d..536b2c7803c5bafa709a253520145aac830fa3f0 100644 (file)
--- a/WebCore/platform/qt/EditorClientQt.h
+++ b/WebCore/platform/qt/EditorClientQt.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
+ * Copyright (C) 2006 Apple Computer, Inc.
  * 
  * All rights reserved.
  *
@@ -32,13 +33,10 @@
 
 namespace WebCore {
 
-class Range;
-
 class EditorClientQt : public EditorClient {
 public:
-    virtual ~EditorClientQt() { }
-
     virtual bool shouldDeleteRange(Range*);
+    virtual bool shouldShowDeleteInterface(HTMLElement*);
 };
 
 }

diff --git a/WebCore/platform/qt/FrameQt.cpp b/WebCore/platform/qt/FrameQt.cpp
index 779d107c2677bad97cdfe0ae8ac6f1243775c52b..79f3a71aefc382bbb364f980ec50db374dd31fde 100644 (file)
--- a/WebCore/platform/qt/FrameQt.cpp
+++ b/WebCore/platform/qt/FrameQt.cpp
@@ -32,6 +32,7 @@
 
 #include "config.h"
 #include "FrameQt.h"
+
 #include "Element.h"
 #include "RenderObject.h"
 #include "RenderWidget.h"
@@ -68,6 +69,8 @@
 
 namespace WebCore {
 
+// FIXME: Turned this off to fix buildbot. This function be either deleted or used.
+#if 0
 static void doScroll(const RenderObject* r, bool isHorizontal, int multiplier)
 {
     // FIXME: The scrolling done here should be done in the default handlers
@@ -90,6 +93,7 @@ static void doScroll(const RenderObject* r, bool isHorizontal, int multiplier)
 
     r->layer()->scrollToOffset(x, y, true, true);
 }
+#endif
 
 FrameQt::FrameQt(Page* page, Element* ownerElement, FrameQtClient* frameClient, EditorClient* editorClient)
     : Frame(page, ownerElement, (editorClient ? editorClient : new EditorClientQt()))