don't use an unecessary subclass of QNetworkAccessManager

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

View file

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

View file

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