Added missing setup for QNetworkAccessManager and QNetworkDiskCache

AmonRaNet · Jan 3, 2024 · 3402554 · 3402554
1 parent 359b49a
commit 3402554
Show file tree

Hide file tree

Showing 26 changed files with 36 additions and 61 deletions.
diff --git a/samples/10000/mainwindow.cpp b/samples/10000/mainwindow.cpp
@@ -32,7 +32,7 @@ MainWindow::MainWindow()
     mMap = new QGVMap(this);
     setCentralWidget(mMap);
 
-    QGV::setNetworkManager(new QNetworkAccessManager());
+    Helpers::setupCachedNetworkAccessManager(this);
 
     // Background layer
     auto osmLayer = new QGVLayerOSM();

diff --git a/samples/10000/mainwindow.h b/samples/10000/mainwindow.h
@@ -19,8 +19,6 @@
 #pragma once
 
 #include <QMainWindow>
-#include <QNetworkAccessManager>
-#include <QNetworkDiskCache>
 
 #include <QGeoView/QGVLayer.h>
 #include <QGeoView/QGVMap.h>
@@ -37,7 +35,5 @@ class MainWindow : public QMainWindow
     QGVLayer* create10000Layer() const;
 
 private:
-    QNetworkAccessManager* mManager;
-    QNetworkDiskCache* mCache;
     QGVMap* mMap;
 };
diff --git a/samples/background/mainwindow.cpp b/samples/background/mainwindow.cpp
@@ -18,10 +18,12 @@
 
 #include "mainwindow.h"
 
-#include <QButtonGroup>
 #include <QGeoView/QGVLayerBing.h>
 #include <QGeoView/QGVLayerGoogle.h>
 #include <QGeoView/QGVLayerOSM.h>
+#include <helpers.h>
+
+#include <QButtonGroup>
 #include <QHBoxLayout>
 #include <QLineEdit>
 #include <QRadioButton>
@@ -34,7 +36,7 @@ MainWindow::MainWindow()
     setCentralWidget(new QWidget());
     centralWidget()->setLayout(new QVBoxLayout());
 
-    QGV::setNetworkManager(new QNetworkAccessManager());
+    Helpers::setupCachedNetworkAccessManager(this);
 
     mMap = new QGVMap(this);
     centralWidget()->layout()->addWidget(mMap);

diff --git a/samples/background/mainwindow.h b/samples/background/mainwindow.h
@@ -20,8 +20,6 @@
 
 #include <QGroupBox>
 #include <QMainWindow>
-#include <QNetworkAccessManager>
-#include <QNetworkDiskCache>
 
 #include <QGeoView/QGVMap.h>
 
@@ -36,7 +34,5 @@ class MainWindow : public QMainWindow
     QGroupBox* createOptionsList();
 
 private:
-    QNetworkAccessManager* mManager;
-    QNetworkDiskCache* mCache;
     QGVMap* mMap;
 };
diff --git a/samples/basic/mainwindow.cpp b/samples/basic/mainwindow.cpp
@@ -21,6 +21,7 @@
 #include <QTimer>
 
 #include <QGeoView/QGVLayerOSM.h>
+#include <helpers.h>
 
 MainWindow::MainWindow()
 {
@@ -29,7 +30,7 @@ MainWindow::MainWindow()
     mMap = new QGVMap(this);
     setCentralWidget(mMap);
 
-    QGV::setNetworkManager(new QNetworkAccessManager());
+    Helpers::setupCachedNetworkAccessManager(this);
 
     // Background layer
     auto osmLayer = new QGVLayerOSM();

diff --git a/samples/basic/mainwindow.h b/samples/basic/mainwindow.h
@@ -19,8 +19,6 @@
 #pragma once
 
 #include <QMainWindow>
-#include <QNetworkAccessManager>
-#include <QNetworkDiskCache>
 
 #include <QGeoView/QGVMap.h>
 
@@ -33,7 +31,5 @@ class MainWindow : public QMainWindow
     ~MainWindow();
 
 private:
-    QNetworkAccessManager* mManager;
-    QNetworkDiskCache* mCache;
     QGVMap* mMap;
 };
