pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hmmm 2...

Browse source
This commit is contained in:
Martin Rotter 2014-02-25 07:25:40 +01:00
parent 9e75252f29
commit 858238edff
3 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/core/networkfactory.cpp
View file

@ -95,22 +95,7 @@ QNetworkReply::NetworkError NetworkFactory::downloadFeedFile(const QString &url,
// process of downloading of a file easier to understand. // process of downloading of a file easier to understand.
// Make necessary variables. // Make necessary variables.
// TODO: Tady bych chtěl použit singleton
// jenže když je toto v jinym vlakně (viz feedmessageviewer movetothread)
// tak se manager ze singletonu vytvoří s parentem qApp kterej je z jinyho
// vlakna a dojde k warningu (TO NECHCI)
// reseni: but necham silent bez parenta a pridam metodu na odstraneni
// nebo k metode instance() pridam parametr kde se specifikuje
// parent kterej se pouzije pro vytvoreni managera a to by mel
// byt parent z tohodle worker vlakna nebo jeste je moznost
// zakomentovat movetothread a vykonavat updaty v hlavnim vlakne,
// ale to vyusti v drobnej lag a NEBO jeste je moznost
// zavolat SilentNetworkAccessManager::instance() před vytvořením hlavního
// okna aplikace v mainu tak aby se nastavil byl manager i parent
// na stejnem vlaknu
SilentNetworkAccessManager manager; SilentNetworkAccessManager manager;
//SilentNetworkAccessManager *manager = SilentNetworkAccessManager::instance();
QEventLoop loop; QEventLoop loop;
QTimer timer; QTimer timer;
QNetworkRequest request; QNetworkRequest request;

10
src/core/silentnetworkaccessmanager.cpp
View file

@ -7,8 +7,6 @@
#include <QApplication> #include <QApplication>
QPointer<SilentNetworkAccessManager> SilentNetworkAccessManager::s_instance;
SilentNetworkAccessManager::SilentNetworkAccessManager(QObject *parent) SilentNetworkAccessManager::SilentNetworkAccessManager(QObject *parent)
: BaseNetworkAccessManager(parent) { : BaseNetworkAccessManager(parent) {
connect(this, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)), connect(this, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)),
@ -19,14 +17,6 @@ SilentNetworkAccessManager::~SilentNetworkAccessManager() {
qDebug("Destroying SilentNetworkAccessManages instance."); qDebug("Destroying SilentNetworkAccessManages instance.");
} }
SilentNetworkAccessManager *SilentNetworkAccessManager::instance() {
if (s_instance.isNull()) {
s_instance = new SilentNetworkAccessManager(qApp);
}
return s_instance;
}
void SilentNetworkAccessManager::onAuthenticationRequired(QNetworkReply *reply, void SilentNetworkAccessManager::onAuthenticationRequired(QNetworkReply *reply,
QAuthenticator *authenticator) { QAuthenticator *authenticator) {
QObject *originating_object = reply->request().originatingObject(); QObject *originating_object = reply->request().originatingObject();

7
src/core/silentnetworkaccessmanager.h
View file

@ -15,15 +15,8 @@ class SilentNetworkAccessManager : public BaseNetworkAccessManager {
explicit SilentNetworkAccessManager(QObject *parent = 0); explicit SilentNetworkAccessManager(QObject *parent = 0);
virtual ~SilentNetworkAccessManager(); virtual ~SilentNetworkAccessManager();
// Returns pointer to global network access manager
// used by ALL feed downloaders.
static SilentNetworkAccessManager *instance();
protected slots: protected slots:
void onAuthenticationRequired(QNetworkReply * reply, QAuthenticator *authenticator); void onAuthenticationRequired(QNetworkReply * reply, QAuthenticator *authenticator);
private:
static QPointer<SilentNetworkAccessManager> s_instance;
}; };
#endif // SILENTNETWORKACCESSMANAGER_H #endif // SILENTNETWORKACCESSMANAGER_H