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

Bug 53057: Fixing up users of implicit |CharT*| conversion operators for nsCString to use |.get()| instead, rr=dbaron, rs=scc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@106257 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jaggernaut%netscape.com
2001-10-25 07:45:52 +00:00
parent 8bdd562d78
commit 5835031439
20 changed files with 48 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/htmlparser/src/CNavDTD.cpp
View File

@@ -2520,7 +2520,7 @@ NS_IMETHODIMP CNavDTD::StringTagToIntTag(nsString &aTag, PRInt32* aIntTag) const
}
NS_IMETHODIMP CNavDTD::IntTagToStringTag(PRInt32 aIntTag, nsString& aTag) const {
aTag.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag)aIntTag));
aTag.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag)aIntTag).get());
return NS_OK;
}

2
mozilla/htmlparser/src/COtherDTD.cpp
View File

@@ -893,7 +893,7 @@ NS_IMETHODIMP COtherDTD::StringTagToIntTag(nsString &aTag, PRInt32* aIntTag) con
}
NS_IMETHODIMP COtherDTD::IntTagToStringTag(PRInt32 aIntTag, nsString& aTag) const {
aTag.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag)aIntTag));
aTag.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag)aIntTag).get());
return NS_OK;
}

4
mozilla/htmlparser/src/COtherElements.h
View File

