2006-02-27 Eric Seidel <eseidel@apple.com>

        Reviewed by timo.

        Move KWQLogging to platform and rename as Logging.*, fix headers.
        This will break the mac build, which I will fix on my next commit.

        * WebCore.vcproj/WebCore/WebCore.vcproj:
        * dom/DocumentImpl.cpp:
        * dom/dom_position.cpp:
        * editing/DeleteSelectionCommand.cpp:
        * editing/InsertLineBreakCommand.cpp:
        * editing/InsertParagraphSeparatorCommand.cpp:
        * editing/InsertTextCommand.cpp:
        * editing/VisiblePosition.cpp:
        * editing/markup.cpp:
        * khtml/ecma/kjs_window.cpp:
        * kwq/KWQLogging.h: Removed.
        * kwq/KWQLogging.m: Removed.
        * kwq/KWQRegExp.cpp:
        * kwq/KWQTextStream.cpp:
        * platform/Logging.cpp: Added.
        * platform/Logging.h: Added.
        * platform/QString.cpp:
        * platform/win/TemporaryLinkStubs.cpp:
        (WebCore::ScrollView::vScrollBarMode):
        (WebCore::theme):

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b85eb7544fa2847047ed9132d49f4ec98f7d7951..94798e08261636fac3b5ad06a8f4d39e368820e5 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,31 @@
+2006-02-27  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by timo.
+
+        Move KWQLogging to platform and rename as Logging.*, fix headers.
+        This will break the mac build, which I will fix on my next commit.
+
+        * WebCore.vcproj/WebCore/WebCore.vcproj:
+        * dom/DocumentImpl.cpp:
+        * dom/dom_position.cpp:
+        * editing/DeleteSelectionCommand.cpp:
+        * editing/InsertLineBreakCommand.cpp:
+        * editing/InsertParagraphSeparatorCommand.cpp:
+        * editing/InsertTextCommand.cpp:
+        * editing/VisiblePosition.cpp:
+        * editing/markup.cpp:
+        * khtml/ecma/kjs_window.cpp:
+        * kwq/KWQLogging.h: Removed.
+        * kwq/KWQLogging.m: Removed.
+        * kwq/KWQRegExp.cpp:
+        * kwq/KWQTextStream.cpp:
+        * platform/Logging.cpp: Added.
+        * platform/Logging.h: Added.
+        * platform/QString.cpp:
+        * platform/win/TemporaryLinkStubs.cpp:
+        (WebCore::ScrollView::vScrollBarMode):
+        (WebCore::theme):
+
 2006-02-27  Eric Seidel  <eseidel@apple.com>
 
         Reviewed by hyatt.

diff --git a/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
index 0871515c9753b898b41cc6fe7b9e321a8f0d944a..2068fb0c8c94bf95d417bb1d98c6e944353b7440 100644 (file)
--- a/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
@@ -1636,6 +1636,14 @@
                                RelativePath="..\..\platform\KURL.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\platform\Logging.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\platform\Logging.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\platform\MouseEvent.h"\r
                                >\r

diff --git a/WebCore/dom/DocumentImpl.cpp b/WebCore/dom/DocumentImpl.cpp
index fb923a71780a9fa1902e0a5306a891a879378dff..3b763fd123ffd1115b1ea0e4549365f190e83b86 100644 (file)
--- a/WebCore/dom/DocumentImpl.cpp
+++ b/WebCore/dom/DocumentImpl.cpp
@@ -38,7 +38,7 @@
 #include "FrameView.h"
 #include "HTMLNameCollectionImpl.h"
 #include "KWQAccObjectCache.h"
-#include "KWQLogging.h"
+#include "Logging.h"
 #include "KeyEvent.h"
 #include "MouseEventWithHitTestResults.h"
 #include "NameNodeListImpl.h"

diff --git a/WebCore/dom/dom_position.cpp b/WebCore/dom/dom_position.cpp
index 19f03ccdc3beb72c7444c785e519f4aa7003ca3b..78ca66e42ecdf5eeb6eec45dfb552271d48db90f 100644 (file)
--- a/WebCore/dom/dom_position.cpp
+++ b/WebCore/dom/dom_position.cpp
@@ -28,7 +28,7 @@
 
 #include "DocumentImpl.h"
 #include "InlineTextBox.h"
-#include "KWQLogging.h"
+#include "Logging.h"
 #include "QString.h"
 #include "RenderBlock.h"
 #include "css_computedstyle.h"

