From 5bfd29b604f5da5cfb749626e8dcd39a41d2fadf Mon Sep 17 00:00:00 2001
From: Jacob Bandes-Storch <jtbandes@gmail.com>
Date: Sat, 27 Jul 2013 01:58:43 -0700
Subject: [PATCH] Move load_bundles to bundles framework

---
 Frameworks/BundlesManager/src/BundlesManager.mm        |  2 +-
 Frameworks/BundlesManager/src/load_bundles.h           | 10 ----------
 Frameworks/bundles/src/bundles.h                       |  1 +
 .../src/load_bundles.cc => bundles/src/load.cc}        |  2 +-
 Frameworks/bundles/src/load.h                          | 10 ++++++++++
 5 files changed, 13 insertions(+), 12 deletions(-)
 delete mode 100644 Frameworks/BundlesManager/src/load_bundles.h
 rename Frameworks/{BundlesManager/src/load_bundles.cc => bundles/src/load.cc} (99%)
 create mode 100644 Frameworks/bundles/src/load.h

diff --git a/Frameworks/BundlesManager/src/BundlesManager.mm b/Frameworks/BundlesManager/src/BundlesManager.mm
index dfae5a30..2bbc0499 100644
--- a/Frameworks/BundlesManager/src/BundlesManager.mm
+++ b/Frameworks/BundlesManager/src/BundlesManager.mm
@@ -1,5 +1,5 @@
 #import "BundlesManager.h"
-#import "load_bundles.h"
+#import <bundles/load.h>
 #import "InstallBundleItems.h"
 #import <OakFoundation/NSDate Additions.h>
 #import <OakFoundation/NSString Additions.h>
diff --git a/Frameworks/BundlesManager/src/load_bundles.h b/Frameworks/BundlesManager/src/load_bundles.h
deleted file mode 100644
index 79fc9a9e..00000000
--- a/Frameworks/BundlesManager/src/load_bundles.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef LOAD_BUNDLES_H_C8BVI372
-#define LOAD_BUNDLES_H_C8BVI372
-
-#include <bundles/item.h>
-#include <oak/misc.h>
-#include <plist/fs_cache.h>
-
-std::pair<std::vector<bundles::item_ptr>, std::map< oak::uuid_t, std::vector<oak::uuid_t>>> create_bundle_index (std::vector<std::string> const& bundlesPaths, plist::cache_t& cache);
-
-#endif /* end of include guard: LOAD_BUNDLES_H_C8BVI372 */
diff --git a/Frameworks/bundles/src/bundles.h b/Frameworks/bundles/src/bundles.h
index 8203e0cf..7346e9ed 100644
--- a/Frameworks/bundles/src/bundles.h
+++ b/Frameworks/bundles/src/bundles.h
@@ -2,6 +2,7 @@
 #define BUNDLES_H_Q267K08K
 
 #include "item.h"
+#include "load.h"
 #include "wrappers.h"
 #include "locations.h"
 #include "query.h"
diff --git a/Frameworks/BundlesManager/src/load_bundles.cc b/Frameworks/bundles/src/load.cc
similarity index 99%
rename from Frameworks/BundlesManager/src/load_bundles.cc
rename to Frameworks/bundles/src/load.cc
index 795951c3..05ebdd78 100644
--- a/Frameworks/BundlesManager/src/load_bundles.cc
+++ b/Frameworks/bundles/src/load.cc
@@ -1,4 +1,4 @@
-#include "load_bundles.h"
+#include "load.h"
 #include <plist/delta.h>
 #include <regexp/glob.h>
 #include <text/format.h>
diff --git a/Frameworks/bundles/src/load.h b/Frameworks/bundles/src/load.h
new file mode 100644
index 00000000..99b4e4a7
--- /dev/null
+++ b/Frameworks/bundles/src/load.h
@@ -0,0 +1,10 @@
+#ifndef LOAD_H_C8BVI372
+#define LOAD_H_C8BVI372
+
+#include "item.h"
+#include <oak/misc.h>
+#include <plist/fs_cache.h>
+
+PUBLIC std::pair<std::vector<bundles::item_ptr>, std::map< oak::uuid_t, std::vector<oak::uuid_t>>> create_bundle_index (std::vector<std::string> const& bundlesPaths, plist::cache_t& cache);
+
+#endif /* end of include guard: LOAD_H_C8BVI372 */