fix for #63625, sr=bienvenu.

nsINewsDatabase.h -> nsINewsDatabase.idl

mailnews/db/msgdb/public/MANIFEST

@@ -20,7 +20,6 @@
 # This is a list of local files which get copied to the mozilla:dist:mailnews directory
 #
 
-nsINewsDatabase.h
 nsMsgDatabase.h
 nsMailDatabase.h
 nsImapMailDatabase.h

mailnews/db/msgdb/public/Makefile.in

@@ -30,7 +30,6 @@ MODULE		= msgdb
 
 EXPORTS		= \
 		nsMsgHdr.h \
-		nsINewsDatabase.h \
 		nsMsgDatabase.h \
 		nsMailDatabase.h \
 		nsImapMailDatabase.h \
@@ -44,6 +43,7 @@ XPIDLSRCS	= \
 		nsIDBChangeListener.idl \
 		nsIDBChangeAnnouncer.idl \
 		nsIMsgDatabase.idl \
+		nsINewsDatabase.idl \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk

mailnews/db/msgdb/public/makefile.win

@@ -27,13 +27,13 @@ XPIDLSRCS =	\
 			.\nsIDBChangeListener.idl		\
 			.\nsIDBChangeAnnouncer.idl		\
 			.\nsIMsgDatabase.idl		\
+			.\nsINewsDatabase.idl		\
 			$(NULL)
 
 ################################################################################
 ## exports
 
 EXPORTS =	 						\
-			nsINewsDatabase.h		\
 			nsMsgDatabase.h			\
 			nsMailDatabase.h		\
 			nsImapMailDatabase.h	\

mailnews/db/msgdb/public/nsINewsDatabase.h

@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- * Seth Spitzer <sspitzer@netscape.com>
- */
-
-#ifndef nsINewsDatabase_h__
-#define nsINewsDatabase_h__
-
-#include "nsISupports.h"
-
-class nsMsgKeySet; 
-
-#define NS_INEWSDATABASE_IID \
-{0x6c7c2890, 0x2f62, 0x11d3, {0x97, 0x3f, 0x00, 0x80, 0x5f, 0x91, 0x6f, 0xd3} }
-
-class nsINewsDatabase : public nsISupports {
-public:
-  static const nsIID& GetIID() { static nsIID iid = NS_INEWSDATABASE_IID; return iid; }
-
-  NS_IMETHOD GetReadSet(nsMsgKeySet **pSet) = 0;
-  NS_IMETHOD GetReadSetStr(char **setStr) = 0;
-  NS_IMETHOD SetReadSetWithStr(const char * setStr) = 0;    
-};
-
-#endif // nsINewsDatabase_h__
-

mailnews/db/msgdb/public/nsNewsDatabase.h

@@ -38,6 +38,7 @@ public:
   virtual ~nsNewsDatabase();
 
   NS_DECL_ISUPPORTS_INHERITED 
+  NS_DECL_NSINEWSDATABASE
 
   virtual  nsresult         MessageDBOpenUsingURL(const char * groupURL);
   char *GetGroupURL()       { return m_groupURL; }
@@ -60,11 +61,6 @@ public:
   NS_IMETHOD                GetLowWaterArticleNum(nsMsgKey *key);
   NS_IMETHOD         MarkAllRead(nsMsgKeyArray *thoseMarked);
 
-  // for nsINewsDatabase
-  NS_IMETHOD                GetReadSet(nsMsgKeySet **pSet);
-  NS_IMETHOD                SetReadSetWithStr(const char * setStr);
-  NS_IMETHOD                GetReadSetStr(char **setStr);
-
   virtual nsresult		ExpireUpTo(nsMsgKey expireKey);
   virtual nsresult		ExpireRange(nsMsgKey startRange, nsMsgKey endRange);
  

mailnews/db/msgdb/src/nsNewsDatabase.cpp

@@ -329,7 +329,7 @@ NS_IMETHODIMP nsNewsDatabase::GetReadSet(nsMsgKeySet **pSet)
     return NS_OK;
 }
 
-NS_IMETHODIMP nsNewsDatabase::SetReadSetWithStr(const char * setStr)
+NS_IMETHODIMP nsNewsDatabase::SetReadSetStr(const char * setStr)
 {
     NS_ASSERTION(setStr, "no setStr!");
     if (!setStr) return NS_ERROR_NULL_POINTER;

mailnews/news/src/nsNewsFolder.cpp

@@ -380,7 +380,7 @@ nsresult nsMsgNewsFolder::GetDatabase(nsIMsgWindow *aMsgWindow)
             rv = GetCachedNewsrcLine(getter_Copies(setStr));
 		    if (NS_FAILED(rv)) return rv;        
 
-		    rv = db->SetReadSetWithStr((const char *)setStr);
+		    rv = db->SetReadSetStr((const char *)setStr);
 		    if (NS_FAILED(rv)) return rv;        
 		}
         if (NS_FAILED(rv)) return rv;