aboutsummaryrefslogtreecommitdiff
path: root/src/qt/paymentserver.h
diff options
context:
space:
mode:
authorPhilip Kaufmann <phil.kaufmann@t-online.de>2013-10-30 11:30:53 +0100
committerPhilip Kaufmann <phil.kaufmann@t-online.de>2013-11-11 14:20:00 +0100
commit7634e0d8de4aac80a3a84dd2438f24f98670d44d (patch)
tree7f109129df59a9395fd8e5c0a07cedfb58daa7b5 /src/qt/paymentserver.h
parent59be91ae1e8da1e679adbb7c84e8bca749daa8a7 (diff)
[Qt] paymentserver: start netManager in uiReady()
- remove explicit init of netManager as this is done in the constructor anyway - move initNetManager() call to uiReady(), which removes an assert() and allows us to use message() in initNetManager() (currently unused but could be necessary because of proxy related messages) - make initNetManager() private - update paymentservertests.cpp
Diffstat (limited to 'src/qt/paymentserver.h')
-rw-r--r--src/qt/paymentserver.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h
index 65bf034354..19cba70cb6 100644
--- a/src/qt/paymentserver.h
+++ b/src/qt/paymentserver.h
@@ -77,9 +77,6 @@ public:
// Return certificate store
static X509_STORE* getCertStore() { return certStore; }
- // Setup networking
- void initNetManager();
-
// Constructor registers this on the parent QApplication to
// receive QEvent::FileOpen events
bool eventFilter(QObject *object, QEvent *event);
@@ -117,6 +114,9 @@ private:
void handleURIOrFile(const QString& s);
void fetchRequest(const QUrl& url);
+ // Setup networking
+ void initNetManager();
+
bool saveURIs; // true during startup
QLocalServer* uriServer;