From 60df1f3a5af4f4ca67f20d44123370f81c95941c Mon Sep 17 00:00:00 2001
From: "tbogard%aol.net" <tbogard%aol.net>
Date: Thu, 18 Aug 2005 11:15:29 +0000
Subject: [PATCH] nsISHEntry's attribute uri became URI to become more
 consistent with other places it exists.

---
 docshell/shistory/public/nsISHEntry.idl | 2 +-
 docshell/shistory/src/nsSHEntry.cpp     | 6 +++---
 docshell/shistory/src/nsSHistory.cpp    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docshell/shistory/public/nsISHEntry.idl b/docshell/shistory/public/nsISHEntry.idl
index 5b976325403..136c2d405f8 100644
--- a/docshell/shistory/public/nsISHEntry.idl
+++ b/docshell/shistory/public/nsISHEntry.idl
@@ -37,7 +37,7 @@ interface nsISHEntry : nsISupports
 {
 
 /** URI for the document */
-attribute nsIURI uri;
+attribute nsIURI URI;
 
 /**  DOM Document */
 attribute nsIDOMDocument document;
diff --git a/docshell/shistory/src/nsSHEntry.cpp b/docshell/shistory/src/nsSHEntry.cpp
index 659a2fdb894..3e0e130e5b5 100644
--- a/docshell/shistory/src/nsSHEntry.cpp
+++ b/docshell/shistory/src/nsSHEntry.cpp
@@ -81,7 +81,7 @@ NS_IMETHODIMP
 nsSHEntry::Create(nsIURI * aURI, const PRUnichar * aTitle, nsIDOMDocument * aDOMDocument,
 			         nsIInputStream * aInputStream, nsISupports * aHistoryLayoutState)
 {
-    SetUri(aURI);
+   SetURI(aURI);
 	SetTitle(aTitle);
 	SetDocument(aDOMDocument);
 	SetPostData(aInputStream);
@@ -124,7 +124,7 @@ nsSHEntry::DestroyChildren() {
 NS_IMPL_ISUPPORTS2(nsSHEntry, nsISHEntry, nsISHContainer)
 
 NS_IMETHODIMP
-nsSHEntry::GetUri(nsIURI **aUri)
+nsSHEntry::GetURI(nsIURI **aUri)
 {
   NS_ENSURE_ARG_POINTER(aUri);
 
@@ -134,7 +134,7 @@ nsSHEntry::GetUri(nsIURI **aUri)
 }
 
 NS_IMETHODIMP
-nsSHEntry::SetUri(nsIURI * aUri)
+nsSHEntry::SetURI(nsIURI * aUri)
 {
 
   NS_IF_RELEASE(mURI);
diff --git a/docshell/shistory/src/nsSHistory.cpp b/docshell/shistory/src/nsSHistory.cpp
index 6e7f53a02ae..f2b7f35d70c 100644
--- a/docshell/shistory/src/nsSHistory.cpp
+++ b/docshell/shistory/src/nsSHistory.cpp
@@ -232,7 +232,7 @@ nsSHistory::PrintHistory()
               nsXPIDLCString  url;
 
               entry->GetLayoutHistoryState(getter_AddRefs(layoutHistoryState));
-              entry->GetUri(getter_AddRefs(uri));
+              entry->GetURI(getter_AddRefs(uri));
               entry->GetTitle(&title);
 
               nsString titlestr(title);