Enhancement - Location object

- Moved Location object into place, ready for integration.

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       \
+               Duration.cpp StringTable.cpp Location.cpp color.cpp parse.cpp   \
-               command.cpp edit.cpp report.cpp util.cpp text.cpp rules.cpp     \
+               task.cpp command.cpp edit.cpp report.cpp util.cpp text.cpp      \
-               import.cpp Config.h Date.h Record.h T.h TDB.h Att.h Mod.h       \
+               rules.cpp import.cpp Config.h Date.h Record.h T.h TDB.h Att.h   \
-               Filter.h Sequence.h Table.h Grid.h Timer.h Duration.h           \
+               Mod.h Filter.h Sequence.h Table.h Grid.h Timer.h Duration.h     \
-               StringTable.h color.h task.h
+               StringTable.h Location.h color.h task.h
 

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 ? "" : " ") + r->second.composeF4 ();
-    ff4 += (first ? "" : " ");
-    ff4 += r->second.composeF4 ();
-  }
 
   ff4 += "]";
   return ff4;

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)