[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 6ebeb4d03ac6f45581137c868e745966a886ae70
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat May 4 00:27:22 2002 +0000

    	* khtml/css/cssstyleselector.cpp:
    	* khtml/dom/css_value.cpp:
    	* khtml/xml/dom_stringimpl.cpp:
    	Put in some namespace-related statements to more-elegantly work around the
    	conflicts between Macintosh and khtml identifiers.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1097 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 2736300..5946eeb 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-05-03  Darin Adler  <darin at apple.com>
 
+	* khtml/css/cssstyleselector.cpp:
+	* khtml/dom/css_value.cpp:
+	* khtml/xml/dom_stringimpl.cpp:
+	Put in some namespace-related statements to more-elegantly work around the
+	conflicts between Macintosh and khtml identifiers.
+
+2002-05-03  Darin Adler  <darin at apple.com>
+
 	* kwq/IFTextRenderer.h: Added.
 	* kwq/IFTextRendererFactory.h: Added.
 	* kwq/IFTextRendererFactory.m: Added.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 2736300..5946eeb 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-05-03  Darin Adler  <darin at apple.com>
 
+	* khtml/css/cssstyleselector.cpp:
+	* khtml/dom/css_value.cpp:
+	* khtml/xml/dom_stringimpl.cpp:
+	Put in some namespace-related statements to more-elegantly work around the
+	conflicts between Macintosh and khtml identifiers.
+
+2002-05-03  Darin Adler  <darin at apple.com>
+
 	* kwq/IFTextRenderer.h: Added.
 	* kwq/IFTextRendererFactory.h: Added.
 	* kwq/IFTextRendererFactory.m: Added.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2736300..5946eeb 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-05-03  Darin Adler  <darin at apple.com>
 
+	* khtml/css/cssstyleselector.cpp:
+	* khtml/dom/css_value.cpp:
+	* khtml/xml/dom_stringimpl.cpp:
+	Put in some namespace-related statements to more-elegantly work around the
+	conflicts between Macintosh and khtml identifiers.
+
+2002-05-03  Darin Adler  <darin at apple.com>
+
 	* kwq/IFTextRenderer.h: Added.
 	* kwq/IFTextRendererFactory.h: Added.
 	* kwq/IFTextRendererFactory.m: Added.
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 577c34e..d98a759 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -64,6 +64,9 @@ using namespace DOM;
 #include <qpaintdevicemetrics.h>
 #include <qintcache.h>
 
+#ifdef APPLE_CHANGES
+namespace khtml {
+#endif
 
 CSSStyleSelectorList *CSSStyleSelector::defaultStyle = 0;
 CSSStyleSelectorList *CSSStyleSelector::defaultPrintStyle = 0;
@@ -2595,3 +2598,6 @@ void CSSStyleSelector::applyRule( DOM::CSSProperty *prop )
     }
 }
 
+#ifdef APPLE_CHANGES
+} // namespace khtml
+#endif
diff --git a/WebCore/khtml/dom/css_value.cpp b/WebCore/khtml/dom/css_value.cpp
index de6760a..fa6e79f 100644
--- a/WebCore/khtml/dom/css_value.cpp
+++ b/WebCore/khtml/dom/css_value.cpp
@@ -26,6 +26,9 @@
 #include "css/css_valueimpl.h"
 
 using namespace DOM;
+#ifdef APPLE_CHANGES
+namespace DOM {
+#endif
 
 CSSStyleDeclaration::CSSStyleDeclaration()
 {
@@ -546,4 +549,6 @@ bool Rect::isNull() const
     return (impl == 0);
 }
 
-
+#ifdef APPLE_CHANGES
+} // namespace DOM
+#endif
diff --git a/WebCore/khtml/xml/dom_stringimpl.cpp b/WebCore/khtml/xml/dom_stringimpl.cpp
index e7484c8..d385730 100644
--- a/WebCore/khtml/xml/dom_stringimpl.cpp
+++ b/WebCore/khtml/xml/dom_stringimpl.cpp
@@ -31,6 +31,11 @@
 using namespace DOM;
 using namespace khtml;
 
+#ifdef APPLE_CHANGES
+namespace DOM {
+using khtml::Fixed;
+#endif
+
 #define QT_ALLOC_QCHAR_VEC( N ) (QChar*) new char[ sizeof(QChar)*( N ) ]
 #define QT_DELETE_QCHAR_VEC( P ) delete[] ((char*)( P ))
 
@@ -306,5 +311,6 @@ DOMStringImpl *DOMStringImpl::capitalize()
     return c;
 }
 
-
-
+#ifdef APPLE_CHANGES
+} // namespace DOM
+#endif

-- 
WebKit Debian packaging