From a77c04e10027cb7c07d676a613cd8eff1d2ea263 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 26 Jan 2014 13:52:59 -0500
Subject: [PATCH] Feature Removed

- Removed version 1.x sort column support.
---
 ChangeLog      |  2 ++
 NEWS           |  1 +
 src/legacy.cpp | 37 ++++++++++++-------------------------
 3 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d169b3149..3c43a71e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ Features
    expression evaluator.
  + Deprecated '_query' alias.
  + Removed deprecated 'push', 'pull' and 'merge' commands.
+ + Removed version 1.x column name support.
+ + Removed version 1.x sort column support.
 
 Bugs
  + #1473 Make TASK_RCDIR customizable (thanks to Elias Probst).
diff --git a/NEWS b/NEWS
index 189a5ff88..e2929f27b 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@ Newly deprecated features in taskwarrior 2.4.0
 Removed features in 2.4.0
 
   - Version 1.x column names no longer supported.
+  - Version 1.x sort columns no longer supported.
 
 Known Issues
 
diff --git a/src/legacy.cpp b/src/legacy.cpp
index 12553a991..2876d280a 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -59,31 +59,18 @@ void legacyColumnMap (std::string& name)
 ////////////////////////////////////////////////////////////////////////////////
 void legacySortColumnMap (std::string& name)
 {
-  // One-time initialization, on demand.
-  static std::map <std::string, std::string> legacyMap;
-  if (! legacyMap.size ())
-  {
-    legacyMap["priority_long"]        = "priority";             // Deprecated
-    legacyMap["entry_time"]           = "entry";                // Deprecated
-    legacyMap["start_time"]           = "start";                // Deprecated
-    legacyMap["end_time"]             = "end";                  // Deprecated
-    legacyMap["countdown"]            = "due";                  // Deprecated
-    legacyMap["countdown_compact"]    = "due";                  // Deprecated
-    legacyMap["age"]                  = "entry";                // Deprecated
-    legacyMap["age_compact"]          = "entry";                // Deprecated
-    legacyMap["active"]               = "start";                // Deprecated
-    legacyMap["recurrence_indicator"] = "recur";                // Deprecated
-    legacyMap["tag_indicator"]        = "tags";                 // Deprecated
-    legacyMap["description_only"]     = "description";          // Deprecated
-  }
-
-  // If a legacy column was used, complain about it, but modify it anyway.
-  std::map <std::string, std::string>::iterator found = legacyMap.find (name);
-  if (found != legacyMap.end ())
-  {
-    context.footnote (format (STRING_CMD_CUSTOM_OLD_SORT, name, found->second));
-    name = found->second;
-  }
+  // 2014-01-26: priority_long        --> priority             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                  Mapping removed
+  // 2014-01-26: countdown_compact    --> due                  Mapping removed
+  // 2014-01-26: age                  --> entry                Mapping removed
+  // 2014-01-26: age_compact          --> entry                Mapping removed
+  // 2014-01-26: active               --> start                Mapping removed
+  // 2014-01-26: recurrence_indicator --> recur                Mapping removed
+  // 2014-01-26: tag_indicator        --> tags                 Mapping removed
+  // 2014-01-26: description_only     --> description          Mapping removed
 }
 
 ////////////////////////////////////////////////////////////////////////////////