Skip to content

Commit 78d94fb

Browse files
authored
refactor: Remove redundant void argument from functions (TheSuperHackers#2345)
1 parent 75d5937 commit 78d94fb

2,066 files changed

Lines changed: 17710 additions & 17710 deletions

File tree

Some content is hidden

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

Core/GameEngine/Include/Common/ArchiveFile.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ class ArchiveFile
5252

5353
virtual Bool getFileInfo( const AsciiString& filename, FileInfo *fileInfo) const = 0; ///< fill in the fileInfo struct with info about the file requested.
5454
virtual File* openFile( const Char *filename, Int access = 0) = 0; ///< Open the specified file within the archive file
55-
virtual void closeAllFiles( void ) = 0; ///< Close all file opened in this archive file
56-
virtual AsciiString getName( void ) = 0; ///< Returns the name of the archive file
57-
virtual AsciiString getPath( void ) = 0; ///< Returns full path and name of archive file
55+
virtual void closeAllFiles() = 0; ///< Close all file opened in this archive file
56+
virtual AsciiString getName() = 0; ///< Returns the name of the archive file
57+
virtual AsciiString getPath() = 0; ///< Returns full path and name of archive file
5858
virtual void setSearchPriority( Int new_priority ) = 0; ///< Set this archive file's search priority
59-
virtual void close( void ) = 0; ///< Close this archive file
59+
virtual void close() = 0; ///< Close this archive file
6060
void attachFile(File *file);
6161

6262
void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const;

Core/GameEngine/Include/Common/ArchiveFileSystem.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,19 +126,19 @@ class ArchiveFileSystem : public SubsystemInterface
126126
ArchiveFileSystem();
127127
virtual ~ArchiveFileSystem();
128128

129-
virtual void init( void ) = 0;
130-
virtual void update( void ) = 0;
131-
virtual void reset( void ) = 0;
132-
virtual void postProcessLoad( void ) = 0;
129+
virtual void init() = 0;
130+
virtual void update() = 0;
131+
virtual void reset() = 0;
132+
virtual void postProcessLoad() = 0;
133133

134134
// ArchiveFile operations
135135
virtual ArchiveFile* openArchiveFile( const Char *filename ) = 0; ///< Create new or return existing Archive file from file name
136136
virtual void closeArchiveFile( const Char *filename ) = 0; ///< Close the one specified big file.
137-
virtual void closeAllArchiveFiles( void ) = 0; ///< Close all Archive files currently open
137+
virtual void closeAllArchiveFiles() = 0; ///< Close all Archive files currently open
138138

139139
// File operations
140140
virtual File* openFile( const Char *filename, Int access = 0, FileInstance instance = 0); ///< Search Archive files for specified file name and open it if found
141-
virtual void closeAllFiles( void ) = 0; ///< Close all files associated with Archive files
141+
virtual void closeAllFiles() = 0; ///< Close all files associated with Archive files
142142
virtual Bool doesFileExist(const Char *filename, FileInstance instance = 0) const; ///< return true if that file exists in an archive file somewhere.
143143

144144
void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep). Possibly search subdirectories. Scans each Archive file.
@@ -149,7 +149,7 @@ class ArchiveFileSystem : public SubsystemInterface
149149
// Unprotected this for copy-protection routines
150150
ArchiveFile* getArchiveFile(const AsciiString& filename, FileInstance instance = 0) const;
151151

152-
void loadMods( void );
152+
void loadMods();
153153

154154
ArchivedDirectoryInfo* friend_getArchivedDirectoryInfo(const Char* directory);
155155

Core/GameEngine/Include/Common/AsciiString.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,12 +244,12 @@ class AsciiString
244244
/**
245245
Remove leading and trailing whitespace from the string.
246246
*/
247-
void trim( void );
247+
void trim();
248248

249249
/**
250250
Remove trailing whitespace from the string.
251251
*/
252-
void trimEnd(void);
252+
void trimEnd();
253253

254254
/**
255255
Remove all consecutive occurrences of c from the end of the string.
@@ -259,7 +259,7 @@ class AsciiString
259259
/**
260260
Make the string lowercase
261261
*/
262-
void toLower( void );
262+
void toLower();
263263

