Rename QNetworkConfiguration::bearerName() function.

bearerName() -> bearerTypeName().

bearerName() is deprecated and converted into an inline function which
calls bearerTypeName(). This is required to keep existing code source
compatible between Qt Mobility 1.0.x and Qt 4.7.

Task-number: QTBUG-12378
Reviewed-by: Alex

2 files changed, 21 insertions, 9 deletions

diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp
index d7fceba..b939342 100644
--- a/src/network/bearer/qnetworkconfiguration.cpp
+++ b/src/network/bearer/qnetworkconfiguration.cpp
@@ -383,12 +383,20 @@ QList<QNetworkConfiguration> QNetworkConfiguration::children() const
 }
 
 /*!
-    Returns the type of bearer. The string is not translated and
-    therefore can not be shown to the user. The subsequent table presents the currently known
-    bearer types:
+    \fn QString QNetworkConfiguration::bearerName() const
+    \deprecated
+
+    This function is deprecated.  It is equivalent to calling bearerTypeName().
+*/
+
+/*!
+    Returns the type of bearer used by this network configuration as a string.
+
+    The string is not translated and therefore can not be shown to the user. The subsequent table
+    presents the currently known bearer types:
 
     \table
-        \header 
+        \header
             \o Value
             \o Description
         \row
@@ -403,7 +411,7 @@ QList<QNetworkConfiguration> QNetworkConfiguration::children() const
         \row
             \o 2G
             \o The session uses CSD, GPRS, HSCSD, EDGE or cdmaOne.
-        \row 
+        \row
             \o CDMA2000
             \o The session uses CDMA.
         \row
@@ -420,11 +428,11 @@ QList<QNetworkConfiguration> QNetworkConfiguration::children() const
             \o The session uses WiMAX.
     \endtable
 
-    This function returns an empty string if this is an invalid configuration,
-    a network configuration of type \l QNetworkConfiguration::ServiceNetwork or
+    This function returns an empty string if this is an invalid configuration, a network
+    configuration of type \l QNetworkConfiguration::ServiceNetwork or
     \l QNetworkConfiguration::UserChoice.
 */
-QString QNetworkConfiguration::bearerName() const
+QString QNetworkConfiguration::bearerTypeName() const
 {
     if (!isValid())
         return QString();
diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h
index dce39eb..42e8b6a 100644
--- a/src/network/bearer/qnetworkconfiguration.h
+++ b/src/network/bearer/qnetworkconfiguration.h
@@ -106,7 +106,11 @@ public:
     StateFlags state() const;
     Type type() const;
     Purpose purpose() const;
-    QString bearerName() const;
+
+    // Required to maintain source compatibility with Qt Mobility.
+    QT_DEPRECATED inline QString bearerName() const { return bearerTypeName(); }
+    QString bearerTypeName() const;
+
     QString identifier() const;
     bool isRoamingAvailable() const;
     QList<QNetworkConfiguration> children() const;