From 412396d35bc31f061442fc799ea53a34ba538259 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 5 Feb 2012 10:08:10 -0500 Subject: [PATCH] Code Cleanup - Removed restriction on waiting recurring tasks. - Removed unused L10N string. - Removed unnecessary include. --- src/Date.cpp | 1 - src/Task.cpp | 5 ----- src/en-US.h | 1 - 3 files changed, 7 deletions(-) diff --git a/src/Date.cpp b/src/Date.cpp index 2bc1ada94..85e6bf187 100644 --- a/src/Date.cpp +++ b/src/Date.cpp @@ -27,7 +27,6 @@ #define L10N // Localization complete. -#include // TODO Remove. #include #include #include diff --git a/src/Task.cpp b/src/Task.cpp index 7c0671f9c..9bc33ba4a 100644 --- a/src/Task.cpp +++ b/src/Task.cpp @@ -1114,11 +1114,6 @@ void Task::validate () throw std::string (format (STRING_TASK_VALID_RECUR, get ("recur"))); } - // TODO Remove this restriction. - if (has ("wait") && - getStatus () == Task::recurring) - throw std::string (STRING_TASK_VALID_WAIT_RECUR); - // Priorities must be valid. if (has ("priority")) { diff --git a/src/en-US.h b/src/en-US.h index 23900146b..b0825f88b 100644 --- a/src/en-US.h +++ b/src/en-US.h @@ -756,7 +756,6 @@ #define STRING_TASK_VALID_REC_DUE "A recurring task must also have a 'due' date." #define STRING_TASK_VALID_UNTIL "Only recurring tasks may have an 'until' date." #define STRING_TASK_VALID_RECUR "The recurrence value '{1}' is not valid." -#define STRING_TASK_VALID_WAIT_RECUR "You cannot create a task that is both waiting and recurring." #define STRING_TASK_VALID_PRIORITY "Priority values may be 'H', 'M' or 'L', not '{1}'." #define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all tasks. Are you sure?" #define STRING_TASK_SAFETY_FAIL "Command prevented from running."