Move ureact/utility/ headers to the ureact/

I recommend to use ureact/ureact.hpp anyway, so there is no good reason for the additional directory
YarikTH · Jan 7, 2024 · f39999d · f39999d
1 parent de9229d
commit f39999d
Show file tree

Hide file tree

Showing 26 changed files with 59 additions and 59 deletions.
diff --git a/include/ureact/adaptor/detail/adjacent_base.hpp b/include/ureact/adaptor/detail/adjacent_base.hpp
@@ -16,8 +16,8 @@
 
 #include <ureact/detail/defines.hpp>
 #include <ureact/events.hpp>
-#include <ureact/utility/signal_pack.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/signal_pack.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/detail/reactive_op_base.hpp b/include/ureact/adaptor/detail/reactive_op_base.hpp
@@ -11,7 +11,7 @@
 #define UREACT_ADAPTOR_DETAIL_REACTIVE_OP_BASE_HPP
 
 #include <ureact/detail/linker_functor.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/detail/synced_adaptor_base.hpp b/include/ureact/adaptor/detail/synced_adaptor_base.hpp
@@ -11,7 +11,7 @@
 #define UREACT_ADAPTOR_DETAIL_SYNCED_ADAPTOR_BASE_HPP
 
 #include <ureact/detail/adaptor.hpp>
-#include <ureact/utility/signal_pack.hpp>
+#include <ureact/signal_pack.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/detail/zip_base.hpp b/include/ureact/adaptor/detail/zip_base.hpp
@@ -16,7 +16,7 @@
 
 #include <ureact/detail/defines.hpp>
 #include <ureact/events.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/flatten.hpp b/include/ureact/adaptor/flatten.hpp
@@ -15,7 +15,7 @@
 #include <ureact/context.hpp>
 #include <ureact/detail/adaptor.hpp>
 #include <ureact/detail/node.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/fold.hpp b/include/ureact/adaptor/fold.hpp
@@ -14,10 +14,10 @@
 
 #include <ureact/detail/adaptor.hpp>
 #include <ureact/detail/linker_functor.hpp>
+#include <ureact/event_range.hpp>
 #include <ureact/signal.hpp>
-#include <ureact/utility/event_range.hpp>
-#include <ureact/utility/signal_pack.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/signal_pack.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/lift.hpp b/include/ureact/adaptor/lift.hpp
@@ -18,8 +18,8 @@
 #include <ureact/detail/deduce_result_type.hpp>
 #include <ureact/detail/temp_signal.hpp>
 #include <ureact/signal.hpp>
-#include <ureact/utility/signal_pack.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/signal_pack.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/observe.hpp b/include/ureact/adaptor/observe.hpp
@@ -15,11 +15,11 @@
 #include <ureact/detail/adaptor.hpp>
 #include <ureact/detail/linker_functor.hpp>
 #include <ureact/detail/observer_node.hpp>
+#include <ureact/observe_policy.hpp>
 #include <ureact/observer.hpp>
-#include <ureact/utility/observe_policy.hpp>
-#include <ureact/utility/observer_action.hpp>
-#include <ureact/utility/signal_pack.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/observer_action.hpp>
+#include <ureact/signal_pack.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/process.hpp b/include/ureact/adaptor/process.hpp
@@ -14,10 +14,10 @@
 
 #include <ureact/detail/adaptor.hpp>
 #include <ureact/detail/linker_functor.hpp>
+#include <ureact/event_emitter.hpp>
+#include <ureact/event_range.hpp>
 #include <ureact/events.hpp>
-#include <ureact/utility/event_emitter.hpp>
-#include <ureact/utility/event_range.hpp>
-#include <ureact/utility/signal_pack.hpp>
+#include <ureact/signal_pack.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/reactive_ref.hpp b/include/ureact/adaptor/reactive_ref.hpp
@@ -13,7 +13,7 @@
 #include <ureact/adaptor/flatten.hpp>
 #include <ureact/adaptor/lift.hpp>
 #include <ureact/detail/adaptor.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/slice.hpp b/include/ureact/adaptor/slice.hpp
@@ -15,7 +15,7 @@
 
 #include <ureact/adaptor/detail/take_drop_base.hpp>
 #include <ureact/adaptor/filter.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/tap.hpp b/include/ureact/adaptor/tap.hpp
