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

Get rid of overloaded class names, to eliminate warnings

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@34069 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
akkana%netscape.com
1999-06-07 21:12:01 +00:00
parent 25b7bf1a12
commit d0e25f4a05
8 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/editor/base/nsHTMLEditor.cpp
View File

@@ -517,12 +517,12 @@ NS_IMETHODIMP nsHTMLEditor::InsertHTML(const nsString& aInputString)
return res;
}
NS_IMETHODIMP nsHTMLEditor::OutputText(nsString& aOutputString)
NS_IMETHODIMP nsHTMLEditor::OutputTextToString(nsString& aOutputString)
{
return nsTextEditor::OutputText(aOutputString);
return nsTextEditor::OutputTextToString(aOutputString);
}
NS_IMETHODIMP nsHTMLEditor::OutputHTML(nsString& aOutputString)
NS_IMETHODIMP nsHTMLEditor::OutputHTMLToString(nsString& aOutputString)
{
#if defined(DEBUG_kostello) || defined(DEBUG_akkana)
nsCOMPtr<nsIHTMLEncoder> encoder;
@@ -535,18 +535,18 @@ NS_IMETHODIMP nsHTMLEditor::OutputHTML(nsString& aOutputString)
return encoder->EncodeToString(aOutputString);
#else
return nsTextEditor::OutputHTML(aOutputString);
return nsTextEditor::OutputHTMLToString(aOutputString);
#endif
}
NS_IMETHODIMP nsHTMLEditor::OutputText(nsIOutputStream* aOutputStream, nsString* aCharsetOverride)
NS_IMETHODIMP nsHTMLEditor::OutputTextToStream(nsIOutputStream* aOutputStream, nsString* aCharsetOverride)
{
return nsTextEditor::OutputText(aOutputStream,aCharsetOverride);
return nsTextEditor::OutputTextToStream(aOutputStream,aCharsetOverride);
}
NS_IMETHODIMP nsHTMLEditor::OutputHTML(nsIOutputStream* aOutputStream,nsString* aCharsetOverride)
NS_IMETHODIMP nsHTMLEditor::OutputHTMLToStream(nsIOutputStream* aOutputStream,nsString* aCharsetOverride)
{
return nsTextEditor::OutputHTML(aOutputStream,aCharsetOverride);
return nsTextEditor::OutputHTMLToStream(aOutputStream,aCharsetOverride);
}

8
mozilla/editor/base/nsHTMLEditor.h
View File

@@ -106,10 +106,10 @@ public:
NS_IMETHOD BeginComposition(void);
NS_IMETHOD SetCompositionString(const nsString& aCompositionString);
NS_IMETHOD EndComposition(void);
NS_IMETHOD OutputText(nsString& aOutputString);
NS_IMETHOD OutputHTML(nsString& aOutputString);
NS_IMETHOD OutputText(nsIOutputStream* aOutputStream,nsString* aCharsetOverride = nsnull);
NS_IMETHOD OutputHTML(nsIOutputStream* aOutputStream,nsString* aCharsetOverride = nsnull);
NS_IMETHOD OutputTextToString(nsString& aOutputString);
NS_IMETHOD OutputHTMLToString(nsString& aOutputString);
NS_IMETHOD OutputTextToStream(nsIOutputStream* aOutputStream,nsString* aCharsetOverride = nsnull);
NS_IMETHOD OutputHTMLToStream(nsIOutputStream* aOutputStream,nsString* aCharsetOverride = nsnull);
// End of methods implemented in nsEditor
//=============================================================

20
mozilla/editor/base/nsTextEditor.cpp
View File

