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:
Tobias Hunger
2010-01-07 18:17:24 +01:00
parent 8bb87fcda4
commit a6ad773722
332 changed files with 1666 additions and 1543 deletions

View File

@@ -39,13 +39,15 @@ struct BaseVCSSubmitEditorFactoryPrivate
BaseVCSSubmitEditorFactoryPrivate(const VCSBaseSubmitEditorParameters *parameters);
const VCSBaseSubmitEditorParameters *m_parameters;
const QString m_kind;
const QString m_id;
const QString m_displayName;
const QStringList m_mimeTypes;
};
BaseVCSSubmitEditorFactoryPrivate::BaseVCSSubmitEditorFactoryPrivate(const VCSBaseSubmitEditorParameters *parameters) :
m_parameters(parameters),
m_kind(QLatin1String(parameters->kind)),
m_id(parameters->id),
m_displayName(parameters->displayName),
m_mimeTypes(QLatin1String(parameters->mimeType))
{
}
@@ -65,11 +67,17 @@ Core::IEditor *BaseVCSSubmitEditorFactory::createEditor(QWidget *parent)
return createBaseSubmitEditor(m_d->m_parameters, parent);
}
QString BaseVCSSubmitEditorFactory::kind() const
QString BaseVCSSubmitEditorFactory::id() const
{
return m_d->m_kind;
return m_d->m_id;
}
QString BaseVCSSubmitEditorFactory::displayName() const
{
return m_d->m_displayName;
}
QStringList BaseVCSSubmitEditorFactory::mimeTypes() const
{
return m_d->m_mimeTypes;
@@ -77,7 +85,7 @@ QStringList BaseVCSSubmitEditorFactory::mimeTypes() const
Core::IFile *BaseVCSSubmitEditorFactory::open(const QString &fileName)
{
if (Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, kind()))
if (Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, id()))
return iface->file();
return 0;
}