From 1b2d8213bc15949f6f58eca383a5a1b3bfe28ed6 Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com" <sspitzer%netscape.com>
Date: Thu, 15 Apr 1999 20:11:33 +0000
Subject: [PATCH] checking in newly generated headers

---
 mailnews/base/public/nsIMsgGroupRecord.h | 25 ++++++++----------------
 mailnews/base/public/nsIMsgThread.h      |  5 +----
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/mailnews/base/public/nsIMsgGroupRecord.h b/mailnews/base/public/nsIMsgGroupRecord.h
index 0c9507b10e7..f64a4057c51 100644
--- a/mailnews/base/public/nsIMsgGroupRecord.h
+++ b/mailnews/base/public/nsIMsgGroupRecord.h
@@ -6,19 +6,13 @@
 #define __gen_nsIMsgGroupRecord_h__
 
 #include "nsISupports.h" /* interface nsISupports */
+#include "nsID.h" /* interface nsID */
 
 #ifdef XPIDL_JS_STUBS
 #include "jsapi.h"
 #endif
-#include "nsDebug.h"
-#include "nsTraceRefcnt.h"
-#include "nsID.h"
-#include "nsIID.h"
-#include "nsError.h"
-#include "nsISupportsUtils.h"
 
-
-/* starting interface nsIMsgGroupRecord */
+/* starting interface:    nsIMsgGroupRecord */
 
 /* {4ed03c60-b256-11d2-b7f0-00805f05ffa5} */
 #define NS_IMSGGROUPRECORD_IID_STR "4ed03c60-b256-11d2-b7f0-00805f05ffa5"
@@ -28,28 +22,25 @@
 
 class nsIMsgGroupRecord : public nsISupports {
  public: 
-  static const nsIID& GetIID() {
-    static nsIID iid = NS_IMSGGROUPRECORD_IID;
-    return iid;
-  }
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMSGGROUPRECORD_IID)
 
   /* void Init (in voidStar parent, in string partname, in long long time, in long uniqueid, in long fileoffset, in char delimiter); */
-  NS_IMETHOD Init(void* parent, char *partname, PRInt64 time, PRInt32 uniqueid, PRInt32 fileoffset, char delimiter) = 0;
+  NS_IMETHOD Init(void* parent, const char *partname, PRInt64 time, PRInt32 uniqueid, PRInt32 fileoffset, char delimiter) = 0;
 
   /* void InitFromParent (in nsIMsgGroupRecord parent, in string saveline, in long savelinelength, in long fileoffset); */
-  NS_IMETHOD InitFromParent(nsIMsgGroupRecord *parent, char *saveline, PRInt32 savelinelength, PRInt32 fileoffset) = 0;
+  NS_IMETHOD InitFromParent(nsIMsgGroupRecord *parent, const char *saveline, PRInt32 savelinelength, PRInt32 fileoffset) = 0;
 
   /* void InitFromFile (in nsIMsgGroupRecord parent, in string partname, in long long time, in long uniqueid, in long fileoffset); */
-  NS_IMETHOD InitFromFile(nsIMsgGroupRecord *parent, char *partname, PRInt64 time, PRInt32 uniqueid, PRInt32 fileoffset) = 0;
+  NS_IMETHOD InitFromFile(nsIMsgGroupRecord *parent, const char *partname, PRInt64 time, PRInt32 uniqueid, PRInt32 fileoffset) = 0;
 
   /* void InitializeSibling (); */
   NS_IMETHOD InitializeSibling() = 0;
 
   /* short GroupNameCompare (in string name1, in string name2, in char delimeter, in boolean caseSensitive); */
-  NS_IMETHOD GroupNameCompare(char *name1, char *name2, char delimeter, PRBool caseSensitive, PRInt16 *_retval) = 0;
+  NS_IMETHOD GroupNameCompare(const char *name1, const char *name2, char delimeter, PRBool caseSensitive, PRInt16 *_retval) = 0;
 
   /* nsIMsgGroupRecord FindDescendent (in string name); */
-  NS_IMETHOD FindDescendent(char *name, nsIMsgGroupRecord **_retval) = 0;
+  NS_IMETHOD FindDescendent(const char *name, nsIMsgGroupRecord **_retval) = 0;
 
   /* readonly attribute nsIMsgGroupRecord parent; */
   NS_IMETHOD GetParent(nsIMsgGroupRecord * *aParent) = 0;
diff --git a/mailnews/base/public/nsIMsgThread.h b/mailnews/base/public/nsIMsgThread.h
index f83f85331ae..e50555ff8e1 100644
--- a/mailnews/base/public/nsIMsgThread.h
+++ b/mailnews/base/public/nsIMsgThread.h
@@ -25,10 +25,7 @@
 
 class nsIMsgThread : public nsISupports {
  public: 
-  static const nsIID& GetIID() {
-    static nsIID iid = NS_IMSGTHREAD_IID;
-    return iid;
-  }
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMSGTHREAD_IID)
 
   /* attribute nsMsgKey threadKey; */
   NS_IMETHOD GetThreadKey(nsMsgKey *aThreadKey) = 0;