StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fixup! Merge branch 'master' into chatlog_v3_1

Browse Source
This commit is contained in:
krepa098 2015-02-02 14:50:06 +01:00
parent 52f220c9e4
commit e67db1575d
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chatlog/chatmessage.cpp
View File

@ -197,7 +197,7 @@ QString ChatMessage::detectQuotes(const QString& str)
QString quotedText; QString quotedText;
for (int i=0;i<messageLines.size();++i) for (int i=0;i<messageLines.size();++i)
{ {
if (QRegExp("^[ ]*&gt;.*").exactMatch(messageLines[i])) if (QRegExp("^&gt;( |&gt;|[^_\\d\\W]).*").exactMatch(messageLines[i]))
quotedText += "<span class=quote>" + messageLines[i] + "</span>"; quotedText += "<span class=quote>" + messageLines[i] + "</span>";
else else
quotedText += messageLines[i]; quotedText += messageLines[i];

6
src/widget/form/chatform.cpp
View File

@ -26,7 +26,6 @@
#include "chatform.h" #include "chatform.h"
#include "src/core.h" #include "src/core.h"
#include "src/friend.h" #include "src/friend.h"
#include "src/filetransferinstance.h"
#include "src/historykeeper.h" #include "src/historykeeper.h"
#include "src/misc/style.h" #include "src/misc/style.h"
#include "src/misc/settings.h" #include "src/misc/settings.h"
@ -34,16 +33,11 @@
#include "src/widget/callconfirmwidget.h" #include "src/widget/callconfirmwidget.h"
#include "src/widget/friendwidget.h" #include "src/widget/friendwidget.h"
#include "src/widget/netcamview.h" #include "src/widget/netcamview.h"
#include "src/widget/chatareawidget.h"
#include "src/widget/form/loadhistorydialog.h" #include "src/widget/form/loadhistorydialog.h"
#include "src/widget/tool/chattextedit.h" #include "src/widget/tool/chattextedit.h"
#include "src/widget/tool/chatactions/filetransferaction.h"
#include "src/widget/widget.h" #include "src/widget/widget.h"
#include "src/widget/maskablepixmapwidget.h" #include "src/widget/maskablepixmapwidget.h"
#include "src/widget/croppinglabel.h" #include "src/widget/croppinglabel.h"
#include "src/misc/style.h"
#include "src/misc/settings.h"
#include "src/misc/cstring.h"
#include "src/chatlog/chatmessage.h" #include "src/chatlog/chatmessage.h"
#include "src/chatlog/content/filetransferwidget.h" #include "src/chatlog/content/filetransferwidget.h"
#include "src/chatlog/chatlinecontentproxy.h" #include "src/chatlog/chatlinecontentproxy.h"