Bug 1295053 (part 3) - Don't use NS_METHOD for xpcom IO functions. r=froydnj.

These don't need __stdcall on Win32.

--HG--
extra : rebase_source : 19959269036f9f0e8f1ca4ee6b82f0d5e2a93a64

xpcom/io/nsAppFileLocationProvider.cpp

@@ -227,7 +227,7 @@ nsAppFileLocationProvider::GetFile(const char* aProp, bool* aPersistent,
 }
 
 
-NS_METHOD
+nsresult
 nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile)
 {
   if (NS_WARN_IF(!aLocalFile)) {
@@ -275,7 +275,7 @@ nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile)
 // WIN    : <Application Data folder on user's machine>\Mozilla
 // Mac    : :Documents:Mozilla:
 //----------------------------------------------------------------------------------------
-NS_METHOD
+nsresult
 nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
                                                bool aLocal)
 {
@@ -352,7 +352,7 @@ nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
 // WIN    : <Application Data folder on user's machine>\Mozilla\Profiles
 // Mac    : :Documents:Mozilla:Profiles:
 //----------------------------------------------------------------------------------------
-NS_METHOD
+nsresult
 nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsIFile** aLocalFile,
                                                      bool aLocal)
 {

xpcom/io/nsAppFileLocationProvider.h

@@ -32,7 +32,7 @@ private:
   }
 
 protected:
-  NS_METHOD CloneMozBinDirectory(nsIFile** aLocalFile);
+  nsresult CloneMozBinDirectory(nsIFile** aLocalFile);
   /**
   * Get the product directory. This is a user-specific directory for storing
   * application settings (e.g. the Application Data directory on windows
@@ -40,10 +40,10 @@ protected:
   * @param aLocal If true, should try to get a directory that is only stored
   *               locally (ie not transferred with roaming profiles)
   */
-  NS_METHOD GetProductDirectory(nsIFile** aLocalFile,
-                                bool aLocal = false);
-  NS_METHOD GetDefaultUserProfileRoot(nsIFile** aLocalFile,
-                                      bool aLocal = false);
+  nsresult GetProductDirectory(nsIFile** aLocalFile,
+                               bool aLocal = false);
+  nsresult GetDefaultUserProfileRoot(nsIFile** aLocalFile,
+                                     bool aLocal = false);
 
 #if defined(MOZ_WIDGET_COCOA)
   static bool IsOSXLeopard();

xpcom/io/nsStorageStream.cpp

@@ -276,7 +276,7 @@ nsStorageStream::GetWriteInProgress(bool* aWriteInProgress)
   return NS_OK;
 }
 
-NS_METHOD
+nsresult
 nsStorageStream::Seek(int32_t aPosition)
 {
   if (NS_WARN_IF(!mSegmentedBuffer)) {
@@ -355,7 +355,7 @@ private:
   }
 
 protected:
-  NS_METHOD Seek(uint32_t aPosition);
+  nsresult Seek(uint32_t aPosition);
 
   friend class nsStorageStream;
 
@@ -550,7 +550,7 @@ nsStorageInputStream::SetEOF()
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_METHOD
+nsresult
 nsStorageInputStream::Seek(uint32_t aPosition)
 {
   uint32_t length = mStorageStream->mLogicalLength;

xpcom/io/nsStorageStream.h

@@ -59,7 +59,7 @@ private:
                                          //   containing the write cursor
   uint32_t           mLogicalLength;     // Number of bytes written to stream
 
-  NS_METHOD Seek(int32_t aPosition);
+  nsresult Seek(int32_t aPosition);
   uint32_t SegNum(uint32_t aPosition)
   {
     return aPosition >> mSegmentSizeLog2;

xpcom/io/nsStreamUtils.cpp

@@ -863,7 +863,7 @@ NS_WriteSegmentThunk(nsIInputStream* aInStr,
                      aCountWritten);
 }
 
-NS_METHOD
+nsresult
 NS_FillArray(FallibleTArray<char>& aDest, nsIInputStream* aInput,
              uint32_t aKeep, uint32_t* aNewBytes)
 {

xpcom/io/nsStreamUtils.h

@@ -260,7 +260,7 @@ struct MOZ_STACK_CLASS nsWriteSegmentThunk
  *        failed
  * @return the result from aInput->Read(...)
  */
-extern NS_METHOD
+extern nsresult
 NS_FillArray(FallibleTArray<char>& aDest, nsIInputStream* aInput,
              uint32_t aKeep, uint32_t* aNewBytes);