From 9233be390b9b744a01c8c7c98638d1abea6cb819 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 25 Nov 2013 11:58:32 +0100 Subject: Tasks: Remove one of two methods to find the task icon The method is in a internal class, so this does not break the build for external plugins. Change-Id: I9ad75e8230059d865ec7a73aa0868cb82a35b35f Reviewed-by: Daniel Teske --- src/plugins/projectexplorer/taskmodel.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'src/plugins/projectexplorer/taskmodel.cpp') diff --git a/src/plugins/projectexplorer/taskmodel.cpp b/src/plugins/projectexplorer/taskmodel.cpp index 85f38123f5..ff32130e79 100644 --- a/src/plugins/projectexplorer/taskmodel.cpp +++ b/src/plugins/projectexplorer/taskmodel.cpp @@ -30,6 +30,7 @@ #include "taskmodel.h" #include "task.h" +#include "taskhub.h" #include @@ -46,8 +47,6 @@ TaskModel::TaskModel(QObject *parent) : QAbstractItemModel(parent), m_maxSizeOfFileName(0), m_lastMaxSizeIndex(0), - m_errorIcon(QLatin1String(":/projectexplorer/images/compile_error.png")), - m_warningIcon(QLatin1String(":/projectexplorer/images/compile_warning.png")), m_sizeOfLineNumber(0) { m_categories.insert(Core::Id(), CategoryData()); @@ -83,19 +82,6 @@ bool TaskModel::hasFile(const QModelIndex &index) const return !m_tasks.at(row).file.isEmpty(); } -QIcon TaskModel::taskTypeIcon(Task::TaskType t) const -{ - switch (t) { - case Task::Warning: - return m_warningIcon; - case Task::Error: - return m_errorIcon; - case Task::Unknown: - break; - } - return QIcon(); -} - void TaskModel::addCategory(const Core::Id &categoryId, const QString &categoryName) { QTC_ASSERT(categoryId.uniqueIdentifier(), return); @@ -269,7 +255,7 @@ QVariant TaskModel::data(const QModelIndex &index, int role) const else if (role == TaskModel::Category) return m_tasks.at(index.row()).category.uniqueIdentifier(); else if (role == TaskModel::Icon) - return taskTypeIcon(m_tasks.at(index.row()).type); + return TaskHub::taskTypeIcon(m_tasks.at(index.row()).type); else if (role == TaskModel::Task_t) return QVariant::fromValue(task(index)); return QVariant(); -- cgit v1.2.1 From 20cbf7d398407f561fd5834694108497e3e87511 Mon Sep 17 00:00:00 2001 From: Petar Perisin Date: Tue, 12 Nov 2013 21:59:43 +0100 Subject: Add icons in Task Change-Id: I6c96cb90cd22c9ece225bc99470068a9168dabe4 Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/taskmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/projectexplorer/taskmodel.cpp') diff --git a/src/plugins/projectexplorer/taskmodel.cpp b/src/plugins/projectexplorer/taskmodel.cpp index ff32130e79..fd73b60118 100644 --- a/src/plugins/projectexplorer/taskmodel.cpp +++ b/src/plugins/projectexplorer/taskmodel.cpp @@ -255,7 +255,7 @@ QVariant TaskModel::data(const QModelIndex &index, int role) const else if (role == TaskModel::Category) return m_tasks.at(index.row()).category.uniqueIdentifier(); else if (role == TaskModel::Icon) - return TaskHub::taskTypeIcon(m_tasks.at(index.row()).type); + return m_tasks.at(index.row()).icon; else if (role == TaskModel::Task_t) return QVariant::fromValue(task(index)); return QVariant(); -- cgit v1.2.1