diff --git a/launcher/news/NewsEntry.cpp b/launcher/news/NewsEntry.cpp index 7eff657b..137703d1 100644 --- a/launcher/news/NewsEntry.cpp +++ b/launcher/news/NewsEntry.cpp @@ -24,18 +24,14 @@ NewsEntry::NewsEntry(QObject* parent) : this->title = tr("Untitled"); this->content = tr("No content."); this->link = ""; - this->author = tr("Unknown Author"); - this->pubDate = QDateTime::currentDateTime(); } -NewsEntry::NewsEntry(const QString& title, const QString& content, const QString& link, const QString& author, const QDateTime& pubDate, QObject* parent) : +NewsEntry::NewsEntry(const QString& title, const QString& content, const QString& link, QObject* parent) : QObject(parent) { this->title = title; this->content = content; this->link = link; - this->author = author; - this->pubDate = pubDate; } /*! @@ -59,19 +55,11 @@ bool NewsEntry::fromXmlElement(const QDomElement& element, NewsEntry* entry, QSt { QString title = childValue(element, "title", tr("Untitled")); QString content = childValue(element, "description", tr("No content.")); - QString link = childValue(element, "link"); - QString author = childValue(element, "dc:creator", tr("Unknown Author")); - QString pubDateStr = childValue(element, "pubDate"); - - // FIXME: For now, we're just ignoring timezones. We assume that all time zones in the RSS feed are the same. - QString dateFormat("ddd, dd MMM yyyy hh:mm:ss"); - QDateTime pubDate = QDateTime::fromString(pubDateStr, dateFormat); + QString link = childValue(element, "id"); entry->title = title; entry->content = content; entry->link = link; - entry->author = author; - entry->pubDate = pubDate; return true; } diff --git a/launcher/news/NewsEntry.h b/launcher/news/NewsEntry.h index 0dbc70a5..1fe95623 100644 --- a/launcher/news/NewsEntry.h +++ b/launcher/news/NewsEntry.h @@ -18,8 +18,6 @@ #include #include #include -#include - #include class NewsEntry : public QObject @@ -36,7 +34,7 @@ public: * Constructs a new news entry. * Note that content may contain HTML. */ - NewsEntry(const QString& title, const QString& content, const QString& link, const QString& author, const QDateTime& pubDate, QObject* parent=0); + NewsEntry(const QString& title, const QString& content, const QString& link, QObject* parent=0); /*! * Attempts to load information from the given XML element into the given news entry pointer. @@ -53,12 +51,6 @@ public: //! URL to the post. QString link; - - //! The post's author. - QString author; - - //! The date and time that this post was published. - QDateTime pubDate; }; typedef std::shared_ptr NewsEntryPtr;