forked from qt-creator/qt-creator
namespace ProFileEvaluatorInternal => QMakeInternal
Change-Id: I0ffa76e802c0cc00d1866e7fe09ae54a6f535a6f Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
@@ -43,7 +43,7 @@
|
|||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
using namespace ProFileEvaluatorInternal;
|
using namespace QMakeInternal;
|
||||||
|
|
||||||
IoUtils::FileType IoUtils::fileType(const QString &fileName)
|
IoUtils::FileType IoUtils::fileType(const QString &fileName)
|
||||||
{
|
{
|
||||||
|
@@ -35,7 +35,7 @@
|
|||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
namespace ProFileEvaluatorInternal {
|
namespace QMakeInternal {
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
This class provides replacement functionality for QFileInfo, QFile & QDir,
|
This class provides replacement functionality for QFileInfo, QFile & QDir,
|
||||||
|
@@ -35,7 +35,7 @@
|
|||||||
|
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
|
|
||||||
using namespace ProFileEvaluatorInternal;
|
using namespace QMakeInternal;
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
@@ -66,7 +66,7 @@
|
|||||||
#define QT_PCLOSE pclose
|
#define QT_PCLOSE pclose
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
using namespace ProFileEvaluatorInternal;
|
using namespace QMakeInternal;
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
@@ -60,7 +60,7 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
using namespace ProFileEvaluatorInternal;
|
using namespace QMakeInternal;
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
@@ -95,7 +95,7 @@ QMakeBaseEnv::~QMakeBaseEnv()
|
|||||||
delete evaluator;
|
delete evaluator;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace ProFileEvaluatorInternal {
|
namespace QMakeInternal {
|
||||||
QMakeStatics statics;
|
QMakeStatics statics;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -165,7 +165,7 @@ public:
|
|||||||
QString currentDirectory() const;
|
QString currentDirectory() const;
|
||||||
ProFile *currentProFile() const;
|
ProFile *currentProFile() const;
|
||||||
QString resolvePath(const QString &fileName) 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,
|
bool evaluateFile(const QString &fileName, QMakeHandler::EvalFileType type,
|
||||||
LoadFlags flags);
|
LoadFlags flags);
|
||||||
|
@@ -64,7 +64,7 @@
|
|||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
namespace ProFileEvaluatorInternal {
|
namespace QMakeInternal {
|
||||||
|
|
||||||
struct QMakeStatics {
|
struct QMakeStatics {
|
||||||
QString field_sep;
|
QString field_sep;
|
||||||
|
@@ -31,7 +31,7 @@
|
|||||||
#include "qmakeparser.h"
|
#include "qmakeparser.h"
|
||||||
|
|
||||||
#include "ioutils.h"
|
#include "ioutils.h"
|
||||||
using namespace ProFileEvaluatorInternal;
|
using namespace QMakeInternal;
|
||||||
|
|
||||||
#include <qfile.h>
|
#include <qfile.h>
|
||||||
#ifdef PROPARSER_THREAD_SAFE
|
#ifdef PROPARSER_THREAD_SAFE
|
||||||
|
Reference in New Issue
Block a user