From 4f4dde55a309c9426fecc370a8a7925896df12ad Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 29 Jun 2014 17:34:09 +0300 Subject: [PATCH] Rename variables that refer to document from editor to document Change-Id: I82114ffb66e29e8ac2e1b41138f6ddadfc266d07 Reviewed-by: Fawzi Mohamed --- src/plugins/qmljseditor/qmloutlinemodel.cpp | 6 +++--- src/plugins/qmljseditor/qmloutlinemodel.h | 2 +- src/plugins/vcsbase/vcsbaseplugin.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/qmljseditor/qmloutlinemodel.cpp b/src/plugins/qmljseditor/qmloutlinemodel.cpp index 6269be9d9e5..badde4ef699 100644 --- a/src/plugins/qmljseditor/qmloutlinemodel.cpp +++ b/src/plugins/qmljseditor/qmloutlinemodel.cpp @@ -298,9 +298,9 @@ private: int indent; }; -QmlOutlineModel::QmlOutlineModel(QmlJSEditorDocument *editor) : - QStandardItemModel(editor), - m_editorDocument(editor) +QmlOutlineModel::QmlOutlineModel(QmlJSEditorDocument *document) : + QStandardItemModel(document), + m_editorDocument(document) { m_icons = Icons::instance(); const QString resourcePath = Core::ICore::resourcePath(); diff --git a/src/plugins/qmljseditor/qmloutlinemodel.h b/src/plugins/qmljseditor/qmloutlinemodel.h index 9aeda58cc10..a127a92a494 100644 --- a/src/plugins/qmljseditor/qmloutlinemodel.h +++ b/src/plugins/qmljseditor/qmloutlinemodel.h @@ -81,7 +81,7 @@ public: NonElementBindingType // can be filtered out }; - QmlOutlineModel(QmlJSEditorDocument *editor); + QmlOutlineModel(QmlJSEditorDocument *document); // QStandardItemModel QStringList mimeTypes() const; diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index 49042f71d54..ff6758d9e2c 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -747,14 +747,14 @@ bool VcsBasePlugin::isSshPromptConfigured() static const char SOURCE_PROPERTY[] = "qtcreator_source"; -void VcsBasePlugin::setSource(Core::IDocument *editor, const QString &source) +void VcsBasePlugin::setSource(Core::IDocument *document, const QString &source) { - editor->setProperty(SOURCE_PROPERTY, source); + document->setProperty(SOURCE_PROPERTY, source); } -QString VcsBasePlugin::source(Core::IDocument *editor) +QString VcsBasePlugin::source(Core::IDocument *document) { - return editor->property(SOURCE_PROPERTY).toString(); + return document->property(SOURCE_PROPERTY).toString(); } void VcsBasePlugin::setProcessEnvironment(QProcessEnvironment *e,