diff --git a/WebCore/editing/DeleteSelectionCommand.cpp b/WebCore/editing/DeleteSelectionCommand.cpp
index c9fdb770c1f0f2e18c03387abd378d47b30e9755..872aae80b1d744cb75c1ec4c4753e481eb1f363f 100644 (file)
--- a/WebCore/editing/DeleteSelectionCommand.cpp
+++ b/WebCore/editing/DeleteSelectionCommand.cpp
@@ -28,7 +28,7 @@
 
 #include "DocumentImpl.h"
 #include "Frame.h"
-#include "KWQLogging.h"
+#include "Logging.h"
 #include "css_computedstyle.h"
 #include "dom2_rangeimpl.h"
 #include "dom_position.h"

diff --git a/WebCore/editing/InsertLineBreakCommand.cpp b/WebCore/editing/InsertLineBreakCommand.cpp
index 93f6e2f399d9800e231f5e3c41d75409d43c9983..cc30472d8ad54c53d7eb28454f78378a801f8811 100644 (file)
--- a/WebCore/editing/InsertLineBreakCommand.cpp
+++ b/WebCore/editing/InsertLineBreakCommand.cpp
@@ -28,7 +28,7 @@
 
 #include "DocumentImpl.h"
 #include "Frame.h"
-#include "KWQLogging.h"
+#include "Logging.h"
 #include "TextImpl.h"
 #include "VisiblePosition.h"
 #include "dom2_rangeimpl.h"

diff --git a/WebCore/editing/InsertParagraphSeparatorCommand.cpp b/WebCore/editing/InsertParagraphSeparatorCommand.cpp
index da00f669bfb452dea65b3cf21d9a08d93fc6e7d1..bd759b819f5a4a832a115fb4646a739ea103999a 100644 (file)
--- a/WebCore/editing/InsertParagraphSeparatorCommand.cpp
+++ b/WebCore/editing/InsertParagraphSeparatorCommand.cpp
@@ -27,7 +27,7 @@
 #include "InsertParagraphSeparatorCommand.h"
 
 #include "DocumentImpl.h"
-#include "KWQLogging.h"
+#include "Logging.h"
 #include "css_computedstyle.h"
 #include "dom_elementimpl.h"
 #include "TextImpl.h"

diff --git a/WebCore/editing/InsertTextCommand.cpp b/WebCore/editing/InsertTextCommand.cpp
index 8d26ae98c0fa22779e8559719db50b3241a775f4..cf4e75cd3d1fe4686e71579e1e26c055199e870e 100644 (file)
--- a/WebCore/editing/InsertTextCommand.cpp
+++ b/WebCore/editing/InsertTextCommand.cpp
@@ -29,7 +29,7 @@
 #include "DocumentImpl.h"
 #include "EditingTextImpl.h"
 #include "Frame.h"
-#include "KWQLogging.h"
+#include "Logging.h"
 #include "VisiblePosition.h"
 #include "dom_position.h"
 #include "html_interchange.h"

diff --git a/WebCore/editing/VisiblePosition.cpp b/WebCore/editing/VisiblePosition.cpp
index 884d6de9fbad209cae0265813a7c45fbc5b432a6..3b9c177ca3d7ee094a86a1063bfb39853253713a 100644 (file)
--- a/WebCore/editing/VisiblePosition.cpp
+++ b/WebCore/editing/VisiblePosition.cpp
@@ -35,7 +35,7 @@
 #include "dom2_rangeimpl.h"
 
 #include <kxmlcore/Assertions.h>
-#include "KWQLogging.h"
+#include "Logging.h"
 
 using namespace DOM::HTMLNames;
 

diff --git a/WebCore/editing/markup.cpp b/WebCore/editing/markup.cpp
index c9b064ecb439aa6bc9e6b5b04d2338d47cdcfd05..57fa86c8bf0d9be02a9b68a68ea57d9b239e4f92 100644 (file)
--- a/WebCore/editing/markup.cpp
+++ b/WebCore/editing/markup.cpp
@@ -31,7 +31,7 @@
 #include "DocumentTypeImpl.h"
 #include "HTMLElementImpl.h"
 #include "InlineTextBox.h"
-#include "KWQLogging.h"
+#include "Logging.h"
 #include "VisiblePosition.h"
 #include "css_computedstyle.h"
 #include "css_valueimpl.h"

diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index 5ca51d41e8f7e9b58ee85426060affe672621bca..f83cef1c08ec4f9aba95bc58fa47dbba571cb168 100644 (file)
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -28,7 +28,7 @@
 #include "JSMutationEvent.h"
 #include "JSXMLHttpRequest.h"
 #include "PlugInInfoStore.h"
-#include "KWQLogging.h"
+#include "Logging.h"
 #include "Screen.h"
 #include "SelectionController.h"
 #include "Shared.h"

