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

Adapt to 4.12

Browse Source 
Change-Id: Ie49d91582dac4b130c8fcd7db2ce19249ed3f057
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Orgad Shaneh
2020-01-31 14:48:28 +02:00
committed by Orgad Shaneh
parent 86f7c7bf12
commit 57e8de1e0b
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/fossil/fossilclient.cpp
View File

@@ -150,11 +150,12 @@ public:
// So we kludge this by coding it as a meta-option (pipe-separated),
// then parse it out in arguments.
// All-choice is a blank argument with no additional parameters
QList<ComboBoxItem> lineageFilterChoices;
lineageFilterChoices << ComboBoxItem(tr("Ancestors"), "ancestors")
<< ComboBoxItem(tr("Descendants"), "descendants")
<< ComboBoxItem(tr("Unfiltered"), "");
mapSetting(addComboBox(QStringList("|LINEAGE|%1|current"), lineageFilterChoices),
const QList<ChoiceItem> lineageFilterChoices = {
ChoiceItem(tr("Ancestors"), "ancestors"),
ChoiceItem(tr("Descendants"), "descendants"),
ChoiceItem(tr("Unfiltered"), "")
};
mapSetting(addChoices(tr("Lineage"), QStringList("|LINEAGE|%1|current"), lineageFilterChoices),
settings.stringPointer(FossilSettings::timelineLineageFilterKey));
}
@@ -173,20 +174,20 @@ public:
VcsBase::VcsBaseClientSettings &settings = m_client->settings();
// option: -t <val>
const QList<ComboBoxItem> itemTypeChoices = {
ComboBoxItem(tr("All Items"), "all"),
ComboBoxItem(tr("File Commits"), "ci"),
ComboBoxItem(tr("Technical Notes"), "e"),
ComboBoxItem(tr("Tags"), "g"),
ComboBoxItem(tr("Tickets"), "t"),
ComboBoxItem(tr("Wiki Commits"), "w")
const QList<ChoiceItem> itemTypeChoices = {
ChoiceItem(tr("All Items"), "all"),
ChoiceItem(tr("File Commits"), "ci"),
ChoiceItem(tr("Technical Notes"), "e"),
ChoiceItem(tr("Tags"), "g"),
ChoiceItem(tr("Tickets"), "t"),
ChoiceItem(tr("Wiki Commits"), "w")
};
// here we setup the ComboBox to map to the "-t <val>", which will produce
// the enquoted option-values (e.g "-t all").
// Fossil expects separate arguments for option and value ( i.e. "-t" "all")
// so we need to handle the splitting explicitly in arguments().
mapSetting(addComboBox(QStringList("-t %1"), itemTypeChoices),
mapSetting(addChoices(tr("Item Types"), QStringList("-t %1"), itemTypeChoices),
settings.stringPointer(FossilSettings::timelineItemTypeKey));
}

4
plugins/fossil/fossilplugin.cpp
View File

@@ -1171,7 +1171,7 @@ void Fossil::Internal::FossilPlugin::testDiffFileResolving_data()
void Fossil::Internal::FossilPlugin::testDiffFileResolving()
{
VcsBase::VcsBaseEditorWidget::testDiffFileResolving(diffParameters.id);
VcsBase::VcsBaseEditorWidget::testDiffFileResolving(dd->diffFactory);
}
void Fossil::Internal::FossilPlugin::testLogResolving()
@@ -1184,6 +1184,6 @@ void Fossil::Internal::FossilPlugin::testLogResolving()
" EDITED src/core/scaler.cpp\n"
" EDITED src/core/scaler.h\n"
);
VcsBase::VcsBaseEditorWidget::testLogResolving(fileLogParameters.id, data, "ac6d1129b8", "56d6917c3b");
VcsBase::VcsBaseEditorWidget::testLogResolving(dd->fileLogFactory, data, "ac6d1129b8", "56d6917c3b");
}
#endif