Merge branch 'master' of ssh://mercury.wipsl.com/var/git/irwi

Conflicts:
	src/remote.cpp

diff --git a/src/remote.cpp b/src/remote.cpp
index a10deff..9e9f80e 100644 (file)
--- a/src/remote.cpp
+++ b/src/remote.cpp
@@ -10,7 +10,7 @@
 #include <QNetworkReply>
 #include <QUrl>
 
-Remote::Remote(const Remote::QString &name)
+Remote::Remote(const QString &name)
     : m_name(name)
 {
     init();
@@ -37,7 +37,9 @@ void Remote::saveToFile()
 {
     QSettings settings;
     if (!m_name.isEmpty()) {
-        QString url = settings.value("remoteUrl", "http://mercury.wipsl.com/irwi/uploaded/").toString() + m_name;
+        QString url = settings.value("remoteUrl",
+            "http://mercury.wipsl.com/irwi/uploaded/").toString()
+            + m_name;
         m_remoteNAM.get(QNetworkRequest(QUrl(url)));
         settings.setValue("remoteName", m_name);
     }
@@ -47,7 +49,10 @@ void Remote::updateInfo()
 {
     QSettings settings;
     if (!m_name.isEmpty()) {
-        QString url = settings.value("baseUrl", "http://mercury.wipsl.com/irwi/").toString() + "vote/get?name=" + m_name;
+        QString url = settings.value("baseUrl",
+            "http://mercury.wipsl.com/irwi/").toString()
+            + "vote/get?name="
+            + m_name;
         m_infoNAM.get(QNetworkRequest(QUrl(url)));
     }
 }
@@ -55,14 +60,15 @@ void Remote::updateInfo()
 void Remote::sendRating(Rating::Rating r)
 {
     QSettings settings;
-    if (!m_name.isEmpty()) {
+    if (m_name != "") {
         m_ratingNAM.get(QNetworkRequest(QUrl(
-              settings.value("baseUrl").toString() 
-                + "vote/"
-                + r == Rating::Up ? "up" : "down"
-                + "?name=" 
-                + m_name )));
-    }
+            settings.value("baseUrl",
+                "http://mercury.wipsl.com/irwi/db.xml").toString() 
+            + "vote/"
+            + ((r == Rating::Up) ? "up" : "down")
+            + "?name=" 
+            + m_name)));
+   }
 }
 
 void Remote::remoteDownloadFinished(QNetworkReply *reply)

diff --git a/src/remote.h b/src/remote.h
index a104ff1..4619246 100644 (file)
--- a/src/remote.h
+++ b/src/remote.h
@@ -12,7 +12,7 @@ namespace Rating {
     Rating Down = false;
 }
 
-class Remote
+class Remote : public QObject
 {
     Q_OBJECT
 public:
@@ -46,8 +46,8 @@ private:
 
     void init();
     
-    void Remote::remoteDownloadFinished(QNetworkReply *reply);
-    void Remote::infoRequestFinished(QNetworkReply *reply);
+    void remoteDownloadFinished(QNetworkReply *reply);
+    void infoRequestFinished(QNetworkReply *reply);
 };
 
 #endif