Skip to content
This repository was archived by the owner on Mar 4, 2024. It is now read-only.

Commit 3b154eb

Browse files
GuillaumeGomezGuillaumeGomez
authored
Merge pull request #211 from fengalin/remove-get_-for-getters
Remove get for getters & properties where applicable
2 parents 11a557f + fb08b0f commit 3b154eb

File tree

533 files changed

+6228
-5627
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

533 files changed

+6228
-5627
lines changed

‎atk/src/auto/action.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub trait AtkActionExt: 'static {
3030
fn get_localized_name(&self, i: i32) -> Option<glib::GString>;
3131

3232
#[doc(alias = "atk_action_get_n_actions")]
33-
fn get_n_actions(&self) -> i32;
33+
fn n_actions(&self) -> i32;
3434

3535
#[doc(alias = "atk_action_get_name")]
3636
fn get_name(&self, i: i32) -> Option<glib::GString>;
@@ -71,7 +71,7 @@ impl<O: IsA<Action>> AtkActionExt for O {
7171
}
7272
}
7373

74-
fn get_n_actions(&self) -> i32 {
74+
fn n_actions(&self) -> i32 {
7575
unsafe { ffi::atk_action_get_n_actions(self.as_ref().to_glib_none().0) }
7676
}
7777

‎atk/src/auto/component.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,22 @@ pub trait ComponentExt: 'static {
3434
fn contains(&self, x: i32, y: i32, coord_type: CoordType) -> bool;
3535

3636
#[doc(alias = "atk_component_get_alpha")]
37-
fn get_alpha(&self) -> f64;
37+
fn alpha(&self) -> f64;
3838

3939
#[doc(alias = "atk_component_get_extents")]
4040
fn get_extents(&self, coord_type: CoordType) -> (i32, i32, i32, i32);
4141

4242
#[doc(alias = "atk_component_get_layer")]
43-
fn get_layer(&self) -> Layer;
43+
fn layer(&self) -> Layer;
4444

4545
#[doc(alias = "atk_component_get_mdi_zorder")]
46-
fn get_mdi_zorder(&self) -> i32;
46+
fn mdi_zorder(&self) -> i32;
4747

4848
#[doc(alias = "atk_component_get_position")]
4949
fn get_position(&self, coord_type: CoordType) -> (i32, i32);
5050

5151
#[doc(alias = "atk_component_get_size")]
52-
fn get_size(&self) -> (i32, i32);
52+
fn size(&self) -> (i32, i32);
5353

5454
#[doc(alias = "atk_component_grab_focus")]
5555
fn grab_focus(&self) -> bool;
@@ -91,7 +91,7 @@ impl<O: IsA<Component>> ComponentExt for O {
9191
}
9292
}
9393

94-
fn get_alpha(&self) -> f64 {
94+
fn alpha(&self) -> f64 {
9595
unsafe { ffi::atk_component_get_alpha(self.as_ref().to_glib_none().0) }
9696
}
9797

@@ -117,11 +117,11 @@ impl<O: IsA<Component>> ComponentExt for O {
117117
}
118118
}
119119