264264
/**
265265
Remove the final character in the string. If the string is empty,

Core/GameEngine/Include/Common/AudioEventInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,5 +131,5 @@ struct AudioEventInfo : public MemoryPoolObject
131131
Bool isPermanentSound() const { return BitIsSet( m_control, AC_LOOP ) && (m_loopCount == 0 ); }
132132

133133
static const FieldParse m_audioEventInfo[]; ///< the parse table for INI definition
134-
const FieldParse *getFieldParse( void ) const { return m_audioEventInfo; }
134+
const FieldParse *getFieldParse() const { return m_audioEventInfo; }
135135
};

Core/GameEngine/Include/Common/AudioEventRTS.h

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -61,95 +61,95 @@ enum AudioPriority CPP_11(: Int);
6161
class AudioEventRTS
6262
{
6363
public:
64-
AudioEventRTS( );
64+
AudioEventRTS();
6565
AudioEventRTS( const AsciiString& eventName );
6666
AudioEventRTS( const AsciiString& eventName, ObjectID ownerID );
6767
AudioEventRTS( const AsciiString& eventName, DrawableID drawableID ); // Pass 0 for unused if attaching to drawable
6868
AudioEventRTS( const AsciiString& eventName, const Coord3D *positionOfAudio );
6969

70-
virtual ~AudioEventRTS( );
70+
virtual ~AudioEventRTS();
7171

7272
AudioEventRTS( const AudioEventRTS& right );
7373
AudioEventRTS& operator=( const AudioEventRTS& right );
7474

7575
void setEventName( AsciiString name );
76-
const AsciiString& getEventName( void ) const { return m_eventName; }
76+
const AsciiString& getEventName() const { return m_eventName; }
7777

7878
// generateFilename is separate from generatePlayInfo because generatePlayInfo should only be called once
7979
// per triggered event. generateFilename will be called once per loop, or once to get each filename if 'all' is
8080
// specified.
81-
void generateFilename( void );
82-
AsciiString getFilename( void );
81+
void generateFilename();
82+
AsciiString getFilename();
8383

8484
// The attack and decay sounds are generated in generatePlayInfo, because they will never be played more
8585
// than once during a given sound event.
86-
void generatePlayInfo( void );
87-
Real getPitchShift( void ) const;
88-
Real getVolumeShift( void ) const;
89-
AsciiString getAttackFilename( void ) const;
90-
AsciiString getDecayFilename( void ) const;
91-
Real getDelay( void ) const;
86+
void generatePlayInfo();
87+
Real getPitchShift() const;
88+
Real getVolumeShift() const;
89+
AsciiString getAttackFilename() const;
90+
AsciiString getDecayFilename() const;
91+
Real getDelay() const;
9292

9393
void decrementDelay( Real timeToDecrement );
9494

95-
PortionToPlay getNextPlayPortion( void ) const;
96-
void advanceNextPlayPortion( void );
95+
PortionToPlay getNextPlayPortion() const;
96+
void advanceNextPlayPortion();
9797
void setNextPlayPortion( PortionToPlay ptp );
9898

99-
void decreaseLoopCount( void );
100-
Bool hasMoreLoops( void ) const;
99+
void decreaseLoopCount();
100+
Bool hasMoreLoops() const;
101101

102102
void setAudioEventInfo( const AudioEventInfo *eventInfo ) const; // is mutable
103-
const AudioEventInfo *getAudioEventInfo( void ) const;
103+
const AudioEventInfo *getAudioEventInfo() const;
104104

105105
void setPlayingHandle( AudioHandle handle ); // for ID of this audio piece.
106-
AudioHandle getPlayingHandle( void ); // for ID of this audio piece
106+
AudioHandle getPlayingHandle(); // for ID of this audio piece
107107

108108
void setPosition( const Coord3D *pos );
109-
const Coord3D* getPosition( void );
109+
const Coord3D* getPosition();
110110

111111
void setObjectID( ObjectID objID );
112-
ObjectID getObjectID( void );
112+
ObjectID getObjectID();
113113

114114
Bool isDead() const { return m_ownerType == OT_Dead; }
115115
OwnerType getOwnerType() const { return m_ownerType; }
116116

117117
void setDrawableID( DrawableID drawID );
118-
DrawableID getDrawableID( void );
118+
DrawableID getDrawableID();
119119

120120
void setTimeOfDay( TimeOfDay tod );
121-
TimeOfDay getTimeOfDay( void ) const;
121+
TimeOfDay getTimeOfDay() const;
122122

123123
void setHandleToKill( AudioHandle handleToKill );
124-
AudioHandle getHandleToKill( void ) const;
124+
AudioHandle getHandleToKill() const;
125125

126126
void setShouldFade( Bool shouldFade );
127-
Bool getShouldFade( void ) const;
127+
Bool getShouldFade() const;
128128

129129
void setIsLogicalAudio( Bool isLogicalAudio );
130-
Bool getIsLogicalAudio( void ) const;
130+
Bool getIsLogicalAudio() const;
131131

132-
Bool isPositionalAudio( void ) const;
133-
Bool isCurrentlyPlaying( void ) const;
132+
Bool isPositionalAudio() const;
133+
Bool isCurrentlyPlaying() const;
134134

135-
AudioPriority getAudioPriority( void ) const;
135+
AudioPriority getAudioPriority() const;
136136
void setAudioPriority( AudioPriority newPriority );
137137

138-
Real getVolume( void ) const;
138+
Real getVolume() const;
139139
void setVolume( Real vol );
140140

141-
Int getPlayerIndex( void ) const;
141+
Int getPlayerIndex() const;
142142
void setPlayerIndex( Int playerNdx );
143143

144-
Int getPlayingAudioIndex( void ) const { return m_playingAudioIndex; }
144+
Int getPlayingAudioIndex() const { return m_playingAudioIndex; }
145145
void setPlayingAudioIndex( Int pai ) const { m_playingAudioIndex = pai; } // is mutable
146146

147-
Bool getUninterruptible( ) const { return m_uninterruptible; }
147+
Bool getUninterruptible() const { return m_uninterruptible; }
148148
void setUninterruptible( Bool uninterruptible ) { m_uninterruptible = uninterruptible; }
149149

150150

151151
// This will retrieve the appropriate position based on type.
152-
const Coord3D *getCurrentPosition( void );
152+
const Coord3D *getCurrentPosition();
153153

154154
// This will return the directory leading up to the appropriate type, including the trailing '\\'
155155
// If localized is true, we'll append a language specific directory to the end of the path.

Core/GameEngine/Include/Common/CRCDebug.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
void dumpMatrix3D(const Matrix3D *m, AsciiString name, AsciiString fname, Int line);
6565
void dumpReal(Real r, AsciiString name, AsciiString fname, Int line);
6666

67-
void outputCRCDebugLines( void );
68-
void CRCDebugStartNewGame( void );
69-
void outputCRCDumpLines( void );
67+
void outputCRCDebugLines();
68+
void CRCDebugStartNewGame();
69+
void outputCRCDumpLines();
7070

7171
void addCRCDebugLine(const char *fmt, ...);
7272
void addCRCDebugLineNoCounter(const char *fmt, ...);

0 commit comments

Comments
 (0)