Fixup previous merge

Author: ogoffart

api/cpp/include/slint.h

@@ -148,7 +148,7 @@ class WindowRc
             (*reinterpret_cast<F *>(data))(state);
         };
         SetRenderingNotifierError err;
-        if (cbindgen_private::sixtyfps_windowrc_set_rendering_notifier(
+        if (cbindgen_private::slint_windowrc_set_rendering_notifier(
                     &inner, actual_cb,
                     [](void *user_data) { delete reinterpret_cast<F *>(user_data); },
                     new F(std::move(callback)), &err)) {
@@ -158,7 +158,7 @@ class WindowRc
         }
     }
 
-    void request_redraw() const { cbindgen_private::sixtyfps_windowrc_request_redraw(&inner); }
+    void request_redraw() const { cbindgen_private::slint_windowrc_request_redraw(&inner); }
 
 private:
     cbindgen_private::WindowRcOpaque inner;

examples/CMakeLists.txt

@@ -8,7 +8,7 @@ list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
 find_package(OpenGLES2 QUIET)
 
 if (NOT TARGET Slint::Slint)
-    find_package(SixtyFPS REQUIRED)
+    find_package(Slint REQUIRED)
     include(FetchContent)
 endif()
 
@@ -26,6 +26,6 @@ endif()
 if (SLINT_FEATURE_INTERPRETER)
     add_subdirectory(iot-dashboard/)
 endif()
-if (OpenGLES2_FOUND AND SIXTYFPS_FEATURE_BACKEND_GL)
+if (OpenGLES2_FOUND AND SLINT_FEATURE_BACKEND_GL)
     add_subdirectory(opengl_underlay)
 endif()

internal/core/api.rs

@@ -10,7 +10,7 @@ use std::rc::Rc;
 use crate::component::ComponentVTable;
 use crate::window::WindowRc;
 
-/// This enum describes a low-level access to specific graphcis APIs used
+/// This enum describes a low-level access to specific graphics APIs used
 /// by the renderer.
 #[derive(Clone)]
 #[non_exhaustive]
@@ -76,7 +76,7 @@ impl<F: FnMut(RenderingState, &GraphicsAPI)> RenderingNotifier for F {
 }
 
 /// This enum describes the different error scenarios that may occur when the applicaton
-/// registers a rendering notifier on a [`sixtyfps::Window`].
+/// registers a rendering notifier on a [`slint::Window`].
 #[derive(Debug, Clone)]
 #[repr(C)]
 #[non_exhaustive]

internal/core/window.rs

@@ -692,7 +692,7 @@ pub mod ffi {
 
     /// C binding to the set_rendering_notifier() API of Window
     #[no_mangle]
-    pub unsafe extern "C" fn sixtyfps_windowrc_set_rendering_notifier(
+    pub unsafe extern "C" fn slint_windowrc_set_rendering_notifier(
         handle: *const WindowRcOpaque,
         callback: extern "C" fn(rendering_state: RenderingState, user_data: *mut c_void),
         drop_user_data: extern "C" fn(user_data: *mut c_void),
@@ -733,7 +733,7 @@ pub mod ffi {
 
     /// This function issues a request to the windowing system to redraw the contents of the window.
     #[no_mangle]
-    pub unsafe extern "C" fn sixtyfps_windowrc_request_redraw(handle: *const WindowRcOpaque) {
+    pub unsafe extern "C" fn slint_windowrc_request_redraw(handle: *const WindowRcOpaque) {
         let window = &*(handle as *const WindowRc);
         window.request_redraw();
     }

tools/syntax_updater/main.rs

@@ -224,10 +224,9 @@ fn fold_node(
     if args.from.as_str() <= "0.0.6" && from_0_0_6::fold_node(node, file, state)? {
         return Ok(true);
     }
-    if args.from.as_str() <= "0.1.0" && from_0_1_0::fold_node(node, file, state)? {
+    if args.from.as_str() <= "0.1.6" && from_0_1_0::fold_node(node, file, state)? {
         return Ok(true);
     }
-
     Ok(false)
 }