From 3731b62f54596dbcdbb704083f1b6e5dfd85e5af Mon Sep 17 00:00:00 2001
From: "hyatt%netscape.com"
 <hyatt%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 10 Nov 1998 23:44:53 +0000
Subject: [PATCH] Tweaks to the interfaces to make them internally consistent.

git-svn-id: svn://10.0.0.236/trunk@14373 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/widget/public/nsIDMItem.h        | 9 +++------
 mozilla/widget/public/nsIDataModel.h     | 6 ++----
 mozilla/widget/public/nsITreeColumn.h    | 2 +-
 mozilla/widget/public/nsITreeDataModel.h | 7 +++----
 mozilla/widget/public/nsITreeItem.h      | 2 +-
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/mozilla/widget/public/nsIDMItem.h b/mozilla/widget/public/nsIDMItem.h
index 9600e89abe4..cf5bbe048d5 100644
--- a/mozilla/widget/public/nsIDMItem.h
+++ b/mozilla/widget/public/nsIDMItem.h
@@ -34,17 +34,14 @@ class nsIDMItem : public nsISupports
 {
 public:
 	// Inspectors
-	NS_IMETHOD GetIconImage(nsIImage** pImage, nsIImageGroup* pGroup) = 0;
+	NS_IMETHOD GetIconImage(nsIImage*& pImage, nsIImageGroup* pGroup) = 0;
 	NS_IMETHOD IsExpanded(PRBool& answer) = 0;
 	
 	// Setters
 
 	// Methods to query the data model for a specific item displayed within the widget.
-	NS_IMETHOD GetStringPropertyValue(PRBool& answer, const nsString& itemProperty,
-								      nsString& value) = 0;
-	NS_IMETHOD GetIntPropertyValue(PRBool& answer, const nsString& itemProperty,
-								      int& value) = 0;
-	
+	NS_IMETHOD GetStringPropertyValue(nsString& value, const nsString& itemProperty) = 0;
+	NS_IMETHOD GetIntPropertyValue(int& value, const nsString& itemProperty) = 0;
 };
 
 #endif /* nsIDMItem_h___ */
diff --git a/mozilla/widget/public/nsIDataModel.h b/mozilla/widget/public/nsIDataModel.h
index 973eaf7cb51..c6a1b7b34ec 100644
--- a/mozilla/widget/public/nsIDataModel.h
+++ b/mozilla/widget/public/nsIDataModel.h
@@ -38,10 +38,8 @@ public:
 	NS_IMETHOD SetDMWidget(nsIDMWidget* pWidget) = 0;
 
 	// Methods to query the data model for property values for an entire widget.
-	NS_IMETHOD GetStringPropertyValue(PRBool& answer,
-					       			  const nsString& property, const nsString& value) = 0;
-	NS_IMETHOD GetIntPropertyValue(PRBool& answer,
-								   const nsString& property, int& value) = 0;
+	NS_IMETHOD GetStringPropertyValue(nsString& value, const nsString& property) = 0;
+	NS_IMETHOD GetIntPropertyValue(int& value, const nsString& property) = 0;
 };
 
 #endif /* nsIDataModel_h___ */
diff --git a/mozilla/widget/public/nsITreeColumn.h b/mozilla/widget/public/nsITreeColumn.h
index 8e2d058751d..37d6c225554 100644
--- a/mozilla/widget/public/nsITreeColumn.h
+++ b/mozilla/widget/public/nsITreeColumn.h
@@ -33,7 +33,7 @@ public:
 	// Inspectors
 	NS_IMETHOD GetPixelWidth(int& width) = 0;
 	NS_IMETHOD GetDesiredPercentage(double& percentage) = 0;
-	NS_IMETHOD IsSortColumn(PRBool& answer) = 0;
+	NS_IMETHOD GetSortState(int& answer) = 0;
 	NS_IMETHOD GetColumnName(nsString& name) = 0;
 
 	// Setters
diff --git a/mozilla/widget/public/nsITreeDataModel.h b/mozilla/widget/public/nsITreeDataModel.h
index 23f74d155a8..c47d23a9988 100644
--- a/mozilla/widget/public/nsITreeDataModel.h
+++ b/mozilla/widget/public/nsITreeDataModel.h
@@ -36,13 +36,12 @@ class nsITreeDataModel : public nsIDataModel
 public:
 	// Column APIs
 	NS_IMETHOD GetVisibleColumnCount(int& count) = 0;
-	NS_IMETHOD GetNthColumn(nsITreeColumn** pColumn, int n) = 0;
+	NS_IMETHOD GetNthColumn(nsITreeColumn*& pColumn, int n) = 0;
 	
 	// TreeItem APIs
 	NS_IMETHOD GetFirstVisibleItemIndex(int& index) = 0;
-	NS_IMETHOD GetNthTreeItem(nsITreeItem** pItem, int n) = 0;
-	NS_IMETHOD GetItemTextForColumn(nsITreeItem* pItem, nsITreeColumn* pColumn, 
-									nsString& nodeText) = 0;
+	NS_IMETHOD GetNthTreeItem(nsITreeItem*& pItem, int n) = 0;
+	NS_IMETHOD GetItemTextForColumn(nsString& nodeText, nsITreeItem* pItem, nsITreeColumn* pColumn) = 0;
 };
 
 #endif /* nsITreeDataModel_h___ */
diff --git a/mozilla/widget/public/nsITreeItem.h b/mozilla/widget/public/nsITreeItem.h
index d33d2ed54f0..0609610128c 100644
--- a/mozilla/widget/public/nsITreeItem.h
+++ b/mozilla/widget/public/nsITreeItem.h
@@ -34,7 +34,7 @@ class nsITreeItem : public nsIDMItem
 {
 public:
 	// Inspectors
-	NS_IMETHOD GetTriggerImage(nsIImage** pImage, nsIImageGroup* pGroup) = 0;
+	NS_IMETHOD GetTriggerImage(nsIImage*& pImage, nsIImageGroup* pGroup) = 0;
 	NS_IMETHOD GetIndentationLevel(int& indentation) = 0;
 	
 	// Setters