diff utilities/widgettest/widgettest.cpp @ 31:07efb25d24d6

* Merge revs 7200-7222 from SVN (update use of loader API, switch to using mapper for merge operation)
author Chris Cannam
date Thu, 18 Mar 2010 16:59:24 +0000
parents 8bed05455706
children add3570c6035
line wrap: on
line diff
--- a/utilities/widgettest/widgettest.cpp	Tue Mar 16 17:36:28 2010 +0000
+++ b/utilities/widgettest/widgettest.cpp	Thu Mar 18 16:59:24 2010 +0000
@@ -84,17 +84,21 @@
     loader->setTypeMapping(tm);
 
     if (!load(store, inFileName)) {
-	cerr << "Failed to load data source" << endl;
-	return 1;
+        cerr << "Failed to load data source" << endl;
+        return 1;
     }
 
     cerr << "Imported RDF data, mapping to objects...";
-    QObject *root = loader->loadAllObjects(0);
+    QObjectList objects = loader->loadAll();
     cerr << " done" << endl;
 
     delete loader;
 
-    QList<Composer *> composers = root->findChildren<Composer *>();
+    QList<Composer *> composers;
+    foreach (QObject *o, objects) {
+        Composer *c = qobject_cast<Composer *>(o);
+        if (c) composers.push_back(c);
+    }
     ComposerTypingThoroughMatcher matcher(composers);
 
     TypingSelectWidget *w = new TypingSelectWidget();