From da1a7d53313025b69eb00de23bb9df3de0484e4f Mon Sep 17 00:00:00 2001 From: "mcmullen%netscape.com" Date: Sat, 9 Jan 1999 02:41:35 +0000 Subject: [PATCH] Remove illegal TextTxn:: within TextTxn class (this is illegal in C++ unless you have a nested class with the same name). This fixes Macintosh build bustage. git-svn-id: svn://10.0.0.236/trunk@17445 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/editor/base/EditTxn.h | 2 +- mozilla/editor/core/EditTxn.h | 2 +- mozilla/editor/libeditor/base/EditTxn.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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);