Add VPN and WiMax connection settings

1 files changed, 47 insertions, 4 deletions

diff --git a/tdecore/tdenetworkconnections.h b/tdecore/tdenetworkconnections.h
index 601fc92b2..5b80058aa 100644
--- a/tdecore/tdenetworkconnections.h
+++ b/tdecore/tdenetworkconnections.h
@@ -58,10 +58,28 @@
 
 typedef TQValueList<TQ_UINT8> TDENetworkByteList;
 typedef TQValueList<TQHostAddress> TDENetworkAddressList;
+typedef TQMap<TQString, TQString> TDENetworkSettingsMap;
+
+namespace TDENetworkDeviceType {
+	enum TDENetworkDeviceType {
+		BackendOnly,
+		WiredEthernet,
+		WiFi,
+		Bluetooth,
+		OLPCMesh,
+		WiMax,
+		Modem,
+		Infiniband,
+		Bond,
+		VLAN,
+		ADSL,
+		Other,
+		Last = Other
+	};
+};
 
 namespace TDENetworkConnectionType {
 	enum TDENetworkConnectionType {
-		BackendOnly,
 		WiredEthernet,
 		WiFi,
 		Bluetooth,
@@ -72,6 +90,7 @@ namespace TDENetworkConnectionType {
 		Bond,
 		VLAN,
 		ADSL,
+		VPN,
 		Other,
 		Last = Other
 	};
@@ -541,7 +560,7 @@ class TDECORE_EXPORT TDENetworkDeviceInformation
 		bool managed;
 		bool autoConnect;
 		bool firmwareMissing;
-		TDENetworkConnectionType::TDENetworkConnectionType deviceType;
+		TDENetworkDeviceType::TDENetworkDeviceType deviceType;
 		TDENetworkWiFiDeviceInfo wiFiInfo;
 };
 
@@ -636,6 +655,30 @@ class TDECORE_EXPORT TDEWiredInfinibandConnection : public TDENetworkConnection
 		TDENetworkInfinibandTransportMode::TDENetworkInfinibandTransportMode transportMode;
 };
 
+class TDECORE_EXPORT TDEVPNConnection : public TDENetworkConnection
+{
+	public:
+		TDEVPNConnection();
+		virtual ~TDEVPNConnection();
+
+	public:
+		TQString vpnPluginID;
+		TQString lockedUserName;
+		TDENetworkSettingsMap pluginData;
+		bool secretsValid;
+		TDENetworkSettingsMap pluginSecrets;
+};
+
+class TDECORE_EXPORT TDEWiMaxConnection : public TDENetworkConnection
+{
+	public:
+		TDEWiMaxConnection();
+		virtual ~TDEWiMaxConnection();
+
+	public:
+		TQString networkServiceProvider;
+};
+
 typedef TQPtrList< TDENetworkConnection > TDENetworkConnectionList;
 
 class TDECORE_EXPORT TDENetworkConnectionManager : public TQObject
@@ -647,7 +690,7 @@ class TDECORE_EXPORT TDENetworkConnectionManager : public TQObject
 		*  Constructor.
 		*  @param macAddress The MAC address of the hardware device
 		*  If an empty MAC address is passed, this object will make global networking backend
-		*  methods available exclusively (TDENetworkConnectionType::BackendOnly).
+		*  methods available exclusively (TDENetworkDeviceType::BackendOnly).
 		*/
 		TDENetworkConnectionManager(TQString macAddress);
 		
@@ -664,7 +707,7 @@ class TDECORE_EXPORT TDENetworkConnectionManager : public TQObject
 		/**
 		* @return the type of connection supported by this device
 		*/
-		virtual TDENetworkConnectionType::TDENetworkConnectionType connectionType() = 0;
+		virtual TDENetworkDeviceType::TDENetworkDeviceType deviceType() = 0;
 
 		/**
 		* @return A TDENetworkGlobalManagerFlags enum value with the current status of the networking backend.