Bug 1380906 - Follow-up: More string bundle changes in Becky import. rs=bustage-fix DONTBUILD
authorJorg K <jorgk@jorgk.com>
Fri, 14 Jul 2017 17:44:54 +0200
changeset 28446 61107603efab124c3214304aca1467649862e870
parent 28445 6b9b94ad31c9801780a8fabbf49434fbf53870a8
child 28447 130d043e685055c682059c92dc582acb2a65afd2
push id1986
push userclokep@gmail.com
push dateWed, 02 Aug 2017 14:43:31 +0000
treeherdercomm-beta@b51c9adf2c9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1380906
Bug 1380906 - Follow-up: More string bundle changes in Becky import. rs=bustage-fix DONTBUILD
mailnews/import/becky/src/nsBeckyAddressBooks.cpp
mailnews/import/becky/src/nsBeckyFilters.cpp
mailnews/import/becky/src/nsBeckyImport.cpp
mailnews/import/becky/src/nsBeckySettings.cpp
--- a/mailnews/import/becky/src/nsBeckyAddressBooks.cpp
+++ b/mailnews/import/becky/src/nsBeckyAddressBooks.cpp
@@ -56,17 +56,17 @@ nsBeckyAddressBooks::GetSupportsMultiple
 NS_IMETHODIMP
 nsBeckyAddressBooks::GetAutoFind(char16_t **aDescription,
                                  bool *_retval)
 {
   NS_ENSURE_ARG_POINTER(aDescription);
   NS_ENSURE_ARG_POINTER(_retval);
 
   *aDescription =
-    nsBeckyStringBundle::GetStringByName(u"BeckyImportDescription");
+    nsBeckyStringBundle::GetStringByName("BeckyImportDescription");
   *_retval = false;
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsBeckyAddressBooks::GetNeedsFieldMap(nsIFile *aLocation, bool *_retval)
 {
@@ -349,17 +349,17 @@ nsBeckyAddressBooks::ImportAddressBook(n
     if (NS_FAILED(rv)) {
       break;
     }
   }
 
   if (!error.IsEmpty())
     *aErrorLog = ToNewUnicode(error);
   else
-    *aSuccessLog = nsBeckyStringBundle::GetStringByName(u"BeckyImportAddressSuccess");
+    *aSuccessLog = nsBeckyStringBundle::GetStringByName("BeckyImportAddressSuccess");
 
   return rv;
 }
 
 NS_IMETHODIMP
 nsBeckyAddressBooks::GetImportProgress(uint32_t *_retval)
 {
   NS_ENSURE_ARG_POINTER(_retval);
--- a/mailnews/import/becky/src/nsBeckyFilters.cpp
+++ b/mailnews/import/becky/src/nsBeckyFilters.cpp
@@ -95,17 +95,17 @@ nsBeckyFilters::AutoLocate(char16_t **aD
                            nsIFile **aLocation,
                            bool *_retval)
 {
   NS_ENSURE_ARG_POINTER(aLocation);
   NS_ENSURE_ARG_POINTER(_retval);
 
   if (aDescription) {
     *aDescription =
-      nsBeckyStringBundle::GetStringByName(u"BeckyImportDescription");
+      nsBeckyStringBundle::GetStringByName("BeckyImportDescription");
   }
   *aLocation = nullptr;
   *_retval = false;
 
   nsresult rv;
   nsCOMPtr<nsIFile> location;
   rv = GetDefaultFilterLocation(getter_AddRefs(location));
   if (NS_FAILED(rv))
--- a/mailnews/import/becky/src/nsBeckyImport.cpp
+++ b/mailnews/import/becky/src/nsBeckyImport.cpp
@@ -46,26 +46,26 @@ nsBeckyImport::~nsBeckyImport()
 
 NS_IMPL_ISUPPORTS(nsBeckyImport, nsIImportModule)
 
 NS_IMETHODIMP
 nsBeckyImport::GetName(char16_t **aName)
 {
   NS_ENSURE_ARG_POINTER(aName);
   *aName =
-    nsBeckyStringBundle::GetStringByName(u"BeckyImportName");
+    nsBeckyStringBundle::GetStringByName("BeckyImportName");
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsBeckyImport::GetDescription(char16_t **aDescription)
 {
   NS_ENSURE_ARG_POINTER(aDescription);
   *aDescription =
-    nsBeckyStringBundle::GetStringByName(u"BeckyImportDescription");
+    nsBeckyStringBundle::GetStringByName("BeckyImportDescription");
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsBeckyImport::GetSupports(char **aSupports)
 {
   NS_ENSURE_ARG_POINTER(aSupports);
   *aSupports = strdup(kBeckySupportsString);
@@ -91,17 +91,17 @@ nsBeckyImport::GetMailImportInterface(ns
   NS_ENSURE_SUCCESS(rv, rv);
   nsCOMPtr<nsIImportGeneric> generic;
   rv = importService->CreateNewGenericMail(getter_AddRefs(generic));
   NS_ENSURE_SUCCESS(rv, rv);
 
   generic->SetData("mailInterface", importer);
 
   nsString name;
-  name.Adopt(nsBeckyStringBundle::GetStringByName(u"BeckyImportName"));
+  name.Adopt(nsBeckyStringBundle::GetStringByName("BeckyImportName"));
 
   nsCOMPtr<nsISupportsString> nameString(do_CreateInstance(NS_SUPPORTS_STRING_CONTRACTID, &rv));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nameString->SetData(name);
   generic->SetData("name", nameString);
 
   return CallQueryInterface(generic, aInterface);
--- a/mailnews/import/becky/src/nsBeckySettings.cpp
+++ b/mailnews/import/becky/src/nsBeckySettings.cpp
@@ -50,17 +50,17 @@ nsBeckySettings::AutoLocate(char16_t **a
                             nsIFile **aLocation,
                             bool *_retval)
 {
   NS_ENSURE_ARG_POINTER(aDescription);
   NS_ENSURE_ARG_POINTER(aLocation);
   NS_ENSURE_ARG_POINTER(_retval);
 
   *aDescription =
-    nsBeckyStringBundle::GetStringByName(u"BeckyImportName");
+    nsBeckyStringBundle::GetStringByName("BeckyImportName");
   *aLocation = nullptr;
   *_retval = false;
 
   nsCOMPtr<nsIFile> location;
   nsresult rv = nsBeckyUtils::GetDefaultMailboxINIFile(getter_AddRefs(location));
   if (NS_FAILED(rv))
     location = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv);
   else