Move Callback and internal Models to the private_api namespace

api/sixtyfps-cpp/include/sixtyfps.h

@@ -427,6 +427,7 @@ private:
     std::vector<private_api::ModelPeer> peers;
 };
 
+namespace private_api {
 /// A Model backed by a std::array of constant size
 template<int Count, typename ModelData>
 class ArrayModel : public Model<ModelData>
@@ -459,6 +460,7 @@ struct IntModel : Model<int>
     int row_count() const override { return data; }
     int row_data(int value) const override { return value; }
 };
+} // namespace pricate_api
 
 /// A Model backed by a SharedVector
 template<typename ModelData>

api/sixtyfps-cpp/include/sixtyfps_callbacks.h

@@ -11,7 +11,7 @@ LICENSE END */
 #include <tuple>
 #include "sixtyfps_properties_internal.h"
 
-namespace sixtyfps {
+namespace sixtyfps::private_api {
 
 /// A Callback stores a function pointer with no parameters and no return value.
 /// It's possible to set that pointer via set_handler() and it can be invoked via call(). This is
@@ -102,7 +102,6 @@ private:
     cbindgen_private::CallbackOpaque inner;
 };
 
-namespace private_api {
 template<typename A, typename R>
 struct CallbackSignatureHelper
 {
@@ -115,6 +114,5 @@ struct CallbackSignatureHelper<void, R>
 };
 template<typename A, typename R = void>
 using CallbackHelper = Callback<typename CallbackSignatureHelper<A, R>::Result>;
-}
 
 } // namespace sixtyfps