From 24a03873299e128aeb9ebf50677da5744942415a Mon Sep 17 00:00:00 2001
From: Jari Jarvi <t7jaja00@students.oamk.fi>
Date: Mon, 21 Jun 2010 10:23:54 +0300
Subject: [PATCH] Error fixes

---
 src/advsettingsdlg.cpp  |    2 +-
 src/remote.cpp          |    2 +-
 src/remote.h            |    6 ++++--
 src/remotedbmgr.cpp     |    1 +
 src/selectremotedlg.cpp |    5 +++--
 src/settingsdlg.cpp     |   12 ++++--------
 src/settingsdlg.h       |    5 ++++-
 7 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/advsettingsdlg.cpp b/src/advsettingsdlg.cpp
index 014354e..3549f74 100644
--- a/src/advsettingsdlg.cpp
+++ b/src/advsettingsdlg.cpp
@@ -85,7 +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");
+    settings->setValue("dbUrl", "http://mercury.wipsl.com/irwi/db/db.xml");
 }
 
 void AdvSettingsDlg::showResetQuery()
diff --git a/src/remote.cpp b/src/remote.cpp
index a545f6c..5c252e0 100644
--- a/src/remote.cpp
+++ b/src/remote.cpp
@@ -49,7 +49,7 @@ void Remote::init()
     connect(&m_remoteNAM, SIGNAL(finished(QNetworkReply*)),
             this, SLOT(remoteDownloadFinished(QNetworkReply*)));
     connect(&m_infoNAM, SIGNAL(finished(QNetworkReply*)),
-            this, SLOT(infoRequestFinished(QNetworkReply *reply)));
+            this, SLOT(infoRequestFinished(QNetworkReply *)));
 }
 
 void Remote::saveToFile()
diff --git a/src/remote.h b/src/remote.h
index 9f23019..39a6ee3 100644
--- a/src/remote.h
+++ b/src/remote.h
@@ -30,6 +30,10 @@ public slots:
     void updateInfo();
     void sendRating(Rating::Rating);
 
+private slots:
+    void remoteDownloadFinished(QNetworkReply *reply);
+    void infoRequestFinished(QNetworkReply *reply);
+
 signals:
     void infoUpdated();
 
@@ -45,8 +49,6 @@ private:
     QNetworkAccessManager m_ratingNAM;
 
     void init();
-    void remoteDownloadFinished(QNetworkReply *reply);
-    void infoRequestFinished(QNetworkReply *reply);
 };
 
 #endif
diff --git a/src/remotedbmgr.cpp b/src/remotedbmgr.cpp
index 3e517e4..0ea4232 100644
--- a/src/remotedbmgr.cpp
+++ b/src/remotedbmgr.cpp
@@ -9,6 +9,7 @@
 #include <QNetworkRequest>
 #include <QBuffer>
 #include <QByteArray>
+#include <QDebug>
 
 RemoteDBMgr::RemoteDBMgr()
 {
diff --git a/src/selectremotedlg.cpp b/src/selectremotedlg.cpp
index e4f1b74..30e86cd 100644
--- a/src/selectremotedlg.cpp
+++ b/src/selectremotedlg.cpp
@@ -46,7 +46,7 @@ SelectRemoteDlg::SelectRemoteDlg(QWidget *parent)
             this, SLOT(downloadRemote()));
 
     this->setLayout(layout);
-    connect(&remoteDBMgr, SIGNAL(RemoteDBMgr::dbReady(RemoteDB*)),
+    connect(&remoteDBMgr, SIGNAL(dbReady(RemoteDB*)),
             this, SLOT(setDB(RemoteDB*)));
     remoteDBMgr.getDBAsync();
     setBusy(true);
@@ -97,7 +97,8 @@ void SelectRemoteDlg::mfgItemChanged(QListWidgetItem *current,
 
 void SelectRemoteDlg::downloadRemote()
 {
-    RemoteListWidgetItem *currentModel = static_cast<RemoteListWidgetItem *>(modelList->currentItem());
+    RemoteListWidgetItem *currentModel =
+        static_cast<RemoteListWidgetItem *>(modelList->currentItem());
     if (currentModel)
     {
         currentModel->remote().saveToFile();
diff --git a/src/settingsdlg.cpp b/src/settingsdlg.cpp
index 6a1786e..39a21d5 100644
--- a/src/settingsdlg.cpp
+++ b/src/settingsdlg.cpp
@@ -9,7 +9,6 @@
 #include <QWidget>
 #include <QDialog>
 #include <QPushButton>
-#include <QSettings>
 #include <QLabel>
 #include <QDebug>
 
@@ -17,8 +16,6 @@ SettingsDlg::SettingsDlg(QWidget *parent)
     : QDialog(parent)
     , remote(NULL)
 {
-    QSettings settings(this);
-
     layout = new QVBoxLayout(this);
     btnLayout = new QHBoxLayout(this);
     remoteNameLayout = new QHBoxLayout(this);
@@ -69,7 +66,7 @@ SettingsDlg::SettingsDlg(QWidget *parent)
     }
     else
     {
-        changeRemote(selectedRemote);
+        changeRemote();
     }
 
     layout->addLayout(remoteNameLayout);
@@ -104,8 +101,7 @@ void SettingsDlg::showAdvSettingsDlg()
 void SettingsDlg::showSelectRemoteDlg()
 {
     SelectRemoteDlg dlg(this);
-    connect(&dlg, SIGNAL(remoteChanged(QString)), 
-            this, SLOT(updateRemoteInfo(QString)));
+    changeRemote();
     dlg.exec();
 }
 
@@ -115,13 +111,13 @@ void SettingsDlg::showAboutDlg()
     dlg.exec();
 }
 
-void SettingsDlg::changeRemote(const QString &name)
+void SettingsDlg::changeRemote()
 {
     if (remote)
     {
         delete remote;
     }
-    remote = new Remote(name);
+    remote = new Remote(settings.value("remoteName", "").toString());
     connect(remote, SIGNAL(infoUpdated()),
             this, SLOT(updateRemoteInfo()));
     remote->updateInfo();
diff --git a/src/settingsdlg.h b/src/settingsdlg.h
index 25fbab9..0f08d80 100644
--- a/src/settingsdlg.h
+++ b/src/settingsdlg.h
@@ -2,6 +2,7 @@
 #define SETTINGSDLG_H
 
 #include <QDialog>
+#include <QSettings>
 
 class QWidget;
 class QHBoxLayout;
@@ -21,7 +22,7 @@ private slots:
     void showAdvSettingsDlg();
     void showSelectRemoteDlg();
     void showAboutDlg();
-    void changeRemote(const QString &name);
+    void changeRemote();
     void updateRemoteInfo();
     void rateUpClicked();
     void rateDownClicked();
@@ -30,6 +31,8 @@ private:
     void enableRateBtns(bool enable = true);
 
 private:
+    QSettings settings;
+
     QVBoxLayout *layout;
     QHBoxLayout *btnLayout;
     QHBoxLayout *remoteNameLayout;
-- 
1.7.9.5