From 3fce3e6f1b31109badfb6e03689a8e7ba3f85b83 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 19 Nov 2020 13:42:52 +0100 Subject: [PATCH] Get rid of the component in the C++ ComponentWindow::run --- api/sixtyfps-cpp/include/sixtyfps.h | 3 +-- api/sixtyfps-cpp/include/sixtyfps_properties.h | 1 + sixtyfps_compiler/generator/cpp.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/sixtyfps-cpp/include/sixtyfps.h b/api/sixtyfps-cpp/include/sixtyfps.h index 4756a2caf..9efa530e3 100644 --- a/api/sixtyfps-cpp/include/sixtyfps.h +++ b/api/sixtyfps-cpp/include/sixtyfps.h @@ -84,8 +84,7 @@ public: ComponentWindow(ComponentWindow &&) = delete; ComponentWindow &operator=(const ComponentWindow &) = delete; - template - void run(const Component *c) const + void run() const { sixtyfps_component_window_run(&inner); } diff --git a/api/sixtyfps-cpp/include/sixtyfps_properties.h b/api/sixtyfps-cpp/include/sixtyfps_properties.h index 292d8ec75..e312c3ef9 100644 --- a/api/sixtyfps-cpp/include/sixtyfps_properties.h +++ b/api/sixtyfps-cpp/include/sixtyfps_properties.h @@ -200,3 +200,4 @@ private: }; } // namespace sixtyfps + diff --git a/sixtyfps_compiler/generator/cpp.rs b/sixtyfps_compiler/generator/cpp.rs index 4991ad6bc..b3420177c 100644 --- a/sixtyfps_compiler/generator/cpp.rs +++ b/sixtyfps_compiler/generator/cpp.rs @@ -858,7 +858,7 @@ fn generate_component( Declaration::Function(Function { name: "run".into(), signature: "() const".into(), - statements: Some(vec!["window.run(this);".into()]), + statements: Some(vec!["window.run();".into()]), ..Default::default() }), ));