diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl index 70bcafe8237..cd99fe27ceb 100644 --- a/docshell/base/nsIDocShell.idl +++ b/docshell/base/nsIDocShell.idl @@ -103,7 +103,7 @@ interface nsIDocShell : nsISupports * of an nsIDocShellLoadInfo object... * * @param aURI - The URI to load. - * @param aReferrer - Refering URI + * @param aReferrer - Referring URI * @param aOwner - Owner (security principal) * @param aInheritOwner - Flag indicating whether the owner of the current * document should be inherited if aOwner is null. diff --git a/docshell/base/nsWebShell.cpp b/docshell/base/nsWebShell.cpp index 6fe7b082341..cb1bee627e4 100644 --- a/docshell/base/nsWebShell.cpp +++ b/docshell/base/nsWebShell.cpp @@ -379,7 +379,7 @@ nsWebShell::LoadDocument(const char* aURL, mCharsetReloadState = eCharsetReloadRequested; LoadURI(NS_ConvertASCIItoUCS2(aURL).get(), // URI string LOAD_FLAGS_NONE, // Load flags - nsnull, // Refering URI + nsnull, // Referring URI nsnull, // Post data stream nsnull); // Header stream } @@ -939,7 +939,7 @@ nsresult nsWebShell::EndPageLoad(nsIWebProgress *aProgress, return LoadURI(newSpecW.get(), // URI string LOAD_FLAGS_NONE, // Load flags - nsnull, // Refering URI + nsnull, // Referring URI nsnull, // Post data stream nsnull); // Headers stream } @@ -1048,7 +1048,7 @@ nsresult nsWebShell::EndPageLoad(nsIWebProgress *aProgress, postDataSeekable->Seek(nsISeekableStream::NS_SEEK_SET, 0); } InternalLoad(url, // URI - referrer, // Refering URI + referrer, // Referring URI nsnull, // Owner PR_TRUE, // Inherit owner nsnull, // No window target diff --git a/editor/ui/dialogs/content/EdDialogCommon.js b/editor/ui/dialogs/content/EdDialogCommon.js index 9d126ff3b18..4e8e7a30c66 100644 --- a/editor/ui/dialogs/content/EdDialogCommon.js +++ b/editor/ui/dialogs/content/EdDialogCommon.js @@ -209,7 +209,7 @@ function ShowInputErrorMessage(message) } // Get the text appropriate to parent container -// to determine what a "%" value is refering to. +// to determine what a "%" value is referring to. // elementForAtt is element we are actually setting attributes on // (a temporary copy of element in the doc to allow canceling), // but elementInDoc is needed to find parent context in document diff --git a/embedding/browser/gtk/src/EmbedPrivate.cpp b/embedding/browser/gtk/src/EmbedPrivate.cpp index bcd6829bd54..4db7501173e 100644 --- a/embedding/browser/gtk/src/EmbedPrivate.cpp +++ b/embedding/browser/gtk/src/EmbedPrivate.cpp @@ -382,7 +382,7 @@ EmbedPrivate::LoadCurrentURI(void) if (mURI.Length()) mNavigation->LoadURI(mURI.get(), // URI string nsIWebNavigation::LOAD_FLAGS_NONE, // Load flags - nsnull, // Refering URI + nsnull, // Referring URI nsnull, // Post data nsnull); // extra headers } diff --git a/embedding/browser/photon/src/EmbedPrivate.cpp b/embedding/browser/photon/src/EmbedPrivate.cpp index ea998442789..e3a5ea15963 100644 --- a/embedding/browser/photon/src/EmbedPrivate.cpp +++ b/embedding/browser/photon/src/EmbedPrivate.cpp @@ -348,7 +348,7 @@ EmbedPrivate::LoadCurrentURI(void) if (mURI.Length()) mNavigation->LoadURI(mURI.get(), // URI string nsIWebNavigation::LOAD_FLAGS_NONE, // Load flags - nsnull, // Refering URI + nsnull, // Referring URI nsnull, // Post data nsnull); // extra headers } diff --git a/embedding/qa/jstests/webNav/nsIWebNavTestCase1.html b/embedding/qa/jstests/webNav/nsIWebNavTestCase1.html index 0c634cede42..9b1f5e0b848 100644 --- a/embedding/qa/jstests/webNav/nsIWebNavTestCase1.html +++ b/embedding/qa/jstests/webNav/nsIWebNavTestCase1.html @@ -140,7 +140,7 @@ function nsIWebNavTests(webNav, urlTotal, loadFlagTotal) dump("The current uri = " + getCurrURI.spec + "\n"); /* not implemented yet */ -// var getRefURI = testReferingURI(webNav); +// var getRefURI = testReferringURI(webNav); // dump("getRefURI object = " + getRefURI + "\n"); var getsHistory = testSessionHistory(webNav); @@ -233,4 +233,4 @@ function recurseReload(webNav, reloadCnt, loadFlagTotal) - \ No newline at end of file + diff --git a/embedding/qa/jstests/webNav/nsIWebNavTestCase1.txt b/embedding/qa/jstests/webNav/nsIWebNavTestCase1.txt index 79b53a90de0..3c9794bd530 100644 --- a/embedding/qa/jstests/webNav/nsIWebNavTestCase1.txt +++ b/embedding/qa/jstests/webNav/nsIWebNavTestCase1.txt @@ -87,7 +87,7 @@ function nsIWebNavTests() dump("The current uri = " + getCurrURI.spec + "\n"); /* not implemented yet */ -// var getRefURI = testReferingURI(webNav); +// var getRefURI = testReferringURI(webNav); // dump("getRefURI object = " + getRefURI + "\n"); var getsHistory = testSessionHistory(webNav); @@ -183,4 +183,4 @@ function recurseReload(webNav, reloadCnt) loadURITests(); - \ No newline at end of file + diff --git a/embedding/qa/jstests/webNav/nsIWebNavTestLib.js b/embedding/qa/jstests/webNav/nsIWebNavTestLib.js index b5bb97b3149..82aac3fb784 100644 --- a/embedding/qa/jstests/webNav/nsIWebNavTestLib.js +++ b/embedding/qa/jstests/webNav/nsIWebNavTestLib.js @@ -236,9 +236,9 @@ function testCurrentURI(webNav) /* not implemented yet // ************************************************************************* -// testReferingURI() gets the referring URI. It accepts the webNav +// testReferringURI() gets the referring URI. It accepts the webNav // object for the parameter. -function testReferingURI(webNav) +function testReferringURI(webNav) { if (!webNav) { alert("Didn't get web navigation object"); @@ -246,7 +246,7 @@ function testReferingURI(webNav) } // Get the refering URI getRefURI = webNav.referringURI; - // alert("The refering uri = " + getRefURI.spec); + // alert("The referring uri = " + getRefURI.spec); return getRefURI; } diff --git a/embedding/qa/testembed/Tests.cpp b/embedding/qa/testembed/Tests.cpp index cc6dae1fdc1..e204fdd94b1 100644 --- a/embedding/qa/testembed/Tests.cpp +++ b/embedding/qa/testembed/Tests.cpp @@ -177,7 +177,7 @@ BEGIN_MESSAGE_MAP(CTests, CWnd) ON_COMMAND(ID_INTERFACES_NSIWEBNAV_GETCANGOBACK, OnInterfacesNsiwebnav) ON_COMMAND(ID_INTERFACES_NSIWEBNAV_GETCANGOFORWARD, OnInterfacesNsiwebnav) ON_COMMAND(ID_INTERFACES_NSIWEBNAV_GETCURRENTURI, OnInterfacesNsiwebnav) - ON_COMMAND(ID_INTERFACES_NSIWEBNAV_GETREFERINGURI, OnInterfacesNsiwebnav) + ON_COMMAND(ID_INTERFACES_NSIWEBNAV_GETREFERRINGURI, OnInterfacesNsiwebnav) ON_COMMAND(ID_INTERFACES_NSIWEBNAV_GETDOCUMENT, OnInterfacesNsiwebnav) ON_COMMAND(ID_INTERFACES_NSIWEBNAV_GETSESSIONHISTORY, OnInterfacesNsiwebnav) ON_COMMAND(ID_INTERFACES_NSIWEBNAV_GOBACK, OnInterfacesNsiwebnav) diff --git a/embedding/qa/testembed/nsIWebNav.cpp b/embedding/qa/testembed/nsIWebNav.cpp index caaadc47b35..1155ca89b1d 100644 --- a/embedding/qa/testembed/nsIWebNav.cpp +++ b/embedding/qa/testembed/nsIWebNav.cpp @@ -129,8 +129,8 @@ void CNsIWebNav::OnStartTests(UINT nMenuID) case ID_INTERFACES_NSIWEBNAV_GETCURRENTURI : GetCurrentURITest(2); break ; - case ID_INTERFACES_NSIWEBNAV_GETREFERINGURI: - GetReferingURITest(2); + case ID_INTERFACES_NSIWEBNAV_GETREFERRINGURI: + GetReferringURITest(2); break; case ID_INTERFACES_NSIWEBNAV_GETSESSIONHISTORY : GetSHTest(2); @@ -189,7 +189,7 @@ void CNsIWebNav::RunAllTests() // uri test GetCurrentURITest(1); - GetReferingURITest(1); + GetReferringURITest(1); // session history test SetSHTest(1); @@ -442,7 +442,7 @@ void CNsIWebNav::GetCurrentURITest(PRInt16 displayMode) FormatAndPrintOutput("the nsIWebNav uri = ", uriString, displayMode); } -void CNsIWebNav::GetReferingURITest(PRInt16 displayMode) +void CNsIWebNav::GetReferringURITest(PRInt16 displayMode) { nsCOMPtr theURI; nsCAutoString uriString; @@ -456,7 +456,7 @@ void CNsIWebNav::GetReferingURITest(PRInt16 displayMode) else QAOutput("We DIDN'T GET the URI.", 1); rv = qaWebNav->GetReferringURI(getter_AddRefs(theURI)); - RvTestResult(rv, "GetReferingURI() test", displayMode); + RvTestResult(rv, "GetReferringURI() test", displayMode); // rv = qaWebNav->LoadURI(NS_ConvertASCIItoUCS2(myDialog.m_urlfield).get(), // myDialog.m_flagvalue, theURI, nsnull, nsnull); } @@ -503,4 +503,4 @@ void CNsIWebNav::SetSHTest(PRInt16 displayMode) QAOutput("We didn't get the session history test object. Test failed.", 2); // we now reset the previous session history rv = qaWebNav->SetSessionHistory(theSessionHistory); -} \ No newline at end of file +} diff --git a/embedding/qa/testembed/nsIWebNav.h b/embedding/qa/testembed/nsIWebNav.h index 409e4abd7b5..2c3e2be4897 100644 --- a/embedding/qa/testembed/nsIWebNav.h +++ b/embedding/qa/testembed/nsIWebNav.h @@ -78,7 +78,7 @@ public: void StopUriTest(char *, PRUint32, PRInt16); void GetDocumentTest(PRInt16); void GetCurrentURITest(PRInt16); - void GetReferingURITest(PRInt16); + void GetReferringURITest(PRInt16); void GetSHTest(PRInt16); void SetSHTest(PRInt16); void LoadUriandReload(int); diff --git a/embedding/qa/testembed/resource.h b/embedding/qa/testembed/resource.h index dd3e0c81c1e..8e4509e07ad 100644 --- a/embedding/qa/testembed/resource.h +++ b/embedding/qa/testembed/resource.h @@ -307,7 +307,7 @@ #define ID_INTERFACES_NSIHTTPCHANNEL_GETRESPONSESTATUS 33044 #define ID_INTERFACES_NSIHTTPCHANNEL_GETRESPONSESTATUSTEXT 33045 #define ID_TESTS_ADDTOOLTIPLISTENER 33046 -#define ID_INTERFACES_NSIWEBNAV_GETREFERINGURI 33047 +#define ID_INTERFACES_NSIWEBNAV_GETREFERRINGURI 33047 #define ID_CLIPBOARDCMD_PASTE 42789 #define ID_CLIPBOARDCMD_COPYSELECTION 42790 #define ID_CLIPBOARDCMD_SELECTALL 42791 diff --git a/embedding/qa/testembed/testembed.rc b/embedding/qa/testembed/testembed.rc index 67818fd4166..ec529367b46 100644 --- a/embedding/qa/testembed/testembed.rc +++ b/embedding/qa/testembed/testembed.rc @@ -256,7 +256,7 @@ BEGIN MENUITEM "GetCurrentURI", ID_INTERFACES_NSIWEBNAV_GETCURRENTURI - MENUITEM "GetReferingURI", ID_INTERFACES_NSIWEBNAV_GETREFERINGURI + MENUITEM "GetReferringURI", ID_INTERFACES_NSIWEBNAV_GETREFERRINGURI MENUITEM "GetSessionHistory", ID_INTERFACES_NSIWEBNAV_GETSESSIONHISTORY diff --git a/embedding/tests/mfcembed/BrowserView.cpp b/embedding/tests/mfcembed/BrowserView.cpp index 2c6c63aa0af..7a1f69f6858 100644 --- a/embedding/tests/mfcembed/BrowserView.cpp +++ b/embedding/tests/mfcembed/BrowserView.cpp @@ -717,7 +717,7 @@ void CBrowserView::OpenURL(const PRUnichar* pUrl) if(mWebNav) mWebNav->LoadURI(pUrl, // URI string nsIWebNavigation::LOAD_FLAGS_NONE, // Load flags - nsnull, // Refering URI + nsnull, // Referring URI nsnull, // Post data nsnull); // Extra headers } diff --git a/mailnews/base/src/nsMessenger.cpp b/mailnews/base/src/nsMessenger.cpp index ac19176ba6c..802ded5973e 100644 --- a/mailnews/base/src/nsMessenger.cpp +++ b/mailnews/base/src/nsMessenger.cpp @@ -579,7 +579,7 @@ nsMessenger::OpenURL(const char *aURL) if(webNav) rv = webNav->LoadURI(NS_ConvertASCIItoUCS2(unescapedUrl).get(), // URI string nsIWebNavigation::LOAD_FLAGS_NONE, // Load flags - nsnull, // Refering URI + nsnull, // Referring URI nsnull, // Post stream nsnull); // Extra headers } diff --git a/mailnews/base/src/nsMsgPrintEngine.cpp b/mailnews/base/src/nsMsgPrintEngine.cpp index 94437b333bc..823142947fe 100644 --- a/mailnews/base/src/nsMsgPrintEngine.cpp +++ b/mailnews/base/src/nsMsgPrintEngine.cpp @@ -556,7 +556,7 @@ nsMsgPrintEngine::FireThatLoadOperation(nsString *uri) if (webNav) rv = webNav->LoadURI(uri->get(), // URI string nsIWebNavigation::LOAD_FLAGS_NONE, // Load flags - nsnull, // Refering URI + nsnull, // Referring URI nsnull, // Post data nsnull); // Extra headers } diff --git a/xpcom/ds/nsCOMArray.h b/xpcom/ds/nsCOMArray.h index 98c2a08288e..7cdd2420b4f 100644 --- a/xpcom/ds/nsCOMArray.h +++ b/xpcom/ds/nsCOMArray.h @@ -133,7 +133,7 @@ private: // // This array will accept null as an argument for any object, and will // store null in the array, just like nsVoidArray. But that also means -// that methods like ObjectAt() may return null when refering to an +// that methods like ObjectAt() may return null when referring to an // existing, but null entry in the array. template class nsCOMArray : public nsCOMArray_base diff --git a/xpcom/tests/TestCOMPtr.cpp b/xpcom/tests/TestCOMPtr.cpp index 98370967bfd..ffd9106400c 100644 --- a/xpcom/tests/TestCOMPtr.cpp +++ b/xpcom/tests/TestCOMPtr.cpp @@ -530,7 +530,7 @@ main() cout << "foo1p allowed compare with in" << endl; #endif - cout << endl << "### Test 14: how about when two |nsCOMPtr|s refering to the same object go out of scope?" << endl; + cout << endl << "### Test 14: how about when two |nsCOMPtr|s referring to the same object go out of scope?" << endl; } { diff --git a/xpfe/browser/src/nsBrowserInstance.cpp b/xpfe/browser/src/nsBrowserInstance.cpp index 89b47a83ded..336a40e4bed 100644 --- a/xpfe/browser/src/nsBrowserInstance.cpp +++ b/xpfe/browser/src/nsBrowserInstance.cpp @@ -494,7 +494,7 @@ nsBrowserInstance::LoadUrl(const PRUnichar * urlToLoad) // Normal browser. rv = webNav->LoadURI( urlToLoad, // URI string nsIWebNavigation::LOAD_FLAGS_NONE, // Load flags - nsnull, // Refering URI + nsnull, // Referring URI nsnull, // Post data nsnull ); // Extra headers