diff --git a/samples/camera-actions/mainwindow.cpp b/samples/camera-actions/mainwindow.cpp
@@ -40,7 +40,7 @@ MainWindow::MainWindow()
     setCentralWidget(new QWidget());
     centralWidget()->setLayout(new QVBoxLayout());
 
-    QGV::setNetworkManager(new QNetworkAccessManager());
+    Helpers::setupCachedNetworkAccessManager(this);
 
     mMap = new QGVMap(this);
     centralWidget()->layout()->addWidget(mMap);

diff --git a/samples/camera-actions/mainwindow.h b/samples/camera-actions/mainwindow.h
@@ -20,8 +20,6 @@
 
 #include <QGroupBox>
 #include <QMainWindow>
-#include <QNetworkAccessManager>
-#include <QNetworkDiskCache>
 
 #include <QGeoView/QGVLayer.h>
 #include <QGeoView/QGVMap.h>
@@ -47,8 +45,6 @@ class MainWindow : public QMainWindow
     Rectangle* getRandomItem();
 
 private:
-    QNetworkAccessManager* mManager;
-    QNetworkDiskCache* mCache;
     QGVMap* mMap;
     QGVLayer* mItemsLayer;
     bool mFlyMode;

diff --git a/samples/custom-tiles/mainwindow.cpp b/samples/custom-tiles/mainwindow.cpp
@@ -21,6 +21,7 @@
 #include <QGeoView/QGVLayerOSM.h>
 #include <QTimer>
 
+#include <helpers.h>
 #include <mytiles.h>
 
 MainWindow::MainWindow()
@@ -30,7 +31,7 @@ MainWindow::MainWindow()
     mMap = new QGVMap(this);
     setCentralWidget(mMap);
 
-    QGV::setNetworkManager(new QNetworkAccessManager());
+    Helpers::setupCachedNetworkAccessManager(this);
 
     // Background layer
     auto osmLayer = new QGVLayerOSM();

diff --git a/samples/custom-tiles/mainwindow.h b/samples/custom-tiles/mainwindow.h
@@ -19,8 +19,6 @@
 #pragma once
 
 #include <QMainWindow>
-#include <QNetworkAccessManager>
-#include <QNetworkDiskCache>
 
 #include <QGeoView/QGVMap.h>
 
@@ -35,7 +33,5 @@ class MainWindow : public QMainWindow
     QGV::GeoRect targetArea() const;
 
 private:
-    QNetworkAccessManager* mManager;
-    QNetworkDiskCache* mCache;
     QGVMap* mMap;
 };
diff --git a/samples/debug/mainwindow.cpp b/samples/debug/mainwindow.cpp
@@ -37,7 +37,7 @@ MainWindow::MainWindow()
     setCentralWidget(new QWidget());
     centralWidget()->setLayout(new QVBoxLayout());
 
-    QGV::setNetworkManager(new QNetworkAccessManager());
+    Helpers::setupCachedNetworkAccessManager(this);
 
     mMap = new QGVMap(this);
     centralWidget()->layout()->addWidget(mMap);

diff --git a/samples/debug/mainwindow.h b/samples/debug/mainwindow.h
@@ -20,8 +20,6 @@
 
 #include <QGroupBox>
 #include <QMainWindow>
-#include <QNetworkAccessManager>
-#include <QNetworkDiskCache>
 
 #include <QGeoView/QGVLayer.h>
 #include <QGeoView/QGVMap.h>
@@ -39,8 +37,6 @@ class MainWindow : public QMainWindow
     QGroupBox* createOptionsList();
 
 private:
-    QNetworkAccessManager* mManager;
-    QNetworkDiskCache* mCache;
     QGVMap* mMap;
     QGVLayer* mItemsLayer;
 };
diff --git a/samples/flags/mainwindow.cpp b/samples/flags/mainwindow.cpp
@@ -37,7 +37,7 @@ MainWindow::MainWindow()
     setCentralWidget(new QWidget());
     centralWidget()->setLayout(new QVBoxLayout());
 
-    QGV::setNetworkManager(new QNetworkAccessManager());
+    Helpers::setupCachedNetworkAccessManager(this);
 
     mMap = new QGVMap(this);
     centralWidget()->layout()->addWidget(mMap);

