Reformatted NewsWidget class

src/Legacy/widgets/newswidget.cpp

@@ -1,15 +1,14 @@
-#include "gui\newswidget.h"
+#include "widgets/newswidget.h"
 #include "ui_newswidget.h"
 
-#include "networkdownloader.h"
-#include "legacyapp.h"
+#include "models/downloader.h"
 #include <QtConcurrent/QtConcurrent>
 #include <QLabel>
 
-NewsWidget::NewsWidget(LegacyApp *_app, QWidget *parent) :
+NewsWidget::NewsWidget(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::NewsWidget),
-    app(_app), news_downloader(this)
+    news_downloader(this)
 {
     ui->setupUi(this);
     ui->test_news_piece->hide();
@@ -17,8 +16,8 @@ NewsWidget::NewsWidget(LegacyApp *_app, QWidget *parent) :
     news_downloader.targetBytearray = &news_data;
     news_downloader.setUrl(QUrl("http://translate.lotros.ru/groupware/launcher_news"));
 
-    connect(&news_update_timer, &QTimer::timeout, &news_downloader, &NetworkDownloader::start);
-    connect(&news_downloader, &NetworkDownloader::downloadFinished, this, &NewsWidget::updateNews);
+    connect(&news_update_timer, &QTimer::timeout, &news_downloader, &Downloader::start);
+    connect(&news_downloader, &Downloader::downloadFinished, this, &NewsWidget::updateNews);
     emit news_downloader.start();
     news_update_timer.setInterval(1000 * 60); // 10 minutes;
     news_update_timer.start();
@@ -147,7 +146,7 @@ void NewsWidget::constructNewsPiece(int piece_id, QString title, QString text, Q
     contentLabel->setSizePolicy(sizePolicy);
 
     news_piece_layout->addWidget(contentLabel, 1, 1, 1, 1);
-    app->window.changeFontSizeRecursive(app->properties.value("settings/ui_scale", 100).toInt(), news_piece);
+//    app->window.changeFontSizeRecursive(app->properties.value("settings/ui_scale", 100).toInt(), news_piece);
 
     ui->news_layout->addWidget(news_piece, piece_id, 0);
 }

src/Legacy/widgets/newswidget.h

@@ -3,20 +3,18 @@
 
 #include <QWidget>
 #include <QTimer>
-#include "networkdownloader.h"
+#include "models/downloader.h"
 
 namespace Ui {
 class NewsWidget;
 }
 
-class LegacyApp;
-
 class NewsWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit NewsWidget(LegacyApp *_app, QWidget *parent = 0);
+    explicit NewsWidget(QWidget *parent = 0);
     ~NewsWidget();
 
 public slots:
@@ -28,10 +26,9 @@ private:
 
 private:
     Ui::NewsWidget *ui;
-    LegacyApp *app;
     QTimer news_update_timer;
     QByteArray news_data;
-    NetworkDownloader news_downloader;
+    Downloader news_downloader;
 };
 
 #endif // NEWSWIDGET_H