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

VCS: Use source() for file path where applicable

Browse Source 
Task-number: QTCREATORBUG-9834

Change-Id: I5ee84593c56a0e3beaf20ef643b04d4de40c37f3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-07-17 21:06:30 +03:00
committed by Orgad Shaneh
parent 1478e661ed
commit 93dd2795ba
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/vcsbase/vcsbaseplugin.cpp
View File

@@ -234,10 +234,19 @@ void StateListener::slotStateChanged()
// folder?
State state;
Core::IDocument *currentDocument = Core::EditorManager::currentDocument();
if (!currentDocument)
if (!currentDocument) {
state.currentFile.clear();
else
} else {
state.currentFile = currentDocument->filePath();
if (state.currentFile.isEmpty()) {
const QList<Core::IEditor *> editors =
Core::EditorManager::documentModel()->editorsForDocument(currentDocument);
if (!editors.isEmpty()) {
if (QWidget *editorWidget = editors.first()->widget())
state.currentFile = editorWidget->property("source").toString();
}
}
}
QScopedPointer<QFileInfo> currentFileInfo; // Instantiate QFileInfo only once if required.
if (!state.currentFile.isEmpty()) {
const bool isTempFile = state.currentFile.startsWith(QDir::tempPath());
@@ -266,7 +275,9 @@ void StateListener::slotStateChanged()
if (!state.currentFile.isEmpty()) {
if (currentFileInfo.isNull())
currentFileInfo.reset(new QFileInfo(state.currentFile));
state.currentFileDirectory = currentFileInfo->absolutePath();
state.currentFileDirectory =
currentFileInfo->isDir() ? currentFileInfo->absoluteFilePath() :
currentFileInfo->absolutePath();
state.currentFileName = currentFileInfo->fileName();
fileControl = vcsManager->findVersionControlForDirectory(state.currentFileDirectory,
&state.currentFileTopLevel);