From 1b71e8a53df87f1bd4bb8614b9d79085c07e92be Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Wed, 25 Feb 2015 13:31:40 +0100
Subject: [PATCH] Utils: Remove unneeded double indirection in OutputFormatter

Change-Id: I1af77688172d139cca105ac20086a3b7c5f32df6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/libs/utils/outputformatter.cpp | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp
index 7db2589c168..d9a70f3040e 100644
--- a/src/libs/utils/outputformatter.cpp
+++ b/src/libs/utils/outputformatter.cpp
@@ -43,24 +43,14 @@ class OutputFormatterPrivate
 {
 public:
     OutputFormatterPrivate()
-        : plainTextEdit(0)
-        , formats(0)
-        , escapeCodeHandler(new AnsiEscapeCodeHandler)
-        , overwriteOutput(false)
-    {
-    }
-
-    ~OutputFormatterPrivate()
-    {
-        delete[] formats;
-        delete escapeCodeHandler;
-    }
+        : plainTextEdit(0), overwriteOutput(false)
+    {}
 
     QPlainTextEdit *plainTextEdit;
-    QTextCharFormat *formats;
+    QTextCharFormat formats[NumberOfFormats];
     QFont font;
     QTextCursor cursor;
-    AnsiEscapeCodeHandler *escapeCodeHandler;
+    AnsiEscapeCodeHandler escapeCodeHandler;
     bool overwriteOutput;
 };
 
@@ -118,7 +108,7 @@ QTextCharFormat OutputFormatter::charFormat(OutputFormat format) const
 
 QList<FormattedText> OutputFormatter::parseAnsi(const QString &text, const QTextCharFormat &format)
 {
-    return d->escapeCodeHandler->parseText(FormattedText(text, format));
+    return d->escapeCodeHandler.parseText(FormattedText(text, format));
 }
 
 void OutputFormatter::append(QTextCursor &cursor, const QString &text,
@@ -148,8 +138,6 @@ void OutputFormatter::initFormats()
     QFont boldFont = d->font;
     boldFont.setBold(true);
 
-    d->formats = new QTextCharFormat[NumberOfFormats];
-
     Theme *theme = creatorTheme();
 
     // NormalMessageFormat
@@ -192,7 +180,7 @@ void OutputFormatter::setFont(const QFont &font)
 
 void OutputFormatter::flush()
 {
-    d->escapeCodeHandler->endFormatScope();
+    d->escapeCodeHandler.endFormatScope();
 }
 
 } // namespace Utils