libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-11-23 17:29:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMMON: Mark more symbols as const

Browse Source
This commit is contained in:
Cameron Cawley 2023-12-23 15:24:27 +00:00 committed by Eugene Sandulenko
parent 5a63845005
commit 5b1b14ad80
47 changed files with 137 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/adlib.cpp
View File

@ -463,7 +463,7 @@ static const AdLibInstrument g_gmInstruments[128] = {
{ 0x00, 0x3F, 0x4C, 0xFB, 0x00, 0x00, 0x3F, 0x0A, 0xE9, 0x7C, 0x0E, 0, { 0, 0, 0, 0, 0, 0, 0, 0 }, 0, { 0, 0, 0, 0, 0, 0, 0, 0 }, 0x05 }
};
static AdLibInstrument g_gmPercussionInstruments[39] = {
static const AdLibInstrument g_gmPercussionInstruments[39] = {
{ 0x1A, 0x3F, 0x15, 0x05, 0x7C, 0x02, 0x21, 0x2B, 0xE4, 0x7C, 0x0E, 0, { 0, 0, 0, 0, 0, 0, 0, 0 }, 0, { 0, 0, 0, 0, 0, 0, 0, 0 }, 0x06 },
{ 0x11, 0x12, 0x04, 0x07, 0x7C, 0x02, 0x23, 0x0B, 0xE5, 0x7C, 0x0E, 0, { 0, 0, 0, 0, 0, 0, 0, 0 }, 0, { 0, 0, 0, 0, 0, 0, 0, 0 }, 0x05 },
{ 0x0A, 0x3F, 0x0B, 0x01, 0x7C, 0x1F, 0x1C, 0x46, 0xD0, 0x7C, 0x0E, 0, { 0, 0, 0, 0, 0, 0, 0, 0 }, 0, { 0, 0, 0, 0, 0, 0, 0, 0 }, 0x01 },

8
audio/adlib_ms.cpp
View File

@ -325,10 +325,10 @@ OplInstrumentDefinition MidiDriver_ADLIB_Multisource::OPL_RHYTHM_BANK[62] = {
// Rhythm mode uses OPL channels 6, 7 and 8. The remaining channels are
// available for melodic instruments.
uint8 MidiDriver_ADLIB_Multisource::MELODIC_CHANNELS_OPL2[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8 };
uint8 MidiDriver_ADLIB_Multisource::MELODIC_CHANNELS_OPL2_RHYTHM[] = { 0, 1, 2, 3, 4, 5 };
uint8 MidiDriver_ADLIB_Multisource::MELODIC_CHANNELS_OPL3[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
uint8 MidiDriver_ADLIB_Multisource::MELODIC_CHANNELS_OPL3_RHYTHM[] = { 0, 1, 2, 3, 4, 5, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
const uint8 MidiDriver_ADLIB_Multisource::MELODIC_CHANNELS_OPL2[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8 };
const uint8 MidiDriver_ADLIB_Multisource::MELODIC_CHANNELS_OPL2_RHYTHM[] = { 0, 1, 2, 3, 4, 5 };
const uint8 MidiDriver_ADLIB_Multisource::MELODIC_CHANNELS_OPL3[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
const uint8 MidiDriver_ADLIB_Multisource::MELODIC_CHANNELS_OPL3_RHYTHM[] = { 0, 1, 2, 3, 4, 5, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
const uint8 MidiDriver_ADLIB_Multisource::OPL_REGISTER_RHYTHM_OFFSETS[OPL_NUM_RHYTHM_INSTRUMENTS] = { 0x11, 0x15, 0x12, 0x14, 0x10 };

10
audio/adlib_ms.h
View File

@ -344,22 +344,22 @@ public:
* The melodic channel numbers available on an OPL2 chip with rhythm mode
* disabled.
*/
static uint8 MELODIC_CHANNELS_OPL2[9];
static const uint8 MELODIC_CHANNELS_OPL2[9];
/**
* The melodic channel numbers available on an OPL2 chip with rhythm mode
* enabled.
*/
static uint8 MELODIC_CHANNELS_OPL2_RHYTHM[6];
static const uint8 MELODIC_CHANNELS_OPL2_RHYTHM[6];
/**
* The melodic channel numbers available on an OPL3 chip with rhythm mode
* disabled.
*/
static uint8 MELODIC_CHANNELS_OPL3[18];
static const uint8 MELODIC_CHANNELS_OPL3[18];
/**
* The melodic channel numbers available on an OPL3 chip with rhythm mode
* enabled.
*/
static uint8 MELODIC_CHANNELS_OPL3_RHYTHM[15];
static const uint8 MELODIC_CHANNELS_OPL3_RHYTHM[15];
/**
* The number of rhythm instruments available in OPL rhythm mode.
*/
@ -1182,7 +1182,7 @@ protected:
// the static channel allocation mode.
uint8 _channelAllocations[MAXIMUM_SOURCES][MIDI_CHANNEL_COUNT];
// Array containing the numbers of the available melodic channels.
uint8 *_melodicChannels;
const uint8 *_melodicChannels;
// The number of available melodic channels (length of _melodicChannels).
uint8 _numMelodicChannels;
// The amount of notes played since the driver was opened / reset.

2
audio/decoders/3do.cpp
View File

@ -165,7 +165,7 @@ int Audio3DO_ADP4_Stream::readBuffer(int16 *buffer, const int numSamples) {
}
// ============================================================================
static int16 audio_3DO_SDX2_SquareTable[256] = {
static const int16 audio_3DO_SDX2_SquareTable[256] = {
-32768,-32258,-31752,-31250,-30752,-30258,-29768,-29282,-28800,-28322,
-27848,-27378,-26912,-26450,-25992,-25538,-25088,-24642,-24200,-23762,
-23328,-22898,-22472,-22050,-21632,-21218,-20808,-20402,-20000,-19602,

2
audio/decoders/vorbis.cpp
View File

@ -76,7 +76,7 @@ static long tell_stream_wrap(void *datasource) {
return stream->pos();
}
static ov_callbacks g_stream_wrap = {
static const ov_callbacks g_stream_wrap = {
read_stream_wrap, seek_stream_wrap, close_stream_wrap, tell_stream_wrap
};

12
audio/miles_adlib.cpp
View File

@ -58,17 +58,17 @@ enum kMilesAdLibUpdateFlags {
kMilesAdLibUpdateFlags_Reg_All = 0x3F
};
uint16 milesAdLibOperator1Register[MILES_ADLIB_PHYSICAL_FMVOICES_COUNT_MAX] = {
const uint16 milesAdLibOperator1Register[MILES_ADLIB_PHYSICAL_FMVOICES_COUNT_MAX] = {
0x0000, 0x0001, 0x0002, 0x0008, 0x0009, 0x000A, 0x0010, 0x0011, 0x0012,
0x0100, 0x0101, 0x0102, 0x0108, 0x0109, 0x010A, 0x0110, 0x0111, 0x0112
};
uint16 milesAdLibOperator2Register[MILES_ADLIB_PHYSICAL_FMVOICES_COUNT_MAX] = {
const uint16 milesAdLibOperator2Register[MILES_ADLIB_PHYSICAL_FMVOICES_COUNT_MAX] = {
0x0003, 0x0004, 0x0005, 0x000B, 0x000C, 0x000D, 0x0013, 0x0014, 0x0015,
0x0103, 0x0104, 0x0105, 0x010B, 0x010C, 0x010D, 0x0113, 0x0114, 0x0115
};
uint16 milesAdLibChannelRegister[MILES_ADLIB_PHYSICAL_FMVOICES_COUNT_MAX] = {
const uint16 milesAdLibChannelRegister[MILES_ADLIB_PHYSICAL_FMVOICES_COUNT_MAX] = {
0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008,
0x0100, 0x0101, 0x0102, 0x0103, 0x0104, 0x0105, 0x0106, 0x0107, 0x0108
};
@ -91,7 +91,7 @@ struct InstrumentEntry {
};
// hardcoded, dumped from ADLIB.MDI
uint16 milesAdLibFrequencyLookUpTable[] = {
const uint16 milesAdLibFrequencyLookUpTable[] = {
0x02B2, 0x02B4, 0x02B7, 0x02B9, 0x02BC, 0x02BE, 0x02C1, 0x02C3, 0x02C6, 0x02C9, 0x02CB, 0x02CE,
0x02D0, 0x02D3, 0x02D6, 0x02D8, 0x02DB, 0x02DD, 0x02E0, 0x02E3, 0x02E5, 0x02E8, 0x02EB, 0x02ED,
0x02F0, 0x02F3, 0x02F6, 0x02F8, 0x02FB, 0x02FE, 0x0301, 0x0303, 0x0306, 0x0309, 0x030C, 0x030F,
@ -111,13 +111,13 @@ uint16 milesAdLibFrequencyLookUpTable[] = {
};
// hardcoded, dumped from ADLIB.MDI
uint16 milesAdLibVolumeSensitivityTable[] = {
const uint16 milesAdLibVolumeSensitivityTable[] = {
82, 85, 88, 91, 94, 97, 100, 103, 106, 109, 112, 115, 118, 121, 124, 127
};
// MIDI panning to register volume table for dual OPL2
// hardcoded, dumped from ADLIB.MDI
uint8 milesAdLibPanningVolumeLookUpTable[] = {
const uint8 milesAdLibPanningVolumeLookUpTable[] = {
0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30,
32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62,
64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94,

2
audio/softsynth/fmtowns_pc98/towns_audio.cpp
View File

@ -1364,7 +1364,7 @@ void TownsAudioInterfaceInternal::pcmReset() {
_pcmChan[i]->clear();
memset(_pcmInstruments, 0, 128 * 32);
static uint8 name[] = { 0x4E, 0x6F, 0x20, 0x44, 0x61, 0x74, 0x61, 0x21 };
static const uint8 name[] = { 0x4E, 0x6F, 0x20, 0x44, 0x61, 0x74, 0x61, 0x21 };
for (int i = 0; i < 32; i++)
memcpy(_pcmInstruments + i * 128, name, 8);

2
backends/cloud/cloudicon.cpp
View File

@ -140,7 +140,7 @@ void CloudIcon::initIcons() {
loadIcon(_disabledIcon, cloudicon_disabled_data, ARRAYSIZE(cloudicon_disabled_data));
}
void CloudIcon::loadIcon(Graphics::Surface &icon, byte *data, uint32 size) {
void CloudIcon::loadIcon(Graphics::Surface &icon, const byte *data, uint32 size) {
Image::PNGDecoder decoder;
Common::MemoryReadStream stream(data, size);
if (!decoder.loadStream(stream)) {

2
backends/cloud/cloudicon.h
View File

@ -78,7 +78,7 @@ private:
uint32 _lastUpdateTime;
void initIcons();
void loadIcon(Graphics::Surface &icon, byte *data, uint32 size);
void loadIcon(Graphics::Surface &icon, const byte *data, uint32 size);
void makeAlphaIcon(const Graphics::Surface &icon, float alpha);
void hide();

2
backends/cloud/cloudicon_data.h
View File

@ -23,7 +23,7 @@
// $ recode data..d1 <dists/cloudicon.png >cloudicon_data.h
// The tool is from https://github.com/pinard/Recode
byte cloudicon_data[] = {
static const byte cloudicon_data[] = {
137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68,
82, 0, 0, 0, 32, 0, 0, 0, 32, 8, 6, 0, 0, 0, 115,
122, 122, 244, 0, 0, 0, 4, 115, 66, 73, 84, 8, 8, 8, 8,

2
backends/cloud/cloudicon_disabled_data.h
View File

@ -23,7 +23,7 @@
// $ recode data..d1 <dists/cloudicon_disabled.png >cloudicon_disabled_data.h
// The tool is from https://github.com/pinard/Recode
byte cloudicon_disabled_data[] = {
static const byte cloudicon_disabled_data[] = {
137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68,
82, 0, 0, 0, 32, 0, 0, 0, 32, 8, 6, 0, 0, 0, 115,
122, 122, 244, 0, 0, 0, 4, 115, 66, 73, 84, 8, 8, 8, 8,

4
backends/graphics/opengl/pipelines/libretro.cpp
View File

@ -105,7 +105,7 @@ static const char *const g_libretroShaderAttributes[] = {
};
// some libretro shaders use texture without checking version
static const char *g_compatVertex =
static const char *const g_compatVertex =
"#if defined(GL_ES)\n"
"#if !defined(HAS_ROUND)\n"
"#define round(x) (sign(x) * floor(abs(x) + .5))\n"
@ -116,7 +116,7 @@ static const char *g_compatVertex =
"#endif\n"
"#endif\n";
static const char *g_compatFragment =
static const char *const g_compatFragment =
"#if defined(GL_ES)\n"
"#if !defined(HAS_ROUND)\n"
"#define round(x) (sign(x) * floor(abs(x) + .5))\n"

2
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
View File

@ -62,7 +62,7 @@
#define SDL_FULLSCREEN 0x40000000
#endif
static OSystem::GraphicsMode s_supportedGraphicsModes[] = {
static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
{"surfacesdl", _s("SDL Surface"), GFX_SURFACESDL},
{nullptr, nullptr, 0}
};

4
backends/graphics3d/opengl/surfacerenderer.cpp
View File

@ -173,7 +173,7 @@ void FixedSurfaceRenderer::restorePreviousState() {
#if defined(USE_OPENGL_SHADERS)
static const char *boxVertex =
static const char *const boxVertex =
"attribute vec2 position;\n"
"attribute vec2 texcoord;\n"
"uniform vec2 offsetXY;\n"
@ -200,7 +200,7 @@ static const char *boxVertex =
"gl_Position = vec4(pos, 0.0, 1.0);\n"
"}\n";
static const char *boxFragment =
static const char *const boxFragment =
"#ifdef GL_ES\n"
"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
"precision highp float;\n"

36
backends/keymapper/standard-actions.cpp
View File

@ -23,23 +23,23 @@
namespace Common {
const char *kStandardActionLeftClick = "LCLK";
const char *kStandardActionMiddleClick = "MCLK";
const char *kStandardActionRightClick = "RCLK";
const char *kStandardActionInteract = "INTRCT";
const char *kStandardActionSkip = "SKIP";
const char *kStandardActionPause = "PAUSE";
const char *kStandardActionMoveUp = "UP";
const char *kStandardActionMoveDown = "DOWN";
const char *kStandardActionMoveLeft = "LEFT";
const char *kStandardActionMoveRight = "RIGHT";
const char *kStandardActionOpenMainMenu = "MENU";
const char *kStandardActionLoad = "LOAD";
const char *kStandardActionSave = "SAVE";
const char *kStandardActionOpenSettings = "OPTS";
const char *kStandardActionEE = "WTF";
const char *kStandardActionCut = "CUT";
const char *kStandardActionCopy = "COPY";
const char *kStandardActionPaste = "PASTE";
const char *const kStandardActionLeftClick = "LCLK";
const char *const kStandardActionMiddleClick = "MCLK";
const char *const kStandardActionRightClick = "RCLK";
const char *const kStandardActionInteract = "INTRCT";
const char *const kStandardActionSkip = "SKIP";
const char *const kStandardActionPause = "PAUSE";
const char *const kStandardActionMoveUp = "UP";
const char *const kStandardActionMoveDown = "DOWN";
const char *const kStandardActionMoveLeft = "LEFT";
const char *const kStandardActionMoveRight = "RIGHT";
const char *const kStandardActionOpenMainMenu = "MENU";
const char *const kStandardActionLoad = "LOAD";
const char *const kStandardActionSave = "SAVE";
const char *const kStandardActionOpenSettings = "OPTS";
const char *const kStandardActionEE = "WTF";
const char *const kStandardActionCut = "CUT";
const char *const kStandardActionCopy = "COPY";
const char *const kStandardActionPaste = "PASTE";
} //namespace Common

36
backends/keymapper/standard-actions.h
View File

@ -37,24 +37,24 @@
namespace Common {
extern const char *kStandardActionLeftClick;
extern const char *kStandardActionMiddleClick;
extern const char *kStandardActionRightClick;
extern const char *kStandardActionInteract;
extern const char *kStandardActionSkip;
extern const char *kStandardActionPause;
extern const char *kStandardActionMoveUp;
extern const char *kStandardActionMoveDown;
extern const char *kStandardActionMoveLeft;
extern const char *kStandardActionMoveRight;
extern const char *kStandardActionOpenMainMenu;
extern const char *kStandardActionLoad;
extern const char *kStandardActionSave;
extern const char *kStandardActionOpenSettings;
extern const char *kStandardActionEE;
extern const char *kStandardActionCut;
extern const char *kStandardActionCopy;
extern const char *kStandardActionPaste;
extern const char *const kStandardActionLeftClick;
extern const char *const kStandardActionMiddleClick;
extern const char *const kStandardActionRightClick;
extern const char *const kStandardActionInteract;
extern const char *const kStandardActionSkip;
extern const char *const kStandardActionPause;
extern const char *const kStandardActionMoveUp;
extern const char *const kStandardActionMoveDown;
extern const char *const kStandardActionMoveLeft;
extern const char *const kStandardActionMoveRight;
extern const char *const kStandardActionOpenMainMenu;
extern const char *const kStandardActionLoad;
extern const char *const kStandardActionSave;
extern const char *const kStandardActionOpenSettings;
extern const char *const kStandardActionEE;
extern const char *const kStandardActionCut;
extern const char *const kStandardActionCopy;
extern const char *const kStandardActionPaste;
} //namespace Common

2
backends/networking/enet/source/protocol.cpp
View File

@ -9,7 +9,7 @@
#include "time.h"
#include "enet.h"
static size_t commandSizes [ENET_PROTOCOL_COMMAND_COUNT] =
static const size_t commandSizes [ENET_PROTOCOL_COMMAND_COUNT] =
{
0,
sizeof (ENetProtocolAcknowledge),

2
backends/platform/sdl/kolibrios/kolibrios.cpp
View File

@ -100,7 +100,7 @@ Common::Path OSystem_KolibriOS::getScreenshotsPath() {
return path;
}
static const char *SCREENSHOTS_DIR_NAME = "ScummVM Screenshots";
static const char *const SCREENSHOTS_DIR_NAME = "ScummVM Screenshots";
if (!KolibriOS::assureDirectoryExists(SCREENSHOTS_DIR_NAME, _writablePath.toString(Common::Path::kNativeSeparator).c_str())) {
return "";
}

2
backends/platform/sdl/posix/posix.cpp
View File

@ -304,7 +304,7 @@ Common::Path OSystem_POSIX::getScreenshotsPath() {
picturesPath += "/";
}
static const char *SCREENSHOTS_DIR_NAME = "ScummVM Screenshots";
static const char *const SCREENSHOTS_DIR_NAME = "ScummVM Screenshots";
if (!Posix::assureDirectoryExists(SCREENSHOTS_DIR_NAME, picturesPath.c_str())) {
return "";
}

2
backends/saves/default/default-saves.cpp
View File

@ -41,7 +41,7 @@
#include <errno.h> // for removeSavefile()
#if defined(USE_CLOUD) && defined(USE_LIBCURL)
const char *DefaultSaveFileManager::TIMESTAMPS_FILENAME = "timestamps";
const char *const DefaultSaveFileManager::TIMESTAMPS_FILENAME = "timestamps";
#endif
DefaultSaveFileManager::DefaultSaveFileManager() {

2
backends/saves/default/default-saves.h
View File

@ -47,7 +47,7 @@ public:
#ifdef USE_LIBCURL
static const uint32 INVALID_TIMESTAMP = UINT_MAX;
static const char *TIMESTAMPS_FILENAME;
static const char *const TIMESTAMPS_FILENAME;
static Common::HashMap<Common::String, uint32> loadTimestamps();
static void saveTimestamps(Common::HashMap<Common::String, uint32> &timestamps);

2
base/detection/detection.cpp
View File

@ -40,7 +40,7 @@ public:
PluginList pl;
#define LINK_PLUGIN(ID) \
extern PluginType g_##ID##_type; \
extern const PluginType g_##ID##_type; \
extern PluginObject *g_##ID##_getObject(); \
pl.push_back(new StaticPlugin(g_##ID##_getObject(), g_##ID##_type));

4
base/plugins.cpp
View File

@ -36,7 +36,7 @@
// Plugin versioning
int pluginTypeVersions[PLUGIN_TYPE_MAX] = {
const int pluginTypeVersions[PLUGIN_TYPE_MAX] = {
PLUGIN_TYPE_ENGINE_DETECTION_VERSION,
PLUGIN_TYPE_ENGINE_VERSION,
PLUGIN_TYPE_MUSIC_VERSION,
@ -81,7 +81,7 @@ public:
PluginList pl;
#define LINK_PLUGIN(ID) \
extern PluginType g_##ID##_type; \
extern const PluginType g_##ID##_type; \
extern PluginObject *g_##ID##_getObject(); \
pl.push_back(new StaticPlugin(g_##ID##_getObject(), g_##ID##_type));

5
base/plugins.h
View File

@ -55,7 +55,7 @@ enum PluginType {
#define PLUGIN_TYPE_DETECTION_VERSION 1
#define PLUGIN_TYPE_SCALER_VERSION 1
extern int pluginTypeVersions[PLUGIN_TYPE_MAX];
extern const int pluginTypeVersions[PLUGIN_TYPE_MAX];
// Plugin linking
@ -85,7 +85,8 @@ extern int pluginTypeVersions[PLUGIN_TYPE_MAX];
* @see REGISTER_PLUGIN_DYNAMIC
*/
#define REGISTER_PLUGIN_STATIC(ID,TYPE,PLUGINCLASS) \
PluginType g_##ID##_type = TYPE; \
extern const PluginType g_##ID##_type; \
const PluginType g_##ID##_type = TYPE; \
PluginObject *g_##ID##_getObject() { \
return new PLUGINCLASS(); \
} \

4
common/compression/gentee_installer.cpp
View File

@ -237,7 +237,7 @@ private:
Common::ReadStream *_inputStream;
static byte g_matchVLCLengths[kNumMatchVLCs];
static const byte g_matchVLCLengths[kNumMatchVLCs];
uint16 _matchVLCOffsets[kNumMatchVLCs];
private:
@ -424,7 +424,7 @@ void DecompressorState::recordMatchOffset(uint matchOffset) {
_matchOffsetHistory[0] = matchOffset;
}
byte DecompressorState::g_matchVLCLengths[DecompressorState::kNumMatchVLCs] = {
const byte DecompressorState::g_matchVLCLengths[DecompressorState::kNumMatchVLCs] = {
0, 1, 1, 2, 2,
2, 3, 3, 3, 3,
4, 4, 5, 5, 6,

26
common/compression/gzio.cpp
View File

@ -97,31 +97,31 @@ struct huft
/* Tables for deflate from PKZIP's appnote.txt. */
static unsigned bitorder_zlib[] =
static const unsigned bitorder_zlib[] =
{ /* Order of the bit length code lengths */
16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
};
static unsigned bitorder_clickteam[] =
static const unsigned bitorder_clickteam[] =
{ /* Order of the bit length code lengths */
18, 17, 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
};
static ush cplens[] =
static const ush cplens[] =
{ /* Copy lengths for literal codes 257..285 */
3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
/* note: see note #13 above about the 258 in this list. */
static ush cplext[] =
static const ush cplext[] =
{ /* Extra bits for literal codes 257..285 */
0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99}; /* 99==invalid */
static ush cpdist[] =
static const ush cpdist[] =
{ /* Copy offsets for distance codes 0..29 */
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
8193, 12289, 16385, 24577};
static ush cpdext[] =
static const ush cpdext[] =
{ /* Extra bits for distance codes */
0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
@ -161,8 +161,8 @@ static ush cpdext[] =
*/
static int lbits = 9; /* bits in base literal/length lookup table */
static int dbits = 6; /* bits in base distance lookup table */
static const int lbits = 9; /* bits in base literal/length lookup table */
static const int dbits = 6; /* bits in base distance lookup table */
/* If BMAX needs to be larger than 16, then h and x[] should be ulg. */
@ -200,7 +200,7 @@ static int dbits = 6; /* bits in base distance lookup table */
the stream.
*/
static ush mask_bits[] =
static const ush mask_bits[] =
{
0x0000,
0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
@ -337,7 +337,7 @@ GzioReadStream::parentSeek(int64 off)
}
/* more function prototypes */
static int huft_build (unsigned *, unsigned, unsigned, ush *, ush *,
static int huft_build (unsigned *, unsigned, unsigned, const ush *, const ush *,
struct huft **, int *);
static int huft_free (struct huft *);
@ -352,8 +352,8 @@ static int
huft_build (unsigned *b, /* code lengths in bits (all assumed <= BMAX) */
unsigned n, /* number of codes (assumed <= N_MAX) */
unsigned s, /* number of simple-valued codes (0..s-1) */
ush * d, /* list of base values for non-simple codes */
ush * e, /* list of extra bits for non-simple codes */
const ush * d, /* list of base values for non-simple codes */
const ush * e, /* list of extra bits for non-simple codes */
struct huft **t, /* result: starting table */
int *m) /* maximum lookup bits, returns actual */
{
@ -809,7 +809,7 @@ GzioReadStream::init_dynamic_block ()
unsigned ll[286 + 30]; /* literal/length and distance code lengths */
ulg b; /* bit buffer */
unsigned k; /* number of bits in bit buffer */
unsigned *bitorder = (_mode == GzioReadStream::Mode::CLICKTEAM) ? bitorder_clickteam : bitorder_zlib;
const unsigned *bitorder = (_mode == GzioReadStream::Mode::CLICKTEAM) ? bitorder_clickteam : bitorder_zlib;
/* make local bit buffer */
b = _bb;

10
common/formats/cue.cpp
View File

@ -127,7 +127,7 @@ struct CueSheet::LookupTable {
int value;
};
int CueSheet::lookupInTable(LookupTable *table, const char *key) {
int CueSheet::lookupInTable(const LookupTable *table, const char *key) {
while (table->key) {
if (!strcmp(key, table->key))
return table->value;
@ -147,7 +147,7 @@ int CueSheet::parseMSF(const char *str) {
return frm + 75 * (sec + 60 * min);
}
CueSheet::LookupTable fileTypes[] = {
static const CueSheet::LookupTable fileTypes[] = {
{ "BINARY", CueSheet::kFileTypeBinary },
{ "AIFF", CueSheet::kFileTypeAIFF },
{ "WAVE", CueSheet::kFileTypeWave },
@ -208,7 +208,7 @@ void CueSheet::parseHeaderContext(const char *line) {
}
}
CueSheet::LookupTable trackTypes[] = {
static const CueSheet::LookupTable trackTypes[] = {
{ "AUDIO", CueSheet::kTrackTypeAudio }, // Audio (sector size: 2352)
{ "CDG", CueSheet::kTrackTypeCDG }, // Karaoke CD+G (sector size: 2448)
{ "MODE1_RAW", CueSheet::kTrackTypeMode1_Raw }, // CD-ROM Mode 1 data (raw) (sector size: 2352), used by cdrdao
@ -224,7 +224,7 @@ CueSheet::LookupTable trackTypes[] = {
{ 0, 0 }
};
CueSheet::LookupTable trackTypesSectorSizes[] = {
static const CueSheet::LookupTable trackTypesSectorSizes[] = {
{ "AUDIO", 2352 },
{ "CDG", 2448 },
{ "MODE1_RAW", 2352 },
@ -275,7 +275,7 @@ void CueSheet::parseFilesContext(const char *line) {
}
CueSheet::LookupTable trackFlags[] = {
static const CueSheet::LookupTable trackFlags[] = {
{ "4CH", CueSheet::kTrackFlag4ch },
{ "DCP", CueSheet::kTrackFlagDCP },
{ "PRE", CueSheet::kTrackFlagPre },

2
common/formats/cue.h
View File

@ -102,7 +102,7 @@ public:
private:
void parse(const char *sheet);
int lookupInTable(LookupTable *table, const char *key);
int lookupInTable(const LookupTable *table, const char *key);
int parseMSF(const char *str);
void parseHeaderContext(const char *line);

6
common/formats/markdown.cpp
View File

@ -138,7 +138,7 @@ enum markdown_char_t {
MD_CHAR_SUPERSCRIPT,
};
static char_trigger markdown_char_ptrs[] = {
static const char_trigger markdown_char_ptrs[] = {
NULL,
&char_emphasis,
&char_codespan,
@ -687,7 +687,7 @@ static size_t char_codespan(SDDataBuffer *ob, SDMarkdown *rndr, byte *data, size
/* char_escape • '\\' backslash escape */
static size_t char_escape(SDDataBuffer *ob, SDMarkdown *rndr, byte *data, size_t offset, size_t size) {
static const char *escape_chars = "\\`*_{}[]()#+-.!:|&<>^~";
static const char *const escape_chars = "\\`*_{}[]()#+-.!:|&<>^~";
SDDataBuffer work = { 0, 0, 0, 0 };
if (size > 1) {
@ -2510,7 +2510,7 @@ void SDMarkdown::version(int *ver_major, int *ver_minor, int *ver_revision) {
int sd_autolink_issafe(const byte *link, size_t link_len) {
static const size_t valid_uris_count = 5;
static const char *valid_uris[] = {
static const char *const valid_uris[] = {
"/", "http://", "https://", "ftp://", "mailto:"
};

2
common/formats/winexe_ne.cpp
View File

@ -157,7 +157,7 @@ bool NEResources::readNameTable(uint32 offset, uint32 size) {
return true;
}
static const char *s_resTypeNames[] = {
static const char *const s_resTypeNames[] = {
"", "cursor", "bitmap", "icon", "menu", "dialog", "string",
"font_dir", "font", "accelerator", "rc_data", "msg_table",
"group_cursor", "", "group_icon", "name_table", "version", "dlg_include",

2
common/lua/ldo.cpp
View File

@ -101,7 +101,7 @@ static void resetstack (lua_State *L, int status) {
// Added in ScummVM. Refer to http://www.lua.org/manual/5.1/manual.html
static const char* luaErrorDescription[] = {
static const char *const luaErrorDescription[] = {
"No error",
"Coroutine yield", // not an actual error, see lua_resume
"Runtime error",

2
devtools/credits.pl
View File

@ -223,7 +223,7 @@ sub begin_credits {
print "\n";
} elsif ($mode eq "CPP") {
print "// This file was generated by credits.pl. Do not edit by hand!\n";
print "static const char *credits[] = {\n";
print "static const char *const credits[] = {\n";
} elsif ($mode eq "YAML") {
print "# This file was generated by credits.pl. Do not edit by hand!\n";
} elsif ($mode eq "RST") {

2
engines/logo_data.h
View File

@ -23,7 +23,7 @@
// recode ../d1 <dists/scummvm_logo.bmp >logo_data.h
// The tool is from https://github.com/pinard/Recode
byte logo_data[] = {
static const byte logo_data[] = {
66, 77, 176, 45, 0, 0, 0, 0, 0, 0, 54, 4, 0, 0, 40,
0, 0, 0, 44, 1, 0, 0, 83, 0, 0, 0, 1, 0, 8, 0,
1, 0, 0, 0, 122, 41, 0, 0, 19, 11, 0, 0, 19, 11, 0,

16
graphics/macgui/macfontmanager.cpp
View File

@ -34,7 +34,7 @@ namespace Graphics {
// Source: Apple IIGS Technical Note #41, "Font Family Numbers"
// https://www.1000bit.it/support/manuali/apple/technotes/iigs/tn.iigs.041.html
static struct FontProto {
static const struct FontProto {
int id;
Common::Language lang;
Common::CodePage encoding;
@ -77,7 +77,7 @@ struct AliasProto {
const char *name;
};
static AliasProto defaultAliases[] = {
static const AliasProto defaultAliases[] = {
// English names for Japanese fonts
{ 16436, 16436, "OsakaMono" },
@ -95,13 +95,13 @@ static AliasProto defaultAliases[] = {
{ -1, -1, NULL }
};
static AliasProto latinModeAliases[] = {
static const AliasProto latinModeAliases[] = {
{ 0, 16383, "System" }, // Chicago
{ 1, 3, "Application" }, // Geneva
{ -1, -1, NULL }
};
static AliasProto japaneseModeAliases[] = {
static const AliasProto japaneseModeAliases[] = {
{ 0, 16384, "System" }, // Osaka
{ 1, 16384, "Application" }, // Osaka
{ -1, -1, NULL }
@ -146,7 +146,7 @@ Common::String cleanFontName(const Common::String fontname) {
MacFontManager::MacFontManager(uint32 mode, Common::Language language) : _mode(mode),
_language(language), _japaneseFontsLoaded(false) {
for (FontProto *font = defaultFonts; font->name; font++) {
for (const FontProto *font = defaultFonts; font->name; font++) {
if (!_fontInfo.contains(font->id)) {
FontInfo *info = new FontInfo;
info->lang = font->lang;
@ -158,7 +158,7 @@ MacFontManager::MacFontManager(uint32 mode, Common::Language language) : _mode(m
_fontIds[font->name] = font->id;
}
}
for (AliasProto *alias = defaultAliases; alias->name; alias++) {
for (const AliasProto *alias = defaultAliases; alias->name; alias++) {
if (!_fontInfo.contains(alias->id)) {
FontInfo *info = new FontInfo;
info->aliasForId = alias->aliasForId;
@ -194,12 +194,12 @@ MacFontManager::~MacFontManager() {
}
void MacFontManager::setLocalizedFonts() {
AliasProto *aliases = latinModeAliases;
const AliasProto *aliases = latinModeAliases;
if (_language == Common::JA_JPN) {
aliases = japaneseModeAliases;
loadJapaneseFonts();
}
for (AliasProto *alias = aliases; alias->name; alias++) {
for (const AliasProto *alias = aliases; alias->name; alias++) {
if (_fontInfo.contains(alias->id)) {
// Overwrite the font info that's already registered in case
// we're switching languages or something.

2
graphics/nanosvg/nanosvg.h
View File

@ -1252,7 +1252,7 @@ typedef struct NSVGNamedColor {
unsigned int color;
} NSVGNamedColor;
NSVGNamedColor nsvg__colors[] = {
static const NSVGNamedColor nsvg__colors[] = {
{ "red", NSVG_RGB(255, 0, 0) },
{ "green", NSVG_RGB( 0, 128, 0) },

8
graphics/opengl/shader.cpp
View File

@ -32,7 +32,7 @@
namespace OpenGL {
static const char *compatVertex =
static const char *const compatVertex =
"#if defined(GL_ES)\n"
"#define ROUND(x) (sign(x) * floor(abs(x) + .5))\n"
"#define in attribute\n"
@ -46,7 +46,7 @@ static const char *compatVertex =
"#define ROUND(x) round(x)\n"
"#endif\n";
static const char *compatFragment =
static const char *const compatFragment =
"#if defined(GL_ES)\n"
"#define in varying\n"
"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
@ -68,11 +68,11 @@ static const char *compatFragment =
// OGLES2 on AmigaOS doesn't support uniform booleans, let's introduce some shim
#if defined(AMIGAOS)
static const char *compatUniformBool =
static const char *const compatUniformBool =
"#define UBOOL mediump int\n"
"#define UBOOL_TEST(v) (v != 0)\n";
#else
static const char *compatUniformBool =
static const char *const compatUniformBool =
"#define UBOOL bool\n"
"#define UBOOL_TEST(v) v\n";
#endif

2
graphics/tinygl/clip.cpp
View File

@ -215,7 +215,7 @@ clip_func(clip_ymax, +, Y, X, Z)
clip_func(clip_zmin, -, Z, X, Y)
clip_func(clip_zmax, +, Z, X, Y)
float(*clip_proc[6])(Vector4 *, Vector4 *, Vector4 *) = {
float(*const clip_proc[6])(Vector4 *, Vector4 *, Vector4 *) = {
clip_xmin, clip_xmax,
clip_ymin, clip_ymax,
clip_zmin, clip_zmax

6
graphics/tinygl/list.cpp
View File

@ -37,17 +37,17 @@ static void glop ## aa (GLContext *c, GLParam *p) { \
}
#include "graphics/tinygl/opinfo.h"
static const char *op_table_str[] = {
static const char *const op_table_str[] = {
#define ADD_OP(a, b, c) "gl" #a " " #c,
#include "graphics/tinygl/opinfo.h"
};
static void (*op_table_func[])(GLContext *, GLParam *) = {
static void (*const op_table_func[])(GLContext *, GLParam *) = {
#define ADD_OP(a, b, c) glop ## a ,
#include "graphics/tinygl/opinfo.h"
};
static int op_table_size[] = {
static const int op_table_size[] = {
#define ADD_OP(a, b, c) b + 1 ,
#include "graphics/tinygl/opinfo.h"
};

6
gui/about.cpp
View File

@ -63,7 +63,7 @@ enum {
// TODO: Add different font sizes (for bigger headlines)
// TODO: Allow color change in the middle of a line...
static const char *copyright_text[] = {
static const char *const copyright_text[] = {
"",
"C0""Copyright (C) 2001-2023 The ScummVM Team",
"C0""https://www.scummvm.org",
@ -72,7 +72,7 @@ static const char *copyright_text[] = {
"",
};
static const char *gpl_text[] = {
static const char *const gpl_text[] = {
"",
"C0""This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.",
"C0""",
@ -1348,7 +1348,7 @@ static const int spcolors[10 * 3] = {
0, 0, 0, 12, 12, 12
};
const char *codes =
const char *const codes =
"Dvhgkm#Ztrsm|ffrs(#$%&'#$%&O}pes&}{1$M{tiq$%&'#$M{tiq${y5(Fsrv||hv%&'#$"
"Hutxxxjx'~v2%N|udr%&'#Gtsw}wiw&}{1$Hutxxxjx'#$%&'(#$%W|qw$%&'(#$%&'";

2
gui/credits.h
View File

@ -1,5 +1,5 @@
// This file was generated by credits.pl. Do not edit by hand!
static const char *credits[] = {
static const char *const credits[] = {
"C1""ScummVM Team",
"",
"C1""Project Leaders",

6
gui/options.cpp
View File

@ -146,10 +146,10 @@ enum {
kApplyCmd = 'appl'
};
static const char *savePeriodLabels[] = { _s("Never"), _s("Every 5 mins"), _s("Every 10 mins"), _s("Every 15 mins"), _s("Every 30 mins"), nullptr };
static const char *const savePeriodLabels[] = { _s("Never"), _s("Every 5 mins"), _s("Every 10 mins"), _s("Every 15 mins"), _s("Every 30 mins"), nullptr };
static const int savePeriodValues[] = { 0, 5 * 60, 10 * 60, 15 * 60, 30 * 60, -1 };
static const char *guiBaseLabels[] = {
static const char *const guiBaseLabels[] = {
// I18N: Very large GUI scale
_s("Very large"),
// I18N: Large GUI scale
@ -164,7 +164,7 @@ static const int guiBaseValues[] = { 150, 125, 100, 75, -1 };
// The keyboard mouse speed values range from 0 to 7 and correspond to speeds shown in the label
// "10" (value 3) is the default speed corresponding to the speed before introduction of this control
static const char *kbdMouseSpeedLabels[] = { "3", "5", "8", "10", "13", "15", "18", "20", nullptr };
static const char *const kbdMouseSpeedLabels[] = { "3", "5", "8", "10", "13", "15", "18", "20", nullptr };
OptionsDialog::OptionsDialog(const Common::String &domain, int x, int y, int w, int h)
: Dialog(x, y, w, h), _domain(domain), _graphicsTabId(-1), _midiTabId(-1), _pathsTabId(-1), _tabWidget(nullptr) {

4
gui/shaderbrowser-dialog.cpp
View File

@ -44,8 +44,8 @@ enum {
kSearchClearCmd = 'SRCL',
};
const char *kFileMask = "*.glslp";
const char *kFileExt = "glslp";
const char *const kFileMask = "*.glslp";
const char *const kFileExt = "glslp";
ShaderBrowserDialog::ShaderBrowserDialog(const Common::Path &initialSelection) : Dialog("ShaderBrowser") {

2
icons/scummvm.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static const char *scummvm_icon[] = {
static const char *const scummvm_icon[] = {
/* columns rows colors chars-per-pixel */
"32 32 25 1 ",
" c #222222",

2
image/codecs/indeo4.cpp
View File

@ -869,7 +869,7 @@ const uint Indeo4Decoder::_ivi4_common_pic_sizes[14] = {
640, 480, 320, 240, 160, 120, 704, 480, 352, 240, 352, 288, 176, 144
};
Indeo4Decoder::Transform Indeo4Decoder::_transforms[18] = {
const Indeo4Decoder::Transform Indeo4Decoder::_transforms[18] = {
{ IndeoDSP::ffIviInverseHaar8x8, IndeoDSP::ffIviDcHaar2d, 1 },
{ IndeoDSP::ffIviRowHaar8, IndeoDSP::ffIviDcHaar2d, 0 },
{ IndeoDSP::ffIviColHaar8, IndeoDSP::ffIviDcHaar2d, 0 },

2
image/codecs/indeo4.h
View File

@ -122,7 +122,7 @@ private:
/**
* Transformations list
*/
static Transform _transforms[18];
static const Transform _transforms[18];
static const uint8 *const _scan_index_to_tab[15];

8
image/codecs/svq1_vlc.h
View File

@ -85,12 +85,12 @@ static const uint32 s_svq1IntraMultistageCodes5[8] = {
1, 1, 1, 1, 1, 1, 0, 1
};
static const byte *s_svq1IntraMultistageLengths[6] = {
static const byte *const s_svq1IntraMultistageLengths[6] = {
s_svq1IntraMultistageLengths0, s_svq1IntraMultistageLengths1, s_svq1IntraMultistageLengths2,
s_svq1IntraMultistageLengths3, s_svq1IntraMultistageLengths4, s_svq1IntraMultistageLengths5
};
static const uint32 *s_svq1IntraMultistageCodes[6] = {
static const uint32 *const s_svq1IntraMultistageCodes[6] = {
s_svq1IntraMultistageCodes0, s_svq1IntraMultistageCodes1, s_svq1IntraMultistageCodes2,
s_svq1IntraMultistageCodes3, s_svq1IntraMultistageCodes4, s_svq1IntraMultistageCodes5
};
@ -143,12 +143,12 @@ static const uint32 s_svq1InterMultistageCodes5[8] = {
1, 1, 1, 3, 2, 1, 1, 0
};
static const byte *s_svq1InterMultistageLengths[6] = {
static const byte *const s_svq1InterMultistageLengths[6] = {
s_svq1InterMultistageLengths0, s_svq1InterMultistageLengths1, s_svq1InterMultistageLengths2,
s_svq1InterMultistageLengths3, s_svq1InterMultistageLengths4, s_svq1InterMultistageLengths5
};
static const uint32 *s_svq1InterMultistageCodes[6] = {
static const uint32 *const s_svq1InterMultistageCodes[6] = {
s_svq1InterMultistageCodes0, s_svq1InterMultistageCodes1, s_svq1InterMultistageCodes2,
s_svq1InterMultistageCodes3, s_svq1InterMultistageCodes4, s_svq1InterMultistageCodes5
};

2
math/sinewindows.cpp
View File

@ -1067,7 +1067,7 @@ static const float sineWindow4096[4096] = {
0.999996f, 0.999997f, 0.999998f, 0.999999f, 0.999999f, 1.000000f, 1.000000f, 1.000000f
};
static const float *sineWindows[13] = {
static const float *const sineWindows[13] = {
nullptr , nullptr , nullptr , nullptr , nullptr ,
sineWindow32 , sineWindow64 , sineWindow128 , sineWindow256, sineWindow512,
sineWindow1024, sineWindow2048, sineWindow4096