KYRA: Make "const type *const" use consistent.

I used this command for changing "const type * const" to "const type *const":
git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/const \([a-zA-Z0-9_]*\) \* const/const \1 \*const/g'

13 files changed, 67 insertions, 67 deletions

diff --git a/engines/kyra/darkmoon.h b/engines/kyra/darkmoon.h
index 5f090491d6..f0057ddd66 100644
--- a/engines/kyra/darkmoon.h
+++ b/engines/kyra/darkmoon.h
@@ -72,14 +72,14 @@ private:
 	void seq_playFinale();
 	void seq_playCredits(DarkmoonSequenceHelper *sq, const uint8 *data, int sd, int backupPage, int tempPage, int speed);
 
-	const char * const *_introStrings;
-	const char * const *_cpsFilesIntro;
+	const char *const *_introStrings;
+	const char *const *_cpsFilesIntro;
 	const DarkMoonAnimCommand **_animIntro;
 	const DarkMoonShapeDef **_shapesIntro;
 
-	const char * const *_finaleStrings;
+	const char *const *_finaleStrings;
 	const uint8 *_creditsData;
-	const char * const *_cpsFilesFinale;
+	const char *const *_cpsFilesFinale;
 	const DarkMoonAnimCommand **_animFinale;
 	const DarkMoonShapeDef **_shapesFinale;
 
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index aca3a96d8c..e42130cde0 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -858,11 +858,11 @@ protected:
 	void restoreWallOfForceTempData(LevelTempData *tmp);
 	void releaseWallOfForceTempData(LevelTempData *tmp);
 
-	const char * const *_saveLoadStrings;
+	const char *const *_saveLoadStrings;
 
 	const uint8 *_mnDef;
-	const char * const *_mnWord;
-	const char * const *_mnPrompt;
+	const char *const *_mnWord;
+	const char *const *_mnPrompt;
 	int _mnNumWord;
 
 	int _rrCount;
diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h
index a9831d0e6c..1b84e5b56f 100644
--- a/engines/kyra/kyra_hof.h
+++ b/engines/kyra/kyra_hof.h
@@ -618,16 +618,16 @@ protected:
 /*	ActiveWSA *_activeWSA;
 	ActiveText *_activeText;
 	*/
-	/*const char * const *_sequencePakList;
+	/*const char *const *_sequencePakList;
 	int _sequencePakListSize;*/
-	const char * const *_ingamePakList;
+	const char *const *_ingamePakList;
 	int _ingamePakListSize;
 
-	const char * const *_musicFileListIntro;
+	const char *const *_musicFileListIntro;
 	int _musicFileListIntroSize;
-	const char * const *_musicFileListFinale;
+	const char *const *_musicFileListFinale;
 	int _musicFileListFinaleSize;
-	const char * const *_musicFileListIngame;
+	const char *const *_musicFileListIngame;
 	int _musicFileListIngameSize;
 	const uint8 *_cdaTrackTableIntro;
 	int _cdaTrackTableIntroSize;
@@ -635,13 +635,13 @@ protected:
 	int _cdaTrackTableIngameSize;
 	const uint8 *_cdaTrackTableFinale;
 	int _cdaTrackTableFinaleSize;
-	const char * const *_ingameSoundList;
+	const char *const *_ingameSoundList;
 	int _ingameSoundListSize;
 	const uint16 *_ingameSoundIndex;
 	int _ingameSoundIndexSize;
 	const uint16 *_ingameTalkObjIndex;
 	int _ingameTalkObjIndexSize;
-	const char * const *_ingameTimJpStr;
+	const char *const *_ingameTimJpStr;
 	int _ingameTimJpStrSize;
 
 	const ItemAnimDefinition *_itemAnimDefinition;
diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h
index 7470dd871b..def5cbcf6f 100644
--- a/engines/kyra/kyra_lok.h
+++ b/engines/kyra/kyra_lok.h
@@ -126,13 +126,13 @@ public:
 	typedef bool (KyraEngine_LoK::*IntroProc)();
 
 	// static data access
-	const char * const *seqWSATable() { return _seq_WSATable; }
-	const char * const *seqCPSTable() { return _seq_CPSTable; }
-	const char * const *seqCOLTable() { return _seq_COLTable; }
-	const char * const *seqTextsTable() { return _seq_textsTable; }
+	const char *const *seqWSATable() { return _seq_WSATable; }
+	const char *const *seqCPSTable() { return _seq_CPSTable; }
+	const char *const *seqCOLTable() { return _seq_COLTable; }
+	const char *const *seqTextsTable() { return _seq_textsTable; }
 
-	const uint8 * const *palTable1() { return &_specialPalettes[0]; }
-	const uint8 * const *palTable2() { return &_specialPalettes[29]; }
+	const uint8 *const *palTable1() { return &_specialPalettes[0]; }
+	const uint8 *const *palTable2() { return &_specialPalettes[29]; }
 
 protected:
 	virtual Common::Error go();
