From 696ae74f8ac31ba65b003115f792902f949209c9 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Sun, 26 Jul 2009 17:25:04 +0000 Subject: [PATCH] Add some const-ness to the kana table, should fix compiler warnings on GCC. Originally committed to SVN as r3293. --- aegisub/src/kana_table.cpp | 14 ++++---------- aegisub/src/kana_table.h | 4 ++-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/aegisub/src/kana_table.cpp b/aegisub/src/kana_table.cpp index ff74c2623..2b79511ce 100644 --- a/aegisub/src/kana_table.cpp +++ b/aegisub/src/kana_table.cpp @@ -34,16 +34,13 @@ // -/////////// -// Headers #include "config.h" #include "kana_table.h" -/////////////// -// Constructor -KanaTable::KanaTable() { +KanaTable::KanaTable() +{ // Regular kana usage and combinations @@ -273,10 +270,7 @@ KanaTable::~KanaTable() } -////////// -// Insert -void KanaTable::Insert(wchar_t *hira,wchar_t *kata,wchar_t *hep) { -#ifdef _UNICODE +void KanaTable::Insert(const wchar_t *hira, const wchar_t *kata, const wchar_t *hep) +{ entries.push_back(KanaEntry(hira,kata,hep)); -#endif } diff --git a/aegisub/src/kana_table.h b/aegisub/src/kana_table.h index a4afd5b2a..9859651f6 100644 --- a/aegisub/src/kana_table.h +++ b/aegisub/src/kana_table.h @@ -50,7 +50,7 @@ public: wxString hepburn; KanaEntry() {} - KanaEntry(wxString hira,wxString kata,wxString hep) { + KanaEntry(const wxString &hira, const wxString &kata, const wxString &hep) { hiragana = hira; katakana = kata; hepburn = hep; @@ -62,7 +62,7 @@ public: // Hiragana/Katakana table class KanaTable { private: - void Insert(wchar_t *hira,wchar_t *kata,wchar_t *hep); + void Insert(const wchar_t *hira, const wchar_t *kata, const wchar_t *hep); public: std::list entries;