Skip to content

Commit

Permalink
Bug 1118418 - Mark virtual overridden functions as MOZ_OVERRIDE in in…
Browse files Browse the repository at this point in the history 
…tl; r=smontagu
  • Loading branch information
@ehsan
ehsan committed Jan 7, 2015
1 parent 123e5a7 commit cd1170a
Show file tree
Hide file tree
Showing 15 changed files with 51 additions and 51 deletions.
12 changes: 6 additions & 6 deletions intl/chardet/nsCyrillicDetector.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,12 @@ class nsCyrXPCOMDetector :
nsCyrXPCOMDetector(uint8_t aItems,
const uint8_t ** aCyrillicClass,
const char **aCharsets);
NS_IMETHOD Init(nsICharsetDetectionObserver* aObserver);
NS_IMETHOD DoIt(const char* aBuf, uint32_t aLen, bool *oDontFeedMe);
NS_IMETHOD Done();
NS_IMETHOD Init(nsICharsetDetectionObserver* aObserver) MOZ_OVERRIDE;
NS_IMETHOD DoIt(const char* aBuf, uint32_t aLen, bool *oDontFeedMe) MOZ_OVERRIDE;
NS_IMETHOD Done() MOZ_OVERRIDE;
protected:
virtual ~nsCyrXPCOMDetector();
virtual void Report(const char* aCharset);
virtual void Report(const char* aCharset) MOZ_OVERRIDE;
private:
nsCOMPtr<nsICharsetDetectionObserver> mObserver;
};
Expand All @@ -113,10 +113,10 @@ class nsCyrXPCOMStringDetector :
const uint8_t ** aCyrillicClass,
const char **aCharsets);
NS_IMETHOD DoIt(const char* aBuf, uint32_t aLen,
const char** oCharset, nsDetectionConfident &oConf);
const char** oCharset, nsDetectionConfident &oConf) MOZ_OVERRIDE;
protected:
virtual ~nsCyrXPCOMStringDetector();
virtual void Report(const char* aCharset);
virtual void Report(const char* aCharset) MOZ_OVERRIDE;
private:
nsCOMPtr<nsICharsetDetectionObserver> mObserver;
const char* mResult;
Expand Down
8 changes: 4 additions & 4 deletions intl/locale/mac/nsDateTimeFormatMac.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,27 @@ class nsDateTimeFormatMac : public nsIDateTimeFormat {
const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector,
const time_t timetTime,
nsAString& stringOut);
nsAString& stringOut) MOZ_OVERRIDE;

// performs a locale sensitive date formatting operation on the struct tm parameter
NS_IMETHOD FormatTMTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector,
const struct tm* tmTime,
nsAString& stringOut);
nsAString& stringOut) MOZ_OVERRIDE;
// performs a locale sensitive date formatting operation on the PRTime parameter
NS_IMETHOD FormatPRTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector,
const PRTime prTime,
nsAString& stringOut);
nsAString& stringOut) MOZ_OVERRIDE;

// performs a locale sensitive date formatting operation on the PRExplodedTime parameter
NS_IMETHOD FormatPRExplodedTime(nsILocale* locale,
const nsDateFormatSelector dateFormatSelector,
const nsTimeFormatSelector timeFormatSelector,
const PRExplodedTime* explodedTime,
nsAString& stringOut);
nsAString& stringOut) MOZ_OVERRIDE;

nsDateTimeFormatMac() {}

Expand Down
2 changes: 1 addition & 1 deletion intl/locale/nsCollation.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class nsCollationFactory MOZ_FINAL : public nsICollationFactory {
public:
NS_DECL_ISUPPORTS

NS_IMETHOD CreateCollation(nsILocale* locale, nsICollation** instancePtr);
NS_IMETHOD CreateCollation(nsILocale* locale, nsICollation** instancePtr) MOZ_OVERRIDE;

nsCollationFactory() {}
};
Expand Down
8 changes: 4 additions & 4 deletions intl/locale/nsLanguageAtomService.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ class nsLanguageAtomService MOZ_FINAL : public nsILanguageAtomService

