diff --git a/atspi-common/src/events/document.rs b/atspi-common/src/events/document.rs index a2698d74..e028d5b3 100644 --- a/atspi-common/src/events/document.rs +++ b/atspi-common/src/events/document.rs @@ -77,18 +77,6 @@ impl GenericEvent<'_> for LoadCompleteEvent { } } -/* -impl TryFrom for LoadCompleteEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Document(DocumentEvents::LoadComplete(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for ReloadEvent { const DBUS_MEMBER: &'static str = "Reload"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Document"; @@ -113,18 +101,6 @@ impl GenericEvent<'_> for ReloadEvent { } } -/* -impl TryFrom for ReloadEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Document(DocumentEvents::Reload(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for LoadStoppedEvent { const DBUS_MEMBER: &'static str = "LoadStopped"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Document"; @@ -149,18 +125,6 @@ impl GenericEvent<'_> for LoadStoppedEvent { } } -/* -impl TryFrom for LoadStoppedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Document(DocumentEvents::LoadStopped(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for ContentChangedEvent { const DBUS_MEMBER: &'static str = "ContentChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Document"; @@ -185,18 +149,6 @@ impl GenericEvent<'_> for ContentChangedEvent { } } -/* -impl TryFrom for ContentChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Document(DocumentEvents::ContentChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for AttributesChangedEvent { const DBUS_MEMBER: &'static str = "AttributesChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Document"; @@ -221,18 +173,6 @@ impl GenericEvent<'_> for AttributesChangedEvent { } } -/* -impl TryFrom for AttributesChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Document(DocumentEvents::AttributesChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for PageChangedEvent { const DBUS_MEMBER: &'static str = "PageChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Document"; @@ -257,18 +197,6 @@ impl GenericEvent<'_> for PageChangedEvent { } } -/* -impl TryFrom for PageChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Document(DocumentEvents::PageChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - #[cfg(feature = "zbus")] impl TryFrom<&zbus::Message> for DocumentEvents { type Error = AtspiError; @@ -409,42 +337,6 @@ impl From for EventBodyOwned { } } -/*impl HasMatchRule for LoadCompleteEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Document',member='LoadComplete'"; -}*/ -/*impl HasMatchRule for ReloadEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Document',member='Reload'"; -}*/ -/*impl HasMatchRule for LoadStoppedEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Document',member='LoadStopped'"; -}*/ -/*impl HasMatchRule for ContentChangedEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Document',member='ContentChanged'"; -}*/ -/*impl HasMatchRule for AttributesChangedEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Document',member='AttributesChanged'"; -}*/ -/*impl HasMatchRule for PageChangedEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Document',member='PageChanged'"; -}*/ -/*impl HasRegistryEventString for LoadCompleteEvent { - const REGISTRY_EVENT_STRING: &'static str = "Document:LoadComplete"; -}*/ -/*impl HasRegistryEventString for ReloadEvent { - const REGISTRY_EVENT_STRING: &'static str = "Document:Reload"; -}*/ -/*impl HasRegistryEventString for LoadStoppedEvent { - const REGISTRY_EVENT_STRING: &'static str = "Document:LoadStopped"; -}*/ -/*impl HasRegistryEventString for ContentChangedEvent { - const REGISTRY_EVENT_STRING: &'static str = "Document:ContentChanged"; -}*/ -/*impl HasRegistryEventString for AttributesChangedEvent { - const REGISTRY_EVENT_STRING: &'static str = "Document:AttributesChanged"; -}*/ -/*impl HasRegistryEventString for PageChangedEvent { - const REGISTRY_EVENT_STRING: &'static str = "Document:PageChanged"; -}*/ impl HasRegistryEventString for DocumentEvents { const REGISTRY_EVENT_STRING: &'static str = "Document:"; } diff --git a/atspi-common/src/events/focus.rs b/atspi-common/src/events/focus.rs index 676827d1..5d6a1019 100644 --- a/atspi-common/src/events/focus.rs +++ b/atspi-common/src/events/focus.rs @@ -46,18 +46,6 @@ impl GenericEvent<'_> for FocusEvent { } } -/* -impl TryFrom for FocusEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Focus(FocusEvents::Focus(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - #[cfg(feature = "zbus")] impl TryFrom<&zbus::Message> for FocusEvents { type Error = AtspiError; @@ -88,12 +76,6 @@ impl From for EventBodyOwned { } } -/*impl HasMatchRule for FocusEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Focus',member='Focus'"; -}*/ -/*impl HasRegistryEventString for FocusEvent { - const REGISTRY_EVENT_STRING: &'static str = "Focus:Focus"; -}*/ impl HasRegistryEventString for FocusEvents { const REGISTRY_EVENT_STRING: &'static str = "Focus:"; } diff --git a/atspi-common/src/events/keyboard.rs b/atspi-common/src/events/keyboard.rs index 004bcb02..408aaa1d 100644 --- a/atspi-common/src/events/keyboard.rs +++ b/atspi-common/src/events/keyboard.rs @@ -49,18 +49,6 @@ impl GenericEvent<'_> for ModifiersEvent { } } -/* -impl TryFrom for ModifiersEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Keyboard(KeyboardEvents::Modifiers(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - #[cfg(feature = "zbus")] impl TryFrom<&zbus::Message> for KeyboardEvents { type Error = AtspiError; @@ -91,12 +79,6 @@ impl From for EventBodyOwned { } } -/*impl HasMatchRule for ModifiersEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Keyboard',member='Modifiers'"; -}*/ -/*impl HasRegistryEventString for ModifiersEvent { - const REGISTRY_EVENT_STRING: &'static str = "Keyboard:Modifiers"; -}*/ impl HasRegistryEventString for KeyboardEvents { const REGISTRY_EVENT_STRING: &'static str = "Keyboard:"; } diff --git a/atspi-common/src/events/mouse.rs b/atspi-common/src/events/mouse.rs index 3793b660..6b02e24a 100644 --- a/atspi-common/src/events/mouse.rs +++ b/atspi-common/src/events/mouse.rs @@ -65,18 +65,6 @@ impl GenericEvent<'_> for AbsEvent { } } -/* -impl TryFrom for AbsEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Mouse(MouseEvents::Abs(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for RelEvent { const DBUS_MEMBER: &'static str = "Rel"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Mouse"; @@ -101,18 +89,6 @@ impl GenericEvent<'_> for RelEvent { } } -/* -impl TryFrom for RelEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Mouse(MouseEvents::Rel(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for ButtonEvent { const DBUS_MEMBER: &'static str = "Button"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Mouse"; @@ -137,18 +113,6 @@ impl GenericEvent<'_> for ButtonEvent { } } -/* -impl TryFrom for ButtonEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Mouse(MouseEvents::Button(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - #[cfg(feature = "zbus")] impl TryFrom<&zbus::Message> for MouseEvents { type Error = AtspiError; @@ -213,24 +177,6 @@ impl From for EventBodyOwned { } } -/*impl HasMatchRule for AbsEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Mouse',member='Abs'"; -}*/ -/*impl HasMatchRule for RelEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Mouse',member='Rel'"; -}*/ -/*impl HasMatchRule for ButtonEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Mouse',member='Button'"; -}*/ -/*impl HasRegistryEventString for AbsEvent { - const REGISTRY_EVENT_STRING: &'static str = "Mouse:Abs"; -}*/ -/*impl HasRegistryEventString for RelEvent { - const REGISTRY_EVENT_STRING: &'static str = "Mouse:Rel"; -}*/ -/*impl HasRegistryEventString for ButtonEvent { - const REGISTRY_EVENT_STRING: &'static str = "Mouse:Button"; -}*/ impl HasRegistryEventString for MouseEvents { const REGISTRY_EVENT_STRING: &'static str = "Mouse:"; } diff --git a/atspi-common/src/events/object.rs b/atspi-common/src/events/object.rs index cfaf39fc..416e05b4 100644 --- a/atspi-common/src/events/object.rs +++ b/atspi-common/src/events/object.rs @@ -186,18 +186,6 @@ impl GenericEvent<'_> for PropertyChangeEvent { } } -/* -impl TryFrom for PropertyChangeEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::PropertyChange(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for BoundsChangedEvent { const DBUS_MEMBER: &'static str = "BoundsChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -222,18 +210,6 @@ impl GenericEvent<'_> for BoundsChangedEvent { } } -/* -impl TryFrom for BoundsChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::BoundsChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for LinkSelectedEvent { const DBUS_MEMBER: &'static str = "LinkSelected"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -258,18 +234,6 @@ impl GenericEvent<'_> for LinkSelectedEvent { } } -/* -impl TryFrom for LinkSelectedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::LinkSelected(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for StateChangedEvent { const DBUS_MEMBER: &'static str = "StateChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -294,18 +258,6 @@ impl GenericEvent<'_> for StateChangedEvent { } } -/* -impl TryFrom for StateChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::StateChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for ChildrenChangedEvent { const DBUS_MEMBER: &'static str = "ChildrenChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -335,18 +287,6 @@ impl GenericEvent<'_> for ChildrenChangedEvent { } } -/* -impl TryFrom for ChildrenChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::ChildrenChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for VisibleDataChangedEvent { const DBUS_MEMBER: &'static str = "VisibleDataChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -371,18 +311,6 @@ impl GenericEvent<'_> for VisibleDataChangedEvent { } } -/* -impl TryFrom for VisibleDataChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::VisibleDataChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for SelectionChangedEvent { const DBUS_MEMBER: &'static str = "SelectionChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -407,18 +335,6 @@ impl GenericEvent<'_> for SelectionChangedEvent { } } -/* -impl TryFrom for SelectionChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::SelectionChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for ModelChangedEvent { const DBUS_MEMBER: &'static str = "ModelChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -443,18 +359,6 @@ impl GenericEvent<'_> for ModelChangedEvent { } } -/* -impl TryFrom for ModelChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::ModelChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for ActiveDescendantChangedEvent { const DBUS_MEMBER: &'static str = "ActiveDescendantChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -479,18 +383,6 @@ impl GenericEvent<'_> for ActiveDescendantChangedEvent { } } -/* -impl TryFrom for ActiveDescendantChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::ActiveDescendantChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for AnnouncementEvent { const DBUS_MEMBER: &'static str = "Announcement"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -515,18 +407,6 @@ impl GenericEvent<'_> for AnnouncementEvent { } } -/* -impl TryFrom for AnnouncementEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::Announcement(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for AttributesChangedEvent { const DBUS_MEMBER: &'static str = "AttributesChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -551,17 +431,6 @@ impl GenericEvent<'_> for AttributesChangedEvent { } } -/* -impl TryFrom for AttributesChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::AttributesChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ impl GenericEvent<'_> for RowInsertedEvent { const DBUS_MEMBER: &'static str = "RowInserted"; @@ -587,18 +456,6 @@ impl GenericEvent<'_> for RowInsertedEvent { } } -/* -impl TryFrom for RowInsertedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::RowInserted(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for RowReorderedEvent { const DBUS_MEMBER: &'static str = "RowReordered"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -623,18 +480,6 @@ impl GenericEvent<'_> for RowReorderedEvent { } } -/* -impl TryFrom for RowReorderedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::RowReordered(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for RowDeletedEvent { const DBUS_MEMBER: &'static str = "RowDeleted"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -659,18 +504,6 @@ impl GenericEvent<'_> for RowDeletedEvent { } } -/* -impl TryFrom for RowDeletedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::RowDeleted(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for ColumnInsertedEvent { const DBUS_MEMBER: &'static str = "ColumnInserted"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -695,18 +528,6 @@ impl GenericEvent<'_> for ColumnInsertedEvent { } } -/* -impl TryFrom for ColumnInsertedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::ColumnInserted(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for ColumnReorderedEvent { const DBUS_MEMBER: &'static str = "ColumnReordered"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -731,18 +552,6 @@ impl GenericEvent<'_> for ColumnReorderedEvent { } } -/* -impl TryFrom for ColumnReorderedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::ColumnReordered(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for ColumnDeletedEvent { const DBUS_MEMBER: &'static str = "ColumnDeleted"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -767,18 +576,6 @@ impl GenericEvent<'_> for ColumnDeletedEvent { } } -/* -impl TryFrom for ColumnDeletedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::ColumnDeleted(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for TextBoundsChangedEvent { const DBUS_MEMBER: &'static str = "TextBoundsChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -803,18 +600,6 @@ impl GenericEvent<'_> for TextBoundsChangedEvent { } } -/* -impl TryFrom for TextBoundsChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::TextBoundsChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for TextSelectionChangedEvent { const DBUS_MEMBER: &'static str = "TextSelectionChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -839,18 +624,6 @@ impl GenericEvent<'_> for TextSelectionChangedEvent { } } -/* -impl TryFrom for TextSelectionChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::TextSelectionChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for TextChangedEvent { const DBUS_MEMBER: &'static str = "TextChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -881,18 +654,6 @@ impl GenericEvent<'_> for TextChangedEvent { } } -/* -impl TryFrom for TextChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::TextChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for TextAttributesChangedEvent { const DBUS_MEMBER: &'static str = "TextAttributesChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -917,18 +678,6 @@ impl GenericEvent<'_> for TextAttributesChangedEvent { } } -/* -impl TryFrom for TextAttributesChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::TextAttributesChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for TextCaretMovedEvent { const DBUS_MEMBER: &'static str = "TextCaretMoved"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Object"; @@ -953,18 +702,6 @@ impl GenericEvent<'_> for TextCaretMovedEvent { } } -/* -impl TryFrom for TextCaretMovedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Object(ObjectEvents::TextCaretMoved(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - #[cfg(feature = "zbus")] impl TryFrom<&zbus::Message> for ObjectEvents { type Error = AtspiError; diff --git a/atspi-common/src/events/terminal.rs b/atspi-common/src/events/terminal.rs index 1fd2bf19..646d4161 100644 --- a/atspi-common/src/events/terminal.rs +++ b/atspi-common/src/events/terminal.rs @@ -71,18 +71,6 @@ impl GenericEvent<'_> for LineChangedEvent { } } -/* -impl TryFrom for LineChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Terminal(TerminalEvents::LineChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for ColumnCountChangedEvent { const DBUS_MEMBER: &'static str = "ColumncountChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Terminal"; @@ -107,18 +95,6 @@ impl GenericEvent<'_> for ColumnCountChangedEvent { } } -/* -impl TryFrom for ColumnCountChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Terminal(TerminalEvents::ColumnCountChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for LineCountChangedEvent { const DBUS_MEMBER: &'static str = "LinecountChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Terminal"; @@ -143,18 +119,6 @@ impl GenericEvent<'_> for LineCountChangedEvent { } } -/* -impl TryFrom for LineCountChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Terminal(TerminalEvents::LineCountChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for ApplicationChangedEvent { const DBUS_MEMBER: &'static str = "ApplicationChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Terminal"; @@ -179,18 +143,6 @@ impl GenericEvent<'_> for ApplicationChangedEvent { } } -/* -impl TryFrom for ApplicationChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Terminal(TerminalEvents::ApplicationChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for CharWidthChangedEvent { const DBUS_MEMBER: &'static str = "CharwidthChanged"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Terminal"; @@ -215,18 +167,6 @@ impl GenericEvent<'_> for CharWidthChangedEvent { } } -/* -impl TryFrom for CharWidthChangedEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Terminal(TerminalEvents::CharWidthChanged(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - #[cfg(feature = "zbus")] impl TryFrom<&zbus::Message> for TerminalEvents { type Error = AtspiError; @@ -350,36 +290,6 @@ impl From for EventBodyOwned { } } -/*impl HasMatchRule for LineChangedEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Terminal',member='LineChanged'"; -}*/ -/*impl HasMatchRule for ColumnCountChangedEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Terminal',member='ColumncountChanged'"; -}*/ -/*impl HasMatchRule for LineCountChangedEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Terminal',member='LinecountChanged'"; -}*/ -/*impl HasMatchRule for ApplicationChangedEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Terminal',member='ApplicationChanged'"; -}*/ -/*impl HasMatchRule for CharWidthChangedEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Terminal',member='CharwidthChanged'"; -}*/ -/*impl HasRegistryEventString for LineChangedEvent { - const REGISTRY_EVENT_STRING: &'static str = "Terminal:LineChanged"; -}*/ -/*impl HasRegistryEventString for ColumnCountChangedEvent { - const REGISTRY_EVENT_STRING: &'static str = "Terminal:ColumncountChanged"; -}*/ -/*impl HasRegistryEventString for LineCountChangedEvent { - const REGISTRY_EVENT_STRING: &'static str = "Terminal:LinecountChanged"; -}*/ -/*impl HasRegistryEventString for ApplicationChangedEvent { - const REGISTRY_EVENT_STRING: &'static str = "Terminal:ApplicationChanged"; -}*/ -/*impl HasRegistryEventString for CharWidthChangedEvent { - const REGISTRY_EVENT_STRING: &'static str = "Terminal:CharwidthChanged"; -}*/ impl HasRegistryEventString for TerminalEvents { const REGISTRY_EVENT_STRING: &'static str = "Terminal:"; } diff --git a/atspi-common/src/events/window.rs b/atspi-common/src/events/window.rs index afcff2eb..26216abc 100644 --- a/atspi-common/src/events/window.rs +++ b/atspi-common/src/events/window.rs @@ -155,18 +155,6 @@ impl GenericEvent<'_> for PropertyChangeEvent { } } -/* -impl TryFrom for PropertyChangeEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::PropertyChange(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for MinimizeEvent { const DBUS_MEMBER: &'static str = "Minimize"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Window"; @@ -191,18 +179,6 @@ impl GenericEvent<'_> for MinimizeEvent { } } -/* -impl TryFrom for MinimizeEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::Minimize(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for MaximizeEvent { const DBUS_MEMBER: &'static str = "Maximize"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Window"; @@ -227,18 +203,6 @@ impl GenericEvent<'_> for MaximizeEvent { } } -/* -impl TryFrom for MaximizeEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::Maximize(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for RestoreEvent { const DBUS_MEMBER: &'static str = "Restore"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Window"; @@ -263,18 +227,6 @@ impl GenericEvent<'_> for RestoreEvent { } } -/* -impl TryFrom for RestoreEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::Restore(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for CloseEvent { const DBUS_MEMBER: &'static str = "Close"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Window"; @@ -299,18 +251,6 @@ impl GenericEvent<'_> for CloseEvent { } } -/* -impl TryFrom for CloseEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::Close(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for CreateEvent { const DBUS_MEMBER: &'static str = "Create"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Window"; @@ -335,18 +275,6 @@ impl GenericEvent<'_> for CreateEvent { } } -/* -impl TryFrom for CreateEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::Create(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for ReparentEvent { const DBUS_MEMBER: &'static str = "Reparent"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Window"; @@ -371,18 +299,6 @@ impl GenericEvent<'_> for ReparentEvent { } } -/* -impl TryFrom for ReparentEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::Reparent(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for DesktopCreateEvent { const DBUS_MEMBER: &'static str = "DesktopCreate"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Window"; @@ -407,18 +323,6 @@ impl GenericEvent<'_> for DesktopCreateEvent { } } -/* -impl TryFrom for DesktopCreateEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::DesktopCreate(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for DesktopDestroyEvent { const DBUS_MEMBER: &'static str = "DesktopDestroy"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Window"; @@ -443,18 +347,6 @@ impl GenericEvent<'_> for DesktopDestroyEvent { } } -/* -impl TryFrom for DesktopDestroyEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::DesktopDestroy(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for DestroyEvent { const DBUS_MEMBER: &'static str = "Destroy"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Window"; @@ -479,18 +371,6 @@ impl GenericEvent<'_> for DestroyEvent { } } -/* -impl TryFrom for DestroyEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::Destroy(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for ActivateEvent { const DBUS_MEMBER: &'static str = "Activate"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Window"; @@ -515,18 +395,6 @@ impl GenericEvent<'_> for ActivateEvent { } } -/* -impl TryFrom for ActivateEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::Activate(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for DeactivateEvent { const DBUS_MEMBER: &'static str = "Deactivate"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Window"; @@ -551,18 +419,6 @@ impl GenericEvent<'_> for DeactivateEvent { } } -/* -impl TryFrom for DeactivateEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::Deactivate(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for RaiseEvent { const DBUS_MEMBER: &'static str = "Raise"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Window"; @@ -587,18 +443,6 @@ impl GenericEvent<'_> for RaiseEvent { } } -/* -impl TryFrom for RaiseEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::Raise(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for LowerEvent { const DBUS_MEMBER: &'static str = "Lower"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Window"; @@ -623,18 +467,6 @@ impl GenericEvent<'_> for LowerEvent { } } -/* -impl TryFrom for LowerEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::Lower(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for MoveEvent { const DBUS_MEMBER: &'static str = "Move"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Window"; @@ -659,18 +491,6 @@ impl GenericEvent<'_> for MoveEvent { } } -/* -impl TryFrom for MoveEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::Move(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for ResizeEvent { const DBUS_MEMBER: &'static str = "Resize"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Window"; @@ -695,18 +515,6 @@ impl GenericEvent<'_> for ResizeEvent { } } -/* -impl TryFrom for ResizeEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::Resize(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for ShadeEvent { const DBUS_MEMBER: &'static str = "Shade"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Window"; @@ -731,18 +539,6 @@ impl GenericEvent<'_> for ShadeEvent { } } -/* -impl TryFrom for ShadeEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::Shade(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for UUshadeEvent { const DBUS_MEMBER: &'static str = "uUshade"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Window"; @@ -767,18 +563,6 @@ impl GenericEvent<'_> for UUshadeEvent { } } -/* -impl TryFrom for UUshadeEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::UUshade(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - impl GenericEvent<'_> for RestyleEvent { const DBUS_MEMBER: &'static str = "Restyle"; const DBUS_INTERFACE: &'static str = "org.a11y.atspi.Event.Window"; @@ -803,18 +587,6 @@ impl GenericEvent<'_> for RestyleEvent { } } -/* -impl TryFrom for RestyleEvent { -type Error = AtspiError; -fn try_from(event: Event) -> Result { - if let Event::Window(WindowEvents::Restyle(inner_event)) = event { - Ok(inner_event) - } else { - Err(AtspiError::Conversion("Invalid type")) - } - } -}*/ - #[cfg(feature = "zbus")] impl TryFrom<&zbus::Message> for WindowEvents { type Error = AtspiError; @@ -1166,120 +938,6 @@ impl From for EventBodyOwned { } } -/*impl HasMatchRule for PropertyChangeEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='PropertyChange'"; -}*/ -/*impl HasMatchRule for MinimizeEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='Minimize'"; -}*/ -/*impl HasMatchRule for MaximizeEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='Maximize'"; -}*/ -/*impl HasMatchRule for RestoreEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='Restore'"; -}*/ -/*impl HasMatchRule for CloseEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='Close'"; -}*/ -/*impl HasMatchRule for CreateEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='Create'"; -}*/ -/*impl HasMatchRule for ReparentEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='Reparent'"; -}*/ -/*impl HasMatchRule for DesktopCreateEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='DesktopCreate'"; -}*/ -/*impl HasMatchRule for DesktopDestroyEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='DesktopDestroy'"; -}*/ -/*impl HasMatchRule for DestroyEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='Destroy'"; -}*/ -/*impl HasMatchRule for ActivateEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='Activate'"; -}*/ -/*impl HasMatchRule for DeactivateEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='Deactivate'"; -}*/ -/*impl HasMatchRule for RaiseEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='Raise'"; -}*/ -/*impl HasMatchRule for LowerEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='Lower'"; -}*/ -/*impl HasMatchRule for MoveEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='Move'"; -}*/ -/*impl HasMatchRule for ResizeEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='Resize'"; -}*/ -/*impl HasMatchRule for ShadeEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='Shade'"; -}*/ -/*impl HasMatchRule for UUshadeEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='uUshade'"; -}*/ -/*impl HasMatchRule for RestyleEvent { - const MATCH_RULE_STRING: &'static str = "type='signal',interface='org.a11y.atspi.Event.Window',member='Restyle'"; -}*/ -/*impl HasRegistryEventString for PropertyChangeEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:PropertyChange"; -}*/ -/*impl HasRegistryEventString for MinimizeEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:Minimize"; -}*/ -/*impl HasRegistryEventString for MaximizeEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:Maximize"; -}*/ -/*impl HasRegistryEventString for RestoreEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:Restore"; -}*/ -/*impl HasRegistryEventString for CloseEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:Close"; -}*/ -/*impl HasRegistryEventString for CreateEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:Create"; -}*/ -/*impl HasRegistryEventString for ReparentEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:Reparent"; -}*/ -/*impl HasRegistryEventString for DesktopCreateEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:DesktopCreate"; -}*/ -/*impl HasRegistryEventString for DesktopDestroyEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:DesktopDestroy"; -}*/ -/*impl HasRegistryEventString for DestroyEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:Destroy"; -}*/ -/*impl HasRegistryEventString for ActivateEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:Activate"; -}*/ -/*impl HasRegistryEventString for DeactivateEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:Deactivate"; -}*/ -/*impl HasRegistryEventString for RaiseEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:Raise"; -}*/ -/*impl HasRegistryEventString for LowerEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:Lower"; -}*/ -/*impl HasRegistryEventString for MoveEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:Move"; -}*/ -/*impl HasRegistryEventString for ResizeEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:Resize"; -}*/ -/*impl HasRegistryEventString for ShadeEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:Shade"; -}*/ -/*impl HasRegistryEventString for UUshadeEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:uUshade"; -}*/ -/*impl HasRegistryEventString for RestyleEvent { - const REGISTRY_EVENT_STRING: &'static str = "Window:Restyle"; -}*/ impl HasRegistryEventString for WindowEvents { const REGISTRY_EVENT_STRING: &'static str = "Window:"; }