@@ -2378,7 +2378,7 @@ void CElementTable::InitializeElements() {
#ifdef DEBUG
void CElementTable::DebugDumpGroups(CElement* aTag){
const char* tag=nsHTMLTags::GetStringValue(aTag->mTag);
const char* tag=nsHTMLTags::GetStringValue(aTag->mTag).get();
const char* prefix=" ";
printf("\n\nTag: <%s>\n",tag);
printf(prefix);
@@ -2458,7 +2458,7 @@ void CElementTable::DebugDumpGroups(CElement* aTag){
}
void CElementTable::DebugDumpContainment(CElement* anElement){
const char* tag=nsHTMLTags::GetStringValue(anElement->mTag);
const char* tag=nsHTMLTags::GetStringValue(anElement->mTag).get();
const char* prefix=" ";
printf("\n\nTag: <%s>\n",tag);
printf(prefix);

7
mozilla/htmlparser/src/nsDTDUtils.cpp
View File

@@ -1546,16 +1546,15 @@ nsObserverEntry::Notify(nsIParserNode* aNode,
keys.AppendString(NS_LITERAL_STRING("X_COMMAND"));
values.AppendString(NS_LITERAL_STRING("text/html"));
nsAutoString theTagStr;
theTagStr.AssignWithConversion(nsHTMLTags::GetStringValue(theTag));
nsCOMPtr<nsIChannel> channel;
aParser->GetChannel(getter_AddRefs(channel));
for (index=0;index<theObserversCount;index++) {
nsIElementObserver* observer = NS_STATIC_CAST(nsIElementObserver*,theObservers->ElementAt(index));
if (observer) {
result = observer->Notify(aWebShell,channel,theTagStr.get(),&keys,&values);
result = observer->Notify(aWebShell, channel,
NS_ConvertASCIItoUCS2(nsHTMLTags::GetStringValue(theTag)).get(),
&keys, &values);
if (NS_FAILED(result)) {
break;
}

8
mozilla/htmlparser/src/nsHTMLTags.cpp
View File

@@ -184,7 +184,7 @@ public:
tag = kTagTable[i];
id = nsHTMLTags::LookupTag(nsCAutoString(tag));
NS_ASSERTION(id != eHTMLTag_userdefined, "can't find tag id");
const char* check = nsHTMLTags::GetStringValue(id);
const char* check = nsHTMLTags::GetStringValue(id).get();
NS_ASSERTION(0 == nsCRT::strcmp(check, tag), "can't map id back to tag");
}
@@ -195,11 +195,11 @@ public:
NS_ASSERTION(id == eHTMLTag_userdefined, "found zzzzz");
const nsCAutoString kNull;
tag = nsHTMLTags::GetStringValue((nsHTMLTag) 0);
tag = nsHTMLTags::GetStringValue((nsHTMLTag) 0).get();
NS_ASSERTION(kNull.Equals(tag), "found enum 0");
tag = nsHTMLTags::GetStringValue((nsHTMLTag) -1);
tag = nsHTMLTags::GetStringValue((nsHTMLTag) -1).get();
NS_ASSERTION(kNull.Equals(tag), "found enum -1");
tag = nsHTMLTags::GetStringValue((nsHTMLTag) (NS_HTML_TAG_MAX + 1));
tag = nsHTMLTags::GetStringValue((nsHTMLTag) (NS_HTML_TAG_MAX + 1)).get();
NS_ASSERTION(kNull.Equals(tag), "found past max enum");
nsHTMLTags::ReleaseTable();
}

2
mozilla/htmlparser/src/nsHTMLTokenizer.cpp
View File

@@ -766,7 +766,7 @@ nsresult nsHTMLTokenizer::ConsumeStartTag(PRUnichar aChar,CToken*& aToken,nsScan
//if((eHTMLTag_style==theTag) || (eHTMLTag_script==theTag)) {
if(gHTMLElements[theTag].CanContainType(kCDATA)) {
nsAutoString endTagName;
endTagName.AssignWithConversion(nsHTMLTags::GetStringValue(theTag));
endTagName.AssignWithConversion(nsHTMLTags::GetStringValue(theTag).get());
CToken* text=theAllocator->CreateTokenOfType(eToken_text,eHTMLTag_text);
CTextToken* textToken=NS_STATIC_CAST(CTextToken*,text);

6
mozilla/htmlparser/src/nsHTMLTokens.cpp
View File

@@ -268,7 +268,7 @@ const nsAReadableString& CStartToken::GetStringValue()
{
if((eHTMLTag_unknown<mTypeID) && (mTypeID<eHTMLTag_text)) {
if(!mTextValue.Length()) {
mTextValue.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag) mTypeID));
mTextValue.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag) mTypeID).get());
}
}
return mTextValue;
@@ -455,7 +455,7 @@ const nsAReadableString& CEndToken::GetStringValue()
{
if((eHTMLTag_unknown<mTypeID) && (mTypeID<eHTMLTag_text)) {
if(!mTextValue.Length()) {
mTextValue.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag) mTypeID));
mTextValue.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag) mTypeID).get());
}
}
return mTextValue;
@@ -2273,7 +2273,7 @@ const char* GetTagName(PRInt32 aTag) {
return gUserdefined;
else return 0;
}
return result;
return result.get();
}

12
mozilla/htmlparser/src/nsLoggingSink.cpp
View File

