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

Merge remote-tracking branch 'origin/4.13'

Browse Source 
Change-Id: I87977120608b94bd2576b2217337c02fe34e4ceb
This commit is contained in:
Orgad Shaneh
2020-07-17 07:35:57 +03:00
parent a0f4ce71e8 cef9a471e6
commit a8c30c9253
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/fossil/fossilclient.cpp
View File

@@ -772,7 +772,7 @@ VcsBase::VcsBaseEditorWidget *FossilClient::annotate(
// annotate shows line numbers
QString vcsCmdString = vcsCommandString(AnnotateCommand);
const Core::Id kind = vcsEditorKind(AnnotateCommand);
const Id kind = vcsEditorKind(AnnotateCommand);
const QString id = VcsBase::VcsBaseEditor::getTitleId(workingDir, QStringList(file), revision);
const QString title = vcsEditorTitle(vcsCmdString, id);
const QString source = VcsBase::VcsBaseEditor::getSource(workingDir, file);
@@ -924,7 +924,7 @@ void FossilClient::view(const QString &source, const QString &id, const QStringL
<< "-v"
<< extraOptions;
const Core::Id kind = vcsEditorKind(DiffCommand);
const Id kind = vcsEditorKind(DiffCommand);
const QString title = vcsEditorTitle(vcsCommandString(DiffCommand), id);
VcsBase::VcsBaseEditorWidget *editor = createVcsEditor(kind, title, source,
@@ -995,7 +995,7 @@ void FossilClient::log(const QString &workingDir, const QStringList &files,
}
const QString vcsCmdString = vcsCommandString(LogCommand);
const Core::Id kind = vcsEditorKind(LogCommand);
const Id kind = vcsEditorKind(LogCommand);
const QString id = VcsBase::VcsBaseEditor::getTitleId(workingDir, files);
const QString title = vcsEditorTitle(vcsCmdString, id);
const QString source = VcsBase::VcsBaseEditor::getSource(workingDir, files);
@@ -1047,7 +1047,7 @@ void FossilClient::logCurrentFile(const QString &workingDir, const QStringList &
}
const QString vcsCmdString = "finfo";
const Core::Id kind = vcsEditorKind(LogCommand);
const Id kind = vcsEditorKind(LogCommand);
const QString id = VcsBase::VcsBaseEditor::getTitleId(workingDir, files);
const QString title = vcsEditorTitle(vcsCmdString, id);
const QString source = VcsBase::VcsBaseEditor::getSource(workingDir, files);
@@ -1157,7 +1157,7 @@ QString FossilClient::vcsCommandString(VcsCommandTag cmd) const
}
}
Core::Id FossilClient::vcsEditorKind(VcsCommandTag cmd) const
Id FossilClient::vcsEditorKind(VcsCommandTag cmd) const
{
switch (cmd) {
case AnnotateCommand:
@@ -1167,7 +1167,7 @@ Core::Id FossilClient::vcsEditorKind(VcsCommandTag cmd) const
case LogCommand:
return Constants::FILELOG_ID;
default:
return Core::Id();
return Id();
}
}

2
plugins/fossil/fossilclient.h
View File

@@ -122,7 +122,7 @@ private:
QString sanitizeFossilOutput(const QString &output) const;
QString vcsCommandString(VcsCommandTag cmd) const final;
Core::Id vcsEditorKind(VcsCommandTag cmd) const final;
Utils::Id vcsEditorKind(VcsCommandTag cmd) const final;
QStringList revisionSpec(const QString &revision) const final;
StatusItem parseStatusLine(const QString &line) const final;
VcsBase::VcsBaseEditorConfig *createAnnotateEditor(VcsBase::VcsBaseEditorWidget *editor);

6
plugins/fossil/fossilplugin.cpp
View File

@@ -148,7 +148,7 @@ public:
// IVersionControl
QString displayName() const final;
Core::Id id() const final;
Id id() const final;
bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final;
@@ -896,9 +896,9 @@ QString FossilPluginPrivate::displayName() const
return tr("Fossil");
}
Core::Id FossilPluginPrivate::id() const
Id FossilPluginPrivate::id() const
{
return Core::Id(Constants::VCS_ID_FOSSIL);
return Id(Constants::VCS_ID_FOSSIL);
}
bool FossilPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &filePath) const

2
plugins/fossil/wizard/fossiljsextension.cpp
View File

@@ -47,7 +47,7 @@ public:
{
}
Core::Id m_vscId;
Utils::Id m_vscId;
VcsBase::VcsBaseClientSettings *m_settings;
};