Merge pull request #137 from ratijas/shorten-uses

Shorten paths and modernize imports

README.md

@@ -18,13 +18,11 @@ Presentation Blog Post: https://woboq.com/blog/qmetaobject-from-rust.html
 ## Overview
 
 ```rust
-#[macro_use] extern crate cstr;
-extern crate qmetaobject;
-
+use cstr::cstr;
 use qmetaobject::*;
 
 // The `QObject` custom derive macro allows to expose a class to Qt and QML
-#[derive(QObject,Default)]
+#[derive(QObject, Default)]
 struct Greeter {
     // Specify the base class with the qt_base_class macro
     base: qt_base_class!(trait QObject),

examples/graph/build.rs

@@ -15,7 +15,6 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FO
 OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-extern crate cpp_build;
 
 fn main() {
     let qt_include_path = std::env::var("DEP_QT_INCLUDE_PATH").unwrap();

examples/graph/src/main.rs

@@ -1,13 +1,11 @@
 #![allow(non_snake_case)]
 #![allow(unused_variables)]
-#[macro_use]
-extern crate qmetaobject;
+
+use cpp::cpp;
+use cstr::cstr;
+
 use qmetaobject::scenegraph::*;
 use qmetaobject::*;
-#[macro_use]
-extern crate cstr;
-#[macro_use]
-extern crate cpp;
 
 mod nodes;
 

examples/graph/src/nodes.rs

@@ -1,5 +1,8 @@
+use cpp::cpp;
+
 use qmetaobject::scenegraph::SGNode;
-use qmetaobject::{QColor, QQuickItem, QRectF};
+use qmetaobject::{qrc, QQuickItem};
+use qttypes::{QColor, QRectF};
 
 qrc! {
     init_resource,

examples/qmlextensionplugins/Cargo.toml

@@ -9,5 +9,6 @@ name = "qmlqtimeexampleplugin"
 crate-type = ["cdylib"]
 
 [dependencies]
-qmetaobject = { path = "../../qmetaobject"}
+qmetaobject = { path = "../../qmetaobject" }
 chrono = "^0.4"
+cstr = "0.2"

examples/qmlextensionplugins/src/lib.rs

@@ -1,10 +1,12 @@
-extern crate qmetaobject;
-use qmetaobject::*;
-extern crate chrono;
-use chrono::Timelike;
+use std::ffi::CStr;
 use std::sync::{Arc, Condvar, Mutex};
 use std::thread::JoinHandle;
 
+use chrono::Timelike;
+use cstr::cstr;
+
+use qmetaobject::*;
+
 #[derive(Default)]
 struct AbortCondVar {
     is_aborted: Mutex<bool>,
@@ -75,13 +77,8 @@ struct QExampleQmlPlugin {
 }
 
 impl QQmlExtensionPlugin for QExampleQmlPlugin {
-    fn register_types(&mut self, uri: &std::ffi::CStr) {
-        //assert_eq!(uri, std::ffi::CStr::from_bytes_with_nul(b"TimeExample\0"));
-        qml_register_type::<TimeModel>(
-            uri,
-            1,
-            0,
-            std::ffi::CStr::from_bytes_with_nul(b"Time\0").unwrap(),
-        );
+    fn register_types(&mut self, uri: &CStr) {
+        //assert_eq!(uri, cstr!("TimeExample"));
+        qml_register_type::<TimeModel>(uri, 1, 0, cstr!("Time"));
     }
 }

examples/todos/Cargo.toml

@@ -5,4 +5,5 @@ edition = "2018"
 authors = ["Olivier Goffart <ogoffart@woboq.com>"]
 
 [dependencies]
-qmetaobject = { path = "../../qmetaobject"}
+qmetaobject = { path = "../../qmetaobject" }
+cstr = "0.2"

examples/todos/src/implementation.rs

@@ -18,9 +18,10 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-use qmetaobject::*;
 use std::collections::HashMap;
 
+use qmetaobject::*;
+
 #[derive(Default, Clone)]
 struct TodosItem {
     completed: bool,

examples/todos/src/main.rs

@@ -1,7 +1,6 @@
-extern crate qmetaobject;
-use qmetaobject::*;
+use cstr::cstr;
 
-use std::ffi::CStr;
+use qmetaobject::*;
 
 mod implementation;
 
@@ -13,12 +12,7 @@ qrc!(my_resource,
 
 fn main() {
     my_resource();
-    qml_register_type::<implementation::Todos>(
-        CStr::from_bytes_with_nul(b"RustCode\0").unwrap(),
-        1,
-        0,
-        CStr::from_bytes_with_nul(b"Todos\0").unwrap(),
-    );
+    qml_register_type::<implementation::Todos>(cstr!("RustCode"), 1, 0, cstr!("Todos"));
     let mut engine = QmlEngine::new();
     engine.load_file("qrc:/todos/qml/main.qml".into());
     engine.exec();

examples/webengine/src/main.rs

@@ -1,4 +1,3 @@
-extern crate qmetaobject;
 use qmetaobject::*;
 
 qrc!(my_resource,

qmetaobject/src/connections.rs

@@ -84,6 +84,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #![deny(missing_docs)]
 use std::os::raw::c_void;
 
+use cpp::{cpp, cpp_class};
+
 use super::*;
 
 /// Inner functor type of a `QRustClosureSlotObject` class.
@@ -282,8 +284,9 @@ impl<Args> Signal<Args> {
     /// # Example
     ///
     /// ```