@@ -224,10 +224,10 @@ nsLoggingSink::CloseContainer(const nsIParserNode& aNode) {
nsHTMLTag nodeType = nsHTMLTag(aNode.GetNodeType());
if ((nodeType >= eHTMLTag_unknown) &&
(nodeType <= nsHTMLTag(NS_HTML_TAG_MAX))) {
const char* tag = nsHTMLTags::GetStringValue(nodeType);
theResult=CloseNode(tag);
}
else theResult= CloseNode("???");
const char* tag = nsHTMLTags::GetStringValue(nodeType).get();
theResult=CloseNode(tag);
}
else theResult= CloseNode("???");
//then proxy the call to the real sink if you have one.
if(mSink) {
@@ -548,7 +548,7 @@ nsLoggingSink::OpenNode(const char* aKind, const nsIParserNode& aNode) {
nsHTMLTag nodeType = nsHTMLTag(aNode.GetNodeType());
if ((nodeType >= eHTMLTag_unknown) &&
(nodeType <= nsHTMLTag(NS_HTML_TAG_MAX))) {
const char* tag = nsHTMLTags::GetStringValue(nodeType);
const char* tag = nsHTMLTags::GetStringValue(nodeType).get();
PR_fprintf(mOutput, "\"%s\"", tag);
}
else {
@@ -660,7 +660,7 @@ nsLoggingSink::LeafNode(const nsIParserNode& aNode)
if ((nodeType >= eHTMLTag_unknown) &&
(nodeType <= nsHTMLTag(NS_HTML_TAG_MAX))) {
const char* tag = nsHTMLTags::GetStringValue(nodeType);
const char* tag = nsHTMLTags::GetStringValue(nodeType).get();
if(tag)
PR_fprintf(mOutput, "<leaf tag=\"%s\"", tag);

4
mozilla/htmlparser/src/nsParserService.cpp
View File

@@ -31,7 +31,7 @@ nsParserService::nsParserService() : mEntries(0)
nsParserService::~nsParserService()
{
nsObserverEntry *entry = nsnull;
while(entry = NS_STATIC_CAST(nsObserverEntry*,mEntries.Pop())) {
while( (entry = NS_STATIC_CAST(nsObserverEntry*,mEntries.Pop())) ) {
NS_RELEASE(entry);
}
}
@@ -60,7 +60,7 @@ nsParserService::HTMLStringTagToId(const nsString &aTag, PRInt32* aId) const
NS_IMETHODIMP
nsParserService::HTMLIdToStringTag(PRInt32 aId, nsString& aTag) const
{
aTag.AssignWithConversion( nsHTMLTags::GetStringValue((nsHTMLTag)aId) );
aTag.AssignWithConversion( nsHTMLTags::GetStringValue((nsHTMLTag)aId).get() );
return NS_OK;
}

2
mozilla/htmlparser/src/nsViewSourceHTML.cpp
View File

@@ -818,7 +818,7 @@ NS_IMETHODIMP CViewSourceHTML::StringTagToIntTag(nsString &aTag, PRInt32* aIntTa
NS_IMETHODIMP CViewSourceHTML::IntTagToStringTag(PRInt32 aIntTag, nsString& aTag) const
{
aTag.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag)aIntTag));
aTag.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag)aIntTag).get());
return NS_OK;
}

2
mozilla/parser/htmlparser/src/CNavDTD.cpp
View File

@@ -2520,7 +2520,7 @@ NS_IMETHODIMP CNavDTD::StringTagToIntTag(nsString &aTag, PRInt32* aIntTag) const
}
NS_IMETHODIMP CNavDTD::IntTagToStringTag(PRInt32 aIntTag, nsString& aTag) const {
aTag.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag)aIntTag));
aTag.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag)aIntTag).get());
return NS_OK;
}

2
mozilla/parser/htmlparser/src/COtherDTD.cpp
View File

@@ -893,7 +893,7 @@ NS_IMETHODIMP COtherDTD::StringTagToIntTag(nsString &aTag, PRInt32* aIntTag) con
}
NS_IMETHODIMP COtherDTD::IntTagToStringTag(PRInt32 aIntTag, nsString& aTag) const {
aTag.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag)aIntTag));
aTag.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag)aIntTag).get());
return NS_OK;
}

4
mozilla/parser/htmlparser/src/COtherElements.h
View File

