From de08c1d32ece4d0cf3155e526dd807b7e0e2b248 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 27 May 2009 00:00:54 -0400
Subject: [PATCH] Enhancement - Location object

- Moved Location object into place, ready for integration.
---
 src/{sandbox => }/Location.cpp |  0
 src/{sandbox => }/Location.h   |  0
 src/Makefile.am                | 10 +++++-----
 src/Record.cpp                 |  9 +++++----
 src/sandbox/Makefile           |  2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)
 rename src/{sandbox => }/Location.cpp (100%)
 rename src/{sandbox => }/Location.h (100%)

diff --git a/src/sandbox/Location.cpp b/src/Location.cpp
similarity index 100%
rename from src/sandbox/Location.cpp
rename to src/Location.cpp
diff --git a/src/sandbox/Location.h b/src/Location.h
similarity index 100%
rename from src/sandbox/Location.h
rename to src/Location.h
diff --git a/src/Makefile.am b/src/Makefile.am
index a16406756..5d8da27b6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,9 @@
 bin_PROGRAMS = task
 task_SOURCES = Config.cpp Date.cpp Record.cpp T.cpp TDB.cpp Att.cpp Mod.cpp    \
                Filter.cpp Sequence.cpp Table.cpp Grid.cpp Timer.cpp            \
-               Duration.cpp StringTable.cpp color.cpp parse.cpp task.cpp       \
-               command.cpp edit.cpp report.cpp util.cpp text.cpp rules.cpp     \
-               import.cpp Config.h Date.h Record.h T.h TDB.h Att.h Mod.h       \
-               Filter.h Sequence.h Table.h Grid.h Timer.h Duration.h           \
-               StringTable.h color.h task.h
+               Duration.cpp StringTable.cpp Location.cpp color.cpp parse.cpp   \
+               task.cpp command.cpp edit.cpp report.cpp util.cpp text.cpp      \
+               rules.cpp import.cpp Config.h Date.h Record.h T.h TDB.h Att.h   \
+               Mod.h Filter.h Sequence.h Table.h Grid.h Timer.h Duration.h     \
+               StringTable.h Location.h color.h task.h
 
diff --git a/src/Record.cpp b/src/Record.cpp
index bfda04fcd..439758820 100644
--- a/src/Record.cpp
+++ b/src/Record.cpp
@@ -60,16 +60,17 @@ Record::~Record ()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// The format is:
+//
+//   [ Att::composeF4 ... ] \n
+//
 std::string Record::composeF4 ()
 {
   std::string ff4 = "[";
 
   bool first = true;
   foreach (r, (*this))
-  {
-    ff4 += (first ? "" : " ");
-    ff4 += r->second.composeF4 ();
-  }
+    ff4 += (first ? "" : " ") + r->second.composeF4 ();
 
   ff4 += "]";
   return ff4;
diff --git a/src/sandbox/Makefile b/src/sandbox/Makefile
index ae332b040..471ceb66d 100644
--- a/src/sandbox/Makefile
+++ b/src/sandbox/Makefile
@@ -4,7 +4,7 @@ LFLAGS  =
 LIBS    = 
 OBJECTS = main.o Context.o TDB.o T.o ../Sequence.o ../Filter.o ../Att.o      \
           Keymap.o ../Record.o ../Mod.o ../StringTable.o ../util.o ../text.o \
-          ../Date.o ../Config.o Location.o
+          ../Date.o ../Config.o ../Location.o
 
 all: $(PROJECT)