diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2020-01-27 22:46:18 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2020-01-31 12:10:50 +0000 |
| commit | b6f137afef222bfde9b13f1685cde9737f4c5a2b (patch) | |
| tree | bd9600e507d1844edbc5a5cb663ed4210871b1de /plugins/fossil/fossilclient.cpp | |
| parent | b418e205cf3661a491afa5f608a612dee316141b (diff) | |
Adapt to upstream changes
Change-Id: Ibdbd3abcfd65b091744451830625e2135c6573d9
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'plugins/fossil/fossilclient.cpp')
| -rw-r--r-- | plugins/fossil/fossilclient.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/plugins/fossil/fossilclient.cpp b/plugins/fossil/fossilclient.cpp index 7e7fe80..092cd56 100644 --- a/plugins/fossil/fossilclient.cpp +++ b/plugins/fossil/fossilclient.cpp @@ -243,7 +243,7 @@ QString FossilClient::makeVersionString(unsigned version) .arg(versionPart(version)); } -FossilClient::FossilClient() : VcsBase::VcsBaseClient(new FossilSettings) +FossilClient::FossilClient(FossilSettings *settings) : VcsBase::VcsBaseClient(settings) { setDiffConfigCreator([this](QToolBar *toolBar) { return new FossilDiffConfig(this, toolBar); @@ -825,10 +825,8 @@ QString FossilClient::findTopLevelForFile(const QFileInfo &file) const { const QString repositoryCheckFile = Constants::FOSSILREPO; return file.isDir() ? - VcsBase::VcsBasePlugin::findRepositoryForDirectory(file.absoluteFilePath(), - repositoryCheckFile) : - VcsBase::VcsBasePlugin::findRepositoryForDirectory(file.absolutePath(), - repositoryCheckFile); + VcsBase::findRepositoryForDirectory(file.absoluteFilePath(), repositoryCheckFile) : + VcsBase::findRepositoryForDirectory(file.absolutePath(), repositoryCheckFile); } bool FossilClient::managesFile(const QString &workingDirectory, const QString &fileName) const |