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

2
src/miscellaneous/application.h
View File

@ -120,7 +120,7 @@ class Application : public QtSingleApplication {
// Returns pointer to "GOD" application singleton.
inline static Application* instance() {
return static_cast<Application*>(QCoreApplication::instance());
return static_cast<Application*>(QCoreApplication::instance());
}
public slots:

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

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

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

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