diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2010-01-07 18:17:24 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2010-01-07 18:17:24 +0100 |
| commit | a6ad773722a758df46813afd7af42625a0f3e276 (patch) | |
| tree | 8a74e3bb0fe819603e3ce5ed867116e75acc8d64 /src/plugins/qt4projectmanager/wizards/guiappwizard.cpp | |
| parent | 8bb87fcda497d09ac3ba39b38b9c229d02022b09 (diff) | |
Make method naming more consistent.
* Use id() for methods returning a string used to represent
some type of object.
* Use displayName() for strings that are meant to be user
visible.
* Quieten some warnings while touching the files anyway.
* Move Factories to their products in the plugins where that
was not done before.
Reviewed-by: dt
Diffstat (limited to 'src/plugins/qt4projectmanager/wizards/guiappwizard.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/wizards/guiappwizard.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp index 0634a69d87..871cf20cec 100644 --- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp @@ -83,11 +83,11 @@ QWizard *GuiAppWizard::createWizardDialog(QWidget *parent, const QString &defaultPath, const WizardPageList &extensionPages) const { - GuiAppWizardDialog *dialog = new GuiAppWizardDialog(name(), icon(), extensionPages, + GuiAppWizardDialog *dialog = new GuiAppWizardDialog(displayName(), icon(), extensionPages, showModulesPageForApplications(), parent); dialog->setPath(defaultPath); - dialog->setName(GuiAppWizardDialog::projectName(defaultPath)); + dialog->setProjectName(GuiAppWizardDialog::uniqueProjectName(defaultPath)); // Order! suffixes first to generate files correctly dialog->setLowerCaseFiles(QtWizard::lowerCaseFiles()); dialog->setSuffixes(headerSuffix(), sourceSuffix(), formSuffix()); @@ -169,7 +169,7 @@ Core::GeneratedFiles GuiAppWizard::generateFiles(const QWizard *w, formHeader.setContents(license + contents); } // Create files: profile - const QString profileName = buildFileName(projectPath, projectParams.name, profileSuffix()); + const QString profileName = buildFileName(projectPath, projectParams.fileName, profileSuffix()); Core::GeneratedFile profile(profileName); contents.clear(); { |