@@ -538,12 +538,12 @@ protected:
 	const uint8 *_seq_Demo4;
 	const uint8 *_seq_Reunion;
 
-	const char * const *_seq_WSATable;
-	const char * const *_seq_CPSTable;
-	const char * const *_seq_COLTable;
-	const char * const *_seq_textsTable;
+	const char *const *_seq_WSATable;
+	const char *const *_seq_CPSTable;
+	const char *const *_seq_COLTable;
+	const char *const *_seq_textsTable;
 
-	const char * const *_storyStrings;
+	const char *const *_storyStrings;
 
 	int _seq_WSATable_Size;
 	int _seq_CPSTable_Size;
@@ -552,25 +552,25 @@ protected:
 
 	int _storyStringsSize;
 
-	const char * const *_itemList;
-	const char * const *_takenList;
-	const char * const *_placedList;
-	const char * const *_droppedList;
-	const char * const *_noDropList;
-	const char * const *_putDownFirst;
-	const char * const *_waitForAmulet;
-	const char * const *_blackJewel;
-	const char * const *_poisonGone;
-	const char * const *_healingTip;
-	const char * const *_thePoison;
-	const char * const *_fluteString;
-	const char * const *_wispJewelStrings;
-	const char * const *_magicJewelString;
-	const char * const *_flaskFull;
-	const char * const *_fullFlask;
-	const char * const *_veryClever;
-	const char * const *_homeString;
-	const char * const *_newGameString;
+	const char *const *_itemList;
+	const char *const *_takenList;
+	const char *const *_placedList;
+	const char *const *_droppedList;
+	const char *const *_noDropList;
+	const char *const *_putDownFirst;
+	const char *const *_waitForAmulet;
+	const char *const *_blackJewel;
+	const char *const *_poisonGone;
+	const char *const *_healingTip;
+	const char *const *_thePoison;
+	const char *const *_fluteString;
+	const char *const *_wispJewelStrings;
+	const char *const *_magicJewelString;
+	const char *const *_flaskFull;
+	const char *const *_fullFlask;
+	const char *const *_veryClever;
+	const char *const *_homeString;
+	const char *const *_newGameString;
 
 	int _itemList_Size;
 	int _takenList_Size;
@@ -592,13 +592,13 @@ protected:
 	int _homeString_Size;
 	int _newGameString_Size;
 
-	const char * const *_characterImageTable;
+	const char *const *_characterImageTable;
 	int _characterImageTableSize;
 
-	const char * const *_guiStrings;
+	const char *const *_guiStrings;
 	int _guiStringsSize;
 
-	const char * const *_configStrings;
+	const char *const *_configStrings;
 	int _configStringsSize;
 
 	Shape *_defaultShapeTable;
@@ -636,12 +636,12 @@ protected:
 
 	Room *_roomTable;
 	int _roomTableSize;
-	const char * const *_roomFilenameTable;
+	const char *const *_roomFilenameTable;
 	int _roomFilenameTableSize;
 
 	const uint8 *_amuleteAnim;
 
