From 27943d2e8c2709271c49e868db9769a61d201de4 Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 7 Jun 2010 18:23:28 +0000 Subject: [PATCH] ported trunk commit 3078: bug correction in chat smiley substitution git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.0@3082 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/chat/HandleRichText.cpp | 4 +--- retroshare-gui/src/gui/chat/HandleRichText.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/retroshare-gui/src/gui/chat/HandleRichText.cpp b/retroshare-gui/src/gui/chat/HandleRichText.cpp index afb00ed35..33a603153 100644 --- a/retroshare-gui/src/gui/chat/HandleRichText.cpp +++ b/retroshare-gui/src/gui/chat/HandleRichText.cpp @@ -55,10 +55,8 @@ void EmbedInHtmlImg::InitFromAwkwardHash(const QHash< QString, QString >& hash) * @param[in,out] currentElement The current node (which is of type Element) * @param[in] embedInfos The regular expression and the type of embedding to use */ -void embedHtml(QDomDocument& doc, QDomElement& currentElement, const EmbedInHtml& _embedInfos) +void embedHtml(QDomDocument& doc, QDomElement& currentElement, EmbedInHtml& embedInfos) { - EmbedInHtml embedInfos(_embedInfos) ; - if(embedInfos.myRE.pattern().length() == 0) // we'll get stuck with an empty regexp return; diff --git a/retroshare-gui/src/gui/chat/HandleRichText.h b/retroshare-gui/src/gui/chat/HandleRichText.h index 458a11100..bd6d481f2 100644 --- a/retroshare-gui/src/gui/chat/HandleRichText.h +++ b/retroshare-gui/src/gui/chat/HandleRichText.h @@ -103,7 +103,7 @@ public: }; -void embedHtml(QDomDocument& doc, QDomElement& currentElement, const EmbedInHtml& embedInfos); +void embedHtml(QDomDocument& doc, QDomElement& currentElement, EmbedInHtml& embedInfos); } // namespace RsChat