- another gcc 4.0 fix

        No new test cases needed.

        * khtml/dom/dom2_events.cpp: Moved constants out of the KHTML_NO_CPLUSPLUS_DOM #if.

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9ed705c7a9ff8eba2b5cff5579a0159797bdc39b..eb8661ecb6094d786dfba477836a2c32625197b0 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2005-05-24  Darin Adler  <darin@apple.com>
+
+        - another gcc 4.0 fix
+
+        No new test cases needed.
+
+        * khtml/dom/dom2_events.cpp: Moved constants out of the KHTML_NO_CPLUSPLUS_DOM #if.
+
 2005-05-24  Darin Adler  <darin@apple.com>
 
         Reviewed by Vicki.

diff --git a/WebCore/khtml/dom/dom2_events.cpp b/WebCore/khtml/dom/dom2_events.cpp
index 83b6309ad8d8d09aac7e43ac863efcd25e922713..09f5e89d32524d1388902dd78a7f85fda5cff09f 100644 (file)
--- a/WebCore/khtml/dom/dom2_events.cpp
+++ b/WebCore/khtml/dom/dom2_events.cpp
@@ -32,7 +32,15 @@
 
 #endif
 
-using namespace DOM;
+namespace DOM {
+
+const unsigned long KeyboardEvent::DOM_KEY_LOCATION_STANDARD;
+const unsigned long KeyboardEvent::DOM_KEY_LOCATION_LEFT;
+const unsigned long KeyboardEvent::DOM_KEY_LOCATION_RIGHT;
+const unsigned long KeyboardEvent::DOM_KEY_LOCATION_NUMPAD;
+const unsigned long KeyboardEvent::DOM_KEY_LOCATION_UNKNOWN;
+
+// -----------------------------------------------------------------------------
 
 EventListener::EventListener()
 {
@@ -646,15 +654,8 @@ void MutationEvent::initMutationEvent(const DOMString &typeArg,
        newValueArg,attrNameArg,attrChangeArg);
 }
 
-
 // -----------------------------------------------------------------------------
 
-const unsigned long KeyboardEvent::DOM_KEY_LOCATION_STANDARD;
-const unsigned long KeyboardEvent::DOM_KEY_LOCATION_LEFT;
-const unsigned long KeyboardEvent::DOM_KEY_LOCATION_RIGHT;
-const unsigned long KeyboardEvent::DOM_KEY_LOCATION_NUMPAD;
-const unsigned long KeyboardEvent::DOM_KEY_LOCATION_UNKNOWN;
-
 KeyboardEvent::KeyboardEvent()
 {
 }
@@ -771,3 +772,5 @@ void KeyboardEvent::initKeyboardEvent(const DOMString &typeArg,
 }
                                     
 #endif
+
+} // namespace