zorba-coders team mailing list archive

[Ghislain Fourny <ghislain.fourny@xxxxxxxxxx>]

Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/removing-store-naive-in-includes into lp:zorba.

Requested reviews:
  Till Westmann (tillw)
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/removing-store-naive-in-includes/+merge/122051

Removing superfluous store/naive prefixes in store includes.
-- 
https://code.launchpad.net/~zorba-coders/zorba/removing-store-naive-in-includes/+merge/122051
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/store/naive/query_context.cpp'
--- src/store/naive/query_context.cpp	2012-08-29 11:12:58 +0000
+++ src/store/naive/query_context.cpp	2012-08-30 12:27:41 +0000
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "store/naive/query_context.h"
-#include "store/naive/node_items.h"
+#include "query_context.h"
+#include "node_items.h"
 
 
 namespace zorba { namespace store {

=== modified file 'src/store/naive/simple_index.h'
--- src/store/naive/simple_index.h	2012-08-29 11:12:58 +0000
+++ src/store/naive/simple_index.h	2012-08-30 12:27:41 +0000
@@ -20,7 +20,7 @@
 #include "store/api/index.h"
 #include "store/api/iterator.h"
 
-#include "store/naive/shared_types.h"
+#include "shared_types.h"
 
 #include "zorbautils/hashmap.h"
 

=== modified file 'src/store/naive/simple_pul.h'
--- src/store/naive/simple_pul.h	2012-08-29 11:12:58 +0000
+++ src/store/naive/simple_pul.h	2012-08-30 12:27:41 +0000
@@ -21,7 +21,7 @@
 #include "shared_types.h"
 
 #include "store/api/pul.h"
-#include "store/naive/simple_index.h"
+#include "simple_index.h"
 
 #include "zorbautils/hashfun.h"
 #include "zorbautils/hashmap.h"

=== modified file 'src/store/naive/simple_store.cpp'
--- src/store/naive/simple_store.cpp	2012-08-29 11:12:58 +0000
+++ src/store/naive/simple_store.cpp	2012-08-30 12:27:41 +0000
@@ -34,7 +34,7 @@
 #include "zorbautils/string_util.h"
 
 #ifdef ZORBA_WITH_JSON
-#include "store/naive/json_loader.h"
+#include "json_loader.h"
 #endif
 
 

=== modified file 'src/store/naive/simple_store.h'
--- src/store/naive/simple_store.h	2012-08-29 11:12:58 +0000
+++ src/store/naive/simple_store.h	2012-08-30 12:27:41 +0000
@@ -16,11 +16,11 @@
 #ifndef ZORBA_SIMPLE_STORE
 #define ZORBA_SIMPLE_STORE
 
-#include "store/naive/store.h"
+#include "store.h"
 
-#include "store/naive/node_factory.h"
-#include "store/naive/pul_primitive_factory.h"
-#include "store/naive/tree_id_generator.h"
+#include "node_factory.h"
+#include "pul_primitive_factory.h"
+#include "tree_id_generator.h"
 
 namespace zorba {
 namespace simplestore {

=== modified file 'src/store/naive/tree_id.h'
--- src/store/naive/tree_id.h	2012-03-21 15:03:00 +0000
+++ src/store/naive/tree_id.h	2012-08-30 12:27:41 +0000
@@ -16,8 +16,8 @@
 #ifndef ZORBA_TREE_ID_H
 #define ZORBA_TREE_ID_H
 
-#include "store/naive/shared_types.h"
-#include "store/naive/store_defs.h"
+#include "shared_types.h"
+#include "store_defs.h"
 #include "zorbatypes/zstring.h"
 
 namespace zorba {

=== modified file 'src/store/naive/tupleimpl.cpp'
--- src/store/naive/tupleimpl.cpp	2012-08-29 11:12:58 +0000
+++ src/store/naive/tupleimpl.cpp	2012-08-30 12:27:41 +0000
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "store/naive/tupleimpl.h"
-#include "store/naive/simple_store.h"
-#include "store/naive/store_defs.h"
+#include "tupleimpl.h"
+#include "simple_store.h"
+#include "store_defs.h"
 
 namespace zorba {