Skip to content

Commit 8fbb015

Browse files
Regenerate with latest gir
1 parent c6e5ba6 commit 8fbb015

Some content is hidden

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

50 files changed

+362
-318
lines changed

gdk-pixbuf/src/auto/enums.rs

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
// from gir-files (https://github.com/gtk-rs/gir-files)
33
// DO NOT EDIT
44

5-
use glib::{
6-
error::ErrorDomain, translate::*, value::FromValue, value::ToValue, Quark, StaticType, Type,
7-
};
5+
use glib::{prelude::*, translate::*};
86
use std::fmt;
97

108
#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
@@ -56,7 +54,7 @@ impl FromGlib<ffi::GdkColorspace> for Colorspace {
5654

5755
impl StaticType for Colorspace {
5856
#[inline]
59-
fn static_type() -> Type {
57+
fn static_type() -> glib::Type {
6058
unsafe { from_glib(ffi::gdk_colorspace_get_type()) }
6159
}
6260
}
@@ -75,7 +73,7 @@ impl glib::value::ValueType for Colorspace {
7573
type Type = Self;
7674
}
7775

78-
unsafe impl<'a> FromValue<'a> for Colorspace {
76+
unsafe impl<'a> glib::value::FromValue<'a> for Colorspace {
7977
type Checker = glib::value::GenericValueTypeChecker<Self>;
8078

8179
#[inline]
@@ -171,7 +169,7 @@ impl FromGlib<ffi::GdkInterpType> for InterpType {
171169

172170
impl StaticType for InterpType {
173171
#[inline]
174-
fn static_type() -> Type {
172+
fn static_type() -> glib::Type {
175173
unsafe { from_glib(ffi::gdk_interp_type_get_type()) }
176174
}
177175
}
@@ -190,7 +188,7 @@ impl glib::value::ValueType for InterpType {
190188
type Type = Self;
191189
}
192190

193-
unsafe impl<'a> FromValue<'a> for InterpType {
191+
unsafe impl<'a> glib::value::FromValue<'a> for InterpType {
194192
type Checker = glib::value::GenericValueTypeChecker<Self>;
195193

196194
#[inline]
@@ -281,7 +279,7 @@ impl FromGlib<ffi::GdkPixbufAlphaMode> for PixbufAlphaMode {
281279
#[allow(deprecated)]
282280
impl StaticType for PixbufAlphaMode {
283281
#[inline]
284-
fn static_type() -> Type {
282+
fn static_type() -> glib::Type {
285283
unsafe { from_glib(ffi::gdk_pixbuf_alpha_mode_get_type()) }
286284
}
287285
}
@@ -303,7 +301,7 @@ impl glib::value::ValueType for PixbufAlphaMode {
303301
}
304302

305303
#[allow(deprecated)]
306-
unsafe impl<'a> FromValue<'a> for PixbufAlphaMode {
304+
unsafe impl<'a> glib::value::FromValue<'a> for PixbufAlphaMode {
307305
type Checker = glib::value::GenericValueTypeChecker<Self>;
308306

309307
#[inline]
@@ -414,9 +412,9 @@ impl FromGlib<ffi::GdkPixbufError> for PixbufError {
414412
}
415413
}
416414

417-
impl ErrorDomain for PixbufError {
415+
impl glib::error::ErrorDomain for PixbufError {
418416
#[inline]
419-
fn domain() -> Quark {
417+
fn domain() -> glib::Quark {
420418
unsafe { from_glib(ffi::gdk_pixbuf_error_quark()) }
421419
}
422420

@@ -437,7 +435,7 @@ impl ErrorDomain for PixbufError {
437435

438436
impl StaticType for PixbufError {
439437
#[inline]
440-
fn static_type() -> Type {
438+
fn static_type() -> glib::Type {
441439
unsafe { from_glib(ffi::gdk_pixbuf_error_get_type()) }
442440
}
443441
}
@@ -456,7 +454,7 @@ impl glib::value::ValueType for PixbufError {
456454
type Type = Self;
457455
}
458456

459-
unsafe impl<'a> FromValue<'a> for PixbufError {
457+
unsafe impl<'a> glib::value::FromValue<'a> for PixbufError {
460458
type Checker = glib::value::GenericValueTypeChecker<Self>;
461459

462460
#[inline]
@@ -552,7 +550,7 @@ impl FromGlib<ffi::GdkPixbufRotation> for PixbufRotation {
552550

553551
impl StaticType for PixbufRotation {
554552
#[inline]
555-
fn static_type() -> Type {
553+
fn static_type() -> glib::Type {
556554
unsafe { from_glib(ffi::gdk_pixbuf_rotation_get_type()) }
557555
}
558556
}
@@ -571,7 +569,7 @@ impl glib::value::ValueType for PixbufRotation {
571569
type Type = Self;
572570
}
573571

574-
unsafe impl<'a> FromValue<'a> for PixbufRotation {
572+
unsafe impl<'a> glib::value::FromValue<'a> for PixbufRotation {
575573
type Checker = glib::value::GenericValueTypeChecker<Self>;
576574

577575
#[inline]

gdk-pixbuf/src/auto/flags.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// from gir-files (https://github.com/gtk-rs/gir-files)
33
// DO NOT EDIT
44

5-
use bitflags::bitflags;
6-
use glib::translate::*;
5+
use glib::{bitflags::bitflags, translate::*};
76
use std::fmt;
87

98
bitflags! {
9+
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
1010
#[doc(alias = "GdkPixbufFormatFlags")]
1111
pub struct PixbufFormatFlags: u32 {
1212
#[doc(alias = "GDK_PIXBUF_FORMAT_WRITABLE")]

gdk-pixbuf/src/auto/pixbuf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ impl Pixbuf {
641641

642642
#[doc(alias = "pixel-bytes")]
643643
pub fn pixel_bytes(&self) -> Option<glib::Bytes> {
644-
glib::ObjectExt::property(self, "pixel-bytes")
644+
ObjectExt::property(self, "pixel-bytes")
645645
}
646646

647647
#[doc(alias = "gdk_pixbuf_calculate_rowstride")]

gdk-pixbuf/src/auto/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 47312a7cf33a)
1+
Generated by gir (https://github.com/gtk-rs/gir @ c659c2b21954)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 744be9fbbbed)

gdk-pixbuf/sys/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 47312a7cf33a)
1+
Generated by gir (https://github.com/gtk-rs/gir @ c659c2b21954)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 744be9fbbbed)

gio/src/auto/application.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ pub trait ApplicationExt: IsA<Application> + sealed::Sealed + 'static {
413413

414414
#[doc(alias = "action-group")]
415415
fn set_action_group<P: IsA<ActionGroup>>(&self, action_group: Option<&P>) {
416-
glib::ObjectExt::set_property(self.as_ref(), "action-group", action_group)
416+
ObjectExt::set_property(self.as_ref(), "action-group", action_group)
417417
}
418418

419419
#[doc(alias = "activate")]

gio/src/auto/charset_converter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ impl CharsetConverter {
7373

7474
#[doc(alias = "from-charset")]
7575
pub fn from_charset(&self) -> Option<glib::GString> {
76-
glib::ObjectExt::property(self, "from-charset")
76+
ObjectExt::property(self, "from-charset")
7777
}
7878

7979
#[doc(alias = "to-charset")]
8080
pub fn to_charset(&self) -> Option<glib::GString> {
81-
glib::ObjectExt::property(self, "to-charset")
81+
ObjectExt::property(self, "to-charset")
8282
}
8383

8484
#[doc(alias = "use-fallback")]

gio/src/auto/dbus_connection.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ impl DBusConnection {
804804
}
805805

806806
pub fn get_property_flags(&self) -> DBusConnectionFlags {
807-
glib::ObjectExt::property(self, "flags")
807+
ObjectExt::property(self, "flags")
808808
}
809809

810810
#[doc(alias = "g_dbus_connection_new")]

gio/src/auto/dbus_interface_skeleton.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,12 @@ pub trait DBusInterfaceSkeletonExt: IsA<DBusInterfaceSkeleton> + sealed::Sealed
163163

164164
#[doc(alias = "g-flags")]
165165
fn g_flags(&self) -> DBusInterfaceSkeletonFlags {
166-
glib::ObjectExt::property(self.as_ref(), "g-flags")
166+
ObjectExt::property(self.as_ref(), "g-flags")
167167
}
168168

169169
#[doc(alias = "g-flags")]
170170
fn set_g_flags(&self, g_flags: DBusInterfaceSkeletonFlags) {
171-
glib::ObjectExt::set_property(self.as_ref(), "g-flags", g_flags)
171+
ObjectExt::set_property(self.as_ref(), "g-flags", g_flags)
172172
}
173173

174174
#[doc(alias = "g-authorize-method")]

gio/src/auto/dbus_proxy.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -645,52 +645,52 @@ pub trait DBusProxyExt: IsA<DBusProxy> + sealed::Sealed + 'static {
645645

646646
#[doc(alias = "g-connection")]
647647
fn g_connection(&self) -> Option<DBusConnection> {
648-
glib::ObjectExt::property(self.as_ref(), "g-connection")
648+
ObjectExt::property(self.as_ref(), "g-connection")
649649
}
650650

651651
#[doc(alias = "g-default-timeout")]
652652
fn g_default_timeout(&self) -> i32 {
653-
glib::ObjectExt::property(self.as_ref(), "g-default-timeout")
653+
ObjectExt::property(self.as_ref(), "g-default-timeout")
654654
}
655655

656656
#[doc(alias = "g-default-timeout")]
657657
fn set_g_default_timeout(&self, g_default_timeout: i32) {
658-
glib::ObjectExt::set_property(self.as_ref(), "g-default-timeout", g_default_timeout)
658+
ObjectExt::set_property(self.as_ref(), "g-default-timeout", g_default_timeout)
659659
}
660660

661661
#[doc(alias = "g-flags")]
662662
fn g_flags(&self) -> DBusProxyFlags {
663-
glib::ObjectExt::property(self.as_ref(), "g-flags")
663+
ObjectExt::property(self.as_ref(), "g-flags")
664664
}
665665

666666
#[doc(alias = "g-interface-info")]
667667
fn g_interface_info(&self) -> Option<DBusInterfaceInfo> {
668-
glib::ObjectExt::property(self.as_ref(), "g-interface-info")
668+
ObjectExt::property(self.as_ref(), "g-interface-info")
669669
}
670670

671671
#[doc(alias = "g-interface-info")]
672672
fn set_g_interface_info(&self, g_interface_info: Option<&DBusInterfaceInfo>) {
673-
glib::ObjectExt::set_property(self.as_ref(), "g-interface-info", g_interface_info)
673+
ObjectExt::set_property(self.as_ref(), "g-interface-info", g_interface_info)
674674
}
675675

676676
#[doc(alias = "g-interface-name")]
677677
fn g_interface_name(&self) -> Option<glib::GString> {
678-
glib::ObjectExt::property(self.as_ref(), "g-interface-name")
678+
ObjectExt::property(self.as_ref(), "g-interface-name")
679679
}
680680

681681
#[doc(alias = "g-name")]
682682
fn g_name(&self) -> Option<glib::GString> {
683-
glib::ObjectExt::property(self.as_ref(), "g-name")
683+
ObjectExt::property(self.as_ref(), "g-name")
684684
}
685685

686686
#[doc(alias = "g-name-owner")]
687687
fn g_name_owner(&self) -> Option<glib::GString> {
688-
glib::ObjectExt::property(self.as_ref(), "g-name-owner")
688+
ObjectExt::property(self.as_ref(), "g-name-owner")
689689
}
690690

691691
#[doc(alias = "g-object-path")]
692692
fn g_object_path(&self) -> Option<glib::GString> {
693-
glib::ObjectExt::property(self.as_ref(), "g-object-path")
693+
ObjectExt::property(self.as_ref(), "g-object-path")
694694
}
695695

696696
#[doc(alias = "g-default-timeout")]

0 commit comments

Comments
 (0)