1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify relative path generation

Browse Source 
instead of hand-crafting the logic, simply use QDir::relativeFilePath()

Change-Id: I5a495ad6bdfa8ec126741180770934e7ebee0495
Reviewed-on: http://codereview.qt.nokia.com/512
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2011-06-10 11:48:16 +02:00 committed by Qt by Nokia
parent 4545b212af
commit e6b744fb4b
1 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/tools/moc/main.cpp
View File

@ -67,34 +67,7 @@ static QByteArray combinePath(const char *infile, const char *outfile)
{ {
QFileInfo inFileInfo(QDir::current(), QFile::decodeName(infile)); QFileInfo inFileInfo(QDir::current(), QFile::decodeName(infile));
QFileInfo outFileInfo(QDir::current(), QFile::decodeName(outfile)); QFileInfo outFileInfo(QDir::current(), QFile::decodeName(outfile));
int numCommonComponents = 0; return QFile::encodeName(outFileInfo.dir().relativeFilePath(inFileInfo.filePath()));
QStringList inSplitted = inFileInfo.dir().canonicalPath().split(QLatin1Char('/'));
QStringList outSplitted = outFileInfo.dir().canonicalPath().split(QLatin1Char('/'));
while (!inSplitted.isEmpty() && !outSplitted.isEmpty() &&
inSplitted.first() == outSplitted.first()) {
inSplitted.removeFirst();
outSplitted.removeFirst();
numCommonComponents++;
}
if (numCommonComponents < 2)
/*
The paths don't have the same drive, or they don't have the
same root directory. Use an absolute path.
*/
return QFile::encodeName(inFileInfo.absoluteFilePath());
/*
The paths have something in common. Use a path relative to
the output file.
*/
while (!outSplitted.isEmpty()) {
outSplitted.removeFirst();
inSplitted.prepend(QLatin1String(".."));
}
inSplitted.append(inFileInfo.fileName());
return QFile::encodeName(inSplitted.join(QLatin1String("/")));
} }