Bearer Management Integration 2.

3 files changed, 11 insertions, 16 deletions

diff --git a/examples/network/bearercloud/bearercloud.pro b/examples/network/bearercloud/bearercloud.pro
index 308ddda..75e3049 100644
--- a/examples/network/bearercloud/bearercloud.pro
+++ b/examples/network/bearercloud/bearercloud.pro
@@ -15,16 +15,9 @@ INCLUDEPATH += ../../src/bearer
 
 include(../examples.pri)
 
-qtAddLibrary(QtBearer)
+CONFIG += mobility
+MOBILITY = bearer
 
 CONFIG += console
 
-include(../examples.pri)
-
-
-macx: {
-    contains(QT_CONFIG,qt_framework):LIBS += -framework QtBearer
-    INCLUDEPATH += ../../
-    contains(CONFIG, debug) {
-    }
-}
+symbian:TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData
diff --git a/examples/network/bearercloud/cloud.cpp b/examples/network/bearercloud/cloud.cpp
index 4a1bde7..61bd88e 100644
--- a/examples/network/bearercloud/cloud.cpp
+++ b/examples/network/bearercloud/cloud.cpp
@@ -226,7 +226,7 @@ QVariant Cloud::itemChange(GraphicsItemChange change, const QVariant &value)
 void Cloud::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
 {
     if (event->button() == Qt::LeftButton) {
-        if (session->isActive())
+        if (session->isOpen())
             session->close();
         else
             session->open();
@@ -258,7 +258,7 @@ void Cloud::stateChanged(QNetworkSession::State state)
         tooltip += tr("<br>Interface: %1").arg(interface.humanReadableName());
     tooltip += tr("<br>Id: %1").arg(configuration.identifier());
 
-    const QString bearerName = session->bearerName();
+    const QString bearerName = configuration.bearerName();
     if (!bearerName.isEmpty())
         tooltip += tr("<br>Bearer: %1").arg(bearerName);
 
@@ -289,10 +289,10 @@ void Cloud::stateChanged(QNetworkSession::State state)
         s = s.arg(tr("Unknown"));
     }
 
-    if (session->isActive())
-        s = s.arg(tr("Active"));
+    if (session->isOpen())
+        s = s.arg(tr("Open"));
     else
-        s = s.arg(tr("Inactive"));
+        s = s.arg(tr("Closed"));
 
     tooltip += s;
 
@@ -307,7 +307,7 @@ void Cloud::stateChanged(QNetworkSession::State state)
 //! [1]
 void Cloud::newConfigurationActivated()
 {
-    const QString bearerName = session->bearerName();
+    const QString bearerName = configuration.bearerName();
     if (!svgCache.contains(bearerName)) {
         if (bearerName == QLatin1String("WLAN"))
             svgCache.insert(bearerName, new QSvgRenderer(QLatin1String(":wlan.svg")));
diff --git a/examples/network/bearercloud/cloud.h b/examples/network/bearercloud/cloud.h
index 4ce43df..b542bf7 100644
--- a/examples/network/bearercloud/cloud.h
+++ b/examples/network/bearercloud/cloud.h
@@ -45,8 +45,10 @@
 #include <QGraphicsItem>
 QTM_USE_NAMESPACE
 
+QT_BEGIN_NAMESPACE
 class QGraphicsTextItem;
 class QGraphicsSvgItem;
+QT_END_NAMESPACE
 
 class Cloud : public QObject, public QGraphicsItem
 {