-	const uint8 * const *_specialPalettes;
+	const uint8 *const *_specialPalettes;
 
 	// positions of the inventory
 	static const uint16 _itemPosX[];
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index 448e4ef70d..baf88819e8 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -724,7 +724,7 @@ void KyraEngine_MR::loadCharacterShapes(int newShapes) {
 	static const uint8 numberOffset[] = { 3, 3, 4, 4, 3, 3 };
 	static const uint8 startShape[] = { 0x32, 0x58, 0x78, 0x98, 0xB8, 0xD8 };
 	static const uint8 endShape[] = { 0x57, 0x77, 0x97, 0xB7, 0xD7, 0xF7 };
-	static const char * const filenames[] = {
+	static const char *const filenames[] = {
 		"MSW##.SHP",
 		"MTA##.SHP",
 		"MTFL##.SHP",
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index 004236ca04..d194fedd4d 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -182,11 +182,11 @@ private:
 
 private:
 	// main menu
-	const char * const *_mainMenuStrings;
+	const char *const *_mainMenuStrings;
 	int _mainMenuStringsSize;
 
-	static const char * const _mainMenuSpanishFan[];
-	static const char * const _mainMenuItalianFan[];
+	static const char *const _mainMenuSpanishFan[];
+	static const char *const _mainMenuItalianFan[];
 
 	// animator
 	uint8 *_gamePlayBuffer;
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index be2d83357d..d8df6b6703 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -391,7 +391,7 @@ private:
 	uint8 _outroShapeTable[256];
 
 	// TODO: Consider moving these tables to kyra.dat
-	static const char * const _outroShapeFileTable[];
+	static const char *const _outroShapeFileTable[];
 	static const uint8 _outroFrameTable[];
 
 	static const int16 _outroRightMonsterPos[];
@@ -814,7 +814,7 @@ private:
 	void decodeSjis(const char *src, char *dst);
 	int decodeCyrillic(const char *src, char *dst);
 
-	static const char * const _languageExt[];
+	static const char *const _languageExt[];
 
 	// graphics
 	void setupScreenDims();
@@ -1013,8 +1013,8 @@ private:
 
 	uint8 *_tempBuffer5120;
 
-	const char * const *_levelDatList;
-	const char * const *_levelShpList;
+	const char *const *_levelDatList;
+	const char *const *_levelShpList;
 
 	const int8 *_dscWalls;
 
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 74ac1b6229..5364cce270 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -62,7 +62,7 @@ public:
 	bool isInCacheList(Common::String name);
 
 	bool loadFileList(const Common::String &filedata);
-	bool loadFileList(const char * const *filelist, uint32 numFiles);
+	bool loadFileList(const char *const *filelist, uint32 numFiles);
 
 	// This unloads *all* pakfiles, even kyra.dat and protected ones.
 	// It does not remove files from cache though!
@@ -87,7 +87,7 @@ protected:
 	Common::Archive *loadArchive(const Common::String &name, Common::ArchiveMemberPtr member);
 	Common::Archive *loadInstallerArchive(const Common::String &file, const Common::String &ext, const uint8 offset);
 
-	bool loadProtectedFiles(const char * const * list);
+	bool loadProtectedFiles(const char *const * list);
 
 	void initializeLoaders();
 
@@ -757,7 +757,7 @@ public:
 	bool init();
 	void deinit();
 
-	const char * const *loadStrings(int id, int &strings);
+	const char *const *loadStrings(int id, int &strings);
 	const uint8 *loadRawData(int id, int &size);
 	const Shape *loadShapeTable(int id, int &entries);
 	const AmigaSfxTable *loadAmigaSfxTable(int id, int &entries);
diff --git a/engines/kyra/resource_intern.h b/engines/kyra/resource_intern.h
index 9d9574d823..e63eab7d6a 100644
--- a/engines/kyra/resource_intern.h
+++ b/engines/kyra/resource_intern.h
@@ -75,7 +75,7 @@ private:
 	const uint32 *findFile(const Common::String &name) const;
 
 	const uint16 _entryCount;
-	const uint32 * const _fileEntries;
+	const uint32 *const _fileEntries;
 };
 
 class CachedArchive : public Common::Archive {
diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index bd94e2611f..7f3abf8b5f 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -596,7 +596,7 @@ protected:
 	int _animBlockSize;
 
 	// dimension handling
-	const ScreenDim * const _dimTable;
+	const ScreenDim *const _dimTable;
 	ScreenDim **_customDimTable;
 	const int _dimTableCount;
 	int _curDimIndex;
diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp
index 110cfec6e6..207d0ced15 100644
--- a/engines/kyra/sequences_hof.cpp
+++ b/engines/kyra/sequences_hof.cpp
@@ -216,8 +216,8 @@ private:
 	uint8 _textColorMap[16];
 	int _textDuration[33];
 
-	const char * const *_sequenceStrings;
-	const char * const *_sequenceSoundList;
+	const char *const *_sequenceStrings;
+	const char *const *_sequenceSoundList;
 	int _sequenceSoundListSize;
 
 	static const uint8 _textColorPresets[];
@@ -1476,7 +1476,7 @@ void SeqPlayer_HOF::playHoFTalkieCredits() {
 
 	int talkieCreditsSize, talkieCreditsSpecialSize;
 	const uint8 *talkieCredits = _vm->staticres()->loadRawData(k2SeqplayCredits, talkieCreditsSize);
-	const char * const *talkieCreditsSpecial = _vm->staticres()->loadStrings(k2SeqplayCreditsSpecial, talkieCreditsSpecialSize);
+	const char *const *talkieCreditsSpecial = _vm->staticres()->loadStrings(k2SeqplayCreditsSpecial, talkieCreditsSpecialSize);
 
 	_vm->sound()->selectAudioResourceSet(kMusicIngame);
 	_vm->sound()->loadSoundFile(3);
diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound_amiga.cpp
index 5962d6f4fe..f633a429f8 100644
--- a/engines/kyra/sound_amiga.cpp
+++ b/engines/kyra/sound_amiga.cpp
@@ -72,7 +72,7 @@ bool SoundAmiga::hasSoundFile(uint file) {
 void SoundAmiga::loadSoundFile(uint file) {
 	debugC(5, kDebugLevelSound, "SoundAmiga::loadSoundFile(%d)", file);
 
-	static const char * const tableFilenames[3][2] = {
+	static const char *const tableFilenames[3][2] = {
 		{ "introscr.mx",  "introinst.mx" },
 		{ "kyramusic.mx", 0 },
 		{ "finalescr.mx", "introinst.mx" }
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index a488884124..372e903386 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -290,7 +290,7 @@ void StaticResource::deinit() {
 }
 
 const char *const *StaticResource::loadStrings(int id, int &strings) {
-	return (const char * const *)getData(id, kStringList, strings);
+	return (const char *const *)getData(id, kStringList, strings);
 }
 
 const uint8 *StaticResource::loadRawData(int id, int &size) {