diff options
Diffstat (limited to 'src/plugins/coreplugin/vcsmanager.cpp')
| -rw-r--r-- | src/plugins/coreplugin/vcsmanager.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp index 6b82d89caf..db06547cba 100644 --- a/src/plugins/coreplugin/vcsmanager.cpp +++ b/src/plugins/coreplugin/vcsmanager.cpp @@ -28,17 +28,17 @@ #include "icore.h" #include "documentmanager.h" #include "idocument.h" -#include "infobar.h" #include <coreplugin/dialogs/addtovcsdialog.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> -#include <vcsbase/vcsbaseconstants.h> #include <extensionsystem/pluginmanager.h> #include <utils/algorithm.h> +#include <utils/infobar.h> #include <utils/optional.h> #include <utils/qtcassert.h> +#include <vcsbase/vcsbaseconstants.h> #include <QDir> #include <QString> @@ -48,6 +48,8 @@ #include <QFileInfo> #include <QMessageBox> +using namespace Utils; + namespace Core { #if defined(WITH_TESTS) @@ -296,12 +298,12 @@ IVersionControl* VcsManager::findVersionControlForDirectory(const QString &input } return versionControl; } else { - InfoBar *infoBar = curDocument ? curDocument->infoBar() : nullptr; + Utils::InfoBar *infoBar = curDocument ? curDocument->infoBar() : nullptr; if (infoBar && infoBar->canInfoBeAdded(vcsWarning)) { - InfoBarEntry info(vcsWarning, - tr("%1 repository was detected but %1 is not configured.") - .arg(versionControl->displayName()), - InfoBarEntry::GlobalSuppression::Enabled); + Utils::InfoBarEntry info(vcsWarning, + tr("%1 repository was detected but %1 is not configured.") + .arg(versionControl->displayName()), + Utils::InfoBarEntry::GlobalSuppression::Enabled); d->m_unconfiguredVcs = versionControl; info.setCustomButtonInfo(ICore::msgShowOptionsDialog(), []() { QTC_ASSERT(d->m_unconfiguredVcs, return); @@ -404,7 +406,7 @@ void VcsManager::promptToAdd(const QString &directory, const QStringList &fileNa if (unmanagedFiles.isEmpty()) return; - Internal::AddToVcsDialog dlg(ICore::mainWindow(), VcsManager::msgAddToVcsTitle(), + Internal::AddToVcsDialog dlg(ICore::dialogParent(), VcsManager::msgAddToVcsTitle(), unmanagedFiles, vc->displayName()); if (dlg.exec() == QDialog::Accepted) { QStringList notAddedToVc; @@ -414,7 +416,8 @@ void VcsManager::promptToAdd(const QString &directory, const QStringList &fileNa } if (!notAddedToVc.isEmpty()) { - QMessageBox::warning(ICore::mainWindow(), VcsManager::msgAddToVcsFailedTitle(), + QMessageBox::warning(ICore::dialogParent(), + VcsManager::msgAddToVcsFailedTitle(), VcsManager::msgToAddToVcsFailed(notAddedToVc, vc)); } } |