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

Commit 6f27d77

Browse files
authored
Merge pull request #802 from sdroege/update-gir
Update gir
2 parents 13ac53e + dc793bd commit 6f27d77

Some content is hidden

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

78 files changed

+1829
-94
lines changed

.github/workflows/CI.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,12 @@ jobs:
7373
if: matrix.rust == 'beta' || matrix.rust == 'stable'
7474
- working-directory: ${{ matrix.conf.name }}
7575
name: clippy ${{ matrix.conf.name }}
76-
run: cargo clippy --all-targets -- -D warnings -A unknown-lints
77-
if: matrix.rust == 'beta' || matrix.rust == 'stable'
76+
run: cargo clippy --all-targets -- -D warnings
77+
if: matrix.rust == 'stable'
78+
- working-directory: ${{ matrix.conf.name }}
79+
name: clippy ${{ matrix.conf.name }}
80+
run: cargo clippy --all-targets
81+
if: matrix.rust == 'beta'
7882
# tests
7983
- name: tests (rust ${{ matrix.rust }})
8084
run: xvfb-run --auto-servernum cargo test --manifest-path ${{ matrix.conf.name }}/Cargo.toml --features "${{ matrix.conf.features }}"

atk/src/auto/enums.rs

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ impl FromGlib<ffi::AtkCoordType> for CoordType {
5454
#[inline]
5555
unsafe fn from_glib(value: ffi::AtkCoordType) -> Self {
5656
skip_assert_initialized!();
57+
5758
match value {
5859
ffi::ATK_XY_SCREEN => Self::Screen,
5960
ffi::ATK_XY_WINDOW => Self::Window,
@@ -70,6 +71,16 @@ impl StaticType for CoordType {
7071
}
7172
}
7273

74+
impl glib::HasParamSpec for CoordType {
75+
type ParamSpec = glib::ParamSpecEnum;
76+
type SetValue = Self;
77+
type BuilderFn = fn(&str, Self) -> glib::ParamSpecEnumBuilder<Self>;
78+
79+
fn param_spec_builder() -> Self::BuilderFn {
80+
|name, default_value| Self::ParamSpec::builder_with_default(name, default_value)
81+
}
82+
}
83+
7384
impl glib::value::ValueType for CoordType {
7485
type Type = Self;
7586
}
@@ -177,6 +188,7 @@ impl FromGlib<ffi::AtkLayer> for Layer {
177188
#[inline]
178189
unsafe fn from_glib(value: ffi::AtkLayer) -> Self {
179190
skip_assert_initialized!();
191+
180192
match value {
181193
ffi::ATK_LAYER_INVALID => Self::Invalid,
182194
ffi::ATK_LAYER_BACKGROUND => Self::Background,
@@ -198,6 +210,16 @@ impl StaticType for Layer {
198210
}
199211
}
200212

213+
impl glib::HasParamSpec for Layer {
214+
type ParamSpec = glib::ParamSpecEnum;
215+
type SetValue = Self;
216+
type BuilderFn = fn(&str, Self) -> glib::ParamSpecEnumBuilder<Self>;
217+
218+
fn param_spec_builder() -> Self::BuilderFn {
219+
|name, default_value| Self::ParamSpec::builder_with_default(name, default_value)
220+
}
221+
}
222+
201223
impl glib::value::ValueType for Layer {
202224
type Type = Self;
203225
}
@@ -374,6 +396,7 @@ impl IntoGlib for RelationType {
374396
impl FromGlib<ffi::AtkRelationType> for RelationType {
375397
unsafe fn from_glib(value: ffi::AtkRelationType) -> Self {
376398
skip_assert_initialized!();
399+
377400
match value {
378401
ffi::ATK_RELATION_NULL => Self::Null,
379402
ffi::ATK_RELATION_CONTROLLED_BY => Self::ControlledBy,
@@ -409,6 +432,16 @@ impl StaticType for RelationType {
409432
}
410433
}
411434

435+
impl glib::HasParamSpec for RelationType {
436+
type ParamSpec = glib::ParamSpecEnum;
437+
type SetValue = Self;
438+
type BuilderFn = fn(&str, Self) -> glib::ParamSpecEnumBuilder<Self>;
439+
440+
fn param_spec_builder() -> Self::BuilderFn {
441+
|name, default_value| Self::ParamSpec::builder_with_default(name, default_value)
442+
}
443+
}
444+
412445
impl glib::value::ValueType for RelationType {
413446
type Type = Self;
414447
}
@@ -1020,6 +1053,7 @@ impl IntoGlib for Role {
10201053
impl FromGlib<ffi::AtkRole> for Role {
10211054
unsafe fn from_glib(value: ffi::AtkRole) -> Self {
10221055
skip_assert_initialized!();
1056+
10231057
match value {
10241058
ffi::ATK_ROLE_INVALID => Self::Invalid,
10251059
ffi::ATK_ROLE_ACCEL_LABEL => Self::AcceleratorLabel,
@@ -1162,6 +1196,16 @@ impl StaticType for Role {
11621196
}
11631197
}
11641198

1199+
impl glib::HasParamSpec for Role {
1200+
type ParamSpec = glib::ParamSpecEnum;
1201+
type SetValue = Self;
1202+
type BuilderFn = fn(&str, Self) -> glib::ParamSpecEnumBuilder<Self>;
1203+
1204+
fn param_spec_builder() -> Self::BuilderFn {
1205+
|name, default_value| Self::ParamSpec::builder_with_default(name, default_value)
1206+
}
1207+
}
1208+
11651209
impl glib::value::ValueType for Role {
11661210
type Type = Self;
11671211
}
@@ -1273,6 +1317,7 @@ impl FromGlib<ffi::AtkScrollType> for ScrollType {
12731317
#[inline]
12741318
unsafe fn from_glib(value: ffi::AtkScrollType) -> Self {
12751319
skip_assert_initialized!();
1320+
12761321
match value {
12771322
ffi::ATK_SCROLL_TOP_LEFT => Self::TopLeft,
12781323
ffi::ATK_SCROLL_BOTTOM_RIGHT => Self::BottomRight,
@@ -1295,6 +1340,18 @@ impl StaticType for ScrollType {
12951340
}
12961341
}
12971342

1343+
#[cfg(any(feature = "v2_30", feature = "dox"))]
1344+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_30")))]
1345+
impl glib::HasParamSpec for ScrollType {
1346+
type ParamSpec = glib::ParamSpecEnum;
1347+
type SetValue = Self;
1348+
type BuilderFn = fn(&str, Self) -> glib::ParamSpecEnumBuilder<Self>;
1349+
1350+
fn param_spec_builder() -> Self::BuilderFn {
1351+
|name, default_value| Self::ParamSpec::builder_with_default(name, default_value)
1352+
}
1353+
}
1354+
12981355
#[cfg(any(feature = "v2_30", feature = "dox"))]
12991356
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_30")))]
13001357
impl glib::value::ValueType for ScrollType {
@@ -1571,6 +1628,7 @@ impl IntoGlib for StateType {
15711628
impl FromGlib<ffi::AtkStateType> for StateType {
15721629
unsafe fn from_glib(value: ffi::AtkStateType) -> Self {
15731630
skip_assert_initialized!();
1631+
15741632
match value {
15751633
ffi::ATK_STATE_INVALID => Self::Invalid,
15761634
ffi::ATK_STATE_ACTIVE => Self::Active,
@@ -1629,6 +1687,16 @@ impl StaticType for StateType {
16291687
}
16301688
}
16311689

1690+
impl glib::HasParamSpec for StateType {
1691+
type ParamSpec = glib::ParamSpecEnum;
1692+
type SetValue = Self;
1693+
type BuilderFn = fn(&str, Self) -> glib::ParamSpecEnumBuilder<Self>;
1694+
1695+
fn param_spec_builder() -> Self::BuilderFn {
1696+
|name, default_value| Self::ParamSpec::builder_with_default(name, default_value)
1697+
}
1698+
}
1699+
16321700
impl glib::value::ValueType for StateType {
16331701
type Type = Self;
16341702
}
@@ -1844,6 +1912,7 @@ impl IntoGlib for TextAttribute {
18441912
impl FromGlib<ffi::AtkTextAttribute> for TextAttribute {
18451913
unsafe fn from_glib(value: ffi::AtkTextAttribute) -> Self {
18461914
skip_assert_initialized!();
1915+
18471916
match value {
18481917
ffi::ATK_TEXT_ATTR_INVALID => Self::Invalid,
18491918
ffi::ATK_TEXT_ATTR_LEFT_MARGIN => Self::LeftMargin,
@@ -1887,6 +1956,16 @@ impl StaticType for TextAttribute {
18871956
}
18881957
}
18891958

1959+
impl glib::HasParamSpec for TextAttribute {
1960+
type ParamSpec = glib::ParamSpecEnum;
1961+
type SetValue = Self;
1962+
type BuilderFn = fn(&str, Self) -> glib::ParamSpecEnumBuilder<Self>;
1963+
1964+
fn param_spec_builder() -> Self::BuilderFn {
1965+
|name, default_value| Self::ParamSpec::builder_with_default(name, default_value)
1966+
}
1967+
}
1968+
18901969
impl glib::value::ValueType for TextAttribute {
18911970
type Type = Self;
18921971
}
@@ -1990,6 +2069,7 @@ impl FromGlib<ffi::AtkTextBoundary> for TextBoundary {
19902069
#[inline]
19912070
unsafe fn from_glib(value: ffi::AtkTextBoundary) -> Self {
19922071
skip_assert_initialized!();
2072+
19932073
match value {
19942074
ffi::ATK_TEXT_BOUNDARY_CHAR => Self::Char,
19952075
ffi::ATK_TEXT_BOUNDARY_WORD_START => Self::WordStart,
@@ -2010,6 +2090,16 @@ impl StaticType for TextBoundary {
20102090
}
20112091
}
20122092

2093+
impl glib::HasParamSpec for TextBoundary {
2094+
type ParamSpec = glib::ParamSpecEnum;
2095+
type SetValue = Self;
2096+
type BuilderFn = fn(&str, Self) -> glib::ParamSpecEnumBuilder<Self>;
2097+
2098+
fn param_spec_builder() -> Self::BuilderFn {
2099+
|name, default_value| Self::ParamSpec::builder_with_default(name, default_value)
2100+
}
2101+
}
2102+
20132103
impl glib::value::ValueType for TextBoundary {
20142104
type Type = Self;
20152105
}
@@ -2101,6 +2191,7 @@ impl FromGlib<ffi::AtkTextClipType> for TextClipType {
21012191
#[inline]
21022192
unsafe fn from_glib(value: ffi::AtkTextClipType) -> Self {
21032193
skip_assert_initialized!();
2194+
21042195
match value {
21052196
ffi::ATK_TEXT_CLIP_NONE => Self::None,
21062197
ffi::ATK_TEXT_CLIP_MIN => Self::Min,
@@ -2118,6 +2209,16 @@ impl StaticType for TextClipType {
21182209
}
21192210
}
21202211

2212+
impl glib::HasParamSpec for TextClipType {
2213+
type ParamSpec = glib::ParamSpecEnum;
2214+
type SetValue = Self;
2215+
type BuilderFn = fn(&str, Self) -> glib::ParamSpecEnumBuilder<Self>;
2216+
2217+
fn param_spec_builder() -> Self::BuilderFn {
2218+
|name, default_value| Self::ParamSpec::builder_with_default(name, default_value)
2219+
}
2220+
}
2221+
21212222
impl glib::value::ValueType for TextClipType {
21222223
type Type = Self;
21232224
}
@@ -2213,6 +2314,7 @@ impl FromGlib<ffi::AtkTextGranularity> for TextGranularity {
22132314
#[inline]
22142315
unsafe fn from_glib(value: ffi::AtkTextGranularity) -> Self {
22152316
skip_assert_initialized!();
2317+
22162318
match value {
22172319
ffi::ATK_TEXT_GRANULARITY_CHAR => Self::Char,
22182320
ffi::ATK_TEXT_GRANULARITY_WORD => Self::Word,
@@ -2231,6 +2333,16 @@ impl StaticType for TextGranularity {
22312333
}
22322334
}
22332335

2336+
impl glib::HasParamSpec for TextGranularity {
2337+
type ParamSpec = glib::ParamSpecEnum;
2338+
type SetValue = Self;
2339+
type BuilderFn = fn(&str, Self) -> glib::ParamSpecEnumBuilder<Self>;
2340+
2341+
fn param_spec_builder() -> Self::BuilderFn {
2342+
|name, default_value| Self::ParamSpec::builder_with_default(name, default_value)
2343+
}
2344+
}
2345+
22342346
impl glib::value::ValueType for TextGranularity {
22352347
type Type = Self;
22362348
}
@@ -2384,6 +2496,7 @@ impl IntoGlib for ValueType {
23842496
impl FromGlib<ffi::AtkValueType> for ValueType {
23852497
unsafe fn from_glib(value: ffi::AtkValueType) -> Self {
23862498
skip_assert_initialized!();
2499+
23872500
match value {
23882501
ffi::ATK_VALUE_VERY_WEAK => Self::VeryWeak,
23892502
ffi::ATK_VALUE_WEAK => Self::Weak,
@@ -2413,6 +2526,16 @@ impl StaticType for ValueType {
24132526
}
24142527
}
24152528

2529+
impl glib::HasParamSpec for ValueType {
2530+
type ParamSpec = glib::ParamSpecEnum;
2531+
type SetValue = Self;
2532+
type BuilderFn = fn(&str, Self) -> glib::ParamSpecEnumBuilder<Self>;
2533+
2534+
fn param_spec_builder() -> Self::BuilderFn {
2535+
|name, default_value| Self::ParamSpec::builder_with_default(name, default_value)
2536+
}
2537+
}
2538+
24162539
impl glib::value::ValueType for ValueType {
24172540
type Type = Self;
24182541
}

atk/src/auto/flags.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@ impl StaticType for HyperlinkStateFlags {
4646
}
4747
}
4848

49+
impl glib::HasParamSpec for HyperlinkStateFlags {
50+
type ParamSpec = glib::ParamSpecFlags;
51+
type SetValue = Self;
52+
type BuilderFn = fn(&str) -> glib::ParamSpecFlagsBuilder<Self>;
53+
54+
fn param_spec_builder() -> Self::BuilderFn {
55+
|name| Self::ParamSpec::builder(name)
56+
}
57+
}
58+
4959
impl glib::value::ValueType for HyperlinkStateFlags {
5060
type Type = Self;
5161
}

atk/src/auto/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 27f16247e511)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 040da0b3a013)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 5eb11fc69910)

atk/sys/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@ repository = "https://github.com/gtk-rs/gtk3-rs"
4040
version = "0.17.0"
4141
edition = "2021"
4242
rust-version = "1.64"
43+
4344
[package.metadata.docs.rs]
4445
features = ["dox"]
46+
4547
[package.metadata.system-deps.atk]
4648
name = "atk"
4749
version = "2.28"

atk/sys/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 27f16247e511)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 040da0b3a013)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 5eb11fc69910)

examples/basic_subclass/simple_application/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ glib::wrapper! {
1111
impl SimpleApplication {
1212
#[allow(clippy::new_without_default)]
1313
pub fn new() -> Self {
14-
glib::Object::new(&[
15-
("application-id", &"org.gtk-rs.SimpleApplication"),
16-
("flags", &ApplicationFlags::empty()),
17-
])
14+
glib::Object::builder()
15+
.property("application-id", &"org.gtk-rs.SimpleApplication")
16+
.property("flags", &ApplicationFlags::empty())
17+
.build()
1818
}
1919
}

examples/basic_subclass/simple_window/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ glib::wrapper! {
1111

1212
impl SimpleWindow {
1313
pub fn new(app: &SimpleApplication) -> Self {
14-
glib::Object::new(&[("application", app)])
14+
glib::Object::builder().property("application", app).build()
1515
}
1616
}

examples/composite_template/example_application_window/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ glib::wrapper! {
1111

1212
impl ExampleApplicationWindow {
1313
pub fn new<P: glib::IsA<gtk::Application>>(app: &P) -> Self {
14-
glib::Object::new(&[("application", app)])
14+
glib::Object::builder().property("application", app).build()
1515
}
1616

1717
fn init_label(&self) {

examples/list_box_model/model/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ glib::wrapper! {
1515
impl Model {
1616
#[allow(clippy::new_without_default)]
1717
pub fn new() -> Model {
18-
glib::Object::new(&[])
18+
glib::Object::new()
1919
}
2020

2121
pub fn append(&self, obj: &RowData) {

0 commit comments

Comments
 (0)