Refactor Windows factory code

This commit is contained in:
Federico Terzi 2019-09-10 18:23:27 +02:00
parent 43a49ccc86
commit bbf07a0ac0
4 changed files with 13 additions and 19 deletions

View File

@ -25,9 +25,7 @@ pub fn get_manager() -> impl ClipboardManager {
// WINDOWS IMPLEMENTATION
#[cfg(target_os = "windows")]
pub fn get_manager() -> impl ClipboardManager {
let manager = windows::WindowsClipboardManager{};
manager.initialize();
manager
windows::WindowsClipboardManager::new()
}
// MAC IMPLEMENTATION

View File

@ -5,11 +5,13 @@ pub struct WindowsClipboardManager {
}
impl super::ClipboardManager for WindowsClipboardManager {
fn initialize(&self) {
// TODO: check if xclip is present and log an error otherwise.
impl WindowsClipboardManager {
pub fn new() -> WindowsClipboardManager {
WindowsClipboardManager{}
}
}
impl super::ClipboardManager for WindowsClipboardManager {
fn get_clipboard(&self) -> Option<String> {
unimplemented!();
}
@ -17,8 +19,4 @@ impl super::ClipboardManager for WindowsClipboardManager {
fn set_clipboard(&self, payload: &str) {
unimplemented!();
}
}
impl WindowsClipboardManager {
}

View File

@ -26,9 +26,7 @@ pub fn get_manager() -> impl SystemManager {
// WINDOWS IMPLEMENTATION
#[cfg(target_os = "windows")]
pub fn get_manager() -> impl SystemManager {
let manager = windows::WindowsSystemManager{};
manager.initialize();
manager
windows::WindowsSystemManager::new()
}
// MAC IMPLEMENTATION

View File

@ -5,6 +5,12 @@ pub struct WindowsSystemManager {
}
impl WindowsSystemManager {
pub fn new() -> WindowsSystemManager {
WindowsSystemManager{}
}
}
impl super::SystemManager for WindowsSystemManager {
fn get_current_window_title(&self) -> Option<String> {
unsafe {
@ -41,10 +47,4 @@ impl super::SystemManager for WindowsSystemManager {
None
}
}
unsafe impl Send for WindowsSystemManager {}
impl WindowsSystemManager {
}