// nsILanguageAtomService
virtual nsIAtom*
LookupLanguage(const nsACString &aLanguage, nsresult *aError);
LookupLanguage(const nsACString &aLanguage, nsresult *aError) MOZ_OVERRIDE;

virtual already_AddRefed<nsIAtom>
LookupCharSet(const nsACString& aCharSet);
LookupCharSet(const nsACString& aCharSet) MOZ_OVERRIDE;

virtual nsIAtom* GetLocaleLanguage(nsresult *aError);
virtual nsIAtom* GetLocaleLanguage(nsresult *aError) MOZ_OVERRIDE;

virtual nsIAtom* GetLanguageGroup(nsIAtom *aLanguage,
nsresult *aError);
nsresult *aError) MOZ_OVERRIDE;

nsLanguageAtomService();

Expand Down
4 changes: 2 additions & 2 deletions intl/locale/nsPlatformCharset.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ class nsPlatformCharset : public nsIPlatformCharset
nsPlatformCharset();

NS_IMETHOD Init();
NS_IMETHOD GetCharset(nsPlatformCharsetSel selector, nsACString& oResult);
NS_IMETHOD GetDefaultCharsetForLocale(const nsAString& localeName, nsACString& oResult);
NS_IMETHOD GetCharset(nsPlatformCharsetSel selector, nsACString& oResult) MOZ_OVERRIDE;
NS_IMETHOD GetDefaultCharsetForLocale(const nsAString& localeName, nsACString& oResult) MOZ_OVERRIDE;

private:
nsCString mCharset;
Expand Down
6 changes: 3 additions & 3 deletions intl/locale/nsScriptableDateFormat.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ class nsScriptableDateFormat : public nsIScriptableDateFormat {
int32_t hour,
int32_t minute,
int32_t second,
char16_t **dateTimeString);
char16_t **dateTimeString) MOZ_OVERRIDE;

NS_IMETHOD FormatDate(const char16_t *locale,
nsDateFormatSelector dateFormatSelector,
int32_t year,
int32_t month,
int32_t day,
char16_t **dateString)
char16_t **dateString) MOZ_OVERRIDE
{return FormatDateTime(locale, dateFormatSelector, kTimeFormatNone,
year, month, day, 0, 0, 0, dateString);}

Expand All @@ -42,7 +42,7 @@ class nsScriptableDateFormat : public nsIScriptableDateFormat {
int32_t hour,
int32_t minute,
int32_t second,
char16_t **timeString)
char16_t **timeString) MOZ_OVERRIDE
{return FormatDateTime(locale, kDateFormatNone, timeFormatSelector,
1999, 1, 1, hour, minute, second, timeString);}

Expand Down
8 changes: 4 additions & 4 deletions intl/lwbrk/nsJISx4051LineBreaker.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ class nsJISx4051LineBreaker : public nsILineBreaker
public:
nsJISx4051LineBreaker();

int32_t Next( const char16_t* aText, uint32_t aLen, uint32_t aPos);
int32_t Next( const char16_t* aText, uint32_t aLen, uint32_t aPos) MOZ_OVERRIDE;

int32_t Prev( const char16_t* aText, uint32_t aLen, uint32_t aPos);
int32_t Prev( const char16_t* aText, uint32_t aLen, uint32_t aPos) MOZ_OVERRIDE;

virtual void GetJISx4051Breaks(const char16_t* aText, uint32_t aLength,
uint8_t aBreakMode,
uint8_t* aBreakBefore);
uint8_t* aBreakBefore) MOZ_OVERRIDE;
virtual void GetJISx4051Breaks(const uint8_t* aText, uint32_t aLength,
uint8_t aBreakMode,
uint8_t* aBreakBefore);
uint8_t* aBreakBefore) MOZ_OVERRIDE;

