From 1fcd2d26898cf54f9d5b8abf61565f46d92d9df0 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Wed, 25 May 2016 13:24:37 +0200 Subject: [PATCH] `std` namespace omitted for code clarity --- ZRColaCompile/dbsource.cpp | 25 ++++++------ ZRColaCompile/main.cpp | 78 +++++++++++++++++++------------------- 2 files changed, 53 insertions(+), 50 deletions(-) diff --git a/ZRColaCompile/dbsource.cpp b/ZRColaCompile/dbsource.cpp index c77e2c3..bd95de5 100644 --- a/ZRColaCompile/dbsource.cpp +++ b/ZRColaCompile/dbsource.cpp @@ -19,6 +19,7 @@ #include "stdafx.h" +using namespace std; bool ZRCola::DBSource::character_desc_idx::add_keywords(const wchar_t *str, wchar_t chr, size_t sub) @@ -37,7 +38,7 @@ bool ZRCola::DBSource::character_desc_idx::add_keywords(const wchar_t *str, wcha } // Get term. - std::wstring term; + wstring term; if (*str == L'"') { const wchar_t *str_end = ++str; for (;;) { @@ -60,13 +61,13 @@ bool ZRCola::DBSource::character_desc_idx::add_keywords(const wchar_t *str, wcha } if (!term.empty()) { - std::transform(term.begin(), term.end(), term.begin(), std::towlower); + transform(term.begin(), term.end(), term.begin(), towlower); if (sub) { - std::wstring::size_type j_end = term.size(); + wstring::size_type j_end = term.size(); if (j_end >= sub) { // Insert all keyword substrings "sub" or more characters long. - for (std::wstring::size_type i = 0, i_end = j_end - sub; i <= i_end; ++i) { - for (std::wstring::size_type j = i + sub; j <= j_end; ++j) + for (wstring::size_type i = 0, i_end = j_end - sub; i <= i_end; ++i) { + for (wstring::size_type j = i + sub; j <= j_end; ++j) add_keyword(term.substr(i, j - i), chr); } } @@ -88,8 +89,8 @@ void ZRCola::DBSource::character_desc_idx::save(ZRCola::textindex::size_type size_keys = 0; - std::vector::size_type size_values = 0; + vector::size_type size_keys = 0; + vector::size_type size_values = 0; for (const_iterator i = cbegin(), i_end = cend(); i != i_end; ++i) { size_keys += i->first.size(); size_values += i->second.size(); @@ -137,7 +138,7 @@ bool ZRCola::DBSource::Open(LPCTSTR filename) HRESULT hr = ::CoCreateInstance(CLSID_CADOConnection, NULL, CLSCTX_ALL, IID_IADOConnection, (LPVOID*)&m_db); if (SUCCEEDED(hr)) { // Open the database. - std::wstring cn; + wstring cn; cn = L"Driver={Microsoft Access Driver (*.mdb)};"; cn += L"Dbq="; cn += filename; @@ -238,7 +239,7 @@ bool ZRCola::DBSource::GetValue(const ATL::CComPtr& f, int& val) const } -bool ZRCola::DBSource::GetValue(const ATL::CComPtr& f, std::wstring& val) const +bool ZRCola::DBSource::GetValue(const ATL::CComPtr& f, wstring& val) const { wxASSERT_MSG(f, wxT("field is empty")); @@ -290,7 +291,7 @@ bool ZRCola::DBSource::GetUnicodeCharacter(const ATL::CComPtr& f, wcha } -bool ZRCola::DBSource::GetUnicodeString(const ATL::CComPtr& f, std::wstring& str) const +bool ZRCola::DBSource::GetUnicodeString(const ATL::CComPtr& f, wstring& str) const { wxASSERT_MSG(f, wxT("field is empty")); @@ -655,7 +656,7 @@ bool ZRCola::DBSource::GetCharacterGroup(const ATL::CComPtr& rs, c ATL::CComPtr flds; wxVERIFY(SUCCEEDED(rs->get_Fields(&flds))); - std::wstring id; + wstring id; { ATL::CComPtr f; @@ -816,7 +817,7 @@ bool ZRCola::DBSource::GetCharacterCategory(const ATL::CComPtr& rs ATL::CComPtr flds; wxVERIFY(SUCCEEDED(rs->get_Fields(&flds))); - std::wstring id; + wstring id; { ATL::CComPtr f; diff --git a/ZRColaCompile/main.cpp b/ZRColaCompile/main.cpp index 9cc4bc6..c695099 100644 --- a/ZRColaCompile/main.cpp +++ b/ZRColaCompile/main.cpp @@ -19,6 +19,8 @@ #include "stdafx.h" +using namespace std; + /// /// Main function @@ -87,7 +89,7 @@ int _tmain(int argc, _TCHAR *argv[]) } const wxString& filenameOut = parser.GetParam(1); - std::fstream dst((LPCTSTR)filenameOut, std::ios_base::out | std::ios_base::trunc | std::ios_base::binary); + fstream dst((LPCTSTR)filenameOut, ios_base::out | ios_base::trunc | ios_base::binary); if (dst.fail()) { _ftprintf(stderr, wxT("%s: error ZCC0002: Error opening output file.\n"), filenameOut.fn_str()); return 1; @@ -97,10 +99,10 @@ int _tmain(int argc, _TCHAR *argv[]) // Set of strings to translate. bool build_pot = parser.GetParamCount() > 2; - std::set pot; + set pot; // Open file ID. - std::streamoff dst_start = stdex::idrec::open(dst, ZRCOLA_DB_ID); + streamoff dst_start = stdex::idrec::open(dst, ZRCOLA_DB_ID); { // Get translations. @@ -125,10 +127,10 @@ int _tmain(int argc, _TCHAR *argv[]) db.data.push_back(trans.chr); wxASSERT_MSG((int)0xffff8000 <= trans.rank && trans.rank <= (int)0x00007fff, wxT("transformation rank out of bounds")); db.data.push_back((unsigned __int16)trans.rank); - std::wstring::size_type n = trans.str.length(); + wstring::size_type n = trans.str.length(); wxASSERT_MSG(n <= 0xffff, wxT("transformation string too long")); db.data.push_back((unsigned __int16)n); - for (std::wstring::size_type i = 0; i < n; i++) + for (wstring::size_type i = 0; i < n; i++) db.data.push_back(trans.str[i]); db.idxComp .push_back(idx); db.idxDecomp.push_back(idx); @@ -175,10 +177,10 @@ int _tmain(int argc, _TCHAR *argv[]) // Add key sequence to index and data. unsigned __int32 idx = db.data.size(); db.data.push_back(ks.chr); - std::vector::size_type n = ks.seq.size(); + vector::size_type n = ks.seq.size(); wxASSERT_MSG(n <= 0xffff, wxT("key sequence too long")); db.data.push_back((unsigned __int16)n); - for (std::vector::size_type i = 0; i < n; i++) { + for (vector::size_type i = 0; i < n; i++) { const ZRCola::DBSource::keyseq::keycode &kc = ks.seq[i]; db.data.push_back(kc.key); db.data.push_back( @@ -242,12 +244,12 @@ int _tmain(int argc, _TCHAR *argv[]) if (src.GetLanguage(rs, lang)) { // Add language to index and data. unsigned __int32 idx = db.data.size(); - for (std::wstring::size_type i = 0; i < sizeof(ZRCola::langid_t)/sizeof(unsigned __int16); i++) + for (wstring::size_type i = 0; i < sizeof(ZRCola::langid_t)/sizeof(unsigned __int16); i++) db.data.push_back(((const unsigned __int16*)lang.id.data)[i]); - std::wstring::size_type n = lang.name.length(); + wstring::size_type n = lang.name.length(); wxASSERT_MSG(n <= 0xffff, wxT("language name too long")); db.data.push_back((unsigned __int16)n); - for (std::wstring::size_type i = 0; i < n; i++) + for (wstring::size_type i = 0; i < n; i++) db.data.push_back(lang.name[i]); db.idxLng.push_back(idx); if (build_pot) @@ -296,7 +298,7 @@ int _tmain(int argc, _TCHAR *argv[]) // Add language characters to index and data. unsigned __int32 idx = db.data.size(); db.data.push_back(lc.chr); - for (std::wstring::size_type i = 0; i < sizeof(ZRCola::langid_t)/sizeof(unsigned __int16); i++) + for (wstring::size_type i = 0; i < sizeof(ZRCola::langid_t)/sizeof(unsigned __int16); i++) db.data.push_back(((const unsigned __int16*)lc.lang.data)[i]); db.idxChr.push_back(idx); #ifdef ZRCOLA_LANGCHAR_LANG_IDX @@ -349,15 +351,15 @@ int _tmain(int argc, _TCHAR *argv[]) db.data.push_back((unsigned __int16)cg.id); wxASSERT_MSG((int)0xffff8000 <= cg.rank && cg.rank <= (int)0x00007fff, wxT("character group rank out of bounds")); db.data.push_back((unsigned __int16)cg.rank); - std::wstring::size_type n_name = cg.name.length(); + wstring::size_type n_name = cg.name.length(); wxASSERT_MSG(n_name <= 0xffff, wxT("character group name too long")); db.data.push_back((unsigned __int16)n_name); - std::wstring::size_type n_char = cg.chars.length(); + wstring::size_type n_char = cg.chars.length(); wxASSERT_MSG(n_char <= 0xffff, wxT("too many character group characters")); db.data.push_back((unsigned __int16)n_char); - for (std::wstring::size_type i = 0; i < n_name; i++) + for (wstring::size_type i = 0; i < n_name; i++) db.data.push_back(cg.name[i]); - for (std::wstring::size_type i = 0; i < n_char; i++) + for (wstring::size_type i = 0; i < n_char; i++) db.data.push_back(cg.chars[i]); db.idxRnk.push_back(idx); if (build_pot) @@ -404,17 +406,17 @@ int _tmain(int argc, _TCHAR *argv[]) // Add character to index and data. unsigned __int32 idx = db.data.size(); db.data.push_back((unsigned __int16)chr.chr); - for (std::wstring::size_type i = 0; i < sizeof(ZRCola::chrcatid_t)/sizeof(unsigned __int16); i++) + for (wstring::size_type i = 0; i < sizeof(ZRCola::chrcatid_t)/sizeof(unsigned __int16); i++) db.data.push_back(((const unsigned __int16*)chr.cat.data)[i]); - std::wstring::size_type n_desc = chr.desc.length(); + wstring::size_type n_desc = chr.desc.length(); wxASSERT_MSG(n_desc <= 0xffff, wxT("character description too long")); db.data.push_back((unsigned __int16)n_desc); - std::wstring::size_type n_rel = chr.rel.length(); + wstring::size_type n_rel = chr.rel.length(); wxASSERT_MSG(n_rel <= 0xffff, wxT("too many related characters")); db.data.push_back((unsigned __int16)n_rel); - for (std::wstring::size_type i = 0; i < n_desc; i++) + for (wstring::size_type i = 0; i < n_desc; i++) db.data.push_back(chr.desc[i]); - for (std::wstring::size_type i = 0; i < n_rel; i++) + for (wstring::size_type i = 0; i < n_rel; i++) db.data.push_back(chr.rel[i]); db.idxChr.push_back(idx); @@ -468,14 +470,14 @@ int _tmain(int argc, _TCHAR *argv[]) if (src.GetCharacterCategory(rs, cc)) { // Add character category to index and data. unsigned __int32 idx = db.data.size(); - for (std::wstring::size_type i = 0; i < sizeof(ZRCola::chrcatid_t)/sizeof(unsigned __int16); i++) + for (wstring::size_type i = 0; i < sizeof(ZRCola::chrcatid_t)/sizeof(unsigned __int16); i++) db.data.push_back(((const unsigned __int16*)cc.id.data)[i]); wxASSERT_MSG((int)0xffff8000 <= cc.rank && cc.rank <= (int)0x00007fff, wxT("character category rank out of bounds")); db.data.push_back((unsigned __int16)cc.rank); - std::wstring::size_type n_name = cc.name.length(); + wstring::size_type n_name = cc.name.length(); wxASSERT_MSG(n_name <= 0xffff, wxT("character category name too long")); db.data.push_back((unsigned __int16)n_name); - for (std::wstring::size_type i = 0; i < n_name; i++) + for (wstring::size_type i = 0; i < n_name; i++) db.data.push_back(cc.name[i]); db.idxChrCat.push_back(idx); db.idxRnk .push_back(idx); @@ -512,21 +514,21 @@ int _tmain(int argc, _TCHAR *argv[]) if (!has_errors && build_pot) { const wxString& filenamePot = parser.GetParam(2); - std::fstream dst((LPCTSTR)filenamePot, std::ios_base::out | std::ios_base::trunc); + fstream dst((LPCTSTR)filenamePot, ios_base::out | ios_base::trunc); if (dst.good()) { - dst << "msgid \"\"" << std::endl - << "msgstr \"\"" << std::endl - << "\"Project-Id-Version: ZRCola.zrcdb\\n\"" << std::endl - << "\"Language: en\\n\"" << std::endl - << "\"MIME-Version: 1.0\\n\"" << std::endl - << "\"Content-Type: text/plain; charset=UTF-8\\n\"" << std::endl - << "\"Content-Transfer-Encoding: 8bit\\n\"" << std::endl - << "\"X-Generator: ZRColaCompile " << ZRCOLA_VERSION_STR << "\\n\"" << std::endl; + dst << "msgid \"\"" << endl + << "msgstr \"\"" << endl + << "\"Project-Id-Version: ZRCola.zrcdb\\n\"" << endl + << "\"Language: en\\n\"" << endl + << "\"MIME-Version: 1.0\\n\"" << endl + << "\"Content-Type: text/plain; charset=UTF-8\\n\"" << endl + << "\"Content-Transfer-Encoding: 8bit\\n\"" << endl + << "\"X-Generator: ZRColaCompile " << ZRCOLA_VERSION_STR << "\\n\"" << endl; - std::wstring_convert> conv; - for (std::set::const_iterator i = pot.cbegin(); i != pot.cend(); ++i) { + wstring_convert> conv; + for (set::const_iterator i = pot.cbegin(); i != pot.cend(); ++i) { // Convert UTF-16 to UTF-8 and escape. - std::string t(conv.to_bytes(*i)), u; + string t(conv.to_bytes(*i)), u; for (size_t i = 0, n = t.size(); i < n; i++) { char c = t[i]; switch (c) { @@ -537,9 +539,9 @@ int _tmain(int argc, _TCHAR *argv[]) default : u += c; } } - dst << std::endl - << "msgid \"" << u << "\"" << std::endl - << "msgstr \"\"" << std::endl; + dst << endl + << "msgid \"" << u << "\"" << endl + << "msgstr \"\"" << endl; } if (dst.fail()) {