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

Rename some methods and variables in DiffEditor

Browse Source 
Change-Id: Ic6db2882c9468b9451a785e4657e4255b40fca4c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
jkobus
2014-07-07 10:23:11 +02:00
committed by Jarek Kobus
parent 91e4271069
commit 5ebd59d12b
8 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/diffeditor/diffeditordocument.cpp
View File

@@ -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);