Error fixes. Now it compiles.

[irwi] / src / remote.cpp

diff --git a/src/remote.cpp b/src/remote.cpp
index 9e9f80e..a545f6c 100644 (file)
--- a/src/remote.cpp
+++ b/src/remote.cpp
@@ -3,7 +3,6 @@
 #include <cstdlib>
 
 #include <QString>
-#include <QSettings>
 #include <QFile>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
@@ -25,6 +24,26 @@ Remote::Remote(const QString &name, const QString &mfg,
     init();
 }
 
+Remote::Remote(const Remote &r)
+    : m_name(r.m_name)
+    , m_mfg(r.m_mfg)
+    , m_rating(r.m_rating)
+    , m_voteCount(r.m_voteCount)
+{
+    init();
+}
+
+Remote &Remote::operator=(const Remote &other)
+{
+    if (this != &other) {
+        m_name = other.m_name;
+        m_mfg = other.m_mfg;
+        m_rating = other.m_rating;
+        m_voteCount = other.m_voteCount;
+    }
+    return *this;
+}
+
 void Remote::init()
 {
     connect(&m_remoteNAM, SIGNAL(finished(QNetworkReply*)),
@@ -35,21 +54,19 @@ void Remote::init()
 
 void Remote::saveToFile()
 {
-    QSettings settings;
     if (!m_name.isEmpty()) {
-        QString url = settings.value("remoteUrl",
+        QString url = m_settings.value("remoteUrl",
             "http://mercury.wipsl.com/irwi/uploaded/").toString()
             + m_name;
         m_remoteNAM.get(QNetworkRequest(QUrl(url)));
-        settings.setValue("remoteName", m_name);
+        m_settings.setValue("remoteName", m_name);
     }
 }
 
 void Remote::updateInfo()
 {
-    QSettings settings;
     if (!m_name.isEmpty()) {
-        QString url = settings.value("baseUrl",
+        QString url = m_settings.value("baseUrl",
             "http://mercury.wipsl.com/irwi/").toString()
             + "vote/get?name="
             + m_name;
@@ -59,10 +76,9 @@ void Remote::updateInfo()
 
 void Remote::sendRating(Rating::Rating r)
 {
-    QSettings settings;
     if (m_name != "") {
         m_ratingNAM.get(QNetworkRequest(QUrl(
-            settings.value("baseUrl",
+            m_settings.value("baseUrl",
                 "http://mercury.wipsl.com/irwi/db.xml").toString() 
             + "vote/"
             + ((r == Rating::Up) ? "up" : "down")
@@ -74,7 +90,7 @@ void Remote::sendRating(Rating::Rating r)
 void Remote::remoteDownloadFinished(QNetworkReply *reply)
 {
     if (reply->error() == QNetworkReply::NoError) {
-        QFile file(settings->value("lircConf", "/etc/lircd.conf").toString());
+        QFile file(m_settings.value("lircConf", "/etc/lircd.conf").toString());
         if(file.open(QIODevice::WriteOnly))
         {
             file.write(reply->readAll());
@@ -92,8 +108,8 @@ void Remote::remoteDownloadFinished(QNetworkReply *reply)
 void Remote::infoRequestFinished(QNetworkReply *reply)
 {
     if (reply->error() == QNetworkReply::NoError) {
-        m_rating    = QString(reply->readline(20)).toInt();
-        m_voteCount = QString(reply->readline(20)).toInt();
+        m_rating    = QString(reply->readLine(20)).toInt();
+        m_voteCount = QString(reply->readLine(20)).toInt();
     }
     reply->close();
     reply->deleteLater();