diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/connman/qconnmanengine.h --- a/src/plugins/bearer/connman/qconnmanengine.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/connman/qconnmanengine.h Mon Oct 04 01:19:32 2010 +0300 @@ -80,8 +80,6 @@ virtual QString getInterfaceFromId(const QString &id); bool hasIdentifier(const QString &id); - virtual QString bearerName(const QString &id); - virtual void connectToId(const QString &id); virtual void disconnectFromId(const QString &id); @@ -125,7 +123,7 @@ QString networkFromId(const QString &id); QNetworkConfiguration::StateFlags getStateForService(const QString &service); - QString typeToBearer(const QString &type); + QNetworkConfiguration::BearerType typeToBearer(const QString &type); void removeConfiguration(const QString &servicePath); void addServiceConfiguration(const QString &servicePath); @@ -139,7 +137,8 @@ QMap deviceMap; //tech path, device path QMap serviceNetworks; //service, network - + QNetworkConfiguration::BearerType ofonoTechToBearerType(const QString &type); + bool isRoamingAllowed(const QString &context); protected: bool requiresPolling() const; QConnmanConnectThread *connThread;