Skip to content

Commit 5193362

Browse files
committed
Changed foo(void) to foo() in almost all non-backend source files
svn-id: r45616
1 parent 400ee8c commit 5193362

File tree

284 files changed

+1428
-1428
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

284 files changed

+1428
-1428
lines changed

backends/platform/sdl/graphics.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ int OSystem_SDL::getDefaultGraphicsMode() const {
8989
return GFX_DOUBLESIZE;
9090
}
9191

92-
void OSystem_SDL::beginGFXTransaction(void) {
92+
void OSystem_SDL::beginGFXTransaction() {
9393
assert(_transactionMode == kTransactionNone);
9494

9595
_transactionMode = kTransactionActive;
@@ -107,7 +107,7 @@ void OSystem_SDL::beginGFXTransaction(void) {
107107
_oldVideoMode = _videoMode;
108108
}
109109

110-
OSystem::TransactionError OSystem_SDL::endGFXTransaction(void) {
110+
OSystem::TransactionError OSystem_SDL::endGFXTransaction() {
111111
int errors = kTransactionSuccess;
112112

113113
assert(_transactionMode != kTransactionNone);

backends/platform/sdl/sdl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ void OSystem_SDL::setupIcon() {
575575
free(icon);
576576
}
577577

578-
OSystem::MutexRef OSystem_SDL::createMutex(void) {
578+
OSystem::MutexRef OSystem_SDL::createMutex() {
579579
return (MutexRef) SDL_CreateMutex();
580580
}
581581

backends/platform/sdl/sdl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ class OSystem_SDL : public BaseBackend {
9090

9191
virtual void initBackend();
9292

93-
void beginGFXTransaction(void);
94-
TransactionError endGFXTransaction(void);
93+
void beginGFXTransaction();
94+
TransactionError endGFXTransaction();
9595

9696
#ifdef USE_RGB_COLOR
9797
// Game screen

common/util.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#ifdef _WIN32_WCE
3434
// This is required for the debugger attachment
35-
extern bool isSmartphone(void);
35+
extern bool isSmartphone();
3636
#endif
3737

3838
#ifdef __PLAYSTATION2__
@@ -178,7 +178,7 @@ uint RandomSource::getRandomNumber(uint max) {
178178
return _randSeed % (max + 1);
179179
}
180180

181-
uint RandomSource::getRandomBit(void) {
181+
uint RandomSource::getRandomBit() {
182182
_randSeed = 0xDEADBF03 * (_randSeed + 1);
183183
_randSeed = (_randSeed >> 13) | (_randSeed << 19);
184184
return _randSeed & 1;

common/util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class RandomSource {
139139
* Identical to getRandomNumber(1), but faster, hopefully.
140140
* @return a random bit, either 0 or 1
141141
*/
142-
uint getRandomBit(void);
142+
uint getRandomBit();
143143
/**
144144
* Generates a random unsigned integer in the interval [min, max].
145145
* @param min the lower bound

engines/agi/agi.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ void AgiEngine::processEvents() {
269269
}
270270
}
271271

272-
void AgiEngine::pollTimer(void) {
272+
void AgiEngine::pollTimer() {
273273
static uint32 m = 0;
274274
uint32 dm;
275275

@@ -715,7 +715,7 @@ void AgiEngine::syncSoundSettings() {
715715
_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, soundVolumeSpeech);
716716
}
717717

718-
void AgiEngine::parseFeatures(void) {
718+
void AgiEngine::parseFeatures() {
719719
if (!ConfMan.hasKey("features"))
720720
return;
721721

engines/agi/agi.h

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -721,10 +721,10 @@ class AgiBase : public ::Engine {
721721

722722
bool _noSaveLoadAllowed;
723723

724-
virtual void pollTimer(void) = 0;
725-
virtual int getKeypress(void) = 0;
726-
virtual bool isKeypress(void) = 0;
727-
virtual void clearKeyQueue(void) = 0;
724+
virtual void pollTimer() = 0;
725+
virtual int getKeypress() = 0;
726+
virtual bool isKeypress() = 0;
727+
virtual void clearKeyQueue() = 0;
728728

729729
AgiBase(OSystem *syst, const AGIGameDescription *gameDesc);
730730

@@ -755,9 +755,9 @@ class AgiBase : public ::Engine {
755755
Common::Language getLanguage() const;
756756
Common::Platform getPlatform() const;
757757
const char *getGameMD5() const;
758-
void initFeatures(void);
758+
void initFeatures();
759759
void setFeature(uint32 feature);
760-
void initVersion(void);
760+
void initVersion();
761761
void setVersion(uint16 version);
762762

763763
bool canLoadGameStateCurrently();
@@ -800,7 +800,7 @@ class AgiEngine : public AgiBase {
800800
int checkCollision(VtEntry *v);
801801
int checkPosition(VtEntry *v);
802802

803-
void parseFeatures(void);
803+
void parseFeatures();
804804

805805
int _firstSlot;
806806

@@ -854,10 +854,10 @@ class AgiEngine : public AgiBase {
854854
int agiUnloadResource(int, int);
855855
void agiUnloadResources();
856856

857-
virtual void pollTimer(void);
858-
virtual int getKeypress(void);
859-
virtual bool isKeypress(void);
860-
virtual void clearKeyQueue(void);
857+
virtual void pollTimer();
858+
virtual int getKeypress();
859+
virtual bool isKeypress();
860+
virtual void clearKeyQueue();
861861

862862
static void agiTimerFunctionLow(void *refCon);
863863
void initPriTable();
@@ -981,27 +981,27 @@ class AgiEngine : public AgiBase {
981981

982982
int messageBox(const char *);
983983
int selectionBox(const char *, const char **);
984-
void closeWindow(void);
984+
void closeWindow();
985985
void drawWindow(int, int, int, int);
986986
void printText(const char *, int, int, int, int, int, int, bool checkerboard = false);
987987
void printTextConsole(const char *, int, int, int, int, int);
988988
int print(const char *, int, int, int);
989989
char *wordWrapString(const char *, int *);
990990
char *agiSprintf(const char *);
991-
void writeStatus(void);
992-
void writePrompt(void);
993-
void clearPrompt(void);
991+
void writeStatus();
992+
void writePrompt();
993+
void clearPrompt();
994994
void clearLines(int, int, int);
995995
void flushLines(int, int);
996-
bool predictiveDialog(void);
996+
bool predictiveDialog();
997997

998998
private:
999999
void printStatus(const char *message, ...) GCC_PRINTF(2, 3);
10001000
void printText2(int l, const char *msg, int foff, int xoff, int yoff, int len, int fg, int bg, bool checkerboard = false);
10011001
void blitTextbox(const char *p, int y, int x, int len);
10021002
void eraseTextbox();
1003-
void loadDict(void);
1004-
bool matchWord(void);
1003+
void loadDict();
1004+
bool matchWord();
10051005

10061006
// Predictive dialog
10071007
// TODO: Move this to a separate class

engines/agi/console.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ struct AgiDebug {
4949
class Console : public GUI::Debugger {
5050
public:
5151
Console(AgiEngine *vm);
52-
virtual ~Console(void);
52+
virtual ~Console();
5353

5454
protected:
5555
virtual void preEnter();
@@ -81,7 +81,7 @@ class Console : public GUI::Debugger {
8181
class PreAGI_Console : public GUI::Debugger {
8282
public:
8383
PreAGI_Console(PreAgiEngine *vm);
84-
virtual ~PreAGI_Console(void) {}
84+
virtual ~PreAGI_Console() {}
8585

8686
protected:
8787
virtual void preEnter() {}
@@ -95,7 +95,7 @@ class PreAGI_Console : public GUI::Debugger {
9595
class Mickey_Console : public PreAGI_Console {
9696
public:
9797
Mickey_Console(PreAgiEngine *vm, Mickey *mickey);
98-
virtual ~Mickey_Console(void) {}
98+
virtual ~Mickey_Console() {}
9999

100100
protected:
101101
virtual void preEnter() {}
@@ -113,7 +113,7 @@ class Mickey_Console : public PreAGI_Console {
113113
class Winnie_Console : public PreAGI_Console {
114114
public:
115115
Winnie_Console(PreAgiEngine *vm, Winnie *winnie);
116-
virtual ~Winnie_Console(void) {}
116+
virtual ~Winnie_Console() {}
117117

118118
protected:
119119
virtual void preEnter() {}

engines/agi/detection.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ const char *AgiBase::getGameMD5() const {
7474
return _gameDescription->desc.filesDescriptions[0].md5;
7575
}
7676

77-
void AgiBase::initFeatures(void) {
77+
void AgiBase::initFeatures() {
7878
_gameFeatures = _gameDescription->features;
7979
}
8080

@@ -86,7 +86,7 @@ void AgiBase::setVersion(uint16 version) {
8686
_gameVersion = version;
8787
}
8888

89-
void AgiBase::initVersion(void) {
89+
void AgiBase::initVersion() {
9090
_gameVersion = _gameDescription->version;
9191
}
9292

engines/agi/keyboard.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -421,12 +421,12 @@ int AgiEngine::waitAnyKey() {
421421
return key;
422422
}
423423

424-
bool AgiEngine::isKeypress(void) {
424+
bool AgiEngine::isKeypress() {
425425
processEvents();
426426
return _keyQueueStart != _keyQueueEnd;
427427
}
428428

429-
int AgiEngine::getKeypress(void) {
429+
int AgiEngine::getKeypress() {
430430
int k;
431431

432432
while (_keyQueueStart == _keyQueueEnd) // block
@@ -437,7 +437,7 @@ int AgiEngine::getKeypress(void) {
437437
return k;
438438
}
439439

440-
void AgiEngine::clearKeyQueue(void) {
440+
void AgiEngine::clearKeyQueue() {
441441
while (isKeypress()) {
442442
getKeypress();
443443
}

0 commit comments

Comments
 (0)