Fix the Qt build

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 36a43945ac405e5ac7b79f73ef953280051f82c3..9e12176c1735ad0b964b335f85812176bc640df7 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2006-12-12  George Staikos  <staikos@kde.org>
+
+        Reviewed by Alexey.
+
+        Fix the Qt build again.
+
+        * WebCore.pro:
+        * loader/qt/FrameLoaderQt.cpp:
+        (WebCore::FrameLoader::createFrame):
+        (WebCore::FrameLoader::load):
+        * platform/qt/PasteboardQt.cpp:
+        (WebCore::Pasteboard::writeSelection):
+        (WebCore::Pasteboard::writeURL):
+        (WebCore::Pasteboard::clear):
+
 2006-12-12  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Beth Dakin.

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 87a369f53c7c481c98052f879d476e43a8bd1264..cc67c5483d32ee3b36fe99c11b000cff3db901fe 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -403,6 +403,7 @@ SOURCES += \
     html/HTMLFrameSetElement.cpp \
     html/HTMLBodyElement.cpp \
     html/HTMLBRElement.cpp \
+    html/HTMLFrameOwnerElement.cpp \
     html/HTMLNameCollection.cpp \
     html/HTMLLegendElement.cpp \
     html/HTMLLIElement.cpp \
@@ -505,6 +506,7 @@ SOURCES += \
     loader/qt/ResourceLoaderQt.cpp \
     platform/CString.cpp \
     platform/AtomicString.cpp \
+    platform/Base64.cpp \
     platform/graphics/AffineTransform.cpp \
     platform/TextStream.cpp \
     platform/Widget.cpp \
@@ -816,18 +818,13 @@ contains(DEFINES, SVG_SUPPORT=1) {
         ksvg2/svg/SVGUnitTypes.idl \
         ksvg2/svg/SVGUseElement.idl \
         ksvg2/svg/SVGViewElement.idl \
-        ksvg2/events/SVGZoomEvent.idl
-
-    LUT_TABLE_FILES += \
-        bindings/js/JSSVGNumber.cpp \
-        bindings/js/JSSVGPoint.cpp \
-        bindings/js/JSSVGRect.cpp
+        ksvg2/events/SVGZoomEvent.idl \
+        ksvg2/svg/SVGNumber.idl \
+        ksvg2/svg/SVGPoint.idl \
+        ksvg2/svg/SVGRect.idl
 
     SOURCES += \
 # TODO: this-one-is-not-auto-added! FIXME! tmp/SVGElementFactory.cpp \
-        bindings/js/JSSVGPoint.cpp \
-        bindings/js/JSSVGRect.cpp \
-        bindings/js/JSSVGNumber.cpp \
         bindings/js/JSSVGElementWrapperFactory.cpp \
         ksvg2/css/SVGCSSParser.cpp \
         ksvg2/css/SVGRenderStyleDefs.cpp \

diff --git a/WebCore/loader/qt/FrameLoaderQt.cpp b/WebCore/loader/qt/FrameLoaderQt.cpp
index 771a7f4b303020276b0781ca72541ba0b4492167..c6af0329d359f9ff663556da2a4b0879667d5367 100644 (file)
--- a/WebCore/loader/qt/FrameLoaderQt.cpp
+++ b/WebCore/loader/qt/FrameLoaderQt.cpp
@@ -50,6 +50,7 @@
 #include "GraphicsContext.h"
 #include "HTMLDocument.h"
 #include "HTMLElement.h"
+#include "HTMLFormElement.h"
 #include "JSLock.h"
 #include "MouseEventWithHitTestResults.h"
 #include "Page.h"
@@ -120,7 +121,7 @@ void FrameLoader::setTitle(const String& title)
     client()->setTitle(title, URL());
 }
 
-Frame* FrameLoader::createFrame(const KURL& url, const String& name, Element* ownerElement, const String& referrer)
+Frame* FrameLoader::createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement, const String& referrer)
 {
     notImplemented();
     return 0;
@@ -270,13 +271,13 @@ void FrameLoader::redirectDataToPlugin(Widget* pluginWidget)
 
 
 void FrameLoader::load(const FrameLoadRequest& request, bool userGesture, Event* event,
-                       Element* submitForm, const HashMap<String, String>& formValues)
+                       HTMLFormElement* submitForm, const HashMap<String, String>& formValues)
 {
     notImplemented();
 }
 
 void FrameLoader::load(const KURL& URL, const String& referrer, FrameLoadType newLoadType,
-    const String& frameName, Event* event, Element* form, const HashMap<String, String>& values)
+    const String& frameName, Event* event, HTMLFormElement* form, const HashMap<String, String>& values)
 {
     notImplemented();
 }

diff --git a/WebCore/platform/qt/PasteboardQt.cpp b/WebCore/platform/qt/PasteboardQt.cpp
index e60e83a6c57323a6f11ec80f02f355264ba9bdda..543cf8c38b7c2aec57bf3b50ab0bc029da83a5d9 100644 (file)
--- a/WebCore/platform/qt/PasteboardQt.cpp
+++ b/WebCore/platform/qt/PasteboardQt.cpp
@@ -42,11 +42,7 @@ Pasteboard* Pasteboard::generalPasteboard()
     return pasteboard;
 }
 
-void Pasteboard::clearTypes()
-{
-}
-
-void Pasteboard::writeSelection(PassRefPtr<Range> selectedRange, bool canSmartCopyOrDelete, Frame* frame)
+void Pasteboard::writeSelection(Range* selectedRange, bool canSmartCopyOrDelete, Frame* frame)
 {
 }
 
@@ -66,4 +62,12 @@ PassRefPtr<DocumentFragment> Pasteboard::documentFragment(Frame* frame, PassRefP
     return 0;
 }
 
+void Pasteboard::writeURL(const KURL&, const String&, Frame*)
+{
+}
+
+void Pasteboard::clear()
+{
+}
+
 }

diff --git a/WebKitQt/ChangeLog b/WebKitQt/ChangeLog
index 1989ee6a017739285d232163bdf57d8b96906ad2..f8486e945b3b8c36dad7ea854ac9fb32c2968fc6 100644 (file)
--- a/WebKitQt/ChangeLog
+++ b/WebKitQt/ChangeLog
@@ -1,3 +1,18 @@
+2006-12-12  George Staikos  <staikos@kde.org>
+
+        Reviewed by Alexey.
+
+        Fix the Qt build again.
+
+        * WebCoreSupport/ContextMenuClientQt.cpp:
+        (WebCore::ContextMenuClientQt::speak):
+        (WebCore::ContextMenuClientQt::stopSpeaking):
+        * WebCoreSupport/ContextMenuClientQt.h:
+        * WebCoreSupport/EditorClientQt.cpp:
+        (WebCore::EditorClientQt::toggleContinuousSpellChecking):
+        (WebCore::EditorClientQt::toggleGrammarChecking):
+        * WebCoreSupport/EditorClientQt.h:
+
 2006-12-10  George Staikos  <stakos@kde.org>
 
         Reviewed by Zack.

diff --git a/WebKitQt/WebCoreSupport/ContextMenuClientQt.cpp b/WebKitQt/WebCoreSupport/ContextMenuClientQt.cpp
index 5f6c7db8dd8b39dcf393195391ec05aa45cc6b78..36cb2f9b98a1dfc888dbc36068dd0194bcdfd288 100644 (file)
--- a/WebKitQt/WebCoreSupport/ContextMenuClientQt.cpp
+++ b/WebKitQt/WebCoreSupport/ContextMenuClientQt.cpp
@@ -82,5 +82,15 @@ void ContextMenuClientQt::contextMenuItemSelected(const ContextMenuItem*)
 
 }
 
+void ContextMenuClientQt::speak(const String&)
+{
+    notImplemented();
+}
+
+
+void ContextMenuClientQt::stopSpeaking()
+{
+    notImplemented();
 }
 
+}

diff --git a/WebKitQt/WebCoreSupport/ContextMenuClientQt.h b/WebKitQt/WebCoreSupport/ContextMenuClientQt.h
index c19365a4e2382fb733a92e5c3971edd2cf154a99..261cfc3a680470815400faf78f6d06629a3a387e 100644 (file)
--- a/WebKitQt/WebCoreSupport/ContextMenuClientQt.h
+++ b/WebKitQt/WebCoreSupport/ContextMenuClientQt.h
@@ -47,6 +47,8 @@ namespace WebCore {
         virtual void downloadURL(const KURL&);
         virtual void copyImageToClipboard(const HitTestResult&);
         virtual void lookUpInDictionary(Frame*);
+        virtual void speak(const String&);
+        virtual void stopSpeaking();
     };
 }
 

diff --git a/WebKitQt/WebCoreSupport/EditorClientQt.cpp b/WebKitQt/WebCoreSupport/EditorClientQt.cpp
index 271694cf482876881ec7266049fe7fb8152fecec..8d565e2bbfc6cc72e8c900a360c82f3eca49c19f 100644 (file)
--- a/WebKitQt/WebCoreSupport/EditorClientQt.cpp
+++ b/WebKitQt/WebCoreSupport/EditorClientQt.cpp
@@ -182,6 +182,17 @@ bool EditorClientQt::smartInsertDeleteEnabled()
     return false;
 }
 
+void EditorClientQt::toggleContinuousSpellChecking()
+{
+    notImplemented();
+}
+
+void EditorClientQt::toggleGrammarChecking()
+{
+    notImplemented();
+}
+
+
 }
 
 // vim: ts=4 sw=4 et

diff --git a/WebKitQt/WebCoreSupport/EditorClientQt.h b/WebKitQt/WebCoreSupport/EditorClientQt.h
index c5318cb05e3fba8e1c343c23038e7c2ffdf66566..1818dda3c9f741b484cbdd9178ff52fc281b36a7 100644 (file)
--- a/WebKitQt/WebCoreSupport/EditorClientQt.h
+++ b/WebKitQt/WebCoreSupport/EditorClientQt.h
@@ -71,6 +71,9 @@ public:
     virtual bool canRedo() const;
     virtual void undo();
     virtual void redo();
+
+    virtual void toggleContinuousSpellChecking();
+    virtual void toggleGrammarChecking();
 };
 
 }