Diffstat (limited to 'noncore/settings/networksettings2/vpn') (more/less context) (ignore whitespace changes)
8 files changed, 25 insertions, 30 deletions
diff --git a/noncore/settings/networksettings2/vpn/opie-networksettings2plugin-vpn.control b/noncore/settings/networksettings2/vpn/opie-networksettings2plugin-vpn.control index b346c5d..08f131f 100644 --- a/noncore/settings/networksettings2/vpn/opie-networksettings2plugin-vpn.control +++ b/noncore/settings/networksettings2/vpn/opie-networksettings2plugin-vpn.control | |||
@@ -1,3 +1,3 @@ | |||
1 | Package: opie-networksettingsplugin2-vpn | 1 | Package: opie-networksettings2plugin-vpn |
2 | Files: plugins/networksettings2/libvpn.so* | 2 | Files: plugins/networksettings2/libvpn.so* |
3 | Priority: optional | 3 | Priority: optional |
diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.cpp b/noncore/settings/networksettings2/vpn/vpn_NN.cpp index 9d3b6e7..23ec04a 100644 --- a/noncore/settings/networksettings2/vpn/vpn_NN.cpp +++ b/noncore/settings/networksettings2/vpn/vpn_NN.cpp | |||
@@ -6,4 +6,8 @@ static const char * VPNNeeds[] = | |||
6 | }; | 6 | }; |
7 | 7 | ||
8 | static const char * VPNProvides[] = | ||
9 | { "connection", | ||
10 | 0 | ||
11 | }; | ||
8 | /** | 12 | /** |
9 | * Constructor, find all of the possible interfaces | 13 | * Constructor, find all of the possible interfaces |
@@ -34,6 +38,6 @@ const char ** VPNNetNode::needs( void ) { | |||
34 | } | 38 | } |
35 | 39 | ||
36 | const char * VPNNetNode::provides( void ) { | 40 | const char ** VPNNetNode::provides( void ) { |
37 | return "connection"; | 41 | return VPNProvides; |
38 | } | 42 | } |
39 | 43 | ||
diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.h b/noncore/settings/networksettings2/vpn/vpn_NN.h index 3c7b5e0..c2e43d4 100644 --- a/noncore/settings/networksettings2/vpn/vpn_NN.h +++ b/noncore/settings/networksettings2/vpn/vpn_NN.h | |||
@@ -21,5 +21,5 @@ public: | |||
21 | virtual ANetNodeInstance * createInstance( void ); | 21 | virtual ANetNodeInstance * createInstance( void ); |
22 | virtual const char ** needs( void ); | 22 | virtual const char ** needs( void ); |
23 | virtual const char * provides( void ); | 23 | virtual const char ** provides( void ); |
24 | 24 | ||
25 | private: | 25 | private: |
diff --git a/noncore/settings/networksettings2/vpn/vpndata.h b/noncore/settings/networksettings2/vpn/vpndata.h index 5c986aa..ee88bc4 100644 --- a/noncore/settings/networksettings2/vpn/vpndata.h +++ b/noncore/settings/networksettings2/vpn/vpndata.h | |||
@@ -3,5 +3,6 @@ | |||
3 | 3 | ||
4 | #include <qstring.h> | 4 | #include <qstring.h> |
5 | typedef struct VPNData { | 5 | class VPNData { |
6 | public : | ||
6 | QString Device; | 7 | QString Device; |
7 | QString LockFile; | 8 | QString LockFile; |
@@ -12,5 +13,5 @@ typedef struct VPNData { | |||
12 | bool HardwareControl; | 13 | bool HardwareControl; |
13 | bool SoftwareControl; | 14 | bool SoftwareControl; |
14 | } VPNData_t; | 15 | } ; |
15 | 16 | ||
16 | #endif | 17 | #endif |
diff --git a/noncore/settings/networksettings2/vpn/vpnedit.cpp b/noncore/settings/networksettings2/vpn/vpnedit.cpp index f336394..8445757 100644 --- a/noncore/settings/networksettings2/vpn/vpnedit.cpp +++ b/noncore/settings/networksettings2/vpn/vpnedit.cpp | |||
@@ -11,8 +11,8 @@ QString VPNEdit::acceptable( void ) { | |||
11 | } | 11 | } |
12 | 12 | ||
13 | void VPNEdit::showData( VPNData_t & Data ) { | 13 | void VPNEdit::showData( VPNData & Data ) { |
14 | } | 14 | } |
15 | 15 | ||
16 | bool VPNEdit::commit( VPNData_t & Data ) { | 16 | bool VPNEdit::commit( VPNData & Data ) { |
17 | return 0; | 17 | return 0; |
18 | } | 18 | } |
diff --git a/noncore/settings/networksettings2/vpn/vpnedit.h b/noncore/settings/networksettings2/vpn/vpnedit.h index 76480cd..156bcc5 100644 --- a/noncore/settings/networksettings2/vpn/vpnedit.h +++ b/noncore/settings/networksettings2/vpn/vpnedit.h | |||
@@ -8,5 +8,5 @@ public : | |||
8 | VPNEdit( QWidget * parent ); | 8 | VPNEdit( QWidget * parent ); |
9 | QString acceptable( void ); | 9 | QString acceptable( void ); |
10 | bool commit( VPNData_t & Data ); | 10 | bool commit( VPNData & Data ); |
11 | void showData( VPNData_t & Data ); | 11 | void showData( VPNData & Data ); |
12 | }; | 12 | }; |
diff --git a/noncore/settings/networksettings2/vpn/vpnrun.cpp b/noncore/settings/networksettings2/vpn/vpnrun.cpp index ab2966c..64728aa 100644 --- a/noncore/settings/networksettings2/vpn/vpnrun.cpp +++ b/noncore/settings/networksettings2/vpn/vpnrun.cpp | |||
@@ -1,6 +1 @@ | |||
1 | #include "vpnrun.h" | #include "vpnrun.h" | |
2 | |||
3 | bool VPNRun::handlesInterface( const QString & ) { | ||
4 | // to be figured out | ||
5 | return 0; | ||
6 | } | ||
diff --git a/noncore/settings/networksettings2/vpn/vpnrun.h b/noncore/settings/networksettings2/vpn/vpnrun.h index c19b609..9a55625 100644 --- a/noncore/settings/networksettings2/vpn/vpnrun.h +++ b/noncore/settings/networksettings2/vpn/vpnrun.h | |||
@@ -2,30 +2,25 @@ | |||
2 | #define VPNRUN_H | 2 | #define VPNRUN_H |
3 | 3 | ||
4 | #include <asconnection.h> | 4 | #include <netnode.h> |
5 | #include "vpndata.h" | 5 | #include "vpndata.h" |
6 | 6 | ||
7 | class VPNRun : public AsConnection { | 7 | class VPNRun : public RuntimeInfo { |
8 | 8 | ||
9 | public : | 9 | public : |
10 | 10 | ||
11 | VPNRun( ANetNodeInstance * NNI, VPNData & Data ) : | 11 | VPNRun( ANetNodeInstance * NNI, VPNData & Data ) : |
12 | AsConnection( NNI ) | 12 | RuntimeInfo( NNI ) |
13 | { } | 13 | { } |
14 | 14 | ||
15 | virtual AsConnection * asConnection( void ) | 15 | virtual RuntimeInfo * connection( void ) |
16 | { return (AsConnection *)this; } | 16 | { return this; } |
17 | protected : | ||
18 | |||
19 | void detectState( NodeCollection * ) | ||
20 | { } | ||
21 | 17 | ||
22 | bool setState( NodeCollection *, Action_t, bool ) | 18 | State_t detectState( void ) |
23 | { return 0; } | 19 | { return Unknown; } |
24 | 20 | ||
25 | bool canSetState( State_t, Action_t ) | 21 | protected : |
26 | { return 0; } | ||
27 | |||
28 | bool handlesInterface( const QString & I ); | ||
29 | 22 | ||
23 | QString setMyState( NodeCollection * , Action_t, bool ) | ||
24 | { return QString(); } | ||
30 | }; | 25 | }; |
31 | 26 | ||