From 4f86602ded72310f24f070e93f8f509fd8c0e6c4 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 26 Jan 2014 13:51:00 -0500 Subject: [PATCH] Deprecation - Removed version 1.x column name mapping support. --- NEWS | 4 ++++ src/legacy.cpp | 37 ++++++++++++------------------------- 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/NEWS b/NEWS index a15d20a22..189a5ff88 100644 --- a/NEWS +++ b/NEWS @@ -16,6 +16,10 @@ Newly deprecated features in taskwarrior 2.4.0 - The alias '_query' is deprecated. +Removed features in 2.4.0 + + - Version 1.x column names no longer supported. + Known Issues - diff --git a/src/legacy.cpp b/src/legacy.cpp index e54e28e57..12553a991 100644 --- a/src/legacy.cpp +++ b/src/legacy.cpp @@ -42,31 +42,18 @@ void legacyAttributeCheck (const std::string& name) //////////////////////////////////////////////////////////////////////////////// void legacyColumnMap (std::string& name) { - // One-time initialization, on demand. - static std::map legacyMap; - if (! legacyMap.size ()) - { - legacyMap["priority_long"] = "priority.long"; // Deprecated. - legacyMap["entry_time"] = "entry"; // Deprecated. - legacyMap["start_time"] = "start"; // Deprecated. - legacyMap["end_time"] = "end"; // Deprecated. - legacyMap["countdown"] = "due.countdown"; // Deprecated. - legacyMap["countdown_compact"] = "due.countdown"; // Deprecated. - legacyMap["age"] = "entry.age"; // Deprecated. - legacyMap["age_compact"] = "entry.age"; // Deprecated. - legacyMap["active"] = "start.active"; // Deprecated. - legacyMap["recurrence_indicator"] = "recur.indicator"; // Deprecated. - legacyMap["tag_indicator"] = "tags.indicator"; // Deprecated. - legacyMap["description_only"] = "description.desc"; // Deprecated. - } - - // If a legacy column was used, complain about it, but modify it anyway. - std::map ::iterator found = legacyMap.find (name); - if (found != legacyMap.end ()) - { - context.footnote (format (STRING_CMD_CUSTOM_OLD_FIELD, name, found->second)); - name = found->second; - } + // 2014-01-26: priority_long --> priority.long Mapping removed + // 2014-01-26: entry_time --> entry Mapping removed + // 2014-01-26: start_time --> start Mapping removed + // 2014-01-26: end_time --> end Mapping removed + // 2014-01-26: countdown --> due.countdown Mapping removed + // 2014-01-26: countdown_compact --> due.countdown Mapping removed + // 2014-01-26: age --> entry.age Mapping removed + // 2014-01-26: age_compact --> entry.age Mapping removed + // 2014-01-26: active --> start.active Mapping removed + // 2014-01-26: recurrence_indicator --> recur.indicator Mapping removed + // 2014-01-26: tag_indicator --> tags.indicator Mapping removed + // 2014-01-26: description_only --> description.desc Mapping removed } ////////////////////////////////////////////////////////////////////////////////