organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-04 13:05:31 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 7

ICU-21833 remove redundant void parameter lists

Browse source 
See #2351
This commit is contained in:
Markus Scherer 2023-03-02 16:20:46 +00:00
parent 79ab90b5f9
commit b6dcc95d3c
254 changed files with 1813 additions and 1813 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
docs/userguide/locale/resources.md
View file

@ -335,7 +335,7 @@ accessed using indexes and by iteration.
In order to be able to distinguish between resources, one needs to know the type
of the resource at hand. To find this out, use the
`UResType ures_getType(UResourceBundle* resourceBundle)` API, or the C++ analog
`UResType getType(void)`. The `UResType` is an enumeration defined in the
`UResType getType()`. The `UResType` is an enumeration defined in the
[unicode/ures.h](https://github.com/unicode-org/icu/blob/main/icu4c/source/common/unicode/ures.h)
header file.
@ -443,8 +443,8 @@ ures_close(currentZone);
...
```
C++ provides analogous APIs: `ResourceBundle getNext(UErrorCode& status)`, `void resetIterator(void)`
and `UBool hasNext(void)`.
C++ provides analogous APIs: `ResourceBundle getNext(UErrorCode& status)`, `void resetIterator()`
and `UBool hasNext()`.
#### Accessing Data in the Simple Resources
@ -540,14 +540,14 @@ following tables.
| Language | API |
| -------- | ------------------------------------------------------- |
| C | `int32_t ures_getSize(UResourceBundle* resourceBundle)` |
| C++ | `int32_t getSize(void) const` |
| C++ | `int32_t getSize() const` |
Gets the number of items in a resource. Simple resources always return size 1.
| Language | API |
| -------- | -------------------------------------------------------- |
| C | `UResType ures_getType(UResourceBundle* resourceBundle)` |
| C++ | `UResType getType(void)` |
| C++ | `UResType getType()` |
Gets the type of the resource. For a list of resource types, see:
[unicode/ures.h](https://github.com/unicode-org/icu/blob/main/icu4c/source/common/unicode/ures.h)
@ -555,7 +555,7 @@ Gets the type of the resource. For a list of resource types, see:
| Language | API |
| -------- | ------------------------------------------------ |
| C | `const char* ures_getKey(UResourceBundle* resB)` |
| C++ | `const char* getKey(void)` |
| C++ | `const char* getKey()` |
Gets the key of a named resource or `NULL` if this resource is a member of an
array.
@ -570,7 +570,7 @@ Fills out the version structure for this resource.
| Language | API |
| -------- | --------------------------------------------------------------------------------------- |
| C | `const char* ures_getLocale(const UResourceBundle* resourceBundle, UErrorCode* status)` |
| C++ | `const Locale& getLocale(void) const` |
| C++ | `const Locale& getLocale() const` |
Returns the locale this resource is from. This API is going to change, so stay
tuned.

10
icu4c/source/common/brkiter.cpp
View file

@ -288,7 +288,7 @@ static icu::ICULocaleService* gService = nullptr;
* Release all static memory held by breakiterator.
*/
U_CDECL_BEGIN
static UBool U_CALLCONV breakiterator_cleanup(void) {
static UBool U_CALLCONV breakiterator_cleanup() {
#if !UCONFIG_NO_SERVICE
if (gService) {
delete gService;
@ -302,13 +302,13 @@ U_CDECL_END
U_NAMESPACE_BEGIN
static void U_CALLCONV
initService(void) {
initService() {
gService = new ICUBreakIteratorService();
ucln_common_registerCleanup(UCLN_COMMON_BREAKITERATOR, breakiterator_cleanup);
}
static ICULocaleService*
getService(void)
getService()
{
umtx_initOnce(gInitOnceBrkiter, &initService);
return gService;
@ -318,7 +318,7 @@ getService(void)
// -------------------------------------
static inline UBool
hasService(void)
hasService()
{
return !gInitOnceBrkiter.isReset() && getService() != nullptr;
}
@ -353,7 +353,7 @@ BreakIterator::unregister(URegistryKey key, UErrorCode& status)
// -------------------------------------
StringEnumeration* U_EXPORT2
BreakIterator::getAvailableLocales(void)
BreakIterator::getAvailableLocales()
{
ICULocaleService *service = getService();
if (service == nullptr) {

4
icu4c/source/common/chariter.cpp
View file

@ -86,13 +86,13 @@ CharacterIterator::operator=(const CharacterIterator &that) {
// implementing first[32]PostInc() directly in a subclass should be faster
// but these implementations make subclassing a little easier
char16_t
CharacterIterator::firstPostInc(void) {
CharacterIterator::firstPostInc() {
setToStart();
return nextPostInc();
}
UChar32
CharacterIterator::first32PostInc(void) {
CharacterIterator::first32PostInc() {
setToStart();
return next32PostInc();
}

2
icu4c/source/common/cmemory.cpp
View file

@ -129,7 +129,7 @@ u_setMemoryFunctions(const void *context, UMemAllocFn *a, UMemReallocFn *r, UMem
}
U_CFUNC UBool cmemory_cleanup(void) {
U_CFUNC UBool cmemory_cleanup() {
pContext = nullptr;
pAlloc = nullptr;
pRealloc = nullptr;

20
icu4c/source/common/filteredbrk.cpp
View file

@ -191,7 +191,7 @@ public:
return clone();
}
virtual SimpleFilteredSentenceBreakIterator* clone() const override { return new SimpleFilteredSentenceBreakIterator(*this); }
virtual UClassID getDynamicClassID(void) const override { return nullptr; }
virtual UClassID getDynamicClassID() const override { return nullptr; }
virtual bool operator==(const BreakIterator& o) const override { if(this==&o) return true; return false; }
/* -- text modifying -- */
@ -202,20 +202,20 @@ public:
/* -- other functions that are just delegated -- */
virtual UText *getUText(UText *fillIn, UErrorCode &status) const override { return fDelegate->getUText(fillIn,status); }
virtual CharacterIterator& getText(void) const override { return fDelegate->getText(); }
virtual CharacterIterator& getText() const override { return fDelegate->getText(); }
/* -- ITERATION -- */
virtual int32_t first(void) override;
virtual int32_t first() override;
virtual int32_t preceding(int32_t offset) override;
virtual int32_t previous(void) override;
virtual int32_t previous() override;
virtual UBool isBoundary(int32_t offset) override;
virtual int32_t current(void) const override { return fDelegate->current(); } // we keep the delegate current, so this should be correct.
virtual int32_t current() const override { return fDelegate->current(); } // we keep the delegate current, so this should be correct.
virtual int32_t next(void) override;
virtual int32_t next() override;
virtual int32_t next(int32_t n) override;
virtual int32_t following(int32_t offset) override;
virtual int32_t last(void) override;
virtual int32_t last() override;
private:
/**
@ -428,7 +428,7 @@ SimpleFilteredSentenceBreakIterator::next() {
}
int32_t
SimpleFilteredSentenceBreakIterator::first(void) {
SimpleFilteredSentenceBreakIterator::first() {
// Don't suppress a break opportunity at the beginning of text.
return fDelegate->first();
}
@ -439,7 +439,7 @@ SimpleFilteredSentenceBreakIterator::preceding(int32_t offset) {
}
int32_t
SimpleFilteredSentenceBreakIterator::previous(void) {
SimpleFilteredSentenceBreakIterator::previous() {
return internalPrev(fDelegate->previous());
}
@ -473,7 +473,7 @@ SimpleFilteredSentenceBreakIterator::following(int32_t offset) {
}
int32_t
SimpleFilteredSentenceBreakIterator::last(void) {
SimpleFilteredSentenceBreakIterator::last() {
// Don't suppress a break opportunity at the end of text.
return fDelegate->last();
}

4
icu4c/source/common/hash.h
View file

@ -97,7 +97,7 @@ public:
inline int32_t removei(const UnicodeString& key);
inline void removeAll(void);
inline void removeAll();
inline UBool containsKey(const UnicodeString& key) const;
@ -246,7 +246,7 @@ inline const UHashElement* Hashtable::nextElement(int32_t& pos) const {
return uhash_nextElement(hash, &pos);
}
inline void Hashtable::removeAll(void) {
inline void Hashtable::removeAll() {
uhash_removeAll(hash);
}

2
icu4c/source/common/icuplug.cpp
View file

@ -632,7 +632,7 @@ U_CAPI UPlugLevel U_EXPORT2 uplug_getCurrentLevel() {
return gCurrentLevel;
}
static UBool U_CALLCONV uplug_cleanup(void)
static UBool U_CALLCONV uplug_cleanup()
{
int32_t i;

4
icu4c/source/common/locavailable.cpp
View file

@ -43,7 +43,7 @@ U_NAMESPACE_END
U_CDECL_BEGIN
static UBool U_CALLCONV locale_available_cleanup(void)
static UBool U_CALLCONV locale_available_cleanup()
{
U_NAMESPACE_USE
@ -196,7 +196,7 @@ class AvailableLocalesStringEnumeration : public StringEnumeration {
/* ### Get available **************************************************/
static UBool U_CALLCONV uloc_cleanup(void) {
static UBool U_CALLCONV uloc_cleanup() {
for (int32_t i = 0; i < UPRV_LENGTHOF(gAvailableLocaleNames); i++) {
uprv_free(gAvailableLocaleNames[i]);
gAvailableLocaleNames[i] = nullptr;

4
icu4c/source/common/locdspnm.cpp
View file

@ -347,7 +347,7 @@ private:
UnicodeString& keyDisplayName(const char* key, UnicodeString& result, UBool skipAdjust) const;
UnicodeString& keyValueDisplayName(const char* key, const char* value,
UnicodeString& result, UBool skipAdjust) const;
void initialize(void);
void initialize();
struct CapitalizationContextSink;
};
@ -447,7 +447,7 @@ struct LocaleDisplayNamesImpl::CapitalizationContextSink : public ResourceSink {
LocaleDisplayNamesImpl::CapitalizationContextSink::~CapitalizationContextSink() {}
void
LocaleDisplayNamesImpl::initialize(void) {
LocaleDisplayNamesImpl::initialize() {
LocaleDisplayNamesImpl *nonConstThis = (LocaleDisplayNamesImpl *)this;
nonConstThis->locale = langData.getLocale() == Locale::getRoot()
? regionData.getLocale()

56
icu4c/source/common/locid.cpp
View file

@ -58,7 +58,7 @@
#include "uvector.h"
U_CDECL_BEGIN
static UBool U_CALLCONV locale_cleanup(void);
static UBool U_CALLCONV locale_cleanup();
U_CDECL_END
U_NAMESPACE_BEGIN
@ -115,7 +115,7 @@ deleteLocale(void *obj) {
delete (icu::Locale *) obj;
}
static UBool U_CALLCONV locale_cleanup(void)
static UBool U_CALLCONV locale_cleanup()
{
U_NAMESPACE_USE
@ -235,7 +235,7 @@ locale_set_default(const char *id)
/* end */
U_CFUNC const char *
locale_get_default(void)
locale_get_default()
{
U_NAMESPACE_USE
return Locale::getDefault().getName();
@ -2244,134 +2244,134 @@ void Locale::setFromPOSIXID(const char *posixID)
}
const Locale & U_EXPORT2
Locale::getRoot(void)
Locale::getRoot()
{
return getLocale(eROOT);
}
const Locale & U_EXPORT2
Locale::getEnglish(void)
Locale::getEnglish()
{
return getLocale(eENGLISH);
}
const Locale & U_EXPORT2
Locale::getFrench(void)
Locale::getFrench()
{
return getLocale(eFRENCH);
}
const Locale & U_EXPORT2
Locale::getGerman(void)
Locale::getGerman()
{
return getLocale(eGERMAN);
}
const Locale & U_EXPORT2
Locale::getItalian(void)
Locale::getItalian()
{
return getLocale(eITALIAN);
}
const Locale & U_EXPORT2
Locale::getJapanese(void)
Locale::getJapanese()
{
return getLocale(eJAPANESE);
}
const Locale & U_EXPORT2
Locale::getKorean(void)
Locale::getKorean()
{
return getLocale(eKOREAN);
}
const Locale & U_EXPORT2
Locale::getChinese(void)
Locale::getChinese()
{
return getLocale(eCHINESE);
}
const Locale & U_EXPORT2
Locale::getSimplifiedChinese(void)
Locale::getSimplifiedChinese()
{
return getLocale(eCHINA);
}
const Locale & U_EXPORT2
Locale::getTraditionalChinese(void)
Locale::getTraditionalChinese()
{
return getLocale(eTAIWAN);
}
const Locale & U_EXPORT2
Locale::getFrance(void)
Locale::getFrance()
{
return getLocale(eFRANCE);
}
const Locale & U_EXPORT2
Locale::getGermany(void)
Locale::getGermany()
{
return getLocale(eGERMANY);
}
const Locale & U_EXPORT2
Locale::getItaly(void)
Locale::getItaly()
{
return getLocale(eITALY);
}
const Locale & U_EXPORT2
Locale::getJapan(void)
Locale::getJapan()
{
return getLocale(eJAPAN);
}
const Locale & U_EXPORT2
Locale::getKorea(void)
Locale::getKorea()
{
return getLocale(eKOREA);
}
const Locale & U_EXPORT2
Locale::getChina(void)
Locale::getChina()
{
return getLocale(eCHINA);
}
const Locale & U_EXPORT2
Locale::getPRC(void)
Locale::getPRC()
{
return getLocale(eCHINA);
}
const Locale & U_EXPORT2
Locale::getTaiwan(void)
Locale::getTaiwan()
{
return getLocale(eTAIWAN);
}
const Locale & U_EXPORT2
Locale::getUK(void)
Locale::getUK()
{
return getLocale(eUK);
}
const Locale & U_EXPORT2
Locale::getUS(void)
Locale::getUS()
{
return getLocale(eUS);
}
const Locale & U_EXPORT2
Locale::getCanada(void)
Locale::getCanada()
{
return getLocale(eCANADA);
}
const Locale & U_EXPORT2
Locale::getCanadaFrench(void)
Locale::getCanadaFrench()
{
return getLocale(eCANADA_FRENCH);
}
@ -2394,7 +2394,7 @@ This function is defined this way in order to get around static
initialization and static destruction.
*/
Locale *
Locale::getLocaleCache(void)
Locale::getLocaleCache()
{
UErrorCode status = U_ZERO_ERROR;
umtx_initOnce(gLocaleCacheInitOnce, locale_init, status);
@ -2410,8 +2410,8 @@ private:
static const char fgClassID;/* Warning this is used beyond the typical RTTI usage. */
public:
static UClassID U_EXPORT2 getStaticClassID(void) { return (UClassID)&fgClassID; }
virtual UClassID getDynamicClassID(void) const override { return getStaticClassID(); }
static UClassID U_EXPORT2 getStaticClassID() { return (UClassID)&fgClassID; }
virtual UClassID getDynamicClassID() const override { return getStaticClassID(); }
public:
KeywordEnumeration(const char *keys, int32_t keywordLen, int32_t currentIndex, UErrorCode &status)
: keywords((char *)&fgClassID), current((char *)&fgClassID), length(0) {

2
icu4c/source/common/locutil.cpp
View file

@ -36,7 +36,7 @@ static icu::Hashtable * LocaleUtility_cache = nullptr;
* Release all static memory held by Locale Utility.
*/
U_CDECL_BEGIN
static UBool U_CALLCONV service_cleanup(void) {
static UBool U_CALLCONV service_cleanup() {
if (LocaleUtility_cache) {
delete LocaleUtility_cache;
LocaleUtility_cache = nullptr;

14
icu4c/source/common/putil.cpp
View file

@ -580,7 +580,7 @@ uprv_trunc(double d)
* type of arbitrary bit length.
*/
U_CAPI double U_EXPORT2
uprv_maxMantissa(void)
uprv_maxMantissa()
{
return pow(2.0, DBL_MANT_DIG + 1.0) - 1.0;
}
@ -964,7 +964,7 @@ static UBool compareBinaryFiles(const char* defaultTZFileName, const char* TZFil
/* dirent also lists two entries: "." and ".." that we can safely ignore. */
#define SKIP1 "."
#define SKIP2 ".."
static UBool U_CALLCONV putil_cleanup(void);
static UBool U_CALLCONV putil_cleanup();
static CharString *gSearchTZFileResult = nullptr;
/*
@ -1074,7 +1074,7 @@ static void u_property_read(void* cookie, const char* name, const char* value,
#endif
U_CAPI void U_EXPORT2
uprv_tzname_clear_cache(void)
uprv_tzname_clear_cache()
{
#if U_PLATFORM == U_PF_ANDROID
/* Android's timezone is stored in system property. */
@ -1271,7 +1271,7 @@ static CharString *gTimeZoneFilesDirectory = nullptr;
static bool gCorrectedPOSIXLocaleHeapAllocated = false;
#endif
static UBool U_CALLCONV putil_cleanup(void)
static UBool U_CALLCONV putil_cleanup()
{
if (gDataDirectory && *gDataDirectory) {
uprv_free(gDataDirectory);
@ -1487,7 +1487,7 @@ static void U_CALLCONV dataDirectoryInitFn() {
}
U_CAPI const char * U_EXPORT2
u_getDataDirectory(void) {
u_getDataDirectory() {
umtx_initOnce(gDataDirInitOnce, &dataDirectoryInitFn);
return gDataDirectory;
}
@ -1647,7 +1647,7 @@ static const char *uprv_getPOSIXIDForCategory(int category)
/* Return just the POSIX id for the default locale, whatever happens to be in
* it. It gets the value from LC_MESSAGES and indirectly from LC_ALL and LANG.
*/
static const char *uprv_getPOSIXIDForDefaultLocale(void)
static const char *uprv_getPOSIXIDForDefaultLocale()
{
static const char* posixID = nullptr;
if (posixID == 0) {
@ -1660,7 +1660,7 @@ static const char *uprv_getPOSIXIDForDefaultLocale(void)
/* Return just the POSIX id for the default codepage, whatever happens to be in
* it. It gets the value from LC_CTYPE and indirectly from LC_ALL and LANG.
*/
static const char *uprv_getPOSIXIDForDefaultCodepage(void)
static const char *uprv_getPOSIXIDForDefaultCodepage()
{
static const char* posixID = nullptr;
if (posixID == 0) {

14
icu4c/source/common/rbbi.cpp
View file

@ -394,7 +394,7 @@ RuleBasedBreakIterator::operator==(const BreakIterator& that) const {
* @return A hash code
*/
int32_t
RuleBasedBreakIterator::hashCode(void) const {
RuleBasedBreakIterator::hashCode() const {
int32_t hash = 0;
if (fData != nullptr) {
hash = fData->hashCode();
@ -538,7 +538,7 @@ RuleBasedBreakIterator &RuleBasedBreakIterator::refreshInputText(UText *input, U
* Sets the current iteration position to the beginning of the text, position zero.
* @return The new iterator position, which is zero.
*/
int32_t RuleBasedBreakIterator::first(void) {
int32_t RuleBasedBreakIterator::first() {
UErrorCode status = U_ZERO_ERROR;
if (!fBreakCache->seek(0)) {
fBreakCache->populateNear(0, status);
@ -552,7 +552,7 @@ int32_t RuleBasedBreakIterator::first(void) {
* Sets the current iteration position to the end of the text.
* @return The text's past-the-end offset.
*/
int32_t RuleBasedBreakIterator::last(void) {
int32_t RuleBasedBreakIterator::last() {
int32_t endPos = (int32_t)utext_nativeLength(&fText);
UBool endShouldBeBoundary = isBoundary(endPos); // Has side effect of setting iterator position.
(void)endShouldBeBoundary;
@ -590,7 +590,7 @@ int32_t RuleBasedBreakIterator::next(int32_t n) {
* Advances the iterator to the next boundary position.
* @return The position of the first boundary after this one.
*/
int32_t RuleBasedBreakIterator::next(void) {
int32_t RuleBasedBreakIterator::next() {
fBreakCache->next();
return fDone ? UBRK_DONE : fPosition;
}
@ -603,7 +603,7 @@ int32_t RuleBasedBreakIterator::next(void) {
*
* @return The position of the boundary position immediately preceding the starting position.
*/
int32_t RuleBasedBreakIterator::previous(void) {
int32_t RuleBasedBreakIterator::previous() {
UErrorCode status = U_ZERO_ERROR;
fBreakCache->previous(status);
return fDone ? UBRK_DONE : fPosition;
@ -700,7 +700,7 @@ UBool RuleBasedBreakIterator::isBoundary(int32_t offset) {
* Returns the current iteration position.
* @return The current iteration position.
*/
int32_t RuleBasedBreakIterator::current(void) const {
int32_t RuleBasedBreakIterator::current() const {
return fPosition;
}
@ -1130,7 +1130,7 @@ static icu::UInitOnce gRBBIInitOnce {};
* Release all static memory held by breakiterator.
*/
U_CDECL_BEGIN
UBool U_CALLCONV rbbi_cleanup(void) {
UBool U_CALLCONV rbbi_cleanup() {
delete gLanguageBreakFactories;
gLanguageBreakFactories = nullptr;
delete gEmptyString;

2
icu4c/source/common/rbbidata.h
View file

@ -205,7 +205,7 @@ private:
U_NAMESPACE_END
U_CFUNC UBool rbbi_cleanup(void);
U_CFUNC UBool rbbi_cleanup();
#endif /* C++ */

14
icu4c/source/common/resbund.cpp
View file

@ -273,27 +273,27 @@ int32_t ResourceBundle::getInt(UErrorCode& status) const {
return ures_getInt(fResource, &status);
}
const char *ResourceBundle::getName(void) const {
const char *ResourceBundle::getName() const {
return ures_getName(fResource);
}
const char *ResourceBundle::getKey(void) const {
const char *ResourceBundle::getKey() const {
return ures_getKey(fResource);
}
UResType ResourceBundle::getType(void) const {
UResType ResourceBundle::getType() const {
return ures_getType(fResource);
}
int32_t ResourceBundle::getSize(void) const {
int32_t ResourceBundle::getSize() const {
return ures_getSize(fResource);
}
UBool ResourceBundle::hasNext(void) const {
UBool ResourceBundle::hasNext() const {
return ures_hasNext(fResource);
}
void ResourceBundle::resetIterator(void) {
void ResourceBundle::resetIterator() {
ures_resetIterator(fResource);
}
@ -377,7 +377,7 @@ void ResourceBundle::getVersion(UVersionInfo versionInfo) const {
ures_getVersion(fResource, versionInfo);
}
const Locale &ResourceBundle::getLocale(void) const {
const Locale &ResourceBundle::getLocale() const {
static UMutex gLocaleLock;
Mutex lock(&gLocaleLock);
if (fLocale != nullptr) {

14
icu4c/source/common/serv.h
View file

@ -830,7 +830,7 @@ class U_COMMON_API ICUService : public ICUNotifier {
*
* <p>This issues a serviceChanged notification to registered listeners.</p>
*/
virtual void reset(void);
virtual void reset();
/**
* <p>Return true if the service is in its default state.</p>
@ -838,7 +838,7 @@ class U_COMMON_API ICUService : public ICUNotifier {
* <p>The default implementation returns true if there are no
* factories registered.</p>
*/
virtual UBool isDefault(void) const;
virtual UBool isDefault() const;
/**
* <p>Create a key from an ID. If ID is nullptr, returns nullptr.</p>
@ -895,7 +895,7 @@ class U_COMMON_API ICUService : public ICUNotifier {
* directly, since it must only be called while holding write
* access to the factory list.</p>
*/
virtual void reInitializeFactories(void);
virtual void reInitializeFactories();
/**
* <p>Default handler for this service if no factory in the factory list
@ -918,7 +918,7 @@ class U_COMMON_API ICUService : public ICUNotifier {
* should generally not call this method directly, as it must only
* be called while synchronized on the factory lock.</p>
*/
virtual void clearCaches(void);
virtual void clearCaches();
/**
* <p>Return true if the listener is accepted.</p>
@ -955,7 +955,7 @@ class U_COMMON_API ICUService : public ICUNotifier {
* the resolution of IDs also changes, requiring the cache to be
* flushed, but not the visible IDs themselves.</p>
*/
void clearServiceCache(void);
void clearServiceCache();
/**
* <p>Return a map from visible IDs to factories.
@ -972,14 +972,14 @@ class U_COMMON_API ICUService : public ICUNotifier {
*
* @return the timestamp.
*/
int32_t getTimestamp(void) const;
int32_t getTimestamp() const;
/**
* <p>Return the number of registered factories.</p>
*
* @return the number of factories registered at the time of the call.
*/
int32_t countFactories(void) const;
int32_t countFactories() const;
private:

2
icu4c/source/common/servloc.h
View file

@ -518,7 +518,7 @@ class U_COMMON_API ICULocaleService : public ICUService
* Convenience method for callers using locales. This returns the standard
* service ID enumeration.
*/
virtual StringEnumeration* getAvailableLocales(void) const;
virtual StringEnumeration* getAvailableLocales() const;
protected:

6
icu4c/source/common/servls.cpp
View file

@ -245,8 +245,8 @@ public:
}
public:
static UClassID U_EXPORT2 getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const override;
static UClassID U_EXPORT2 getStaticClassID();
virtual UClassID getDynamicClassID() const override;
};
ServiceEnumeration::~ServiceEnumeration() {}
@ -254,7 +254,7 @@ ServiceEnumeration::~ServiceEnumeration() {}
UOBJECT_DEFINE_RTTI_IMPLEMENTATION(ServiceEnumeration)
StringEnumeration*
ICULocaleService::getAvailableLocales(void) const
ICULocaleService::getAvailableLocales() const
{
return ServiceEnumeration::create(this);
}

6
icu4c/source/common/servnotf.cpp
View file

@ -23,12 +23,12 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(EventListener)
static UMutex notifyLock;
ICUNotifier::ICUNotifier(void)
ICUNotifier::ICUNotifier()
: listeners(nullptr)
{
}
ICUNotifier::~ICUNotifier(void) {
ICUNotifier::~ICUNotifier() {
{
Mutex lmx(&notifyLock);
delete listeners;
@ -104,7 +104,7 @@ ICUNotifier::removeListener(const EventListener *l, UErrorCode& status)
}
void
ICUNotifier::notifyChanged(void)
ICUNotifier::notifyChanged()
{
Mutex lmx(&notifyLock);
if (listeners != nullptr) {

6
icu4c/source/common/servnotf.h
View file

@ -75,9 +75,9 @@ class U_COMMON_API ICUNotifier : public UMemory {
private: UVector* listeners;
public:
ICUNotifier(void);
ICUNotifier();
virtual ~ICUNotifier(void);
virtual ~ICUNotifier();
/**
* Add a listener to be notified when notifyChanged is called.
@ -101,7 +101,7 @@ public:
* indefinitely block the calling thread. Callers should beware of
* deadlock situations.
*/
virtual void notifyChanged(void);
virtual void notifyChanged();
protected:
/**

2
icu4c/source/common/ubidi.cpp
View file

@ -124,7 +124,7 @@ static const Flags flagO[2]={ DIRPROP_FLAG(LRO), DIRPROP_FLAG(RLO) };
/* UBiDi object management -------------------------------------------------- */
U_CAPI UBiDi * U_EXPORT2
ubidi_open(void)
ubidi_open()
{
UErrorCode errorCode=U_ZERO_ERROR;
return ubidi_openSized(0, 0, &errorCode);

4
icu4c/source/common/ucln_cmn.cpp
View file

@ -37,7 +37,7 @@ static cleanupFunc *gLibCleanupFunctions[UCLN_COMMON];
Please be sure that you have read ucln.h
************************************************/
U_CAPI void U_EXPORT2
u_cleanup(void)
u_cleanup()
{
UTRACE_ENTRY_OC(UTRACE_U_CLEANUP);
icu::umtx_lock(nullptr); /* Force a memory barrier, so that we are sure to see */
@ -102,7 +102,7 @@ ucln_registerCleanup(ECleanupLibraryType type,
}
}
U_CFUNC UBool ucln_lib_cleanup(void) {
U_CFUNC UBool ucln_lib_cleanup() {
int32_t libType = UCLN_START;
int32_t commonFunc = UCLN_COMMON_START;

4
icu4c/source/common/ucnv_bld.cpp
View file

@ -241,7 +241,7 @@ ucnv_flushAvailableConverterCache() {
/* in use by open converters. */
/* Not thread safe. */
/* Not supported API. */
static UBool U_CALLCONV ucnv_cleanup(void) {
static UBool U_CALLCONV ucnv_cleanup() {
ucnv_flushCache();
if (SHARED_DATA_HASHTABLE != nullptr && uhash_count(SHARED_DATA_HASHTABLE) == 0) {
uhash_close(SHARED_DATA_HASHTABLE);
@ -262,7 +262,7 @@ static UBool U_CALLCONV ucnv_cleanup(void) {
}
U_CAPI void U_EXPORT2
ucnv_enableCleanup(void) {
ucnv_enableCleanup() {
ucln_common_registerCleanup(UCLN_COMMON_UCNV, ucnv_cleanup);
}

4
icu4c/source/common/ucnv_io.cpp
View file

@ -216,7 +216,7 @@ isAcceptable(void * /*context*/,
pInfo->formatVersion[0]==3);
}
static UBool U_CALLCONV ucnv_io_cleanup(void)
static UBool U_CALLCONV ucnv_io_cleanup()
{
if (gAliasData) {
udata_close(gAliasData);
@ -997,7 +997,7 @@ ucnv_getAliases(const char *alias, const char **aliases, UErrorCode *pErrorCode)
}
U_CAPI uint16_t U_EXPORT2
ucnv_countStandards(void)
ucnv_countStandards()
{
UErrorCode err = U_ZERO_ERROR;
return ucnv_io_countStandards(&err);

16
icu4c/source/common/ucurr.cpp
View file

@ -231,7 +231,7 @@ static const icu::Hashtable* getCurrSymbolsEquiv();
* Cleanup callback func
*/
static UBool U_CALLCONV
isoCodes_cleanup(void)
isoCodes_cleanup()
{
if (gIsoCodes != nullptr) {
uhash_close(const_cast<UHashtable *>(gIsoCodes));
@ -245,7 +245,7 @@ isoCodes_cleanup(void)
* Cleanup callback func
*/
static UBool U_CALLCONV
currSymbolsEquiv_cleanup(void)
currSymbolsEquiv_cleanup()
{
delete const_cast<icu::Hashtable *>(gCurrSymbolsEquiv);
gCurrSymbolsEquiv = nullptr;
@ -361,7 +361,7 @@ idForLocale(const char* locale, char* countryAndVariant, int capacity, UErrorCod
// don't use ICUService since we don't need fallback
U_CDECL_BEGIN
static UBool U_CALLCONV currency_cleanup(void);
static UBool U_CALLCONV currency_cleanup();
U_CDECL_END
#if !UCONFIG_NO_SERVICE
@ -446,7 +446,7 @@ struct CReg : public icu::UMemory {
}
/* This doesn't need to be thread safe. It's for u_cleanup only. */
static void cleanup(void) {
static void cleanup() {
while (gCRegHead) {
CReg* n = gCRegHead;
gCRegHead = gCRegHead->next;
@ -485,14 +485,14 @@ ucurr_unregister(UCurrRegistryKey key, UErrorCode* status)
/**
* Release all static memory held by currency.
*/
/*The declaration here is needed so currency_cleanup(void)
/*The declaration here is needed so currency_cleanup()
* can call this function.
*/
static UBool U_CALLCONV
currency_cache_cleanup(void);
currency_cache_cleanup();
U_CDECL_BEGIN
static UBool U_CALLCONV currency_cleanup(void) {
static UBool U_CALLCONV currency_cleanup() {
#if !UCONFIG_NO_SERVICE
CReg::cleanup();
#endif
@ -1417,7 +1417,7 @@ deleteCacheEntry(CurrencyNameCacheEntry* entry) {
// Cache clean up
static UBool U_CALLCONV
currency_cache_cleanup(void) {
currency_cache_cleanup() {
for (int32_t i = 0; i < CURRENCY_NAME_CACHE_NUM; ++i) {
if (currCache[i]) {
deleteCacheEntry(currCache[i]);

6
icu4c/source/common/udata.cpp
View file

@ -120,7 +120,7 @@ static UDataFileAccess gDataFileAccess = UDATA_NO_FILES;
#endif
static UBool U_CALLCONV
udata_cleanup(void)
udata_cleanup()
{
int32_t i;
@ -652,8 +652,8 @@ extern "C" const DataHeader U_DATA_API U_ICUDATA_ENTRY_POINT;
* to its data package, if it is linked in.
*/
/*
extern const void *uprv_getICUData_collation(void) ATTRIBUTE_WEAK;
extern const void *uprv_getICUData_conversion(void) ATTRIBUTE_WEAK;
extern const void *uprv_getICUData_collation() ATTRIBUTE_WEAK;
extern const void *uprv_getICUData_conversion() ATTRIBUTE_WEAK;
*/
/*----------------------------------------------------------------------*

2
icu4c/source/common/uloc.cpp
View file

@ -56,7 +56,7 @@ U_NAMESPACE_USE
/* Locale stuff from locid.cpp */
U_CFUNC void locale_set_default(const char *id);
U_CFUNC const char *locale_get_default(void);
U_CFUNC const char *locale_get_default();
/* ### Data tables **************************************************/

2
icu4c/source/common/uloc_keytype.cpp
View file

@ -53,7 +53,7 @@ static icu::MemoryPool<LocExtType>* gLocExtTypeEntries = nullptr;
U_CDECL_BEGIN
static UBool U_CALLCONV
uloc_key_type_cleanup(void) {
uloc_key_type_cleanup() {
if (gLocExtKeyMap != nullptr) {
uhash_close(gLocExtKeyMap);
gLocExtKeyMap = nullptr;

2
icu4c/source/common/unames.cpp
View file

@ -162,7 +162,7 @@ static const char * const charCatNames[U_CHAR_EXTENDED_CATEGORY_COUNT] = {
/* implementation ----------------------------------------------------------- */
static UBool U_CALLCONV unames_cleanup(void)
static UBool U_CALLCONV unames_cleanup()
{
if(uCharNamesData) {
udata_close(uCharNamesData);

12
icu4c/source/common/uniset.cpp
View file

@ -294,7 +294,7 @@ bool UnicodeSet::operator==(const UnicodeSet& o) const {
* @return the hash code value for this set.
* @see Object#hashCode()
*/
int32_t UnicodeSet::hashCode(void) const {
int32_t UnicodeSet::hashCode() const {
uint32_t result = static_cast<uint32_t>(len);
for (int32_t i = 0; i < len; ++i) {
result *= 1000003u;
@ -314,7 +314,7 @@ int32_t UnicodeSet::hashCode(void) const {
*
* @return the number of elements in this set (its cardinality).
*/
int32_t UnicodeSet::size(void) const {
int32_t UnicodeSet::size() const {
int32_t n = 0;
int32_t count = getRangeCount();
for (int32_t i = 0; i < count; ++i) {
@ -328,7 +328,7 @@ int32_t UnicodeSet::size(void) const {
*
* @return <tt>true</tt> if this set contains no elements.
*/
UBool UnicodeSet::isEmpty(void) const {
UBool UnicodeSet::isEmpty() const {
return len == 1 && !hasStrings();
}
@ -1218,7 +1218,7 @@ UnicodeSet& UnicodeSet::complement(UChar32 c) {
* This is equivalent to
* <code>complement(MIN_VALUE, MAX_VALUE)</code>.
*/
UnicodeSet& UnicodeSet::complement(void) {
UnicodeSet& UnicodeSet::complement() {
if (isFrozen() || isBogus()) {
return *this;
}
@ -1361,7 +1361,7 @@ UnicodeSet& UnicodeSet::complementAll(const UnicodeSet& c) {
* Removes all of the elements from this set. This set will be
* empty after this call returns.
*/
UnicodeSet& UnicodeSet::clear(void) {
UnicodeSet& UnicodeSet::clear() {
if (isFrozen()) {
return *this;
}
@ -1687,7 +1687,7 @@ bool UnicodeSet::ensureBufferCapacity(int32_t newLen) {
/**
* Swap list and buffer.
*/
void UnicodeSet::swapBuffers(void) {
void UnicodeSet::swapBuffers() {
// swap list and buffer
UChar32* temp = list;
list = buffer;

2
icu4c/source/common/uniset_props.cpp
View file

@ -67,7 +67,7 @@ static icu::UInitOnce uni32InitOnce {};
/**
* Cleanup function for UnicodeSet
*/
static UBool U_CALLCONV uset_cleanup(void) {
static UBool U_CALLCONV uset_cleanup() {
delete uni32Singleton;
uni32Singleton = nullptr;
uni32InitOnce.reset();

4
icu4c/source/common/unistr.cpp
View file

@ -1234,7 +1234,7 @@ UnicodeString::getTerminatedBuffer() {
} else if(((fUnion.fFields.fLengthAndFlags & kRefCounted) == 0 || refCount() == 1)) {
// kRefCounted: Do not write the NUL if the buffer is shared.
// That is mostly safe, except when the length of one copy was modified
// without copy-on-write, e.g., via truncate(newLength) or remove(void).
// without copy-on-write, e.g., via truncate(newLength) or remove().
// Then the NUL would be written into the middle of another copy's string.
// Otherwise, the buffer is fully writable and it is anyway safe to write the NUL.
@ -1980,7 +1980,7 @@ This makes sure that static library dependencies are kept to a minimum.
#if defined(__clang__) || U_GCC_MAJOR_MINOR >= 1100
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
static void uprv_UnicodeStringDummy(void) {
static void uprv_UnicodeStringDummy() {
delete [] (new UnicodeString[2]);
}
#pragma GCC diagnostic pop

4
icu4c/source/common/uresbund.cpp
View file

@ -430,7 +430,7 @@ static int32_t ures_flushCache()
#ifdef URES_DEBUG
#include <stdio.h>
U_CAPI UBool U_EXPORT2 ures_dumpCacheContents(void) {
U_CAPI UBool U_EXPORT2 ures_dumpCacheContents() {
UBool cacheNotEmpty = false;
int32_t pos = UHASH_FIRST;
const UHashElement *e;
@ -461,7 +461,7 @@ U_CAPI UBool U_EXPORT2 ures_dumpCacheContents(void) {
#endif
static UBool U_CALLCONV ures_cleanup(void)
static UBool U_CALLCONV ures_cleanup()
{
if (cache != nullptr) {
ures_flushCache();

2
icu4c/source/common/usprep.cpp
View file

@ -192,7 +192,7 @@ usprep_flushCache(){
}
*/
static UBool U_CALLCONV usprep_cleanup(void){
static UBool U_CALLCONV usprep_cleanup(){
if (SHARED_DATA_HASHTABLE != nullptr) {
usprep_internal_flushCache(true);
if (SHARED_DATA_HASHTABLE != nullptr && uhash_count(SHARED_DATA_HASHTABLE) == 0) {

4
icu4c/source/common/ustack.cpp
View file

@ -35,7 +35,7 @@ UStack::UStack(UObjectDeleter *d, UElementsAreEqual *c, int32_t initialCapacity,
UStack::~UStack() {}
void* UStack::pop(void) {
void* UStack::pop() {
int32_t n = size() - 1;
void* result = nullptr;
if (n >= 0) {
@ -44,7 +44,7 @@ void* UStack::pop(void) {
return result;
}
int32_t UStack::popi(void) {
int32_t UStack::popi() {
int32_t n = size() - 1;
int32_t result = 0;
if (n >= 0) {

2
icu4c/source/common/uvector.cpp
View file

@ -248,7 +248,7 @@ UBool UVector::removeElement(void* obj) {
return false;
}
void UVector::removeAllElements(void) {
void UVector::removeAllElements() {
if (deleter != nullptr) {
for (int32_t i=0; i<count; ++i) {
if (elements[i].pointer != nullptr) {

20
icu4c/source/common/uvector.h
View file

@ -161,11 +161,11 @@ public:
UBool equals(const UVector &other) const;
inline void* firstElement(void) const {return elementAt(0);}
inline void* firstElement() const {return elementAt(0);}
inline void* lastElement(void) const {return elementAt(count-1);}
inline void* lastElement() const {return elementAt(count-1);}
inline int32_t lastElementi(void) const {return elementAti(count-1);}
inline int32_t lastElementi() const {return elementAti(count-1);}
int32_t indexOf(void* obj, int32_t startIndex = 0) const;
@ -187,9 +187,9 @@ public:
void removeAllElements();
inline int32_t size(void) const {return count;}
inline int32_t size() const {return count;}
inline UBool isEmpty(void) const {return count == 0;}
inline UBool isEmpty() const {return count == 0;}
UBool ensureCapacity(int32_t minimumCapacity, UErrorCode &status);
@ -328,20 +328,20 @@ public:
// It's okay not to have a virtual destructor (in UVector)
// because UStack has no special cleanup to do.
inline UBool empty(void) const {return isEmpty();}
inline UBool empty() const {return isEmpty();}
inline void* peek(void) const {return lastElement();}
inline void* peek() const {return lastElement();}
inline int32_t peeki(void) const {return lastElementi();}
inline int32_t peeki() const {return lastElementi();}
/**
* Pop and return an element from the stack.
* For stacks with a deleter function, the caller takes ownership
* of the popped element.
*/
void* pop(void);
void* pop();
int32_t popi(void);
int32_t popi();
inline void* push(void* obj, UErrorCode &status) {
if (hasDeleter()) {

2
icu4c/source/common/uvectr32.cpp
View file

@ -165,7 +165,7 @@ void UVector32::removeElementAt(int32_t index) {
}
}
void UVector32::removeAllElements(void) {
void UVector32::removeAllElements() {
count = 0;
}

24
icu4c/source/common/uvectr32.h
View file

@ -107,7 +107,7 @@ public:
UBool equals(const UVector32 &other) const;
inline int32_t lastElementi(void) const;
inline int32_t lastElementi() const;
int32_t indexOf(int32_t elem, int32_t startIndex = 0) const;
@ -123,9 +123,9 @@ public:
void removeAllElements();
inline int32_t size(void) const;
inline int32_t size() const;
inline UBool isEmpty(void) const;
inline UBool isEmpty() const;
// Inline. Use this one for speedy size check.
inline UBool ensureCapacity(int32_t minimumCapacity, UErrorCode &status);
@ -197,11 +197,11 @@ private:
// In the original UVector, these were in a separate derived class, UStack.
// Here in UVector32, they are all together.
public:
inline UBool empty(void) const; // TODO: redundant, same as empty(). Remove it?
inline UBool empty() const; // TODO: redundant, same as empty(). Remove it?
inline int32_t peeki(void) const;
inline int32_t peeki() const;
inline int32_t popi(void);
inline int32_t popi();
inline int32_t push(int32_t i, UErrorCode &status);
@ -252,11 +252,11 @@ inline int32_t *UVector32::popFrame(int32_t size) {
inline int32_t UVector32::size(void) const {
inline int32_t UVector32::size() const {
return count;
}
inline UBool UVector32::isEmpty(void) const {
inline UBool UVector32::isEmpty() const {
return count == 0;
}
@ -264,7 +264,7 @@ inline UBool UVector32::contains(int32_t obj) const {
return indexOf(obj) >= 0;
}
inline int32_t UVector32::lastElementi(void) const {
inline int32_t UVector32::lastElementi() const {
return elementAti(count-1);
}
@ -279,11 +279,11 @@ inline int32_t *UVector32::getBuffer() const {
// UStack inlines
inline UBool UVector32::empty(void) const {
inline UBool UVector32::empty() const {
return isEmpty();
}
inline int32_t UVector32::peeki(void) const {
inline int32_t UVector32::peeki() const {
return lastElementi();
}
@ -292,7 +292,7 @@ inline int32_t UVector32::push(int32_t i, UErrorCode &status) {
return i;
}
inline int32_t UVector32::popi(void) {
inline int32_t UVector32::popi() {
int32_t result = 0;
if (count > 0) {
count--;

2
icu4c/source/common/uvectr64.cpp
View file

@ -111,7 +111,7 @@ void UVector64::insertElementAt(int64_t elem, int32_t index, UErrorCode &status)
/* else index out of range */
}
void UVector64::removeAllElements(void) {
void UVector64::removeAllElements() {
count = 0;
}

18
icu4c/source/common/uvectr64.h
View file

@ -106,7 +106,7 @@ public:
//UBool equals(const UVector64 &other) const;
inline int64_t lastElementi(void) const;
inline int64_t lastElementi() const;
//int32_t indexOf(int64_t elem, int32_t startIndex = 0) const;
@ -122,9 +122,9 @@ public:
void removeAllElements();
inline int32_t size(void) const;
inline int32_t size() const;
inline UBool isEmpty(void) const { return count == 0; }
inline UBool isEmpty() const { return count == 0; }
// Inline. Use this one for speedy size check.
inline UBool ensureCapacity(int32_t minimumCapacity, UErrorCode &status);
@ -186,11 +186,11 @@ private:
// In the original UVector, these were in a separate derived class, UStack.
// Here in UVector64, they are all together.
public:
//UBool empty(void) const; // TODO: redundant, same as empty(). Remove it?
//UBool empty() const; // TODO: redundant, same as empty(). Remove it?
//int64_t peeki(void) const;
//int64_t peeki() const;
inline int64_t popi(void);
inline int64_t popi();
inline int64_t push(int64_t i, UErrorCode &status);
@ -241,11 +241,11 @@ inline int64_t *UVector64::popFrame(int32_t size) {
inline int32_t UVector64::size(void) const {
inline int32_t UVector64::size() const {
return count;
}
inline int64_t UVector64::lastElementi(void) const {
inline int64_t UVector64::lastElementi() const {
return elementAti(count-1);
}
@ -265,7 +265,7 @@ inline int64_t UVector64::push(int64_t i, UErrorCode &status) {
return i;
}
inline int64_t UVector64::popi(void) {
inline int64_t UVector64::popi() {
int64_t result = 0;
if (count > 0) {
count--;

2
icu4c/source/i18n/astro.cpp
View file

@ -68,7 +68,7 @@ static inline UBool isINVALID(double d) {
static icu::UMutex ccLock;
U_CDECL_BEGIN
static UBool calendar_astro_cleanup(void) {
static UBool calendar_astro_cleanup() {
return true;
}
U_CDECL_END

4
icu4c/source/i18n/buddhcal.h
View file

@ -107,7 +107,7 @@ public:
* same class ID. Objects of other classes have different class IDs.
* @internal
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
/**
* Return the class ID for this class. This is useful only for comparing to a return
@ -120,7 +120,7 @@ public:
* @return The class ID for all objects of this class.
* @internal
*/
U_I18N_API static UClassID U_EXPORT2 getStaticClassID(void);
U_I18N_API static UClassID U_EXPORT2 getStaticClassID();
/**
* return the calendar type, "buddhist".

10
icu4c/source/i18n/calendar.cpp
View file

@ -70,7 +70,7 @@ static icu::UInitOnce gServiceInitOnce {};
// INTERNAL - for cleanup
U_CDECL_BEGIN
static UBool calendar_cleanup(void) {
static UBool calendar_cleanup() {
#if !UCONFIG_NO_SERVICE
if (gService) {
delete gService;
@ -2433,7 +2433,7 @@ Calendar::setRepeatedWallTimeOption(UCalendarWallTimeOption option)
// -------------------------------------
UCalendarWallTimeOption
Calendar::getRepeatedWallTimeOption(void) const
Calendar::getRepeatedWallTimeOption() const
{
return fRepeatedWallTime;
}
@ -2449,7 +2449,7 @@ Calendar::setSkippedWallTimeOption(UCalendarWallTimeOption option)
// -------------------------------------
UCalendarWallTimeOption
Calendar::getSkippedWallTimeOption(void) const
Calendar::getSkippedWallTimeOption() const
{
return fSkippedWallTime;
}
@ -2578,7 +2578,7 @@ Calendar::isWeekend(UDate date, UErrorCode &status) const
}
UBool
Calendar::isWeekend(void) const
Calendar::isWeekend() const
{
UErrorCode status = U_ZERO_ERROR;
UCalendarDaysOfWeek dayOfWeek = (UCalendarDaysOfWeek)get(UCAL_DAY_OF_WEEK, status);
@ -4059,7 +4059,7 @@ int32_t Calendar::internalGetMonth(int32_t defaultValue) const {
}
BasicTimeZone*
Calendar::getBasicTimeZone(void) const {
Calendar::getBasicTimeZone() const {
if (dynamic_cast<const OlsonTimeZone *>(fZone) != nullptr
|| dynamic_cast<const SimpleTimeZone *>(fZone) != nullptr
|| dynamic_cast<const RuleBasedTimeZone *>(fZone) != nullptr

4
icu4c/source/i18n/chnsecal.cpp
View file

@ -86,7 +86,7 @@ static const int32_t SYNODIC_GAP = 25;
U_CDECL_BEGIN
static UBool calendar_chinese_cleanup(void) {
static UBool calendar_chinese_cleanup() {
if (gChineseCalendarAstro) {
delete gChineseCalendarAstro;
gChineseCalendarAstro = nullptr;
@ -161,7 +161,7 @@ static void U_CALLCONV initChineseCalZoneAstroCalc() {
ucln_i18n_registerCleanup(UCLN_I18N_CHINESE_CALENDAR, calendar_chinese_cleanup);
}
const TimeZone* ChineseCalendar::getChineseCalZoneAstroCalc(void) const {
const TimeZone* ChineseCalendar::getChineseCalZoneAstroCalc() const {
umtx_initOnce(gChineseCalendarZoneAstroCalcInitOnce, &initChineseCalZoneAstroCalc);
return gChineseCalendarZoneAstroCalc;
}

10
icu4c/source/i18n/chnsecal.h
View file

@ -257,7 +257,7 @@ class U_I18N_API ChineseCalendar : public Calendar {
int32_t gmonth, UBool setAllFields);
virtual int32_t newYear(int32_t gyear) const;
virtual void offsetMonth(int32_t newMoon, int32_t dom, int32_t delta);
const TimeZone* getChineseCalZoneAstroCalc(void) const;
const TimeZone* getChineseCalZoneAstroCalc() const;
// UObject stuff
public:
@ -266,7 +266,7 @@ class U_I18N_API ChineseCalendar : public Calendar {
* same class ID. Objects of other classes have different class IDs.
* @internal
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
/**
* Return the class ID for this class. This is useful only for comparing to a return
@ -279,7 +279,7 @@ class U_I18N_API ChineseCalendar : public Calendar {
* @return The class ID for all objects of this class.
* @internal
*/
static UClassID U_EXPORT2 getStaticClassID(void);
static UClassID U_EXPORT2 getStaticClassID();
/**
* return the calendar type, "chinese".
@ -320,13 +320,13 @@ class U_I18N_API ChineseCalendar : public Calendar {
* Returns the beginning date of the 100-year window that dates
* with 2-digit years are considered to fall within.
*/
UDate internalGetDefaultCenturyStart(void) const;
UDate internalGetDefaultCenturyStart() const;
/**
* Returns the first year of the 100-year window that dates with
* 2-digit years are considered to fall within.
*/
int32_t internalGetDefaultCenturyStartYear(void) const;
int32_t internalGetDefaultCenturyStartYear() const;
ChineseCalendar() = delete; // default constructor not implemented
};

16
icu4c/source/i18n/coll.cpp
View file

@ -73,7 +73,7 @@ static icu::UInitOnce gAvailableLocaleListInitOnce {};
* Release all static memory held by collator.
*/
U_CDECL_BEGIN
static UBool U_CALLCONV collator_cleanup(void) {
static UBool U_CALLCONV collator_cleanup() {
#if !UCONFIG_NO_SERVICE
if (gService) {
delete gService;
@ -108,7 +108,7 @@ CollatorFactory::~CollatorFactory() {}
//-------------------------------------------
UBool
CollatorFactory::visible(void) const {
CollatorFactory::visible() const {
return true;
}
@ -204,7 +204,7 @@ static void U_CALLCONV initService() {
static ICULocaleService*
getService(void)
getService()
{
umtx_initOnce(gServiceInitOnce, &initService);
return gService;
@ -213,7 +213,7 @@ getService(void)
// -------------------------------------
static inline UBool
hasService(void)
hasService()
{
UBool retVal = !gServiceInitOnce.isReset() && (getService() != nullptr);
return retVal;
@ -804,8 +804,8 @@ class CollationLocaleListEnumeration : public StringEnumeration {
private:
int32_t index;
public:
static UClassID U_EXPORT2 getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const override;
static UClassID U_EXPORT2 getStaticClassID();
virtual UClassID getDynamicClassID() const override;
public:
CollationLocaleListEnumeration()
: index(0)
@ -864,7 +864,7 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CollationLocaleListEnumeration)
// -------------------------------------
StringEnumeration* U_EXPORT2
Collator::getAvailableLocales(void)
Collator::getAvailableLocales()
{
#if !UCONFIG_NO_SERVICE
if (hasService()) {
@ -913,7 +913,7 @@ Collator::getFunctionalEquivalent(const char* keyword, const Locale& locale,
}
Collator::ECollationStrength
Collator::getStrength(void) const {
Collator::getStrength() const {
UErrorCode intStatus = U_ZERO_ERROR;
return (ECollationStrength)getAttribute(UCOL_STRENGTH, intStatus);
}

4
icu4c/source/i18n/coptccal.h
View file

@ -216,7 +216,7 @@ public:
* same class ID. Objects of other classes have different class IDs.
* @internal
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
/**
* Return the class ID for this class. This is useful only for comparing to a return
@ -229,7 +229,7 @@ public:
* @return The class ID for all objects of this class.
* @internal
*/
U_I18N_API static UClassID U_EXPORT2 getStaticClassID(void);
U_I18N_API static UClassID U_EXPORT2 getStaticClassID();
#if 0
// We do not want to introduce this API in ICU4C.

6
icu4c/source/i18n/cpdtrans.cpp
View file

@ -265,7 +265,7 @@ CompoundTransliterator::~CompoundTransliterator() {
freeTransliterators();
}
void CompoundTransliterator::freeTransliterators(void) {
void CompoundTransliterator::freeTransliterators() {
if (trans != 0) {
for (int32_t i=0; i<count; ++i) {
delete trans[i];
@ -332,7 +332,7 @@ CompoundTransliterator* CompoundTransliterator::clone() const {
* Returns the number of transliterators in this chain.
* @return number of transliterators in this chain.
*/
int32_t CompoundTransliterator::getCount(void) const {
int32_t CompoundTransliterator::getCount() const {
return count;
}
@ -599,7 +599,7 @@ void CompoundTransliterator::handleTransliterate(Replaceable& text, UTransPositi
* Sets the length of the longest context required by this transliterator.
* This is <em>preceding</em> context.
*/
void CompoundTransliterator::computeMaximumContextLength(void) {
void CompoundTransliterator::computeMaximumContextLength() {
int32_t max = 0;
for (int32_t i=0; i<count; ++i) {
int32_t len = trans[i]->getMaximumContextLength();

6
icu4c/source/i18n/cpdtrans.h
View file

@ -104,7 +104,7 @@ public:
* Returns the number of transliterators in this chain.
* @return number of transliterators in this chain.
*/
virtual int32_t getCount(void) const;
virtual int32_t getCount() const;
/**
* Returns the transliterator at the given index in this chain.
@ -220,9 +220,9 @@ private:
UnicodeString joinIDs(Transliterator* const transliterators[],
int32_t transCount);
void freeTransliterators(void);
void freeTransliterators();
void computeMaximumContextLength(void);
void computeMaximumContextLength();
};
U_NAMESPACE_END

2
icu4c/source/i18n/csdetect.cpp
View file

@ -51,7 +51,7 @@ static icu::UInitOnce gCSRecognizersInitOnce {};
static int32_t fCSRecognizers_size = 0;
U_CDECL_BEGIN
static UBool U_CALLCONV csdet_cleanup(void)
static UBool U_CALLCONV csdet_cleanup()
{
U_NAMESPACE_USE
if (fCSRecognizers != nullptr) {

2
icu4c/source/i18n/dangical.cpp
View file

@ -33,7 +33,7 @@ static icu::UInitOnce gDangiCalendarInitOnce {};
static const int32_t DANGI_EPOCH_YEAR = -2332; // Gregorian year
U_CDECL_BEGIN
static UBool calendar_dangi_cleanup(void) {
static UBool calendar_dangi_cleanup() {
if (gDangiCalendarZoneAstroCalc) {
delete gDangiCalendarZoneAstroCalc;
gDangiCalendarZoneAstroCalc = nullptr;

4
icu4c/source/i18n/dangical.h
View file

@ -97,7 +97,7 @@ class DangiCalendar : public ChineseCalendar {
* same class ID. Objects of other classes have different class IDs.
* @internal
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
/**
* Return the class ID for this class. This is useful only for comparing to a return
@ -110,7 +110,7 @@ class DangiCalendar : public ChineseCalendar {
* @return The class ID for all objects of this class.
* @internal
*/
U_I18N_API static UClassID U_EXPORT2 getStaticClassID(void);
U_I18N_API static UClassID U_EXPORT2 getStaticClassID();
/**
* return the calendar type, "dangi".

2
icu4c/source/i18n/decNumber.cpp
View file

@ -3605,7 +3605,7 @@ U_CAPI decNumber * U_EXPORT2 uprv_decNumberTrim(decNumber *dn) {
/* */
/* No error is possible. */
/* ------------------------------------------------------------------ */
const char * uprv_decNumberVersion(void) {
const char * uprv_decNumberVersion() {
return DECVERSION;
} /* decNumberVersion */

2
icu4c/source/i18n/decNumber.h
View file

@ -174,7 +174,7 @@
U_CAPI decNumber * U_EXPORT2 uprv_decNumberNextPlus(decNumber *, const decNumber *, decContext *);
U_CAPI decNumber * U_EXPORT2 uprv_decNumberNextToward(decNumber *, const decNumber *, const decNumber *, decContext *);
U_CAPI decNumber * U_EXPORT2 uprv_decNumberTrim(decNumber *);
U_CAPI const char * U_EXPORT2 uprv_decNumberVersion(void);
U_CAPI const char * U_EXPORT2 uprv_decNumberVersion();
U_CAPI decNumber * U_EXPORT2 uprv_decNumberZero(decNumber *);
/* Functions for testing decNumbers (normality depends on context) */

28
icu4c/source/i18n/decimfmt.cpp
View file

@ -790,7 +790,7 @@ CurrencyAmount* DecimalFormat::parseCurrency(const UnicodeString& text, ParsePos
}
}
const DecimalFormatSymbols* DecimalFormat::getDecimalFormatSymbols(void) const {
const DecimalFormatSymbols* DecimalFormat::getDecimalFormatSymbols() const {
if (fields == nullptr) {
return nullptr;
}
@ -831,7 +831,7 @@ void DecimalFormat::setDecimalFormatSymbols(const DecimalFormatSymbols& symbols)
touchNoError();
}
const CurrencyPluralInfo* DecimalFormat::getCurrencyPluralInfo(void) const {
const CurrencyPluralInfo* DecimalFormat::getCurrencyPluralInfo() const {
if (fields == nullptr) {
return nullptr;
}
@ -957,7 +957,7 @@ void DecimalFormat::setSignAlwaysShown(UBool value) {
touchNoError();
}
int32_t DecimalFormat::getMultiplier(void) const {
int32_t DecimalFormat::getMultiplier() const {
const DecimalFormatProperties *dfp;
// Not much we can do to report an error.
if (fields == nullptr) {
@ -1021,7 +1021,7 @@ void DecimalFormat::setMultiplierScale(int32_t newValue) {
touchNoError();
}
double DecimalFormat::getRoundingIncrement(void) const {
double DecimalFormat::getRoundingIncrement() const {
// Not much we can do to report an error.
if (fields == nullptr) {
// Fallback to using the default instance of DecimalFormatProperties.
@ -1037,7 +1037,7 @@ void DecimalFormat::setRoundingIncrement(double newValue) {
touchNoError();
}
ERoundingMode DecimalFormat::getRoundingMode(void) const {
ERoundingMode DecimalFormat::getRoundingMode() const {
// Not much we can do to report an error.
if (fields == nullptr) {
// Fallback to using the default instance of DecimalFormatProperties.
@ -1058,7 +1058,7 @@ void DecimalFormat::setRoundingMode(ERoundingMode roundingMode) UPRV_NO_SANITIZE
touchNoError();
}
int32_t DecimalFormat::getFormatWidth(void) const {
int32_t DecimalFormat::getFormatWidth() const {
// Not much we can do to report an error.
if (fields == nullptr) {
// Fallback to using the default instance of DecimalFormatProperties.
@ -1094,7 +1094,7 @@ void DecimalFormat::setPadCharacter(const UnicodeString& padChar) {
touchNoError();
}
EPadPosition DecimalFormat::getPadPosition(void) const {
EPadPosition DecimalFormat::getPadPosition() const {
if (fields == nullptr || fields->properties.padPosition.isNull()) {
return EPadPosition::kPadBeforePrefix;
} else {
@ -1113,7 +1113,7 @@ void DecimalFormat::setPadPosition(EPadPosition padPos) {
touchNoError();
}
UBool DecimalFormat::isScientificNotation(void) const {
UBool DecimalFormat::isScientificNotation() const {
// Not much we can do to report an error.
if (fields == nullptr) {
// Fallback to using the default instance of DecimalFormatProperties.
@ -1134,7 +1134,7 @@ void DecimalFormat::setScientificNotation(UBool useScientific) {
touchNoError();
}
int8_t DecimalFormat::getMinimumExponentDigits(void) const {
int8_t DecimalFormat::getMinimumExponentDigits() const {
// Not much we can do to report an error.
if (fields == nullptr) {
// Fallback to using the default instance of DecimalFormatProperties.
@ -1150,7 +1150,7 @@ void DecimalFormat::setMinimumExponentDigits(int8_t minExpDig) {
touchNoError();
}
UBool DecimalFormat::isExponentSignAlwaysShown(void) const {
UBool DecimalFormat::isExponentSignAlwaysShown() const {
// Not much we can do to report an error.
if (fields == nullptr) {
// Fallback to using the default instance of DecimalFormatProperties.
@ -1166,7 +1166,7 @@ void DecimalFormat::setExponentSignAlwaysShown(UBool expSignAlways) {
touchNoError();
}
int32_t DecimalFormat::getGroupingSize(void) const {
int32_t DecimalFormat::getGroupingSize() const {
int32_t groupingSize;
// Not much we can do to report an error.
if (fields == nullptr) {
@ -1188,7 +1188,7 @@ void DecimalFormat::setGroupingSize(int32_t newValue) {
touchNoError();
}
int32_t DecimalFormat::getSecondaryGroupingSize(void) const {
int32_t DecimalFormat::getSecondaryGroupingSize() const {
int32_t grouping2;
// Not much we can do to report an error.
if (fields == nullptr) {
@ -1226,7 +1226,7 @@ void DecimalFormat::setMinimumGroupingDigits(int32_t newValue) {
touchNoError();
}
UBool DecimalFormat::isDecimalSeparatorAlwaysShown(void) const {
UBool DecimalFormat::isDecimalSeparatorAlwaysShown() const {
// Not much we can do to report an error.
if (fields == nullptr) {
// Fallback to using the default instance of DecimalFormatProperties.
@ -1242,7 +1242,7 @@ void DecimalFormat::setDecimalSeparatorAlwaysShown(UBool newValue) {
touchNoError();
}
UBool DecimalFormat::isDecimalPatternMatchRequired(void) const {
UBool DecimalFormat::isDecimalPatternMatchRequired() const {
// Not much we can do to report an error.
if (fields == nullptr) {
// Fallback to using the default instance of DecimalFormatProperties.

4
icu4c/source/i18n/dtfmtsym.cpp
View file

@ -1274,7 +1274,7 @@ DateFormatSymbols::getZoneStrings(int32_t& rowCount, int32_t& columnCount) const
// This code must be called within a synchronized block
void
DateFormatSymbols::initZoneStringsArray(void) {
DateFormatSymbols::initZoneStringsArray() {
if (fZoneStrings != nullptr || fLocaleZoneStrings != nullptr) {
return;
}
@ -1376,7 +1376,7 @@ DateFormatSymbols::setZoneStrings(const UnicodeString* const *strings, int32_t r
//------------------------------------------------------
const char16_t * U_EXPORT2
DateFormatSymbols::getPatternUChars(void)
DateFormatSymbols::getPatternUChars()
{
return gPatternChars;
}

2
icu4c/source/i18n/dtptngen.cpp
View file

@ -2287,7 +2287,7 @@ PatternMap::getDuplicateElem(
} // PatternMap::getDuplicateElem
DateTimeMatcher::DateTimeMatcher(void) {
DateTimeMatcher::DateTimeMatcher() {
}
DateTimeMatcher::~DateTimeMatcher() {}

8
icu4c/source/i18n/dtptngen_impl.h
View file

@ -278,8 +278,8 @@ class DTSkeletonEnumeration : public StringEnumeration {
public:
DTSkeletonEnumeration(PatternMap& patternMap, dtStrEnum type, UErrorCode& status);
virtual ~DTSkeletonEnumeration();
static UClassID U_EXPORT2 getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const override;
static UClassID U_EXPORT2 getStaticClassID();
virtual UClassID getDynamicClassID() const override;
virtual const UnicodeString* snext(UErrorCode& status) override;
virtual void reset(UErrorCode& status) override;
virtual int32_t count(UErrorCode& status) const override;
@ -293,8 +293,8 @@ class DTRedundantEnumeration : public StringEnumeration {
public:
DTRedundantEnumeration();
virtual ~DTRedundantEnumeration();
static UClassID U_EXPORT2 getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const override;
static UClassID U_EXPORT2 getStaticClassID();
virtual UClassID getDynamicClassID() const override;
virtual const UnicodeString* snext(UErrorCode& status) override;
virtual void reset(UErrorCode& status) override;
virtual int32_t count(UErrorCode& status) const override;

14
icu4c/source/i18n/dtrule.cpp
View file

@ -100,37 +100,37 @@ DateTimeRule::operator!=(const DateTimeRule& that) const {
}
DateTimeRule::DateRuleType
DateTimeRule::getDateRuleType(void) const {
DateTimeRule::getDateRuleType() const {
return fDateRuleType;
}
DateTimeRule::TimeRuleType
DateTimeRule::getTimeRuleType(void) const {
DateTimeRule::getTimeRuleType() const {
return fTimeRuleType;
}
int32_t
DateTimeRule::getRuleMonth(void) const {
DateTimeRule::getRuleMonth() const {
return fMonth;
}
int32_t
DateTimeRule::getRuleDayOfMonth(void) const {
DateTimeRule::getRuleDayOfMonth() const {
return fDayOfMonth;
}
int32_t
DateTimeRule::getRuleDayOfWeek(void) const {
DateTimeRule::getRuleDayOfWeek() const {
return fDayOfWeek;
}
int32_t
DateTimeRule::getRuleWeekInMonth(void) const {
DateTimeRule::getRuleWeekInMonth() const {
return fWeekInMonth;
}
int32_t
DateTimeRule::getRuleMillisInDay(void) const {
DateTimeRule::getRuleMillisInDay() const {
return fMillisInDay;
}

8
icu4c/source/i18n/ethpccal.h
View file

@ -207,7 +207,7 @@ public:
* same class ID. Objects of other classes have different class IDs.
* @internal
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
/**
* Return the class ID for this class. This is useful only for comparing to a return
@ -220,7 +220,7 @@ public:
* @return The class ID for all objects of this class.
* @internal
*/
U_I18N_API static UClassID U_EXPORT2 getStaticClassID(void);
U_I18N_API static UClassID U_EXPORT2 getStaticClassID();
#if 0
// We do not want to introduce this API in ICU4C.
@ -298,7 +298,7 @@ public:
* same class ID. Objects of other classes have different class IDs.
* @internal
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
/**
* Return the class ID for this class. This is useful only for comparing to a return
@ -311,7 +311,7 @@ public:
* @return The class ID for all objects of this class.
* @internal
*/
U_I18N_API static UClassID U_EXPORT2 getStaticClassID(void);
U_I18N_API static UClassID U_EXPORT2 getStaticClassID();
/**
* @return The related Gregorian year; will be obtained by modifying the value

4
icu4c/source/i18n/fphdlimp.cpp
View file

@ -54,7 +54,7 @@ FieldPositionOnlyHandler::shiftLast(int32_t delta) {
}
UBool
FieldPositionOnlyHandler::isRecording(void) const {
FieldPositionOnlyHandler::isRecording() const {
return pos.getField() != FieldPosition::DONT_CARE;
}
@ -116,7 +116,7 @@ FieldPositionIteratorHandler::shiftLast(int32_t delta) {
}
UBool
FieldPositionIteratorHandler::isRecording(void) const {
FieldPositionIteratorHandler::isRecording() const {
return U_SUCCESS(status);
}

6
icu4c/source/i18n/fphdlimp.h
View file

@ -31,7 +31,7 @@ class U_I18N_API FieldPositionHandler: public UMemory {
virtual ~FieldPositionHandler();
virtual void addAttribute(int32_t id, int32_t start, int32_t limit) = 0;
virtual void shiftLast(int32_t delta) = 0;
virtual UBool isRecording(void) const = 0;
virtual UBool isRecording() const = 0;
void setShift(int32_t delta);
};
@ -50,7 +50,7 @@ class FieldPositionOnlyHandler : public FieldPositionHandler {
void addAttribute(int32_t id, int32_t start, int32_t limit) override;
void shiftLast(int32_t delta) override;
UBool isRecording(void) const override;
UBool isRecording() const override;
/**
* Enable this option to lock in the FieldPosition value after seeing the
@ -88,7 +88,7 @@ class U_I18N_API FieldPositionIteratorHandler : public FieldPositionHandler {
void addAttribute(int32_t id, int32_t start, int32_t limit) override;
void shiftLast(int32_t delta) override;
UBool isRecording(void) const override;
UBool isRecording() const override;
/** Copies a failed error code into _status. */
inline void getError(UErrorCode& _status) {

2
icu4c/source/i18n/gender.cpp
View file

@ -48,7 +48,7 @@ enum GenderStyle {
U_CDECL_BEGIN
static UBool U_CALLCONV gender_cleanup(void) {
static UBool U_CALLCONV gender_cleanup() {
if (gGenderInfoCache != nullptr) {
uhash_close(gGenderInfoCache);
gGenderInfoCache = nullptr;

2
icu4c/source/i18n/hebrwcal.cpp
View file

@ -139,7 +139,7 @@ static const int16_t LEAP_MONTH_START[][3] = {
static icu::CalendarCache *gCache = nullptr;
U_CDECL_BEGIN
static UBool calendar_hebrew_cleanup(void) {
static UBool calendar_hebrew_cleanup() {
delete gCache;
gCache = nullptr;
return true;

4
icu4c/source/i18n/hebrwcal.h
View file

@ -198,7 +198,7 @@ public:
* same class ID. Objects of other classes have different class IDs.
* @internal
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
/**
* Return the class ID for this class. This is useful only for comparing to a return
@ -211,7 +211,7 @@ public:
* @return The class ID for all objects of this class.
* @internal
*/
static UClassID U_EXPORT2 getStaticClassID(void);
static UClassID U_EXPORT2 getStaticClassID();
/**
* return the calendar type, "hebrew".

4
icu4c/source/i18n/indiancal.h
View file

@ -261,7 +261,7 @@ public:
* same class ID. Objects of other classes have different class IDs.
* @internal
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
/**
* Return the class ID for this class. This is useful only for comparing to a return
@ -274,7 +274,7 @@ public:
* @return The class ID for all objects of this class.
* @internal
*/
static UClassID U_EXPORT2 getStaticClassID(void);
static UClassID U_EXPORT2 getStaticClassID();
/**
* return the calendar type, "indian".

2
icu4c/source/i18n/islamcal.cpp
View file

@ -58,7 +58,7 @@ static icu::CalendarCache *gMonthCache = nullptr;
static icu::CalendarAstronomer *gIslamicCalendarAstro = nullptr;
U_CDECL_BEGIN
static UBool calendar_islamic_cleanup(void) {
static UBool calendar_islamic_cleanup() {
if (gMonthCache) {
delete gMonthCache;
gMonthCache = nullptr;

22
icu4c/source/i18n/islamcal.h
View file

@ -313,7 +313,7 @@ class U_I18N_API IslamicCalendar : public Calendar {
* same class ID. Objects of other classes have different class IDs.
* @internal
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
/**
* Return the class ID for this class. This is useful only for comparing to a return
@ -326,7 +326,7 @@ class U_I18N_API IslamicCalendar : public Calendar {
* @return The class ID for all objects of this class.
* @internal
*/
/*U_I18N_API*/ static UClassID U_EXPORT2 getStaticClassID(void);
/*U_I18N_API*/ static UClassID U_EXPORT2 getStaticClassID();
/**
* return the calendar type, "islamic".
@ -389,7 +389,7 @@ class U_I18N_API IslamicCalendar : public Calendar {
* are considered to fall within so that its start date is 80 years
* before the current time.
*/
static void U_CALLCONV initializeSystemDefaultCentury(void);
static void U_CALLCONV initializeSystemDefaultCentury();
};
/*
@ -434,7 +434,7 @@ class U_I18N_API IslamicCivilCalendar : public IslamicCalendar {
* same class ID. Objects of other classes have different class IDs.
* @internal
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
/**
* Return the class ID for this class. This is useful only for comparing to a return
@ -447,7 +447,7 @@ class U_I18N_API IslamicCivilCalendar : public IslamicCalendar {
* @return The class ID for all objects of this class.
* @internal
*/
static UClassID U_EXPORT2 getStaticClassID(void);
static UClassID U_EXPORT2 getStaticClassID();
/**
* return the calendar type, "islamic-civil".
@ -546,7 +546,7 @@ class U_I18N_API IslamicTBLACalendar : public IslamicCivilCalendar {
* same class ID. Objects of other classes have different class IDs.
* @internal
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
/**
* Return the class ID for this class. This is useful only for comparing to a return
@ -559,7 +559,7 @@ class U_I18N_API IslamicTBLACalendar : public IslamicCivilCalendar {
* @return The class ID for all objects of this class.
* @internal
*/
static UClassID U_EXPORT2 getStaticClassID(void);
static UClassID U_EXPORT2 getStaticClassID();
/**
* return the calendar type, "islamic-tbla".
@ -614,7 +614,7 @@ class U_I18N_API IslamicUmalquraCalendar : public IslamicCalendar {
* same class ID. Objects of other classes have different class IDs.
* @internal
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
/**
* Return the class ID for this class. This is useful only for comparing to a return
@ -627,7 +627,7 @@ class U_I18N_API IslamicUmalquraCalendar : public IslamicCalendar {
* @return The class ID for all objects of this class.
* @internal
*/
static UClassID U_EXPORT2 getStaticClassID(void);
static UClassID U_EXPORT2 getStaticClassID();
/**
* return the calendar type, "islamic-umalqura".
@ -730,7 +730,7 @@ class U_I18N_API IslamicRGSACalendar : public IslamicCalendar {
* same class ID. Objects of other classes have different class IDs.
* @internal
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
/**
* Return the class ID for this class. This is useful only for comparing to a return
@ -743,7 +743,7 @@ class U_I18N_API IslamicRGSACalendar : public IslamicCalendar {
* @return The class ID for all objects of this class.
* @internal
*/
static UClassID U_EXPORT2 getStaticClassID(void);
static UClassID U_EXPORT2 getStaticClassID();
/**
* return the calendar type, "islamic-rgsa".

4
icu4c/source/i18n/iso8601cal.h
View file

@ -67,7 +67,7 @@ class ISO8601Calendar : public GregorianCalendar {
* same class ID. Objects of other classes have different class IDs.
* @internal
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
/**
* Return the class ID for this class. This is useful only for comparing to a return
@ -80,7 +80,7 @@ class ISO8601Calendar : public GregorianCalendar {
* @return The class ID for all objects of this class.
* @internal
*/
U_I18N_API static UClassID U_EXPORT2 getStaticClassID(void);
U_I18N_API static UClassID U_EXPORT2 getStaticClassID();
/**
* return the calendar type, "iso8601".

2
icu4c/source/i18n/japancal.cpp
View file

@ -43,7 +43,7 @@ static icu::UInitOnce gJapaneseEraRulesInitOnce {};
static int32_t gCurrentEra = 0;
U_CDECL_BEGIN
static UBool japanese_calendar_cleanup(void) {
static UBool japanese_calendar_cleanup() {
if (gJapaneseEraRules) {
delete gJapaneseEraRules;
gJapaneseEraRules = nullptr;

8
icu4c/source/i18n/japancal.h
View file

@ -70,14 +70,14 @@ public:
* Check environment variable.
* @internal
*/
U_I18N_API static UBool U_EXPORT2 enableTentativeEra(void);
U_I18N_API static UBool U_EXPORT2 enableTentativeEra();
/**
* Useful constants for JapaneseCalendar.
* Exported for use by test code.
* @internal
*/
U_I18N_API static uint32_t U_EXPORT2 getCurrentEra(void); // the current era
U_I18N_API static uint32_t U_EXPORT2 getCurrentEra(); // the current era
/**
* Constructs a JapaneseCalendar based on the current time in the default time zone
@ -143,7 +143,7 @@ public:
* same class ID. Objects of other classes have different class IDs.
* @internal
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
/**
* Return the class ID for this class. This is useful only for comparing to a return
@ -156,7 +156,7 @@ public:
* @return The class ID for all objects of this class.
* @internal
*/
U_I18N_API static UClassID U_EXPORT2 getStaticClassID(void);
U_I18N_API static UClassID U_EXPORT2 getStaticClassID();
/**
* return the calendar type, "japanese".

4
icu4c/source/i18n/msgfmt_impl.h
View file

@ -28,8 +28,8 @@ class FormatNameEnumeration : public StringEnumeration {
public:
FormatNameEnumeration(LocalPointer<UVector> fFormatNames, UErrorCode& status);
virtual ~FormatNameEnumeration();
static UClassID U_EXPORT2 getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const override;
static UClassID U_EXPORT2 getStaticClassID();
virtual UClassID getDynamicClassID() const override;
virtual const UnicodeString* snext(UErrorCode& status) override;
virtual void reset(UErrorCode& status) override;
virtual int32_t count(UErrorCode& status) const override;

28
icu4c/source/i18n/nfsubs.cpp
View file

@ -65,8 +65,8 @@ public:
virtual char16_t tokenChar() const override { return (char16_t)0x003d; } // '='
public:
static UClassID getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const override;
static UClassID getStaticClassID();
virtual UClassID getDynamicClassID() const override;
};
SameValueSubstitution::~SameValueSubstitution() {}
@ -119,8 +119,8 @@ public:
virtual char16_t tokenChar() const override { return (char16_t)0x003c; } // '<'
public:
static UClassID getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const override;
static UClassID getStaticClassID();
virtual UClassID getDynamicClassID() const override;
};
MultiplierSubstitution::~MultiplierSubstitution() {}
@ -174,8 +174,8 @@ public:
virtual void toString(UnicodeString& result) const override;
public:
static UClassID getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const override;
static UClassID getStaticClassID();
virtual UClassID getDynamicClassID() const override;
};
ModulusSubstitution::~ModulusSubstitution() {}
@ -196,8 +196,8 @@ public:
virtual char16_t tokenChar() const override { return (char16_t)0x003c; } // '<'
public:
static UClassID getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const override;
static UClassID getStaticClassID();
virtual UClassID getDynamicClassID() const override;
};
IntegralPartSubstitution::~IntegralPartSubstitution() {}
@ -233,8 +233,8 @@ public:
virtual char16_t tokenChar() const override { return (char16_t)0x003e; } // '>'
public:
static UClassID getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const override;
static UClassID getStaticClassID();
virtual UClassID getDynamicClassID() const override;
};
FractionalPartSubstitution::~FractionalPartSubstitution() {}
@ -255,8 +255,8 @@ public:
virtual char16_t tokenChar() const override { return (char16_t)0x003e; } // '>'
public:
static UClassID getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const override;
static UClassID getStaticClassID();
virtual UClassID getDynamicClassID() const override;
};
AbsoluteValueSubstitution::~AbsoluteValueSubstitution() {}
@ -307,8 +307,8 @@ private:
static const char16_t LTLT[2];
public:
static UClassID getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const override;
static UClassID getStaticClassID();
virtual UClassID getDynamicClassID() const override;
};
NumeratorSubstitution::~NumeratorSubstitution() {}

4
icu4c/source/i18n/nfsubs.h
View file

@ -249,8 +249,8 @@ private:
NFSubstitution &operator=(const NFSubstitution &other) = delete; // forbid copying of this class
public:
static UClassID getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const override;
static UClassID getStaticClassID();
virtual UClassID getDynamicClassID() const override;
};
U_NAMESPACE_END

20
icu4c/source/i18n/numfmt.cpp
View file

@ -172,7 +172,7 @@ deleteNumberingSystem(void *obj) {
delete (icu::NumberingSystem *)obj;
}
static UBool U_CALLCONV numfmt_cleanup(void) {
static UBool U_CALLCONV numfmt_cleanup() {
#if !UCONFIG_NO_SERVICE
gServiceInitOnce.reset();
if (gService) {
@ -210,7 +210,7 @@ SimpleNumberFormatFactory::SimpleNumberFormatFactory(const Locale& locale, UBool
SimpleNumberFormatFactory::~SimpleNumberFormatFactory() {}
UBool SimpleNumberFormatFactory::visible(void) const {
UBool SimpleNumberFormatFactory::visible() const {
return _visible;
}
@ -481,23 +481,23 @@ class ArgExtractor {
ArgExtractor(const NumberFormat& nf, const Formattable& obj, UErrorCode& status);
~ArgExtractor();
const Formattable* number(void) const;
const char16_t *iso(void) const;
UBool wasCurrency(void) const;
const Formattable* number() const;
const char16_t *iso() const;
UBool wasCurrency() const;
};
inline const Formattable*
ArgExtractor::number(void) const {
ArgExtractor::number() const {
return num;
}
inline UBool
ArgExtractor::wasCurrency(void) const {
ArgExtractor::wasCurrency() const {
return fWasCurrency;
}
inline const char16_t *
ArgExtractor::iso(void) const {
ArgExtractor::iso() const {
return save;
}
@ -973,7 +973,7 @@ static void U_CALLCONV initNumberFormatService() {
}
static ICULocaleService*
getNumberFormatService(void)
getNumberFormatService()
{
umtx_initOnce(gServiceInitOnce, &initNumberFormatService);
return gService;
@ -1021,7 +1021,7 @@ NumberFormat::unregister(URegistryKey key, UErrorCode& status)
// -------------------------------------
StringEnumeration* U_EXPORT2
NumberFormat::getAvailableLocales(void)
NumberFormat::getAvailableLocales()
{
ICULocaleService *service = getNumberFormatService();
if (service) {

4
icu4c/source/i18n/numsys_impl.h
View file

@ -29,8 +29,8 @@ public:
NumsysNameEnumeration(UErrorCode& status);
virtual ~NumsysNameEnumeration();
static UClassID U_EXPORT2 getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const override;
static UClassID U_EXPORT2 getStaticClassID();
virtual UClassID getDynamicClassID() const override;
virtual const UnicodeString* snext(UErrorCode& status) override;
virtual void reset(UErrorCode& status) override;
virtual int32_t count(UErrorCode& status) const override;

4
icu4c/source/i18n/olsontz.cpp
View file

@ -651,7 +651,7 @@ OlsonTimeZone::hasSameRules(const TimeZone &other) const {
}
void
OlsonTimeZone::clearTransitionRules(void) {
OlsonTimeZone::clearTransitionRules() {
initialRule = nullptr;
firstTZTransition = nullptr;
firstFinalTZTransition = nullptr;
@ -663,7 +663,7 @@ OlsonTimeZone::clearTransitionRules(void) {
}
void
OlsonTimeZone::deleteTransitionRules(void) {
OlsonTimeZone::deleteTransitionRules() {
if (initialRule != nullptr) {
delete initialRule;
}

4
icu4c/source/i18n/olsontz.h
View file

@ -385,8 +385,8 @@ private:
const char16_t *canonicalID;
/* BasicTimeZone support */
void clearTransitionRules(void);
void deleteTransitionRules(void);
void clearTransitionRules();
void deleteTransitionRules();
void checkTransitionRules(UErrorCode& status) const;
public: // Internal, for access from plain C code

4
icu4c/source/i18n/persncal.h
View file

@ -255,7 +255,7 @@ class PersianCalendar : public Calendar {
* same class ID. Objects of other classes have different class IDs.
* @internal
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
/**
* Return the class ID for this class. This is useful only for comparing to a return
@ -268,7 +268,7 @@ class PersianCalendar : public Calendar {
* @return The class ID for all objects of this class.
* @internal
*/
U_I18N_API static UClassID U_EXPORT2 getStaticClassID(void);
U_I18N_API static UClassID U_EXPORT2 getStaticClassID();
/**
* return the calendar type, "persian".

4
icu4c/source/i18n/plurrule_impl.h
View file

@ -410,8 +410,8 @@ class PluralKeywordEnumeration : public StringEnumeration {
public:
PluralKeywordEnumeration(RuleChain *header, UErrorCode& status);
virtual ~PluralKeywordEnumeration();
static UClassID U_EXPORT2 getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const override;
static UClassID U_EXPORT2 getStaticClassID();
virtual UClassID getDynamicClassID() const override;
virtual const UnicodeString* snext(UErrorCode& status) override;
virtual void reset(UErrorCode& status) override;
virtual int32_t count(UErrorCode& status) const override;

30
icu4c/source/i18n/rbnf.cpp
View file

@ -87,12 +87,12 @@ protected:
public:
LocalizationInfo() : refcount(0) {}
LocalizationInfo* ref(void) {
LocalizationInfo* ref() {
++refcount;
return this;
}
LocalizationInfo* unref(void) {
LocalizationInfo* unref() {
if (refcount && --refcount == 0) {
delete this;
}
@ -102,9 +102,9 @@ public:
virtual bool operator==(const LocalizationInfo* rhs) const;
inline bool operator!=(const LocalizationInfo* rhs) const { return !operator==(rhs); }
virtual int32_t getNumberOfRuleSets(void) const = 0;
virtual int32_t getNumberOfRuleSets() const = 0;
virtual const char16_t* getRuleSetName(int32_t index) const = 0;
virtual int32_t getNumberOfDisplayLocales(void) const = 0;
virtual int32_t getNumberOfDisplayLocales() const = 0;
virtual const char16_t* getLocaleName(int32_t index) const = 0;
virtual const char16_t* getDisplayName(int32_t localeIndex, int32_t ruleIndex) const = 0;
@ -112,7 +112,7 @@ public:
virtual int32_t indexForRuleSet(const char16_t* ruleset) const;
// virtual UClassID getDynamicClassID() const = 0;
// static UClassID getStaticClassID(void);
// static UClassID getStaticClassID();
};
LocalizationInfo::~LocalizationInfo() {}
@ -243,7 +243,7 @@ public:
}
}
void** release(void) {
void** release() {
void** result = buf;
buf = nullptr;
cap = 0;
@ -271,14 +271,14 @@ public:
static StringLocalizationInfo* create(const UnicodeString& info, UParseError& perror, UErrorCode& status);
virtual ~StringLocalizationInfo();
virtual int32_t getNumberOfRuleSets(void) const override { return numRuleSets; }
virtual int32_t getNumberOfRuleSets() const override { return numRuleSets; }
virtual const char16_t* getRuleSetName(int32_t index) const override;
virtual int32_t getNumberOfDisplayLocales(void) const override { return numLocales; }
virtual int32_t getNumberOfDisplayLocales() const override { return numLocales; }
virtual const char16_t* getLocaleName(int32_t index) const override;
virtual const char16_t* getDisplayName(int32_t localeIndex, int32_t ruleIndex) const override;
// virtual UClassID getDynamicClassID() const;
// static UClassID getStaticClassID(void);
// static UClassID getStaticClassID();
private:
void init(UErrorCode& status) const;
@ -318,7 +318,7 @@ public:
private:
inline void inc(void) {
inline void inc() {
++p;
ch = 0xffff;
}
@ -332,7 +332,7 @@ private:
inline UBool check(char16_t c) {
return p < e && (ch == c || *p == c);
}
inline void skipWhitespace(void) {
inline void skipWhitespace() {
while (p < e && PatternProps::isWhiteSpace(ch != 0xffff ? ch : *p)) {
inc();
}
@ -348,10 +348,10 @@ private:
}
void parseError(const char* msg);
StringLocalizationInfo* doParse(void);
StringLocalizationInfo* doParse();
char16_t** nextArray(int32_t& requiredLength);
char16_t* nextString(void);
char16_t* nextString();
};
#ifdef RBNF_DEBUG
@ -419,7 +419,7 @@ LocDataParser::parse(char16_t* _data, int32_t len) {
StringLocalizationInfo*
LocDataParser::doParse(void) {
LocDataParser::doParse() {
skipWhitespace();
if (!checkInc(OPEN_ANGLE)) {
ERROR("Missing open angle");
@ -1027,7 +1027,7 @@ RuleBasedNumberFormat::getNumberOfRuleSetNames() const
}
int32_t
RuleBasedNumberFormat::getNumberOfRuleSetDisplayNameLocales(void) const {
RuleBasedNumberFormat::getNumberOfRuleSetDisplayNameLocales() const {
if (localizations) {
return localizations->getNumberOfDisplayLocales();
}

4
icu4c/source/i18n/rbt.h
View file

@ -193,7 +193,7 @@ public:
* @return The class ID for all objects of this class.
* @internal Use transliterator factory methods instead since this class will be removed in that release.
*/
U_I18N_API static UClassID U_EXPORT2 getStaticClassID(void);
U_I18N_API static UClassID U_EXPORT2 getStaticClassID();
/**
* Returns a unique class ID <b>polymorphically</b>. This method
@ -205,7 +205,7 @@ public:
* class have the same class ID. Objects of other classes have
* different class IDs.
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
private:

2
icu4c/source/i18n/rbt_rule.cpp
View file

@ -208,7 +208,7 @@ TransliterationRule::~TransliterationRule() {
* needed to make repeated incremental transliteration with
* anchors work.
*/
int32_t TransliterationRule::getContextLength(void) const {
int32_t TransliterationRule::getContextLength() const {
return anteContextLength + ((flags & ANCHOR_START) ? 1 : 0);
}

2
icu4c/source/i18n/rbt_rule.h
View file

@ -217,7 +217,7 @@ public:
* anchors work.
* @return the preceding context length.
*/
virtual int32_t getContextLength(void) const;
virtual int32_t getContextLength() const;
/**
* Internal method. Returns 8-bit index value for this rule.

2
icu4c/source/i18n/rbt_set.cpp
View file

@ -225,7 +225,7 @@ void TransliterationRuleSet::setData(const TransliterationRuleData* d) {
* Return the maximum context length.
* @return the length of the longest preceding context.
*/
int32_t TransliterationRuleSet::getMaximumContextLength(void) const {
int32_t TransliterationRuleSet::getMaximumContextLength() const {
return maxContextLength;
}

2
icu4c/source/i18n/rbt_set.h
View file

@ -92,7 +92,7 @@ public:
* Return the maximum context length.
* @return the length of the longest preceding context.
*/
virtual int32_t getMaximumContextLength(void) const;
virtual int32_t getMaximumContextLength() const;
/**
* Add a rule to this set. Rules are added in order, and order is

8
icu4c/source/i18n/rbtz.cpp
View file

@ -474,7 +474,7 @@ RuleBasedTimeZone::setRawOffset(int32_t /*offsetMillis*/) {
}
int32_t
RuleBasedTimeZone::getRawOffset(void) const {
RuleBasedTimeZone::getRawOffset() const {
// Note: This implementation returns standard GMT offset
// as of current time.
UErrorCode status = U_ZERO_ERROR;
@ -484,7 +484,7 @@ RuleBasedTimeZone::getRawOffset(void) const {
}
UBool
RuleBasedTimeZone::useDaylightTime(void) const {
RuleBasedTimeZone::useDaylightTime() const {
// Note: This implementation returns true when
// daylight saving time is used as of now or
// after the next transition.
@ -620,7 +620,7 @@ RuleBasedTimeZone::getTimeZoneRules(const InitialTimeZoneRule*& initial,
}
void
RuleBasedTimeZone::deleteRules(void) {
RuleBasedTimeZone::deleteRules() {
delete fInitialRule;
fInitialRule = nullptr;
if (fHistoricRules != nullptr) {
@ -634,7 +634,7 @@ RuleBasedTimeZone::deleteRules(void) {
}
void
RuleBasedTimeZone::deleteTransitions(void) {
RuleBasedTimeZone::deleteTransitions() {
if (fHistoricTransitions != nullptr) {
delete fHistoricTransitions;
}

2
icu4c/source/i18n/regexst.cpp
View file

@ -143,7 +143,7 @@ RegexStaticSets::~RegexStaticSets() {
U_CDECL_BEGIN
static UBool U_CALLCONV
regex_cleanup(void) {
regex_cleanup() {
delete RegexStaticSets::gStaticSets;
RegexStaticSets::gStaticSets = nullptr;
gStaticSetsInitOnce.reset();

2
icu4c/source/i18n/region.cpp
View file

@ -42,7 +42,7 @@ U_CDECL_BEGIN
/**
* Cleanup callback func
*/
static UBool U_CALLCONV region_cleanup(void)
static UBool U_CALLCONV region_cleanup()
{
icu::Region::cleanupRegionData();

4
icu4c/source/i18n/region_impl.h
View file

@ -32,8 +32,8 @@ public:
*/
RegionNameEnumeration(UVector *nameList, UErrorCode& status);
virtual ~RegionNameEnumeration();
static UClassID U_EXPORT2 getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const override;
static UClassID U_EXPORT2 getStaticClassID();
virtual UClassID getDynamicClassID() const override;
virtual const UnicodeString* snext(UErrorCode& status) override;
virtual void reset(UErrorCode& status) override;
virtual int32_t count(UErrorCode& status) const override;

6
icu4c/source/i18n/reldtfmt.h
View file

@ -233,7 +233,7 @@ public:
* with this date-time formatter.
* @internal ICU 4.8
*/
virtual const DateFormatSymbols* getDateFormatSymbols(void) const;
virtual const DateFormatSymbols* getDateFormatSymbols() const;
/**
* Set a particular UDisplayContext value in the formatter, such as
@ -314,7 +314,7 @@ public:
* @return The class ID for all objects of this class.
* @internal ICU 3.8
*/
U_I18N_API static UClassID U_EXPORT2 getStaticClassID(void);
U_I18N_API static UClassID U_EXPORT2 getStaticClassID();
/**
* Returns a unique class ID POLYMORPHICALLY. Pure virtual override. This
@ -327,7 +327,7 @@ public:
* other classes have different class IDs.
* @internal ICU 3.8
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
};

4
icu4c/source/i18n/search.cpp
View file

@ -143,7 +143,7 @@ void SearchIterator::setBreakIterator(BreakIterator *breakiter,
}
}
const BreakIterator * SearchIterator::getBreakIterator(void) const
const BreakIterator * SearchIterator::getBreakIterator() const
{
return m_breakiterator_;
}
@ -170,7 +170,7 @@ void SearchIterator::setText(CharacterIterator &text, UErrorCode &status)
}
}
const UnicodeString & SearchIterator::getText(void) const
const UnicodeString & SearchIterator::getText() const
{
return m_text_;
}

4
icu4c/source/i18n/simpletz.cpp
View file

@ -1039,7 +1039,7 @@ SimpleTimeZone::getPreviousTransition(UDate base, UBool inclusive, TimeZoneTrans
}
void
SimpleTimeZone::clearTransitionRules(void) {
SimpleTimeZone::clearTransitionRules() {
initialRule = nullptr;
firstTransition = nullptr;
stdRule = nullptr;
@ -1048,7 +1048,7 @@ SimpleTimeZone::clearTransitionRules(void) {
}
void
SimpleTimeZone::deleteTransitionRules(void) {
SimpleTimeZone::deleteTransitionRules() {
if (initialRule != nullptr) {
delete initialRule;
}

4
icu4c/source/i18n/smpdtfmt.cpp
View file

@ -4096,7 +4096,7 @@ SimpleDateFormat::setDateFormatSymbols(const DateFormatSymbols& newFormatSymbols
//----------------------------------------------------------------------
const TimeZoneFormat*
SimpleDateFormat::getTimeZoneFormat(void) const {
SimpleDateFormat::getTimeZoneFormat() const {
// TimeZoneFormat initialization might fail when out of memory.
// If we always initialize TimeZoneFormat instance, we can return
// such status there. For now, this implementation lazily instantiates
@ -4222,7 +4222,7 @@ SimpleDateFormat::isFieldUnitIgnored(const UnicodeString& pattern,
//----------------------------------------------------------------------
const Locale&
SimpleDateFormat::getSmpFmtLocale(void) const {
SimpleDateFormat::getSmpFmtLocale() const {
return fLocale;
}

4
icu4c/source/i18n/smpdtfst.cpp
View file

@ -76,7 +76,7 @@ SimpleDateFormatStaticSets::~SimpleDateFormatStaticSets() {
//
//------------------------------------------------------------------------------
UBool
SimpleDateFormatStaticSets::cleanup(void)
SimpleDateFormatStaticSets::cleanup()
{
delete gStaticSets;
gStaticSets = nullptr;
@ -86,7 +86,7 @@ SimpleDateFormatStaticSets::cleanup(void)
U_CDECL_BEGIN
static UBool U_CALLCONV
smpdtfmt_cleanup(void)
smpdtfmt_cleanup()
{
return SimpleDateFormatStaticSets::cleanup();
}

2
icu4c/source/i18n/stsearch.cpp
View file

@ -227,7 +227,7 @@ void StringSearch::setOffset(int32_t position, UErrorCode &status)
usearch_setOffset(m_strsrch_, position, &status);
}
int32_t StringSearch::getOffset(void) const
int32_t StringSearch::getOffset() const
{
return usearch_getOffset(m_strsrch_);
}

4
icu4c/source/i18n/taiwncal.h
View file

@ -104,7 +104,7 @@ public:
* same class ID. Objects of other classes have different class IDs.
* @internal
*/
virtual UClassID getDynamicClassID(void) const override;
virtual UClassID getDynamicClassID() const override;
/**
* Return the class ID for this class. This is useful only for comparing to a return
@ -117,7 +117,7 @@ public:
* @return The class ID for all objects of this class.
* @internal
*/
U_I18N_API static UClassID U_EXPORT2 getStaticClassID(void);
U_I18N_API static UClassID U_EXPORT2 getStaticClassID();
/**
* return the calendar type, "Taiwan".

8
icu4c/source/i18n/timezone.cpp
View file

@ -140,7 +140,7 @@ static icu::UInitOnce gCanonicalZonesInitOnce {};
static icu::UInitOnce gCanonicalLocationZonesInitOnce {};
U_CDECL_BEGIN
static UBool U_CALLCONV timeZone_cleanup(void)
static UBool U_CALLCONV timeZone_cleanup()
{
U_NAMESPACE_USE
delete DEFAULT_ZONE;
@ -328,7 +328,7 @@ TimeZone::getUnknown()
}
const TimeZone* U_EXPORT2
TimeZone::getGMT(void)
TimeZone::getGMT()
{
umtx_initOnce(gStaticZonesInitOnce, &initStaticTimeZones);
return reinterpret_cast<SimpleTimeZone*>(gRawGMT);
@ -972,8 +972,8 @@ public:
}
public:
static UClassID U_EXPORT2 getStaticClassID(void);
virtual UClassID getDynamicClassID(void) const override;
static UClassID U_EXPORT2 getStaticClassID();
virtual UClassID getDynamicClassID() const override;
};
TZEnumeration::~TZEnumeration() {

14
icu4c/source/i18n/translit.cpp
View file

@ -700,7 +700,7 @@ void Transliterator::setMaximumContextLength(int32_t maxContextLength) {
* @see #registerInstance
* @see #getAvailableIDs
*/
const UnicodeString& Transliterator::getID(void) const {
const UnicodeString& Transliterator::getID() const {
return ID;
}
@ -834,7 +834,7 @@ UnicodeString& U_EXPORT2 Transliterator::getDisplayName(const UnicodeString& id,
* if this transliterator uses no filter. Caller musn't delete
* the result!
*/
const UnicodeFilter* Transliterator::getFilter(void) const {
const UnicodeFilter* Transliterator::getFilter() const {
return filter;
}
@ -844,7 +844,7 @@ const UnicodeFilter* Transliterator::getFilter(void) const {
* caller must eventually delete the result. After this call,
* this transliterator's filter is set to <tt>nullptr</tt>.
*/
UnicodeFilter* Transliterator::orphanFilter(void) {
UnicodeFilter* Transliterator::orphanFilter() {
UnicodeFilter *result = filter;
filter = nullptr;
return result;
@ -1323,7 +1323,7 @@ void U_EXPORT2 Transliterator::unregister(const UnicodeString& ID) {
* To retrieve the actual IDs, call getAvailableID(i) with
* i from 0 to countAvailableIDs() - 1.
*/
int32_t U_EXPORT2 Transliterator::countAvailableIDs(void) {
int32_t U_EXPORT2 Transliterator::countAvailableIDs() {
int32_t retVal = 0;
Mutex lock(&registryMutex);
UErrorCode ec = U_ZERO_ERROR;
@ -1365,7 +1365,7 @@ StringEnumeration* U_EXPORT2 Transliterator::getAvailableIDs(UErrorCode& ec) {
return result;
}
int32_t U_EXPORT2 Transliterator::countAvailableSources(void) {
int32_t U_EXPORT2 Transliterator::countAvailableSources() {
Mutex lock(&registryMutex);
UErrorCode ec = U_ZERO_ERROR;
return HAVE_REGISTRY(ec) ? _countAvailableSources() : 0;
@ -1417,7 +1417,7 @@ UnicodeString& U_EXPORT2 Transliterator::getAvailableVariant(int32_t index,
return result;
}
int32_t Transliterator::_countAvailableSources(void) {
int32_t Transliterator::_countAvailableSources() {
return registry->countAvailableSources();
}
@ -1663,7 +1663,7 @@ U_NAMESPACE_END
* necessarily invalidate any rule-based transliterators held by the
* user, because RBTs hold pointers to common data objects.
*/
U_CFUNC UBool utrans_transliterator_cleanup(void) {
U_CFUNC UBool utrans_transliterator_cleanup() {
U_NAMESPACE_USE
TransliteratorIDParser::cleanup();
if (registry) {

Some files were not shown because too many files have changed in this diff Show more