diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-06-17 12:23:44 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-06-18 06:39:54 +0000 |
| commit | 7c5ed6f7d99362af743f30916d031d441abc1984 (patch) | |
| tree | 7b8ef47da6e256e79f2e0034c0334350907c3057 /src/plugins/diffeditor | |
| parent | c70c6ded30610afff34447a65da905e993e0e9b6 (diff) | |
Move InfoBar to Utils
The only reason it was required to be in Core plugin, was its use of Id,
which now is available in Utils.
Change-Id: I66ce863c24924e6448d339b3422538a7fe167336
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/diffeditor')
| -rw-r--r-- | src/plugins/diffeditor/diffeditorwidgetcontroller.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp index 8c408ae389..253bf67a61 100644 --- a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp +++ b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp @@ -30,7 +30,6 @@ #include <coreplugin/documentmanager.h> #include <coreplugin/editormanager/editormanager.h> -#include <coreplugin/infobar.h> #include <coreplugin/patchtool.h> #include <texteditor/fontsettings.h> @@ -40,6 +39,7 @@ #include <cpaster/codepasterservice.h> +#include <utils/infobar.h> #include <utils/progressindicator.h> #include <utils/qtcassert.h> #include <utils/temporaryfile.h> @@ -307,15 +307,15 @@ void DiffEditorWidgetController::updateCannotDecodeInfo() if (!m_document) return; - InfoBar *infoBar = m_document->infoBar(); + Utils::InfoBar *infoBar = m_document->infoBar(); Id selectEncodingId(Constants::SELECT_ENCODING); if (m_document->hasDecodingError()) { if (!infoBar->canInfoBeAdded(selectEncodingId)) return; - InfoBarEntry info(selectEncodingId, - tr("<b>Error:</b> Could not decode \"%1\" with \"%2\"-encoding.") - .arg(m_document->displayName(), - QString::fromLatin1(m_document->codec()->name()))); + Utils::InfoBarEntry info(selectEncodingId, + tr("<b>Error:</b> Could not decode \"%1\" with \"%2\"-encoding.") + .arg(m_document->displayName(), + QString::fromLatin1(m_document->codec()->name()))); info.setCustomButtonInfo(tr("Select Encoding"), [this]() { m_document->selectEncoding(); }); infoBar->addInfo(info); } else { |