replaced occurences of oos with matador

zussel · Mar 9, 2017 · 017a354 · 017a354
1 parent 9c24862
commit 017a354
Show file tree

Hide file tree

Showing 93 changed files with 251 additions and 248 deletions.
diff --git a/doc/doxygen/oos-api.dxy.in b/doc/doxygen/oos-api.dxy.in
@@ -1594,7 +1594,7 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             = OOS_DOXYGEN_DOC
+PREDEFINED             = MATADOR_DOXYGEN_DOC
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 

diff --git a/doc/doxygen/oos.dxy.in b/doc/doxygen/oos.dxy.in
@@ -1592,7 +1592,7 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             = OOS_DOXYGEN_DOC
+PREDEFINED             = MATADOR_DOXYGEN_DOC
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 

diff --git a/include/matador/db/mssql/mssql_connection.hpp b/include/matador/db/mssql/mssql_connection.hpp
@@ -19,7 +19,7 @@
 #define MSSQL_connection_HPP
 
 #ifdef _MSC_VER
-  #ifdef oos_mssql_EXPORTS
+  #ifdef matador_mssql_EXPORTS
     #define OOS_MSSQL_API __declspec(dllexport)
   #else
     #define OOS_MSSQL_API __declspec(dllimport)

diff --git a/include/matador/db/mssql/mssql_exception.hpp b/include/matador/db/mssql/mssql_exception.hpp
@@ -19,7 +19,7 @@
 #define MSSQL_EXCEPTION_HPP
 
 #ifdef _MSC_VER
-  #ifdef oos_mssql_EXPORTS
+  #ifdef matador_mssql_EXPORTS
     #define OOS_MSSQL_API __declspec(dllexport)
   #else
     #define OOS_MSSQL_API __declspec(dllimport)

diff --git a/include/matador/db/mysql/mysql_connection.hpp b/include/matador/db/mysql/mysql_connection.hpp
@@ -19,7 +19,7 @@
 #define MYSQL_DATABASE_HPP
 
 #ifdef _MSC_VER
-  #ifdef oos_mysql_EXPORTS
+  #ifdef matador_mysql_EXPORTS
     #define OOS_MYSQL_API __declspec(dllexport)
   #else
     #define OOS_MYSQL_API __declspec(dllimport)

diff --git a/include/matador/db/mysql/mysql_exception.hpp b/include/matador/db/mysql/mysql_exception.hpp
@@ -19,7 +19,7 @@
 #define MYSQL_EXCEPTION_HPP
 
 #ifdef _MSC_VER
-  #ifdef oos_mysql_EXPORTS
+  #ifdef matador_mysql_EXPORTS
     #define OOS_MYSQL_API __declspec(dllexport)
   #else
     #define OOS_MYSQL_API __declspec(dllimport)

diff --git a/include/matador/db/sqlite/sqlite_connection.hpp b/include/matador/db/sqlite/sqlite_connection.hpp
@@ -19,7 +19,7 @@
 #define SQLITE_DATABASE_HPP
 
 #ifdef _MSC_VER
-  #ifdef oos_sqlite_EXPORTS
+  #ifdef matador_sqlite_EXPORTS
     #define OOS_SQLITE_API __declspec(dllexport)
   #else
     #define OOS_SQLITE_API __declspec(dllimport)

diff --git a/include/matador/db/sqlite/sqlite_exception.hpp b/include/matador/db/sqlite/sqlite_exception.hpp
@@ -19,7 +19,7 @@
 #define SQLITE_EXCEPTION_HPP
 
 #ifdef _MSC_VER
-  #ifdef oos_sqlite_EXPORTS
+  #ifdef matador_sqlite_EXPORTS
     #define OOS_SQLITE_API __declspec(dllexport)
   #else
     #define OOS_SQLITE_API __declspec(dllimport)

diff --git a/include/matador/object/abstract_has_many.hpp b/include/matador/object/abstract_has_many.hpp
@@ -23,7 +23,7 @@ class object_inserter;
 
 class object_store;
 
