summaryrefslogtreecommitdiff
path: root/src/plugins/diffeditor/diffeditordocument.cpp
diff options
context:
space:
mode:
authorjkobus <jaroslaw.kobus@digia.com>2014-07-07 10:23:11 +0200
committerJarek Kobus <jaroslaw.kobus@digia.com>2014-07-07 10:34:17 +0200
commit5ebd59d12b3211376cec2055be48233c34725c48 (patch)
tree9ef9bb2104ba8f80e4cb3f1d53cdd8468b703698 /src/plugins/diffeditor/diffeditordocument.cpp
parent91e42710697944375780708b2e8637b2f57608ac (diff)
downloadqt-creator-5ebd59d12b3211376cec2055be48233c34725c48.tar.gz
Rename some methods and variables in DiffEditor
Change-Id: Ic6db2882c9468b9451a785e4657e4255b40fca4c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditordocument.cpp')
-rw-r--r--src/plugins/diffeditor/diffeditordocument.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp
index e36fcd6a8e..817f0d946c 100644
--- a/src/plugins/diffeditor/diffeditordocument.cpp
+++ b/src/plugins/diffeditor/diffeditordocument.cpp
@@ -43,7 +43,7 @@ namespace DiffEditor {
DiffEditorDocument::DiffEditorDocument() :
Core::TextDocument(),
- m_diffEditorController(new DiffEditorController(this))
+ m_controller(new DiffEditorController(this))
{
setId(Constants::DIFF_EDITOR_ID);
setTemporary(true);
@@ -55,7 +55,7 @@ DiffEditorDocument::~DiffEditorDocument()
DiffEditorController *DiffEditorDocument::controller() const
{
- return m_diffEditorController;
+ return m_controller;
}
bool DiffEditorDocument::setContents(const QByteArray &contents)
@@ -66,10 +66,10 @@ bool DiffEditorDocument::setContents(const QByteArray &contents)
QString DiffEditorDocument::defaultPath() const
{
- if (!m_diffEditorController)
+ if (!m_controller)
return QString();
- return m_diffEditorController->workingDirectory();
+ return m_controller->workingDirectory();
}
bool DiffEditorDocument::save(QString *errorString, const QString &fileName, bool autoSave)
@@ -77,10 +77,10 @@ bool DiffEditorDocument::save(QString *errorString, const QString &fileName, boo
Q_UNUSED(errorString)
Q_UNUSED(autoSave)
- if (!m_diffEditorController)
+ if (!m_controller)
return false;
- const QString contents = DiffUtils::makePatch(m_diffEditorController->diffFiles());
+ const QString contents = DiffUtils::makePatch(m_controller->diffFiles());
const bool ok = write(fileName, format(), contents, errorString);