Skip to content

Commit 84a9289

Browse files
rubdosogoffart
authored andcommitted
Introduce prelude
1 parent 93edcc7 commit 84a9289

File tree

6 files changed

+20
-9
lines changed

6 files changed

+20
-9
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Presentation Blog Post: https://woboq.com/blog/qmetaobject-from-rust.html
1919

2020
```rust
2121
use cstr::cstr;
22-
use qmetaobject::*;
22+
use qmetaobject::prelude::*;
2323

2424
// The `QObject` custom derive macro allows to expose a class to Qt and QML
2525
#[derive(QObject, Default)]

examples/graph/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
use cpp::cpp;
55
use cstr::cstr;
66

7+
use qmetaobject::prelude::*;
78
use qmetaobject::scenegraph::*;
8-
use qmetaobject::*;
99

1010
mod nodes;
1111

examples/qmlextensionplugins/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::thread::JoinHandle;
55
use chrono::Timelike;
66
use cstr::cstr;
77

8-
use qmetaobject::*;
8+
use qmetaobject::prelude::*;
99

1010
#[derive(Default)]
1111
struct AbortCondVar {

examples/todos/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use cstr::cstr;
22

3-
use qmetaobject::*;
3+
use qmetaobject::prelude::*;
44

55
mod implementation;
66

examples/webengine/src/main.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
use qmetaobject::*;
1+
use qmetaobject::prelude::*;
2+
use qmetaobject::webengine;
23

34
qrc!(my_resource,
45
"webengine" {

qmetaobject/src/lib.rs

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2222
2323
```
2424
use cstr::cstr;
25-
use qmetaobject::*;
25+
use qmetaobject::prelude::*;
2626
2727
// The `QObject` custom derive macro allows to expose a class to Qt and QML
2828
#[derive(QObject,Default)]
@@ -114,7 +114,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
114114
This can be done like so:
115115
116116
```
117-
use qmetaobject::*;
117+
use qmetaobject::prelude::*;
118118
# use std::cell::RefCell;
119119
120120
#[derive(QObject, Default)]
@@ -124,7 +124,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
124124
result_changed: qt_signal!(),
125125
recompute_result: qt_method!(fn recompute_result(&self, name: String) {
126126
let qptr = QPointer::from(&*self);
127-
let set_value = queued_callback(move |val: QString| {
127+
let set_value = qmetaobject::queued_callback(move |val: QString| {
128128
qptr.as_pinned().map(|this| {
129129
this.borrow_mut().result = val;
130130
this.borrow().result_changed();
@@ -139,7 +139,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
139139
}
140140
# let obj = RefCell::new(MyAsyncObject::default());
141141
# let mut engine = QmlEngine::new();
142-
# unsafe { connect(
142+
# unsafe { qmetaobject::connect(
143143
# QObject::cpp_construct(&obj),
144144
# obj.borrow().result_changed.to_cpp_representation(&*obj.borrow()),
145145
# || engine.quit()
@@ -209,6 +209,16 @@ pub mod tablemodel;
209209
#[cfg(feature = "webengine")]
210210
pub mod webengine;
211211

212+
/// Module intended for glob import.
213+
pub mod prelude {
214+
pub use crate::{
215+
qml_register_type, qrc, qt_base_class, qt_method, qt_plugin, qt_property, qt_signal,
216+
QAbstractListModel, QByteArray, QColor, QDate, QDateTime, QModelIndex, QObject, QObjectBox,
217+
QPointer, QQmlExtensionPlugin, QQuickItem, QQuickView, QRectF, QString, QTime, QVariant,
218+
QmlEngine,
219+
};
220+
}
221+
212222
cpp! {{
213223
#include <qmetaobject_rust.hpp>
214224
}}

0 commit comments

Comments
 (0)