Merge pull request #84 from ratijas/cosmit

Cosmit

Author: ogoffart

examples/graph/src/main.qml

@@ -49,7 +49,6 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-
 import Graph 1.0
 
 Item {
@@ -70,7 +69,7 @@ Item {
                 appendSample(newSample(i));
         }
 
-        property int offset: 100;
+        property int offset: 100
     }
 
     Timer {
@@ -82,7 +81,6 @@ Item {
             graph.removeFirstSample();
             graph.appendSample(graph.newSample(++graph.offset));
         }
-
     }
 
     Rectangle {
@@ -91,5 +89,4 @@ Item {
         border.color: "black"
         border.width: 2
     }
-
 }

examples/qmlextensionplugins/README

@@ -1,5 +1,5 @@
-This example is showing that you can use plugins with qml builder.
-It is base on the `qmlextensionplugins` example found in the qtdeclarative
+This example shows how you can use plugins with qml builder.
+It is based on the `qmlextensionplugins` example found in the qtdeclarative
 source code. It needs the QML files from that example in the Qt source tree.
 
 Build with:

examples/qmlextensionplugins/src/lib.rs

@@ -46,7 +46,7 @@ impl TimeModel {
                 if *lock {
                     break;
                 }
-                // We just wait on the condition variable for 1 second to similate a one second timer
+                // We just wait on the condition variable for 1 second to simulate a one second timer
                 let lock = arc2
                     .abort_condvar
                     .wait_timeout(lock, std::time::Duration::from_millis(1000))

examples/todos/README

@@ -2,5 +2,3 @@ This example is based on a rust-qt-binding-generator example from Jos van den Oe
 https://github.com/KDE/rust-qt-binding-generator/tree/9822dcef071f8c6d6ec2f6b39bab436613493221/examples/todos
 The file main.qml is imported unmodified, and the file implementation.rs was used and adapted to
 the qmetaobject crate
-
-

examples/todos/main.qml

@@ -22,7 +22,7 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
-import RustCode 1.0;
+import RustCode 1.0
 
 ApplicationWindow {
     visible: true

examples/todos/src/main.rs

@@ -7,7 +7,6 @@ mod implementation;
 
 qrc!(my_resource,
     "todos/qml" {
-      //  "../main.qml" as "main.qml",
         "main.qml",
     },
 );

qmetaobject/src/lib.rs

@@ -168,9 +168,6 @@ pub use lazy_static::*;
 #[macro_export]
 macro_rules! qmetaobject_lazy_static { ($($t:tt)*) => { lazy_static!($($t)*) } }
 
-//#[macro_use]
-//extern crate bitflags;
-
 use std::cell::RefCell;
 use std::os::raw::{c_char, c_void};
 

qmetaobject/tests/models.rs

@@ -32,23 +32,25 @@ fn simple_model() {
         pub a: QString,
         pub b: u32,
     }
-    // FIXME! why vec! here?
     let model: qmetaobject::listmodel::SimpleListModel<TM> =
-        (vec![TM { a: "hello".into(), b: 1 }]).into_iter().collect();
+        std::iter::once(TM { a: "hello".into(), b: 42 }).collect();
     assert!(do_test(
         model,
-        "Item {
-            Repeater{
+        "
+        Item {
+            Repeater {
                 id: rep;
-                model:_obj;
+                model: _obj
                 Text {
-                    text: a + b;
+                    text: a + b
                 }
             }
             function doTest() {
                 console.log('simple_model:', rep.count, rep.itemAt(0).text);
-                return rep.count === 1 && rep.itemAt(0).text === 'hello1';
-            }}"
+                return rep.count === 1 && rep.itemAt(0).text === 'hello42';
+            }
+        }
+        "
     ));
 }
 
@@ -86,19 +88,25 @@ fn simple_model_remove() {
 
     assert!(do_test(
         obj,
-        "Item {
+        "
+        Item {
             Repeater{
-                id: rep;
-                model:_obj.list;
+                id: rep
+                model: _obj.list
                 Text {
-                    text: val;
+                    text: val
                 }
             }
             function doTest() {
                 _obj.remove(1);
                 console.log('simple_model_remove', rep.count, rep.itemAt(0).text, rep.itemAt(1).text, rep.itemAt(2).text);
-                return rep.count === 3 && rep.itemAt(0).text === '10' && rep.itemAt(1).text === '12'  && rep.itemAt(2).text === '13';
-            }}"
+                return rep.count === 3
+                    && rep.itemAt(0).text === '10'
+                    && rep.itemAt(1).text === '12'
+                    && rep.itemAt(2).text === '13';
+            }
+        }
+        "
     ));
 }