forked from qt-creator/qt-creator
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
This commit is contained in:
@@ -46,9 +46,9 @@ QWizard *EmptyProjectWizard::createWizardDialog(QWidget *parent,
|
||||
const QString &defaultPath,
|
||||
const WizardPageList &extensionPages) const
|
||||
{
|
||||
EmptyProjectWizardDialog *dialog = new EmptyProjectWizardDialog(name(), icon(), extensionPages, parent);
|
||||
EmptyProjectWizardDialog *dialog = new EmptyProjectWizardDialog(displayName(), icon(), extensionPages, parent);
|
||||
dialog->setPath(defaultPath);
|
||||
dialog->setName(EmptyProjectWizardDialog::projectName(defaultPath));
|
||||
dialog->setProjectName(EmptyProjectWizardDialog::uniqueProjectName(defaultPath));
|
||||
return dialog;
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ Core::GeneratedFiles
|
||||
const EmptyProjectWizardDialog *wizard = qobject_cast< const EmptyProjectWizardDialog *>(w);
|
||||
const QtProjectParameters params = wizard->parameters();
|
||||
const QString projectPath = params.projectPath();
|
||||
const QString profileName = Core::BaseFileWizard::buildFileName(projectPath, params.name, profileSuffix());
|
||||
const QString profileName = Core::BaseFileWizard::buildFileName(projectPath, params.fileName, profileSuffix());
|
||||
|
||||
Core::GeneratedFile profile(profileName);
|
||||
return Core::GeneratedFiles() << profile;
|
||||
|
||||
Reference in New Issue
Block a user