From d3b1c79d6368192cd64085361f890e8c79a9d39f Mon Sep 17 00:00:00 2001
From: "mkaply%us.ibm.com"
 <mkaply%us.ibm.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 5 Jul 2000 13:48:12 +0000
Subject: [PATCH] #42637 r=sspitzer, a=brendan OS/2 bringup - VisualAge treats
 this like a cast - according to nsFileSpec.h, our way is correct

git-svn-id: svn://10.0.0.236/trunk@73669 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/profile/Acct/nsAccount.cpp                    | 2 +-
 mozilla/profile/pref-migrator/src/nsPrefMigration.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mozilla/profile/Acct/nsAccount.cpp b/mozilla/profile/Acct/nsAccount.cpp
index 03056fd32e4..493f27554ad 100644
--- a/mozilla/profile/Acct/nsAccount.cpp
+++ b/mozilla/profile/Acct/nsAccount.cpp
@@ -318,7 +318,7 @@ int nsAccount::IterateDirectoryChildren(nsFileSpec& startChild)
     {
 	printf ("Inside the iteration \n");
 
-        char* itemName = ((nsFileSpec&)i).GetLeafName();
+        char* itemName = (i.Spec()).GetLeafName();
 		PL_strcpy(gNCIInfo[NCICount], itemName);
         mConsole << '\t' << itemName << nsEndl;
 		mConsole << '\t' << "This is the arraynumber "<<NCICount<<"and value" <<gNCIInfo[NCICount] << nsEndl;
diff --git a/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp b/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp
index 0c9b4fdf471..2a2274e872e 100644
--- a/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp
+++ b/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp
@@ -1283,7 +1283,7 @@ nsPrefMigration::GetSizes(nsFileSpec inputPath, PRBool readSubdirs, PRUint32 *si
 
   for (nsDirectoryIterator dir(inputPath, PR_FALSE); dir.Exists(); dir++)
   {
-    nsFileSpec fileOrDirName = (nsFileSpec&)dir;
+    nsFileSpec fileOrDirName = dir.Spec();
     folderName = fileOrDirName.GetLeafName();
     fileOrDirNameStr.AssignWithConversion(folderName);
     if (nsStringEndsWith(fileOrDirNameStr, MAIL_SUMMARY_SUFFIX_IN_4x) || nsStringEndsWith(fileOrDirNameStr, NEWS_SUMMARY_SUFFIX_IN_4x) || nsStringEndsWith(fileOrDirNameStr, SUMMARY_SUFFIX_IN_5x)) /* Don't copy the summary files */
@@ -1416,7 +1416,7 @@ nsPrefMigration::CopyAndRenameNewsrcFiles(nsIFileSpec * newPathSpec)
 
   for (nsDirectoryIterator dir(oldPath, PR_FALSE); dir.Exists(); dir++)
   {
-    nsFileSpec fileOrDirName = (nsFileSpec&)dir; //set first file or dir to a nsFileSpec
+    nsFileSpec fileOrDirName = dir.Spec(); //set first file or dir to a nsFileSpec
     folderName = fileOrDirName.GetLeafName();    //get the filename without the full path
     fileOrDirNameStr.AssignWithConversion(folderName);
 
@@ -1474,7 +1474,7 @@ nsPrefMigration::DoTheCopyAndRename(nsIFileSpec * oldPathSpec, nsIFileSpec *newP
   
   for (nsDirectoryIterator dir(oldPath, PR_FALSE); dir.Exists(); dir++)
   {
-    nsFileSpec fileOrDirName = (nsFileSpec&)dir; //set first file or dir to a nsFileSpec
+    nsFileSpec fileOrDirName = dir.Spec(); //set first file or dir to a nsFileSpec
     folderName = fileOrDirName.GetLeafName();    //get the filename without the full path
     fileOrDirNameStr.AssignWithConversion(folderName);