Compile after latest WebKit changes and don't depend on
authorzack <zack@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 10 Dec 2006 00:41:47 +0000 (00:41 +0000)
committerzack <zack@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 10 Dec 2006 00:41:47 +0000 (00:41 +0000)
deprecated methods in Qt.

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

WebCore/ChangeLog
WebCore/platform/network/qt/ResourceHandleManager.cpp
WebCore/platform/network/qt/ResourceHandleQt.cpp
WebCore/platform/qt/PlatformKeyboardEventQt.cpp

index bd3101cb971e17c3d7a7f94f4c3f1804629f67f4..79582bac21ae40fc4dcbae32f0d32af785a771e0 100644 (file)
@@ -1,3 +1,18 @@
+2006-12-10  Lars Knoll <lars@trolltech.com>
+
+        Reviewed by Zack.
+
+        Compile after latest WebKit changes and don't depend
+        on deprecated methods in Qt.
+
+        * platform/network/qt/ResourceHandleManager.cpp:
+        (WebCore::ResourceHandleManager::remove):
+        (WebCore::ResourceHandleManager::deliverJobData):
+        * platform/network/qt/ResourceHandleQt.cpp:
+        (WebCore::ResourceHandle::extractCharsetFromHeaders):
+        * platform/qt/PlatformKeyboardEventQt.cpp:
+        (WebCore::windowsKeyCodeForKeyEvent):
+
 2006-12-10  Lars Knoll <lars@trolltech.com>
 
         Reviewed by Zack.
index 583a98674527e26f61450031a9dcb2e3b40f783b..8c34fc306588418e93317d782eddcf98910f21c2 100644 (file)
@@ -249,7 +249,6 @@ void ResourceHandleManager::remove(ResourceHandle* job)
     if (!qtJob)
         return;
 
-    d->m_client->receivedAllData(job, 0);
     d->m_client->didFinishLoading(job);
 
     m_resourceToJob.remove(job);
@@ -310,7 +309,7 @@ void ResourceHandleManager::deliverJobData(QtJob* job, const QByteArray& data)
     if (!d || !d->m_client)
         return;
 
-    d->m_client->didReceiveData(handle, data.data(), data.size());
+    d->m_client->didReceiveData(handle, data.data(), data.size(), data.size() /* FixMe */);
 
     //FIXME: should report an error
     //handle->setError(0);
index c0bea838d47f16a1850dacb28e5d0d54759e966f..4382b04255cd3be632c64f9ad5d7f68bc6df8bab 100644 (file)
@@ -72,12 +72,12 @@ void ResourceHandle::cancel()
 
 QString ResourceHandle::extractCharsetFromHeaders(QString headers) const
 {
-    int pos = headers.find("content-type:", 0, false);
+    int pos = headers.indexOf("content-type:", 0, Qt::CaseInsensitive);
 
     if (pos > -1) {
         pos += 13;
 
-        int index = headers.find('\n', pos);
+        int index = headers.indexOf('\n', pos);
         QString type = headers.mid(pos, index - pos);
         index = type.indexOf(';');
 
index 769deb54c87d551dbd7eda9dd1016323738e810a..f36468b3200f30ea6a0fbdb8defc4473980ce7b2 100644 (file)
@@ -163,7 +163,7 @@ static int windowsKeyCodeForKeyEvent(unsigned int keycode)
             return VK_DIVIDE; // (6F) Divide key
 
         */
-        case Qt::Key_BackSpace:
+        case Qt::Key_Backspace:
             return VK_BACK; // (08) BACKSPACE key
         case Qt::Key_Tab:
             return VK_TAB; // (09) TAB key