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

Include namespaces inside header guard

Browse Source 
Task: QTCREATORBUG-2724
RevBy: Friedemann Kleint <qtc-committer@nokia.com>
This commit is contained in:
Jarek Kobus
2011-01-18 12:18:08 +01:00
parent 11c6ca71ac
commit 0c60770fab
5 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/qt4projectmanager/wizards/libraryparameters.cpp
View File

@@ -74,8 +74,15 @@ void LibraryParameters::generateCode(QtProjectParameters:: Type t,
const QString indent = QString(indentation, QLatin1Char(' '));
// Do we have namespaces?
QStringList namespaceList = className.split(QLatin1String("::"));
if (namespaceList.empty()) // Paranoia!
return;
const QString unqualifiedClassName = namespaceList.takeLast();
// 1) Header
const QString guard = Utils::headerGuard(headerFileName);
const QString guard = Utils::headerGuard(headerFileName, namespaceList);
headerStr << "#ifndef " << guard
<< "\n#define " << guard << '\n' << '\n';
@@ -94,14 +101,6 @@ void LibraryParameters::generateCode(QtProjectParameters:: Type t,
headerStr << '\n';
}
// Do we have namespaces?
QStringList namespaceList = className.split(QLatin1String("::"));
if (namespaceList.empty()) // Paranoia!
return;
const QString unqualifiedClassName = namespaceList.back();
namespaceList.pop_back();
const QString namespaceIndent = Utils::writeOpeningNameSpaces(namespaceList, indent, headerStr);
// Class declaraction