Merge lp:~widelands-dev/widelands/bug_1760581-fix-UnicodeString into lp:widelands

[GunChleoc]

Fixed compile error in bidi.h and icu 61

Already reviewed and tested

@bunnybot merge

[GunChleoc (gunchleoc)]

review: Approve

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3335. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/361556708.
Appveyor build 3141. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1760581_fix_UnicodeString-3141.

[kaputtnik (franku)]

All fine.

@bunnybot merge

=== 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);