Move "Clear/Clean" icon from ProjectExplorer to Core

And use it in the menu entry for
"Window->Output Panes->Clear"

Change-Id: Iff8c011fde8a21fd10bf52b35163eb3f63659153
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>

src/plugins/coreplugin/coreicons.cpp

@@ -95,7 +95,9 @@ const Icon PREV_TOOLBAR({
         {QLatin1String(":/core/images/prev.png"), Theme::IconsNavigationArrowsColor}});
 const Icon MAGNIFIER({
         {QLatin1String(":/core/images/magnifier.png"), Theme::PanelTextColorMid}}, Icon::Tint);
-const Icon CLEAN_PANE({
+const Icon CLEAN({
+        {QLatin1String(":/core/images/clean_pane_small.png"), Theme::PanelTextColorMid}}, Utils::Icon::Tint);
+const Icon CLEAN_TOOLBAR({
         {QLatin1String(":/core/images/clean_pane_small.png"), Theme::IconsBaseColor}});
 const Icon RELOAD({
         {QLatin1String(":/core/images/reload_gray.png"), Theme::IconsBaseColor}});

src/plugins/coreplugin/coreicons.h

@@ -65,7 +65,8 @@ CORE_EXPORT extern const Utils::Icon NEXT_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon PREV;
 CORE_EXPORT extern const Utils::Icon PREV_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon MAGNIFIER;
-CORE_EXPORT extern const Utils::Icon CLEAN_PANE;
+CORE_EXPORT extern const Utils::Icon CLEAN;
+CORE_EXPORT extern const Utils::Icon CLEAN_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon RELOAD;
 CORE_EXPORT extern const Utils::Icon TOGGLE_SIDEBAR;
 CORE_EXPORT extern const Utils::Icon TOGGLE_SIDEBAR_TOOLBAR;

src/plugins/coreplugin/outputpanemanager.cpp

@@ -140,7 +140,7 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
     m_titleLabel->setContentsMargins(5, 0, 5, 0);
 
     m_clearAction = new QAction(this);
-    m_clearAction->setIcon(Icons::CLEAN_PANE.icon());
+    m_clearAction->setIcon(Icons::CLEAN.icon());
     m_clearAction->setText(tr("Clear"));
     connect(m_clearAction, &QAction::triggered, this, &OutputPaneManager::clearPage);
 
@@ -227,6 +227,7 @@ void OutputPaneManager::init()
 
     cmd = ActionManager::registerAction(m_clearAction, "Coreplugin.OutputPane.clear");
     m_clearButton->setDefaultAction(cmd->action());
+    m_clearButton->setIcon(Icons::CLEAN_TOOLBAR.icon());
     mpanes->addAction(cmd, "Coreplugin.OutputPane.ActionsGroup");
 
     cmd = ActionManager::registerAction(m_prevAction, "Coreplugin.OutputPane.previtem");

src/plugins/cppeditor/cppinsertvirtualmethods.cpp

@@ -1023,7 +1023,7 @@ void InsertVirtualMethodsDialog::initGui()
             m_overrideReplacementComboBox, &QComboBox::setEnabled);
 
     QAction *clearUserAddedReplacements = new QAction(this);
-    clearUserAddedReplacements->setIcon(Core::Icons::CLEAN_PANE.icon());
+    clearUserAddedReplacements->setIcon(Core::Icons::CLEAN_TOOLBAR.icon());
     clearUserAddedReplacements->setText(tr("Clear Added \"override\" Equivalents"));
     connect(clearUserAddedReplacements, &QAction::triggered, [this]() {
        m_availableOverrideReplacements = defaultOverrideReplacements();

src/plugins/projectexplorer/projectexplorer.cpp

@@ -841,7 +841,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD);
 
     // clean session
-    dd->m_cleanSessionAction = new QAction(Icons::CLEAN.icon(), tr("Clean All"), this);
+    dd->m_cleanSessionAction = new QAction(Core::Icons::CLEAN.icon(), tr("Clean All"), this);
     cmd = ActionManager::registerAction(dd->m_cleanSessionAction, Constants::CLEANSESSION);
     mbuild->addAction(cmd, Constants::G_BUILD_CLEAN);
     msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD);

src/plugins/projectexplorer/projectexplorericons.h

@@ -37,8 +37,6 @@ const Utils::Icon BUILD_FLAT({
         {QLatin1String(":/projectexplorer/images/build_hammerhead_mask.png"), Utils::Theme::IconsBuildHammerHeadColor}});
 const Utils::Icon BUILD_SMALL(
         QLatin1String(":/projectexplorer/images/build_small.png"));
-const Utils::Icon CLEAN({
-        {QLatin1String(":/core/images/clean_pane_small.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint);
 const Utils::Icon REBUILD({
         {QLatin1String(":/projectexplorer/images/rebuildhammerhandles.png"), Utils::Theme::IconsBuildHammerHandleColor},
         {QLatin1String(":/projectexplorer/images/rebuildhammerheads.png"), Utils::Theme::IconsBuildHammerHeadColor}}, Utils::Icon::Tint);

src/plugins/qmlprofiler/qmlprofilertool.cpp

@@ -205,7 +205,7 @@ QmlProfilerTool::QmlProfilerTool(QObject *parent)
     setRecording(d->m_profilerState->clientRecording());
 
     d->m_clearButton = new QToolButton;
-    d->m_clearButton->setIcon(Core::Icons::CLEAN_PANE.icon());
+    d->m_clearButton->setIcon(Core::Icons::CLEAN_TOOLBAR.icon());
     d->m_clearButton->setToolTip(tr("Discard data"));
 
     connect(d->m_clearButton, &QAbstractButton::clicked, [this](){