Update everything for glib macro renamings

10 files changed, 14 insertions, 14 deletions

diff --git a/tutorial/src/identity/imp.rs b/tutorial/src/identity/imp.rs
index 8bd8c65ea..d94ec448d 100644
--- a/tutorial/src/identity/imp.rs
+++ b/tutorial/src/identity/imp.rs
@@ -122,7 +122,7 @@ impl ObjectSubclass for Identity {
     type Class = subclass::simple::ClassStruct<Self>;
 
     // This macro provides some boilerplate.
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     // Called when a new instance is to be created. We need to return an instance
     // of our struct here and also get the class struct passed in case it's needed
diff --git a/tutorial/src/identity/mod.rs b/tutorial/src/identity/mod.rs
index c9b4c18d0..d7d45183a 100644
--- a/tutorial/src/identity/mod.rs
+++ b/tutorial/src/identity/mod.rs
@@ -11,7 +11,7 @@ use glib::prelude::*;
 mod imp;
 
 // The public Rust wrapper type for our element
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Identity(ObjectSubclass<imp::Identity>) @extends gst::Element, gst::Object;
 }
 
diff --git a/tutorial/src/progressbin/imp.rs b/tutorial/src/progressbin/imp.rs
index 4488458c0..9a1e5c7cf 100644
--- a/tutorial/src/progressbin/imp.rs
+++ b/tutorial/src/progressbin/imp.rs
@@ -64,7 +64,7 @@ impl ObjectSubclass for ProgressBin {
     type Class = subclass::simple::ClassStruct<Self>;
 
     // This macro provides some boilerplate.
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     // Called when a new instance is to be created. We need to return an instance
     // of our struct here and also get the class struct passed in case it's needed
diff --git a/tutorial/src/progressbin/mod.rs b/tutorial/src/progressbin/mod.rs
index 51551b64a..d4f940f76 100644
--- a/tutorial/src/progressbin/mod.rs
+++ b/tutorial/src/progressbin/mod.rs
@@ -30,7 +30,7 @@ pub enum ProgressBinOutput {
 }
 
 // The public Rust wrapper type for our element
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct ProgressBin(ObjectSubclass<imp::ProgressBin>) @extends gst::Bin, gst::Element, gst::Object;
 }
 
diff --git a/tutorial/src/rgb2gray/imp.rs b/tutorial/src/rgb2gray/imp.rs
index 17f2a61e9..03e07b3b6 100644
--- a/tutorial/src/rgb2gray/imp.rs
+++ b/tutorial/src/rgb2gray/imp.rs
@@ -122,7 +122,7 @@ impl ObjectSubclass for Rgb2Gray {
     type Class = subclass::simple::ClassStruct<Self>;
 
     // This macro provides some boilerplate
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     // Called when a new instance is to be created. We need to return an instance
     // of our struct here.
diff --git a/tutorial/src/rgb2gray/mod.rs b/tutorial/src/rgb2gray/mod.rs
index 0500f7d69..988904d7d 100644
--- a/tutorial/src/rgb2gray/mod.rs
+++ b/tutorial/src/rgb2gray/mod.rs
@@ -11,7 +11,7 @@ use glib::prelude::*;
 mod imp;
 
 // The public Rust wrapper type for our element
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Rgb2Gray(ObjectSubclass<imp::Rgb2Gray>) @extends gst_base::BaseTransform, gst::Element, gst::Object;
 }
 
diff --git a/tutorial/src/sinesrc/imp.rs b/tutorial/src/sinesrc/imp.rs
index 3a6f79d78..fcfcb4b97 100644
--- a/tutorial/src/sinesrc/imp.rs
+++ b/tutorial/src/sinesrc/imp.rs
@@ -207,7 +207,7 @@ impl ObjectSubclass for SineSrc {
     type Class = subclass::simple::ClassStruct<Self>;
 
     // This macro provides some boilerplate.
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     // Called when a new instance is to be created. We need to return an instance
     // of our struct here.
diff --git a/tutorial/src/sinesrc/mod.rs b/tutorial/src/sinesrc/mod.rs
index 4d9af02c8..8e3964997 100644
--- a/tutorial/src/sinesrc/mod.rs
+++ b/tutorial/src/sinesrc/mod.rs
@@ -11,7 +11,7 @@ use glib::prelude::*;
 mod imp;
 
 // The public Rust wrapper type for our element
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct SineSrc(ObjectSubclass<imp::SineSrc>) @extends gst_base::BaseSrc, gst::Element, gst::Object;
 }
 
diff --git a/tutorial/tutorial-1.md b/tutorial/tutorial-1.md
index 91dd11dae..efbc33e9d 100644
--- a/tutorial/tutorial-1.md
+++ b/tutorial/tutorial-1.md
@@ -175,7 +175,7 @@ impl ObjectSubclass for Rgb2Gray {
     type Class = subclass::simple::ClassStruct<Self>;
 
     // This macro provides some boilerplate
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {}
@@ -198,7 +198,7 @@ use glib::prelude::*;
 mod imp;
 
 // The public Rust wrapper type for our element
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Rgb2Gray(ObjectSubclass<imp::Rgb2Gray>) @extends gst_base::BaseTransform, gst::Element, gst::Object;
 }
 
@@ -290,7 +290,7 @@ impl ObjectSubclass for Rgb2Gray {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 }
 
 impl ObjectImpl for Rgb2Gray {}
@@ -305,7 +305,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Rgb2Gray(ObjectSubclass<imp::Rgb2Gray>) @extends gst_base::BaseTransform, gst::Element, gst::Object;
 }
 
diff --git a/tutorial/tutorial-2.md b/tutorial/tutorial-2.md
index 8bc1a5480..4e8a20b8f 100644
--- a/tutorial/tutorial-2.md
+++ b/tutorial/tutorial-2.md
@@ -154,7 +154,7 @@ impl ObjectSubclass for SineSrc {
     type Class = subclass::simple::ClassStruct<Self>;
 
     // This macro provides some boilerplate.
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     // Called when a new instance is to be created. We need to return an instance
     // of our struct here.
@@ -380,7 +380,7 @@ use glib::prelude::*;
 mod imp;
 
 // The public Rust wrapper type for our element
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct SineSrc(ObjectSubclass<imp::SineSrc>) @extends gst_base::BaseSrc, gst::Element, gst::Object;
 }