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

C++-Settings/License template: Add %FILENAME%, %CLASS% placeholders.

Browse Source 
... for doxygen. Change logic for known empty keywords to be replaced
by an empty string.

Task-number: QTCREATORBUG-1854
This commit is contained in:
Friedemann Kleint
2010-08-09 12:23:21 +02:00
parent 934a9590c4
commit 7ab30d8a63
14 changed files with 78 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/designer/cpp/formclasswizardparameters.cpp
View File

@@ -341,7 +341,10 @@ bool FormClassWizardParametersPrivate::generateCpp(const FormClassWizardGenerati
const QString unqualifiedClassName = namespaceList.takeLast();
const QString license = CppTools::AbstractEditorSupport::licenseTemplate();
const QString headerLicense =
CppTools::AbstractEditorSupport::licenseTemplate(headerFile, className);
const QString sourceLicense =
CppTools::AbstractEditorSupport::licenseTemplate(sourceFile, className);
// Include guards
const QString guard = Utils::headerGuard(headerFile);
@@ -351,7 +354,7 @@ bool FormClassWizardParametersPrivate::generateCpp(const FormClassWizardGenerati
// 1) Header file
QTextStream headerStr(header);
headerStr << license << "#ifndef " << guard
headerStr << headerLicense << "#ifndef " << guard
<< "\n#define " << guard << '\n' << '\n';
// Include 'ui_'
@@ -409,7 +412,7 @@ bool FormClassWizardParametersPrivate::generateCpp(const FormClassWizardGenerati
// 2) Source file
QTextStream sourceStr(source);
sourceStr << license;
sourceStr << sourceLicense;
Utils::writeIncludeFileDirective(headerFile, false, sourceStr);
if (embedding == FormClassWizardGenerationParameters::PointerAggregatedUiClass)
Utils::writeIncludeFileDirective(uiInclude, false, sourceStr);