From 2a3684fb2fb55119d9c977be4a9c3fd3ce562ec2 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 18 Aug 2011 13:58:23 +0200
Subject: [PATCH] Compile fix Windows.
Change-Id: I93048cf9e4fda2d261037408967c30a0f5796110
Reviewed-on: http://codereview.qt.nokia.com/3181
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
src/plugins/projectexplorer/msvcparser.cpp | 7 ++-----
src/plugins/projectexplorer/msvcparser.h | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/plugins/projectexplorer/msvcparser.cpp b/src/plugins/projectexplorer/msvcparser.cpp
index 77ba7ca6534..96428634b1f 100644
--- a/src/plugins/projectexplorer/msvcparser.cpp
+++ b/src/plugins/projectexplorer/msvcparser.cpp
@@ -33,9 +33,8 @@
#include "msvcparser.h"
#include "projectexplorerconstants.h"
-namespace {
-const char * const FILE_POS_PATTERN = "(cl|LINK|.+) : ";
-const char * const ERROR_PATTERN = "[A-Z]+\\d\\d\\d\\d ?:";
+static const char FILE_POS_PATTERN[] = "(cl|LINK|.+) : ";
+static const char ERROR_PATTERN[] = "[A-Z]+\\d\\d\\d\\d ?:";
static QPair<QString, int> parseFileName(const QString &input)
{
@@ -60,8 +59,6 @@ static QPair<QString, int> parseFileName(const QString &input)
return qMakePair(fileName, linenumber);
}
-} // namespace
-
using namespace ProjectExplorer;
MsvcParser::MsvcParser()
diff --git a/src/plugins/projectexplorer/msvcparser.h b/src/plugins/projectexplorer/msvcparser.h
index 118ac375d46..d7890f28d38 100644
--- a/src/plugins/projectexplorer/msvcparser.h
+++ b/src/plugins/projectexplorer/msvcparser.h
@@ -34,7 +34,7 @@
#define MSVCPARSER_H
#include "ioutputparser.h"
-#include "taskwindow.h"
+#include "task.h"
#include <QtCore/QRegExp>
#include <QtCore/QString>
--
GitLab