From 86fa1b58e5a44a1711e812ed1e56c0e2c6946eed Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 24 Sep 2015 09:11:59 +0200 Subject: Rename MonitorID -> MonitorId --- src/window.rs | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/window.rs') diff --git a/src/window.rs b/src/window.rs index 9d9aeff..d9386df 100644 --- a/src/window.rs +++ b/src/window.rs @@ -65,8 +65,8 @@ impl<'a> WindowBuilder<'a> { /// /// If you don't specify dimensions for the window, it will match the monitor's. #[inline] - pub fn with_fullscreen(mut self, monitor: MonitorID) -> WindowBuilder<'a> { - let MonitorID(monitor) = monitor; + pub fn with_fullscreen(mut self, monitor: MonitorId) -> WindowBuilder<'a> { + let MonitorId(monitor) = monitor; self.window.monitor = Some(monitor); self } @@ -611,15 +611,15 @@ impl<'a> Iterator for WaitEventsIterator<'a> { // Implementation note: we retreive the list once, then serve each element by one by one. // This may change in the future. pub struct AvailableMonitorsIter { - data: VecDequeIter, + data: VecDequeIter, } impl Iterator for AvailableMonitorsIter { - type Item = MonitorID; + type Item = MonitorId; #[inline] - fn next(&mut self) -> Option { - self.data.next().map(|id| MonitorID(id)) + fn next(&mut self) -> Option { + self.data.next().map(|id| MonitorId(id)) } #[inline] @@ -637,32 +637,32 @@ pub fn get_available_monitors() -> AvailableMonitorsIter { /// Returns the primary monitor of the system. #[inline] -pub fn get_primary_monitor() -> MonitorID { - MonitorID(platform::get_primary_monitor()) +pub fn get_primary_monitor() -> MonitorId { + MonitorId(platform::get_primary_monitor()) } /// Identifier for a monitor. -pub struct MonitorID(platform::MonitorID); +pub struct MonitorId(platform::MonitorId); -impl MonitorID { +impl MonitorId { /// Returns a human-readable name of the monitor. #[inline] pub fn get_name(&self) -> Option { - let &MonitorID(ref id) = self; + let &MonitorId(ref id) = self; id.get_name() } /// Returns the native platform identifier for this monitor. #[inline] pub fn get_native_identifier(&self) -> NativeMonitorId { - let &MonitorID(ref id) = self; + let &MonitorId(ref id) = self; id.get_native_identifier() } /// Returns the number of pixels currently displayed on the monitor. #[inline] pub fn get_dimensions(&self) -> (u32, u32) { - let &MonitorID(ref id) = self; + let &MonitorId(ref id) = self; id.get_dimensions() } } -- cgit v1.2.3