@@ -1312,18 +1312,18 @@ NS_IMETHODIMP nsTextEditor::SetBodyWrapWidth(PRInt32 aWrapColumn)
return res;
}
NS_IMETHODIMP nsTextEditor::OutputText(nsString& aOutputString)
NS_IMETHODIMP nsTextEditor::OutputTextToString(nsString& aOutputString)
{
return OutputText(nsnull,&aOutputString,nsnull);
return OutputTextInternal(nsnull,&aOutputString,nsnull);
}
NS_IMETHODIMP nsTextEditor::OutputText(nsIOutputStream* aOutputStream, nsString* aCharsetOverride)
NS_IMETHODIMP nsTextEditor::OutputTextToStream(nsIOutputStream* aOutputStream, nsString* aCharsetOverride)
{
return OutputText(aOutputStream,nsnull,aCharsetOverride);
return OutputTextInternal(aOutputStream,nsnull,aCharsetOverride);
}
NS_IMETHODIMP nsTextEditor::OutputText(nsIOutputStream* aOutputStream, nsString* aOutputString, nsString* aCharsetOverride)
NS_IMETHODIMP nsTextEditor::OutputTextInternal(nsIOutputStream* aOutputStream, nsString* aOutputString, nsString* aCharsetOverride)
{
nsresult rv = NS_ERROR_FAILURE;
@@ -1387,18 +1387,18 @@ NS_IMETHODIMP nsTextEditor::OutputText(nsIOutputStream* aOutputStream, nsString*
}
NS_IMETHODIMP nsTextEditor::OutputHTML(nsString& aOutputString)
NS_IMETHODIMP nsTextEditor::OutputHTMLToString(nsString& aOutputString)
{
return OutputHTML(nsnull,&aOutputString,nsnull);
return OutputHTMLInternal(nsnull,&aOutputString,nsnull);
}
NS_IMETHODIMP nsTextEditor::OutputHTML(nsIOutputStream* aOutputStream,nsString* aCharsetOverride)
NS_IMETHODIMP nsTextEditor::OutputHTMLToStream(nsIOutputStream* aOutputStream,nsString* aCharsetOverride)
{
return OutputHTML(aOutputStream,nsnull,aCharsetOverride);
return OutputHTMLInternal(aOutputStream,nsnull,aCharsetOverride);
}
NS_IMETHODIMP nsTextEditor::OutputHTML(nsIOutputStream* aOutputStream, nsString* aOutputString, nsString* aCharsetOverride)
NS_IMETHODIMP nsTextEditor::OutputHTMLInternal(nsIOutputStream* aOutputStream, nsString* aOutputString, nsString* aCharsetOverride)
{
nsresult rv = NS_ERROR_FAILURE;

12
mozilla/editor/base/nsTextEditor.h
View File

@@ -108,10 +108,10 @@ public:
NS_IMETHOD BeginComposition(void);
NS_IMETHOD SetCompositionString(const nsString& aCompositionString);
NS_IMETHOD EndComposition(void);
NS_IMETHOD OutputText(nsString& aOutputString);
NS_IMETHOD OutputHTML(nsString& aOutputString);
NS_IMETHOD OutputText(nsIOutputStream* aOutputStream, nsString* aCharsetOverride);
NS_IMETHOD OutputHTML(nsIOutputStream* aOutputStream, nsString* aCharsetOverride);
NS_IMETHOD OutputTextToString(nsString& aOutputString);
NS_IMETHOD OutputHTMLToString(nsString& aOutputString);
NS_IMETHOD OutputTextToStream(nsIOutputStream* aOutputStream, nsString* aCharsetOverride);
NS_IMETHOD OutputHTMLToStream(nsIOutputStream* aOutputStream, nsString* aCharsetOverride);
// Plain text wrapping control
NS_IMETHOD GetBodyWrapWidth(PRInt32 *aWrapColumn);
@@ -258,8 +258,8 @@ protected:
TypeInState *GetTypeInState();
NS_IMETHOD OutputText(nsIOutputStream* aOutputStream, nsString* aOutputString, nsString* aCharsetOverride);
NS_IMETHOD OutputHTML(nsIOutputStream* aOutputStream, nsString* aOutputString, nsString* aCharsetOverride);
NS_IMETHOD OutputTextInternal(nsIOutputStream* aOutputStream, nsString* aOutputString, nsString* aCharsetOverride);
NS_IMETHOD OutputHTMLInternal(nsIOutputStream* aOutputStream, nsString* aOutputString, nsString* aCharsetOverride);
/** simple utility to handle any error with event listener allocation or registration */
void HandleEventListenerError();

16
mozilla/editor/libeditor/html/nsHTMLEditor.cpp
View File

@@ -517,12 +517,12 @@ NS_IMETHODIMP nsHTMLEditor::InsertHTML(const nsString& aInputString)
return res;
}
NS_IMETHODIMP nsHTMLEditor::OutputText(nsString& aOutputString)
NS_IMETHODIMP nsHTMLEditor::OutputTextToString(nsString& aOutputString)
{
return nsTextEditor::OutputText(aOutputString);
return nsTextEditor::OutputTextToString(aOutputString);
}
NS_IMETHODIMP nsHTMLEditor::OutputHTML(nsString& aOutputString)
NS_IMETHODIMP nsHTMLEditor::OutputHTMLToString(nsString& aOutputString)
{
#if defined(DEBUG_kostello) || defined(DEBUG_akkana)
nsCOMPtr<nsIHTMLEncoder> encoder;
@@ -535,18 +535,18 @@ NS_IMETHODIMP nsHTMLEditor::OutputHTML(nsString& aOutputString)
return encoder->EncodeToString(aOutputString);
#else
return nsTextEditor::OutputHTML(aOutputString);
return nsTextEditor::OutputHTMLToString(aOutputString);
#endif
}
NS_IMETHODIMP nsHTMLEditor::OutputText(nsIOutputStream* aOutputStream, nsString* aCharsetOverride)
NS_IMETHODIMP nsHTMLEditor::OutputTextToStream(nsIOutputStream* aOutputStream, nsString* aCharsetOverride)
{
return nsTextEditor::OutputText(aOutputStream,aCharsetOverride);
return nsTextEditor::OutputTextToStream(aOutputStream,aCharsetOverride);
}
NS_IMETHODIMP nsHTMLEditor::OutputHTML(nsIOutputStream* aOutputStream,nsString* aCharsetOverride)
NS_IMETHODIMP nsHTMLEditor::OutputHTMLToStream(nsIOutputStream* aOutputStream,nsString* aCharsetOverride)
{
return nsTextEditor::OutputHTML(aOutputStream,aCharsetOverride);
return nsTextEditor::OutputHTMLToStream(aOutputStream,aCharsetOverride);
}

8
mozilla/editor/libeditor/html/nsHTMLEditor.h
View File

@@ -106,10 +106,10 @@ public:
NS_IMETHOD BeginComposition(void);
NS_IMETHOD SetCompositionString(const nsString& aCompositionString);
NS_IMETHOD EndComposition(void);
NS_IMETHOD OutputText(nsString& aOutputString);
NS_IMETHOD OutputHTML(nsString& aOutputString);
NS_IMETHOD OutputText(nsIOutputStream* aOutputStream,nsString* aCharsetOverride = nsnull);
NS_IMETHOD OutputHTML(nsIOutputStream* aOutputStream,nsString* aCharsetOverride = nsnull);
NS_IMETHOD OutputTextToString(nsString& aOutputString);
NS_IMETHOD OutputHTMLToString(nsString& aOutputString);
NS_IMETHOD OutputTextToStream(nsIOutputStream* aOutputStream,nsString* aCharsetOverride = nsnull);
NS_IMETHOD OutputHTMLToStream(nsIOutputStream* aOutputStream,nsString* aCharsetOverride = nsnull);
// End of methods implemented in nsEditor
//=============================================================

8
mozilla/editor/public/nsIHTMLEditor.h
View File

@@ -99,11 +99,11 @@ public:
NS_IMETHOD InsertHTML(const nsString &aInputString)=0;
NS_IMETHOD OutputText(nsString& aOutputString)=0;
NS_IMETHOD OutputHTML(nsString& aOutputString)=0;
NS_IMETHOD OutputTextToString(nsString& aOutputString)=0;
NS_IMETHOD OutputHTMLToString(nsString& aOutputString)=0;
NS_IMETHOD OutputText(nsIOutputStream* aOutputStream, nsString* aCharsetOverride = nsnull)=0;
NS_IMETHOD OutputHTML(nsIOutputStream* aOutputStream, nsString* aCharsetOverride = nsnull)=0;
NS_IMETHOD OutputTextToStream(nsIOutputStream* aOutputStream, nsString* aCharsetOverride = nsnull)=0;
NS_IMETHOD OutputHTMLToStream(nsIOutputStream* aOutputStream, nsString* aCharsetOverride = nsnull)=0;
NS_IMETHOD GetLocalFileURL(nsIDOMWindow* aParent, const nsString& aFilterType, nsString& aReturn)=0;

8
mozilla/editor/public/nsITextEditor.h
View File

@@ -314,11 +314,11 @@ public:
NS_IMETHOD ScrollIntoView(PRBool aScrollToBegin)=0;
// Input/Output
NS_IMETHOD OutputText(nsString& aOutputString)=0;
NS_IMETHOD OutputHTML(nsString& aOutputString)=0;
NS_IMETHOD OutputTextToString(nsString& aOutputString)=0;
NS_IMETHOD OutputHTMLToString(nsString& aOutputString)=0;
NS_IMETHOD OutputText(nsIOutputStream* aOutputStream, nsString* aCharsetOverride = nsnull)=0;
NS_IMETHOD OutputHTML(nsIOutputStream* aOutputStream, nsString* aCharsetOverride = nsnull)=0;
NS_IMETHOD OutputTextToStream(nsIOutputStream* aOutputStream, nsString* aCharsetOverride = nsnull)=0;
NS_IMETHOD OutputHTMLToStream(nsIOutputStream* aOutputStream, nsString* aCharsetOverride = nsnull)=0;
/** Get and set the body wrap width
* @param aWrapColumn - the column to wrap at. This is set as a COLS attribute