From a9ff2389e613471d6611301dae6c1e8e2177111c Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sat, 6 Jul 2019 21:17:19 -0500 Subject: [PATCH] minor code cleanup --- app/CMakeLists.txt | 2 +- app/project/item/folder/folder.h | 5 +++++ app/task/taskmanager.cpp | 23 +++++------------------ app/task/taskmanager.h | 3 +++ 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 3cd57a3ae..ac56a76ec 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -56,7 +56,7 @@ target_compile_definitions(${OLIVE_TARGET} PRIVATE ${OLIVE_DEFINITIONS}) target_compile_options( ${OLIVE_TARGET} PRIVATE - $<$:-Werror -pedantic-errors -Wall -Wextra -Wconversion -Wsign-conversion>) + $<$:-Werror -Wuninitialized -pedantic-errors -Wall -Wextra -Wconversion -Wsign-conversion>) target_link_libraries(${OLIVE_TARGET} PRIVATE diff --git a/app/project/item/folder/folder.h b/app/project/item/folder/folder.h index 844794a35..23fda54d5 100644 --- a/app/project/item/folder/folder.h +++ b/app/project/item/folder/folder.h @@ -23,6 +23,11 @@ #include "project/item/item.h" +/** + * @brief The Folder class representing a directory in a project structure + * + * + */ class Folder : public Item { public: diff --git a/app/task/taskmanager.cpp b/app/task/taskmanager.cpp index 563567f85..04ece9eef 100644 --- a/app/task/taskmanager.cpp +++ b/app/task/taskmanager.cpp @@ -106,27 +106,14 @@ void TaskManager::DeleteTask(Task *t) void TaskManager::TaskCallback(Task::Status status) { - switch (status) { - case Task::kWaiting: - //qDebug() << sender() << "is waiting..."; - break; - case Task::kWorking: - //qDebug() << sender() << "is working..."; - break; - case Task::kFinished: - //qDebug() << sender() << "finished successfully."; - + if (status == Task::kFinished || status == Task::kError) { // The Task has finished, we can start a new one StartNextWaiting(); - DeleteTask(static_cast(sender())); - break; - case Task::kError: - //qDebug() << sender() << "failed:" << static_cast(sender())->error(); - - // The Task has finished, we can start a new one - StartNextWaiting(); - break; + if (status == Task::kFinished) { + // The Task was successful, remove this Task from the queue + DeleteTask(static_cast(sender())); + } } } diff --git a/app/task/taskmanager.h b/app/task/taskmanager.h index 3504a13d8..872ffc99c 100644 --- a/app/task/taskmanager.h +++ b/app/task/taskmanager.h @@ -92,6 +92,9 @@ public: */ void Clear(); + /** + * @brief Undoable command for adding a Task to the TaskManager + */ class AddTaskCommand : public QUndoCommand { public: AddTaskCommand(TaskPtr t, QUndoCommand* parent = nullptr);