language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-09-30 22:01:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Remove the null state in ComponentDefinition

Browse source 
This isn't needed as it turns out and a cleaner API this way
This commit is contained in:
Simon Hausmann 2021-03-19 17:08:04 +01:00
parent 4705c455b9
commit 59d6866b13
1 changed files with 13 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

31
api/sixtyfps-cpp/include/sixtyfps_interpreter.h
View file

@ -422,17 +422,17 @@ class ComponentDefinition
{
friend class ComponentCompiler;
union {
sixtyfps::cbindgen_private::ComponentDefinitionOpaque inner;
void *ptr;
};
using ComponentDefinitionOpaque = sixtyfps::cbindgen_private::ComponentDefinitionOpaque;
ComponentDefinitionOpaque inner;
ComponentDefinition() = delete;
// Internal constructor that takes ownership of the component definition
explicit ComponentDefinition(ComponentDefinitionOpaque &inner) : inner(inner) { }
public:
ComponentDefinition() { ptr = nullptr; }
ComponentDefinition(const ComponentDefinition &other)
{
ptr = nullptr;
operator=(other);
sixtyfps_interpreter_component_definition_clone(&other.inner, &inner);
}
ComponentDefinition &operator=(const ComponentDefinition &other)
{
@ -441,21 +441,12 @@ public:
if (this == &other)
return *this;
if (ptr != nullptr)
sixtyfps_interpreter_component_definition_destructor(&inner);
if (other.ptr != nullptr)
sixtyfps_interpreter_component_definition_clone(&other.inner, &inner);
else
ptr = nullptr;
return *this;
}
~ComponentDefinition()
{
if (ptr != nullptr)
sixtyfps_interpreter_component_definition_destructor(&inner);
}
~ComponentDefinition() { sixtyfps_interpreter_component_definition_destructor(&inner); }
};
class ComponentCompiler
@ -488,12 +479,12 @@ public:
std::optional<ComponentDefinition> build_from_source(std::string_view source_code,
std::string_view path)
{
ComponentDefinition result;
cbindgen_private::ComponentDefinitionOpaque result;
if (cbindgen_private::sixtyfps_interpreter_component_compiler_build_from_source(
&inner, sixtyfps::private_api::string_to_slice(source_code),
sixtyfps::private_api::string_to_slice(path), &result.inner)) {
sixtyfps::private_api::string_to_slice(path), &result)) {
return result;
return ComponentDefinition(result);
} else {
return {};
}