summaryrefslogtreecommitdiff
path: root/src/bin/eolian_cxx
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2014-07-23 14:13:21 +0100
committerDaniel Kolesa <d.kolesa@samsung.com>2014-07-23 14:13:21 +0100
commitfd0210f30ebf7f0900ae77bc324aae7bf222c623 (patch)
tree1fe385b0c54b7e7d08092cc8aca68320d6fb5dd5 /src/bin/eolian_cxx
parente26be1aca68f9e04e1ceffcbe9b0d9fed777dfad (diff)
eolian: list_get -> get, find_by -> get_by
Diffstat (limited to 'src/bin/eolian_cxx')
-rw-r--r--src/bin/eolian_cxx/convert.cc20
-rw-r--r--src/bin/eolian_cxx/convert_comments.cc2
-rw-r--r--src/bin/eolian_cxx/eolian_cxx.cc4
-rw-r--r--src/bin/eolian_cxx/eolian_wrappers.hh10
-rw-r--r--src/bin/eolian_cxx/type_lookup.hh2
5 files changed, 19 insertions, 19 deletions
diff --git a/src/bin/eolian_cxx/convert.cc b/src/bin/eolian_cxx/convert.cc
index 0da515c347..8323d44611 100644
--- a/src/bin/eolian_cxx/convert.cc
+++ b/src/bin/eolian_cxx/convert.cc
@@ -49,7 +49,7 @@ static efl::eolian::parameters_container_type
49convert_eolian_parameters(Eolian_Function const& func, getter_t func_type) 49convert_eolian_parameters(Eolian_Function const& func, getter_t func_type)
50{ 50{
51 return convert_eolian_parameters 51 return convert_eolian_parameters
52 (::eolian_parameters_list_get(&func), func_type.value); 52 (::eolian_parameters_get(&func), func_type.value);
53} 53}
54 54
55static efl::eolian::parameters_container_type 55static efl::eolian::parameters_container_type
@@ -69,7 +69,7 @@ convert_eolian_parameters(Eolian_Function const& func)
69{ 69{
70 assert(function_type(func) != EOLIAN_PROPERTY); 70 assert(function_type(func) != EOLIAN_PROPERTY);
71 return convert_eolian_parameters 71 return convert_eolian_parameters
72 (::eolian_parameters_list_get(&func), function_type(func)); 72 (::eolian_parameters_get(&func), function_type(func));
73} 73}
74 74
75static efl::eolian::functions_container_type 75static efl::eolian::functions_container_type
@@ -78,7 +78,7 @@ convert_eolian_property_to_functions(Eolian_Class const& klass)
78 efl::eolian::functions_container_type container; 78 efl::eolian::functions_container_type container;
79 std::string cxx_classname = safe_lower(class_name(klass)); 79 std::string cxx_classname = safe_lower(class_name(klass));
80 Eina_Iterator *properties = 80 Eina_Iterator *properties =
81 ::eolian_class_functions_list_get(&klass, EOLIAN_PROPERTY); // XXX 81 ::eolian_class_functions_get(&klass, EOLIAN_PROPERTY); // XXX
82 void *curr; 82 void *curr;
83 std::string prefix(class_prefix(klass)); 83 std::string prefix(class_prefix(klass));
84 EINA_ITERATOR_FOREACH(properties, curr) 84 EINA_ITERATOR_FOREACH(properties, curr)
@@ -122,7 +122,7 @@ convert_eolian_property_to_functions(Eolian_Class const& klass)
122 }); 122 });
123 } 123 }
124 efl::eolian::parameters_container_type keys = 124 efl::eolian::parameters_container_type keys =
125 convert_eolian_parameters(::eolian_property_keys_list_get(prop_), 125 convert_eolian_parameters(::eolian_property_keys_get(prop_),
126 eolian_cxx::getter); 126 eolian_cxx::getter);
127 if (!keys.empty()) 127 if (!keys.empty())
128 { 128 {
@@ -141,10 +141,10 @@ convert_eolian_property_to_functions(Eolian_Class const& klass)
141 set_.name = function_name(*prop_) + "_set"; 141 set_.name = function_name(*prop_) + "_set";
142 set_.impl = function_impl(*prop_, prefix) + "_set"; 142 set_.impl = function_impl(*prop_, prefix) + "_set";
143 efl::eolian::parameters_container_type keys = 143 efl::eolian::parameters_container_type keys =
144 convert_eolian_parameters(::eolian_property_keys_list_get(prop_), 144 convert_eolian_parameters(::eolian_property_keys_get(prop_),
145 eolian_cxx::setter); 145 eolian_cxx::setter);
146 efl::eolian::parameters_container_type params = 146 efl::eolian::parameters_container_type params =
147 convert_eolian_parameters(::eolian_parameters_list_get(prop_), 147 convert_eolian_parameters(::eolian_parameters_get(prop_),
148 eolian_cxx::setter); 148 eolian_cxx::setter);
149 set_.params = params; 149 set_.params = params;
150 if (!keys.empty()) 150 if (!keys.empty())
@@ -175,7 +175,7 @@ void
175convert_eolian_inheritances(efl::eolian::eo_class& cls, Eolian_Class const& klass) 175convert_eolian_inheritances(efl::eolian::eo_class& cls, Eolian_Class const& klass)
176{ 176{
177 Eina_Iterator *inheritances = 177 Eina_Iterator *inheritances =
178 ::eolian_class_inherits_list_get(&klass); 178 ::eolian_class_inherits_get(&klass);
179 void *curr; 179 void *curr;
180 180
181 if (!eina_iterator_next(inheritances, &curr) || !curr) 181 if (!eina_iterator_next(inheritances, &curr) || !curr)
@@ -203,7 +203,7 @@ void
203convert_eolian_implements(efl::eolian::eo_class& cls, Eolian_Class const& klass) 203convert_eolian_implements(efl::eolian::eo_class& cls, Eolian_Class const& klass)
204{ 204{
205 std::string prefix(class_prefix(klass)); 205 std::string prefix(class_prefix(klass));
206 Eina_Iterator *itr = ::eolian_class_implements_list_get(&klass); 206 Eina_Iterator *itr = ::eolian_class_implements_get(&klass);
207 void *impl_desc_; 207 void *impl_desc_;
208 208
209 EINA_ITERATOR_FOREACH(itr, impl_desc_) 209 EINA_ITERATOR_FOREACH(itr, impl_desc_)
@@ -234,7 +234,7 @@ convert_eolian_constructors(efl::eolian::eo_class& cls, Eolian_Class const& klas
234 void *curr; 234 void *curr;
235 std::string prefix(class_prefix(klass)); 235 std::string prefix(class_prefix(klass));
236 Eina_Iterator *constructors = 236 Eina_Iterator *constructors =
237 ::eolian_class_functions_list_get(&klass, EOLIAN_CTOR); 237 ::eolian_class_functions_get(&klass, EOLIAN_CTOR);
238 EINA_ITERATOR_FOREACH(constructors, curr) 238 EINA_ITERATOR_FOREACH(constructors, curr)
239 { 239 {
240 Eolian_Function *eo_constructor = static_cast<Eolian_Function*>(curr); 240 Eolian_Function *eo_constructor = static_cast<Eolian_Function*>(curr);
@@ -253,7 +253,7 @@ convert_eolian_functions(efl::eolian::eo_class& cls, Eolian_Class const& klass)
253 void *curr; 253 void *curr;
254 254
255 Eina_Iterator *eolian_functions = 255 Eina_Iterator *eolian_functions =
256 ::eolian_class_functions_list_get(&klass, EOLIAN_METHOD); 256 ::eolian_class_functions_get(&klass, EOLIAN_METHOD);
257 EINA_ITERATOR_FOREACH(eolian_functions, curr) 257 EINA_ITERATOR_FOREACH(eolian_functions, curr)
258 { 258 {
259 efl::eolian::eo_function func_; 259 efl::eolian::eo_function func_;
diff --git a/src/bin/eolian_cxx/convert_comments.cc b/src/bin/eolian_cxx/convert_comments.cc
index 0242eefa8f..7094e6209e 100644
--- a/src/bin/eolian_cxx/convert_comments.cc
+++ b/src/bin/eolian_cxx/convert_comments.cc
@@ -50,7 +50,7 @@ _comment_brief_and_params(Eolian_Function const& function,
50 { 50 {
51 doc += "@brief " + func + "\n\n"; 51 doc += "@brief " + func + "\n\n";
52 } 52 }
53 std::string params = _comment_parameters_list(::eolian_parameters_list_get(&function)); 53 std::string params = _comment_parameters_list(::eolian_parameters_get(&function));
54 if (params != "") 54 if (params != "")
55 { 55 {
56 doc += params + "\n"; 56 doc += params + "\n";
diff --git a/src/bin/eolian_cxx/eolian_cxx.cc b/src/bin/eolian_cxx/eolian_cxx.cc
index e01948d0d0..ba053215a3 100644
--- a/src/bin/eolian_cxx/eolian_cxx.cc
+++ b/src/bin/eolian_cxx/eolian_cxx.cc
@@ -94,10 +94,10 @@ generator_options(const Eolian_Class& klass)
94 gen_opts.c_headers.push_back(class_base_file(klass) + ".h"); 94 gen_opts.c_headers.push_back(class_base_file(klass) + ".h");
95 95
96 void *cur = NULL; 96 void *cur = NULL;
97 Eina_Iterator *inheritances = ::eolian_class_inherits_list_get(&klass); 97 Eina_Iterator *inheritances = ::eolian_class_inherits_get(&klass);
98 EINA_ITERATOR_FOREACH(inheritances, cur) 98 EINA_ITERATOR_FOREACH(inheritances, cur)
99 { 99 {
100 const Eolian_Class *ext = ::eolian_class_find_by_name(static_cast<const char*>(cur)); 100 const Eolian_Class *ext = ::eolian_class_get_by_name(static_cast<const char*>(cur));
101 std::string eo_parent_file = class_base_file(*ext); 101 std::string eo_parent_file = class_base_file(*ext);
102 if (!eo_parent_file.empty()) 102 if (!eo_parent_file.empty())
103 { 103 {
diff --git a/src/bin/eolian_cxx/eolian_wrappers.hh b/src/bin/eolian_cxx/eolian_wrappers.hh
index f16dbc9a01..ce2c4f2b09 100644
--- a/src/bin/eolian_cxx/eolian_wrappers.hh
+++ b/src/bin/eolian_cxx/eolian_wrappers.hh
@@ -30,7 +30,7 @@ ctor_t const ctor = {};
30inline const Eolian_Class* 30inline const Eolian_Class*
31class_from_file(std::string const& file) 31class_from_file(std::string const& file)
32{ 32{
33 return ::eolian_class_find_by_file(file.c_str()); 33 return ::eolian_class_get_by_file(file.c_str());
34} 34}
35 35
36inline std::string 36inline std::string
@@ -60,7 +60,7 @@ class_full_name(Eolian_Class const& klass)
60inline const Eolian_Class * 60inline const Eolian_Class *
61class_from_name(std::string const& classname) 61class_from_name(std::string const& classname)
62{ 62{
63 return ::eolian_class_find_by_name(classname.c_str()); 63 return ::eolian_class_get_by_name(classname.c_str());
64} 64}
65 65
66inline std::string 66inline std::string
@@ -137,7 +137,7 @@ inline std::string
137class_namespace_full(Eolian_Class const& klass) 137class_namespace_full(Eolian_Class const& klass)
138{ 138{
139 std::string s; 139 std::string s;
140 Eina_Iterator* itr = ::eolian_class_namespaces_list_get(&klass); 140 Eina_Iterator* itr = ::eolian_class_namespaces_get(&klass);
141 void* name; 141 void* name;
142 EINA_ITERATOR_FOREACH(itr, name) 142 EINA_ITERATOR_FOREACH(itr, name)
143 { 143 {
@@ -173,7 +173,7 @@ private:
173inline iterator_iterator<const Eolian_Class> 173inline iterator_iterator<const Eolian_Class>
174class_list_all() 174class_list_all()
175{ 175{
176 return iterator_iterator<const Eolian_Class>(::eolian_all_classes_list_get()); 176 return iterator_iterator<const Eolian_Class>(::eolian_all_classes_get());
177} 177}
178 178
179inline std::string 179inline std::string
@@ -364,7 +364,7 @@ inline efl::eolian::events_container_type
364event_list(Eolian_Class const& klass) 364event_list(Eolian_Class const& klass)
365{ 365{
366 efl::eolian::events_container_type events; 366 efl::eolian::events_container_type events;
367 Eina_Iterator *itr = ::eolian_class_events_list_get(&klass); 367 Eina_Iterator *itr = ::eolian_class_events_get(&klass);
368 Eolian_Event *e; 368 Eolian_Event *e;
369 EINA_ITERATOR_FOREACH(itr, e) 369 EINA_ITERATOR_FOREACH(itr, e)
370 { 370 {
diff --git a/src/bin/eolian_cxx/type_lookup.hh b/src/bin/eolian_cxx/type_lookup.hh
index da68ff4dec..dfecf5050c 100644
--- a/src/bin/eolian_cxx/type_lookup.hh
+++ b/src/bin/eolian_cxx/type_lookup.hh
@@ -52,7 +52,7 @@ type_lookup(const Eolian_Type* type,
52 if (type == NULL) return { efl::eolian::void_type }; // XXX shouldn't 52 if (type == NULL) return { efl::eolian::void_type }; // XXX shouldn't
53 53
54 std::vector<Eolian_Type const*> types; types.push_back(type); 54 std::vector<Eolian_Type const*> types; types.push_back(type);
55 efl::eina::iterator<Eolian_Type const> iterator ( ::eolian_type_subtypes_list_get(type) ); 55 efl::eina::iterator<Eolian_Type const> iterator ( ::eolian_type_subtypes_get(type) );
56 while(iterator != efl::eina::iterator<Eolian_Type const>()) 56 while(iterator != efl::eina::iterator<Eolian_Type const>())
57 if(Eolian_Type const* t = &*iterator) 57 if(Eolian_Type const* t = &*iterator)
58 types.push_back(t), ++iterator; 58 types.push_back(t), ++iterator;