diff options
Diffstat (limited to 'WebKit/wx/WebKitSupport')
-rw-r--r-- | WebKit/wx/WebKitSupport/DragClientWx.h | 2 | ||||
-rw-r--r-- | WebKit/wx/WebKitSupport/EditorClientWx.cpp | 2 | ||||
-rw-r--r-- | WebKit/wx/WebKitSupport/EditorClientWx.h | 2 | ||||
-rw-r--r-- | WebKit/wx/WebKitSupport/FrameLoaderClientWx.h | 2 | ||||
-rw-r--r-- | WebKit/wx/WebKitSupport/InspectorClientWx.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/WebKit/wx/WebKitSupport/DragClientWx.h b/WebKit/wx/WebKitSupport/DragClientWx.h index 0e93e66..afb54fb 100644 --- a/WebKit/wx/WebKitSupport/DragClientWx.h +++ b/WebKit/wx/WebKitSupport/DragClientWx.h @@ -39,7 +39,7 @@ public: virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint&); virtual void startDrag(WebCore::DragImageRef dragImage, const WebCore::IntPoint& dragImageOrigin, const WebCore::IntPoint& eventPos, WebCore::Clipboard*, WebCore::Frame*, bool linkDrag = false); - virtual WebCore::DragImageRef createDragImageForLink(WebCore::KURL&, const WebCore::String& label, WebCore::Frame*); + virtual WebCore::DragImageRef createDragImageForLink(WebCore::KURL&, const WTF::String& label, WebCore::Frame*); }; } diff --git a/WebKit/wx/WebKitSupport/EditorClientWx.cpp b/WebKit/wx/WebKitSupport/EditorClientWx.cpp index 64bfd06..99afec8 100644 --- a/WebKit/wx/WebKitSupport/EditorClientWx.cpp +++ b/WebKit/wx/WebKitSupport/EditorClientWx.cpp @@ -532,7 +532,7 @@ void EditorClientWx::getGuessesForWord(const String&, Vector<String>& guesses) notImplemented(); } -String EditorClientWx::getAutoCorrectSuggestionForMisspelledWord(const WebCore::String&) +String EditorClientWx::getAutoCorrectSuggestionForMisspelledWord(const WTF::String&) { notImplemented(); return String(); diff --git a/WebKit/wx/WebKitSupport/EditorClientWx.h b/WebKit/wx/WebKitSupport/EditorClientWx.h index 8d69e36..be5c98a 100644 --- a/WebKit/wx/WebKitSupport/EditorClientWx.h +++ b/WebKit/wx/WebKitSupport/EditorClientWx.h @@ -108,7 +108,7 @@ public: virtual void showSpellingUI(bool show); virtual bool spellingUIIsShowing(); virtual void getGuessesForWord(const String&, Vector<String>& guesses); - virtual String getAutoCorrectSuggestionForMisspelledWord(const WebCore::String&); + virtual String getAutoCorrectSuggestionForMisspelledWord(const WTF::String&); virtual void willSetInputMethodState(); virtual void setInputMethodState(bool enabled); diff --git a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h index 95ef2e6..0dee4bf 100644 --- a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h +++ b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h @@ -34,6 +34,7 @@ #include "PluginView.h" #include "ResourceResponse.h" #include "HTMLPlugInElement.h" +#include <wtf/Forward.h> class wxWebFrame; class wxWebView; @@ -45,7 +46,6 @@ namespace WebCore { class Element; class FormState; class NavigationAction; - class String; class ResourceLoader; struct LoadErrorResetToken; diff --git a/WebKit/wx/WebKitSupport/InspectorClientWx.h b/WebKit/wx/WebKitSupport/InspectorClientWx.h index 698a0f5..799e954 100644 --- a/WebKit/wx/WebKitSupport/InspectorClientWx.h +++ b/WebKit/wx/WebKitSupport/InspectorClientWx.h @@ -27,12 +27,12 @@ #define InspectorClientWx_h #include "InspectorClient.h" +#include <wtf/Forward.h> namespace WebCore { class Node; class Page; -class String; class InspectorClientWx : public InspectorClient { public: |