Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorTorste Aikio <zokier@zokier.laptop>
Tue, 29 Jun 2010 12:46:01 +0000 (15:46 +0300)
committerTorste Aikio <zokier@zokier.laptop>
Tue, 29 Jun 2010 12:46:01 +0000 (15:46 +0300)
1  2 
src/remote.cpp

diff --combined src/remote.cpp
@@@ -62,6 -62,14 +62,14 @@@ Remote &Remote::operator=(const Remote 
      return *this;
  }
  
+ bool Remote::operator==(const Remote &other) const
+ {
+     return (m_name == other.m_name &&
+             m_mfg == other.m_mfg &&
+             m_rating == other.m_rating &&
+             m_voteCount == other.m_voteCount);
+ }
  void Remote::saveToFile()
  {
      if (!m_name.isEmpty()) {
@@@ -137,7 -145,7 +145,7 @@@ void Remote::infoRequestFinished(QNetwo
      if (reply->error() == QNetworkReply::NoError) {
          m_rating    = QString(reply->readLine(20)).toInt();
          m_voteCount = QString(reply->readLine(20)).toInt();
 -        m_mfg       = QString(reply->readLine(20));
 +        m_mfg       = QString(reply->readLine(20)).trimmed();
      }
      reply->close();
      reply->deleteLater();