From e31b792996b7d8586c5f16b246d8e46cfab657af Mon Sep 17 00:00:00 2001
From: Jari Jarvi <t7jaja00@students.oamk.fi>
Date: Mon, 14 Jun 2010 14:01:14 +0300
Subject: [PATCH] RemoteList integration to SelectRemoteDlg

---
 src/advsettingsdlg.cpp  |    1 +
 src/selectremotedlg.cpp |   18 ++++++++----------
 src/src.pro             |    1 +
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/advsettingsdlg.cpp b/src/advsettingsdlg.cpp
index 16a0c89..014354e 100644
--- a/src/advsettingsdlg.cpp
+++ b/src/advsettingsdlg.cpp
@@ -85,6 +85,7 @@ void AdvSettingsDlg::setDefaults()
     settings->setValue("height", 147);
     settings->setValue("width", 250);
     settings->setValue("idleTimeout", 300);
+    settings->setValue("dbUrl", "http://mercury.wipsl.com/irwi/db.xml");
 }
 
 void AdvSettingsDlg::showResetQuery()
diff --git a/src/selectremotedlg.cpp b/src/selectremotedlg.cpp
index ce36cf2..898c6e1 100644
--- a/src/selectremotedlg.cpp
+++ b/src/selectremotedlg.cpp
@@ -22,6 +22,7 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QListWidgetItem>
+#include <QDomDocument>
 
 SelectRemoteDlg::SelectRemoteDlg(QWidget *parent)
     : QDialog(parent)
@@ -65,25 +66,19 @@ SelectRemoteDlg::SelectRemoteDlg(QWidget *parent)
     connect(remoteNetAM, SIGNAL(finished(QNetworkReply*)), 
             this,  SLOT(remoteDownloadFinished(QNetworkReply*)));
     beginDownload(settings->value("dbUrl", 
-                "http://mercury.wipsl.com/irwi/db.xml").toString, listNetAM); 
+                "http://mercury.wipsl.com/irwi/db.xml").toString(), listNetAM); 
 }
 
 SelectRemoteDlg::~SelectRemoteDlg()
 {
     delete layout;
-    layout = NULL;
     delete settings;
-    settings = NULL;
     delete listNetAM;
-    listNetAM = NULL;
     delete remoteNetAM;
-    remoteNetAM = NULL;
     delete deviceNameMap;
-    deviceNameMap = NULL;
     if (remoteList)
     {
         delete remoteList;
-        remoteList = NULL;
     }
 }
 
@@ -93,7 +88,8 @@ void SelectRemoteDlg::setBusy(bool busy)
     setEnabled(!busy);
 }
 
-void SelectRemoteDlg::beginDownload(const QString &url, QNetworkAccessManager *nam)
+void SelectRemoteDlg::beginDownload(const QString &url,
+                                    QNetworkAccessManager *nam)
 {
     nam->get(QNetworkRequest(QUrl(url)));
     setBusy(true);
@@ -117,8 +113,10 @@ void SelectRemoteDlg::listDownloadFinished(QNetworkReply *reply)
         QBuffer buf(&ba, this);
         buf.open(QIODevice::ReadOnly);
         buf.seek(0);
-        remoteList = new RemoteList(buf);
-        alist = remoteList->letters();
+        QDomDocument doc;
+        doc.setContent(&buf);
+        remoteList = new RemoteList(doc);
+        QStringList alist = remoteList->letters();
         for (int i = 0; i < alist.size(); ++i)
         {
             alphabetList->addItem(QString(alist[i]));
diff --git a/src/src.pro b/src/src.pro
index e0ad1a6..ad23e74 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -27,6 +27,7 @@ include(qmaemo5homescreenadaptor/qmaemo5homescreenadaptor.pri)
 
 
 QT += network
+QT += xml
 
 unix {
 #VARIABLES
-- 
1.7.9.5