120-
fn get_layer(&self) -> Layer {
120+
fn layer(&self) -> Layer {
121121
unsafe { from_glib(ffi::atk_component_get_layer(self.as_ref().to_glib_none().0)) }
122122
}
123123

124-
fn get_mdi_zorder(&self) -> i32 {
124+
fn mdi_zorder(&self) -> i32 {
125125
unsafe { ffi::atk_component_get_mdi_zorder(self.as_ref().to_glib_none().0) }
126126
}
127127

@@ -141,7 +141,7 @@ impl<O: IsA<Component>> ComponentExt for O {
141141
}
142142
}
143143

144-
fn get_size(&self) -> (i32, i32) {
144+
fn size(&self) -> (i32, i32) {
145145
unsafe {
146146
let mut width = mem::MaybeUninit::uninit();
147147
let mut height = mem::MaybeUninit::uninit();

‎atk/src/auto/document.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ pub trait DocumentExt: 'static {
2626
fn get_attribute_value(&self, attribute_name: &str) -> Option<glib::GString>;
2727

2828
//#[doc(alias = "atk_document_get_attributes")]
29-
//fn get_attributes(&self) -> /*Ignored*/Option<AttributeSet>;
29+
//fn attributes(&self) -> /*Ignored*/Option<AttributeSet>;
3030

3131
#[doc(alias = "atk_document_get_current_page_number")]
32-
fn get_current_page_number(&self) -> i32;
32+
fn current_page_number(&self) -> i32;
3333

3434
//#[doc(alias = "atk_document_get_document")]
35-
//fn get_document(&self) -> /*Unimplemented*/Option<Fundamental: Pointer>;
35+
//fn document(&self) -> /*Unimplemented*/Option<Fundamental: Pointer>;
3636

3737
#[doc(alias = "atk_document_get_document_type")]
38-
fn get_document_type(&self) -> Option<glib::GString>;
38+
fn document_type(&self) -> Option<glib::GString>;
3939

4040
#[doc(alias = "atk_document_get_page_count")]
41-
fn get_page_count(&self) -> i32;
41+
fn page_count(&self) -> i32;
4242

4343
#[doc(alias = "atk_document_set_attribute_value")]
4444
fn set_attribute_value(&self, attribute_name: &str, attribute_value: &str) -> bool;
@@ -62,27 +62,27 @@ impl<O: IsA<Document>> DocumentExt for O {
6262
}
6363
}
6464

65-
//fn get_attributes(&self) -> /*Ignored*/Option<AttributeSet> {
65+
//fn attributes(&self) -> /*Ignored*/Option<AttributeSet> {
6666
// unsafe { TODO: call ffi:atk_document_get_attributes() }
6767
//}
6868

69-
fn get_current_page_number(&self) -> i32 {
69+
fn current_page_number(&self) -> i32 {
7070
unsafe { ffi::atk_document_get_current_page_number(self.as_ref().to_glib_none().0) }
7171
}
7272

73-
//fn get_document(&self) -> /*Unimplemented*/Option<Fundamental: Pointer> {
73+
//fn document(&self) -> /*Unimplemented*/Option<Fundamental: Pointer> {
7474
// unsafe { TODO: call ffi:atk_document_get_document() }
7575
//}
7676

77-
fn get_document_type(&self) -> Option<glib::GString> {
77+
fn document_type(&self) -> Option<glib::GString> {
7878
unsafe {
7979
from_glib_none(ffi::atk_document_get_document_type(
8080
self.as_ref().to_glib_none().0,
8181
))
8282
}
8383
}
8484

85-
fn get_page_count(&self) -> i32 {
85+
fn page_count(&self) -> i32 {
8686
unsafe { ffi::atk_document_get_page_count(self.as_ref().to_glib_none().0) }
8787
}
8888

‎atk/src/auto/gobject_accessible.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ pub const NONE_GOBJECT_ACCESSIBLE: Option<&GObjectAccessible> = None;
3131

3232
pub trait GObjectAccessibleExt: 'static {
3333
#[doc(alias = "atk_gobject_accessible_get_object")]
34-
fn get_object(&self) -> Option<glib::Object>;
34+
fn object(&self) -> Option<glib::Object>;
3535
}
3636

3737
impl<O: IsA<GObjectAccessible>> GObjectAccessibleExt for O {
38-
fn get_object(&self) -> Option<glib::Object> {
38+
fn object(&self) -> Option<glib::Object> {
3939
unsafe {
4040
from_glib_none(ffi::atk_gobject_accessible_get_object(
4141
self.as_ref().to_glib_none().0,

‎atk/src/auto/hyperlink.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ pub const NONE_HYPERLINK: Option<&Hyperlink> = None;
2626

2727
pub trait HyperlinkExt: 'static {
2828
#[doc(alias = "atk_hyperlink_get_end_index")]
29-
fn get_end_index(&self) -> i32;
29+
fn end_index(&self) -> i32;
3030

3131
#[doc(alias = "atk_hyperlink_get_n_anchors")]
32-
fn get_n_anchors(&self) -> i32;
32+
fn n_anchors(&self) -> i32;
3333

3434
#[doc(alias = "atk_hyperlink_get_object")]
3535
fn get_object(&self, i: i32) -> Option<Object>;
3636

3737
#[doc(alias = "atk_hyperlink_get_start_index")]
38-
fn get_start_index(&self) -> i32;
38+
fn start_index(&self) -> i32;
3939

4040
#[doc(alias = "atk_hyperlink_get_uri")]
4141
fn get_uri(&self, i: i32) -> Option<glib::GString>;
@@ -46,7 +46,8 @@ pub trait HyperlinkExt: 'static {
4646
#[doc(alias = "atk_hyperlink_is_valid")]
4747
fn is_valid(&self) -> bool;
4848

49-
fn get_property_number_of_anchors(&self) -> i32;
49+
#[doc(alias = "get_property_number_of_anchors")]
50+
fn number_of_anchors(&self) -> i32;
5051

5152
fn connect_link_activated<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
5253

@@ -61,11 +62,11 @@ pub trait HyperlinkExt: 'static {
6162
}
6263

6364
impl<O: IsA<Hyperlink>> HyperlinkExt for O {
64-
fn get_end_index(&self) -> i32 {
65+
fn end_index(&self) -> i32 {
6566
unsafe { ffi::atk_hyperlink_get_end_index(self.as_ref().to_glib_none().0) }
6667
}
6768

68-
fn get_n_anchors(&self) -> i32 {
69+
fn n_anchors(&self) -> i32 {
6970
unsafe { ffi::atk_hyperlink_get_n_anchors(self.as_ref().to_glib_none().0) }
7071
}
7172

@@ -78,7 +79,7 @@ impl<O: IsA<Hyperlink>> HyperlinkExt for O {
7879
}
7980
}
8081

81-
fn get_start_index(&self) -> i32 {
82+
fn start_index(&self) -> i32 {
8283
unsafe { ffi::atk_hyperlink_get_start_index(self.as_ref().to_glib_none().0) }
8384
}
8485

@@ -99,7 +100,7 @@ impl<O: IsA<Hyperlink>> HyperlinkExt for O {
99100
unsafe { from_glib(ffi::atk_hyperlink_is_valid(self.as_ref().to_glib_none().0)) }
100101
}
101102

102-
fn get_property_number_of_anchors(&self) -> i32 {
103+
fn number_of_anchors(&self) -> i32 {
103104
unsafe {
104105
let mut value = glib::Value::from_type(<i32 as StaticType>::static_type());
105106
glib::gobject_ffi::g_object_get_property(

‎atk/src/auto/hyperlink_impl.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ pub const NONE_HYPERLINK_IMPL: Option<&HyperlinkImpl> = None;
1919

2020
pub trait HyperlinkImplExt: 'static {
2121
#[doc(alias = "atk_hyperlink_impl_get_hyperlink")]
22-
fn get_hyperlink(&self) -> Option<Hyperlink>;
22+
fn hyperlink(&self) -> Option<Hyperlink>;
2323
}
2424

2525
impl<O: IsA<HyperlinkImpl>> HyperlinkImplExt for O {
26-
fn get_hyperlink(&self) -> Option<Hyperlink> {
26+
fn hyperlink(&self) -> Option<Hyperlink> {
2727
unsafe {
2828
from_glib_full(ffi::atk_hyperlink_impl_get_hyperlink(
2929
self.as_ref().to_glib_none().0,

‎atk/src/auto/hypertext.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub trait HypertextExt: 'static {
3030
fn get_link_index(&self, char_index: i32) -> i32;
3131

3232
#[doc(alias = "atk_hypertext_get_n_links")]
33-
fn get_n_links(&self) -> i32;
33+
fn n_links(&self) -> i32;
3434

3535
fn connect_link_selected<F: Fn(&Self, i32) + 'static>(&self, f: F) -> SignalHandlerId;
3636
}
@@ -49,7 +49,7 @@ impl<O: IsA<Hypertext>> HypertextExt for O {
4949
unsafe { ffi::atk_hypertext_get_link_index(self.as_ref().to_glib_none().0, char_index) }
5050
}
5151

52-
fn get_n_links(&self) -> i32 {
52+
fn n_links(&self) -> i32 {
5353
unsafe { ffi::atk_hypertext_get_n_links(self.as_ref().to_glib_none().0) }
5454
}
5555

‎atk/src/auto/image.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,31 @@ pub const NONE_IMAGE: Option<&Image> = None;
2020

2121
pub trait AtkImageExt: 'static {
2222
#[doc(alias = "atk_image_get_image_description")]
23-
fn get_image_description(&self) -> Option<glib::GString>;
23+
fn image_description(&self) -> Option<glib::GString>;
2424

2525
#[doc(alias = "atk_image_get_image_locale")]
26-
fn get_image_locale(&self) -> Option<glib::GString>;
26+
fn image_locale(&self) -> Option<glib::GString>;
2727

2828
#[doc(alias = "atk_image_get_image_position")]
2929
fn get_image_position(&self, coord_type: CoordType) -> (i32, i32);
3030

3131
#[doc(alias = "atk_image_get_image_size")]
32-
fn get_image_size(&self) -> (i32, i32);
32+
fn image_size(&self) -> (i32, i32);
3333

3434
#[doc(alias = "atk_image_set_image_description")]
3535
fn set_image_description(&self, description: &str) -> bool;
3636
}
3737

3838
impl<O: IsA<Image>> AtkImageExt for O {
39-
fn get_image_description(&self) -> Option<glib::GString> {
39+
fn image_description(&self) -> Option<glib::GString> {
4040
unsafe {
4141
from_glib_none(ffi::atk_image_get_image_description(
4242
self.as_ref().to_glib_none().0,
4343
))
4444
}
4545
}
4646

47-
fn get_image_locale(&self) -> Option<glib::GString> {
47+
fn image_locale(&self) -> Option<glib::GString> {
4848
unsafe {
4949
from_glib_none(ffi::atk_image_get_image_locale(
5050
self.as_ref().to_glib_none().0,
@@ -68,7 +68,7 @@ impl<O: IsA<Image>> AtkImageExt for O {
6868
}
6969
}
7070

71-
fn get_image_size(&self) -> (i32, i32) {
71+
fn image_size(&self) -> (i32, i32) {
7272
unsafe {
7373
let mut width = mem::MaybeUninit::uninit();
7474
let mut height = mem::MaybeUninit::uninit();

0 commit comments

Comments
 (0)