transition paths to 2018 edition

Replaces all `extern crate ...` and especially #[macro_use] statements
with direct `use`s of relevant items.

Introduces cstr! crate & macro to examples, because we don't want our dear
users/readers to suffer with raw CStr nightmare:
    std::ffi::CStr::from_bytes_with_nul(b"...\0").unwrap()

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/nodes.rs

@@ -1,7 +1,8 @@
 use cpp::cpp;
 
 use qmetaobject::scenegraph::SGNode;
-use qmetaobject::{qrc, 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,7 +284,7 @@ impl<Args> Signal<Args> {
     /// # Example
     ///
     /// ```
-    /// #[macro_use] extern crate cpp;
+    /// use cpp::cpp;
     /// use qmetaobject::*;
     ///
     /// fn object_name_changed() -> Signal<fn(QString)> {

qmetaobject/src/future.rs

@@ -4,6 +4,8 @@ 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(

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();

qmetaobject/src/lib.rs

@@ -21,8 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     # Example:
 
     ```
-    #[macro_use] extern crate cstr;
-
+    use cstr::cstr;
     use qmetaobject::*;
 
     // The `QObject` custom derive macro allows to expose a class to Qt and QML
@@ -155,18 +154,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #![cfg_attr(feature = "cargo-clippy", allow(clippy::needless_pass_by_value))] // Too many of that for qt types. (FIXME)
 #![cfg_attr(feature = "cargo-clippy", allow(clippy::cognitive_complexity))]
 
-#[macro_use]
-extern crate cpp;
-
 #[doc(hidden)]
 pub use qmetaobject_impl::*;
 
 // In order to be able to use the lazy_static macro from the QObject custom derive, we re-export
 // it under a new name qmetaobject_lazy_static.
-extern crate lazy_static;
 #[allow(unused_imports)]
 #[doc(hidden)]
-pub use lazy_static::*;
+pub use lazy_static::lazy_static;
 #[doc(hidden)]
 #[macro_export]
 macro_rules! qmetaobject_lazy_static { ($($t:tt)*) => { lazy_static!($($t)*) } }
@@ -175,6 +170,8 @@ use std::cell::{RefCell, RefMut};
 use std::ffi::{CStr, CString};
 use std::os::raw::{c_char, c_void};
 
+use cpp::{cpp, cpp_class};
+
 pub use qttypes;
 
 pub use crate::log::*;

qmetaobject/src/listmodel.rs

@@ -16,11 +16,14 @@ OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-use super::*;
 use std::collections::HashMap;
 use std::iter::FromIterator;
 use std::ops::Index;
 
+use cpp::cpp;
+
+use super::*;
+
 /// This trait allow to override a Qt QAbstractListModel
 pub trait QAbstractListModel: QObject {
     /// Required for the implementation detail of the QObject custom derive

qmetaobject/src/log.rs

@@ -3,6 +3,8 @@
 use std::ffi::CStr;
 use std::os::raw::c_char;
 
+use cpp::{cpp, cpp_class};
+
 #[cfg(feature = "log")]
 use log::{logger, Level, Record, RecordBuilder};
 

qmetaobject/src/qmetatype.rs

@@ -15,6 +15,8 @@ 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 cpp::cpp;
+
 use super::*;
 
 fn register_metatype_common<T: QMetaType>(

qmetaobject/src/qrc.rs

@@ -15,6 +15,7 @@ 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 cpp::cpp;
 
 cpp! {{
 Q_CORE_EXPORT bool qRegisterResourceData(int, const unsigned char *,

qmetaobject/src/qtdeclarative.rs

@@ -15,6 +15,8 @@ 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 cpp::{cpp, cpp_class};
+
 use crate::scenegraph::*;
 use crate::*;
 

qmetaobject/src/scenegraph.rs

@@ -15,6 +15,7 @@ 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 cpp::cpp;
 
 use super::*;
 
@@ -118,7 +119,6 @@ impl SGNode<ContainerNode> {
     /// call reset() if you want to change the size.
     ///
     /// ```
-    /// extern crate qttypes;
     /// # use qmetaobject::{QObject, qtdeclarative::QQuickItem};
     /// use qmetaobject::scenegraph::{SGNode, ContainerNode, RectangleNode};
     /// use qttypes::QRectF;
@@ -181,7 +181,6 @@ impl SGNode<ContainerNode> {
     /// In this example, the node has two children node
     ///
     /// ```
-    /// extern crate qttypes;
     /// # use qmetaobject::{QObject, qtdeclarative::QQuickItem};
     /// use qmetaobject::scenegraph::{SGNode, ContainerNode, RectangleNode};
     /// use qttypes::QRectF;

qmetaobject/src/tablemodel.rs

@@ -1,6 +1,9 @@
-use super::*;
 use std::collections::HashMap;
 
+use cpp::cpp;
+
+use super::*;
+
 pub trait QAbstractTableModel: QObject {
     fn get_object_description() -> &'static QObjectDescription
     where

qmetaobject/src/webengine.rs

@@ -1,3 +1,5 @@
+use cpp::cpp;
+
 cpp! {{
 #include <QtWebEngine/QtWebEngine>
 }}

qmetaobject/tests/common/mod.rs

@@ -18,10 +18,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #![allow(dead_code)]
 
-use qmetaobject::*;
 use std::cell::RefCell;
 use std::sync::Mutex;
 
+use qmetaobject::*;
+
 lazy_static! {
     pub static ref TEST_MUTEX: Mutex<()> = Mutex::new(());
     pub static ref QML_LOGS: Mutex<Vec<String>> = Mutex::new(Vec::new());

qmetaobject/tests/models.rs

@@ -15,15 +15,13 @@ 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::cell::RefCell;
+use std::iter::FromIterator;
 
-extern crate qmetaobject;
 use qmetaobject::*;
 
 mod common;
-use common::*;
-
-use std::cell::RefCell;
-use std::iter::FromIterator;
+use self::common::*;
 
 #[test]
 fn simple_model() {