Actually do the last commit, but completely this time

114007f1 · louiz’ · bd7936bd · 114007f1 · 114007f1
Commit 114007f1 authored Apr 18, 2014 by louiz’
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

src/bridge/colors.cpp src/bridge/colors.cpp +3 -3

src/test.cpp src/test.cpp +4 -0

No files found.
--- a/src/bridge/colors.cpp
+++ b/src/bridge/colors.cpp
@@ -73,7 +73,7 @@ Xmpp::body irc_format_to_xhtmlim(const std::string& s)
      if (current_node->has_children())
        current_node->get_last_child()->add_to_tail(txt);
      else
-        current_node->set_inner(txt);
+        current_node->add_to_inner(txt);
      if (s[pos_end] == IRC_FORMAT_BOLD_CHAR)
        styles.strong = !styles.strong;
@@ -151,9 +151,9 @@ Xmpp::body irc_format_to_xhtmlim(const std::string& s)
  const std::string txt = s.substr(pos_start, pos_end-pos_start);
  cleaned += txt;
  if (current_node->has_children())
-    current_node->get_last_child()->set_tail(txt);
+    current_node->get_last_child()->add_to_tail(txt);
  else
-    current_node->set_inner(txt);
+    current_node->add_to_inner(txt);
  if (current_node != result.get())
    {

--- a/src/test.cpp
+++ b/src/test.cpp
@@ -148,6 +148,10 @@ int main()
  assert(xhtml->to_string() == "<body xmlns='http://www.w3.org/1999/xhtml'>[<span style='font-style:italic;'/><span style='font-style:italic;color:lightmagenta;'>dolphin-emu/dolphin</span><span style='color:lightmagenta;'>] </span><span style='color:green;'>foo</span> commented on #283 (Add support for the guide button to XInput): <span style='text-decoration:underline;'/><span style='text-decoration:underline;color:blue;'>http://example.com</span><span style='text-decoration:underline;'/></body>");
  assert(cleaned_up == "[dolphin-emu/dolphin] foo commented on #283 (Add support for the guide button to XInput): http://example.com");
+  std::tie(cleaned_up, xhtml) = irc_format_to_xhtmlim("0e46ab by 03Pierre Dindon [090|091|040] 02http://example.net/Ojrh4P media: avoid pop-in effect when loading thumbnails by specifying an explicit size");
+  assert(cleaned_up == "0e46ab by Pierre Dindon [0|1|0] http://example.net/Ojrh4P media: avoid pop-in effect when loading thumbnails by specifying an explicit size");
+  assert(xhtml->to_string() == "<body xmlns='http://www.w3.org/1999/xhtml'>0e46ab by <span style='color:green;'>Pierre Dindon</span> [<span style='color:lightgreen;'>0</span>|<span style='color:lightgreen;'>1</span>|<span style='color:indianred;'>0</span>] <span style='text-decoration:underline;'/><span style='text-decoration:underline;color:blue;'>http://example.net/Ojrh4P</span><span style='text-decoration:underline;'/> media: avoid pop-in effect when loading thumbnails by specifying an explicit size</body>");
  /**
   * JID parsing
   */