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

Fix build after upstream change

Browse Source 
Use Utils::Id. The upstream files no longer automatically include
the Core::Id wrapper.

Change-Id: I7b4d6ef865df44b47e07248bb653a913ba68c494
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2020-07-07 11:47:13 +02:00
parent 6ab75271a8
commit cef9a471e6
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();
}
}