From 8f9f655a0cd7d5aa86387264284ed0ea58c241ea Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 3 Sep 2012 21:30:28 +0200 Subject: [PATCH] namespace ProFileEvaluatorInternal => QMakeInternal Change-Id: I0ffa76e802c0cc00d1866e7fe09ae54a6f535a6f Reviewed-by: Daniel Teske --- src/shared/proparser/ioutils.cpp | 2 +- src/shared/proparser/ioutils.h | 2 +- src/shared/proparser/profileevaluator.cpp | 2 +- src/shared/proparser/qmakebuiltins.cpp | 2 +- src/shared/proparser/qmakeevaluator.cpp | 4 ++-- src/shared/proparser/qmakeevaluator.h | 2 +- src/shared/proparser/qmakeevaluator_p.h | 2 +- src/shared/proparser/qmakeparser.cpp | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/shared/proparser/ioutils.cpp b/src/shared/proparser/ioutils.cpp index fa26a1235b4..41198f75fbe 100644 --- a/src/shared/proparser/ioutils.cpp +++ b/src/shared/proparser/ioutils.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -using namespace ProFileEvaluatorInternal; +using namespace QMakeInternal; IoUtils::FileType IoUtils::fileType(const QString &fileName) { diff --git a/src/shared/proparser/ioutils.h b/src/shared/proparser/ioutils.h index 1fdb736c690..11d58a50b77 100644 --- a/src/shared/proparser/ioutils.h +++ b/src/shared/proparser/ioutils.h @@ -35,7 +35,7 @@ QT_BEGIN_NAMESPACE -namespace ProFileEvaluatorInternal { +namespace QMakeInternal { /*! This class provides replacement functionality for QFileInfo, QFile & QDir, diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index 32c1da0179b..a0fb9ae6990 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -35,7 +35,7 @@ #include -using namespace ProFileEvaluatorInternal; +using namespace QMakeInternal; QT_BEGIN_NAMESPACE diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp index c725e14fb12..568cbbc35a4 100644 --- a/src/shared/proparser/qmakebuiltins.cpp +++ b/src/shared/proparser/qmakebuiltins.cpp @@ -66,7 +66,7 @@ #define QT_PCLOSE pclose #endif -using namespace ProFileEvaluatorInternal; +using namespace QMakeInternal; QT_BEGIN_NAMESPACE diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 901cf2219f8..4fa44faf00e 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -60,7 +60,7 @@ #include #include -using namespace ProFileEvaluatorInternal; +using namespace QMakeInternal; QT_BEGIN_NAMESPACE @@ -95,7 +95,7 @@ QMakeBaseEnv::~QMakeBaseEnv() delete evaluator; } -namespace ProFileEvaluatorInternal { +namespace QMakeInternal { QMakeStatics statics; } diff --git a/src/shared/proparser/qmakeevaluator.h b/src/shared/proparser/qmakeevaluator.h index 84b7c5557dd..f84f0502faf 100644 --- a/src/shared/proparser/qmakeevaluator.h +++ b/src/shared/proparser/qmakeevaluator.h @@ -165,7 +165,7 @@ public: QString currentDirectory() const; ProFile *currentProFile() const; QString resolvePath(const QString &fileName) const - { return ProFileEvaluatorInternal::IoUtils::resolvePath(currentDirectory(), fileName); } + { return QMakeInternal::IoUtils::resolvePath(currentDirectory(), fileName); } bool evaluateFile(const QString &fileName, QMakeHandler::EvalFileType type, LoadFlags flags); diff --git a/src/shared/proparser/qmakeevaluator_p.h b/src/shared/proparser/qmakeevaluator_p.h index faf6c52b2bc..63821e4c49c 100644 --- a/src/shared/proparser/qmakeevaluator_p.h +++ b/src/shared/proparser/qmakeevaluator_p.h @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE -namespace ProFileEvaluatorInternal { +namespace QMakeInternal { struct QMakeStatics { QString field_sep; diff --git a/src/shared/proparser/qmakeparser.cpp b/src/shared/proparser/qmakeparser.cpp index 5e1a7414df4..aacb8e30fe7 100644 --- a/src/shared/proparser/qmakeparser.cpp +++ b/src/shared/proparser/qmakeparser.cpp @@ -31,7 +31,7 @@ #include "qmakeparser.h" #include "ioutils.h" -using namespace ProFileEvaluatorInternal; +using namespace QMakeInternal; #include #ifdef PROPARSER_THREAD_SAFE