Code cleanup in Welcome-plugin.

Remove unused page from stacked widget form, move duplicated code
into utility functions, reduce state variables and string comparisons
in RssFetcher, clean out includes. Give WelcomeModeTreeWidget
uniform row height.

1 files changed, 10 insertions, 10 deletions

diff --git a/src/plugins/welcome/rssfetcher.h b/src/plugins/welcome/rssfetcher.h
index e046eead0b8..db1fba88b6a 100644
--- a/src/plugins/welcome/rssfetcher.h
+++ b/src/plugins/welcome/rssfetcher.h
@@ -30,12 +30,14 @@
 #ifndef RSSFETCHER_H
 #define RSSFETCHER_H
 
-#include <QtCore/QXmlStreamReader>
-#include <QtNetwork/QNetworkAccessManager>
+#include <QtCore/QScopedPointer>
+#include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
 class QNetworkReply;
+class QNetworkAccessManager;
 class QUrl;
+class QIODevice;
 QT_END_NAMESPACE
 
 namespace Welcome {
@@ -46,6 +48,7 @@ class RSSFetcher : public QObject
     Q_OBJECT
 public:
     explicit RSSFetcher(int maxItems, QObject *parent = 0);
+    virtual ~RSSFetcher();
 
 signals:
     void newsItemReady(const QString& title, const QString& desciption, const QString& url);
@@ -56,17 +59,14 @@ public slots:
     void fetch(const QUrl &url);
 
 private:
-    void parseXml();
+    enum  TagElement { itemElement, titleElement, descriptionElement, linkElement, otherElement };
+    static TagElement tagElement(const QStringRef &);
+    void parseXml(QIODevice *);
 
-    QXmlStreamReader m_xml;
-    QString m_currentTag;
-    QString m_linkString;
-    QString m_descriptionString;
-    QString m_titleString;
+    const int m_maxItems;
 
-    QNetworkAccessManager m_networkAccessManager;
+    QScopedPointer<QNetworkAccessManager> m_networkAccessManager;
     int m_items;
-    int m_maxItems;
 };
 
 } // namespace Welcome