@@ -11,8 +11,8 @@
 #define UREACT_ADAPTOR_TAP_HPP
 
 #include <ureact/adaptor/observe.hpp>
-#include <ureact/utility/observe_policy.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/observe_policy.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/unify.hpp b/include/ureact/adaptor/unify.hpp
@@ -11,7 +11,7 @@
 #define UREACT_ADAPTOR_UNIFY_HPP
 
 #include <ureact/adaptor/cast.hpp>
-#include <ureact/utility/unit.hpp>
+#include <ureact/unit.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/detail/adaptor.hpp b/include/ureact/detail/adaptor.hpp
@@ -14,7 +14,7 @@
 #include <utility>
 
 #include <ureact/detail/defines.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/utility/event_emitter.hpp → include/ureact/event_emitter.hpp b/include/ureact/utility/event_emitter.hpp → include/ureact/event_emitter.hpp
@@ -7,13 +7,13 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_UTILITY_EVENT_EMITTER_HPP
-#define UREACT_UTILITY_EVENT_EMITTER_HPP
+#ifndef UREACT_EVENT_EMITTER_HPP
+#define UREACT_EVENT_EMITTER_HPP
 
 #include <vector>
 
 #include <ureact/detail/defines.hpp>
-#include <ureact/utility/unit.hpp>
+#include <ureact/unit.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
@@ -93,4 +93,4 @@ class event_emitter final
 
 UREACT_END_NAMESPACE
 
-#endif //UREACT_UTILITY_EVENT_EMITTER_HPP
+#endif //UREACT_EVENT_EMITTER_HPP
diff --git a/include/ureact/utility/event_range.hpp → include/ureact/event_range.hpp b/include/ureact/utility/event_range.hpp → include/ureact/event_range.hpp
@@ -7,13 +7,13 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_UTILITY_EVENT_RANGE_HPP
-#define UREACT_UTILITY_EVENT_RANGE_HPP
+#ifndef UREACT_EVENT_RANGE_HPP
+#define UREACT_EVENT_RANGE_HPP
 
 #include <vector>
 
 #include <ureact/detail/defines.hpp>
-#include <ureact/utility/unit.hpp>
+#include <ureact/unit.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
@@ -94,4 +94,4 @@ class event_range final
 
 UREACT_END_NAMESPACE
 
-#endif //UREACT_UTILITY_EVENT_RANGE_HPP
+#endif //UREACT_EVENT_RANGE_HPP
diff --git a/include/ureact/events.hpp b/include/ureact/events.hpp
@@ -15,8 +15,8 @@
 
 #include <ureact/context.hpp>
 #include <ureact/detail/node.hpp>
-#include <ureact/utility/event_range.hpp> // event ranges often needed along with events.hpp header
-#include <ureact/utility/unit.hpp>
+#include <ureact/event_range.hpp> // event ranges often needed along with events.hpp header
+#include <ureact/unit.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/utility/observe_policy.hpp → include/ureact/observe_policy.hpp b/include/ureact/utility/observe_policy.hpp → include/ureact/observe_policy.hpp
@@ -7,8 +7,8 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_UTILITY_OBSERVE_POLICY_HPP
-#define UREACT_UTILITY_OBSERVE_POLICY_HPP
+#ifndef UREACT_OBSERVE_POLICY_HPP
+#define UREACT_OBSERVE_POLICY_HPP
 
 #include <ureact/detail/defines.hpp>
 
@@ -25,4 +25,4 @@ enum class observe_policy
 
 UREACT_END_NAMESPACE
 
-#endif //UREACT_UTILITY_OBSERVE_POLICY_HPP
+#endif //UREACT_OBSERVE_POLICY_HPP
diff --git a/include/ureact/utility/observer_action.hpp → include/ureact/observer_action.hpp b/include/ureact/utility/observer_action.hpp → include/ureact/observer_action.hpp
@@ -7,8 +7,8 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_UTILITY_OBSERVER_ACTION_HPP
-#define UREACT_UTILITY_OBSERVER_ACTION_HPP
+#ifndef UREACT_OBSERVER_ACTION_HPP
+#define UREACT_OBSERVER_ACTION_HPP
 
 #include <ureact/detail/defines.hpp>
 
@@ -25,4 +25,4 @@ enum class observer_action
 
 UREACT_END_NAMESPACE
 