-/// @cond OOS_DEV
+/// @cond MATADOR_DEV
 
 class abstract_has_many
 {

diff --git a/include/matador/object/action.hpp b/include/matador/object/action.hpp
@@ -19,16 +19,16 @@
 #define ACTION_HPP
 
 #ifdef _MSC_VER
-  #ifdef oos_object_EXPORTS
-    #define OOS_OBJECT_API __declspec(dllexport)
+  #ifdef matador_object_EXPORTS
+    #define MATADOR_OBJECT_API __declspec(dllexport)
     #define EXPIMP_OBJECT_TEMPLATE
   #else
-    #define OOS_OBJECT_API __declspec(dllimport)
+    #define MATADOR_OBJECT_API __declspec(dllimport)
     #define EXPIMP_OBJECT_TEMPLATE extern
   #endif
   #pragma warning(disable: 4251)
 #else
-  #define OOS_OBJECT_API
+  #define MATADOR_OBJECT_API
 #endif
 
 #include <string>
@@ -43,7 +43,7 @@ class object_store;
 class object_proxy;
 class object_serializer;
 
-/// @cond OOS_DEV
+/// @cond MATADOR_DEV
 
 /**
  * @class action
@@ -58,7 +58,7 @@ class object_serializer;
  * All these actions are accepted via the action_visitor
  * class, which implements the visitor pattern.
  */
-class OOS_OBJECT_API action
+class MATADOR_OBJECT_API action
 {
 public:
   /**

diff --git a/include/matador/object/action_inserter.hpp b/include/matador/object/action_inserter.hpp
@@ -6,16 +6,16 @@
 #define OOS_ACTION_INSERTER_HPP
 
 #ifdef _MSC_VER
-#ifdef oos_object_EXPORTS
-#define OOS_OBJECT_API __declspec(dllexport)
+#ifdef matador_object_EXPORTS
+#define MATADOR_OBJECT_API __declspec(dllexport)
 #define EXPIMP_OBJECT_TEMPLATE
 #else
-#define OOS_OBJECT_API __declspec(dllimport)
+#define MATADOR_OBJECT_API __declspec(dllimport)
 #define EXPIMP_OBJECT_TEMPLATE extern
 #endif
 #pragma warning(disable: 4251)
 #else
-#define OOS_OBJECT_API
+#define MATADOR_OBJECT_API
 #endif
 
 #include "matador/object/action_visitor.hpp"
@@ -26,11 +26,11 @@
 
 namespace matador {
 
-/// @cond OOS_DEV
+/// @cond MATADOR_DEV
 
 class object_proxy;
 
-class OOS_OBJECT_API action_inserter : public action_visitor
+class MATADOR_OBJECT_API action_inserter : public action_visitor
 {
 public:
   typedef std::shared_ptr<action> action_ptr;

diff --git a/include/matador/object/action_remover.hpp b/include/matador/object/action_remover.hpp
@@ -6,16 +6,16 @@
 #define OOS_ACTION_REMOVER_HPP
 
 #ifdef _MSC_VER
-#ifdef oos_object_EXPORTS
-#define OOS_OBJECT_API __declspec(dllexport)
+#ifdef matador_object_EXPORTS
+#define MATADOR_OBJECT_API __declspec(dllexport)
 #define EXPIMP_OBJECT_TEMPLATE
 #else
-#define OOS_OBJECT_API __declspec(dllimport)
+#define MATADOR_OBJECT_API __declspec(dllimport)
 #define EXPIMP_OBJECT_TEMPLATE extern
 #endif
 #pragma warning(disable: 4251)
 #else
-#define OOS_OBJECT_API
+#define MATADOR_OBJECT_API
 #endif
 
 #include "matador/object/action_visitor.hpp"
@@ -25,11 +25,11 @@
 
 namespace matador {
 
-/// @cond OOS_DEV
+/// @cond MATADOR_DEV
 
 class object_proxy;
 
-class OOS_OBJECT_API action_remover : public action_visitor
+class MATADOR_OBJECT_API action_remover : public action_visitor
 {
 public:
   typedef std::shared_ptr<action> action_ptr;

diff --git a/include/matador/object/action_visitor.hpp b/include/matador/object/action_visitor.hpp
@@ -6,21 +6,21 @@
 #define OOS_ACTION_VISITOR_HPP
 
 #ifdef _MSC_VER
-#ifdef oos_object_EXPORTS
-    #define OOS_OBJECT_API __declspec(dllexport)
+#ifdef matador_object_EXPORTS
+    #define MATADOR_OBJECT_API __declspec(dllexport)
     #define EXPIMP_OBJECT_TEMPLATE
   #else
-    #define OOS_OBJECT_API __declspec(dllimport)
+    #define MATADOR_OBJECT_API __declspec(dllimport)
     #define EXPIMP_OBJECT_TEMPLATE extern
   #endif
   #pragma warning(disable: 4251)
 #else
-#define OOS_OBJECT_API
+#define MATADOR_OBJECT_API
 #endif
 
 namespace matador {
 
-/// @cond OOS_DEV
+/// @cond MATADOR_DEV
 
 class insert_action;
 class update_action;
@@ -35,7 +35,7 @@ class delete_action;
  * a concrete visitor, a class must be derived from this
  * class and implement all virtual method.
  */
-class OOS_OBJECT_API action_visitor
+class MATADOR_OBJECT_API action_visitor
 {
 public:
   virtual ~action_visitor() {}

diff --git a/include/matador/object/attribute_serializer.hpp b/include/matador/object/attribute_serializer.hpp
@@ -30,7 +30,7 @@
 
 namespace matador {
 
-/// @cond OOS_DEV
+/// @cond MATADOR_DEV
 
 class basic_attribute_serializer
 {

diff --git a/include/matador/object/basic_has_many.hpp b/include/matador/object/basic_has_many.hpp
@@ -12,6 +12,8 @@
 
 namespace matador {
 
+/// @cond MATADOR_DEV
+
 namespace detail {
 class object_inserter;
 
@@ -22,8 +24,6 @@ template<class T, template <class ...> class C, class Enabled = void>
 class has_many_inserter;
 }
 
-/// @cond OOS_DEV
-
 template < class T, template <class ...> class C = std::vector >
 class basic_has_many;
 
@@ -163,7 +163,7 @@ class basic_has_many : public abstract_has_many
   void append(const typename iterator::internal_type &item) { container_.push_back(item); }
 
 protected:
-  /// @cond OOS_DEV
+  /// @cond MATADOR_DEV
 
   friend class detail::object_inserter;
   friend class object_store;

diff --git a/include/matador/object/basic_has_many_item.hpp b/include/matador/object/basic_has_many_item.hpp
@@ -6,16 +6,16 @@
 #define OOS_BASIC_HAS_MANY_ITEM_HPP
 
 #ifdef _MSC_VER
-#ifdef oos_object_EXPORTS
-#define OOS_OBJECT_API __declspec(dllexport)
+#ifdef matador_object_EXPORTS
+#define MATADOR_OBJECT_API __declspec(dllexport)
 #define EXPIMP_OBJECT_TEMPLATE
 #else
-#define OOS_OBJECT_API __declspec(dllimport)
+#define MATADOR_OBJECT_API __declspec(dllimport)
 #define EXPIMP_OBJECT_TEMPLATE extern
 #endif
 #pragma warning(disable: 4251)
 #else
-#define OOS_OBJECT_API
+#define MATADOR_OBJECT_API
 #endif
 
 #include "matador/utils/basic_identifier.hpp"
@@ -24,9 +24,9 @@
 
 namespace matador {
 
-/// @cond OOS_DEV
+/// @cond MATADOR_DEV
 
-class OOS_OBJECT_API basic_has_many_item
+class MATADOR_OBJECT_API basic_has_many_item
 {
 public:
 

diff --git a/include/matador/object/container_type_traits.hpp b/include/matador/object/container_type_traits.hpp
@@ -6,7 +6,7 @@
 #include <set>
 #include <type_traits>
 
-/// @cond OOS_DEV
+/// @cond MATADOR_DEV
 
 template < template < class ... > class Container>
 struct is_container_type : std::false_type { };

diff --git a/include/matador/object/delete_action.hpp b/include/matador/object/delete_action.hpp
@@ -6,16 +6,16 @@
 #define OOS_DELETE_ACTION_HPP
 
 #ifdef _MSC_VER
-#ifdef oos_object_EXPORTS
-#define OOS_OBJECT_API __declspec(dllexport)
+#ifdef matador_object_EXPORTS
+#define MATADOR_OBJECT_API __declspec(dllexport)
 #define EXPIMP_OBJECT_TEMPLATE
 #else
-#define OOS_OBJECT_API __declspec(dllimport)
+#define MATADOR_OBJECT_API __declspec(dllimport)
 #define EXPIMP_OBJECT_TEMPLATE extern
 #endif
 #pragma warning(disable: 4251)
 #else
-#define OOS_OBJECT_API
+#define MATADOR_OBJECT_API
 #endif
 
 #include "matador/object/action.hpp"
@@ -30,7 +30,7 @@ namespace matador {
 
 class object_serializer;
 
-/// @cond OOS_DEV
+/// @cond MATADOR_DEV
 
 /**
  * @internal
@@ -40,7 +40,7 @@ class object_serializer;
  * This action is used when an objected
  * is deleted from the database.
  */
-class OOS_OBJECT_API delete_action : public action
+class MATADOR_OBJECT_API delete_action : public action
 {
 private:
   typedef void (*t_backup_func)(byte_buffer&, delete_action*, object_serializer &serializer);

diff --git a/include/matador/object/has_many_item.hpp b/include/matador/object/has_many_item.hpp
@@ -15,7 +15,7 @@
 
 namespace matador {
 
-/// @cond OOS_DEV
+/// @cond MATADOR_DEV
 
 template < class T, template <class ...> class C >
 class has_many_iterator;

diff --git a/include/matador/object/has_many_list.hpp b/include/matador/object/has_many_list.hpp
@@ -12,7 +12,7 @@
 
 namespace matador {
 
-/// @cond OOS_DEV
+/// @cond MATADOR_DEV
 
 template < class T >
 struct has_many_iterator_traits<T, std::list, typename std::enable_if<!std::is_scalar<T>::value>::type>
@@ -223,7 +223,7 @@ class has_many_iterator<T, std::list>
   container_iterator iter_;
 };
 
-/// @cond OOS_DEV
+/// @cond MATADOR_DEV
 
 template < class T >
 struct const_has_many_iterator_traits<T, std::list, typename std::enable_if<!std::is_scalar<T>::value>::type>
@@ -455,7 +455,7 @@ class const_has_many_iterator<T, std::list>
 
 namespace detail {
 
-/// @cond OOS_DEV
+/// @cond MATADOR_DEV
 
 template<class T>
 class has_many_inserter<T, std::list, typename std::enable_if<!std::is_scalar<T>::value>::type>