Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small bug fixes and removal of global statics

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@22072 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rickg%netscape.com
1999-02-26 06:33:54 +00:00
parent b0e3a4ac8c
commit 5012f4e582
56 changed files with 279 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/parser/htmlparser/src/nsParserNode.cpp
View File

@@ -23,7 +23,7 @@
#include "nshtmlpars.h"
#include "nsITokenizer.h"
const nsAutoString nsCParserNode::mEmptyString("");
const nsString* nsCParserNode::mEmptyString=0;
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kClassIID, NS_PARSER_NODE_IID);
@@ -38,6 +38,9 @@ static NS_DEFINE_IID(kIParserNodeIID, NS_IPARSER_NODE_IID);
*/
nsCParserNode::nsCParserNode(CToken* aToken,PRInt32 aLineNumber,nsITokenRecycler* aRecycler): nsIParserNode() {
NS_INIT_REFCNT();
if(!mEmptyString) {
mEmptyString=new nsString(""); //this is going to leak, but it's a singleton
}
mAttributeCount=0;
mLineNumber=aLineNumber;
mToken=aToken;
@@ -162,7 +165,7 @@ void nsCParserNode::SetSkippedContent(CToken* aToken){
* @return string ref containing node name
*/
const nsString& nsCParserNode::GetName() const {
return mEmptyString;
return *mEmptyString;
// return mName;
}
@@ -191,7 +194,7 @@ const nsString& nsCParserNode::GetSkippedContent() const {
if (nsnull != mSkippedContent) {
return ((CSkippedContentToken*)mSkippedContent)->GetKey();
}
return mEmptyString;
return *mEmptyString;
}
/**
@@ -246,7 +249,7 @@ const nsString& nsCParserNode::GetKeyAt(PRInt32 anIndex) const {
CAttributeToken* tkn=(CAttributeToken*)(mAttributes[anIndex]);
return tkn->GetKey();
}
return mEmptyString;
return *mEmptyString;
}
@@ -262,7 +265,7 @@ const nsString& nsCParserNode::GetValueAt(PRInt32 anIndex) const {
if(anIndex<mAttributeCount){
return (mAttributes[anIndex])->GetStringValueXXX();
}
return mEmptyString;
return *mEmptyString;
}