Connection handling improved again. Added ability to bybass general Maemo connectivit...

[jenirok] / src / common / connectionmanager.h

diff --git a/src/common/connectionmanager.h b/src/common/connectionmanager.h
index 49e6dfc..547163d 100644 (file)
--- a/src/common/connectionmanager.h
+++ b/src/common/connectionmanager.h
@@ -33,8 +33,7 @@ class ConnectionManager : public QObject
 
 public:
 
-    enum ConnectionType {WLAN, GPRS};
-    enum NetworkMode {NETWORK_UNKNOWN, NETWORK_2G, NETWORK_2_5G, NETWORK_3G, NETWORK_3_5G};
+    enum ConnectionType {NO_TYPE, WLAN, GPRS};
     enum Error {NO_ERROR, NO_AVAILABLE_CONNECTIONS, INVALID_IAP, UNKNOWN_ERROR};
 
     struct Connection
@@ -51,12 +50,10 @@ public:
     bool connect();
     bool connect(Connection const& connection);
     bool connect(QString const& id);
-    bool getBestConnection(Connection& connection);
-    bool autoConnect();
+    bool getBestConnection(Connection& connection, ConnectionType type = NO_TYPE);
     bool disconnect(bool force = false);
     bool isConnected();
-    bool scanConnections(QList<Connection>& connections);
-    NetworkMode getNetworkMode();
+    bool scanConnections(QList<Connection>& connections, ConnectionType type = NO_TYPE);
     Error error() const;
     static unsigned int const TIMEOUT = 20000;