forked from qt-creator/qt-creator
move value() implementation down to ProFileEvaluator
This commit is contained in:
@@ -87,16 +87,6 @@ QList<ProFile*> ProFileReader::includeFiles() const
|
|||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString ProFileReader::value(const QString &variable) const
|
|
||||||
{
|
|
||||||
const QStringList &vals = values(variable);
|
|
||||||
if (!vals.isEmpty())
|
|
||||||
return vals.first();
|
|
||||||
|
|
||||||
return QString();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void ProFileReader::fileMessage(const QString &message)
|
void ProFileReader::fileMessage(const QString &message)
|
||||||
{
|
{
|
||||||
Q_UNUSED(message)
|
Q_UNUSED(message)
|
||||||
|
|||||||
@@ -51,8 +51,6 @@ public:
|
|||||||
bool readProFile(const QString &fileName);
|
bool readProFile(const QString &fileName);
|
||||||
QList<ProFile*> includeFiles() const;
|
QList<ProFile*> includeFiles() const;
|
||||||
|
|
||||||
QString value(const QString &variable) const;
|
|
||||||
|
|
||||||
ProFile *proFileFor(const QString &name);
|
ProFile *proFileFor(const QString &name);
|
||||||
signals:
|
signals:
|
||||||
void errorFound(const QString &error);
|
void errorFound(const QString &error);
|
||||||
|
|||||||
@@ -4080,6 +4080,15 @@ static QStringList expandEnvVars(const ProStringList &x)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString ProFileEvaluator::value(const QString &variable) const
|
||||||
|
{
|
||||||
|
const QStringList &vals = values(variable);
|
||||||
|
if (!vals.isEmpty())
|
||||||
|
return vals.first();
|
||||||
|
|
||||||
|
return QString();
|
||||||
|
}
|
||||||
|
|
||||||
QStringList ProFileEvaluator::values(const QString &variableName) const
|
QStringList ProFileEvaluator::values(const QString &variableName) const
|
||||||
{
|
{
|
||||||
return expandEnvVars(d->values(ProString(variableName)));
|
return expandEnvVars(d->values(ProString(variableName)));
|
||||||
|
|||||||
@@ -90,6 +90,7 @@ public:
|
|||||||
bool accept(ProFile *pro);
|
bool accept(ProFile *pro);
|
||||||
|
|
||||||
bool contains(const QString &variableName) const;
|
bool contains(const QString &variableName) const;
|
||||||
|
QString value(const QString &variableName) const;
|
||||||
QStringList values(const QString &variableName) const;
|
QStringList values(const QString &variableName) const;
|
||||||
QStringList values(const QString &variableName, const ProFile *pro) const;
|
QStringList values(const QString &variableName, const ProFile *pro) const;
|
||||||
QStringList absolutePathValues(const QString &variable, const QString &baseDirectory) const;
|
QStringList absolutePathValues(const QString &variable, const QString &baseDirectory) const;
|
||||||
|
|||||||
Reference in New Issue
Block a user