@@ -2378,7 +2378,7 @@ void CElementTable::InitializeElements() {
#ifdef DEBUG
void CElementTable::DebugDumpGroups(CElement* aTag){
const char* tag=nsHTMLTags::GetStringValue(aTag->mTag);
const char* tag=nsHTMLTags::GetStringValue(aTag->mTag).get();
const char* prefix=" ";
printf("\n\nTag: <%s>\n",tag);
printf(prefix);
@@ -2458,7 +2458,7 @@ void CElementTable::DebugDumpGroups(CElement* aTag){
}
void CElementTable::DebugDumpContainment(CElement* anElement){
const char* tag=nsHTMLTags::GetStringValue(anElement->mTag);
const char* tag=nsHTMLTags::GetStringValue(anElement->mTag).get();
const char* prefix=" ";
printf("\n\nTag: <%s>\n",tag);
printf(prefix);

7
mozilla/parser/htmlparser/src/nsDTDUtils.cpp
View File

@@ -1546,16 +1546,15 @@ nsObserverEntry::Notify(nsIParserNode* aNode,
keys.AppendString(NS_LITERAL_STRING("X_COMMAND"));
values.AppendString(NS_LITERAL_STRING("text/html"));
nsAutoString theTagStr;
theTagStr.AssignWithConversion(nsHTMLTags::GetStringValue(theTag));
nsCOMPtr<nsIChannel> channel;
aParser->GetChannel(getter_AddRefs(channel));
for (index=0;index<theObserversCount;index++) {
nsIElementObserver* observer = NS_STATIC_CAST(nsIElementObserver*,theObservers->ElementAt(index));
if (observer) {
result = observer->Notify(aWebShell,channel,theTagStr.get(),&keys,&values);
result = observer->Notify(aWebShell, channel,
NS_ConvertASCIItoUCS2(nsHTMLTags::GetStringValue(theTag)).get(),
&keys, &values);
if (NS_FAILED(result)) {
break;
}

8
mozilla/parser/htmlparser/src/nsHTMLTags.cpp
View File

@@ -184,7 +184,7 @@ public:
tag = kTagTable[i];
id = nsHTMLTags::LookupTag(nsCAutoString(tag));
NS_ASSERTION(id != eHTMLTag_userdefined, "can't find tag id");
const char* check = nsHTMLTags::GetStringValue(id);
const char* check = nsHTMLTags::GetStringValue(id).get();
NS_ASSERTION(0 == nsCRT::strcmp(check, tag), "can't map id back to tag");
}
@@ -195,11 +195,11 @@ public:
NS_ASSERTION(id == eHTMLTag_userdefined, "found zzzzz");
const nsCAutoString kNull;
tag = nsHTMLTags::GetStringValue((nsHTMLTag) 0);
tag = nsHTMLTags::GetStringValue((nsHTMLTag) 0).get();
NS_ASSERTION(kNull.Equals(tag), "found enum 0");
tag = nsHTMLTags::GetStringValue((nsHTMLTag) -1);
tag = nsHTMLTags::GetStringValue((nsHTMLTag) -1).get();
NS_ASSERTION(kNull.Equals(tag), "found enum -1");
tag = nsHTMLTags::GetStringValue((nsHTMLTag) (NS_HTML_TAG_MAX + 1));
tag = nsHTMLTags::GetStringValue((nsHTMLTag) (NS_HTML_TAG_MAX + 1)).get();
NS_ASSERTION(kNull.Equals(tag), "found past max enum");
nsHTMLTags::ReleaseTable();
}

2
mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
View File

@@ -766,7 +766,7 @@ nsresult nsHTMLTokenizer::ConsumeStartTag(PRUnichar aChar,CToken*& aToken,nsScan
//if((eHTMLTag_style==theTag) || (eHTMLTag_script==theTag)) {
if(gHTMLElements[theTag].CanContainType(kCDATA)) {
nsAutoString endTagName;
endTagName.AssignWithConversion(nsHTMLTags::GetStringValue(theTag));
endTagName.AssignWithConversion(nsHTMLTags::GetStringValue(theTag).get());
CToken* text=theAllocator->CreateTokenOfType(eToken_text,eHTMLTag_text);
CTextToken* textToken=NS_STATIC_CAST(CTextToken*,text);

6
mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
View File

@@ -268,7 +268,7 @@ const nsAReadableString& CStartToken::GetStringValue()
{
if((eHTMLTag_unknown<mTypeID) && (mTypeID<eHTMLTag_text)) {
if(!mTextValue.Length()) {
mTextValue.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag) mTypeID));
mTextValue.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag) mTypeID).get());
}
}
return mTextValue;
@@ -455,7 +455,7 @@ const nsAReadableString& CEndToken::GetStringValue()
{
if((eHTMLTag_unknown<mTypeID) && (mTypeID<eHTMLTag_text)) {
if(!mTextValue.Length()) {
mTextValue.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag) mTypeID));
mTextValue.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag) mTypeID).get());
}
}
return mTextValue;
@@ -2273,7 +2273,7 @@ const char* GetTagName(PRInt32 aTag) {
return gUserdefined;
else return 0;
}
return result;
return result.get();
}

