diff options
author | Daniel Kolesa <d.kolesa@osg.samsung.com> | 2017-01-13 15:44:09 +0100 |
---|---|---|
committer | Daniel Kolesa <d.kolesa@osg.samsung.com> | 2017-01-13 15:44:09 +0100 |
commit | cb3f8304e09c5647542a9822f396b300dd6a3f8b (patch) | |
tree | dd26bed2f9b195a074c97524660301ebaa422115 /src | |
parent | 692ae7adb65d700c0387696a9fd789fe761ccfca (diff) |
eolian: change eo file syntax @virtual_pure -> @pure_virtual
Diffstat (limited to 'src')
31 files changed, 109 insertions, 109 deletions
diff --git a/src/lib/ecore_audio/ecore_audio.eo b/src/lib/ecore_audio/ecore_audio.eo index 74fd206434..ee5bb50afe 100644 --- a/src/lib/ecore_audio/ecore_audio.eo +++ b/src/lib/ecore_audio/ecore_audio.eo | |||
@@ -58,7 +58,7 @@ class Ecore.Audio (Efl.Object) | |||
58 | volume: double; [[The volume]] | 58 | volume: double; [[The volume]] |
59 | } | 59 | } |
60 | } | 60 | } |
61 | @property source @virtual_pure { | 61 | @property source @pure_virtual { |
62 | [[Source of the object | 62 | [[Source of the object |
63 | 63 | ||
64 | What sources are supported depends on the actual object. | 64 | What sources are supported depends on the actual object. |
@@ -77,7 +77,7 @@ class Ecore.Audio (Efl.Object) | |||
77 | source: string; [[The source to set to (i.e. file, URL, device)]] | 77 | source: string; [[The source to set to (i.e. file, URL, device)]] |
78 | } | 78 | } |
79 | } | 79 | } |
80 | @property format @virtual_pure { | 80 | @property format @pure_virtual { |
81 | [[Format of the object.]] | 81 | [[Format of the object.]] |
82 | set { | 82 | set { |
83 | [[Set the format of the object | 83 | [[Set the format of the object |
@@ -102,7 +102,7 @@ class Ecore.Audio (Efl.Object) | |||
102 | format: Ecore.Audio.Format; [[The audio format of the object]] | 102 | format: Ecore.Audio.Format; [[The audio format of the object]] |
103 | } | 103 | } |
104 | } | 104 | } |
105 | vio_set @virtual_pure { | 105 | vio_set @pure_virtual { |
106 | [[Set the virtual IO functions | 106 | [[Set the virtual IO functions |
107 | 107 | ||
108 | @since 1.8 | 108 | @since 1.8 |
diff --git a/src/lib/ecore_audio/ecore_audio_in.eo b/src/lib/ecore_audio/ecore_audio_in.eo index e288ad7007..be0aa8f6a5 100644 --- a/src/lib/ecore_audio/ecore_audio_in.eo +++ b/src/lib/ecore_audio/ecore_audio_in.eo | |||
@@ -44,7 +44,7 @@ class Ecore.Audio.In (Ecore.Audio) | |||
44 | channels: int; [[The number of channels]] | 44 | channels: int; [[The number of channels]] |
45 | } | 45 | } |
46 | } | 46 | } |
47 | @property preloaded @virtual_pure { | 47 | @property preloaded @pure_virtual { |
48 | [[Preloaded state of the input | 48 | [[Preloaded state of the input |
49 | 49 | ||
50 | @since 1.8 | 50 | @since 1.8 |
@@ -82,7 +82,7 @@ class Ecore.Audio.In (Ecore.Audio) | |||
82 | 82 | ||
83 | @since 1.8 | 83 | @since 1.8 |
84 | ]] | 84 | ]] |
85 | set @virtual_pure { | 85 | set @pure_virtual { |
86 | } | 86 | } |
87 | get { | 87 | get { |
88 | } | 88 | } |
@@ -134,7 +134,7 @@ class Ecore.Audio.In (Ecore.Audio) | |||
134 | @in len: size; [[The amount of samples to read]] | 134 | @in len: size; [[The amount of samples to read]] |
135 | } | 135 | } |
136 | } | 136 | } |
137 | seek @virtual_pure { | 137 | seek @pure_virtual { |
138 | [[Seek within the input | 138 | [[Seek within the input |
139 | 139 | ||
140 | @since 1.8 | 140 | @since 1.8 |
diff --git a/src/lib/ecore_con/efl_net_server_fd.eo b/src/lib/ecore_con/efl_net_server_fd.eo index 6d9ef9e8d4..9c936623f8 100644 --- a/src/lib/ecore_con/efl_net_server_fd.eo +++ b/src/lib/ecore_con/efl_net_server_fd.eo | |||
@@ -121,7 +121,7 @@ class Efl.Net.Server.Fd (Efl.Loop.Fd, Efl.Net.Server) { | |||
121 | ]] | 121 | ]] |
122 | } | 122 | } |
123 | 123 | ||
124 | client_add @protected @virtual_pure { | 124 | client_add @protected @pure_virtual { |
125 | [[Accept a new client, should emit "client,add". | 125 | [[Accept a new client, should emit "client,add". |
126 | 126 | ||
127 | Remember to create the client object with a callback to | 127 | Remember to create the client object with a callback to |
@@ -140,7 +140,7 @@ class Efl.Net.Server.Fd (Efl.Loop.Fd, Efl.Net.Server) { | |||
140 | } | 140 | } |
141 | } | 141 | } |
142 | 142 | ||
143 | client_reject @protected @virtual_pure { | 143 | client_reject @protected @pure_virtual { |
144 | [[Reject a new client, should emit "client,rejected". | 144 | [[Reject a new client, should emit "client,rejected". |
145 | 145 | ||
146 | Must always close the client socket when it's done. | 146 | Must always close the client socket when it's done. |
diff --git a/src/lib/ector/cairo/ector_renderer_cairo.eo b/src/lib/ector/cairo/ector_renderer_cairo.eo index d3eb852932..75d4757464 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo.eo +++ b/src/lib/ector/cairo/ector_renderer_cairo.eo | |||
@@ -2,7 +2,7 @@ abstract Ector.Renderer.Cairo (Ector.Renderer) | |||
2 | { | 2 | { |
3 | [[Ector cairo renderer abstract class]] | 3 | [[Ector cairo renderer abstract class]] |
4 | methods { | 4 | methods { |
5 | fill @virtual_pure { | 5 | fill @pure_virtual { |
6 | [[Fill operation]] | 6 | [[Fill operation]] |
7 | return: bool; [[$true on success, $false otherwise]] | 7 | return: bool; [[$true on success, $false otherwise]] |
8 | params { | 8 | params { |
diff --git a/src/lib/ector/ector_buffer.eo b/src/lib/ector/ector_buffer.eo index abe4ab7f13..0b8782ff68 100644 --- a/src/lib/ector/ector_buffer.eo +++ b/src/lib/ector/ector_buffer.eo | |||
@@ -43,7 +43,7 @@ mixin Ector.Buffer | |||
43 | cspace: Efl.Gfx.Colorspace; [[Colorspace]] | 43 | cspace: Efl.Gfx.Colorspace; [[Colorspace]] |
44 | } | 44 | } |
45 | } | 45 | } |
46 | map @virtual_pure { | 46 | map @pure_virtual { |
47 | [[Map a region of this buffer for read or write access by the CPU, | 47 | [[Map a region of this buffer for read or write access by the CPU, |
48 | fetch data from the GPU if needed. This operation may be slow if | 48 | fetch data from the GPU if needed. This operation may be slow if |
49 | cpu_readable_fast or cpu_writeable_fast are not true, or if the | 49 | cpu_readable_fast or cpu_writeable_fast are not true, or if the |
@@ -63,14 +63,14 @@ mixin Ector.Buffer | |||
63 | } | 63 | } |
64 | return: void_ptr @warn_unused; [[Pointer to the top-left pixel data. Returns $null in case of failure]] | 64 | return: void_ptr @warn_unused; [[Pointer to the top-left pixel data. Returns $null in case of failure]] |
65 | } | 65 | } |
66 | unmap @virtual_pure { | 66 | unmap @pure_virtual { |
67 | [[Unmap a region of this buffer, and upload data to the GPU (if needed).]] | 67 | [[Unmap a region of this buffer, and upload data to the GPU (if needed).]] |
68 | params { | 68 | params { |
69 | @in data: void_ptr; [[Data pointer returned by a previous call to map]] | 69 | @in data: void_ptr; [[Data pointer returned by a previous call to map]] |
70 | @in length: uint; [[Must be the same as returned by map.]] | 70 | @in length: uint; [[Must be the same as returned by map.]] |
71 | } | 71 | } |
72 | } | 72 | } |
73 | pixels_set @virtual_pure { | 73 | pixels_set @pure_virtual { |
74 | [[Set the source pixels for this buffer, or allocate a new memory region]] | 74 | [[Set the source pixels for this buffer, or allocate a new memory region]] |
75 | params { | 75 | params { |
76 | @in pixels: void_ptr; [[If $null, allocates an empty buffer]] | 76 | @in pixels: void_ptr; [[If $null, allocates an empty buffer]] |
@@ -86,7 +86,7 @@ mixin Ector.Buffer | |||
86 | } | 86 | } |
87 | return: bool; [[True if pixels_set was successful]] | 87 | return: bool; [[True if pixels_set was successful]] |
88 | } | 88 | } |
89 | span_get @virtual_pure { | 89 | span_get @pure_virtual { |
90 | [[Get a single horizontal span of length w starting from (x,y) | 90 | [[Get a single horizontal span of length w starting from (x,y) |
91 | 91 | ||
92 | Call span_free() to release it. This function will try not to | 92 | Call span_free() to release it. This function will try not to |
@@ -102,7 +102,7 @@ mixin Ector.Buffer | |||
102 | } | 102 | } |
103 | return: ptr(uint8); [[A temporary memory buffer containing the pixels requested.]] | 103 | return: ptr(uint8); [[A temporary memory buffer containing the pixels requested.]] |
104 | } | 104 | } |
105 | span_free @virtual_pure { | 105 | span_free @pure_virtual { |
106 | [[Must be called as soon as possible after span_get]] | 106 | [[Must be called as soon as possible after span_get]] |
107 | params { | 107 | params { |
108 | data: ptr(uint8); [[Data to be freed]] | 108 | data: ptr(uint8); [[Data to be freed]] |
diff --git a/src/lib/ector/ector_renderer.eo b/src/lib/ector/ector_renderer.eo index d742be1c98..af3775d14b 100644 --- a/src/lib/ector/ector_renderer.eo +++ b/src/lib/ector/ector_renderer.eo | |||
@@ -107,13 +107,13 @@ abstract Ector.Renderer (Efl.Object) | |||
107 | return: uint; [[CRC value]] | 107 | return: uint; [[CRC value]] |
108 | } | 108 | } |
109 | } | 109 | } |
110 | bounds_get @virtual_pure { | 110 | bounds_get @pure_virtual { |
111 | [[Retrieve the bounds of the renderer]] | 111 | [[Retrieve the bounds of the renderer]] |
112 | params { | 112 | params { |
113 | @out r: Eina.Rectangle; [[Bounds as @Eina.Rectangle]] | 113 | @out r: Eina.Rectangle; [[Bounds as @Eina.Rectangle]] |
114 | } | 114 | } |
115 | } | 115 | } |
116 | draw @virtual_pure { | 116 | draw @pure_virtual { |
117 | [[Actual draw operation]] | 117 | [[Actual draw operation]] |
118 | return: bool; [[$true on success, $false otherwise]] | 118 | return: bool; [[$true on success, $false otherwise]] |
119 | params { | 119 | params { |
@@ -126,7 +126,7 @@ abstract Ector.Renderer (Efl.Object) | |||
126 | [[Prepare for rendering]] | 126 | [[Prepare for rendering]] |
127 | return: bool; [[$true on success, $false otherwise]] | 127 | return: bool; [[$true on success, $false otherwise]] |
128 | } | 128 | } |
129 | done @virtual_pure { | 129 | done @pure_virtual { |
130 | [[Done with rendering]] | 130 | [[Done with rendering]] |
131 | return: bool; [[$true on success, $false otherwise]] | 131 | return: bool; [[$true on success, $false otherwise]] |
132 | } | 132 | } |
diff --git a/src/lib/ector/ector_surface.eo b/src/lib/ector/ector_surface.eo index 228a2d130b..a13cf02142 100644 --- a/src/lib/ector/ector_surface.eo +++ b/src/lib/ector/ector_surface.eo | |||
@@ -7,14 +7,14 @@ mixin Ector.Surface (Ector.Buffer) | |||
7 | methods { | 7 | methods { |
8 | @property reference_point { | 8 | @property reference_point { |
9 | [[This define where is (0,0) in pixels coordinate inside the surface]] | 9 | [[This define where is (0,0) in pixels coordinate inside the surface]] |
10 | set @virtual_pure { | 10 | set @pure_virtual { |
11 | } | 11 | } |
12 | values { | 12 | values { |
13 | x: int; [[X coordinate for reference point]] | 13 | x: int; [[X coordinate for reference point]] |
14 | y: int; [[Y coordinate for reference point]] | 14 | y: int; [[Y coordinate for reference point]] |
15 | } | 15 | } |
16 | } | 16 | } |
17 | renderer_factory_new @virtual_pure { | 17 | renderer_factory_new @pure_virtual { |
18 | [[Create a new renderer factory for the given type]] | 18 | [[Create a new renderer factory for the given type]] |
19 | return: Efl.Object; [[Renderer factory object]] /* FIXME: Should be a more restricted type, only here for cyclic. */ | 19 | return: Efl.Object; [[Renderer factory object]] /* FIXME: Should be a more restricted type, only here for cyclic. */ |
20 | params { | 20 | params { |
diff --git a/src/lib/ector/gl/ector_renderer_gl.eo b/src/lib/ector/gl/ector_renderer_gl.eo index f310b7e40d..592b5952fc 100644 --- a/src/lib/ector/gl/ector_renderer_gl.eo +++ b/src/lib/ector/gl/ector_renderer_gl.eo | |||
@@ -4,7 +4,7 @@ abstract Ector.Renderer.GL (Ector.Renderer) | |||
4 | { | 4 | { |
5 | [[Ector GL renderer abstract class]] | 5 | [[Ector GL renderer abstract class]] |
6 | methods { | 6 | methods { |
7 | fill @virtual_pure { | 7 | fill @pure_virtual { |
8 | [[Fill operation]] | 8 | [[Fill operation]] |
9 | return: bool; [[$true on success, $false otherwise]] | 9 | return: bool; [[$true on success, $false otherwise]] |
10 | params { | 10 | params { |
diff --git a/src/lib/ector/software/ector_renderer_software.eo b/src/lib/ector/software/ector_renderer_software.eo index 8fac492372..16772100a2 100644 --- a/src/lib/ector/software/ector_renderer_software.eo +++ b/src/lib/ector/software/ector_renderer_software.eo | |||
@@ -3,7 +3,7 @@ class Ector.Renderer.Software (Ector.Renderer) | |||
3 | [[Ector software renderer class]] | 3 | [[Ector software renderer class]] |
4 | data: null; | 4 | data: null; |
5 | methods { | 5 | methods { |
6 | fill @virtual_pure { | 6 | fill @pure_virtual { |
7 | [[Renderer fill operation]] | 7 | [[Renderer fill operation]] |
8 | return: bool; [[$true on success, $false otherwise]] | 8 | return: bool; [[$true on success, $false otherwise]] |
9 | } | 9 | } |
diff --git a/src/lib/efl/interfaces/efl_io_closer.eo b/src/lib/efl/interfaces/efl_io_closer.eo index 7ecfd7f948..f14c94401f 100644 --- a/src/lib/efl/interfaces/efl_io_closer.eo +++ b/src/lib/efl/interfaces/efl_io_closer.eo | |||
@@ -15,7 +15,7 @@ mixin Efl.Io.Closer { | |||
15 | data: null; | 15 | data: null; |
16 | 16 | ||
17 | methods { | 17 | methods { |
18 | close @virtual_pure { | 18 | close @pure_virtual { |
19 | [[Closes the Input/Output object. | 19 | [[Closes the Input/Output object. |
20 | 20 | ||
21 | This operation will be executed immediately and may or | 21 | This operation will be executed immediately and may or |
@@ -32,7 +32,7 @@ mixin Efl.Io.Closer { | |||
32 | 32 | ||
33 | @property closed { | 33 | @property closed { |
34 | [[If true will notify object was closed.]] | 34 | [[If true will notify object was closed.]] |
35 | get @virtual_pure { } | 35 | get @pure_virtual { } |
36 | set { | 36 | set { |
37 | [[If true, calls close()]] | 37 | [[If true, calls close()]] |
38 | return: bool; [[$true if could close, $false if already closed or errors.]] | 38 | return: bool; [[$true if could close, $false if already closed or errors.]] |
@@ -49,8 +49,8 @@ mixin Efl.Io.Closer { | |||
49 | so they are not inherited by the processes (children or | 49 | so they are not inherited by the processes (children or |
50 | self) doing exec(). | 50 | self) doing exec(). |
51 | ]] | 51 | ]] |
52 | get @virtual_pure { } | 52 | get @pure_virtual { } |
53 | set @virtual_pure { | 53 | set @pure_virtual { |
54 | [[If $true, will close on exec() call.]] | 54 | [[If $true, will close on exec() call.]] |
55 | return: bool; [[$true if could set, $false if not supported or failed.]] | 55 | return: bool; [[$true if could set, $false if not supported or failed.]] |
56 | } | 56 | } |
@@ -65,8 +65,8 @@ mixin Efl.Io.Closer { | |||
65 | If the object was deleted without close, this property | 65 | If the object was deleted without close, this property |
66 | will state whenever it should be closed or not. | 66 | will state whenever it should be closed or not. |
67 | ]] | 67 | ]] |
68 | get @virtual_pure { } | 68 | get @pure_virtual { } |
69 | set @virtual_pure { } | 69 | set @pure_virtual { } |
70 | values { | 70 | values { |
71 | close_on_destructor: bool; [[$true if close on destructor, $false otherwise]] | 71 | close_on_destructor: bool; [[$true if close on destructor, $false otherwise]] |
72 | } | 72 | } |
diff --git a/src/lib/efl/interfaces/efl_io_positioner.eo b/src/lib/efl/interfaces/efl_io_positioner.eo index b0e7d7e810..b344d784de 100644 --- a/src/lib/efl/interfaces/efl_io_positioner.eo +++ b/src/lib/efl/interfaces/efl_io_positioner.eo | |||
@@ -16,7 +16,7 @@ mixin Efl.Io.Positioner { | |||
16 | data: null; | 16 | data: null; |
17 | 17 | ||
18 | methods { | 18 | methods { |
19 | seek @virtual_pure { | 19 | seek @pure_virtual { |
20 | [[Seek in data]] | 20 | [[Seek in data]] |
21 | params { | 21 | params { |
22 | @in offset: int64; [[Offset in byte relative to whence]] | 22 | @in offset: int64; [[Offset in byte relative to whence]] |
@@ -27,7 +27,7 @@ mixin Efl.Io.Positioner { | |||
27 | 27 | ||
28 | @property position { | 28 | @property position { |
29 | [[Position property]] | 29 | [[Position property]] |
30 | get @virtual_pure { } | 30 | get @pure_virtual { } |
31 | set { | 31 | set { |
32 | [[Try to set position object, relative to start of file. See @.seek()]] | 32 | [[Try to set position object, relative to start of file. See @.seek()]] |
33 | return: bool; [[$true if could reposition, $false if errors.]] | 33 | return: bool; [[$true if could reposition, $false if errors.]] |
diff --git a/src/lib/efl/interfaces/efl_io_sizer.eo b/src/lib/efl/interfaces/efl_io_sizer.eo index 1e378b8917..64a14f99ec 100644 --- a/src/lib/efl/interfaces/efl_io_sizer.eo +++ b/src/lib/efl/interfaces/efl_io_sizer.eo | |||
@@ -12,7 +12,7 @@ mixin Efl.Io.Sizer { | |||
12 | data: null; | 12 | data: null; |
13 | 13 | ||
14 | methods { | 14 | methods { |
15 | resize @virtual_pure { | 15 | resize @pure_virtual { |
16 | [[Resize object]] | 16 | [[Resize object]] |
17 | params { | 17 | params { |
18 | @in size: uint64; [[Object size]] | 18 | @in size: uint64; [[Object size]] |
@@ -22,7 +22,7 @@ mixin Efl.Io.Sizer { | |||
22 | 22 | ||
23 | @property size { | 23 | @property size { |
24 | [[Size property]] | 24 | [[Size property]] |
25 | get @virtual_pure { } | 25 | get @pure_virtual { } |
26 | set { | 26 | set { |
27 | [[Try to resize the object, check with get if the value was accepted or not.]] | 27 | [[Try to resize the object, check with get if the value was accepted or not.]] |
28 | return: bool; [[$true if could resize, $false if errors.]] | 28 | return: bool; [[$true if could resize, $false if errors.]] |
diff --git a/src/lib/efl/interfaces/efl_observer.eo b/src/lib/efl/interfaces/efl_observer.eo index f89bd3926d..c76503fac2 100644 --- a/src/lib/efl/interfaces/efl_observer.eo +++ b/src/lib/efl/interfaces/efl_observer.eo | |||
@@ -1,7 +1,7 @@ | |||
1 | interface Efl.Observer { | 1 | interface Efl.Observer { |
2 | [[Efl observer interface]] | 2 | [[Efl observer interface]] |
3 | methods { | 3 | methods { |
4 | update @virtual_pure { | 4 | update @pure_virtual { |
5 | [[Update observer according to the changes of observable object. | 5 | [[Update observer according to the changes of observable object. |
6 | 6 | ||
7 | @since 1.19]] | 7 | @since 1.19]] |
diff --git a/src/lib/elementary/elm_interface_atspi_action.eo b/src/lib/elementary/elm_interface_atspi_action.eo index d6c95e824e..86737001f5 100644 --- a/src/lib/elementary/elm_interface_atspi_action.eo +++ b/src/lib/elementary/elm_interface_atspi_action.eo | |||
@@ -4,7 +4,7 @@ mixin Elm.Interface.Atspi_Action () | |||
4 | eo_prefix: elm_interface_atspi_action; | 4 | eo_prefix: elm_interface_atspi_action; |
5 | data: null; | 5 | data: null; |
6 | methods { | 6 | methods { |
7 | @property name @protected @virtual_pure { | 7 | @property name @protected @pure_virtual { |
8 | [[Gets action name for given id]] | 8 | [[Gets action name for given id]] |
9 | get { | 9 | get { |
10 | } | 10 | } |
@@ -26,7 +26,7 @@ mixin Elm.Interface.Atspi_Action () | |||
26 | id: int; [[ID to get localized name for]] | 26 | id: int; [[ID to get localized name for]] |
27 | } | 27 | } |
28 | } | 28 | } |
29 | @property description @protected @virtual_pure { | 29 | @property description @protected @pure_virtual { |
30 | [[Action description for given id]] | 30 | [[Action description for given id]] |
31 | get { | 31 | get { |
32 | } | 32 | } |
@@ -42,20 +42,20 @@ mixin Elm.Interface.Atspi_Action () | |||
42 | } | 42 | } |
43 | @property actions @protected { | 43 | @property actions @protected { |
44 | [[Get list of available widget actions]] | 44 | [[Get list of available widget actions]] |
45 | get @virtual_pure { | 45 | get @pure_virtual { |
46 | } | 46 | } |
47 | values { | 47 | values { |
48 | actions: list<Elm_Atspi_Action>; [[Contains statically allocated strings]] | 48 | actions: list<Elm_Atspi_Action>; [[Contains statically allocated strings]] |
49 | } | 49 | } |
50 | } | 50 | } |
51 | action_do @protected @virtual_pure { | 51 | action_do @protected @pure_virtual { |
52 | [[Performs action on given widget.]] | 52 | [[Performs action on given widget.]] |
53 | params { | 53 | params { |
54 | @in id: int; [[ID for widget]] | 54 | @in id: int; [[ID for widget]] |
55 | } | 55 | } |
56 | return: bool; [[$true if action was performed, $false otherwise]] | 56 | return: bool; [[$true if action was performed, $false otherwise]] |
57 | } | 57 | } |
58 | keybinding_get @protected @virtual_pure { | 58 | keybinding_get @protected @pure_virtual { |
59 | [[Gets configured keybinding for specific action and widget.]] | 59 | [[Gets configured keybinding for specific action and widget.]] |
60 | params { | 60 | params { |
61 | @in id: int; [[ID for widget]] | 61 | @in id: int; [[ID for widget]] |
diff --git a/src/lib/elementary/elm_interface_atspi_image.eo b/src/lib/elementary/elm_interface_atspi_image.eo index 675b71651c..a3e76498f5 100644 --- a/src/lib/elementary/elm_interface_atspi_image.eo +++ b/src/lib/elementary/elm_interface_atspi_image.eo | |||
@@ -6,7 +6,7 @@ mixin Elm.Interface.Atspi_Image () | |||
6 | methods { | 6 | methods { |
7 | @property extents @protected { | 7 | @property extents @protected { |
8 | [[Gets an image extents.]] | 8 | [[Gets an image extents.]] |
9 | get @virtual_pure { | 9 | get @pure_virtual { |
10 | } | 10 | } |
11 | keys { | 11 | keys { |
12 | screen_coords: bool; [[$true if we got the screen coordinates, $false otherwise]] | 12 | screen_coords: bool; [[$true if we got the screen coordinates, $false otherwise]] |
diff --git a/src/lib/elementary/elm_interface_atspi_widget_action.eo b/src/lib/elementary/elm_interface_atspi_widget_action.eo index c5b6e53391..6919e4924a 100644 --- a/src/lib/elementary/elm_interface_atspi_widget_action.eo +++ b/src/lib/elementary/elm_interface_atspi_widget_action.eo | |||
@@ -8,7 +8,7 @@ mixin Elm.Interface.Atspi_Widget_Action (Elm.Interface.Atspi_Action) | |||
8 | methods { | 8 | methods { |
9 | @property elm_actions @protected { | 9 | @property elm_actions @protected { |
10 | [[Elementary actions]] | 10 | [[Elementary actions]] |
11 | get @virtual_pure { | 11 | get @pure_virtual { |
12 | } | 12 | } |
13 | values { | 13 | values { |
14 | actions: ptr(const(Elm_Atspi_Action)); [[NULL-terminated array of Elm_Atspi_Action]] | 14 | actions: ptr(const(Elm_Atspi_Action)); [[NULL-terminated array of Elm_Atspi_Action]] |
diff --git a/src/lib/elementary/elm_web.eo b/src/lib/elementary/elm_web.eo index 43e7d779b5..b1e37d3e0e 100644 --- a/src/lib/elementary/elm_web.eo +++ b/src/lib/elementary/elm_web.eo | |||
@@ -21,7 +21,7 @@ class Elm.Web (Elm.Widget) | |||
21 | eo_prefix: elm_obj_web; | 21 | eo_prefix: elm_obj_web; |
22 | event_prefix: elm_web; | 22 | event_prefix: elm_web; |
23 | methods { | 23 | methods { |
24 | @property text_matches_highlight @virtual_pure { | 24 | @property text_matches_highlight @pure_virtual { |
25 | set { | 25 | set { |
26 | [[Sets whether to highlight the matched marks. | 26 | [[Sets whether to highlight the matched marks. |
27 | 27 | ||
@@ -37,7 +37,7 @@ class Elm.Web (Elm.Widget) | |||
37 | highlight: bool; [[Whether to highlight the marks or not.]] | 37 | highlight: bool; [[Whether to highlight the marks or not.]] |
38 | } | 38 | } |
39 | } | 39 | } |
40 | @property useragent @virtual_pure { | 40 | @property useragent @pure_virtual { |
41 | set { | 41 | set { |
42 | [[Change useragent of a elm_web object.]] | 42 | [[Change useragent of a elm_web object.]] |
43 | } | 43 | } |
@@ -48,7 +48,7 @@ class Elm.Web (Elm.Widget) | |||
48 | user_agent: string; [[String for useragent.]] | 48 | user_agent: string; [[String for useragent.]] |
49 | } | 49 | } |
50 | } | 50 | } |
51 | @property url @virtual_pure { | 51 | @property url @pure_virtual { |
52 | set { | 52 | set { |
53 | [[Sets the URL for the web object. | 53 | [[Sets the URL for the web object. |
54 | 54 | ||
@@ -68,7 +68,7 @@ class Elm.Web (Elm.Widget) | |||
68 | url: string; [[The URL to set.]] | 68 | url: string; [[The URL to set.]] |
69 | } | 69 | } |
70 | } | 70 | } |
71 | @property bg_color @virtual_pure { | 71 | @property bg_color @pure_virtual { |
72 | set { | 72 | set { |
73 | [[Sets the background color to be used by the web object. | 73 | [[Sets the background color to be used by the web object. |
74 | 74 | ||
@@ -92,7 +92,7 @@ class Elm.Web (Elm.Widget) | |||
92 | a: int; [[Alpha component.]] | 92 | a: int; [[Alpha component.]] |
93 | } | 93 | } |
94 | } | 94 | } |
95 | @property inwin_mode @virtual_pure { | 95 | @property inwin_mode @pure_virtual { |
96 | set { | 96 | set { |
97 | [[Sets the default dialogs to use an Inwin instead of a | 97 | [[Sets the default dialogs to use an Inwin instead of a |
98 | normal window. | 98 | normal window. |
@@ -109,7 +109,7 @@ class Elm.Web (Elm.Widget) | |||
109 | value: bool; [[$true if dialog will be opened as Inwin, $false otherwise]] | 109 | value: bool; [[$true if dialog will be opened as Inwin, $false otherwise]] |
110 | } | 110 | } |
111 | } | 111 | } |
112 | @property tab_propagate @virtual_pure { | 112 | @property tab_propagate @pure_virtual { |
113 | set { | 113 | set { |
114 | [[Sets whether to use tab propagation. | 114 | [[Sets whether to use tab propagation. |
115 | 115 | ||
@@ -127,7 +127,7 @@ class Elm.Web (Elm.Widget) | |||
127 | propagate: bool; [[Whether to propagate Tab keys to Elementary or not.]] | 127 | propagate: bool; [[Whether to propagate Tab keys to Elementary or not.]] |
128 | } | 128 | } |
129 | } | 129 | } |
130 | @property history_enabled @virtual_pure { | 130 | @property history_enabled @pure_virtual { |
131 | set { | 131 | set { |
132 | [[Enables or disables the browsing history.]] | 132 | [[Enables or disables the browsing history.]] |
133 | } | 133 | } |
@@ -138,7 +138,7 @@ class Elm.Web (Elm.Widget) | |||
138 | enable: bool; [[Whether to enable or disable the browsing history.]] | 138 | enable: bool; [[Whether to enable or disable the browsing history.]] |
139 | } | 139 | } |
140 | } | 140 | } |
141 | @property zoom_mode @virtual_pure { | 141 | @property zoom_mode @pure_virtual { |
142 | set { | 142 | set { |
143 | [[Sets the zoom mode to use. | 143 | [[Sets the zoom mode to use. |
144 | 144 | ||
@@ -165,7 +165,7 @@ class Elm.Web (Elm.Widget) | |||
165 | mode: Elm.Web.Zoom_Mode; [[The mode to set.]] | 165 | mode: Elm.Web.Zoom_Mode; [[The mode to set.]] |
166 | } | 166 | } |
167 | } | 167 | } |
168 | @property zoom @virtual_pure { | 168 | @property zoom @pure_virtual { |
169 | set { | 169 | set { |
170 | [[Sets the zoom level of the web object. | 170 | [[Sets the zoom level of the web object. |
171 | 171 | ||
@@ -191,7 +191,7 @@ class Elm.Web (Elm.Widget) | |||
191 | } | 191 | } |
192 | } | 192 | } |
193 | @property console_message_hook { | 193 | @property console_message_hook { |
194 | set @virtual_pure { | 194 | set @pure_virtual { |
195 | [[Sets the function to call when a console message is emitted | 195 | [[Sets the function to call when a console message is emitted |
196 | from JS. | 196 | from JS. |
197 | 197 | ||
@@ -206,7 +206,7 @@ class Elm.Web (Elm.Widget) | |||
206 | } | 206 | } |
207 | } | 207 | } |
208 | @property window_create_hook { | 208 | @property window_create_hook { |
209 | set @virtual_pure { | 209 | set @pure_virtual { |
210 | [[Sets the function to call when a new window is requested. | 210 | [[Sets the function to call when a new window is requested. |
211 | 211 | ||
212 | This hook will be called when a request to create a new | 212 | This hook will be called when a request to create a new |
@@ -222,7 +222,7 @@ class Elm.Web (Elm.Widget) | |||
222 | } | 222 | } |
223 | } | 223 | } |
224 | @property dialog_file_selector_hook { | 224 | @property dialog_file_selector_hook { |
225 | set @virtual_pure { | 225 | set @pure_virtual { |
226 | [[Sets the function to call when an file selector dialog. | 226 | [[Sets the function to call when an file selector dialog. |
227 | 227 | ||
228 | This hook will be called when a JavaScript file selector | 228 | This hook will be called when a JavaScript file selector |
@@ -237,7 +237,7 @@ class Elm.Web (Elm.Widget) | |||
237 | } | 237 | } |
238 | } | 238 | } |
239 | @property dialog_confirm_hook { | 239 | @property dialog_confirm_hook { |
240 | set @virtual_pure { | 240 | set @pure_virtual { |
241 | [[Sets the function to call when an confirm dialog. | 241 | [[Sets the function to call when an confirm dialog. |
242 | 242 | ||
243 | This hook will be called when a JavaScript confirm dialog is | 243 | This hook will be called when a JavaScript confirm dialog is |
@@ -251,7 +251,7 @@ class Elm.Web (Elm.Widget) | |||
251 | } | 251 | } |
252 | } | 252 | } |
253 | @property popup_selected { | 253 | @property popup_selected { |
254 | set @virtual_pure { | 254 | set @pure_virtual { |
255 | [[Tells the web object which index in the currently open popup | 255 | [[Tells the web object which index in the currently open popup |
256 | was selected. | 256 | was selected. |
257 | 257 | ||
@@ -266,7 +266,7 @@ class Elm.Web (Elm.Widget) | |||
266 | } | 266 | } |
267 | } | 267 | } |
268 | @property dialog_prompt_hook { | 268 | @property dialog_prompt_hook { |
269 | set @virtual_pure { | 269 | set @pure_virtual { |
270 | [[Sets the function to call when an prompt dialog. | 270 | [[Sets the function to call when an prompt dialog. |
271 | 271 | ||
272 | This hook will be called when a JavaScript prompt dialog is | 272 | This hook will be called when a JavaScript prompt dialog is |
@@ -280,7 +280,7 @@ class Elm.Web (Elm.Widget) | |||
280 | } | 280 | } |
281 | } | 281 | } |
282 | @property dialog_alert_hook { | 282 | @property dialog_alert_hook { |
283 | set @virtual_pure { | 283 | set @pure_virtual { |
284 | [[Sets the function to call when an alert dialog. | 284 | [[Sets the function to call when an alert dialog. |
285 | 285 | ||
286 | This hook will be called when a JavaScript alert dialog is | 286 | This hook will be called when a JavaScript alert dialog is |
@@ -294,13 +294,13 @@ class Elm.Web (Elm.Widget) | |||
294 | } | 294 | } |
295 | } | 295 | } |
296 | @property forward_possible { | 296 | @property forward_possible { |
297 | get @virtual_pure { | 297 | get @pure_virtual { |
298 | [[Queries whether it's possible to go forward in history.]] | 298 | [[Queries whether it's possible to go forward in history.]] |
299 | return: bool; [[$true if it is possible to go forward, $false otherwise]] | 299 | return: bool; [[$true if it is possible to go forward, $false otherwise]] |
300 | } | 300 | } |
301 | } | 301 | } |
302 | @property webkit_view { | 302 | @property webkit_view { |
303 | get @virtual_pure { | 303 | get @pure_virtual { |
304 | [[Get internal ewk_view object from web object. | 304 | [[Get internal ewk_view object from web object. |
305 | 305 | ||
306 | Elementary may not provide some low level features of EWebKit, | 306 | Elementary may not provide some low level features of EWebKit, |
@@ -315,13 +315,13 @@ class Elm.Web (Elm.Widget) | |||
315 | } | 315 | } |
316 | } | 316 | } |
317 | @property back_possible { | 317 | @property back_possible { |
318 | get @virtual_pure { | 318 | get @pure_virtual { |
319 | [[Queries whether it's possible to go back in history.]] | 319 | [[Queries whether it's possible to go back in history.]] |
320 | return: bool; [[$true if it is possible to go back, $false otherwise]] | 320 | return: bool; [[$true if it is possible to go back, $false otherwise]] |
321 | } | 321 | } |
322 | } | 322 | } |
323 | @property load_progress { | 323 | @property load_progress { |
324 | get @virtual_pure { | 324 | get @pure_virtual { |
325 | [[Get the overall loading progress of the page. | 325 | [[Get the overall loading progress of the page. |
326 | 326 | ||
327 | Returns the estimated loading progress of the page, with a | 327 | Returns the estimated loading progress of the page, with a |
@@ -333,7 +333,7 @@ class Elm.Web (Elm.Widget) | |||
333 | } | 333 | } |
334 | } | 334 | } |
335 | @property selection { | 335 | @property selection { |
336 | get @virtual_pure { | 336 | get @pure_virtual { |
337 | [[Get a copy of the currently selected text. | 337 | [[Get a copy of the currently selected text. |
338 | 338 | ||
339 | The string returned must be freed by the user when it's done | 339 | The string returned must be freed by the user when it's done |
@@ -345,7 +345,7 @@ class Elm.Web (Elm.Widget) | |||
345 | } | 345 | } |
346 | } | 346 | } |
347 | @property title { | 347 | @property title { |
348 | get @virtual_pure { | 348 | get @pure_virtual { |
349 | [[Get the current title. | 349 | [[Get the current title. |
350 | 350 | ||
351 | The returned string must not be freed and is guaranteed to be | 351 | The returned string must not be freed and is guaranteed to be |
@@ -357,7 +357,7 @@ class Elm.Web (Elm.Widget) | |||
357 | ]] | 357 | ]] |
358 | } | 358 | } |
359 | } | 359 | } |
360 | navigate @virtual_pure { | 360 | navigate @pure_virtual { |
361 | [[Jumps the given number of steps in the browsing history. | 361 | [[Jumps the given number of steps in the browsing history. |
362 | 362 | ||
363 | The $steps value can be a negative integer to back in history, | 363 | The $steps value can be a negative integer to back in history, |
@@ -369,14 +369,14 @@ class Elm.Web (Elm.Widget) | |||
369 | @in steps: int; [[The number of steps to jump.]] | 369 | @in steps: int; [[The number of steps to jump.]] |
370 | } | 370 | } |
371 | } | 371 | } |
372 | back @virtual_pure { | 372 | back @pure_virtual { |
373 | [[Goes back one step in the browsing history. | 373 | [[Goes back one step in the browsing history. |
374 | 374 | ||
375 | This is equivalent to calling elm_web_object_navigate(obj, -1); | 375 | This is equivalent to calling elm_web_object_navigate(obj, -1); |
376 | ]] | 376 | ]] |
377 | return: bool; [[$true on success, $false otherwise]] | 377 | return: bool; [[$true on success, $false otherwise]] |
378 | } | 378 | } |
379 | html_string_load @virtual_pure { | 379 | html_string_load @pure_virtual { |
380 | [[Loads the specified $html string as the content of the web | 380 | [[Loads the specified $html string as the content of the web |
381 | object. | 381 | object. |
382 | 382 | ||
@@ -396,7 +396,7 @@ class Elm.Web (Elm.Widget) | |||
396 | @in unreachable_url: string @optional; [[URL that could not be reached (optional).]] | 396 | @in unreachable_url: string @optional; [[URL that could not be reached (optional).]] |
397 | } | 397 | } |
398 | } | 398 | } |
399 | text_search @const @virtual_pure { | 399 | text_search @const @pure_virtual { |
400 | [[Searches the given string in a document.]] | 400 | [[Searches the given string in a document.]] |
401 | return: bool; [[$true if the given string was found, $false if not | 401 | return: bool; [[$true if the given string was found, $false if not |
402 | or failure.]] | 402 | or failure.]] |
@@ -407,7 +407,7 @@ class Elm.Web (Elm.Widget) | |||
407 | @in wrap: bool; [[If search should wrap at the end.]] | 407 | @in wrap: bool; [[If search should wrap at the end.]] |
408 | } | 408 | } |
409 | } | 409 | } |
410 | popup_destroy @virtual_pure { | 410 | popup_destroy @pure_virtual { |
411 | [[Dismisses an open dropdown popup | 411 | [[Dismisses an open dropdown popup |
412 | 412 | ||
413 | When the popup from a dropdown widget is to be dismissed, either | 413 | When the popup from a dropdown widget is to be dismissed, either |
@@ -419,7 +419,7 @@ class Elm.Web (Elm.Widget) | |||
419 | return: bool; [[$true if the menu was successfully destroyed, or | 419 | return: bool; [[$true if the menu was successfully destroyed, or |
420 | $false if there was no menu to destroy.]] | 420 | $false if there was no menu to destroy.]] |
421 | } | 421 | } |
422 | region_show @virtual_pure { | 422 | region_show @pure_virtual { |
423 | [[Shows the given region in the web object.]] | 423 | [[Shows the given region in the web object.]] |
424 | params { | 424 | params { |
425 | @in x: int; [[The x coordinate of the region to show.]] | 425 | @in x: int; [[The x coordinate of the region to show.]] |
@@ -428,7 +428,7 @@ class Elm.Web (Elm.Widget) | |||
428 | @in h: int; [[The height of the region to show.]] | 428 | @in h: int; [[The height of the region to show.]] |
429 | } | 429 | } |
430 | } | 430 | } |
431 | forward @virtual_pure { | 431 | forward @pure_virtual { |
432 | [[Goes forward one step in the browsing history. | 432 | [[Goes forward one step in the browsing history. |
433 | 433 | ||
434 | This is equivalent to calling elm_web_object_navigate(obj, 1); | 434 | This is equivalent to calling elm_web_object_navigate(obj, 1); |
@@ -438,7 +438,7 @@ class Elm.Web (Elm.Widget) | |||
438 | ]] | 438 | ]] |
439 | return: bool; [[$true on success, $false otherwise.]] | 439 | return: bool; [[$true on success, $false otherwise.]] |
440 | } | 440 | } |
441 | text_matches_mark @virtual_pure { | 441 | text_matches_mark @pure_virtual { |
442 | [[Marks matches of the given string in a document.]] | 442 | [[Marks matches of the given string in a document.]] |
443 | return: uint; [[Number of matched $string.]] | 443 | return: uint; [[Number of matched $string.]] |
444 | params { | 444 | params { |
@@ -448,7 +448,7 @@ class Elm.Web (Elm.Widget) | |||
448 | @in limit: uint; [[Maximum amount of matches, or zero to unlimited.]] | 448 | @in limit: uint; [[Maximum amount of matches, or zero to unlimited.]] |
449 | } | 449 | } |
450 | } | 450 | } |
451 | region_bring_in @virtual_pure { | 451 | region_bring_in @pure_virtual { |
452 | [[Brings in the region to the visible area. | 452 | [[Brings in the region to the visible area. |
453 | 453 | ||
454 | Like @.region_show, but it animates the scrolling of the object | 454 | Like @.region_show, but it animates the scrolling of the object |
@@ -461,7 +461,7 @@ class Elm.Web (Elm.Widget) | |||
461 | @in h: int; [[The height of the region to show.]] | 461 | @in h: int; [[The height of the region to show.]] |
462 | } | 462 | } |
463 | } | 463 | } |
464 | stop @virtual_pure { | 464 | stop @pure_virtual { |
465 | [[Stops loading the current page. | 465 | [[Stops loading the current page. |
466 | 466 | ||
467 | Cancels the loading of the current page in the web object. This | 467 | Cancels the loading of the current page in the web object. This |
@@ -470,7 +470,7 @@ class Elm.Web (Elm.Widget) | |||
470 | ]] | 470 | ]] |
471 | return: bool; [[$true if the cancel was successful, $false otherwise.]] | 471 | return: bool; [[$true if the cancel was successful, $false otherwise.]] |
472 | } | 472 | } |
473 | navigate_possible_get @virtual_pure { | 473 | navigate_possible_get @pure_virtual { |
474 | [[Queries whether it's possible to jump the given number of steps. | 474 | [[Queries whether it's possible to jump the given number of steps. |
475 | 475 | ||
476 | The $steps value can be a negative integer to back in history, | 476 | The $steps value can be a negative integer to back in history, |
@@ -482,17 +482,17 @@ class Elm.Web (Elm.Widget) | |||
482 | @in steps: int; [[The number of steps to check for.]] | 482 | @in steps: int; [[The number of steps to check for.]] |
483 | } | 483 | } |
484 | } | 484 | } |
485 | reload_full @virtual_pure { | 485 | reload_full @pure_virtual { |
486 | [[Requests a reload of the current document, avoiding any | 486 | [[Requests a reload of the current document, avoiding any |
487 | existing caches. | 487 | existing caches. |
488 | ]] | 488 | ]] |
489 | return: bool; [[$true on success, $false otherwise.]] | 489 | return: bool; [[$true on success, $false otherwise.]] |
490 | } | 490 | } |
491 | text_matches_unmark_all @virtual_pure { | 491 | text_matches_unmark_all @pure_virtual { |
492 | [[Clears all marked matches in the document.]] | 492 | [[Clears all marked matches in the document.]] |
493 | return: bool; [[$true on success, $false otherwise.]] | 493 | return: bool; [[$true on success, $false otherwise.]] |
494 | } | 494 | } |
495 | reload @virtual_pure { | 495 | reload @pure_virtual { |
496 | [[Requests a reload of the current document in the object.]] | 496 | [[Requests a reload of the current document in the object.]] |
497 | return: bool; [[$true on success, $false otherwise.]] | 497 | return: bool; [[$true on success, $false otherwise.]] |
498 | } | 498 | } |
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo index 1cd838edb7..006d8a6f20 100644 --- a/src/lib/elementary/elm_widget.eo +++ b/src/lib/elementary/elm_widget.eo | |||
@@ -375,7 +375,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter | |||
375 | } | 375 | } |
376 | @property parent_widget { | 376 | @property parent_widget { |
377 | [[Parent widget property]] | 377 | [[Parent widget property]] |
378 | get @virtual_pure { | 378 | get @pure_virtual { |
379 | return: Efl.Canvas.Object; [[Parent widget]] | 379 | return: Efl.Canvas.Object; [[Parent widget]] |
380 | legacy: null; | 380 | legacy: null; |
381 | } | 381 | } |
@@ -576,7 +576,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter | |||
576 | @in dir: Elm.Focus_Direction; [[Direction to move the focus.]] | 576 | @in dir: Elm.Focus_Direction; [[Direction to move the focus.]] |
577 | } | 577 | } |
578 | } | 578 | } |
579 | focus_direction @virtual_pure { | 579 | focus_direction @pure_virtual { |
580 | [['Virtual' function handling passing focus to sub-objects given a direction, in degrees.]] | 580 | [['Virtual' function handling passing focus to sub-objects given a direction, in degrees.]] |
581 | params { | 581 | params { |
582 | @in base: const(Efl.Canvas.Object); [[Base object]] | 582 | @in base: const(Efl.Canvas.Object); [[Base object]] |
@@ -717,7 +717,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter | |||
717 | focus_hide_handle { | 717 | focus_hide_handle { |
718 | [[Handle hide focus]] | 718 | [[Handle hide focus]] |
719 | } | 719 | } |
720 | focus_next @virtual_pure { | 720 | focus_next @pure_virtual { |
721 | [['Virtual' function handling passing focus to sub-objects.]] | 721 | [['Virtual' function handling passing focus to sub-objects.]] |
722 | params { | 722 | params { |
723 | @in dir: Elm.Focus_Direction; [[Focus direction]] | 723 | @in dir: Elm.Focus_Direction; [[Focus direction]] |
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h index 051852cb92..56ef7664b5 100644 --- a/src/lib/eolian/eo_lexer.h +++ b/src/lib/eolian/eo_lexer.h | |||
@@ -32,7 +32,7 @@ enum Tokens | |||
32 | KWAT(c_only), KWAT(class), KWAT(const), KWAT(empty), KWAT(extern), \ | 32 | KWAT(c_only), KWAT(class), KWAT(const), KWAT(empty), KWAT(extern), \ |
33 | KWAT(free), KWAT(hot), KWAT(in), KWAT(inout), KWAT(nonull), KWAT(nullable), \ | 33 | KWAT(free), KWAT(hot), KWAT(in), KWAT(inout), KWAT(nonull), KWAT(nullable), \ |
34 | KWAT(optional), KWAT(out), KWAT(private), KWAT(property), \ | 34 | KWAT(optional), KWAT(out), KWAT(private), KWAT(property), \ |
35 | KWAT(protected), KWAT(restart), KWAT(virtual_pure), KWAT(warn_unused), \ | 35 | KWAT(protected), KWAT(restart), KWAT(pure_virtual), KWAT(warn_unused), \ |
36 | \ | 36 | \ |
37 | KW(byte), KW(ubyte), KW(char), KW(short), KW(ushort), KW(int), KW(uint), \ | 37 | KW(byte), KW(ubyte), KW(char), KW(short), KW(ushort), KW(int), KW(uint), \ |
38 | KW(long), KW(ulong), KW(llong), KW(ullong), \ | 38 | KW(long), KW(ulong), KW(llong), KW(ullong), \ |
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c index 0cd748806f..eaa28b7359 100644 --- a/src/lib/eolian/eo_parser.c +++ b/src/lib/eolian/eo_parser.c | |||
@@ -1189,8 +1189,8 @@ parse_accessor(Eo_Lexer *ls, Eolian_Function *prop) | |||
1189 | eo_lexer_get(ls); | 1189 | eo_lexer_get(ls); |
1190 | for (;;) switch (ls->t.kw) | 1190 | for (;;) switch (ls->t.kw) |
1191 | { | 1191 | { |
1192 | case KW_at_virtual_pure: | 1192 | case KW_at_pure_virtual: |
1193 | CASE_LOCK(ls, virtp, "virtual_pure qualifier"); | 1193 | CASE_LOCK(ls, virtp, "pure_virtual qualifier"); |
1194 | if (is_get) prop->get_pure_virtual = EINA_TRUE; | 1194 | if (is_get) prop->get_pure_virtual = EINA_TRUE; |
1195 | else prop->set_pure_virtual = EINA_TRUE; | 1195 | else prop->set_pure_virtual = EINA_TRUE; |
1196 | eo_lexer_get(ls); | 1196 | eo_lexer_get(ls); |
@@ -1350,8 +1350,8 @@ parse_property(Eo_Lexer *ls) | |||
1350 | prop->is_beta = EINA_TRUE; | 1350 | prop->is_beta = EINA_TRUE; |
1351 | eo_lexer_get(ls); | 1351 | eo_lexer_get(ls); |
1352 | break; | 1352 | break; |
1353 | case KW_at_virtual_pure: | 1353 | case KW_at_pure_virtual: |
1354 | CASE_LOCK(ls, virtp, "virtual_pure qualifier"); | 1354 | CASE_LOCK(ls, virtp, "pure_virtual qualifier"); |
1355 | eo_lexer_get(ls); | 1355 | eo_lexer_get(ls); |
1356 | break; | 1356 | break; |
1357 | default: | 1357 | default: |
@@ -1441,8 +1441,8 @@ parse_method(Eo_Lexer *ls) | |||
1441 | meth->is_beta = EINA_TRUE; | 1441 | meth->is_beta = EINA_TRUE; |
1442 | eo_lexer_get(ls); | 1442 | eo_lexer_get(ls); |
1443 | break; | 1443 | break; |
1444 | case KW_at_virtual_pure: | 1444 | case KW_at_pure_virtual: |
1445 | CASE_LOCK(ls, virtp, "virtual_pure qualifier"); | 1445 | CASE_LOCK(ls, virtp, "pure_virtual qualifier"); |
1446 | eo_lexer_get(ls); | 1446 | eo_lexer_get(ls); |
1447 | break; | 1447 | break; |
1448 | default: | 1448 | default: |
diff --git a/src/lib/evas/canvas/efl_canvas_filter_internal.eo b/src/lib/evas/canvas/efl_canvas_filter_internal.eo index db83375db5..48bfd2685d 100644 --- a/src/lib/evas/canvas/efl_canvas_filter_internal.eo +++ b/src/lib/evas/canvas/efl_canvas_filter_internal.eo | |||
@@ -22,11 +22,11 @@ mixin Efl.Canvas.Filter.Internal (Efl.Gfx.Filter, Efl.Object) | |||
22 | val: bool; [[$true if filter is invalid, $false otherwise]] | 22 | val: bool; [[$true if filter is invalid, $false otherwise]] |
23 | } | 23 | } |
24 | } | 24 | } |
25 | filter_input_alpha @protected @virtual_pure { | 25 | filter_input_alpha @protected @pure_virtual { |
26 | [[Called by Efl.Canvas.Filter.Internal to determine whether the input is alpha or rgba.]] | 26 | [[Called by Efl.Canvas.Filter.Internal to determine whether the input is alpha or rgba.]] |
27 | return: bool; [[$true on success, $false otherwise]] | 27 | return: bool; [[$true on success, $false otherwise]] |
28 | } | 28 | } |
29 | filter_input_render @protected @virtual_pure { | 29 | filter_input_render @protected @pure_virtual { |
30 | [[Called by Efl.Canvas.Filter.Internal when the parent class must render the input. | 30 | [[Called by Efl.Canvas.Filter.Internal when the parent class must render the input. |
31 | ; | 31 | ; |
32 | ]] | 32 | ]] |
@@ -41,7 +41,7 @@ mixin Efl.Canvas.Filter.Internal (Efl.Gfx.Filter, Efl.Object) | |||
41 | do_async: bool; [[$true when the operation should be done asynchronous, $false otherwise]] | 41 | do_async: bool; [[$true when the operation should be done asynchronous, $false otherwise]] |
42 | } | 42 | } |
43 | } | 43 | } |
44 | filter_dirty @protected @virtual_pure { | 44 | filter_dirty @protected @pure_virtual { |
45 | [[Called when the filter changes must trigger a redraw of the object. | 45 | [[Called when the filter changes must trigger a redraw of the object. |
46 | 46 | ||
47 | Virtual, to be implemented in the parent class. | 47 | Virtual, to be implemented in the parent class. |
diff --git a/src/lib/evas/canvas/efl_canvas_surface.eo b/src/lib/evas/canvas/efl_canvas_surface.eo index 4cb2685cd7..18495c8fcb 100644 --- a/src/lib/evas/canvas/efl_canvas_surface.eo +++ b/src/lib/evas/canvas/efl_canvas_surface.eo | |||
@@ -15,7 +15,7 @@ mixin Efl.Canvas.Surface (Efl.Interface, Efl.Canvas.Image.Internal) | |||
15 | Set to $null to detach this surface from the external buffer. | 15 | Set to $null to detach this surface from the external buffer. |
16 | ]] | 16 | ]] |
17 | get {} | 17 | get {} |
18 | set @virtual_pure { | 18 | set @pure_virtual { |
19 | [[Set the buffer. If this fails, this function returns $false, | 19 | [[Set the buffer. If this fails, this function returns $false, |
20 | and the surface is left without any attached buffer. | 20 | and the surface is left without any attached buffer. |
21 | ]] | 21 | ]] |
diff --git a/src/lib/evas/canvas/efl_gfx_map.eo b/src/lib/evas/canvas/efl_gfx_map.eo index 542b4172a6..6c93d9eefd 100644 --- a/src/lib/evas/canvas/efl_gfx_map.eo +++ b/src/lib/evas/canvas/efl_gfx_map.eo | |||
@@ -28,7 +28,7 @@ mixin Efl.Gfx.Map (Efl.Interface, Efl.Object) | |||
28 | ]] | 28 | ]] |
29 | data: null; | 29 | data: null; |
30 | methods { | 30 | methods { |
31 | @property map_enable @virtual_pure { | 31 | @property map_enable @pure_virtual { |
32 | [[Whether map transformation is enabled on this object. | 32 | [[Whether map transformation is enabled on this object. |
33 | 33 | ||
34 | The default map enable state is off ($false). The other | 34 | The default map enable state is off ($false). The other |
diff --git a/src/lib/evas/canvas/efl_input_event.eo b/src/lib/evas/canvas/efl_input_event.eo index f11e3526e3..420bf7ac77 100644 --- a/src/lib/evas/canvas/efl_input_event.eo +++ b/src/lib/evas/canvas/efl_input_event.eo | |||
@@ -13,7 +13,7 @@ mixin Efl.Input.Event | |||
13 | eo_prefix: efl_input; | 13 | eo_prefix: efl_input; |
14 | data: null; | 14 | data: null; |
15 | methods { | 15 | methods { |
16 | @property timestamp @virtual_pure { | 16 | @property timestamp @pure_virtual { |
17 | [[The time at which an event was generated. | 17 | [[The time at which an event was generated. |
18 | 18 | ||
19 | If the event is generated by a server (eg. X.org or Wayland), then | 19 | If the event is generated by a server (eg. X.org or Wayland), then |
@@ -27,20 +27,20 @@ mixin Efl.Input.Event | |||
27 | ms: double; [[Time in milliseconds when the event happened.]] | 27 | ms: double; [[Time in milliseconds when the event happened.]] |
28 | } | 28 | } |
29 | } | 29 | } |
30 | reset @virtual_pure { | 30 | reset @pure_virtual { |
31 | [[Resets the internal data to 0 or default values.]] | 31 | [[Resets the internal data to 0 or default values.]] |
32 | } | 32 | } |
33 | dup @virtual_pure { | 33 | dup @pure_virtual { |
34 | [[Creates a copy of this event.]] | 34 | [[Creates a copy of this event.]] |
35 | return: own(Efl.Input.Event); [[Event copy]] | 35 | return: own(Efl.Input.Event); [[Event copy]] |
36 | } | 36 | } |
37 | @property device @virtual_pure { | 37 | @property device @pure_virtual { |
38 | [[Input device that originated this event.]] | 38 | [[Input device that originated this event.]] |
39 | values { | 39 | values { |
40 | dev: Efl.Input.Device; [[Input device origin]] | 40 | dev: Efl.Input.Device; [[Input device origin]] |
41 | } | 41 | } |
42 | } | 42 | } |
43 | @property event_flags @virtual_pure { | 43 | @property event_flags @pure_virtual { |
44 | [[Extra flags for this event, may be changed by the user.]] | 44 | [[Extra flags for this event, may be changed by the user.]] |
45 | values { | 45 | values { |
46 | flags: Efl.Input.Flags; [[Input event flags]] | 46 | flags: Efl.Input.Flags; [[Input event flags]] |
@@ -65,7 +65,7 @@ mixin Efl.Input.Event | |||
65 | val: bool; [[$true if the event was not from real hardware, $false otherwise]] | 65 | val: bool; [[$true if the event was not from real hardware, $false otherwise]] |
66 | } | 66 | } |
67 | } | 67 | } |
68 | instance_get @class @protected @virtual_pure { | 68 | instance_get @class @protected @pure_virtual { |
69 | [[Get an instance of this input event]] | 69 | [[Get an instance of this input event]] |
70 | params { | 70 | params { |
71 | @in owner: Efl.Object; [[Owner of this input event]] | 71 | @in owner: Efl.Object; [[Owner of this input event]] |
diff --git a/src/lib/evas/canvas/efl_vg.eo b/src/lib/evas/canvas/efl_vg.eo index 8c23bb7534..df69ae1aaf 100644 --- a/src/lib/evas/canvas/efl_vg.eo +++ b/src/lib/evas/canvas/efl_vg.eo | |||
@@ -82,7 +82,7 @@ abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Stack) | |||
82 | Evas_VG_Quality q; | 82 | Evas_VG_Quality q; |
83 | } | 83 | } |
84 | } */ | 84 | } */ |
85 | bounds_get @virtual_pure { | 85 | bounds_get @pure_virtual { |
86 | [[Give the bounding box in screen coordinate as being drawn. | 86 | [[Give the bounding box in screen coordinate as being drawn. |
87 | 87 | ||
88 | It will start as the control box until it is refined once the shape | 88 | It will start as the control box until it is refined once the shape |
diff --git a/src/lib/evas/canvas/evas_canvas3d_object.eo b/src/lib/evas/canvas/evas_canvas3d_object.eo index 2287abe93c..abec916708 100644 --- a/src/lib/evas/canvas/evas_canvas3d_object.eo +++ b/src/lib/evas/canvas/evas_canvas3d_object.eo | |||
@@ -35,13 +35,13 @@ class Evas.Canvas3D.Object (Efl.Object) | |||
35 | update { | 35 | update { |
36 | [[Update request for the object.]] | 36 | [[Update request for the object.]] |
37 | } | 37 | } |
38 | update_notify @virtual_pure { | 38 | update_notify @pure_virtual { |
39 | [[Pure virtual update_notify function. | 39 | [[Pure virtual update_notify function. |
40 | 40 | ||
41 | Update request for the object.]] | 41 | Update request for the object.]] |
42 | } | 42 | } |
43 | 43 | ||
44 | change_notify @virtual_pure { | 44 | change_notify @pure_virtual { |
45 | [[Pure virtual change_notify function. | 45 | [[Pure virtual change_notify function. |
46 | 46 | ||
47 | Update request for the object.]] | 47 | Update request for the object.]] |
@@ -50,14 +50,14 @@ class Evas.Canvas3D.Object (Efl.Object) | |||
50 | @in ref: Evas.Canvas3D.Object; [[The Object that caused the change.]] | 50 | @in ref: Evas.Canvas3D.Object; [[The Object that caused the change.]] |
51 | } | 51 | } |
52 | } | 52 | } |
53 | callback_register @virtual_pure { | 53 | callback_register @pure_virtual { |
54 | [[Pure virtual register samrt callback function.]] | 54 | [[Pure virtual register samrt callback function.]] |
55 | params { | 55 | params { |
56 | @in event: string; [[Event type.]] | 56 | @in event: string; [[Event type.]] |
57 | @in data: const(void_ptr); [[User data.]] | 57 | @in data: const(void_ptr); [[User data.]] |
58 | } | 58 | } |
59 | } | 59 | } |
60 | callback_unregister @virtual_pure { | 60 | callback_unregister @pure_virtual { |
61 | [[Pure virtual unregister smart callback function.]] | 61 | [[Pure virtual unregister smart callback function.]] |
62 | params { | 62 | params { |
63 | @in event: string; [[Event type.]] | 63 | @in event: string; [[Event type.]] |
diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua index de4ab262dc..dada2341c5 100644 --- a/src/scripts/elua/apps/gendoc.lua +++ b/src/scripts/elua/apps/gendoc.lua | |||
@@ -176,7 +176,7 @@ local gen_method_sig = function(fn, cl) | |||
176 | local buf = {} | 176 | local buf = {} |
177 | gen_func_namesig(fn, cl, buf, false, false, false) | 177 | gen_func_namesig(fn, cl, buf, false, false, false) |
178 | if fn:is_pure_virtual(fn.METHOD) then | 178 | if fn:is_pure_virtual(fn.METHOD) then |
179 | buf[#buf + 1] = "@virtual_pure " | 179 | buf[#buf + 1] = "@pure_virtual " |
180 | end | 180 | end |
181 | buf[#buf + 1] = "{" | 181 | buf[#buf + 1] = "{" |
182 | local params = fn:parameters_get() | 182 | local params = fn:parameters_get() |
@@ -233,7 +233,7 @@ local gen_prop_sig = function(fn, cl) | |||
233 | local svirt = fn:is_pure_virtual(fn.PROP_SET) | 233 | local svirt = fn:is_pure_virtual(fn.PROP_SET) |
234 | 234 | ||
235 | if (not isget or gvirt) and (not isset or svirt) then | 235 | if (not isget or gvirt) and (not isset or svirt) then |
236 | buf[#buf + 1] = "@virtual_pure " | 236 | buf[#buf + 1] = "@pure_virtual " |
237 | end | 237 | end |
238 | 238 | ||
239 | local gkeys = isget and fn:property_keys_get(fn.PROP_GET) or {} | 239 | local gkeys = isget and fn:property_keys_get(fn.PROP_GET) or {} |
diff --git a/src/tests/eolian/data/base.eo b/src/tests/eolian/data/base.eo index 7fcd73e860..1576573406 100644 --- a/src/tests/eolian/data/base.eo +++ b/src/tests/eolian/data/base.eo | |||
@@ -7,7 +7,7 @@ class Base { | |||
7 | c: float; | 7 | c: float; |
8 | } | 8 | } |
9 | } | 9 | } |
10 | constructor @virtual_pure { | 10 | constructor @pure_virtual { |
11 | } | 11 | } |
12 | destructor { | 12 | destructor { |
13 | } | 13 | } |
diff --git a/src/tests/eolian/data/nmsp1_nmsp11_class2.eo b/src/tests/eolian/data/nmsp1_nmsp11_class2.eo index 27dd47cb06..13750e5f46 100644 --- a/src/tests/eolian/data/nmsp1_nmsp11_class2.eo +++ b/src/tests/eolian/data/nmsp1_nmsp11_class2.eo | |||
@@ -2,7 +2,7 @@ class nmsp1.nmsp11.class2 | |||
2 | { | 2 | { |
3 | methods { | 3 | methods { |
4 | @property a { | 4 | @property a { |
5 | set @virtual_pure { | 5 | set @pure_virtual { |
6 | } | 6 | } |
7 | } | 7 | } |
8 | } | 8 | } |
diff --git a/src/tests/eolian/data/object_impl.eo b/src/tests/eolian/data/object_impl.eo index abf1820d43..97906ab3cc 100644 --- a/src/tests/eolian/data/object_impl.eo +++ b/src/tests/eolian/data/object_impl.eo | |||
@@ -19,7 +19,7 @@ class Object_Impl (Base) { | |||
19 | @property b { | 19 | @property b { |
20 | set { | 20 | set { |
21 | } | 21 | } |
22 | get @virtual_pure { | 22 | get @pure_virtual { |
23 | /* set as virtual pure - no implementation expected */ | 23 | /* set as virtual pure - no implementation expected */ |
24 | } | 24 | } |
25 | values { | 25 | values { |
@@ -50,7 +50,7 @@ class Object_Impl (Base) { | |||
50 | @in b: string; | 50 | @in b: string; |
51 | } | 51 | } |
52 | } | 52 | } |
53 | pure_foo3 @virtual_pure { | 53 | pure_foo3 @pure_virtual { |
54 | /* set as virtual pure - no implementation expected */ | 54 | /* set as virtual pure - no implementation expected */ |
55 | } | 55 | } |
56 | } | 56 | } |
diff --git a/src/tests/eolian/data/override.eo b/src/tests/eolian/data/override.eo index abf80b6be8..d6e2d56a40 100644 --- a/src/tests/eolian/data/override.eo +++ b/src/tests/eolian/data/override.eo | |||
@@ -1,7 +1,7 @@ | |||
1 | class Override (Base) { | 1 | class Override (Base) { |
2 | methods { | 2 | methods { |
3 | @property a { | 3 | @property a { |
4 | set @virtual_pure { | 4 | set @pure_virtual { |
5 | } | 5 | } |
6 | get { | 6 | get { |
7 | } | 7 | } |
@@ -32,7 +32,7 @@ class Override (Base) { | |||
32 | c: int(50); | 32 | c: int(50); |
33 | } | 33 | } |
34 | } | 34 | } |
35 | foo @virtual_pure { | 35 | foo @pure_virtual { |
36 | } | 36 | } |
37 | bar { | 37 | bar { |
38 | params { | 38 | params { |