feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Simplify TaskMark constructor

Browse Source 
Change-Id: I8ba0e8451772eff605961e0d9aff15f535c12566
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
David Schulz
2017-07-21 09:26:50 +02:00
parent 8db91e822b
commit 0332a8c173
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/projectexplorer/taskhub.cpp
View File

@@ -59,18 +59,19 @@ static Core::Id categoryForType(Task::TaskType type)
class TaskMark : public TextEditor::TextMark class TaskMark : public TextEditor::TextMark
{ {
public: public:
TaskMark(unsigned int id, const QString &fileName, int lineNumber, TaskMark(const Task &task) :
Task::TaskType type, bool visible) : TextMark(task.file.toString(), task.line, categoryForType(task.type)),
TextMark(fileName, lineNumber, categoryForType(type)), m_id(task.taskId)
m_id(id)
{ {
setColor(type == Task::Error ? Utils::Theme::ProjectExplorer_TaskError_TextMarkColor setColor(task.type == Task::Error ? Utils::Theme::ProjectExplorer_TaskError_TextMarkColor
: Utils::Theme::ProjectExplorer_TaskWarn_TextMarkColor); : Utils::Theme::ProjectExplorer_TaskWarn_TextMarkColor);
setDefaultToolTip(type == Task::Error ? QApplication::translate("TaskHub", "Error") setDefaultToolTip(task.type == Task::Error ? QApplication::translate("TaskHub", "Error")
: QApplication::translate("TaskHub", "Warning")); : QApplication::translate("TaskHub", "Warning"));
setPriority(type == Task::Error ? TextEditor::TextMark::NormalPriority setPriority(task.type == Task::Error ? TextEditor::TextMark::NormalPriority
: TextEditor::TextMark::LowPriority); : TextEditor::TextMark::LowPriority);
setVisible(visible); setToolTip(task.description);
setIcon(task.icon);
setVisible(!task.icon.isNull());
} }
bool isClickable() const; bool isClickable() const;
@@ -151,12 +152,8 @@ void TaskHub::addTask(Task task)
task.line = -1; task.line = -1;
task.movedLine = task.line; task.movedLine = task.line;
if (task.line != -1) { if (task.line != -1)
auto mark = new TaskMark(task.taskId, task.file.toString(), task.line, task.type, !task.icon.isNull()); task.setMark(new TaskMark(task));
mark->setToolTip(task.description);
mark->setIcon(task.icon);
task.setMark(mark);
}
emit m_instance->taskAdded(task); emit m_instance->taskAdded(task);
} }