private:
int32_t WordMove(const char16_t* aText, uint32_t aLen, uint32_t aPos,
Expand Down
6 changes: 3 additions & 3 deletions intl/lwbrk/nsSampleWordBreaker.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ class nsSampleWordBreaker : public nsIWordBreaker
nsSampleWordBreaker() ;

bool BreakInBetween(const char16_t* aText1 , uint32_t aTextLen1,
const char16_t* aText2 , uint32_t aTextLen2);
const char16_t* aText2 , uint32_t aTextLen2) MOZ_OVERRIDE;
nsWordRange FindWord(const char16_t* aText1 , uint32_t aTextLen1,
uint32_t aOffset);
uint32_t aOffset) MOZ_OVERRIDE;

int32_t NextWord(const char16_t* aText, uint32_t aLen, uint32_t aPos);
int32_t NextWord(const char16_t* aText, uint32_t aLen, uint32_t aPos) MOZ_OVERRIDE;

protected:
uint8_t GetClass(char16_t aChar);
Expand Down
4 changes: 2 additions & 2 deletions intl/uconv/nsUCSupport.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ class nsBasicDecoderSupport : public nsIUnicodeDecoder
//--------------------------------------------------------------------
// Interface nsIUnicodeDecoder [declaration]

virtual void SetInputErrorBehavior(int32_t aBehavior);
virtual char16_t GetCharacterForUnMapped();
virtual void SetInputErrorBehavior(int32_t aBehavior) MOZ_OVERRIDE;
virtual char16_t GetCharacterForUnMapped() MOZ_OVERRIDE;

protected:
int32_t mErrBehavior;
Expand Down
10 changes: 5 additions & 5 deletions intl/uconv/nsUnicodeToUTF8.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,17 @@ class nsUnicodeToUTF8 MOZ_FINAL : public nsIUnicodeEncoder
NS_IMETHOD Convert(const char16_t * aSrc,
int32_t * aSrcLength,
char * aDest,
int32_t * aDestLength);
int32_t * aDestLength) MOZ_OVERRIDE;

NS_IMETHOD Finish(char * aDest, int32_t * aDestLength);
NS_IMETHOD Finish(char * aDest, int32_t * aDestLength) MOZ_OVERRIDE;

NS_IMETHOD GetMaxLength(const char16_t * aSrc, int32_t aSrcLength,
int32_t * aDestLength);
int32_t * aDestLength) MOZ_OVERRIDE;

NS_IMETHOD Reset() {mHighSurrogate = 0; return NS_OK;}
NS_IMETHOD Reset() MOZ_OVERRIDE {mHighSurrogate = 0; return NS_OK;}

NS_IMETHOD SetOutputErrorBehavior(int32_t aBehavior,
nsIUnicharEncoder * aEncoder, char16_t aChar) {return NS_OK;}
nsIUnicharEncoder * aEncoder, char16_t aChar) MOZ_OVERRIDE {return NS_OK;}

protected:
char16_t mHighSurrogate;
Expand Down
12 changes: 6 additions & 6 deletions intl/unicharutil/nsCaseConversionImp2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ class nsCaseConversionImp2 : public nsICaseConversion {

static nsCaseConversionImp2* GetInstance();

NS_IMETHOD ToUpper(char16_t aChar, char16_t* aReturn);
NS_IMETHOD ToUpper(char16_t aChar, char16_t* aReturn) MOZ_OVERRIDE;

NS_IMETHOD ToLower(char16_t aChar, char16_t* aReturn);
NS_IMETHOD ToLower(char16_t aChar, char16_t* aReturn) MOZ_OVERRIDE;

NS_IMETHOD ToTitle(char16_t aChar, char16_t* aReturn);
NS_IMETHOD ToTitle(char16_t aChar, char16_t* aReturn) MOZ_OVERRIDE;

NS_IMETHOD ToUpper(const char16_t* anArray, char16_t* aReturn, uint32_t aLen);
NS_IMETHOD ToUpper(const char16_t* anArray, char16_t* aReturn, uint32_t aLen) MOZ_OVERRIDE;

NS_IMETHOD ToLower(const char16_t* anArray, char16_t* aReturn, uint32_t aLen);
NS_IMETHOD ToLower(const char16_t* anArray, char16_t* aReturn, uint32_t aLen) MOZ_OVERRIDE;

NS_IMETHOD CaseInsensitiveCompare(const char16_t* aLeft, const char16_t* aRight, uint32_t aLength, int32_t *aResult);
NS_IMETHOD CaseInsensitiveCompare(const char16_t* aLeft, const char16_t* aRight, uint32_t aLength, int32_t *aResult) MOZ_OVERRIDE;
};

