summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-05 01:13:05 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-08 07:48:36 (GMT)
commitb1029a6bd7131d540f76ead8783ed0978f7163aa (patch)
treeb17f3f2bd8c759c321c462f5fdc54f1e865ed678 /src/plugins/bearer
parenta307e9662c2b57ad16c2329754ea4795615de125 (diff)
downloadQt-b1029a6bd7131d540f76ead8783ed0978f7163aa.zip
Qt-b1029a6bd7131d540f76ead8783ed0978f7163aa.tar.gz
Qt-b1029a6bd7131d540f76ead8783ed0978f7163aa.tar.bz2
Rename internal QNetworkSessionEngine* to QBearerEngine*.
Diffstat (limited to 'src/plugins/bearer')
-rw-r--r--src/plugins/bearer/corewlan/corewlan.pro2
-rw-r--r--src/plugins/bearer/corewlan/qcorewlanengine.h4
-rw-r--r--src/plugins/bearer/corewlan/qcorewlanengine.mm2
-rw-r--r--src/plugins/bearer/generic/generic.pro2
-rw-r--r--src/plugins/bearer/generic/qgenericengine.cpp2
-rw-r--r--src/plugins/bearer/generic/qgenericengine.h4
-rw-r--r--src/plugins/bearer/nativewifi/nativewifi.pro2
-rw-r--r--src/plugins/bearer/nativewifi/qnativewifiengine.cpp2
-rw-r--r--src/plugins/bearer/nativewifi/qnativewifiengine.h4
-rw-r--r--src/plugins/bearer/networkmanager/networkmanager.pro2
-rw-r--r--src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp2
-rw-r--r--src/plugins/bearer/networkmanager/qnetworkmanagerengine.h4
-rw-r--r--src/plugins/bearer/nla/nla.pro2
-rw-r--r--src/plugins/bearer/nla/qnlaengine.cpp2
-rw-r--r--src/plugins/bearer/nla/qnlaengine.h4
-rw-r--r--src/plugins/bearer/qbearerengine_impl.h (renamed from src/plugins/bearer/qnetworksessionengine_impl.h)14
-rw-r--r--src/plugins/bearer/qnetworksession_impl.cpp34
-rw-r--r--src/plugins/bearer/qnetworksession_impl.h8
-rw-r--r--src/plugins/bearer/symbian/symbianengine.cpp2
-rw-r--r--src/plugins/bearer/symbian/symbianengine.h4
20 files changed, 51 insertions, 51 deletions
diff --git a/src/plugins/bearer/corewlan/corewlan.pro b/src/plugins/bearer/corewlan/corewlan.pro
index c59d602..50c72b2 100644
--- a/src/plugins/bearer/corewlan/corewlan.pro
+++ b/src/plugins/bearer/corewlan/corewlan.pro
@@ -13,7 +13,7 @@ contains(QT_CONFIG, corewlan) {
HEADERS += qcorewlanengine.h \
../qnetworksession_impl.h \
- ../qnetworksessionengine_impl.h
+ ../qbearerengine_impl.h
SOURCES += main.cpp \
qcorewlanengine.mm \
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.h b/src/plugins/bearer/corewlan/qcorewlanengine.h
index 7199ace..54f2027 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.h
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.h
@@ -42,7 +42,7 @@
#ifndef QCOREWLANENGINE_H
#define QCOREWLANENGINE_H
-#include "../qnetworksessionengine_impl.h"
+#include "../qbearerengine_impl.h"
#include <QMap>
#include <QTimer>
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
class QNetworkConfigurationPrivate;
-class QCoreWlanEngine : public QNetworkSessionEngineImpl
+class QCoreWlanEngine : public QBearerEngineImpl
{
Q_OBJECT
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
index ca193ab..fff65e4 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
@@ -106,7 +106,7 @@ static QString qGetInterfaceType(const QString &interfaceString)
}
QCoreWlanEngine::QCoreWlanEngine(QObject *parent)
-: QNetworkSessionEngineImpl(parent)
+: QBearerEngineImpl(parent)
{
connect(&pollTimer, SIGNAL(timeout()), this, SLOT(doRequestUpdate()));
pollTimer.setInterval(10000);
diff --git a/src/plugins/bearer/generic/generic.pro b/src/plugins/bearer/generic/generic.pro
index dbf96d1..1d141fd 100644
--- a/src/plugins/bearer/generic/generic.pro
+++ b/src/plugins/bearer/generic/generic.pro
@@ -5,7 +5,7 @@ QT += network
HEADERS += qgenericengine.h \
../qnetworksession_impl.h \
- ../qnetworksessionengine_impl.h \
+ ../qbearerengine_impl.h \
../platformdefs_win.h
SOURCES += qgenericengine.cpp \
../qnetworksession_impl.cpp \
diff --git a/src/plugins/bearer/generic/qgenericengine.cpp b/src/plugins/bearer/generic/qgenericengine.cpp
index dea820d..c6ab4df 100644
--- a/src/plugins/bearer/generic/qgenericengine.cpp
+++ b/src/plugins/bearer/generic/qgenericengine.cpp
@@ -141,7 +141,7 @@ static QString qGetInterfaceType(const QString &interface)
}
QGenericEngine::QGenericEngine(QObject *parent)
-: QNetworkSessionEngineImpl(parent)
+: QBearerEngineImpl(parent)
{
connect(&pollTimer, SIGNAL(timeout()), this, SLOT(doRequestUpdate()));
pollTimer.setInterval(10000);
diff --git a/src/plugins/bearer/generic/qgenericengine.h b/src/plugins/bearer/generic/qgenericengine.h
index d755228..cd9a976 100644
--- a/src/plugins/bearer/generic/qgenericengine.h
+++ b/src/plugins/bearer/generic/qgenericengine.h
@@ -42,7 +42,7 @@
#ifndef QGENERICENGINE_H
#define QGENERICENGINE_H
-#include "../qnetworksessionengine_impl.h"
+#include "../qbearerengine_impl.h"
#include <QMap>
#include <QTimer>
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
class QNetworkConfigurationPrivate;
class QNetworkSessionPrivate;
-class QGenericEngine : public QNetworkSessionEngineImpl
+class QGenericEngine : public QBearerEngineImpl
{
Q_OBJECT
diff --git a/src/plugins/bearer/nativewifi/nativewifi.pro b/src/plugins/bearer/nativewifi/nativewifi.pro
index 928d819..f277a04 100644
--- a/src/plugins/bearer/nativewifi/nativewifi.pro
+++ b/src/plugins/bearer/nativewifi/nativewifi.pro
@@ -6,7 +6,7 @@ QT += network
HEADERS += qnativewifiengine.h \
platformdefs.h \
../qnetworksession_impl.h \
- ../qnetworksessionengine_impl.h
+ ../qbearerengine_impl.h
SOURCES += main.cpp \
qnativewifiengine.cpp \
diff --git a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
index 9f0d4c0..d88534b 100644
--- a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
+++ b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
@@ -77,7 +77,7 @@ void qNotificationCallback(WLAN_NOTIFICATION_DATA *data, QNativeWifiEngine *d)
}
QNativeWifiEngine::QNativeWifiEngine(QObject *parent)
-: QNetworkSessionEngineImpl(parent), handle(0)
+: QBearerEngineImpl(parent), handle(0)
{
DWORD clientVersion;
diff --git a/src/plugins/bearer/nativewifi/qnativewifiengine.h b/src/plugins/bearer/nativewifi/qnativewifiengine.h
index 41217e2..a9a9375 100644
--- a/src/plugins/bearer/nativewifi/qnativewifiengine.h
+++ b/src/plugins/bearer/nativewifi/qnativewifiengine.h
@@ -53,7 +53,7 @@
// We mean it.
//
-#include "../qnetworksessionengine_impl.h"
+#include "../qbearerengine_impl.h"
#include <QtCore/qtimer.h>
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
class QNetworkConfigurationPrivate;
struct WLAN_NOTIFICATION_DATA;
-class QNativeWifiEngine : public QNetworkSessionEngineImpl
+class QNativeWifiEngine : public QBearerEngineImpl
{
Q_OBJECT
diff --git a/src/plugins/bearer/networkmanager/networkmanager.pro b/src/plugins/bearer/networkmanager/networkmanager.pro
index 6f271c6..5bac121 100644
--- a/src/plugins/bearer/networkmanager/networkmanager.pro
+++ b/src/plugins/bearer/networkmanager/networkmanager.pro
@@ -9,7 +9,7 @@ HEADERS += qnmdbushelper.h \
qnetworkmanagerservice.h \
qnetworkmanagerengine.h \
../qnetworksession_impl.h \
- ../qnetworksessionengine_impl.h
+ ../qbearerengine_impl.h
SOURCES += main.cpp \
qnmdbushelper.cpp \
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
index 129f7d2..2c550f0 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
@@ -60,7 +60,7 @@
QT_BEGIN_NAMESPACE
QNetworkManagerEngine::QNetworkManagerEngine(QObject *parent)
-: QNetworkSessionEngineImpl(parent),
+: QBearerEngineImpl(parent),
interface(new QNetworkManagerInterface(this)),
systemSettings(new QNetworkManagerSettings(NM_DBUS_SERVICE_SYSTEM_SETTINGS, this)),
userSettings(new QNetworkManagerSettings(NM_DBUS_SERVICE_USER_SETTINGS, this))
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
index f454628..848f166 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
@@ -53,7 +53,7 @@
// We mean it.
//
-#include "../qnetworksessionengine_impl.h"
+#include "../qbearerengine_impl.h"
#include "qnetworkmanagerservice.h"
@@ -62,7 +62,7 @@
QT_BEGIN_NAMESPACE
-class QNetworkManagerEngine : public QNetworkSessionEngineImpl
+class QNetworkManagerEngine : public QBearerEngineImpl
{
Q_OBJECT
diff --git a/src/plugins/bearer/nla/nla.pro b/src/plugins/bearer/nla/nla.pro
index 4c5e492..5ba171e 100644
--- a/src/plugins/bearer/nla/nla.pro
+++ b/src/plugins/bearer/nla/nla.pro
@@ -12,7 +12,7 @@ QT += network
HEADERS += qnlaengine.h \
../platformdefs_win.h \
../qnetworksession_impl.h \
- ../qnetworksessionengine_impl.h
+ ../qbeaerengine_impl.h
SOURCES += main.cpp \
qnlaengine.cpp \
diff --git a/src/plugins/bearer/nla/qnlaengine.cpp b/src/plugins/bearer/nla/qnlaengine.cpp
index ed802c0..fbfac17 100644
--- a/src/plugins/bearer/nla/qnlaengine.cpp
+++ b/src/plugins/bearer/nla/qnlaengine.cpp
@@ -506,7 +506,7 @@ void QNlaThread::fetchConfigurations()
}
QNlaEngine::QNlaEngine(QObject *parent)
-: QNetworkSessionEngineImpl(parent), nlaThread(0)
+: QBearerEngineImpl(parent), nlaThread(0)
{
nlaThread = new QNlaThread(this);
connect(nlaThread, SIGNAL(networksChanged()),
diff --git a/src/plugins/bearer/nla/qnlaengine.h b/src/plugins/bearer/nla/qnlaengine.h
index fa010b9..14c5201 100644
--- a/src/plugins/bearer/nla/qnlaengine.h
+++ b/src/plugins/bearer/nla/qnlaengine.h
@@ -53,7 +53,7 @@
// We mean it.
//
-#include "../qnetworksessionengine_impl.h"
+#include "../qbearerengine_impl.h"
#include <QtNetwork/private/qnativesocketengine_p.h>
@@ -72,7 +72,7 @@ public:
int version;
};
-class QNlaEngine : public QNetworkSessionEngineImpl
+class QNlaEngine : public QBearerEngineImpl
{
Q_OBJECT
diff --git a/src/plugins/bearer/qnetworksessionengine_impl.h b/src/plugins/bearer/qbearerengine_impl.h
index 1294cc5..6fffe27 100644
--- a/src/plugins/bearer/qnetworksessionengine_impl.h
+++ b/src/plugins/bearer/qbearerengine_impl.h
@@ -39,14 +39,14 @@
**
****************************************************************************/
-#ifndef QNETWORKSESSIONENGINE_IMPL_H
-#define QNETWORKSESSIONENGINE_IMPL_H
+#ifndef QBEARERENGINE_IMPL_H
+#define QBEARERENGINE_IMPL_H
-#include <QtNetwork/private/qnetworksessionengine_p.h>
+#include <QtNetwork/private/qbearerengine_p.h>
QT_BEGIN_NAMESPACE
-class QNetworkSessionEngineImpl : public QNetworkSessionEngine
+class QBearerEngineImpl : public QBearerEngine
{
Q_OBJECT
@@ -58,8 +58,8 @@ public:
DisconnectionError,
};
- QNetworkSessionEngineImpl(QObject *parent = 0) : QNetworkSessionEngine(parent) { }
- ~QNetworkSessionEngineImpl() { }
+ QBearerEngineImpl(QObject *parent = 0) : QBearerEngine(parent) { }
+ ~QBearerEngineImpl() { }
virtual void connectToId(const QString &id) = 0;
virtual void disconnectFromId(const QString &id) = 0;
@@ -74,4 +74,4 @@ Q_SIGNALS:
QT_END_NAMESPACE
-#endif // QNETWORKSESSIONENGINE_IMPL_H
+#endif
diff --git a/src/plugins/bearer/qnetworksession_impl.cpp b/src/plugins/bearer/qnetworksession_impl.cpp
index 6de3423..c823d89 100644
--- a/src/plugins/bearer/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/qnetworksession_impl.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include "qnetworksession_impl.h"
-#include "qnetworksessionengine_impl.h"
+#include "qbearerengine_impl.h"
#include <QtNetwork/qnetworksession.h>
#include <QtNetwork/private/qnetworkconfigmanager_p.h>
@@ -53,12 +53,12 @@
QT_BEGIN_NAMESPACE
-static QNetworkSessionEngineImpl *getEngineFromId(const QString &id)
+static QBearerEngineImpl *getEngineFromId(const QString &id)
{
QNetworkConfigurationManagerPrivate *priv = qNetworkConfigurationManagerPrivate();
- foreach (QNetworkSessionEngine *engine, priv->sessionEngines) {
- QNetworkSessionEngineImpl *engineImpl = qobject_cast<QNetworkSessionEngineImpl *>(engine);
+ foreach (QBearerEngine *engine, priv->sessionEngines) {
+ QBearerEngineImpl *engineImpl = qobject_cast<QBearerEngineImpl *>(engine);
if (engineImpl && engineImpl->hasIdentifier(id))
return engineImpl;
}
@@ -111,16 +111,16 @@ void QNetworkSessionPrivateImpl::syncStateWithInterface()
state = QNetworkSession::Invalid;
lastError = QNetworkSession::UnknownSessionError;
- qRegisterMetaType<QNetworkSessionEngineImpl::ConnectionError>
- ("QNetworkSessionEngineImpl::ConnectionError");
+ qRegisterMetaType<QBearerEngineImpl::ConnectionError>
+ ("QBearerEngineImpl::ConnectionError");
switch (publicConfig.type()) {
case QNetworkConfiguration::InternetAccessPoint:
activeConfig = publicConfig;
engine = getEngineFromId(activeConfig.identifier());
if (engine) {
- connect(engine, SIGNAL(connectionError(QString,QNetworkSessionEngine::ConnectionError)),
- this, SLOT(connectionError(QString,QNetworkSessionEngine::ConnectionError)),
+ connect(engine, SIGNAL(connectionError(QString,QBearerEngine::ConnectionError)),
+ this, SLOT(connectionError(QString,QBearerEngine::ConnectionError)),
Qt::QueuedConnection);
}
break;
@@ -322,15 +322,15 @@ void QNetworkSessionPrivateImpl::updateStateFromServiceNetwork()
if (activeConfig != config) {
if (engine) {
- disconnect(engine, SIGNAL(connectionError(QString,QNetworkSessionEngine::ConnectionError)),
- this, SLOT(connectionError(QString,QNetworkSessionEngine::ConnectionError)));
+ disconnect(engine, SIGNAL(connectionError(QString,QBearerEngine::ConnectionError)),
+ this, SLOT(connectionError(QString,QBearerEngine::ConnectionError)));
}
activeConfig = config;
engine = getEngineFromId(activeConfig.identifier());
if (engine) {
- connect(engine, SIGNAL(connectionError(QString,QNetworkSessionEngine::ConnectionError)),
- this, SLOT(connectionError(QString,QNetworkSessionEngine::ConnectionError)),
+ connect(engine, SIGNAL(connectionError(QString,QBearerEngine::ConnectionError)),
+ this, SLOT(connectionError(QString,QBearerEngine::ConnectionError)),
Qt::QueuedConnection);
}
emit newConfigurationActivated();
@@ -408,18 +408,18 @@ void QNetworkSessionPrivateImpl::forcedSessionClose(const QNetworkConfiguration
}
void QNetworkSessionPrivateImpl::connectionError(const QString &id,
- QNetworkSessionEngineImpl::ConnectionError error)
+ QBearerEngineImpl::ConnectionError error)
{
if (activeConfig.identifier() == id) {
networkConfigurationsChanged();
switch (error) {
- case QNetworkSessionEngineImpl::OperationNotSupported:
+ case QBearerEngineImpl::OperationNotSupported:
lastError = QNetworkSession::OperationNotSupportedError;
opened = false;
break;
- case QNetworkSessionEngineImpl::InterfaceLookupError:
- case QNetworkSessionEngineImpl::ConnectError:
- case QNetworkSessionEngineImpl::DisconnectionError:
+ case QBearerEngineImpl::InterfaceLookupError:
+ case QBearerEngineImpl::ConnectError:
+ case QBearerEngineImpl::DisconnectionError:
default:
lastError = QNetworkSession::UnknownSessionError;
}
diff --git a/src/plugins/bearer/qnetworksession_impl.h b/src/plugins/bearer/qnetworksession_impl.h
index 1fd97d3..0126a99 100644
--- a/src/plugins/bearer/qnetworksession_impl.h
+++ b/src/plugins/bearer/qnetworksession_impl.h
@@ -53,7 +53,7 @@
// We mean it.
//
-#include "qnetworksessionengine_impl.h"
+#include "qbearerengine_impl.h"
#include <QtNetwork/private/qnetworkconfigmanager_p.h>
#include <QtNetwork/private/qnetworksession_p.h>
@@ -62,7 +62,7 @@
QT_BEGIN_NAMESPACE
-class QNetworkSessionEngineImpl;
+class QBearerEngineImpl;
class QNetworkSessionPrivateImpl : public QNetworkSessionPrivate
{
@@ -110,7 +110,7 @@ private Q_SLOTS:
void networkConfigurationsChanged();
void configurationChanged(const QNetworkConfiguration &config);
void forcedSessionClose(const QNetworkConfiguration &config);
- void connectionError(const QString &id, QNetworkSessionEngineImpl::ConnectionError error);
+ void connectionError(const QString &id, QBearerEngineImpl::ConnectionError error);
private:
QNetworkConfigurationManager manager;
@@ -121,7 +121,7 @@ private:
bool opened;
- QNetworkSessionEngineImpl *engine;
+ QBearerEngineImpl *engine;
QNetworkSession::SessionError lastError;
diff --git a/src/plugins/bearer/symbian/symbianengine.cpp b/src/plugins/bearer/symbian/symbianengine.cpp
index 3d0ec0f..2d0b5ee 100644
--- a/src/plugins/bearer/symbian/symbianengine.cpp
+++ b/src/plugins/bearer/symbian/symbianengine.cpp
@@ -98,7 +98,7 @@ QString SymbianNetworkConfigurationPrivate::bearerName() const
}
SymbianEngine::SymbianEngine(QObject *parent)
-: QNetworkSessionEngine(parent), CActive(CActive::EPriorityIdle), iInitOk(true)
+: QBearerEngine(parent), CActive(CActive::EPriorityIdle), iInitOk(true)
{
CActiveScheduler::Add(this);
diff --git a/src/plugins/bearer/symbian/symbianengine.h b/src/plugins/bearer/symbian/symbianengine.h
index 4a4a8c1..587585b 100644
--- a/src/plugins/bearer/symbian/symbianengine.h
+++ b/src/plugins/bearer/symbian/symbianengine.h
@@ -42,7 +42,7 @@
#ifndef SYMBIANENGINE_H
#define SYMBIANENGINE_H
-#include <QtNetwork/private/qnetworksessionengine_p.h>
+#include <QtNetwork/private/qbearerengine_p.h>
#include <QtNetwork/qnetworkconfigmanager.h>
#include <QHash>
@@ -97,7 +97,7 @@ inline SymbianNetworkConfigurationPrivate *toSymbianConfig(QNetworkConfiguration
return static_cast<SymbianNetworkConfigurationPrivate *>(ptr.data());
}
-class SymbianEngine : public QNetworkSessionEngine, public CActive,
+class SymbianEngine : public QBearerEngine, public CActive,
public MConnectionMonitorObserver
{
Q_OBJECT