From 85e77c1958e4f20ea7e456c6ac4037bdaac4f382 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 7 Aug 2011 17:06:06 -0400
Subject: [PATCH] Code Cleanup

- Merging Record and Task objects, step 5.  Done.
---
 src/CMakeLists.txt              |  1 -
 src/Record.cpp                  | 41 --------------------------------
 src/Record.h                    | 42 ---------------------------------
 test/.gitignore                 |  2 +-
 test/CMakeLists.txt             |  4 ++--
 test/{record.t.cpp => t2.t.cpp} |  0
 6 files changed, 3 insertions(+), 87 deletions(-)
 delete mode 100644 src/Record.cpp
 delete mode 100644 src/Record.h
 rename test/{record.t.cpp => t2.t.cpp} (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6a070d8d8..1cf291a5f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,7 +23,6 @@ set (task_SRCS A3.cpp A3.h
                Nibbler.cpp Nibbler.h
                Path.cpp Path.h
                Permission.cpp Permission.h
-               Record.cpp Record.h
                RX.cpp RX.h
                TDB.cpp TDB.h
                TDB2.cpp TDB2.h
diff --git a/src/Record.cpp b/src/Record.cpp
deleted file mode 100644
index f92d8db6e..000000000
--- a/src/Record.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// taskwarrior - a command line task list manager.
-//
-// Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
-// All rights reserved.
-//
-// This program is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License as published by the Free Software
-// Foundation; either version 2 of the License, or (at your option) any later
-// version.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-// details.
-//
-// You should have received a copy of the GNU General Public License along with
-// this program; if not, write to the
-//
-//     Free Software Foundation, Inc.,
-//     51 Franklin Street, Fifth Floor,
-//     Boston, MA
-//     02110-1301
-//     USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#define L10N                                           // Localization complete.
-
-#include <iostream>
-#include <sstream>
-#include <stdlib.h>
-#include <util.h>
-#include <Nibbler.h>
-#include <Context.h>
-#include <text.h>
-#include <i18n.h>
-#include <Record.h>
-
-extern Context context;
-
diff --git a/src/Record.h b/src/Record.h
deleted file mode 100644
index 80041361f..000000000
--- a/src/Record.h
+++ /dev/null
@@ -1,42 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// taskwarrior - a command line task list manager.
-//
-// Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
-// All rights reserved.
-//
-// This program is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License as published by the Free Software
-// Foundation; either version 2 of the License, or (at your option) any later
-// version.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-// details.
-//
-// You should have received a copy of the GNU General Public License along with
-// this program; if not, write to the
-//
-//     Free Software Foundation, Inc.,
-//     51 Franklin Street, Fifth Floor,
-//     Boston, MA
-//     02110-1301
-//     USA
-//
-////////////////////////////////////////////////////////////////////////////////
-#ifndef INCLUDED_RECORD
-#define INCLUDED_RECORD
-#define L10N                                           // Localization complete.
-
-#include <vector>
-#include <map>
-#include <string>
-#include <stdio.h>
-#include <Att.h>
-
-class Record : public std::map <std::string, Att>
-{
-};
-
-#endif
-////////////////////////////////////////////////////////////////////////////////
diff --git a/test/.gitignore b/test/.gitignore
index b26578f71..127105c54 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -20,13 +20,13 @@ lisp.t
 list.t
 nibbler.t
 path.t
-record.t
 rx.t
 sensor.t
 seq.t
 subst.t
 t.benchmark.t
 t.t
+t2.t
 taskmod.t
 tdb.t
 tdb2.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f99ee709f..4c1dd5be1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -7,8 +7,8 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${TASK_INCLUDE_DIRS})
 
 set (test_SRCS att.t autocomplete.t color.t config.t date.t directory.t dom.t
-               duration.t file.t i18n.t json.t list.t nibbler.t path.t record.t
-               rx.t t.benchmark.t t.t taskmod.t tdb.t tdb2.t text.t uri.t util.t
+               duration.t file.t i18n.t json.t list.t nibbler.t path.t rx.t
+               t.benchmark.t t.t t2.t taskmod.t tdb.t tdb2.t text.t uri.t util.t
                view.t json_test)
 
 add_custom_target (test ./run_all DEPENDS ${test_SRCS}
diff --git a/test/record.t.cpp b/test/t2.t.cpp
similarity index 100%
rename from test/record.t.cpp
rename to test/t2.t.cpp