Browse Source

Code clean up

adaptive-webui-19844
Christophe Dumez 13 years ago
parent
commit
a2d9cce181
  1. 2
      src/dnsupdater.cpp
  2. 2
      src/preferences/options_imp.cpp
  3. 2
      src/qtlibtorrent/qbtsession.cpp
  4. 16
      src/rss/rssfeed.cpp
  5. 1
      src/rss/rssfeed.h

2
src/dnsupdater.cpp

@ -175,7 +175,7 @@ void DNSUpdater::processIPUpdateReply(const QString &reply) @@ -175,7 +175,7 @@ void DNSUpdater::processIPUpdateReply(const QString &reply)
QString code = reply.split(" ").first();
qDebug() << Q_FUNC_INFO << "Code:" << code;
if (code == "good" || code == "nochg") {
QBtSession::instance()->addConsoleMessage(tr("Your dynamic DNS was successfuly updated."), "green");
QBtSession::instance()->addConsoleMessage(tr("Your dynamic DNS was successfully updated."), "green");
return;
}
if (code == "911" || code == "dnserr") {

2
src/preferences/options_imp.cpp

@ -1221,7 +1221,7 @@ void options_imp::handleIPFilterParsed(bool error, int ruleCount) @@ -1221,7 +1221,7 @@ void options_imp::handleIPFilterParsed(bool error, int ruleCount)
if (error) {
QMessageBox::warning(this, tr("Parsing error"), tr("Failed to parse the provided IP filter"));
} else {
QMessageBox::information(this, tr("Successfully refreshed"), tr("Successfuly parsed the provided IP filter: %1 rules were applied.", "%1 is a number").arg(ruleCount));
QMessageBox::information(this, tr("Successfully refreshed"), tr("Successfully parsed the provided IP filter: %1 rules were applied.", "%1 is a number").arg(ruleCount));
}
m_refreshingIpFilter = false;
disconnect(QBtSession::instance(), SIGNAL(ipFilterParsed(bool, int)), this, SLOT(handleIPFilterParsed(bool, int)));

2
src/qtlibtorrent/qbtsession.cpp

@ -2775,7 +2775,7 @@ qlonglong QBtSession::getETA(const QString &hash) const @@ -2775,7 +2775,7 @@ qlonglong QBtSession::getETA(const QString &hash) const
void QBtSession::handleIPFilterParsed(int ruleCount)
{
addConsoleMessage(tr("Successfuly parsed the provided IP filter: %1 rules were applied.", "%1 is a number").arg(ruleCount));
addConsoleMessage(tr("Successfully parsed the provided IP filter: %1 rules were applied.", "%1 is a number").arg(ruleCount));
emit ipFilterParsed(false, ruleCount);
}

16
src/rss/rssfeed.cpp

@ -120,10 +120,6 @@ void RssFeed::removeAllSettings() { @@ -120,10 +120,6 @@ void RssFeed::removeAllSettings() {
}
}
bool RssFeed::itemAlreadyExists(const QString &guid) const {
return m_articles.contains(guid);
}
void RssFeed::setLoading(bool val) {
m_loading = val;
}
@ -231,8 +227,12 @@ void RssFeed::parseRSSChannel(QXmlStreamReader& xml) @@ -231,8 +227,12 @@ void RssFeed::parseRSSChannel(QXmlStreamReader& xml)
}
else if (xml.name() == "item") {
RssArticlePtr article = xmlToRssArticle(this, xml);
if (article && !itemAlreadyExists(article->guid()))
m_articles.insert(article->guid(), article);
if (article) {
QString guid = article->guid();
if (m_articles.contains(guid) && m_articles[guid]->isRead())
article->markAsRead();
m_articles[guid] = article;
}
} else
xml.skipCurrentElement();
}
@ -335,14 +335,14 @@ bool RssFeed::parseXmlFile(const QString &file_path) { @@ -335,14 +335,14 @@ bool RssFeed::parseXmlFile(const QString &file_path) {
// read and store the downloaded rss' informations
void RssFeed::handleFinishedDownload(const QString& url, const QString &file_path) {
if (url == m_url) {
qDebug() << Q_FUNC_INFO << "Successfuly downloaded RSS feed at" << url;
qDebug() << Q_FUNC_INFO << "Successfully downloaded RSS feed at" << url;
m_downloadFailure = false;
m_loading = false;
// Parse the download RSS
if (parseXmlFile(file_path)) {
m_refreshed = true;
m_manager->forwardFeedInfosChanged(m_url, displayName(), unreadCount()); // XXX: Ugly
qDebug() << Q_FUNC_INFO << "Feed parsed successfuly";
qDebug() << Q_FUNC_INFO << "Feed parsed successfully";
}
}
else if (url == m_iconUrl) {

1
src/rss/rssfeed.h

@ -55,7 +55,6 @@ public: @@ -55,7 +55,6 @@ public:
void refresh();
virtual QString id() const { return m_url; }
virtual void removeAllSettings();
bool itemAlreadyExists(const QString &guid) const;
virtual void saveItemsToDisk();
void setLoading(bool val);
bool isLoading() const;

Loading…
Cancel
Save