feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

refactoring (from qt)

Browse Source
This commit is contained in:
Oswald Buddenhagen
2008-12-09 20:33:11 +01:00
parent bed8c719c8
commit adc58b0472
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
shared/proparser/profileevaluator.cpp
View File

@@ -1765,28 +1765,13 @@ void ProFileEvaluator::setVerbose(bool on)
d->m_verbose = on; d->m_verbose = on;
} }
bool evaluateProFile(const QString &fileName, bool verbose, QHash<QByteArray, QStringList> *varMap) void evaluateProFile(const ProFileEvaluator &visitor, QHash<QByteArray, QStringList> *varMap)
{ {
QStringList sourceFiles; QStringList sourceFiles;
QString codecForTr; QString codecForTr;
QString codecForSource; QString codecForSource;
QStringList tsFileNames; QStringList tsFileNames;
QFileInfo fi(fileName);
if (!fi.exists())
return false;
ProFile pro(fi.absoluteFilePath());
ProFileEvaluator visitor;
visitor.setVerbose(verbose);
if (!visitor.queryProFile(&pro))
return false;
if (!visitor.accept(&pro))
return false;
// app/lib template // app/lib template
sourceFiles += visitor.values(QLatin1String("SOURCES")); sourceFiles += visitor.values(QLatin1String("SOURCES"));
sourceFiles += visitor.values(QLatin1String("HEADERS")); sourceFiles += visitor.values(QLatin1String("HEADERS"));
@@ -1823,6 +1808,27 @@ bool evaluateProFile(const QString &fileName, bool verbose, QHash<QByteArray, QS
varMap->insert("CODECFORTR", QStringList() << codecForTr); varMap->insert("CODECFORTR", QStringList() << codecForTr);
varMap->insert("CODECFORSRC", QStringList() << codecForSource); varMap->insert("CODECFORSRC", QStringList() << codecForSource);
varMap->insert("TRANSLATIONS", tsFileNames); varMap->insert("TRANSLATIONS", tsFileNames);
}
bool evaluateProFile(const QString &fileName, bool verbose, QHash<QByteArray, QStringList> *varMap)
{
QFileInfo fi(fileName);
if (!fi.exists())
return false;
ProFile pro(fi.absoluteFilePath());
ProFileEvaluator visitor;
visitor.setVerbose(verbose);
if (!visitor.queryProFile(&pro))
return false;
if (!visitor.accept(&pro))
return false;
evaluateProFile(visitor, varMap);
return true; return true;
} }

2
shared/proparser/profileevaluator.h
View File

@@ -45,7 +45,9 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class ProFile; class ProFile;
class ProFileEvaluator;
void evaluateProFile(const ProFileEvaluator &visitor, QHash<QByteArray, QStringList> *varMap);
bool evaluateProFile(const QString &fileName, bool verbose, QHash<QByteArray, QStringList> *varMap); bool evaluateProFile(const QString &fileName, bool verbose, QHash<QByteArray, QStringList> *varMap);
class ProFileEvaluator class ProFileEvaluator