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

@@ -44,7 +44,6 @@ using namespace Designer::Constants;
FormEditorFactory::FormEditorFactory()
: Core::IEditorFactory(Core::ICore::instance()),
m_kind(QLatin1String(C_FORMEDITOR)),
m_mimeTypes(QLatin1String(FORM_MIMETYPE))
{
Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance();
@@ -52,14 +51,19 @@ FormEditorFactory::FormEditorFactory()
QLatin1String("ui"));
}
QString FormEditorFactory::kind() const
QString FormEditorFactory::id() const
{
return C_FORMEDITOR;
return QLatin1String(C_FORMEDITOR_ID);
}
QString FormEditorFactory::displayName() const
{
return tr(C_FORMEDITOR_DISPLAY_NAME);
}
Core::IFile *FormEditorFactory::open(const QString &fileName)
{
Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, kind());
Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, id());
return iface ? iface->file() : 0;
}