Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:17:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't use an unecessary subclass of QNetworkAccessManager

Browse source
This commit is contained in:
Stephen Birarda 2014-10-06 09:42:47 -07:00
parent 89cc7c7b0d
commit a441c5fb16
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/networking/src/NetworkAccessManager.cpp
View file

@ -13,16 +13,12 @@
#include "NetworkAccessManager.h" #include "NetworkAccessManager.h"
QThreadStorage<NetworkAccessManager*> networkAccessManagers; QThreadStorage<QNetworkAccessManager*> networkAccessManagers;
NetworkAccessManager& NetworkAccessManager::getInstance(bool forceReset) { QNetworkAccessManager& NetworkAccessManager::getInstance(bool forceReset) {
if (!networkAccessManagers.hasLocalData() || forceReset) { if (!networkAccessManagers.hasLocalData() || forceReset) {
networkAccessManagers.setLocalData(new NetworkAccessManager()); networkAccessManagers.setLocalData(new QNetworkAccessManager());
} }
return *networkAccessManagers.localData(); return *networkAccessManagers.localData();
} }
NetworkAccessManager::NetworkAccessManager() {
}

7
libraries/networking/src/NetworkAccessManager.h
View file

@ -15,13 +15,10 @@
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
/// Wrapper around QNetworkAccessManager to restrict at one instance by thread /// Wrapper around QNetworkAccessManager to restrict at one instance by thread
class NetworkAccessManager : public QNetworkAccessManager { class NetworkAccessManager : public QObject {
Q_OBJECT Q_OBJECT
public: public:
static NetworkAccessManager& getInstance(bool forceReset = false); static QNetworkAccessManager& getInstance(bool forceReset = false);
private:
NetworkAccessManager();
}; };
#endif // hifi_NetworkAccessManager_h #endif // hifi_NetworkAccessManager_h