diff --git a/build/premake/premake4.lua b/build/premake/premake4.lua index 80482bb020..8bf879c543 100644 --- a/build/premake/premake4.lua +++ b/build/premake/premake4.lua @@ -550,7 +550,7 @@ end function setup_third_party_static_lib_project (project_name, rel_source_dirs, extern_libs, extra_params) setup_static_lib_project(project_name, rel_source_dirs, extern_libs, extra_params) - includedirs { source_root .. "third_party/" .. project_name .. "/include/" .. project_name } + includedirs { source_root .. "third_party/" .. project_name .. "/include/" } end function setup_shared_lib_project (project_name, rel_source_dirs, extern_libs, extra_params) diff --git a/source/i18n/L10n.cpp b/source/i18n/L10n.cpp index a77c7dab79..2fe301cfed 100644 --- a/source/i18n/L10n.cpp +++ b/source/i18n/L10n.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2014 Wildfire Games +/* Copyright (c) 2015 Wildfire Games * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the @@ -565,7 +565,7 @@ void L10n::ReadPoIntoDictionary(const std::string& poContent, tinygettext::Dicti try { std::istringstream inputStream(poContent); - tinygettext::POParser::parse("virtual PO file", inputStream, *dictionary, false); + tinygettext::POParser::parse("virtual PO file", inputStream, *dictionary); } catch(std::exception& e) { diff --git a/source/third_party/tinygettext/COPYING b/source/third_party/tinygettext/COPYING deleted file mode 100644 index c45fcd8cb4..0000000000 --- a/source/third_party/tinygettext/COPYING +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - tinygettext - A gettext replacement that works directly on .po files - Copyright (C) 2006 Ingo Ruhnke - - 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 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/source/third_party/tinygettext/README b/source/third_party/tinygettext/README index 0eeabe93e2..79753a6382 100644 --- a/source/third_party/tinygettext/README +++ b/source/third_party/tinygettext/README @@ -3,9 +3,9 @@ tinygettext tinygettext is a minimal gettext() replacement written in C++. It can read .po files directly and doesn't need .mo files generated from .po. -It also can read the .po files from arbitary locations, so its much +It also can read the .po files from arbitary locations, so it's much better suited for non-Unix systems and situations in which one wants -to store or distrubite .po files seperatly from the software itself. +to store or distribute .po files seperately from the software itself. diff --git a/source/third_party/tinygettext/include/tinygettext/dictionary.hpp b/source/third_party/tinygettext/include/tinygettext/dictionary.hpp index 743e075a07..5f08710f80 100644 --- a/source/third_party/tinygettext/include/tinygettext/dictionary.hpp +++ b/source/third_party/tinygettext/include/tinygettext/dictionary.hpp @@ -18,9 +18,10 @@ #ifndef HEADER_TINYGETTEXT_DICTIONARY_HPP #define HEADER_TINYGETTEXT_DICTIONARY_HPP -#include -#include #include +#include +#include + #include "plural_forms.hpp" namespace tinygettext { @@ -31,10 +32,10 @@ namespace tinygettext { class Dictionary { private: - typedef std::map > Entries; + typedef std::unordered_map > Entries; Entries entries; - typedef std::map CtxtEntries; + typedef std::unordered_map CtxtEntries; CtxtEntries ctxt_entries; std::string charset; diff --git a/source/third_party/tinygettext/include/tinygettext/dictionary_manager.hpp b/source/third_party/tinygettext/include/tinygettext/dictionary_manager.hpp index 7c3d7f3bcb..c3f6d9574a 100644 --- a/source/third_party/tinygettext/include/tinygettext/dictionary_manager.hpp +++ b/source/third_party/tinygettext/include/tinygettext/dictionary_manager.hpp @@ -18,11 +18,11 @@ #ifndef HEADER_TINYGETTEXT_DICTIONARY_MANAGER_HPP #define HEADER_TINYGETTEXT_DICTIONARY_MANAGER_HPP -#include +#include #include #include +#include #include -#include #include "dictionary.hpp" #include "language.hpp" @@ -37,7 +37,7 @@ class FileSystem; class DictionaryManager { private: - typedef std::map Dictionaries; + typedef std::unordered_map Dictionaries; Dictionaries dictionaries; typedef std::vector SearchPath; @@ -51,7 +51,7 @@ private: Dictionary empty_dict; - std::auto_ptr filesystem; + std::unique_ptr filesystem; void clear_cache(); @@ -85,7 +85,7 @@ public: /** Return a set of the available languages in their country code */ std::set get_languages(); - void set_filesystem(std::auto_ptr filesystem); + void set_filesystem(std::unique_ptr filesystem); private: DictionaryManager (const DictionaryManager&); diff --git a/source/third_party/tinygettext/include/tinygettext/file_system.hpp b/source/third_party/tinygettext/include/tinygettext/file_system.hpp index af47aaf966..67ec33b9fd 100644 --- a/source/third_party/tinygettext/include/tinygettext/file_system.hpp +++ b/source/third_party/tinygettext/include/tinygettext/file_system.hpp @@ -30,8 +30,8 @@ class FileSystem public: virtual ~FileSystem() {} - virtual std::vector open_directory(const std::string& pathname) =0; - virtual std::auto_ptr open_file(const std::string& filename) =0; + virtual std::vector open_directory(const std::string& pathname) =0; + virtual std::unique_ptr open_file(const std::string& filename) =0; }; } // namespace tinygettext diff --git a/source/third_party/tinygettext/include/tinygettext/language.hpp b/source/third_party/tinygettext/include/tinygettext/language.hpp index b997a13ebe..de37cc8c4c 100644 --- a/source/third_party/tinygettext/include/tinygettext/language.hpp +++ b/source/third_party/tinygettext/include/tinygettext/language.hpp @@ -19,6 +19,7 @@ #define HEADER_TINYGETTEXT_LANGUAGE_HPP #include +#include namespace tinygettext { @@ -78,12 +79,21 @@ public: bool operator!=(const Language& rhs) const; friend bool operator<(const Language& lhs, const Language& rhs); + friend struct Language_hash; }; inline bool operator<(const Language& lhs, const Language& rhs) { return lhs.language_spec < rhs.language_spec; } +struct Language_hash +{ + size_t operator()(const Language& v) const + { + return reinterpret_cast(v.language_spec); + } +}; + } // namespace tinygettext #endif diff --git a/source/third_party/tinygettext/include/tinygettext/po_parser.hpp b/source/third_party/tinygettext/include/tinygettext/po_parser.hpp index 865597abad..14d4487e61 100644 --- a/source/third_party/tinygettext/include/tinygettext/po_parser.hpp +++ b/source/third_party/tinygettext/include/tinygettext/po_parser.hpp @@ -49,18 +49,18 @@ private: void parse_header(const std::string& header); void parse(); void next_line(); - std::string get_string(std::string::size_type skip); - void get_string_line(std::ostringstream& str,std::string::size_type skip); + std::string get_string(unsigned int skip); + void get_string_line(std::ostringstream& str, size_t skip); bool is_empty_line(); bool prefix(const char* ); - void error(const std::string& msg); + void error(const std::string& msg) __attribute__((__noreturn__)); void warning(const std::string& msg); public: /** @param filename name of the istream, only used in error messages @param in stream from which the PO file is read. @param dict dictionary to which the strings are written */ - static void parse(const std::string& filename, std::istream& in, Dictionary& dict, bool use_fuzzy = true); + static void parse(const std::string& filename, std::istream& in, Dictionary& dict); static bool pedantic; private: diff --git a/source/third_party/tinygettext/include/tinygettext/unix_file_system.hpp b/source/third_party/tinygettext/include/tinygettext/unix_file_system.hpp index 80f3e6db4f..aa2552442b 100644 --- a/source/third_party/tinygettext/include/tinygettext/unix_file_system.hpp +++ b/source/third_party/tinygettext/include/tinygettext/unix_file_system.hpp @@ -28,7 +28,7 @@ public: UnixFileSystem(); std::vector open_directory(const std::string& pathname); - std::auto_ptr open_file(const std::string& filename); + std::unique_ptr open_file(const std::string& filename); }; } // namespace tinygettext diff --git a/source/third_party/tinygettext/src/dictionary.cpp b/source/third_party/tinygettext/src/dictionary.cpp index 620af6cd86..8e1835dd55 100644 --- a/source/third_party/tinygettext/src/dictionary.cpp +++ b/source/third_party/tinygettext/src/dictionary.cpp @@ -18,8 +18,9 @@ #include "precompiled.h" #include -#include "log_stream.hpp" -#include "dictionary.hpp" + +#include "tinygettext/log_stream.hpp" +#include "tinygettext/dictionary.hpp" namespace tinygettext { diff --git a/source/third_party/tinygettext/src/dictionary_manager.cpp b/source/third_party/tinygettext/src/dictionary_manager.cpp index b136ac9d1a..d183588100 100644 --- a/source/third_party/tinygettext/src/dictionary_manager.cpp +++ b/source/third_party/tinygettext/src/dictionary_manager.cpp @@ -17,7 +17,7 @@ #include "precompiled.h" -#include "dictionary_manager.hpp" +#include "tinygettext/dictionary_manager.hpp" #include #include @@ -26,9 +26,9 @@ #include #include -#include "log_stream.hpp" -#include "po_parser.hpp" -#include "unix_file_system.hpp" +#include "tinygettext/log_stream.hpp" +#include "tinygettext/po_parser.hpp" +#include "tinygettext/unix_file_system.hpp" namespace tinygettext { @@ -148,7 +148,7 @@ DictionaryManager::get_dictionary(const Language& language) std::string pofile = *p + "/" + best_filename; try { - std::auto_ptr in = filesystem->open_file(pofile); + std::unique_ptr in = filesystem->open_file(pofile); if (!in.get()) { log_error << "error: failure opening: " << pofile << std::endl; @@ -234,9 +234,9 @@ DictionaryManager::add_directory(const std::string& pathname) } void -DictionaryManager::set_filesystem(std::auto_ptr filesystem_) +DictionaryManager::set_filesystem(std::unique_ptr filesystem_) { - filesystem = filesystem_; + filesystem = std::move(filesystem_); } } // namespace tinygettext diff --git a/source/third_party/tinygettext/src/iconv.cpp b/source/third_party/tinygettext/src/iconv.cpp index d41d575046..d433f0c74b 100644 --- a/source/third_party/tinygettext/src/iconv.cpp +++ b/source/third_party/tinygettext/src/iconv.cpp @@ -25,8 +25,8 @@ #include #include -#include "iconv.hpp" -#include "log_stream.hpp" +#include "tinygettext/iconv.hpp" +#include "tinygettext/log_stream.hpp" namespace tinygettext { diff --git a/source/third_party/tinygettext/src/language.cpp b/source/third_party/tinygettext/src/language.cpp index 0678610480..e21693a5ca 100644 --- a/source/third_party/tinygettext/src/language.cpp +++ b/source/third_party/tinygettext/src/language.cpp @@ -17,10 +17,10 @@ #include "precompiled.h" -#include "language.hpp" +#include "tinygettext/language.hpp" -#include #include +#include #include namespace tinygettext { @@ -73,6 +73,7 @@ LanguageSpec languages[] = { { "ca", "ES", 0, "Catalan (Spain)" }, { "ca", 0, "valencia", "Catalan (valencia)" }, { "ca", 0, 0, "Catalan" }, + { "cmn", 0, 0, "Mandarin" }, { "co", 0, 0, "Corsican" }, { "cs", 0, 0, "Czech" }, { "cs", "CZ", 0, "Czech (Czech Republic)" }, @@ -286,7 +287,7 @@ LanguageSpec languages[] = { std::string resolve_language_alias(const std::string& name) { - typedef std::map Aliases; + typedef std::unordered_map Aliases; static Aliases language_aliases; if (language_aliases.empty()) { @@ -364,7 +365,7 @@ resolve_language_alias(const std::string& name) Language Language::from_spec(const std::string& language, const std::string& country, const std::string& modifier) { - static std::map > language_map; + static std::unordered_map > language_map; if (language_map.empty()) { // Init language_map @@ -372,7 +373,7 @@ Language::from_spec(const std::string& language, const std::string& country, con language_map[languages[i].language].push_back(&languages[i]); } - std::map >::iterator i = language_map.find(language); + std::unordered_map >::iterator i = language_map.find(language); if (i != language_map.end()) { std::vector& lst = i->second; diff --git a/source/third_party/tinygettext/src/log.cpp b/source/third_party/tinygettext/src/log.cpp index a3c11d2b9f..9d45a0b4db 100644 --- a/source/third_party/tinygettext/src/log.cpp +++ b/source/third_party/tinygettext/src/log.cpp @@ -18,7 +18,7 @@ #include "precompiled.h" #include -#include "log.hpp" +#include "tinygettext/log.hpp" namespace tinygettext { diff --git a/source/third_party/tinygettext/src/plural_forms.cpp b/source/third_party/tinygettext/src/plural_forms.cpp index e96670e7de..3a25a0acfa 100644 --- a/source/third_party/tinygettext/src/plural_forms.cpp +++ b/source/third_party/tinygettext/src/plural_forms.cpp @@ -17,9 +17,9 @@ #include "precompiled.h" -#include "plural_forms.hpp" +#include "tinygettext/plural_forms.hpp" -#include +#include namespace tinygettext { @@ -49,7 +49,7 @@ unsigned int plural4_gd(int n) { return static_cast( n==1 || n==11 PluralForms PluralForms::from_string(const std::string& str) { - static std::map plural_forms; + static std::unordered_map plural_forms; if (plural_forms.empty()) { @@ -77,7 +77,7 @@ PluralForms::from_string(const std::string& str) if (!isspace(str[i])) space_less_str += str[i]; - std::map::const_iterator it= plural_forms.find(space_less_str); + std::unordered_map::const_iterator it= plural_forms.find(space_less_str); if (it != plural_forms.end()) { return it->second; diff --git a/source/third_party/tinygettext/src/po_parser.cpp b/source/third_party/tinygettext/src/po_parser.cpp index 146c3ed585..74aeeb70be 100644 --- a/source/third_party/tinygettext/src/po_parser.cpp +++ b/source/third_party/tinygettext/src/po_parser.cpp @@ -17,30 +17,30 @@ #include "precompiled.h" -#include "po_parser.hpp" +#include "tinygettext/po_parser.hpp" #include #include #include #include #include -#include +#include #include -#include "language.hpp" -#include "log_stream.hpp" -#include "iconv.hpp" -#include "dictionary.hpp" -#include "plural_forms.hpp" +#include "tinygettext/language.hpp" +#include "tinygettext/log_stream.hpp" +#include "tinygettext/iconv.hpp" +#include "tinygettext/dictionary.hpp" +#include "tinygettext/plural_forms.hpp" namespace tinygettext { bool POParser::pedantic = true; - + void -POParser::parse(const std::string& filename, std::istream& in, Dictionary& dict, bool use_fuzzy_) +POParser::parse(const std::string& filename, std::istream& in, Dictionary& dict) { - POParser parser(filename, in, dict, use_fuzzy_); + POParser parser(filename, in, dict); parser.parse(); } @@ -93,9 +93,9 @@ POParser::next_line() } void -POParser::get_string_line(std::ostringstream& out,std::string::size_type skip) +POParser::get_string_line(std::ostringstream& out, size_t skip) { - if (skip+1 >= static_cast(current_line.size())) + if (skip+1 >= static_cast(current_line.size())) error("unexpected end of line"); if (current_line[skip] != '"') @@ -161,11 +161,11 @@ POParser::get_string_line(std::ostringstream& out,std::string::size_type skip) } std::string -POParser::get_string(std::string::size_type skip) +POParser::get_string(unsigned int skip) { std::ostringstream out; - if (skip+1 >= static_cast(current_line.size())) + if (skip+1 >= static_cast(current_line.size())) error("unexpected end of line"); if (current_line[skip] == ' ' && current_line[skip+1] == '"') @@ -179,7 +179,7 @@ POParser::get_string(std::string::size_type skip) for(;;) { - if (skip >= static_cast(current_line.size())) + if (skip >= static_cast(current_line.size())) error("unexpected end of line"); else if (current_line[skip] == '\"') { @@ -209,7 +209,7 @@ next: if (pedantic) warning("leading whitespace before string"); - get_string_line(out, i); + get_string_line(out, i); goto next; } else if (isspace(current_line[i])) @@ -247,7 +247,7 @@ POParser::parse_header(const std::string& header) if (has_prefix(line, "Content-Type:")) { // from_charset = line.substr(len); - std::string::size_type len = strlen("Content-Type: text/plain; charset="); + unsigned int len = strlen("Content-Type: text/plain; charset="); if (line.compare(0, len, "Content-Type: text/plain; charset=") == 0) { from_charset = line.substr(len); @@ -396,7 +396,7 @@ POParser::parse() current_line.size() > 8 && isdigit(current_line[7]) && current_line[8] == ']') { - std::string::size_type number = static_cast(current_line[7] - '0'); + unsigned int number = static_cast(current_line[7] - '0'); std::string msgstr = get_string(9); if(!msgstr.empty()) diff --git a/source/third_party/tinygettext/src/unix_file_system.cpp b/source/third_party/tinygettext/src/unix_file_system.cpp index 33cd1c1f72..d93ad89520 100644 --- a/source/third_party/tinygettext/src/unix_file_system.cpp +++ b/source/third_party/tinygettext/src/unix_file_system.cpp @@ -17,7 +17,7 @@ #include "precompiled.h" -#include "unix_file_system.hpp" +#include "tinygettext/unix_file_system.hpp" #include #include @@ -60,10 +60,10 @@ UnixFileSystem::open_directory(const std::string& pathname) } } -std::auto_ptr +std::unique_ptr UnixFileSystem::open_file(const std::string& filename) { - return std::auto_ptr(new std::ifstream(filename.c_str())); + return std::unique_ptr(new std::ifstream(filename.c_str())); } } // namespace tinygettext