-#endif //UREACT_UTILITY_OBSERVER_ACTION_HPP
+#endif //UREACT_OBSERVER_ACTION_HPP
diff --git a/include/ureact/signal.hpp b/include/ureact/signal.hpp
@@ -15,7 +15,7 @@
 #include <ureact/context.hpp>
 #include <ureact/detail/has_changed.hpp>
 #include <ureact/detail/node.hpp>
-#include <ureact/utility/type_traits.hpp>
+#include <ureact/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/utility/signal_pack.hpp → include/ureact/signal_pack.hpp b/include/ureact/utility/signal_pack.hpp → include/ureact/signal_pack.hpp
@@ -7,8 +7,8 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_UTILITY_SIGNAL_PACK_HPP
-#define UREACT_UTILITY_SIGNAL_PACK_HPP
+#ifndef UREACT_SIGNAL_PACK_HPP
+#define UREACT_SIGNAL_PACK_HPP
 
 #include <tuple>
 
@@ -59,4 +59,4 @@ UREACT_WARN_UNUSED_RESULT auto with( const signal<Values>&... deps )
 
 UREACT_END_NAMESPACE
 
-#endif //UREACT_UTILITY_SIGNAL_PACK_HPP
+#endif //UREACT_SIGNAL_PACK_HPP
diff --git a/include/ureact/utility/type_traits.hpp → include/ureact/type_traits.hpp b/include/ureact/utility/type_traits.hpp → include/ureact/type_traits.hpp
@@ -7,8 +7,8 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_UTILITY_TYPE_TRAITS_HPP
-#define UREACT_UTILITY_TYPE_TRAITS_HPP
+#ifndef UREACT_TYPE_TRAITS_HPP
+#define UREACT_TYPE_TRAITS_HPP
 
 #include <type_traits>
 
@@ -334,4 +334,4 @@ inline constexpr bool is_reactive_v = is_reactive<T>::value;
 
 UREACT_END_NAMESPACE
 
-#endif //UREACT_UTILITY_TYPE_TRAITS_HPP
+#endif //UREACT_TYPE_TRAITS_HPP
diff --git a/include/ureact/utility/unit.hpp → include/ureact/unit.hpp b/include/ureact/utility/unit.hpp → include/ureact/unit.hpp
@@ -7,8 +7,8 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_UTILITY_UNIT_HPP
-#define UREACT_UTILITY_UNIT_HPP
+#ifndef UREACT_UNIT_HPP
+#define UREACT_UNIT_HPP
 
 #include <ureact/detail/defines.hpp>
 
@@ -44,4 +44,4 @@ constexpr bool operator>=(unit, unit) noexcept { return true; }
 
 UREACT_END_NAMESPACE
 
-#endif //UREACT_UTILITY_UNIT_HPP
+#endif //UREACT_UNIT_HPP
diff --git a/include/ureact/ureact.hpp b/include/ureact/ureact.hpp
@@ -15,16 +15,16 @@
 // clang-format on
 
 #include <ureact/context.hpp>
+#include <ureact/event_emitter.hpp>
+#include <ureact/event_range.hpp>
 #include <ureact/events.hpp>
+#include <ureact/observe_policy.hpp>
 #include <ureact/observer.hpp>
+#include <ureact/observer_action.hpp>
 #include <ureact/signal.hpp>
+#include <ureact/signal_pack.hpp>
 #include <ureact/transaction.hpp>
-#include <ureact/utility/event_emitter.hpp>
-#include <ureact/utility/event_range.hpp>
-#include <ureact/utility/observe_policy.hpp>
-#include <ureact/utility/observer_action.hpp>
-#include <ureact/utility/signal_pack.hpp>
-#include <ureact/utility/type_traits.hpp>
-#include <ureact/utility/unit.hpp>
+#include <ureact/type_traits.hpp>
+#include <ureact/unit.hpp>
 
 #endif //UREACT_UREACT_HPP
diff --git a/tests/src/event_emitter.cpp b/tests/src/event_emitter.cpp
@@ -5,7 +5,7 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
-#include "ureact/utility/event_emitter.hpp"
+#include "ureact/event_emitter.hpp"
 
 #include <algorithm>
 

diff --git a/tests/src/event_range.cpp b/tests/src/event_range.cpp
@@ -5,7 +5,7 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
-#include "ureact/utility/event_range.hpp"
+#include "ureact/event_range.hpp"
 
 #include "catch2_extra.hpp"