-    /// # #[macro_use] extern crate cpp;
-    /// # use qmetaobject::*;
+    /// use cpp::cpp;
+    /// use qmetaobject::*;
+    ///
     /// fn object_name_changed() -> Signal<fn(QString)> {
     ///     unsafe {
     ///         Signal::new(cpp!([] -> SignalInner as "SignalInner"  {

qmetaobject/src/future.rs

@@ -1,8 +1,11 @@
 use std::future::Future;
+use std::mem::replace;
 use std::os::raw::c_void;
 use std::pin::Pin;
 use std::task::{Context, Poll, RawWaker, RawWakerVTable, Waker};
 
+use cpp::cpp;
+
 use crate::connections::SignalArgArrayToTuple;
 
 static QT_WAKER_VTABLE: RawWakerVTable = RawWakerVTable::new(
@@ -90,7 +93,7 @@ cpp! {{
 
         ~Waker() {
             rust!(QtDestroyFuture [future: *mut dyn Future<Output = ()> as "TraitObject"] {
-                std::mem::drop(Box::from_raw(future))
+                drop(Box::from_raw(future));
             });
         }
     };
@@ -160,7 +163,7 @@ pub unsafe fn wait_on_signal<Args: SignalArgArrayToTuple>(
         type Output = <Args as SignalArgArrayToTuple>::Tuple;
         fn poll(mut self: Pin<&mut Self>, ctx: &mut Context) -> Poll<Self::Output> {
             let state = &mut self.0;
-            *state = match std::mem::replace(state, ConnectionFutureState::Invalid) {
+            *state = match replace(state, ConnectionFutureState::Invalid) {
                 ConnectionFutureState::Finished { result } => {
                     return Poll::Ready(result);
                 }
@@ -181,7 +184,7 @@ pub unsafe fn wait_on_signal<Args: SignalArgArrayToTuple>(
         for *mut ConnectionFutureState<Args>
     {
         unsafe fn apply(&mut self, a: *const *const c_void) {
-            if let ConnectionFutureState::Started { mut handle, waker } = std::mem::replace(
+            if let ConnectionFutureState::Started { mut handle, waker } = replace(
                 &mut **self,
                 ConnectionFutureState::Finished { result: Args::args_array_to_tuple(a) },
             ) {

qmetaobject/src/itemmodel.rs

@@ -15,9 +15,10 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FO
 OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-
 use std::collections::HashMap;
 
+use cpp::cpp;
+
 use crate::*;
 
 /// This trait allow to override a Qt QAbstractItemModel
@@ -58,6 +59,7 @@ pub trait QAbstractItemModel: QObject {
     fn role_names(&self) -> HashMap<i32, QByteArray> {
         HashMap::new()
     }
+
     /// Refer to the Qt documentation of QAbstractListModel::beginInsertRows
     fn begin_insert_rows(&self, parent: QModelIndex, first: i32, last: i32) {
         let obj = self.get_cpp_object();