Rename internal QNetworkSessionEngine* to QBearerEngine*.

8 files changed, 27 insertions, 29 deletions

diff --git a/src/network/bearer/bearer.pri b/src/network/bearer/bearer.pri
index 66b0ca4..14e7c0c 100644
--- a/src/network/bearer/bearer.pri
+++ b/src/network/bearer/bearer.pri
@@ -40,11 +40,11 @@ maemo {
     HEADERS += bearer/qnetworkconfigmanager_p.h \
                bearer/qnetworkconfiguration_p.h \
                bearer/qnetworksession_p.h \
-               bearer/qnetworksessionengine_p.h \
+               bearer/qbearerengine_p.h \
                bearer/qbearerplugin.h
 
     SOURCES += bearer/qnetworkconfigmanager_p.cpp \
-               bearer/qnetworksessionengine.cpp \
+               bearer/qbearerengine.cpp \
                bearer/qbearerplugin.cpp
 
     contains(QT_CONFIG, networkmanager):DEFINES += BACKEND_NM
diff --git a/src/network/bearer/qnetworksessionengine.cpp b/src/network/bearer/qbearerengine.cpp
index 0744add..4d56047 100644
--- a/src/network/bearer/qnetworksessionengine.cpp
+++ b/src/network/bearer/qbearerengine.cpp
@@ -39,16 +39,16 @@
 **
 ****************************************************************************/
 
-#include "qnetworksessionengine_p.h"
+#include "qbearerengine_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QNetworkSessionEngine::QNetworkSessionEngine(QObject *parent)
+QBearerEngine::QBearerEngine(QObject *parent)
 :   QObject(parent)
 {
 }
 
-QNetworkSessionEngine::~QNetworkSessionEngine()
+QBearerEngine::~QBearerEngine()
 {
     foreach (const QString &oldIface, snapConfigurations.keys()) {
         QNetworkConfigurationPrivatePointer priv = snapConfigurations.take(oldIface);
@@ -69,6 +69,6 @@ QNetworkSessionEngine::~QNetworkSessionEngine()
     }
 }
 
-#include "moc_qnetworksessionengine_p.cpp"
-QT_END_NAMESPACE
+#include "moc_qbearerengine_p.cpp"
 
+QT_END_NAMESPACE
diff --git a/src/network/bearer/qnetworksessionengine_p.h b/src/network/bearer/qbearerengine_p.h
index 39c3d17..7e96877 100644
--- a/src/network/bearer/qnetworksessionengine_p.h
+++ b/src/network/bearer/qbearerengine_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QNETWORKSESSIONENGINE_P_H
-#define QNETWORKSESSIONENGINE_P_H
+#ifndef QBEARERENGINE_P_H
+#define QBEARERENGINE_P_H
 
 //
 //  W A R N I N G
@@ -68,13 +68,13 @@ QT_BEGIN_NAMESPACE
 
 class QNetworkConfiguration;
 
-class Q_NETWORK_EXPORT QNetworkSessionEngine : public QObject
+class Q_NETWORK_EXPORT QBearerEngine : public QObject
 {
     Q_OBJECT
 
 public:
-    QNetworkSessionEngine(QObject *parent = 0);
-    virtual ~QNetworkSessionEngine();
+    QBearerEngine(QObject *parent = 0);
+    virtual ~QBearerEngine();
 
     virtual bool hasIdentifier(const QString &id) = 0;
 
@@ -102,8 +102,6 @@ Q_SIGNALS:
     void updateCompleted();
 };
 
-typedef QNetworkSessionEngine QBearerEngine;
-
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/network/bearer/qbearerplugin.h b/src/network/bearer/qbearerplugin.h
index 970410b..1958188 100644
--- a/src/network/bearer/qbearerplugin.h
+++ b/src/network/bearer/qbearerplugin.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -42,7 +42,7 @@
 #ifndef QBEARERPLUGIN_H
 #define QBEARERPLUGIN_H
 
-#include <QtNetwork/private/qnetworksessionengine_p.h>
+#include "qbearerengine_p.h"
 
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp
index f4daf4a..d46048b 100644
--- a/src/network/bearer/qnetworkconfigmanager.cpp
+++ b/src/network/bearer/qnetworkconfigmanager.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -42,7 +42,7 @@
 #include "qnetworkconfigmanager.h"
 
 #include "qnetworkconfigmanager_p.h"
-#include "qnetworksessionengine_p.h"
+#include "qbearerengine_p.h"
 
 #include <QtCore/qstringlist.h>
 
@@ -232,7 +232,7 @@ QList<QNetworkConfiguration> QNetworkConfigurationManager::allConfigurations(QNe
     QList<QNetworkConfiguration> result;
     QNetworkConfigurationManagerPrivate* conPriv = connManager();
 
-    foreach (QNetworkSessionEngine *engine, conPriv->sessionEngines) {
+    foreach (QBearerEngine *engine, conPriv->sessionEngines) {
         QStringList cpsIdents = engine->accessPointConfigurations.keys();
 
         //find all InternetAccessPoints
@@ -274,7 +274,7 @@ QNetworkConfiguration QNetworkConfigurationManager::configurationFromIdentifier(
 
     QNetworkConfiguration item;
 
-    foreach (QNetworkSessionEngine *engine, conPriv->sessionEngines) {
+    foreach (QBearerEngine *engine, conPriv->sessionEngines) {
         if (engine->accessPointConfigurations.contains(identifier))
             item.d = engine->accessPointConfigurations.value(identifier);
         else if (engine->snapConfigurations.contains(identifier))
diff --git a/src/network/bearer/qnetworkconfigmanager_p.cpp b/src/network/bearer/qnetworkconfigmanager_p.cpp
index bc3cfbd..a94fd2f 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.cpp
+++ b/src/network/bearer/qnetworkconfigmanager_p.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -176,7 +176,7 @@ void QNetworkConfigurationManagerPrivate::updateConfigurations()
         foreach (const QString &key, l->keys()) {
             QBearerEnginePlugin *plugin = qobject_cast<QBearerEnginePlugin *>(l->instance(key));
             if (plugin) {
-                QNetworkSessionEngine *engine = plugin->create(key);
+                QBearerEngine *engine = plugin->create(key);
                 if (!engine)
                     continue;
 
@@ -195,7 +195,7 @@ void QNetworkConfigurationManagerPrivate::updateConfigurations()
         }
     }
 
-    QNetworkSessionEngine *engine = qobject_cast<QNetworkSessionEngine *>(sender());
+    QBearerEngine *engine = qobject_cast<QBearerEngine *>(sender());
     if (!updatingEngines.isEmpty() && engine) {
         int index = sessionEngines.indexOf(engine);
         if (index >= 0)
@@ -219,7 +219,7 @@ void QNetworkConfigurationManagerPrivate::updateConfigurations()
 */
 QNetworkConfiguration QNetworkConfigurationManagerPrivate::defaultConfiguration()
 {
-    foreach (QNetworkSessionEngine *engine, sessionEngines) {
+    foreach (QBearerEngine *engine, sessionEngines) {
         QNetworkConfigurationPrivatePointer ptr = engine->defaultConfiguration();
 
         if (ptr) {
diff --git a/src/network/bearer/qnetworkconfigmanager_p.h b/src/network/bearer/qnetworkconfigmanager_p.h
index 4ef1f09..f6603ce 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.h
+++ b/src/network/bearer/qnetworkconfigmanager_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -58,7 +58,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QNetworkSessionEngine;
+class QBearerEngine;
 
 class QNetworkConfigurationManagerPrivate : public QObject
 {
@@ -96,7 +96,7 @@ private:
     void abort();
 
 public:
-    QList<QNetworkSessionEngine *> sessionEngines;
+    QList<QBearerEngine *> sessionEngines;
 
 private:
     QSet<QNetworkConfigurationPrivatePointer> onlineConfigurations;
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index c00921f..ba50ed6 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -43,7 +43,7 @@
 #include <QTimer>
 
 #include "qnetworksession.h"
-#include "qnetworksessionengine_p.h"
+#include "qbearerengine_p.h"
 #include "qnetworkconfigmanager_p.h"
 
 #if Q_WS_MAEMO_6
@@ -228,7 +228,7 @@ QT_BEGIN_NAMESPACE
 QNetworkSession::QNetworkSession(const QNetworkConfiguration& connectionConfig, QObject* parent)
 :   QObject(parent), d(0)
 {
-    foreach (QNetworkSessionEngine *engine, qNetworkConfigurationManagerPrivate()->sessionEngines) {
+    foreach (QBearerEngine *engine, qNetworkConfigurationManagerPrivate()->sessionEngines) {
         if (engine->hasIdentifier(connectionConfig.identifier())) {
             d = engine->createSessionBackend();
             d->q = this;