From f2df57df60accbc657a33ab710727fabbc8779df Mon Sep 17 00:00:00 2001 From: Jacob Bandes-Storch Date: Sat, 27 Jul 2013 00:24:16 -0700 Subject: [PATCH] =?UTF-8?q?Rename=20=E2=80=9Cindex.{cc,h}=E2=80=9D=20to=20?= =?UTF-8?q?the=20more=20appropriate=20=E2=80=9Citem.{cc,h}=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frameworks/BundlesManager/src/BundlesManager.h | 2 +- Frameworks/BundlesManager/src/load_bundles.h | 2 +- Frameworks/bundles/src/bundles.h | 2 +- Frameworks/bundles/src/{index.cc => item.cc} | 2 +- Frameworks/bundles/src/{index.h => item.h} | 6 +++--- Frameworks/bundles/src/query.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename Frameworks/bundles/src/{index.cc => item.cc} (99%) rename Frameworks/bundles/src/{index.h => item.h} (97%) diff --git a/Frameworks/BundlesManager/src/BundlesManager.h b/Frameworks/BundlesManager/src/BundlesManager.h index f355af6b..02f1aaa3 100644 --- a/Frameworks/BundlesManager/src/BundlesManager.h +++ b/Frameworks/BundlesManager/src/BundlesManager.h @@ -1,5 +1,5 @@ #import -#import +#import PUBLIC extern NSString* const kUserDefaultsDisableBundleUpdatesKey; PUBLIC extern NSString* const kUserDefaultsLastBundleUpdateCheckKey; diff --git a/Frameworks/BundlesManager/src/load_bundles.h b/Frameworks/BundlesManager/src/load_bundles.h index dabfab20..c6f5902b 100644 --- a/Frameworks/BundlesManager/src/load_bundles.h +++ b/Frameworks/BundlesManager/src/load_bundles.h @@ -2,7 +2,7 @@ #define LOAD_BUNDLES_H_C8BVI372 #include "fs_cache.h" -#include +#include #include std::pair, std::map< oak::uuid_t, std::vector>> create_bundle_index (std::vector const& bundlesPaths, fs::cache_t& cache); diff --git a/Frameworks/bundles/src/bundles.h b/Frameworks/bundles/src/bundles.h index 4601edba..8203e0cf 100644 --- a/Frameworks/bundles/src/bundles.h +++ b/Frameworks/bundles/src/bundles.h @@ -1,7 +1,7 @@ #ifndef BUNDLES_H_Q267K08K #define BUNDLES_H_Q267K08K -#include "index.h" +#include "item.h" #include "wrappers.h" #include "locations.h" #include "query.h" diff --git a/Frameworks/bundles/src/index.cc b/Frameworks/bundles/src/item.cc similarity index 99% rename from Frameworks/bundles/src/index.cc rename to Frameworks/bundles/src/item.cc index 5513169b..a8beac8f 100644 --- a/Frameworks/bundles/src/index.cc +++ b/Frameworks/bundles/src/item.cc @@ -1,4 +1,4 @@ -#include "index.h" +#include "item.h" #include "query.h" // required by item_t::environment #include "locations.h" // required by item_t::save #include diff --git a/Frameworks/bundles/src/index.h b/Frameworks/bundles/src/item.h similarity index 97% rename from Frameworks/bundles/src/index.h rename to Frameworks/bundles/src/item.h index 4adc9866..c4337ae9 100644 --- a/Frameworks/bundles/src/index.h +++ b/Frameworks/bundles/src/item.h @@ -1,5 +1,5 @@ -#ifndef BUNDLES_INDEX_H_H2GEVOXK -#define BUNDLES_INDEX_H_H2GEVOXK +#ifndef BUNDLES_ITEM_H_H2GEVOXK +#define BUNDLES_ITEM_H_H2GEVOXK #include #include @@ -115,4 +115,4 @@ namespace bundles } /* bundles */ -#endif /* end of include guard: BUNDLES_INDEX_H_H2GEVOXK */ +#endif /* end of include guard: BUNDLES_ITEM_H_H2GEVOXK */ diff --git a/Frameworks/bundles/src/query.h b/Frameworks/bundles/src/query.h index 81007975..c23829b2 100644 --- a/Frameworks/bundles/src/query.h +++ b/Frameworks/bundles/src/query.h @@ -1,7 +1,7 @@ #ifndef BUNDLES_QUERY_H_7L9NPR0I #define BUNDLES_QUERY_H_7L9NPR0I -#include "index.h" +#include "item.h" namespace bundles {