Make sure that all the tests are compiling and running.

Note that some tests are still failing.

4 files changed, 29 insertions, 43 deletions

diff --git a/src/qlistfromtreeadaptor.cpp b/src/qlistfromtreeadaptor.cpp
index b43342a..ddf5a3b 100644
--- a/src/qlistfromtreeadaptor.cpp
+++ b/src/qlistfromtreeadaptor.cpp
@@ -193,8 +193,8 @@ void QtListFromTreeAdaptor::setModel(QtTreeModelBase *model)
                             this, SLOT(_q_itemsInserted(const QtTreeModelBase::iterator_base&,int)));
         QObject::disconnect(d->model, SIGNAL(itemsRemoved(const QtTreeModelBase::iterator_base&,int)),
                             this, SLOT(_q_itemsRemoved(const QtTreeModelBase::iterator_base&,int)));
-        QObject::disconnect(d->model, SIGNAL(itemsChanged(const QtTreeModelBase::iterator_base&,int,QList<int>)),
-                            this, SLOT(_q_itemsChanged(const QtTreeModelBase::iterator_base&,int,QList<int>)));
+        QObject::disconnect(d->model, SIGNAL(itemsChanged(const QtTreeModelBase::iterator_base&,int,QList<QByteArray>)),
+                            this, SLOT(_q_itemsChanged(const QtTreeModelBase::iterator_base&,int,QList<QByteArray>)));
     }
     d->model = model;
     if (d->model) {
@@ -204,8 +204,8 @@ void QtListFromTreeAdaptor::setModel(QtTreeModelBase *model)
                          this, SLOT(_q_itemsInserted(const QtTreeModelBase::iterator_base&,int)));
         QObject::connect(d->model, SIGNAL(itemsRemoved(const QtTreeModelBase::iterator_base&,int)),
                          this, SLOT(_q_itemsRemoved(const QtTreeModelBase::iterator_base&,int)));
-        QObject::connect(d->model, SIGNAL(itemsChanged(const QtTreeModelBase::iterator_base&,int,QList<int>)),
-                         this, SLOT(_q_itemsChanged(const QtTreeModelBase::iterator_base&,int,QList<int>)));
+        QObject::connect(d->model, SIGNAL(itemsChanged(const QtTreeModelBase::iterator_base&,int,QList<QByteArray>)),
+                         this, SLOT(_q_itemsChanged(const QtTreeModelBase::iterator_base&,int,QList<QByteArray>)));
     }
 }
 
diff --git a/tests/qlistfromtreeadaptor/tst_qlistfromtreeadaptor.cpp b/tests/qlistfromtreeadaptor/tst_qlistfromtreeadaptor.cpp
index e0f131e..e28b054 100644
--- a/tests/qlistfromtreeadaptor/tst_qlistfromtreeadaptor.cpp
+++ b/tests/qlistfromtreeadaptor/tst_qlistfromtreeadaptor.cpp
@@ -53,13 +53,13 @@ protected:
     QtListFromTreeAdaptor *adaptor;
 };
 
-Q_DECLARE_METATYPE(QList<int>)
 Q_DECLARE_METATYPE(QList<bool>)
+Q_DECLARE_METATYPE(QList<QByteArray>)
 Q_DECLARE_METATYPE(QtTreeModelBase::iterator_base)
 
 tst_QtListFromTreeAdaptor::tst_QtListFromTreeAdaptor()
 {
-    qRegisterMetaType<QList<int> >("QList<int>");
+    qRegisterMetaType<QList<QByteArray> >("QList<QByteArray>");
     qRegisterMetaType<QtTreeModelBase::iterator_base>("const QtTreeModelBase::iterator_base&");
 }
 
