зеркало из https://github.com/mozilla/gecko-dev.git
sspitzer: stop hiding these virtual methods (thanks mac compiler!)
This commit is contained in:
Родитель
89621ab0bc
Коммит
c80f6b8daa
|
@ -767,10 +767,10 @@ NS_IMETHODIMP nsMsgNewsFolder::Adopt(nsIMsgFolder *srcFolder, PRUint32 *outPos)
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsMsgNewsFolder::GetChildNamed(nsString& name, nsISupports ** aChild)
|
nsMsgNewsFolder::GetChildNamed(const char *name, nsISupports ** aChild)
|
||||||
{
|
{
|
||||||
#ifdef DEBUG_sspitzer_
|
#ifdef DEBUG_sspitzer
|
||||||
printf("nsMsgNewsFolder::GetChildNamed()\n");
|
printf("nsMsgNewsFolder::GetChildNamed(%s)\n",name);
|
||||||
#endif
|
#endif
|
||||||
NS_ASSERTION(aChild, "NULL child");
|
NS_ASSERTION(aChild, "NULL child");
|
||||||
|
|
||||||
|
@ -791,8 +791,9 @@ nsMsgNewsFolder::GetChildNamed(nsString& name, nsISupports ** aChild)
|
||||||
char *folderName;
|
char *folderName;
|
||||||
|
|
||||||
folder->GetName(&folderName);
|
folder->GetName(&folderName);
|
||||||
// case-insensitive compare is probably LCD across OS filesystems
|
|
||||||
if (folderName && !name.EqualsIgnoreCase(folderName)) {
|
// case-insensitive compare is probably LCD across OS filesystems
|
||||||
|
if (folderName && PL_strcasecmp(name, folderName)!=0) {
|
||||||
*aChild = folder;
|
*aChild = folder;
|
||||||
PR_FREEIF(folderName);
|
PR_FREEIF(folderName);
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
@ -830,16 +831,16 @@ NS_IMETHODIMP nsMsgNewsFolder::GetName(char **name)
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP nsMsgNewsFolder::GetPrettyName(nsString& prettyName)
|
NS_IMETHODIMP nsMsgNewsFolder::GetPrettyName(char ** prettyName)
|
||||||
{
|
{
|
||||||
if (mDepth == 1) {
|
if (mDepth == 1) {
|
||||||
// Depth == 1 means we are on the news server level
|
// Depth == 1 means we are on the news server level
|
||||||
// override the name here to say "News.Foo.Bar"
|
// override the name here to say "News.Foo.Bar"
|
||||||
prettyName = PL_strdup("News.Foo.Bar");
|
*prettyName = PL_strdup("News.Foo.Bar");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
nsresult rv = NS_ERROR_NULL_POINTER;
|
nsresult rv = NS_ERROR_NULL_POINTER;
|
||||||
char *pName = prettyName.ToNewCString();
|
char *pName = PL_strdup(*prettyName);
|
||||||
if (pName)
|
if (pName)
|
||||||
rv = nsMsgFolder::GetPrettyName(&pName);
|
rv = nsMsgFolder::GetPrettyName(&pName);
|
||||||
delete[] pName;
|
delete[] pName;
|
||||||
|
@ -978,7 +979,7 @@ NS_IMETHODIMP nsMsgNewsFolder::GetRequiresCleanup(PRBool *requiresCleanup)
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP nsMsgNewsFolder::GetSizeOnDisk(PRUint32 size)
|
NS_IMETHODIMP nsMsgNewsFolder::GetSizeOnDisk(PRUint32 *size)
|
||||||
{
|
{
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -67,11 +67,11 @@ public:
|
||||||
NS_IMETHOD Rename (const char *newName);
|
NS_IMETHOD Rename (const char *newName);
|
||||||
NS_IMETHOD Adopt(nsIMsgFolder *srcFolder, PRUint32 *outPos);
|
NS_IMETHOD Adopt(nsIMsgFolder *srcFolder, PRUint32 *outPos);
|
||||||
|
|
||||||
NS_IMETHOD GetChildNamed(nsString& name, nsISupports ** aChild);
|
NS_IMETHOD GetChildNamed(const char* name, nsISupports ** aChild);
|
||||||
|
|
||||||
// this override pulls the value from the db
|
// this override pulls the value from the db
|
||||||
NS_IMETHOD GetName(char ** name); // Name of this folder (as presented to user).
|
NS_IMETHOD GetName(char ** name); // Name of this folder (as presented to user).
|
||||||
NS_IMETHOD GetPrettyName(nsString& prettyName); // Override of the base, for top-level news folder
|
NS_IMETHOD GetPrettyName(char ** prettyName); // Override of the base, for top-level news folder
|
||||||
|
|
||||||
NS_IMETHOD BuildFolderURL(char **url);
|
NS_IMETHOD BuildFolderURL(char **url);
|
||||||
|
|
||||||
|
@ -83,12 +83,12 @@ public:
|
||||||
NS_IMETHOD GetCanBeRenamed (PRBool *canBeRenamed);
|
NS_IMETHOD GetCanBeRenamed (PRBool *canBeRenamed);
|
||||||
NS_IMETHOD GetRequiresCleanup(PRBool *requiresCleanup);
|
NS_IMETHOD GetRequiresCleanup(PRBool *requiresCleanup);
|
||||||
|
|
||||||
NS_IMETHOD GetSizeOnDisk(PRUint32 size);
|
NS_IMETHOD GetSizeOnDisk(PRUint32 *size);
|
||||||
|
|
||||||
NS_IMETHOD GetUsersName(char** userName);
|
NS_IMETHOD GetUsersName(char** userName);
|
||||||
NS_IMETHOD GetHostName(char** hostName);
|
NS_IMETHOD GetHostName(char** hostName);
|
||||||
NS_IMETHOD UserNeedsToAuthenticateForFolder(PRBool displayOnly, PRBool *authenticate);
|
NS_IMETHOD UserNeedsToAuthenticateForFolder(PRBool displayOnly, PRBool *authenticate);
|
||||||
NS_IMETHOD RememberPassword(char *password);
|
NS_IMETHOD RememberPassword(const char *password);
|
||||||
NS_IMETHOD GetRememberedPassword(char ** password);
|
NS_IMETHOD GetRememberedPassword(char ** password);
|
||||||
|
|
||||||
virtual nsresult GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo, nsIMsgDatabase **db);
|
virtual nsresult GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo, nsIMsgDatabase **db);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче