Added missing model.h and some tests for remotelist

[irwi] / src / remotelist.cpp

diff --git a/src/remotelist.cpp b/src/remotelist.cpp
index e5352bf..7cfd34d 100644 (file)
--- a/src/remotelist.cpp
+++ b/src/remotelist.cpp
@@ -26,11 +26,11 @@ RemoteList::RemoteList(const QString &xmlFile)
     parse(xmlFile);   
 }
 
-RemoteList::RemoteList(QIODevice in)
+RemoteList::RemoteList(QIODevice &in)
 {
     QDomDocument doc;
-    doc.setContent(&in);
-    parse(doc);
+    if (doc.setContent(&in))
+        parse(doc);
 }
 
 RemoteList::~RemoteList()
@@ -56,12 +56,12 @@ bool RemoteList::isValid()
     return valid;
 }
 
-QList<QChar> RemoteList::letters()
+QStringList RemoteList::letters()
 {
     return mfgMap.keys();
 }
 
-QStringList RemoteList::manufacturers(const QChar &letter)
+QStringList RemoteList::manufacturers(const QString &letter)
 {
     return mfgMap.value(letter);
 }
@@ -107,9 +107,9 @@ void RemoteList::parse(QDomDocument &doc)
         }
     }
 
+    // TODO: more error handling
     valid = (mfgMap.size() > 0 &&
-             modelMap.size() > 0 &&
-             mfgMap.values().size() == modelMap.keys().size());
+             modelMap.size() > 0);
 }
 
 QStringList RemoteList::parseMfgs(QDomElement &charEl)