FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use static-global macro.

Browse Source
This commit is contained in:
Martin Rotter 2017-07-21 09:44:48 +02:00
parent 768c430bd2
commit c01ea84e7b
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/network-web/silentnetworkaccessmanager.cpp
View File

@ -22,8 +22,8 @@
#include <QNetworkReply> #include <QNetworkReply>
#include <QAuthenticator> #include <QAuthenticator>
Q_GLOBAL_STATIC(SilentNetworkAccessManager, qz_silent_acmanager)
QPointer<SilentNetworkAccessManager> SilentNetworkAccessManager::s_instance;
SilentNetworkAccessManager::SilentNetworkAccessManager(QObject* parent) SilentNetworkAccessManager::SilentNetworkAccessManager(QObject* parent)
: BaseNetworkAccessManager(parent) { : BaseNetworkAccessManager(parent) {
@ -36,11 +36,7 @@ SilentNetworkAccessManager::~SilentNetworkAccessManager() {
} }
SilentNetworkAccessManager* SilentNetworkAccessManager::instance() { SilentNetworkAccessManager* SilentNetworkAccessManager::instance() {
if (s_instance.isNull()) { return qz_silent_acmanager();
s_instance = new SilentNetworkAccessManager(qApp);
}
return s_instance;
} }
void SilentNetworkAccessManager::onAuthenticationRequired(QNetworkReply* reply, QAuthenticator* authenticator) { void SilentNetworkAccessManager::onAuthenticationRequired(QNetworkReply* reply, QAuthenticator* authenticator) {

3
src/network-web/silentnetworkaccessmanager.h
View File

@ -39,9 +39,6 @@ class SilentNetworkAccessManager : public BaseNetworkAccessManager {
public slots: public slots:
// This cannot do any GUI stuff. // This cannot do any GUI stuff.
void onAuthenticationRequired(QNetworkReply* reply, QAuthenticator* authenticator); void onAuthenticationRequired(QNetworkReply* reply, QAuthenticator* authenticator);
private:
static QPointer<SilentNetworkAccessManager> s_instance;
}; };
#endif // SILENTNETWORKACCESSMANAGER_H #endif // SILENTNETWORKACCESSMANAGER_H