Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 268176 Merge useless nsIMsgHdr into nsIMsgDBHdr r+sr=bienvenu

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@166211 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
neil%parkwaycc.co.uk
2004-12-03 20:16:57 +00:00
parent 87744897ac
commit 8992981dce
6 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/mailnews/base/public/nsIMsgHdr.idl
View File

@@ -47,8 +47,8 @@
interface nsIMsgFolder;
[scriptable, uuid(89b3cc7e-1f50-4f6a-8576-e5aaf71f00b1)]
interface nsIMsgHdr : nsISupports
[scriptable, uuid(B5212A60-F93F-11d2-951C-006097222B83)]
interface nsIMsgDBHdr : nsISupports
{
/* general property routines - I think this can retrieve any
header in the db */
@@ -120,11 +120,5 @@ interface nsIMsgHdr : nsISupports
attribute string accountKey;
readonly attribute nsIMsgFolder folder;
};
[scriptable, uuid(B5212A60-F93F-11d2-951C-006097222B83)]
interface nsIMsgDBHdr : nsIMsgHdr
{
};
/* *******************************************************************************/

1
mozilla/mailnews/base/public/nsIMsgThread.idl
View File

@@ -40,7 +40,6 @@
#include "MailNewsTypes2.idl"
interface nsIMsgDBHdr;
interface nsIMsgHdr;
interface nsIDBChangeAnnouncer;

18
mozilla/mailnews/base/src/nsMsgDBView.cpp
View File