@@ -93,7 +93,6 @@ void tst_QtListFromTreeAdaptor::count()
 {
     QFETCH(int, itemCount);
     QFETCH(int, signalCount);
-    int x;
 
     QSignalSpy sourceItemsInserted(source,
             SIGNAL(itemsInserted(const QtTreeModelBase::iterator_base&,int)));
@@ -103,18 +102,16 @@ void tst_QtListFromTreeAdaptor::count()
     QSignalSpy adaptorItemsInserted(adaptor, SIGNAL(itemsInserted(int,int)));
     QSignalSpy adaptorItemsRemoved(adaptor, SIGNAL(itemsRemoved(int,int)));
 
-    for (x = 0; x < itemCount; x++) {
+    for (int x = 0; x < itemCount; ++x)
         new QtTreeDefaultItem(QString::number(x), source->rootItem());
-    }
 
     QCOMPARE(source->rootItem()->children().count(), itemCount);
     QCOMPARE(source->rootItem()->children().count(), adaptor->count());
     QCOMPARE(sourceItemsInserted.count(), signalCount);
     QCOMPARE(adaptorItemsInserted.count(), signalCount);
 
-    foreach (QtTreeDefaultItem *item, source->rootItem()->children()) {
+    foreach (QtTreeDefaultItem *item, source->rootItem()->children())
         source->rootItem()->removeChild(item);
-    }
 
     QCOMPARE(sourceItemsRemoved.count(), signalCount);
     QCOMPARE(adaptorItemsRemoved.count(), signalCount);
@@ -135,15 +132,13 @@ void tst_QtListFromTreeAdaptor::parentCount()
     QFETCH(int, parentItemCount);
     QFETCH(int, childrenItemCount);
     QFETCH(int, signalCount);
-    int x, y;
 
-    QSignalSpy sourceItemsInserted(source,
-            SIGNAL(itemsInserted(const QtTreeModelBase::iterator_base&,int)));
+    QSignalSpy sourceItemsInserted(source, SIGNAL(itemsInserted(const QtTreeModelBase::iterator_base&,int)));
     QSignalSpy adaptorItemsInserted(adaptor, SIGNAL(itemsInserted(int,int)));
 
-    for (x = 0; x < parentItemCount; x++) {
+    for (int x = 0; x < parentItemCount; ++x) {
         QtTreeDefaultItem *item = new QtTreeDefaultItem(QString::number(x), source->rootItem());
-        for (y = 0; y < childrenItemCount; y++) {
+        for (int y = 0; y < childrenItemCount; ++y) {
             new QtTreeDefaultItem(QString::number(y), item);
         }
     }
@@ -151,9 +146,8 @@ void tst_QtListFromTreeAdaptor::parentCount()
     QCOMPARE(sourceItemsInserted.count(), (parentItemCount * childrenItemCount) + parentItemCount);
     QCOMPARE(adaptorItemsInserted.count(), signalCount);
 
-    foreach (QtTreeDefaultItem *item, source->rootItem()->children()) {
+    foreach (QtTreeDefaultItem *item, source->rootItem()->children())
         source->rootItem()->removeChild(item);
-    }
 }
 
 void tst_QtListFromTreeAdaptor::dataCheck_data()
@@ -177,21 +171,20 @@ void tst_QtListFromTreeAdaptor::dataCheck()
     for (x = 0; x < itemCount; x++) {
         new QtTreeDefaultItem(QString::number(x), source->rootItem());
 
-        QCOMPARE(source->rootItem()->children().at(x)->data(0, QList<QByteArray>() << "DisplayRole"),
-                 adaptor->data(x, QList<QByteArray>() << "DisplayRole"));
+        QCOMPARE(source->rootItem()->children().at(x)->data(0, QList<QByteArray>() << QByteArray("DisplayRole")),
+                 adaptor->data(x, QList<QByteArray>() << QByteArray("DisplayRole")));
 
-        source->rootItem()->children().at(x)->setData(QString("changed text"), 0, "DisplayRole");
+        source->rootItem()->children().at(x)->setData(QString("changed text"), 0, QByteArray("DisplayRole"));
 
-        QCOMPARE(source->rootItem()->children().at(x)->data(0, QList<QByteArray>() << "DisplayRole"),
-                 adaptor->data(x, QList<QByteArray>() << "DisplayRole"));
+        QCOMPARE(source->rootItem()->children().at(x)->data(0, QList<QByteArray>() << QByteArray("DisplayRole")),
+                 adaptor->data(x, QList<QByteArray>() << QByteArray("DisplayRole")));
     }
 
     QCOMPARE(sourceItemsChanged.count(), signalCount);
     QCOMPARE(adaptorItemsChanged.count(), signalCount);
 
-    foreach (QtTreeDefaultItem *item, source->rootItem()->children()) {
+    foreach (QtTreeDefaultItem *item, source->rootItem()->children())
         source->rootItem()->removeChild(item);
-    }
 }
 
 void tst_QtListFromTreeAdaptor::rootCheck_data()
@@ -204,28 +197,20 @@ void tst_QtListFromTreeAdaptor::rootCheck_data()
 void tst_QtListFromTreeAdaptor::rootCheck()
 {
     QFETCH(int, itemCount);
-    int x;
 
-    delete source;
-    delete adaptor;
-
-    source = new QtTreeDefaultModel;
+    QtTreeDefaultModel *source = new QtTreeDefaultModel;
 
-    QSignalSpy sourceItemsInserted(source,
-            SIGNAL(itemsInserted(const QtTreeModelBase::iterator_base&,int)));
+    QSignalSpy sourceItemsInserted(source, SIGNAL(itemsInserted(const QtTreeModelBase::iterator_base&,int)));
 
-    for (x = 0; x < itemCount; x++) {
+    for (int x = 0; x < itemCount; ++x)
         new QtTreeDefaultItem(QString::number(x), source->rootItem());
-    }
 
-    adaptor = new QtListFromTreeAdaptor(source,
-            source->itemIterator(source->rootItem()->firstChild()));
+    QtListFromTreeAdaptor *adaptor = new QtListFromTreeAdaptor(source, source->itemIterator(source->rootItem()->firstChild()));
 
     QSignalSpy adaptorItemsInserted(adaptor, SIGNAL(itemsInserted(int,int)));
 
-    for (x = 0; x < itemCount; x++) {
-        new QtTreeDefaultItem(QString::number(x), source->rootItem()->firstChild());
-    }
+    for (int y = 0; y < itemCount; ++y)
+        new QtTreeDefaultItem(QString::number(y), source->rootItem()->firstChild());
 
     QCOMPARE(sourceItemsInserted.count(), itemCount * itemCount);
     QCOMPARE(adaptorItemsInserted.count(), itemCount);
diff --git a/tests/qlistmodeladaptor/tst_qlistmodeladaptor.cpp b/tests/qlistmodeladaptor/tst_qlistmodeladaptor.cpp
index e8680f2..e04205c 100644
--- a/tests/qlistmodeladaptor/tst_qlistmodeladaptor.cpp
+++ b/tests/qlistmodeladaptor/tst_qlistmodeladaptor.cpp
@@ -116,13 +116,13 @@ void tst_QtListModelAdaptor::getData_data()
 
     QTest::newRow("no items")
             << QStringList()
-            << "DisplayRole"
+            << QByteArray("DisplayRole")
             << QStringList()
             << 0;
 
     QTest::newRow("three items")
             << (QStringList() << "one" << "two" << "three")
-            << "DisplayRole"
+            << QByteArray("DisplayRole")
             << (QStringList() << "four" << "five" << "six")
             << 3;
 }
@@ -161,13 +161,13 @@ void tst_QtListModelAdaptor::setData_data()
 
     QTest::newRow("no items")
             << QStringList()
-            << "DisplayRole"
+            << QByteArray("DisplayRole")
             << QStringList()
             << 0;
 
     QTest::newRow("three items")
             << (QStringList() << "one" << "two" << "three")
-            << "DisplayRole"
+            << QByteArray("DisplayRole")
             << (QStringList() << "four" << "five" << "six")
             << 3;
 }
diff --git a/tests/qtreeselectionmanager/tst_qtreeselectionmanager.cpp b/tests/qtreeselectionmanager/tst_qtreeselectionmanager.cpp
index bb33291..08ffd67 100644
--- a/tests/qtreeselectionmanager/tst_qtreeselectionmanager.cpp
+++ b/tests/qtreeselectionmanager/tst_qtreeselectionmanager.cpp
@@ -67,6 +67,7 @@ Q_DECLARE_METATYPE(QtTreeModelBase::iterator_base)
 
 tst_QtTreeSelectionManager::tst_QtTreeSelectionManager()
 {
+    qRegisterMetaType<QtTreeModelBase::iterator_base>("QtTreeModelBase::iterator_base");
 }
 
 tst_QtTreeSelectionManager::~tst_QtTreeSelectionManager()