[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 e2f6d07e867069f7cd7116160820fcd5f9d77adb
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 7 17:56:53 2004 +0000

            Reviewed by Ken.
    
            * khtml/editing/jsediting.h: Elide some unnecessary namespace prefixes.
            * khtml/editing/jsediting.cpp: Make typed constants instead of macros.
            (DOM::JSEditor::commandDict): Elide unnecessary namespace prefix.
            (DOM::JSEditor::execCommand): Remove xxxNotImplemented functions; just return false instead.
            (DOM::JSEditor::queryCommandEnabled): Ditto.
            (DOM::JSEditor::queryCommandIndeterm): Ditto.
            (DOM::JSEditor::queryCommandState): Ditto.
            (DOM::JSEditor::queryCommandSupported): Ditto.
            (DOM::JSEditor::queryCommandValue): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6782 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ff6b104..ac7ce62 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2004-06-07  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+        * khtml/editing/jsediting.h: Elide some unnecessary namespace prefixes.
+        * khtml/editing/jsediting.cpp: Make typed constants instead of macros.
+        (DOM::JSEditor::commandDict): Elide unnecessary namespace prefix.
+        (DOM::JSEditor::execCommand): Remove xxxNotImplemented functions; just return false instead.
+        (DOM::JSEditor::queryCommandEnabled): Ditto.
+        (DOM::JSEditor::queryCommandIndeterm): Ditto.
+        (DOM::JSEditor::queryCommandState): Ditto.
+        (DOM::JSEditor::queryCommandSupported): Ditto.
+        (DOM::JSEditor::queryCommandValue): Ditto.
+
 2004-06-05  Trey Matteson  <trey at apple.com>
 
 	As agreed with Hyatt and Louch, do not post incoming dragging events
diff --git a/WebCore/khtml/editing/jsediting.cpp b/WebCore/khtml/editing/jsediting.cpp
index d937559..ce8a961 100644
--- a/WebCore/khtml/editing/jsediting.cpp
+++ b/WebCore/khtml/editing/jsediting.cpp
@@ -42,47 +42,29 @@
 #define ERROR(formatAndArgs...) ((void)0)
 #endif
 
-#define NoExec (0)
-#define NoEnabled (0)
-#define NoIndeterm (0)
-#define NoState (0)
-#define NoSupported (0)
-#define NoValue (0)
-
 using khtml::TypingCommand;
 
 namespace DOM {
 
 class DocumentImpl;
 
-static bool execCommandNotImplemented()
-{
-    ERROR("unimplemented");
-    return false;
-}
-
-static bool queryBoolNotImplemented()
-{
-    ERROR("unimplemented");
-    return false;
-}
-
-static DOMString queryValueNotImplemented()
-{
-    ERROR("unimplemented");
-    return DOMString();
-}
+const JSEditor::execCommandFn NoExec = 0;
+const JSEditor::queryBoolFn NoEnabled = 0;
+const JSEditor::queryBoolFn NoIndeterm = 0;
+const JSEditor::queryBoolFn NoState = 0;
+const JSEditor::queryBoolFn NoSupported = 0;
+const JSEditor::queryValueFn NoValue = 0;
 
 QDict<JSEditor::CommandIdentifier> &JSEditor::commandDict()
 {
-    static QDict<JSEditor::CommandIdentifier> dict;
+    static QDict<CommandIdentifier> dict;
     return dict;
 }
 
 JSEditor::JSEditor(DocumentImpl *doc) : m_doc(doc) 
 {
     initDict();
- }
+}
 
 JSEditor::CommandIdentifier *JSEditor::commandIdentifier(const DOMString &command)
 {
@@ -571,7 +553,7 @@ bool JSEditor::execCommand(const DOMString &command, bool userInterface, const D
 { 
     CommandIdentifier *cmd = commandIdentifier(command);
     if (!cmd || !cmd->execFn)
-        return execCommandNotImplemented();
+        return false;
         
     ASSERT(document());
     document()->updateLayout();
@@ -582,7 +564,7 @@ bool JSEditor::queryCommandEnabled(const DOMString &command)
 { 
     CommandIdentifier *cmd = commandIdentifier(command);
     if (!cmd || !cmd->enabledFn)
-        return queryBoolNotImplemented();
+        return false;
         
     ASSERT(document());
     document()->updateLayout();
@@ -593,7 +575,7 @@ bool JSEditor::queryCommandIndeterm(const DOMString &command)
 {
     CommandIdentifier *cmd = commandIdentifier(command);
     if (!cmd || !cmd->indetermFn)
-        return queryBoolNotImplemented();
+        return false;
         
     ASSERT(document());
     document()->updateLayout();
@@ -604,7 +586,7 @@ bool JSEditor::queryCommandState(const DOMString &command)
 {
     CommandIdentifier *cmd = commandIdentifier(command);
     if (!cmd || !cmd->stateFn)
-        return queryBoolNotImplemented();
+        return false;
         
     ASSERT(document());
     document()->updateLayout();
@@ -615,7 +597,7 @@ bool JSEditor::queryCommandSupported(const DOMString &command)
 {
     CommandIdentifier *cmd = commandIdentifier(command);
     if (!cmd || !cmd->supportedFn)
-        return queryBoolNotImplemented();
+        return false;
         
     ASSERT(document());
     document()->updateLayout();
@@ -626,7 +608,7 @@ DOMString JSEditor::queryCommandValue(const DOMString &command)
 { 
     CommandIdentifier *cmd = commandIdentifier(command);
     if (!cmd || !cmd->valueFn)
-        return queryValueNotImplemented();
+        return DOMString();
     
     ASSERT(document());
     document()->updateLayout();
diff --git a/WebCore/khtml/editing/jsediting.h b/WebCore/khtml/editing/jsediting.h
index d5dbd76..f41715a 100644
--- a/WebCore/khtml/editing/jsediting.h
+++ b/WebCore/khtml/editing/jsediting.h
@@ -44,14 +44,14 @@ public:
 
     typedef bool (JSEditor::*execCommandFn)(bool userInterface, const DOMString &value);
     typedef bool (JSEditor::*queryBoolFn)();
-    typedef DOM::DOMString (JSEditor::*queryValueFn)();
+    typedef DOMString (JSEditor::*queryValueFn)();
 
     struct CommandIdentifier {
         CommandIdentifier() {}
         CommandIdentifier(execCommandFn exec, queryBoolFn enabled, queryBoolFn indeterm, queryBoolFn state, queryBoolFn supported, queryValueFn value)
             : execFn(exec), enabledFn(enabled), indetermFn(indeterm), stateFn(state), supportedFn(supported), valueFn(value) {}
 
-        JSEditor::execCommandFn execFn;
+        execCommandFn execFn;
         queryBoolFn enabledFn;
         queryBoolFn indetermFn;
         queryBoolFn stateFn;
@@ -64,7 +64,7 @@ public:
     bool queryCommandIndeterm(const DOMString &command);
     bool queryCommandState(const DOMString &command);
     bool queryCommandSupported(const DOMString &command);
-    DOM::DOMString queryCommandValue(const DOMString &command);
+    DOMString queryCommandValue(const DOMString &command);
 
 private:
     JSEditor(const JSEditor &);
@@ -88,7 +88,7 @@ private:
     // queryCommandSupported implementations
     bool commandSupported();
 
-    QDict<JSEditor::CommandIdentifier> &commandDict();
+    QDict<CommandIdentifier> &commandDict();
     DocumentImpl *document() { return m_doc; }
     KHTMLPart *part() { return document()->part(); }
     CommandIdentifier *commandIdentifier(const DOMString &command);

-- 
WebKit Debian packaging