From b12cc89eb812f4748e44a7dac301df63e8a4ca6c Mon Sep 17 00:00:00 2001
From: Chris Frey <cdfrey@foursquare.net>
Date: Fri, 21 Nov 2008 03:12:12 -0500
Subject: [PATCH] Revert "Reorganized barry.h app header and record.h header"

This reverts commit 092d6d2da394ceeec5875bd5bfea6265a6d73810.

The old behaviour of only #including <barry/record.h> is in fact
a useful operation from the application programmer's point of view.

See the gui/ for an example.

This needs to be done differently.
---
 ChangeLog     |  2 --
 src/barry.h   | 18 ++----------------
 src/ldif.cc   |  1 -
 src/r_task.cc |  1 -
 src/record.h  | 12 ++++++++++++
 5 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 694fefb1..4f91d104 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,8 +10,6 @@ Release: version 0.15 - 2008/10/??
 		WINDOWS-1252 charset to/from UTF-8 and more
 	- fixed bug in IConverter that saved end of string instead of
 		beginning
-	- reorganized barry.h app header and record.h header, so that
-		internal builds have fewer dependencies
 	- large parser/builder API change, adding IConverter support
 		This change starts at the top (Mode::Desktop) which
 		takes an optional IConverter object for parsing and
diff --git a/src/barry.h b/src/barry.h
index 80b7ea30..42905873 100644
--- a/src/barry.h
+++ b/src/barry.h
@@ -58,31 +58,17 @@
 #include "protocol.h"			// application-safe header
 #include "parser.h"
 #include "builder.h"
+#include "record.h"
 #include "ldif.h"
 #include "controller.h"
 #include "m_desktop.h"
+#include "m_desktoptmpl.h"
 #include "m_ipmodem.h"
 #include "m_serial.h"
 #include "version.h"
 #include "log.h"
 #include "sha1.h"
 #include "iconv.h"
-#include "record.h"
-
-// Include all parser classes, to make it easy for the application to use.
-#include "r_calendar.h"
-#include "r_contact.h"
-#include "r_memo.h"
-#include "r_message.h"
-#include "r_servicebook.h"
-#include "r_task.h"
-#include "r_pin_message.h"
-#include "r_saved_message.h"
-#include "r_folder.h"
-#include "r_timezone.h"
-
-// Include the template helpers after the record classes
-#include "m_desktoptmpl.h"
 
 #ifdef __BARRY_BOOST_MODE__
 // Boost serialization seems to be picky about header order, do them all here
diff --git a/src/ldif.cc b/src/ldif.cc
index 2b9b8eb9..faf7309c 100644
--- a/src/ldif.cc
+++ b/src/ldif.cc
@@ -21,7 +21,6 @@
 
 #include "ldif.h"
 #include "record.h"
-#include "r_contact.h"
 #include "base64.h"
 #include <stdexcept>
 #include <iostream>
diff --git a/src/r_task.cc b/src/r_task.cc
index 72749642..b98b583d 100644
--- a/src/r_task.cc
+++ b/src/r_task.cc
@@ -21,7 +21,6 @@
 */
 
 #include "r_task.h"
-#include "r_calendar.h"			// for CAL_* defines
 #include "record-internal.h"
 #include "protostructs.h"
 #include "data.h"
diff --git a/src/record.h b/src/record.h
index d0476821..a423ff25 100644
--- a/src/record.h
+++ b/src/record.h
@@ -256,5 +256,17 @@ BXEXPORT std::ostream& operator<<(std::ostream &os, const Date &date);
 
 } // namespace Barry
 
+// Include all parser classes, to make it easy for the application to use.
+#include "r_calendar.h"
+#include "r_contact.h"
+#include "r_memo.h"
+#include "r_message.h"
+#include "r_servicebook.h"
+#include "r_task.h"
+#include "r_pin_message.h"
+#include "r_saved_message.h"
+#include "r_folder.h"
+#include "r_timezone.h"
+
 #endif
 
-- 
2.11.4.GIT