diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-17 06:16:55 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-19 02:11:19 (GMT) |
| commit | 39818f933b958d504b9cc18487658209d1df22da (patch) | |
| tree | b88fcbfbfda7d57866bab0e391360521c3f87af0 /src/network/bearer | |
| parent | 777843c18c9b62af90436ba03036027c9222eadf (diff) | |
| download | Qt-39818f933b958d504b9cc18487658209d1df22da.zip Qt-39818f933b958d504b9cc18487658209d1df22da.tar.gz Qt-39818f933b958d504b9cc18487658209d1df22da.tar.bz2 | |
Don't emit open signal on session close/error.
Diffstat (limited to 'src/network/bearer')
| -rw-r--r-- | src/network/bearer/qnetworksession.cpp | 9 | ||||
| -rw-r--r-- | src/network/bearer/qnetworksession_p.h | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp index cf9f4b2..d05f20e 100644 --- a/src/network/bearer/qnetworksession.cpp +++ b/src/network/bearer/qnetworksession.cpp @@ -231,7 +231,7 @@ QNetworkSession::QNetworkSession(const QNetworkConfiguration& connectionConfig, d->q = this; d->publicConfig = connectionConfig; d->syncStateWithInterface(); - connect(d, SIGNAL(quitPendingWaitsForOpened()), this, SIGNAL(opened())); + connect(d, SIGNAL(opened()), this, SIGNAL(opened())); connect(d, SIGNAL(error(QNetworkSession::SessionError)), this, SIGNAL(error(QNetworkSession::SessionError))); connect(d, SIGNAL(stateChanged(QNetworkSession::State)), @@ -308,10 +308,9 @@ bool QNetworkSession::waitForOpened(int msecs) return false; QEventLoop* loop = new QEventLoop(this); - QObject::connect(d, SIGNAL(quitPendingWaitsForOpened()), - loop, SLOT(quit())); - QObject::connect(this, SIGNAL(error(QNetworkSession::SessionError)), - loop, SLOT(quit())); + connect(d, SIGNAL(opened()), loop, SLOT(quit())); + connect(d, SIGNAL(closed()), loop, SLOT(quit())); + connect(d, SIGNAL(error(QNetworkSession::SessionError)), loop, SLOT(quit())); //final call if (msecs>=0) diff --git a/src/network/bearer/qnetworksession_p.h b/src/network/bearer/qnetworksession_p.h index 76691b3..5eef8e3 100644 --- a/src/network/bearer/qnetworksession_p.h +++ b/src/network/bearer/qnetworksession_p.h @@ -116,9 +116,7 @@ protected: } Q_SIGNALS: - //releases any pending waitForOpened() calls - void quitPendingWaitsForOpened(); - + void opened(); void error(QNetworkSession::SessionError error); void stateChanged(QNetworkSession::State state); void closed(); |