diff --git a/samples/flags/mainwindow.h b/samples/flags/mainwindow.h
@@ -20,8 +20,6 @@
 
 #include <QGroupBox>
 #include <QMainWindow>
-#include <QNetworkAccessManager>
-#include <QNetworkDiskCache>
 
 #include <QGeoView/QGVLayer.h>
 #include <QGeoView/QGVMap.h>
@@ -42,8 +40,6 @@ class MainWindow : public QMainWindow
     void applySelectable(bool enabled);
 
 private:
-    QNetworkAccessManager* mManager;
-    QNetworkDiskCache* mCache;
     QGVMap* mMap;
     QGVLayer* mItemsLayer;
 };
diff --git a/samples/fun/mainwindow.cpp b/samples/fun/mainwindow.cpp
@@ -25,6 +25,7 @@
 
 #include <functional>
 
+#include <helpers.h>
 #include <placemark.h>
 #include <waveanimation.h>
 
@@ -40,7 +41,7 @@ MainWindow::MainWindow()
     setCentralWidget(new QWidget());
     centralWidget()->setLayout(new QVBoxLayout());
 
-    QGV::setNetworkManager(new QNetworkAccessManager());
+    Helpers::setupCachedNetworkAccessManager(this);
 
     mMap = new QGVMap(this);
     centralWidget()->layout()->addWidget(mMap);

diff --git a/samples/fun/mainwindow.h b/samples/fun/mainwindow.h
@@ -20,8 +20,6 @@
 
 #include <QGroupBox>
 #include <QMainWindow>
-#include <QNetworkAccessManager>
-#include <QNetworkDiskCache>
 
 #include <QGeoView/QGVLayer.h>
 #include <QGeoView/QGVMap.h>
@@ -42,8 +40,6 @@ class MainWindow : public QMainWindow
     QGroupBox* createOptionsList();
 
 private:
-    QNetworkAccessManager* mManager;
-    QNetworkDiskCache* mCache;
     QGVMap* mMap;
     QGVLayer* mQGVLayer;
     QAbstractAnimation* mQGVAnimation;

diff --git a/samples/layers/mainwindow.cpp b/samples/layers/mainwindow.cpp
@@ -37,7 +37,7 @@ MainWindow::MainWindow()
     setCentralWidget(new QWidget());
     centralWidget()->setLayout(new QVBoxLayout());
 
-    QGV::setNetworkManager(new QNetworkAccessManager());
+    Helpers::setupCachedNetworkAccessManager(this);
 
     mMap = new QGVMap(this);
     centralWidget()->layout()->addWidget(mMap);

diff --git a/samples/layers/mainwindow.h b/samples/layers/mainwindow.h
@@ -20,8 +20,6 @@
 
 #include <QGroupBox>
 #include <QMainWindow>
-#include <QNetworkAccessManager>
-#include <QNetworkDiskCache>
 
 #include <QGeoView/QGVLayer.h>
 #include <QGeoView/QGVMap.h>
@@ -39,7 +37,5 @@ class MainWindow : public QMainWindow
     QGroupBox* createLayersList();
 
 private:
-    QNetworkAccessManager* mManager;
-    QNetworkDiskCache* mCache;
     QGVMap* mMap;
 };
diff --git a/samples/mouse-actions/mainwindow.cpp b/samples/mouse-actions/mainwindow.cpp
@@ -41,7 +41,7 @@ MainWindow::MainWindow()
     setCentralWidget(new QWidget());
     centralWidget()->setLayout(new QVBoxLayout());
 
-    QGV::setNetworkManager(new QNetworkAccessManager());
+    Helpers::setupCachedNetworkAccessManager(this);
 
     mMap = new QGVMap(this);
     centralWidget()->layout()->addWidget(mMap);

diff --git a/samples/mouse-actions/mainwindow.h b/samples/mouse-actions/mainwindow.h
@@ -20,8 +20,6 @@
 
 #include <QGroupBox>
 #include <QMainWindow>
