Reviewed by Hyatt.
authorrwlbuis <rwlbuis@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Sep 2006 22:33:52 +0000 (22:33 +0000)
committerrwlbuis <rwlbuis@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Sep 2006 22:33:52 +0000 (22:33 +0000)
        Fix Qt/Linux build.

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

WebCore/CMakeLists.txt
WebCore/ChangeLog
WebCore/platform/qt/ScrollViewQt.cpp
WebCore/platform/qt/TemporaryLinkStubs.cpp
WebCore/platform/qt/WidgetQt.cpp

index 57e7d9c7ac3b4fb14ae7e1331e491d7488bd37b0..5af6d9e5ecc220b11e92cf3c0c020eac06bea2bd 100644 (file)
@@ -808,6 +808,7 @@ set(WebCore_SRCS
     ${SVG_SOURCES}
     ${XPATH_SOURCES}
 
+    editing/CommandByName.cpp
     editing/InsertIntoTextNodeCommand.cpp
     editing/WrapContentsInDummySpanCommand.cpp
     editing/ReplaceSelectionCommand.cpp
index be2499a10e174268c7cbc4028235454ac82d1115..19d2e218b2aef7c598aaf43b141f811813698997 100644 (file)
@@ -1,3 +1,19 @@
+2006-09-30  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Hyatt.
+
+        Fix Qt/Linux build.
+
+        * CMakeLists.txt:
+        * platform/qt/ScrollViewQt.cpp:
+        (WebCore::ScrollView::convertToContainingWindow):
+        (WebCore::ScrollView::convertFromContainingWindow):
+        * platform/qt/TemporaryLinkStubs.cpp:
+        (WebCore::signedPublicKeyAndChallengeString):
+        * platform/qt/WidgetQt.cpp:
+        (WebCore::Widget::convertToContainingWindow):
+        (WebCore::Widget::convertFromContainingWindow):
+
 2006-09-29  Sam Weinig  <sam.weinig@gmail.com>
 
         Reviewed by Tim H.
index 3277ed3661fa64f81b364a433fd34c26ca5d4077..3dc49fcc81462bbf4c316b493192ead2805f7f22 100644 (file)
@@ -130,16 +130,15 @@ int ScrollView::contentsHeight() const
     return m_area->widget()->height();
 }
 
-IntPoint ScrollView::viewportToContents(const IntPoint& viewportPoint)
+
+IntPoint ScrollView::convertToContainingWindow(const IntPoint& point) const
 {
-    // Qt already handles this in the coordinates we get from the mouse events...
-    return viewportPoint;
+    return point - scrollOffset();
 }
 
-IntPoint ScrollView::contentsToViewport(const IntPoint& contentsPoint)
+IntPoint ScrollView::convertFromContainingWindow(const IntPoint& point) const
 {
-    // Qt already handles this in the coordinates we get from the mouse events...
-    return contentsPoint;
+    return point + scrollOffset();
 }
 
 IntSize ScrollView::scrollOffset() const
index 40c64f657b5a8e957b40869632e87dbaee11a232..4eabe098f8251393ecbecb32520dddbc93e02fec 100644 (file)
@@ -187,7 +187,7 @@ bool WebCore::PlugInInfoStore::supportsMIMEType(const WebCore::String&) { return
 namespace WebCore {
     
 DeprecatedStringList supportedKeySizes() { notImplemented(); return DeprecatedStringList(); }
-DeprecatedString signedPublicKeyAndChallengeString(unsigned keySizeIndex, const DeprecatedString &challengeString, const KURL &url) { return DeprecatedString(); }
+String signedPublicKeyAndChallengeString(unsigned keySizeIndex, const String &challengeString, const KURL &url) { return String(); }
 
 }
 
index 3f36ec4ed847a8d2034017d9f1d2731a21e9b782..4c9e3e3ebca1022942cbf917b49a3a6fbaa466e1 100644 (file)
@@ -75,6 +75,16 @@ WidgetClient* Widget::client() const
     return 0;
 }
 
+IntPoint Widget::convertToContainingWindow(const IntPoint& point) const
+{
+    return point;
+}
+
+IntPoint Widget::convertFromContainingWindow(const IntPoint& point) const
+{
+    return point;
+}
+
 IntRect Widget::frameGeometry() const
 {
     if (!data->m_widget)