diff --git a/mozilla/editor/base/EditTxn.h b/mozilla/editor/base/EditTxn.h index ac0201f0412..83b3b96d2e6 100644 --- a/mozilla/editor/base/EditTxn.h +++ b/mozilla/editor/base/EditTxn.h @@ -60,7 +60,7 @@ public: nsIDOMNode * aNewNode, nsIDOMNode * aParent); - static nsresult EditTxn::JoinNodes(nsIDOMNode * aNodeToKeep, + static nsresult JoinNodes(nsIDOMNode * aNodeToKeep, nsIDOMNode * aNodeToJoin, nsIDOMNode * aParent, PRBool aNodeToKeepIsFirst); diff --git a/mozilla/editor/core/EditTxn.h b/mozilla/editor/core/EditTxn.h index ac0201f0412..83b3b96d2e6 100644 --- a/mozilla/editor/core/EditTxn.h +++ b/mozilla/editor/core/EditTxn.h @@ -60,7 +60,7 @@ public: nsIDOMNode * aNewNode, nsIDOMNode * aParent); - static nsresult EditTxn::JoinNodes(nsIDOMNode * aNodeToKeep, + static nsresult JoinNodes(nsIDOMNode * aNodeToKeep, nsIDOMNode * aNodeToJoin, nsIDOMNode * aParent, PRBool aNodeToKeepIsFirst); diff --git a/mozilla/editor/libeditor/base/EditTxn.h b/mozilla/editor/libeditor/base/EditTxn.h index ac0201f0412..83b3b96d2e6 100644 --- a/mozilla/editor/libeditor/base/EditTxn.h +++ b/mozilla/editor/libeditor/base/EditTxn.h @@ -60,7 +60,7 @@ public: nsIDOMNode * aNewNode, nsIDOMNode * aParent); - static nsresult EditTxn::JoinNodes(nsIDOMNode * aNodeToKeep, + static nsresult JoinNodes(nsIDOMNode * aNodeToKeep, nsIDOMNode * aNodeToJoin, nsIDOMNode * aParent, PRBool aNodeToKeepIsFirst);