12
mozilla/parser/htmlparser/src/nsLoggingSink.cpp
View File

@@ -224,10 +224,10 @@ nsLoggingSink::CloseContainer(const nsIParserNode& aNode) {
nsHTMLTag nodeType = nsHTMLTag(aNode.GetNodeType());
if ((nodeType >= eHTMLTag_unknown) &&
(nodeType <= nsHTMLTag(NS_HTML_TAG_MAX))) {
const char* tag = nsHTMLTags::GetStringValue(nodeType);
theResult=CloseNode(tag);
}
else theResult= CloseNode("???");
const char* tag = nsHTMLTags::GetStringValue(nodeType).get();
theResult=CloseNode(tag);
}
else theResult= CloseNode("???");
//then proxy the call to the real sink if you have one.
if(mSink) {
@@ -548,7 +548,7 @@ nsLoggingSink::OpenNode(const char* aKind, const nsIParserNode& aNode) {
nsHTMLTag nodeType = nsHTMLTag(aNode.GetNodeType());
if ((nodeType >= eHTMLTag_unknown) &&
(nodeType <= nsHTMLTag(NS_HTML_TAG_MAX))) {
const char* tag = nsHTMLTags::GetStringValue(nodeType);
const char* tag = nsHTMLTags::GetStringValue(nodeType).get();
PR_fprintf(mOutput, "\"%s\"", tag);
}
else {
@@ -660,7 +660,7 @@ nsLoggingSink::LeafNode(const nsIParserNode& aNode)
if ((nodeType >= eHTMLTag_unknown) &&
(nodeType <= nsHTMLTag(NS_HTML_TAG_MAX))) {
const char* tag = nsHTMLTags::GetStringValue(nodeType);
const char* tag = nsHTMLTags::GetStringValue(nodeType).get();
if(tag)
PR_fprintf(mOutput, "<leaf tag=\"%s\"", tag);

4
mozilla/parser/htmlparser/src/nsParserService.cpp
View File

@@ -31,7 +31,7 @@ nsParserService::nsParserService() : mEntries(0)
nsParserService::~nsParserService()
{
nsObserverEntry *entry = nsnull;
while(entry = NS_STATIC_CAST(nsObserverEntry*,mEntries.Pop())) {
while( (entry = NS_STATIC_CAST(nsObserverEntry*,mEntries.Pop())) ) {
NS_RELEASE(entry);
}
}
@@ -60,7 +60,7 @@ nsParserService::HTMLStringTagToId(const nsString &aTag, PRInt32* aId) const
NS_IMETHODIMP
nsParserService::HTMLIdToStringTag(PRInt32 aId, nsString& aTag) const
{
aTag.AssignWithConversion( nsHTMLTags::GetStringValue((nsHTMLTag)aId) );
aTag.AssignWithConversion( nsHTMLTags::GetStringValue((nsHTMLTag)aId).get() );
return NS_OK;
}

2
mozilla/parser/htmlparser/src/nsViewSourceHTML.cpp
View File

@@ -818,7 +818,7 @@ NS_IMETHODIMP CViewSourceHTML::StringTagToIntTag(nsString &aTag, PRInt32* aIntTa
NS_IMETHODIMP CViewSourceHTML::IntTagToStringTag(PRInt32 aIntTag, nsString& aTag) const
{
aTag.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag)aIntTag));
aTag.AssignWithConversion(nsHTMLTags::GetStringValue((nsHTMLTag)aIntTag).get());
return NS_OK;
}