From 992af6c30d5e1216bf7a6db2521c16f0b508e396 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Mon, 8 Feb 2010 10:50:14 +1000 Subject: Missed this in a previous commit. --- src/plugins/bearer/qbearerengine_impl.h | 2 +- src/plugins/bearer/qnetworksession_impl.cpp | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/plugins/bearer/qbearerengine_impl.h b/src/plugins/bearer/qbearerengine_impl.h index 3772639..740def3 100644 --- a/src/plugins/bearer/qbearerengine_impl.h +++ b/src/plugins/bearer/qbearerengine_impl.h @@ -73,7 +73,7 @@ public: virtual quint64 startTime(const QString &) { return Q_UINT64_C(0); } Q_SIGNALS: - void connectionError(const QString &id, ConnectionError error); + void connectionError(const QString &id, QBearerEngineImpl::ConnectionError error); }; QT_END_NAMESPACE diff --git a/src/plugins/bearer/qnetworksession_impl.cpp b/src/plugins/bearer/qnetworksession_impl.cpp index 8f95e77..de1c91a 100644 --- a/src/plugins/bearer/qnetworksession_impl.cpp +++ b/src/plugins/bearer/qnetworksession_impl.cpp @@ -119,8 +119,8 @@ void QNetworkSessionPrivateImpl::syncStateWithInterface() activeConfig = publicConfig; engine = getEngineFromId(activeConfig.identifier()); if (engine) { - connect(engine, SIGNAL(connectionError(QString,QBearerEngine::ConnectionError)), - this, SLOT(connectionError(QString,QBearerEngine::ConnectionError)), + connect(engine, SIGNAL(connectionError(QString,QBearerEngineImpl::ConnectionError)), + this, SLOT(connectionError(QString,QBearerEngineImpl::ConnectionError)), Qt::QueuedConnection); } break; @@ -298,15 +298,18 @@ void QNetworkSessionPrivateImpl::updateStateFromServiceNetwork() if (activeConfig != config) { if (engine) { - disconnect(engine, SIGNAL(connectionError(QString,QBearerEngine::ConnectionError)), - this, SLOT(connectionError(QString,QBearerEngine::ConnectionError))); + disconnect(engine, + SIGNAL(connectionError(QString,QBearerEngineImpl::ConnectionError)), + this, + SLOT(connectionError(QString,QBearerEngineImpl::ConnectionError))); } activeConfig = config; engine = getEngineFromId(activeConfig.identifier()); if (engine) { - connect(engine, SIGNAL(connectionError(QString,QBearerEngine::ConnectionError)), - this, SLOT(connectionError(QString,QBearerEngine::ConnectionError)), + connect(engine, + SIGNAL(connectionError(QString,QBearerEngineImpl::ConnectionError)), + this, SLOT(connectionError(QString,QBearerEngineImpl::ConnectionError)), Qt::QueuedConnection); } emit newConfigurationActivated(); -- cgit v0.12