feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Make method naming more consistent.

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
View File

@@ -266,14 +266,14 @@ bool EditorManagerPrototype::closeEditors(const QList<Core::IEditor*> editorsToC
return callee()->closeEditors(editorsToClose, askAboutModifiedEditors);
}
Core::IEditor *EditorManagerPrototype::openEditor(const QString &fileName, const QString &editorKind)
Core::IEditor *EditorManagerPrototype::openEditor(const QString &fileName, const QString &editorId)
{
return callee()->openEditor(fileName, editorKind);
return callee()->openEditor(fileName, editorId);
}
Core::IEditor *EditorManagerPrototype::newFile(const QString &editorKind, QString titlePattern, const QString &contents)
Core::IEditor *EditorManagerPrototype::newFile(const QString &editorId, QString titlePattern, const QString &contents)
{
return callee()->openEditorWithContents(editorKind, &titlePattern, contents);
return callee()->openEditorWithContents(editorId, &titlePattern, contents);
}
int EditorManagerPrototype::makeEditorWritable(Core::IEditor *editor)
@@ -310,9 +310,9 @@ void EditorPrototype::setDisplayName(const QString &title)
callee()->setDisplayName(title);
}
QString EditorPrototype::kind() const
QString EditorPrototype::id() const
{
return QLatin1String(callee()->kind());
return callee()->id();
}
bool EditorPrototype::duplicateSupported() const

8
src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
View File

@@ -178,8 +178,8 @@ public:
public slots:
QList<Core::IEditor*> editorsForFiles(QList<Core::IFile*> files) const;
bool closeEditors(const QList<Core::IEditor*> editorsToClose, bool askAboutModifiedEditors);
Core::IEditor *openEditor(const QString &fileName, const QString &editorKind);
Core::IEditor *newFile(const QString &editorKind, QString titlePattern, const QString &contents);
Core::IEditor *openEditor(const QString &fileName, const QString &editorId);
Core::IEditor *newFile(const QString &editorId, QString titlePattern, const QString &contents);
int makeEditorWritable(Core::IEditor *editor);
QString toString() const;
@@ -194,7 +194,7 @@ class EditorPrototype : public QObject, public QScriptable
{
Q_OBJECT
Q_PROPERTY(QString displayName READ displayName WRITE setDisplayName DESIGNABLE false SCRIPTABLE true STORED false)
Q_PROPERTY(QString kind READ kind DESIGNABLE false SCRIPTABLE true STORED false)
Q_PROPERTY(QString id READ id DESIGNABLE false SCRIPTABLE true STORED false)
Q_PROPERTY(bool duplicateSupported READ duplicateSupported DESIGNABLE false SCRIPTABLE true STORED false)
Q_PROPERTY(Core::IFile* file READ file DESIGNABLE false SCRIPTABLE true STORED false)
Q_PROPERTY(QWidget* toolBar READ toolBar DESIGNABLE false SCRIPTABLE true STORED false)
@@ -205,7 +205,7 @@ public:
QString displayName() const;
void setDisplayName(const QString &title);
QString kind() const;
QString id() const;
bool duplicateSupported() const;
Core::IFile *file() const;