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

VCS: Rename diffBaseDirectory -> workingDirectory

Browse Source 
Can have other usages than diff

Change-Id: Ieb01a88eb95503ac89b2f2c1120eddf404cdce5a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-10-06 20:52:09 +03:00
committed by Orgad Shaneh
parent 7b08d993bf
commit 2da85dc686
8 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/vcsbase/vcsbaseeditor.cpp
View File

@@ -563,7 +563,7 @@ public:
const VcsBaseEditorParameters *m_parameters;
QString m_source;
QString m_diffBaseDirectory;
QString m_workingDirectory;
QRegExp m_diffFilePattern;
QRegExp m_logEntryPattern;
@@ -779,14 +779,14 @@ void VcsBaseEditorWidget::setFileLogAnnotateEnabled(bool e)
d->m_fileLogAnnotateEnabled = e;
}
QString VcsBaseEditorWidget::diffBaseDirectory() const
QString VcsBaseEditorWidget::workingDirectory() const
{
return d->m_diffBaseDirectory;
return d->m_workingDirectory;
}
void VcsBaseEditorWidget::setDiffBaseDirectory(const QString &bd)
void VcsBaseEditorWidget::setWorkingDirectory(const QString &wd)
{
d->m_diffBaseDirectory = bd;
d->m_workingDirectory = wd;
}
QTextCodec *VcsBaseEditorWidget::codec() const
@@ -1370,8 +1370,8 @@ QString VcsBaseEditorWidget::findDiffFile(const QString &f) const
// 1) Try base dir
const QChar slash = QLatin1Char('/');
if (!d->m_diffBaseDirectory.isEmpty()) {
const QFileInfo baseFileInfo(d->m_diffBaseDirectory + slash + f);
if (!d->m_workingDirectory.isEmpty()) {
const QFileInfo baseFileInfo(d->m_workingDirectory + slash + f);
if (baseFileInfo.isFile())
return baseFileInfo.absoluteFilePath();
}
@@ -1451,8 +1451,8 @@ bool VcsBaseEditorWidget::canApplyDiffChunk(const DiffChunk &dc) const
// (passing '-R' for revert), assuming we got absolute paths from the VCS plugins.
bool VcsBaseEditorWidget::applyDiffChunk(const DiffChunk &dc, bool revert) const
{
return VcsBasePlugin::runPatch(dc.asPatch(d->m_diffBaseDirectory),
d->m_diffBaseDirectory, 0, revert);
return VcsBasePlugin::runPatch(dc.asPatch(d->m_workingDirectory),
d->m_workingDirectory, 0, revert);
}
QString VcsBaseEditorWidget::fileNameFromDiffSpecification(const QTextBlock &inBlock, QString *header) const