Bug 927728 - Part 1: Replace PRUnichar with char16_t; r=roc
This patch was automatically generated by the following script:
#!/bin/bash
# Command to convert PRUnichar to char16_t
function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
! -wholename "*security/nss*" \
! -wholename "*modules/libmar*" \
! -wholename "*/.hg*" \
! -wholename "obj-ff-dbg*" \
! -name prtypes.h \
! -name Char16.h \
-type f \
\( -iname "*.cpp" \
-o -iname "*.h" \
-o -iname "*.c" \
-o -iname "*.cc" \
-o -iname "*.idl" \
-o -iname "*.ipdl" \
-o -iname "*.ipdlh" \
-o -iname "*.mm" \) | \
xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}
convert PRUnichar char16_t
This commit is contained in:
@@ -368,9 +368,9 @@ ForEachPing(nsIContent *content, ForEachPingCallback callback, void *closure)
|
||||
nsIDocument *doc = content->OwnerDoc();
|
||||
|
||||
// value contains relative URIs split on spaces (U+0020)
|
||||
const PRUnichar *start = value.BeginReading();
|
||||
const PRUnichar *end = value.EndReading();
|
||||
const PRUnichar *iter = start;
|
||||
const char16_t *start = value.BeginReading();
|
||||
const char16_t *end = value.EndReading();
|
||||
const char16_t *iter = start;
|
||||
for (;;) {
|
||||
if (iter < end && *iter != ' ') {
|
||||
++iter;
|
||||
@@ -2841,7 +2841,7 @@ nsDocShell::SetName(const nsAString& aName)
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDocShell::NameEquals(const PRUnichar *aName, bool *_retval)
|
||||
nsDocShell::NameEquals(const char16_t *aName, bool *_retval)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aName);
|
||||
NS_ENSURE_ARG_POINTER(_retval);
|
||||
@@ -3228,7 +3228,7 @@ ItemIsActive(nsIDocShellTreeItem *aItem)
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDocShell::FindItemWithName(const PRUnichar * aName,
|
||||
nsDocShell::FindItemWithName(const char16_t * aName,
|
||||
nsISupports * aRequestor,
|
||||
nsIDocShellTreeItem * aOriginalRequestor,
|
||||
nsIDocShellTreeItem ** _retval)
|
||||
@@ -3326,7 +3326,7 @@ nsDocShell::FindItemWithName(const PRUnichar * aName,
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsDocShell::DoFindItemWithName(const PRUnichar* aName,
|
||||
nsDocShell::DoFindItemWithName(const char16_t* aName,
|
||||
nsISupports* aRequestor,
|
||||
nsIDocShellTreeItem* aOriginalRequestor,
|
||||
nsIDocShellTreeItem** _retval)
|
||||
@@ -3769,7 +3769,7 @@ nsDocShell::GetChildAt(int32_t aIndex, nsIDocShellTreeItem ** aChild)
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDocShell::FindChildWithName(const PRUnichar * aName,
|
||||
nsDocShell::FindChildWithName(const char16_t * aName,
|
||||
bool aRecurse, bool aSameType,
|
||||
nsIDocShellTreeItem * aRequestor,
|
||||
nsIDocShellTreeItem * aOriginalRequestor,
|
||||
@@ -4237,7 +4237,7 @@ NS_IMETHODIMP nsDocShell::GotoIndex(int32_t aIndex)
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDocShell::LoadURI(const PRUnichar * aURI,
|
||||
nsDocShell::LoadURI(const char16_t * aURI,
|
||||
uint32_t aLoadFlags,
|
||||
nsIURI * aReferringURI,
|
||||
nsIInputStream * aPostStream,
|
||||
@@ -4344,7 +4344,7 @@ nsDocShell::LoadURI(const PRUnichar * aURI,
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDocShell::DisplayLoadError(nsresult aError, nsIURI *aURI,
|
||||
const PRUnichar *aURL,
|
||||
const char16_t *aURL,
|
||||
nsIChannel* aFailedChannel)
|
||||
{
|
||||
// Get prompt and string bundle servcies
|
||||
@@ -4651,7 +4651,7 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI *aURI,
|
||||
rv = NS_OK;
|
||||
++formatStrCount;
|
||||
|
||||
const PRUnichar *strs[kMaxFormatStrArgs];
|
||||
const char16_t *strs[kMaxFormatStrArgs];
|
||||
for (uint32_t i = 0; i < formatStrCount; i++) {
|
||||
strs[i] = formatStrs[i].get();
|
||||
}
|
||||
@@ -4689,10 +4689,10 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI *aURI,
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDocShell::LoadErrorPage(nsIURI *aURI, const PRUnichar *aURL,
|
||||
nsDocShell::LoadErrorPage(nsIURI *aURI, const char16_t *aURL,
|
||||
const char *aErrorPage,
|
||||
const PRUnichar *aErrorType,
|
||||
const PRUnichar *aDescription,
|
||||
const char16_t *aErrorType,
|
||||
const char16_t *aDescription,
|
||||
const char *aCSSClass,
|
||||
nsIChannel* aFailedChannel)
|
||||
{
|
||||
@@ -5749,7 +5749,7 @@ nsDocShell::GetMainWidget(nsIWidget ** aMainWidget)
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDocShell::GetTitle(PRUnichar ** aTitle)
|
||||
nsDocShell::GetTitle(char16_t ** aTitle)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aTitle);
|
||||
|
||||
@@ -5758,7 +5758,7 @@ nsDocShell::GetTitle(PRUnichar ** aTitle)
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDocShell::SetTitle(const PRUnichar * aTitle)
|
||||
nsDocShell::SetTitle(const char16_t * aTitle)
|
||||
{
|
||||
// Store local title
|
||||
mTitle = aTitle;
|
||||
@@ -6888,7 +6888,7 @@ nsDocShell::OnRedirectStateChange(nsIChannel* aOldChannel,
|
||||
NS_IMETHODIMP
|
||||
nsDocShell::OnStatusChange(nsIWebProgress * aWebProgress,
|
||||
nsIRequest * aRequest,
|
||||
nsresult aStatus, const PRUnichar * aMessage)
|
||||
nsresult aStatus, const char16_t * aMessage)
|
||||
{
|
||||
NS_NOTREACHED("notification excluded in AddProgressListener(...)");
|
||||
return NS_OK;
|
||||
@@ -8829,7 +8829,7 @@ nsDocShell::InternalLoad(nsIURI * aURI,
|
||||
nsIURI * aReferrer,
|
||||
nsISupports * aOwner,
|
||||
uint32_t aFlags,
|
||||
const PRUnichar *aWindowTarget,
|
||||
const char16_t *aWindowTarget,
|
||||
const char* aTypeHint,
|
||||
const nsAString& aFileName,
|
||||
nsIInputStream * aPostData,
|
||||
@@ -11780,7 +11780,7 @@ nsDocShell::ConfirmRepost(bool * aRepost)
|
||||
else {
|
||||
// Brand available - if the app has an override file with formatting, the app name will
|
||||
// be included. Without an override, the prompt will look like the generic version.
|
||||
const PRUnichar *formatStrings[] = { brandName.get() };
|
||||
const char16_t *formatStrings[] = { brandName.get() };
|
||||
rv = appBundle->FormatStringFromName(MOZ_UTF16("confirmRepostPrompt"),
|
||||
formatStrings, ArrayLength(formatStrings),
|
||||
getter_Copies(msgString));
|
||||
@@ -12392,7 +12392,7 @@ class OnLinkClickEvent : public nsRunnable {
|
||||
public:
|
||||
OnLinkClickEvent(nsDocShell* aHandler, nsIContent* aContent,
|
||||
nsIURI* aURI,
|
||||
const PRUnichar* aTargetSpec,
|
||||
const char16_t* aTargetSpec,
|
||||
const nsAString& aFileName,
|
||||
nsIInputStream* aPostDataStream,
|
||||
nsIInputStream* aHeadersDataStream,
|
||||
@@ -12426,7 +12426,7 @@ private:
|
||||
OnLinkClickEvent::OnLinkClickEvent(nsDocShell* aHandler,
|
||||
nsIContent *aContent,
|
||||
nsIURI* aURI,
|
||||
const PRUnichar* aTargetSpec,
|
||||
const char16_t* aTargetSpec,
|
||||
const nsAString& aFileName,
|
||||
nsIInputStream* aPostDataStream,
|
||||
nsIInputStream* aHeadersDataStream,
|
||||
@@ -12448,7 +12448,7 @@ OnLinkClickEvent::OnLinkClickEvent(nsDocShell* aHandler,
|
||||
NS_IMETHODIMP
|
||||
nsDocShell::OnLinkClick(nsIContent* aContent,
|
||||
nsIURI* aURI,
|
||||
const PRUnichar* aTargetSpec,
|
||||
const char16_t* aTargetSpec,
|
||||
const nsAString& aFileName,
|
||||
nsIInputStream* aPostDataStream,
|
||||
nsIInputStream* aHeadersDataStream,
|
||||
@@ -12497,7 +12497,7 @@ nsDocShell::OnLinkClick(nsIContent* aContent,
|
||||
NS_IMETHODIMP
|
||||
nsDocShell::OnLinkClickSync(nsIContent *aContent,
|
||||
nsIURI* aURI,
|
||||
const PRUnichar* aTargetSpec,
|
||||
const char16_t* aTargetSpec,
|
||||
const nsAString& aFileName,
|
||||
nsIInputStream* aPostDataStream,
|
||||
nsIInputStream* aHeadersDataStream,
|
||||
@@ -12617,7 +12617,7 @@ nsDocShell::OnLinkClickSync(nsIContent *aContent,
|
||||
NS_IMETHODIMP
|
||||
nsDocShell::OnOverLink(nsIContent* aContent,
|
||||
nsIURI* aURI,
|
||||
const PRUnichar* aTargetSpec)
|
||||
const char16_t* aTargetSpec)
|
||||
{
|
||||
if (aContent->IsEditable()) {
|
||||
return NS_OK;
|
||||
|
||||
Reference in New Issue
Block a user