forked from qt-creator/qt-creator
Include namespaces inside header guard
Task: QTCREATORBUG-2724 RevBy: Friedemann Kleint <qtc-committer@nokia.com>
This commit is contained in:
@@ -58,10 +58,18 @@ QTCREATOR_UTILS_EXPORT QString fileNameToCppIdentifier(const QString &s)
|
||||
|
||||
QTCREATOR_UTILS_EXPORT QString headerGuard(const QString &file)
|
||||
{
|
||||
return headerGuard(file, QStringList());
|
||||
}
|
||||
|
||||
QTCREATOR_UTILS_EXPORT QString headerGuard(const QString &file, const QStringList &namespaceList)
|
||||
{
|
||||
const QChar underscore = QLatin1Char('_');
|
||||
QString rc;
|
||||
for (int i = 0; i < namespaceList.count(); i++)
|
||||
rc += namespaceList.at(i).toUpper() + underscore;
|
||||
|
||||
const QFileInfo fi(file);
|
||||
QString rc = fileNameToCppIdentifier(fi.completeBaseName()).toUpper();
|
||||
rc += QLatin1Char('_');
|
||||
rc += fileNameToCppIdentifier(fi.suffix()).toUpper();
|
||||
rc += fileNameToCppIdentifier(fi.fileName()).toUpper();
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user