mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
fixup! Merge branch 'master' into chatlog_v3_1
This commit is contained in:
parent
52f220c9e4
commit
e67db1575d
|
@ -197,7 +197,7 @@ QString ChatMessage::detectQuotes(const QString& str)
|
|||
QString quotedText;
|
||||
for (int i=0;i<messageLines.size();++i)
|
||||
{
|
||||
if (QRegExp("^[ ]*>.*").exactMatch(messageLines[i]))
|
||||
if (QRegExp("^>( |>|[^_\\d\\W]).*").exactMatch(messageLines[i]))
|
||||
quotedText += "<span class=quote>" + messageLines[i] + "</span>";
|
||||
else
|
||||
quotedText += messageLines[i];
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
#include "chatform.h"
|
||||
#include "src/core.h"
|
||||
#include "src/friend.h"
|
||||
#include "src/filetransferinstance.h"
|
||||
#include "src/historykeeper.h"
|
||||
#include "src/misc/style.h"
|
||||
#include "src/misc/settings.h"
|
||||
|
@ -34,16 +33,11 @@
|
|||
#include "src/widget/callconfirmwidget.h"
|
||||
#include "src/widget/friendwidget.h"
|
||||
#include "src/widget/netcamview.h"
|
||||
#include "src/widget/chatareawidget.h"
|
||||
#include "src/widget/form/loadhistorydialog.h"
|
||||
#include "src/widget/tool/chattextedit.h"
|
||||
#include "src/widget/tool/chatactions/filetransferaction.h"
|
||||
#include "src/widget/widget.h"
|
||||
#include "src/widget/maskablepixmapwidget.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/content/filetransferwidget.h"
|
||||
#include "src/chatlog/chatlinecontentproxy.h"
|
||||
|
|
Loading…
Reference in New Issue
Block a user