- try to fix Windows build
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Jul 2006 06:15:44 +0000 (06:15 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Jul 2006 06:15:44 +0000 (06:15 +0000)
        * COM/WebFrame.cpp: Rename QChar to DeprecatedChar.

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

WebKit/COM/WebFrame.cpp
WebKit/ChangeLog

index 4c0155075c5b34a887ba1a4a2709a2e6aeba0482..7957e44acfe056a8febabd00039bd9f1885d8d11 100644 (file)
@@ -222,10 +222,10 @@ HRESULT STDMETHODCALLTYPE WebFrame::loadHTMLString(
     /* [in] */ BSTR string,
     /* [in] */ BSTR baseURL)
 {
-    DeprecatedString htmlString((QChar*)string, SysStringLen(string));
+    DeprecatedString htmlString((DeprecatedChar*)string, SysStringLen(string));
 
     if (baseURL) {
-        DeprecatedString baseURLString((QChar*)baseURL, SysStringLen(baseURL));
+        DeprecatedString baseURLString((DeprecatedChar*)baseURL, SysStringLen(baseURL));
         d->frame->begin(KURL(baseURLString));
     }
     else
@@ -352,7 +352,7 @@ void WebFrame::paint()
     EndPaint(windowHandle, &ps);
 }
 
-WebCore::Frame* WebFrame::impl()
+Frame* WebFrame::impl()
 {
     return d->frame.get();
 }
@@ -370,11 +370,11 @@ HRESULT WebFrame::loadDataSource(WebDataSource* dataSource)
         if (SUCCEEDED(hr)) {
             hr = request->HTTPMethod(&method);
             if (SUCCEEDED(hr)) {
-                KURL kurl(DeprecatedString((QChar*)url, SysStringLen(url)));
+                KURL kurl(DeprecatedString((DeprecatedChar*)url, SysStringLen(url)));
                 d->frame->didOpenURL(kurl);
                 d->frame->begin(kurl);
                 String methodString(method, SysStringLen(method));
-                WebCore::TransferJob* job;
+                TransferJob* job;
                 const FormData* formData = 0;
                 if (wcscmp(method, TEXT("GET"))) {
                     WebMutableURLRequest* requestImpl = static_cast<WebMutableURLRequest*>(request);
index 61e35b459d59ab3485bd93868717cb8cd15ea9c2..7074f9b94a349e090cf14bc7cca14fb9f3f188ea 100644 (file)
@@ -1,3 +1,9 @@
+2006-07-09  Darin Adler  <darin@apple.com>
+
+        - try to fix Windows build
+
+        * COM/WebFrame.cpp: Rename QChar to DeprecatedChar.
+
 2006-07-09  Darin Adler  <darin@apple.com>
 
         - fix newlines to be consistent for all files in the COM directory