forked from qt-creator/qt-creator
VcsBase: Proliferate use of FilePath
... and update user code. Change-Id: I52c08e9e07238536d31fc72f97312ac582a1e32f Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -14,8 +14,6 @@
|
||||
#include <QString>
|
||||
#include <QTextCursor>
|
||||
#include <QTextBlock>
|
||||
#include <QDir>
|
||||
#include <QFileInfo>
|
||||
#include <QDebug>
|
||||
|
||||
using namespace Utils;
|
||||
@@ -57,18 +55,17 @@ VcsBase::BaseAnnotationHighlighter *MercurialEditorWidget::createAnnotationHighl
|
||||
|
||||
QString MercurialEditorWidget::decorateVersion(const QString &revision) const
|
||||
{
|
||||
const QFileInfo fi(source());
|
||||
const QString workingDirectory = fi.absolutePath();
|
||||
const FilePath workingDirectory = source().absolutePath();
|
||||
// Format with short summary
|
||||
return m_client->shortDescriptionSync(FilePath::fromString(workingDirectory), revision);
|
||||
return m_client->shortDescriptionSync(workingDirectory, revision);
|
||||
}
|
||||
|
||||
QStringList MercurialEditorWidget::annotationPreviousVersions(const QString &revision) const
|
||||
{
|
||||
const QFileInfo fi(source());
|
||||
const QString workingDirectory = fi.absolutePath();
|
||||
const FilePath filePath = source();
|
||||
const FilePath workingDirectory = filePath.absolutePath();
|
||||
// Retrieve parent revisions
|
||||
return m_client->parentRevisionsSync(FilePath::fromString(workingDirectory), fi.fileName(), revision);
|
||||
return m_client->parentRevisionsSync(workingDirectory, filePath.fileName(), revision);
|
||||
}
|
||||
|
||||
} // Mercurial::Internal
|
||||
|
||||
Reference in New Issue
Block a user