From 24ad0f7d8f57914c0f42f905eee6b3efbd10787e Mon Sep 17 00:00:00 2001
From: "rpotts%netscape.com"
 <rpotts%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 19 Dec 2000 23:01:25 +0000
Subject: [PATCH] a little cleanup - no need to make private methdos virtual...

git-svn-id: svn://10.0.0.236/trunk@83869 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/docshell/base/nsDefaultURIFixup.cpp | 15 ++++++++-------
 mozilla/docshell/base/nsDefaultURIFixup.h   |  8 ++++----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/mozilla/docshell/base/nsDefaultURIFixup.cpp b/mozilla/docshell/base/nsDefaultURIFixup.cpp
index 0718bdaf4d1..4a9e7a2f992 100644
--- a/mozilla/docshell/base/nsDefaultURIFixup.cpp
+++ b/mozilla/docshell/base/nsDefaultURIFixup.cpp
@@ -114,8 +114,8 @@ NS_IMETHODIMP nsDefaultURIFixup::CreateFixupURI(const PRUnichar *aStringURI, nsI
 }
 
 
-NS_IMETHODIMP nsDefaultURIFixup::FileURIFixup(const PRUnichar* aStringURI, 
-   nsIURI** aURI)
+nsresult nsDefaultURIFixup::FileURIFixup(const PRUnichar* aStringURI, 
+                                         nsIURI** aURI)
 {
     nsAutoString uriSpecIn(aStringURI);
     nsAutoString uriSpecOut(aStringURI);
@@ -138,7 +138,8 @@ NS_IMETHODIMP nsDefaultURIFixup::FileURIFixup(const PRUnichar* aStringURI,
 
 #define FILE_PROTOCOL "file://"
 
-NS_IMETHODIMP nsDefaultURIFixup::ConvertFileToStringURI(nsString& aIn, nsString& aOut)
+nsresult nsDefaultURIFixup::ConvertFileToStringURI(nsString& aIn,
+                                                   nsString& aOut)
 {
 #ifdef XP_PC
     // Check for \ in the url-string or just a drive (PC)
@@ -169,8 +170,8 @@ NS_IMETHODIMP nsDefaultURIFixup::ConvertFileToStringURI(nsString& aIn, nsString&
 }
 
 
-NS_IMETHODIMP nsDefaultURIFixup::ConvertStringURIToFileCharset(nsString& aIn, 
-   nsCString& aOut)
+nsresult nsDefaultURIFixup::ConvertStringURIToFileCharset(nsString& aIn, 
+                                                          nsCString& aOut)
 {
     aOut = "";
     // for file url, we need to convert the nsString to the file system
@@ -209,8 +210,8 @@ NS_IMETHODIMP nsDefaultURIFixup::ConvertStringURIToFileCharset(nsString& aIn,
 }
 
 
-NS_IMETHODIMP nsDefaultURIFixup::KeywordURIFixup(const PRUnichar* aStringURI, 
-   nsIURI** aURI)
+nsresult nsDefaultURIFixup::KeywordURIFixup(const PRUnichar* aStringURI, 
+                                            nsIURI** aURI)
 {
     // These are keyword formatted strings
     // "what is mozilla"
diff --git a/mozilla/docshell/base/nsDefaultURIFixup.h b/mozilla/docshell/base/nsDefaultURIFixup.h
index 5cfd9647c76..f1742536d73 100644
--- a/mozilla/docshell/base/nsDefaultURIFixup.h
+++ b/mozilla/docshell/base/nsDefaultURIFixup.h
@@ -44,10 +44,10 @@ protected:
 
 private:
     /* additional members */
-    NS_IMETHOD FileURIFixup(const PRUnichar* aStringURI, nsIURI** aURI);
-    NS_IMETHOD ConvertFileToStringURI(nsString& aIn, nsString& aOut);
-    NS_IMETHOD ConvertStringURIToFileCharset(nsString& aIn, nsCString& aOut);
-    NS_IMETHOD KeywordURIFixup(const PRUnichar* aStringURI, nsIURI** aURI);
+    nsresult FileURIFixup(const PRUnichar* aStringURI, nsIURI** aURI);
+    nsresult ConvertFileToStringURI(nsString& aIn, nsString& aOut);
+    nsresult ConvertStringURIToFileCharset(nsString& aIn, nsCString& aOut);
+    nsresult KeywordURIFixup(const PRUnichar* aStringURI, nsIURI** aURI);
 
     nsCOMPtr<nsIPref> mPrefs;
 };