diff --git a/WebCore/kwq/KWQRegExp.cpp b/WebCore/kwq/KWQRegExp.cpp
index e1aa8598346198a25f036ebbee911df9078f8885..422f1ebe850322d1658f775a9eb97564cd70232a 100644 (file)
--- a/WebCore/kwq/KWQRegExp.cpp
+++ b/WebCore/kwq/KWQRegExp.cpp
@@ -25,7 +25,7 @@
 
 #include "config.h"
 #include "KWQRegExp.h"
-#include "KWQLogging.h"
+#include "Logging.h"
 
 #include <sys/types.h>
 #include <pcre/pcre.h>

diff --git a/WebCore/kwq/KWQTextStream.cpp b/WebCore/kwq/KWQTextStream.cpp
index 3953f89370ee8d08e6a7488eb7c5a3f1516728c7..eae276c739e4098d02ecb2b5fa1b9983a140923c 100644 (file)
--- a/WebCore/kwq/KWQTextStream.cpp
+++ b/WebCore/kwq/KWQTextStream.cpp
@@ -27,7 +27,7 @@
 #include "KWQTextStream.h"
 
 #include "QString.h"
-#include "KWQLogging.h"
+#include "Logging.h"
 
 const size_t integerOrPointerAsStringBufferSize = 100; // large enough for any integer or pointer in string format, including trailing null character
 const char *precisionFormats[] = { "%.0f", "%.1f", "%.2f", "%.3f", "%.4f", "%.5f" "%.6f"}; 

diff --git a/WebCore/kwq/KWQLogging.m b/WebCore/platform/Logging.cpp
similarity index 95%
rename from WebCore/kwq/KWQLogging.m
rename to WebCore/platform/Logging.cpp
index 194816193f946cb2e466b67baaf6ba2234672a07..67c3a0eade8a01140d9e95720ba6c583eb3ae12a 100644 (file)
--- a/WebCore/kwq/KWQLogging.m
+++ b/WebCore/platform/Logging.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,7 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#import "KWQLogging.h"
+#include "Logging.h"
 
 KXCLogChannel KWQLogNotYetImplemented = { 0x00000001, "WebCoreLogLevel", KXCLogChannelUninitialized };
 

diff --git a/WebCore/kwq/KWQLogging.h b/WebCore/platform/Logging.h
similarity index 95%
rename from WebCore/kwq/KWQLogging.h
rename to WebCore/platform/Logging.h
index d7e9758f90000945c5cb8b7cfbc4953ed08c3929..7d750da0f550e88ba7bdda5de0b445c427ee929e 100644 (file)
--- a/WebCore/kwq/KWQLogging.h
+++ b/WebCore/platform/Logging.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/WebCore/platform/QString.cpp b/WebCore/platform/QString.cpp
index f8367ea5b695ed878aefea10ec321e076926ca6a..9bb11ec691c707438b0460846725c04c3b58456b 100644 (file)
--- a/WebCore/platform/QString.cpp
+++ b/WebCore/platform/QString.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "QString.h"
 
-#include "KWQLogging.h"
+#include "Logging.h"
 #include "KWQRegExp.h"
 #include "TextEncoding.h"
 #include <kjs/dtoa.h>

diff --git a/WebCore/platform/win/TemporaryLinkStubs.cpp b/WebCore/platform/win/TemporaryLinkStubs.cpp
index 151e418f55bd3ac9401f5bb8ee7e4f82ed8baee4..88d9f253d8c351d17eb275f8c8ddb42737ac267e 100644 (file)
--- a/WebCore/platform/win/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/win/TemporaryLinkStubs.cpp
@@ -32,6 +32,7 @@
 #include "History.h"
 #include "KWQKLocale.h"
 #include "PlugInInfoStore.h"
+#include "render_theme.h"
 
 using namespace WebCore;
 
@@ -327,4 +328,5 @@ int WebCore::ScrollView::contentsWidth(void)const { notImplemented(); return 0;
 int WebCore::ScrollView::visibleHeight(void)const { notImplemented(); return 0; }
 int WebCore::ScrollView::visibleWidth(void)const { notImplemented(); return 0; }
 WebCore::ScrollBarMode WebCore::ScrollView::hScrollBarMode(void)const { notImplemented(); return ScrollBarAlwaysOff; }
-WebCore::ScrollBarMode WebCore::ScrollView::vScrollBarMode(void)const { notImplemented(); return ScrollBarAlwaysOff; }
\ No newline at end of file
+WebCore::ScrollBarMode WebCore::ScrollView::vScrollBarMode(void)const { notImplemented(); return ScrollBarAlwaysOff; }
+RenderTheme* WebCore::theme() { notImplemented(); return 0; }