Rename the qt/widgets.rs to qt/qt_widgets.rs

there are other files wih widgets in their name, so disambiguate
This commit is contained in:
Olivier Goffart 2021-08-06 18:48:58 +02:00
parent fb5be2ed8a
commit 3d7ce0fed8
2 changed files with 16 additions and 16 deletions

View file

@ -24,9 +24,9 @@ use sixtyfps_corelib::items::ImageFit;
use sixtyfps_corelib::window::Window; use sixtyfps_corelib::window::Window;
#[cfg(not(no_qt))] #[cfg(not(no_qt))]
mod qt_window; mod qt_widgets;
#[cfg(not(no_qt))] #[cfg(not(no_qt))]
mod widgets; mod qt_window;
mod key_generated; mod key_generated;
@ -41,7 +41,7 @@ pub fn use_modules() -> usize {
#[cfg(not(no_qt))] #[cfg(not(no_qt))]
{ {
qt_window::ffi::sixtyfps_qt_get_widget as usize qt_window::ffi::sixtyfps_qt_get_widget as usize
+ (&widgets::NativeButtonVTable) as *const _ as usize + (&qt_widgets::NativeButtonVTable) as *const _ as usize
} }
} }
@ -78,28 +78,28 @@ mod ffi {
#[cfg(not(no_qt))] #[cfg(not(no_qt))]
#[rustfmt::skip] #[rustfmt::skip]
pub type NativeWidgets = pub type NativeWidgets =
(widgets::NativeButton, (qt_widgets::NativeButton,
(widgets::NativeCheckBox, (qt_widgets::NativeCheckBox,
(widgets::NativeSlider, (qt_widgets::NativeSlider,
(widgets::NativeSpinBox, (qt_widgets::NativeSpinBox,
(widgets::NativeGroupBox, (qt_widgets::NativeGroupBox,
(widgets::NativeLineEdit, (qt_widgets::NativeLineEdit,
(widgets::NativeScrollView, (qt_widgets::NativeScrollView,
(widgets::NativeStandardListViewItem, (qt_widgets::NativeStandardListViewItem,
(widgets::NativeComboBox, (qt_widgets::NativeComboBox,
(widgets::NativeTabWidget, (qt_widgets::NativeTabWidget,
(widgets::NativeTab, (qt_widgets::NativeTab,
()))))))))))); ())))))))))));
#[cfg(not(no_qt))] #[cfg(not(no_qt))]
#[rustfmt::skip] #[rustfmt::skip]
pub type NativeGlobals = pub type NativeGlobals =
(widgets::NativeStyleMetrics, (qt_widgets::NativeStyleMetrics,
()); ());
pub mod native_widgets { pub mod native_widgets {
#[cfg(not(no_qt))] #[cfg(not(no_qt))]
pub use super::widgets::*; pub use super::qt_widgets::*;
} }
#[cfg(no_qt)] #[cfg(no_qt)]