@@ -487,7 +487,7 @@ nsresult nsMsgDBView::AppendSelectedTextColorProperties(nsMsgLabelValue label, n
// nsITreeView Implementation Methods (and helper methods)
///////////////////////////////////////////////////////////////////////////
nsresult nsMsgDBView::FetchAuthor(nsIMsgHdr * aHdr, PRUnichar ** aSenderString)
nsresult nsMsgDBView::FetchAuthor(nsIMsgDBHdr * aHdr, PRUnichar ** aSenderString)
{
nsXPIDLString unparsedAuthor;
if (!mHeaderParser)
@@ -513,7 +513,7 @@ nsresult nsMsgDBView::FetchAuthor(nsIMsgHdr * aHdr, PRUnichar ** aSenderString)
return NS_OK;
}
nsresult nsMsgDBView::FetchAccount(nsIMsgHdr * aHdr, PRUnichar ** aAccount)
nsresult nsMsgDBView::FetchAccount(nsIMsgDBHdr * aHdr, PRUnichar ** aAccount)
{
nsXPIDLCString accountKey;
@@ -541,7 +541,7 @@ nsresult nsMsgDBView::FetchAccount(nsIMsgHdr * aHdr, PRUnichar ** aAccount)
}
nsresult nsMsgDBView::FetchRecipients(nsIMsgHdr * aHdr, PRUnichar ** aRecipientsString)
nsresult nsMsgDBView::FetchRecipients(nsIMsgDBHdr * aHdr, PRUnichar ** aRecipientsString)
{
nsXPIDLString unparsedRecipients;
if (!mHeaderParser)
@@ -567,7 +567,7 @@ nsresult nsMsgDBView::FetchRecipients(nsIMsgHdr * aHdr, PRUnichar ** aRecipients
return NS_OK;
}
nsresult nsMsgDBView::FetchSubject(nsIMsgHdr * aMsgHdr, PRUint32 aFlags, PRUnichar ** aValue)
nsresult nsMsgDBView::FetchSubject(nsIMsgDBHdr * aMsgHdr, PRUint32 aFlags, PRUnichar ** aValue)
{
if (aFlags & MSG_FLAG_HAS_RE)
{
@@ -586,7 +586,7 @@ nsresult nsMsgDBView::FetchSubject(nsIMsgHdr * aMsgHdr, PRUint32 aFlags, PRUnich
// in case we want to play around with the date string, I've broken it out into
// a separate routine.
nsresult nsMsgDBView::FetchDate(nsIMsgHdr * aHdr, PRUnichar ** aDateString)
nsresult nsMsgDBView::FetchDate(nsIMsgDBHdr * aHdr, PRUnichar ** aDateString)
{
PRTime dateOfMsg;
nsAutoString formattedDateString;
@@ -691,7 +691,7 @@ nsresult nsMsgDBView::FetchStatus(PRUint32 aFlags, PRUnichar ** aStatusString)
return NS_OK;
}
nsresult nsMsgDBView::FetchSize(nsIMsgHdr * aHdr, PRUnichar ** aSizeString)
nsresult nsMsgDBView::FetchSize(nsIMsgDBHdr * aHdr, PRUnichar ** aSizeString)
{
nsAutoString formattedSizeString;
PRUint32 msgSize = 0;
@@ -729,7 +729,7 @@ nsresult nsMsgDBView::FetchSize(nsIMsgHdr * aHdr, PRUnichar ** aSizeString)
return (*aSizeString) ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
}
nsresult nsMsgDBView::FetchPriority(nsIMsgHdr *aHdr, PRUnichar ** aPriorityString)
nsresult nsMsgDBView::FetchPriority(nsIMsgDBHdr *aHdr, PRUnichar ** aPriorityString)
{
nsMsgPriorityValue priority = nsMsgPriority::notSet;
const PRUnichar * priorityString = nsnull;
@@ -764,7 +764,7 @@ nsresult nsMsgDBView::FetchPriority(nsIMsgHdr *aHdr, PRUnichar ** aPriorityStrin
return NS_OK;
}
nsresult nsMsgDBView::FetchLabel(nsIMsgHdr *aHdr, PRUnichar ** aLabelString)
nsresult nsMsgDBView::FetchLabel(nsIMsgDBHdr *aHdr, PRUnichar ** aLabelString)
{
nsresult rv = NS_OK;
nsMsgLabelValue label = 0;
@@ -5925,7 +5925,7 @@ nsMsgDBView::FindIndexFromKey(nsMsgKey aMsgKey, PRBool aExpand, nsMsgViewIndex *
return NS_OK;
}
static void getDateFormatPref( const nsCOMPtr<nsIPrefBranch>& _prefBranch, const char* _prefLocalName, nsDateFormatSelector& _format )
static void getDateFormatPref( nsIPrefBranch* _prefBranch, const char* _prefLocalName, nsDateFormatSelector& _format )
{
// read
PRInt32 nFormatSetting( 0 );

16
mozilla/mailnews/base/src/nsMsgDBView.h
View File

@@ -160,15 +160,15 @@ protected:
PRPackedBool mCommandsNeedDisablingBecauseOfSelection;
PRPackedBool mSuppressChangeNotification;
virtual const char * GetViewName(void) {return "MsgDBView"; }
nsresult FetchAuthor(nsIMsgHdr * aHdr, PRUnichar ** aAuthorString);
nsresult FetchRecipients(nsIMsgHdr * aHdr, PRUnichar ** aRecipientsString);
nsresult FetchSubject(nsIMsgHdr * aMsgHdr, PRUint32 aFlags, PRUnichar ** aValue);
nsresult FetchDate(nsIMsgHdr * aHdr, PRUnichar ** aDateString);
nsresult FetchAuthor(nsIMsgDBHdr * aHdr, PRUnichar ** aAuthorString);
nsresult FetchRecipients(nsIMsgDBHdr * aHdr, PRUnichar ** aRecipientsString);
nsresult FetchSubject(nsIMsgDBHdr * aMsgHdr, PRUint32 aFlags, PRUnichar ** aValue);
nsresult FetchDate(nsIMsgDBHdr * aHdr, PRUnichar ** aDateString);
nsresult FetchStatus(PRUint32 aFlags, PRUnichar ** aStatusString);
nsresult FetchSize(nsIMsgHdr * aHdr, PRUnichar ** aSizeString);
nsresult FetchPriority(nsIMsgHdr *aHdr, PRUnichar ** aPriorityString);
nsresult FetchLabel(nsIMsgHdr *aHdr, PRUnichar ** aLabelString);
nsresult FetchAccount(nsIMsgHdr * aHdr, PRUnichar ** aAccount);
nsresult FetchSize(nsIMsgDBHdr * aHdr, PRUnichar ** aSizeString);
nsresult FetchPriority(nsIMsgDBHdr *aHdr, PRUnichar ** aPriorityString);
nsresult FetchLabel(nsIMsgDBHdr *aHdr, PRUnichar ** aLabelString);
nsresult FetchAccount(nsIMsgDBHdr * aHdr, PRUnichar ** aAccount);
nsresult CycleThreadedColumn(nsIDOMElement * aElement);
// Save and Restore Selection are a pair of routines you should

2
mozilla/mailnews/db/msgdb/public/nsMsgHdr.h
View File

@@ -48,7 +48,7 @@ class nsCString;
class nsMsgHdr : public nsIMsgDBHdr {
public:
NS_DECL_NSIMSGHDR
NS_DECL_NSIMSGDBHDR
friend class nsMsgDatabase;
////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////

2
mozilla/mailnews/db/msgdb/src/nsMsgThread.cpp
View File

@@ -228,7 +228,7 @@ nsresult nsMsgThread::RerootThread(nsIMsgDBHdr *newParentOfOldRoot, nsIMsgDBHdr
ReparentNonReferenceChildrenOf(oldRoot, newRoot, announcer);
if (ancestorHdr)
{
nsIMsgHdr *msgHdr = ancestorHdr;
nsIMsgDBHdr *msgHdr = ancestorHdr;
nsMsgHdr* rootMsgHdr = NS_STATIC_CAST(nsMsgHdr*, msgHdr); // closed system, cast ok
nsIMdbRow *newRootHdrRow = rootMsgHdr->GetMDBRow();
// move the root hdr to pos 0.