-#include <QNetworkAccessManager>
-#include <QNetworkDiskCache>
 
 #include <QGeoView/QGVLayer.h>
 #include <QGeoView/QGVMap.h>
@@ -44,8 +42,6 @@ class MainWindow : public QMainWindow
     void enableAction(bool enable, QGV::MouseAction action);
 
 private:
-    QNetworkAccessManager* mManager;
-    QNetworkDiskCache* mCache;
     QGVMap* mMap;
     QGVLayer* mItemsLayer;
 };
diff --git a/samples/moving-objects/mainwindow.cpp b/samples/moving-objects/mainwindow.cpp
@@ -21,6 +21,7 @@
 #include <QRandomGenerator>
 #include <QTimer>
 
+#include <helpers.h>
 #include <placemarkcircle.h>
 
 #include <QGeoView/QGVLayerOSM.h>
@@ -32,7 +33,7 @@ MainWindow::MainWindow()
     mMap = new QGVMap(this);
     setCentralWidget(mMap);
 
-    QGV::setNetworkManager(new QNetworkAccessManager());
+    Helpers::setupCachedNetworkAccessManager(this);
 
     // Background layer
     auto osmLayer = new QGVLayerOSM();

diff --git a/samples/moving-objects/mainwindow.h b/samples/moving-objects/mainwindow.h
@@ -19,8 +19,6 @@
 #pragma once
 
 #include <QMainWindow>
-#include <QNetworkAccessManager>
-#include <QNetworkDiskCache>
 
 #include <QGeoView/QGVMap.h>
 #include <placemarkcircle.h>
@@ -36,8 +34,6 @@ class MainWindow : public QMainWindow
     void moveObject(PlacemarkCircle* item);
 
 private:
-    QNetworkAccessManager* mManager;
-    QNetworkDiskCache* mCache;
     QGVMap* mMap;
     QTimer* mTimer;
 };
diff --git a/samples/shared/helpers.cpp b/samples/shared/helpers.cpp
@@ -21,6 +21,10 @@
 #include <random>
 #endif
 
+#include <QDir>
+#include <QNetworkAccessManager>
+#include <QNetworkDiskCache>
+
 static auto initRand = []() {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     std::srand(std::time(nullptr));
@@ -67,3 +71,13 @@ QSizeF Helpers::randSize(int baseSize)
     return QSize(baseSize + (qrand() % range), baseSize + (qrand() % range));
 #endif
 }
+
+void Helpers::setupCachedNetworkAccessManager(QObject* parent)
+{
+    QDir("cacheDir").removeRecursively();
+    auto cache = new QNetworkDiskCache(parent);
+    cache->setCacheDirectory("cacheDir");
+    auto manager = new QNetworkAccessManager(parent);
+    manager->setCache(cache);
+    QGV::setNetworkManager(manager);
+}
diff --git a/samples/shared/helpers.h b/samples/shared/helpers.h
@@ -21,6 +21,8 @@
 #include <QGeoView/QGVMap.h>
 
 namespace Helpers {
+void setupCachedNetworkAccessManager(QObject* parent);
+
 QGV::GeoRect randRect(QGVMap* geoMap, const QGV::GeoRect& targetArea, const QSizeF& size);
 QGV::GeoRect randRect(QGVMap* geoMap, const QGV::GeoRect& targetArea, int baseSize);
 QGV::GeoPos randPos(const QGV::GeoRect& targetArea);

diff --git a/samples/widgets/mainwindow.cpp b/samples/widgets/mainwindow.cpp
@@ -26,6 +26,7 @@
 #include <QGeoView/QGVWidgetCompass.h>
 #include <QGeoView/QGVWidgetScale.h>
 #include <QGeoView/QGVWidgetZoom.h>
+#include <helpers.h>
 
 MainWindow::MainWindow()
 {
@@ -34,7 +35,7 @@ MainWindow::MainWindow()
     setCentralWidget(new QWidget());
     centralWidget()->setLayout(new QVBoxLayout());
 
-    QGV::setNetworkManager(new QNetworkAccessManager());
+    Helpers::setupCachedNetworkAccessManager(this);
 
     mMap = new QGVMap(this);
     centralWidget()->layout()->addWidget(mMap);