aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qtsupport/qtoutputformatter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qtsupport/qtoutputformatter.cpp')
-rw-r--r--src/plugins/qtsupport/qtoutputformatter.cpp26
1 files changed, 12 insertions, 14 deletions
diff --git a/src/plugins/qtsupport/qtoutputformatter.cpp b/src/plugins/qtsupport/qtoutputformatter.cpp
index cb5913ad98..17487c9428 100644
--- a/src/plugins/qtsupport/qtoutputformatter.cpp
+++ b/src/plugins/qtsupport/qtoutputformatter.cpp
@@ -142,8 +142,7 @@ void QtOutputFormatter::appendMessage(const QString &txt, OutputFormat format)
appendMessage(txt, charFormat(format));
}
-void QtOutputFormatter::appendMessagePart(QTextCursor &cursor, const QString &txt,
- const QTextCharFormat &format)
+void QtOutputFormatter::appendMessagePart(const QString &txt, const QTextCharFormat &format)
{
QString deferredText;
@@ -156,11 +155,11 @@ void QtOutputFormatter::appendMessagePart(QTextCursor &cursor, const QString &tx
LinkResult lr = matchLine(line);
if (!lr.href.isEmpty()) {
// Found something && line continuation
- cursor.insertText(deferredText, format);
+ d->cursor.insertText(deferredText, format);
deferredText.clear();
if (!d->lastLine.isEmpty())
clearLastLine();
- appendLine(cursor, lr, line, format);
+ appendLine(lr, line, format);
} else {
// Found nothing, just emit the new part
deferredText += newPart;
@@ -172,7 +171,7 @@ void QtOutputFormatter::appendMessagePart(QTextCursor &cursor, const QString &tx
}
d->lastLine.clear(); // Handled line continuation
}
- cursor.insertText(deferredText, format);
+ d->cursor.insertText(deferredText, format);
}
void QtOutputFormatter::appendMessage(const QString &txt, const QTextCharFormat &format)
@@ -182,15 +181,14 @@ void QtOutputFormatter::appendMessage(const QString &txt, const QTextCharFormat
d->cursor.beginEditBlock();
foreach (const FormattedText &output, parseAnsi(txt, format))
- appendMessagePart(d->cursor, output.text, output.format);
+ appendMessagePart(output.text, output.format);
d->cursor.endEditBlock();
}
-void QtOutputFormatter::appendLine(QTextCursor &cursor, const LinkResult &lr,
- const QString &line, OutputFormat format)
+void QtOutputFormatter::appendLine(const LinkResult &lr, const QString &line, OutputFormat format)
{
- appendLine(cursor, lr, line, charFormat(format));
+ appendLine(lr, line, charFormat(format));
}
static QTextCharFormat linkFormat(const QTextCharFormat &inputFormat, const QString &href)
@@ -204,12 +202,12 @@ static QTextCharFormat linkFormat(const QTextCharFormat &inputFormat, const QStr
return result;
}
-void QtOutputFormatter::appendLine(QTextCursor &cursor, const LinkResult &lr,
- const QString &line, const QTextCharFormat &format)
+void QtOutputFormatter::appendLine(const LinkResult &lr, const QString &line,
+ const QTextCharFormat &format)
{
- cursor.insertText(line.left(lr.start), format);
- cursor.insertText(line.mid(lr.start, lr.end - lr.start), linkFormat(format, lr.href));
- cursor.insertText(line.mid(lr.end), format);
+ d->cursor.insertText(line.left(lr.start), format);
+ d->cursor.insertText(line.mid(lr.start, lr.end - lr.start), linkFormat(format, lr.href));
+ d->cursor.insertText(line.mid(lr.end), format);
}
void QtOutputFormatter::handleLink(const QString &href)