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

@@ -278,8 +278,10 @@ QmlEditorEditable::QmlEditorEditable(QmlTextEditor *editor)
{
Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
m_context << uidm->uniqueIdentifier(QmlEditor::Constants::C_QMLEDITOR);
m_context << uidm->uniqueIdentifier(QmlEditor::Constants::C_QMLEDITOR_ID);
m_context << uidm->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR);
setDisplayName(tr(QmlEditor::Constants::C_QMLEDITOR_DISPLAY_NAME));
}
QmlTextEditor::QmlTextEditor(QWidget *parent) :
@@ -328,9 +330,9 @@ Core::IEditor *QmlEditorEditable::duplicate(QWidget *parent)
return newEditor->editableInterface();
}
const char *QmlEditorEditable::kind() const
QString QmlEditorEditable::id() const
{
return QmlEditor::Constants::C_QMLEDITOR;
return QLatin1String(QmlEditor::Constants::C_QMLEDITOR_ID);
}
QmlTextEditor::Context QmlEditorEditable::context() const