#endif
2 changes: 1 addition & 1 deletion intl/unicharutil/nsCategoryImp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class nsCategoryImp : public nsIUGenCategory {
/**
* Give a Unichar, return a nsUGenCategory
*/
virtual nsUGenCategory Get(uint32_t aChar);
virtual nsUGenCategory Get(uint32_t aChar) MOZ_OVERRIDE;
};

#endif /* nsCategoryImp_h__ */
6 changes: 3 additions & 3 deletions intl/unicharutil/nsEntityConverter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ class nsEntityConverter: public nsIEntityConverter
//
// nsIEntityConverter
//
NS_IMETHOD ConvertUTF32ToEntity(uint32_t character, uint32_t entityVersion, char **_retval);
NS_IMETHOD ConvertToEntity(char16_t character, uint32_t entityVersion, char **_retval);
NS_IMETHOD ConvertUTF32ToEntity(uint32_t character, uint32_t entityVersion, char **_retval) MOZ_OVERRIDE;
NS_IMETHOD ConvertToEntity(char16_t character, uint32_t entityVersion, char **_retval) MOZ_OVERRIDE;

NS_IMETHOD ConvertToEntities(const char16_t *inString, uint32_t entityVersion, char16_t **_retval);
NS_IMETHOD ConvertToEntities(const char16_t *inString, uint32_t entityVersion, char16_t **_retval) MOZ_OVERRIDE;

protected:

Expand Down
6 changes: 3 additions & 3 deletions intl/unicharutil/nsSaveAsCharset.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ class nsSaveAsCharset : public nsISaveAsCharset
//
// nsIEntityConverter
//
NS_IMETHOD Init(const char *charset, uint32_t attr, uint32_t entityVersion);
NS_IMETHOD Init(const char *charset, uint32_t attr, uint32_t entityVersion) MOZ_OVERRIDE;

NS_IMETHOD Convert(const char16_t *inString, char **_retval);
NS_IMETHOD Convert(const char16_t *inString, char **_retval) MOZ_OVERRIDE;

NS_IMETHODIMP GetCharset(char * *aCharset);
NS_IMETHODIMP GetCharset(char * *aCharset) MOZ_OVERRIDE;

protected:

Expand Down
8 changes: 4 additions & 4 deletions intl/unicharutil/nsUnicodeNormalizer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ class nsUnicodeNormalizer : public nsIUnicodeNormalizer {

NS_DECL_ISUPPORTS

NS_IMETHOD NormalizeUnicodeNFD( const nsAString& aSrc, nsAString& aDest);
NS_IMETHOD NormalizeUnicodeNFC( const nsAString& aSrc, nsAString& aDest);
NS_IMETHOD NormalizeUnicodeNFKD( const nsAString& aSrc, nsAString& aDest);
NS_IMETHOD NormalizeUnicodeNFKC( const nsAString& aSrc, nsAString& aDest);
NS_IMETHOD NormalizeUnicodeNFD( const nsAString& aSrc, nsAString& aDest) MOZ_OVERRIDE;
NS_IMETHOD NormalizeUnicodeNFC( const nsAString& aSrc, nsAString& aDest) MOZ_OVERRIDE;
NS_IMETHOD NormalizeUnicodeNFKD( const nsAString& aSrc, nsAString& aDest) MOZ_OVERRIDE;
NS_IMETHOD NormalizeUnicodeNFKC( const nsAString& aSrc, nsAString& aDest) MOZ_OVERRIDE;

// low-level access to the composition data needed for HarfBuzz callbacks
static bool Compose(uint32_t a, uint32_t b, uint32_t *ab);
Expand Down

0 comments on commit cd1170a

Please sign in to comment.