autocommit 2022-02-05 18:14:24 CET

src/ifs/wl_data_offer/mod.rs

@@ -1,9 +1,9 @@
 mod types;
 
 use crate::client::{Client, DynEventFormatter};
-use crate::ifs::wl_data_source::{WlDataSource};
+use crate::ifs::wl_data_source::WlDataSource;
 use crate::ifs::wl_seat::WlSeatGlobal;
-use crate::object::{Interface, Object, ObjectId};
+use crate::object::Object;
 use crate::utils::buffd::MsgParser;
 use crate::utils::clonecell::CloneCell;
 use std::ops::Deref;
@@ -121,35 +121,19 @@ impl WlDataOffer {
         let _req: SetActions = self.client.parse(self, parser)?;
         Ok(())
     }
-
-    fn handle_request_(
-        self: &Rc<Self>,
-        request: u32,
-        parser: MsgParser<'_, '_>,
-    ) -> Result<(), WlDataOfferError> {
-        match request {
-            ACCEPT => self.accept(parser)?,
-            RECEIVE => self.receive(parser)?,
-            DESTROY => self.destroy(parser)?,
-            FINISH => self.finish(parser)?,
-            SET_ACTIONS => self.set_actions(parser)?,
-            _ => unreachable!(),
-        }
-        Ok(())
-    }
 }
 
-handle_request!(WlDataOffer);
+object_base! {
+    WlDataOffer, WlDataOfferError;
+
+    ACCEPT => accept,
+    RECEIVE => receive,
+    DESTROY => destroy,
+    FINISH => finish,
+    SET_ACTIONS => set_actions,
+}
 
 impl Object for WlDataOffer {
-    fn id(&self) -> ObjectId {
-        self.id.into()
-    }
-
-    fn interface(&self) -> Interface {
-        Interface::WlDataOffer
-    }
-
     fn num_requests(&self) -> u32 {
         SET_ACTIONS + 1
     }
@@ -158,3 +142,5 @@ impl Object for WlDataOffer {
         self.disconnect();
     }
 }
+
+simple_add_obj!(WlDataOffer);