mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1118420 - Mark virtual overridden functions as MOZ_OVERRIDE in editor; r=roc
This commit is contained in:
parent
4459d1fec4
commit
4c07e3c09a
@ -38,8 +38,8 @@ public:
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
// nsIControllerCommand. Declared longhand so we can make them pure virtual
|
||||
NS_IMETHOD IsCommandEnabled(const char * aCommandName, nsISupports *aCommandRefCon, bool *_retval) = 0;
|
||||
NS_IMETHOD DoCommand(const char * aCommandName, nsISupports *aCommandRefCon) = 0;
|
||||
NS_IMETHOD IsCommandEnabled(const char * aCommandName, nsISupports *aCommandRefCon, bool *_retval) MOZ_OVERRIDE = 0;
|
||||
NS_IMETHOD DoCommand(const char * aCommandName, nsISupports *aCommandRefCon) MOZ_OVERRIDE = 0;
|
||||
|
||||
};
|
||||
|
||||
|
@ -47,21 +47,21 @@ public:
|
||||
|
||||
/** nsITransactionListener interfaces
|
||||
*/
|
||||
NS_IMETHOD WillDo(nsITransactionManager *aManager, nsITransaction *aTransaction, bool *aInterrupt);
|
||||
NS_IMETHOD DidDo(nsITransactionManager *aManager, nsITransaction *aTransaction, nsresult aDoResult);
|
||||
NS_IMETHOD WillUndo(nsITransactionManager *aManager, nsITransaction *aTransaction, bool *aInterrupt);
|
||||
NS_IMETHOD DidUndo(nsITransactionManager *aManager, nsITransaction *aTransaction, nsresult aUndoResult);
|
||||
NS_IMETHOD WillRedo(nsITransactionManager *aManager, nsITransaction *aTransaction, bool *aInterrupt);
|
||||
NS_IMETHOD DidRedo(nsITransactionManager *aManager, nsITransaction *aTransaction, nsresult aRedoResult);
|
||||
NS_IMETHOD WillBeginBatch(nsITransactionManager *aManager, bool *aInterrupt);
|
||||
NS_IMETHOD DidBeginBatch(nsITransactionManager *aManager, nsresult aResult);
|
||||
NS_IMETHOD WillEndBatch(nsITransactionManager *aManager, bool *aInterrupt);
|
||||
NS_IMETHOD DidEndBatch(nsITransactionManager *aManager, nsresult aResult);
|
||||
NS_IMETHOD WillDo(nsITransactionManager *aManager, nsITransaction *aTransaction, bool *aInterrupt) MOZ_OVERRIDE;
|
||||
NS_IMETHOD DidDo(nsITransactionManager *aManager, nsITransaction *aTransaction, nsresult aDoResult) MOZ_OVERRIDE;
|
||||
NS_IMETHOD WillUndo(nsITransactionManager *aManager, nsITransaction *aTransaction, bool *aInterrupt) MOZ_OVERRIDE;
|
||||
NS_IMETHOD DidUndo(nsITransactionManager *aManager, nsITransaction *aTransaction, nsresult aUndoResult) MOZ_OVERRIDE;
|
||||
NS_IMETHOD WillRedo(nsITransactionManager *aManager, nsITransaction *aTransaction, bool *aInterrupt) MOZ_OVERRIDE;
|
||||
NS_IMETHOD DidRedo(nsITransactionManager *aManager, nsITransaction *aTransaction, nsresult aRedoResult) MOZ_OVERRIDE;
|
||||
NS_IMETHOD WillBeginBatch(nsITransactionManager *aManager, bool *aInterrupt) MOZ_OVERRIDE;
|
||||
NS_IMETHOD DidBeginBatch(nsITransactionManager *aManager, nsresult aResult) MOZ_OVERRIDE;
|
||||
NS_IMETHOD WillEndBatch(nsITransactionManager *aManager, bool *aInterrupt) MOZ_OVERRIDE;
|
||||
NS_IMETHOD DidEndBatch(nsITransactionManager *aManager, nsresult aResult) MOZ_OVERRIDE;
|
||||
NS_IMETHOD WillMerge(nsITransactionManager *aManager, nsITransaction *aTopTransaction,
|
||||
nsITransaction *aTransactionToMerge, bool *aInterrupt);
|
||||
nsITransaction *aTransactionToMerge, bool *aInterrupt) MOZ_OVERRIDE;
|
||||
NS_IMETHOD DidMerge(nsITransactionManager *aManager, nsITransaction *aTopTransaction,
|
||||
nsITransaction *aTransactionToMerge,
|
||||
bool aDidMerge, nsresult aMergeResult);
|
||||
bool aDidMerge, nsresult aMergeResult) MOZ_OVERRIDE;
|
||||
|
||||
|
||||
nsresult Init(nsIDOMWindow* aDOMWindow);
|
||||
|
@ -138,7 +138,7 @@ public:
|
||||
|
||||
NS_IMETHOD Fetch(nsIEditor* aEditor);
|
||||
|
||||
NS_IMETHOD HandleResult(nsIContentPref* aPref)
|
||||
NS_IMETHOD HandleResult(nsIContentPref* aPref) MOZ_OVERRIDE
|
||||
{
|
||||
nsCOMPtr<nsIVariant> value;
|
||||
nsresult rv = aPref->GetValue(getter_AddRefs(value));
|
||||
@ -147,13 +147,13 @@ public:
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHOD HandleCompletion(uint16_t reason)
|
||||
NS_IMETHOD HandleCompletion(uint16_t reason) MOZ_OVERRIDE
|
||||
{
|
||||
mSpellCheck->DictionaryFetched(this);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHOD HandleError(nsresult error)
|
||||
NS_IMETHOD HandleError(nsresult error) MOZ_OVERRIDE
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user