Commit aa68e40d authored by Jacob Potter's avatar Jacob Potter

fix ObjcProxy constructors

parent cd5c74e0
...@@ -13,13 +13,10 @@ class TextboxListenerObjcProxy final : public ::textsort::TextboxListener ...@@ -13,13 +13,10 @@ class TextboxListenerObjcProxy final : public ::textsort::TextboxListener
{ {
public: public:
id <TXSTextboxListener> objcRef; id <TXSTextboxListener> objcRef;
TextboxListenerObjcProxy (id objcRef); explicit TextboxListenerObjcProxy (id objcRef);
virtual ~TextboxListenerObjcProxy () override; virtual ~TextboxListenerObjcProxy () override;
static std::shared_ptr<::textsort::TextboxListener> textbox_listener_with_objc (id objcRef); static std::shared_ptr<::textsort::TextboxListener> textbox_listener_with_objc (id objcRef);
virtual void update (const ::textsort::ItemList & items) override; virtual void update (const ::textsort::ItemList & items) override;
private:
TextboxListenerObjcProxy () {};
}; };
} // namespace djinni_generated } // namespace djinni_generated
...@@ -321,7 +321,7 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) { ...@@ -321,7 +321,7 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
w.wl(s"class $objcExtSelf final : public ${withNs(spec.cppNamespace, idCpp.ty(ident))}").bracedSemi { w.wl(s"class $objcExtSelf final : public ${withNs(spec.cppNamespace, idCpp.ty(ident))}").bracedSemi {
w.wl("public:") w.wl("public:")
w.wl(s"id <$self> objcRef;") w.wl(s"id <$self> objcRef;")
w.wl(s"$objcExtSelf (id objcRef);") w.wl(s"explicit $objcExtSelf (id objcRef);")
w.wl(s"virtual ~$objcExtSelf () override;") w.wl(s"virtual ~$objcExtSelf () override;")
w.wl(s"static std::shared_ptr<${withNs(spec.cppNamespace, idCpp.ty(ident.name))}> ${idCpp.method(ident.name + "_with_objc")} (id objcRef);") w.wl(s"static std::shared_ptr<${withNs(spec.cppNamespace, idCpp.ty(ident.name))}> ${idCpp.method(ident.name + "_with_objc")} (id objcRef);")
for (m <- i.methods) { for (m <- i.methods) {
...@@ -329,9 +329,6 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) { ...@@ -329,9 +329,6 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
val params = m.params.map(p => toCppParamType(p, spec.cppNamespace)) val params = m.params.map(p => toCppParamType(p, spec.cppNamespace))
w.wl(s"virtual $ret ${idCpp.method(m.ident)} ${params.mkString("(", ", ", ")")} override;") w.wl(s"virtual $ret ${idCpp.method(m.ident)} ${params.mkString("(", ", ", ")")} override;")
} }
w.wl
w.wl("private:")
w.wl(s"$objcExtSelf () {};")
} }
}) })
}) })
......
...@@ -13,13 +13,10 @@ class ClientInterfaceObjcProxy final : public ClientInterface ...@@ -13,13 +13,10 @@ class ClientInterfaceObjcProxy final : public ClientInterface
{ {
public: public:
id <DBClientInterface> objcRef; id <DBClientInterface> objcRef;
ClientInterfaceObjcProxy (id objcRef); explicit ClientInterfaceObjcProxy (id objcRef);
virtual ~ClientInterfaceObjcProxy () override; virtual ~ClientInterfaceObjcProxy () override;
static std::shared_ptr<ClientInterface> client_interface_with_objc (id objcRef); static std::shared_ptr<ClientInterface> client_interface_with_objc (id objcRef);
virtual ClientReturnedRecord get_record (int64_t record_id, const std::string & utf8string) override; virtual ClientReturnedRecord get_record (int64_t record_id, const std::string & utf8string) override;
private:
ClientInterfaceObjcProxy () {};
}; };
} // namespace djinni_generated } // namespace djinni_generated
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment