Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
djinni
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
djinni
Commits
aa68e40d
Commit
aa68e40d
authored
Apr 13, 2015
by
Jacob Potter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix ObjcProxy constructors
parent
cd5c74e0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
12 deletions
+3
-12
example/generated-src/objc/TXSTextboxListenerObjcProxy+Private.h
.../generated-src/objc/TXSTextboxListenerObjcProxy+Private.h
+1
-4
src/source/ObjcGenerator.scala
src/source/ObjcGenerator.scala
+1
-4
test-suite/generated-src/objc/DBClientInterfaceObjcProxy+Private.h
...e/generated-src/objc/DBClientInterfaceObjcProxy+Private.h
+1
-4
No files found.
example/generated-src/objc/TXSTextboxListenerObjcProxy+Private.h
View file @
aa68e40d
...
@@ -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
src/source/ObjcGenerator.scala
View file @
aa68e40d
...
@@ -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 () {};"
)
}
}
})
})
})
})
...
...
test-suite/generated-src/objc/DBClientInterfaceObjcProxy+Private.h
View file @
aa68e40d
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment