Centralize error/warning/info icons

There are multiple copies of these pngs in different plugins.
Let's have one version in core, also as @2x variant.

Change-Id: Iedff1a6190a72c1947dd202ae1ee46f59f9fb13c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>

11 files changed, 15 insertions, 19 deletions

diff --git a/src/plugins/projectexplorer/buildprogress.cpp b/src/plugins/projectexplorer/buildprogress.cpp
index 65623f1f27..0300d1ffc8 100644
--- a/src/plugins/projectexplorer/buildprogress.cpp
+++ b/src/plugins/projectexplorer/buildprogress.cpp
@@ -30,6 +30,7 @@
 #include "buildprogress.h"
 #include "projectexplorerconstants.h"
 
+#include <coreplugin/coreconstants.h>
 #include <utils/stylehelper.h>
 
 #include <QVBoxLayout>
@@ -85,8 +86,8 @@ BuildProgress::BuildProgress(TaskWindow *taskWindow, Qt::Orientation orientation
 
     m_errorIcon->setAlignment(Qt::AlignRight);
     m_warningIcon->setAlignment(Qt::AlignRight);
-    m_errorIcon->setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_ERROR)));
-    m_warningIcon->setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)));
+    m_errorIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_ERROR)));
+    m_warningIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
 
     m_contentWidget->hide();
 
diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp
index 475e4f152d..d346ab2cbc 100644
--- a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp
+++ b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp
@@ -31,6 +31,7 @@
 #include "ui_desktopdeviceconfigurationwidget.h"
 #include <projectexplorer/projectexplorerconstants.h>
 
+#include <coreplugin/coreconstants.h>
 #include <utils/portlist.h>
 #include <utils/qtcassert.h>
 
@@ -73,7 +74,7 @@ void DesktopDeviceConfigurationWidget::initGui()
     m_ui->freePortsLineEdit->setPlaceholderText(
                 QString::fromLatin1("eg: %1-%2").arg(DESKTOP_PORT_START).arg(DESKTOP_PORT_END));
     m_ui->portsWarningLabel->setPixmap(
-                QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)));
+                QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
     m_ui->portsWarningLabel->setToolTip(QLatin1String("<font color=\"red\">")
                                         + tr("You will need at least one port for QML debugging.")
                                         + QLatin1String("</font>"));
diff --git a/src/plugins/projectexplorer/images/compile_error.png b/src/plugins/projectexplorer/images/compile_error.png
deleted file mode 100644
index 71496e0437..0000000000
--- a/src/plugins/projectexplorer/images/compile_error.png
+++ /dev/null
diff --git a/src/plugins/projectexplorer/images/compile_warning.png b/src/plugins/projectexplorer/images/compile_warning.png
deleted file mode 100644
index 645cc5fd58..0000000000
--- a/src/plugins/projectexplorer/images/compile_warning.png
+++ /dev/null
diff --git a/src/plugins/projectexplorer/kitmodel.cpp b/src/plugins/projectexplorer/kitmodel.cpp
index be87d31d3a..e0920fb8ac 100644
--- a/src/plugins/projectexplorer/kitmodel.cpp
+++ b/src/plugins/projectexplorer/kitmodel.cpp
@@ -32,8 +32,8 @@
 #include "kit.h"
 #include "kitmanagerconfigwidget.h"
 #include "kitmanager.h"
-#include "projectexplorerconstants.h"
 
+#include <coreplugin/coreconstants.h>
 #include <utils/qtcassert.h>
 
 #include <QApplication>
@@ -156,8 +156,8 @@ int KitModel::columnCount(const QModelIndex &parent) const
 
 QVariant KitModel::data(const QModelIndex &index, int role) const
 {
-    static QIcon warningIcon(QString::fromLatin1(ProjectExplorer::Constants::ICON_WARNING));
-    static QIcon errorIcon(QString::fromLatin1(ProjectExplorer::Constants::ICON_ERROR));
+    static QIcon warningIcon(QString::fromLatin1(Core::Constants::ICON_WARNING));
+    static QIcon errorIcon(QString::fromLatin1(Core::Constants::ICON_ERROR));
 
     if (!index.isValid() || index.column() != 0)
         return QVariant();
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index bce65aadff..2837bb3f58 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -227,8 +227,6 @@ QtcPlugin {
             "clean.png",
             "clean_small.png",
             "closetab.png",
-            "compile_error.png",
-            "compile_warning.png",
             "debugger_start.png",
             "debugger_start_small.png",
             "findallprojects.png",
diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc
index bbf1b90b31..faa38fd3ab 100644
--- a/src/plugins/projectexplorer/projectexplorer.qrc
+++ b/src/plugins/projectexplorer/projectexplorer.qrc
@@ -25,8 +25,6 @@
         <file>images/leftselection.png</file>
         <file>images/rightselection.png</file>
         <file>images/midselection.png</file>
-        <file>images/compile_error.png</file>
-        <file>images/compile_warning.png</file>
         <file>images/BuildSettings.png</file>
         <file>images/CodeStyleSettings.png</file>
         <file>images/RunSettings.png</file>
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index 9f7c14d29a..180e7a5741 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -162,8 +162,6 @@ const char ICON_DEBUG_SMALL[]     = ":/projectexplorer/images/debugger_start_sma
 const char ICON_STOP[]            = ":/projectexplorer/images/stop.png";
 const char ICON_STOP_SMALL[]      = ":/projectexplorer/images/stop_small.png";
 const char ICON_WINDOW[]          = ":/projectexplorer/images/window.png";
-const char ICON_WARNING[]         = ":/projectexplorer/images/compile_warning.png";
-const char ICON_ERROR[]           = ":/projectexplorer/images/compile_error.png";
 
 // Mime types
 const char C_SOURCE_MIMETYPE[]    = "text/x-csrc";
diff --git a/src/plugins/projectexplorer/task.cpp b/src/plugins/projectexplorer/task.cpp
index f794969066..ac7a8d4838 100644
--- a/src/plugins/projectexplorer/task.cpp
+++ b/src/plugins/projectexplorer/task.cpp
@@ -29,7 +29,7 @@
 
 #include "task.h"
 
-#include <projectexplorer/projectexplorerconstants.h>
+#include <coreplugin/coreconstants.h>
 #include <utils/qtcassert.h>
 
 namespace ProjectExplorer
@@ -39,9 +39,9 @@ static QString taskTypeIcon(Task::TaskType t)
 {
     switch (t) {
     case Task::Warning:
-        return QLatin1String(ProjectExplorer::Constants::ICON_WARNING);
+        return QLatin1String(Core::Constants::ICON_WARNING);
     case Task::Error:
-        return QLatin1String(ProjectExplorer::Constants::ICON_ERROR);
+        return QLatin1String(Core::Constants::ICON_ERROR);
     case Task::Unknown:
         break;
     }
diff --git a/src/plugins/projectexplorer/taskhub.cpp b/src/plugins/projectexplorer/taskhub.cpp
index 3b671b3d46..d02cce80db 100644
--- a/src/plugins/projectexplorer/taskhub.cpp
+++ b/src/plugins/projectexplorer/taskhub.cpp
@@ -29,8 +29,8 @@
 
 #include "taskhub.h"
 
+#include <coreplugin/coreconstants.h>
 #include <coreplugin/ioutputpane.h>
-#include <projectexplorer/projectexplorerconstants.h>
 #include <utils/qtcassert.h>
 
 using namespace ProjectExplorer;
@@ -85,8 +85,8 @@ void TaskMark::clicked()
 }
 
 TaskHub::TaskHub()
-    : m_errorIcon(QLatin1String(ProjectExplorer::Constants::ICON_ERROR)),
-      m_warningIcon(QLatin1String(ProjectExplorer::Constants::ICON_WARNING))
+    : m_errorIcon(QLatin1String(Core::Constants::ICON_ERROR)),
+      m_warningIcon(QLatin1String(Core::Constants::ICON_WARNING))
 {
     m_instance = this;
     qRegisterMetaType<ProjectExplorer::Task>("ProjectExplorer::Task");
diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index d5d1833790..0bc1c088bb 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -262,7 +262,7 @@ TaskWindow::TaskWindow() : d(new TaskWindowPrivate)
     d->m_listview->setContextMenuPolicy(Qt::ActionsContextMenu);
 
     d->m_filterWarningsButton = createFilterButton(
-                QIcon(QLatin1String(Constants::ICON_WARNING)),
+                QIcon(QLatin1String(Core::Constants::ICON_WARNING)),
                 tr("Show Warnings"), this, SLOT(setShowWarnings(bool)));
 
     d->m_categoriesButton = new QToolButton;