From edf33c56e1f3985b827595023f94a7e2bca1b92e Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 7 Jan 2011 11:47:00 +0100
Subject: [PATCH] projectexplorer: move OutputFormat to separate file
---
src/plugins/projectexplorer/outputformat.h | 50 +++++++++++++++++++
src/plugins/projectexplorer/outputformatter.h | 22 +++-----
.../projectexplorer/projectexplorer.pro | 1 +
3 files changed, 59 insertions(+), 14 deletions(-)
create mode 100644 src/plugins/projectexplorer/outputformat.h
diff --git a/src/plugins/projectexplorer/outputformat.h b/src/plugins/projectexplorer/outputformat.h
new file mode 100644
index 00000000000..3d6624a4fc6
--- /dev/null
+++ b/src/plugins/projectexplorer/outputformat.h
@@ -0,0 +1,50 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** No Commercial Usage
+**
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**************************************************************************/
+
+#ifndef OUTPUTFORMAT_H
+#define OUTPUTFORMAT_H
+
+namespace ProjectExplorer {
+
+enum OutputFormat
+{
+ NormalMessageFormat,
+ ErrorMessageFormat,
+ StdOutFormat,
+ StdErrFormat,
+ NumberOfFormats // Keep this entry last.
+};
+
+} // namespace ProjectExplorer
+
+#endif // OUTPUTFORMATR_H
diff --git a/src/plugins/projectexplorer/outputformatter.h b/src/plugins/projectexplorer/outputformatter.h
index a24a8cc7b78..f21d40a5e17 100644
--- a/src/plugins/projectexplorer/outputformatter.h
+++ b/src/plugins/projectexplorer/outputformatter.h
@@ -35,26 +35,20 @@
#define OUTPUTFORMATTER_H
#include "projectexplorer_export.h"
+#include "outputformat.h"
#include <QtCore/QObject>
-QT_FORWARD_DECLARE_CLASS(QMouseEvent)
-QT_FORWARD_DECLARE_CLASS(QPlainTextEdit)
-QT_FORWARD_DECLARE_CLASS(QTextCharFormat)
-QT_FORWARD_DECLARE_CLASS(QColor)
+QT_BEGIN_NAMESPACE
+class QMouseEvent;
+class QPlainTextEdit;
+class QTextCharFormat;
+class QColor;
+QT_END_NAMESPACE
namespace ProjectExplorer {
-enum OutputFormat
-{
- NormalMessageFormat,
- ErrorMessageFormat,
- StdOutFormat,
- StdErrFormat,
- NumberOfFormats // Keep this entry last.
-};
-
-class PROJECTEXPLORER_EXPORT OutputFormatter: public QObject
+class PROJECTEXPLORER_EXPORT OutputFormatter : public QObject
{
Q_OBJECT
diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro
index 33364198821..ceb3417bf69 100644
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/src/plugins/projectexplorer/projectexplorer.pro
@@ -87,6 +87,7 @@ HEADERS += projectexplorer.h \
buildenvironmentwidget.h \
ldparser.h \
linuxiccparser.h \
+ outputformat.h \
outputformatter.h \
runconfigurationmodel.h \
buildconfigurationmodel.h \
--
GitLab