widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug_1760581-fix-UnicodeString into lp:widelands.

Commit message:
Fixed compile error in bidi.h and icu 61

Requested reviews:
  GunChleoc (gunchleoc)
Related bugs:
  Bug #1760581 in widelands: "bidi.h: 'UnicodeString' does not name a type"
  https://bugs.launchpad.net/widelands/+bug/1760581

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug_1760581-fix-UnicodeString/+merge/342544

Already reviewed and tested

@bunnybot merge
-- 
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug_1760581-fix-UnicodeString.

=== modified file 'src/graphic/text/bidi.h'
--- src/graphic/text/bidi.h	2017-01-25 18:55:59 +0000
+++ src/graphic/text/bidi.h	2018-04-03 08:47:09 +0000
@@ -40,7 +40,7 @@
 // True if a string contains a character from the script's code blocks
 bool has_script_character(const char* input, UI::FontSets::Selector script);
 UI::FontSet const* find_fontset(const char* word, const UI::FontSets& fontsets);
-std::string icustring2string(const UnicodeString& convertme);
+std::string icustring2string(const icu::UnicodeString& convertme);
 std::string icuchar2string(const UChar& convertme);
 bool cannot_start_line(const UChar& c);
 bool cannot_end_line(const UChar& c);