Diffstat (limited to 'noncore/settings/networksettings2/vpn') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/vpn/vpn_NN.cpp | 14 | ||||
-rw-r--r-- | noncore/settings/networksettings2/vpn/vpn_NN.h | 8 | ||||
-rw-r--r-- | noncore/settings/networksettings2/vpn/vpn_NNI.cpp | 6 | ||||
-rw-r--r-- | noncore/settings/networksettings2/vpn/vpn_NNI.h | 16 |
4 files changed, 7 insertions, 37 deletions
diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.cpp b/noncore/settings/networksettings2/vpn/vpn_NN.cpp index 6c7b308..9d3b6e7 100644 --- a/noncore/settings/networksettings2/vpn/vpn_NN.cpp +++ b/noncore/settings/networksettings2/vpn/vpn_NN.cpp @@ -1,18 +1,17 @@ #include "vpn_NN.h" #include "vpn_NNI.h" static const char * VPNNeeds[] = - { "connection", - 0 + { 0 }; /** * Constructor, find all of the possible interfaces */ VPNNetNode::VPNNetNode() : ANetNode(tr("VPN Connection")) { } /** * Delete any interfaces that we own. */ VPNNetNode::~VPNNetNode(){ @@ -29,34 +28,23 @@ const QString VPNNetNode::nodeDescription(){ ANetNodeInstance * VPNNetNode::createInstance( void ) { return new AVPN( this ); } const char ** VPNNetNode::needs( void ) { return VPNNeeds; } const char * VPNNetNode::provides( void ) { return "connection"; } -bool VPNNetNode::generateProperFilesFor( - ANetNodeInstance * ) { - return 0; -} - -bool VPNNetNode::generateDeviceDataForCommonFile( - SystemFile & , - long ) { - return 0; -} - void VPNNetNode::setSpecificAttribute( QString & , QString & ) { } void VPNNetNode::saveSpecificAttribute( QTextStream & ) { } extern "C" { void create_plugin( QList<ANetNode> & PNN ) { PNN.append( new VPNNetNode() ); } } diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.h b/noncore/settings/networksettings2/vpn/vpn_NN.h index 5b6632e..3c7b5e0 100644 --- a/noncore/settings/networksettings2/vpn/vpn_NN.h +++ b/noncore/settings/networksettings2/vpn/vpn_NN.h @@ -9,36 +9,28 @@ class VPNNetNode : public ANetNode{ Q_OBJECT public: VPNNetNode(); virtual ~VPNNetNode(); virtual const QString pixmapName() { return "Devices/vpn"; } virtual const QString nodeDescription() ; - virtual ANetNodeInstance * createInstance( void ); - virtual const char ** needs( void ); virtual const char * provides( void ); - virtual bool generateProperFilesFor( ANetNodeInstance * NNI ); - virtual bool hasDataFor( const QString & ) - { return 0; } - virtual bool generateDeviceDataForCommonFile( - SystemFile & SF, long DevNr ); - private: virtual void setSpecificAttribute( QString & Attr, QString & Value ); virtual void saveSpecificAttribute( QTextStream & TS ); }; extern "C" { void create_plugin( QList<ANetNode> & PNN ); }; #endif diff --git a/noncore/settings/networksettings2/vpn/vpn_NNI.cpp b/noncore/settings/networksettings2/vpn/vpn_NNI.cpp index ee999e8..6c20aeb 100644 --- a/noncore/settings/networksettings2/vpn/vpn_NNI.cpp +++ b/noncore/settings/networksettings2/vpn/vpn_NNI.cpp @@ -19,18 +19,12 @@ QWidget * AVPN::edit( QWidget * parent ) { return GUI; } QString AVPN::acceptable( void ) { return ( GUI ) ? GUI->acceptable( ) : QString(); } void AVPN::commit( void ) { if( GUI && GUI->commit( Data ) ) setModified( 1 ); } -bool AVPN::generateDataForCommonFile( - SystemFile & , - long) { - return 1; -} - diff --git a/noncore/settings/networksettings2/vpn/vpn_NNI.h b/noncore/settings/networksettings2/vpn/vpn_NNI.h index c3eb016..aee5891 100644 --- a/noncore/settings/networksettings2/vpn/vpn_NNI.h +++ b/noncore/settings/networksettings2/vpn/vpn_NNI.h @@ -5,41 +5,37 @@ #include "vpndata.h" #include "vpnrun.h" class VPNNetNode; class VPNEdit; class AVPN : public ANetNodeInstance { public : AVPN( VPNNetNode * PNN ); + RuntimeInfo * runtime( void ) + { return + ( RT ) ? RT : ( RT = new VPNRun( this, Data ) ); + } + QWidget * edit( QWidget * parent ); QString acceptable( void ); void commit( void ); - RuntimeInfo * runtime( void ) - { if( RT == 0 ) - RT = new VPNRun( this, Data ); - return RT; - } - virtual void * data( void ) { return (void *)&Data; } - virtual bool hasDataFor( const QString & ) - { return 0; } - virtual bool generateDataForCommonFile( - SystemFile & SF, long DevNr ); + protected : virtual void setSpecificAttribute( QString & Attr, QString & Value ); virtual void saveSpecificAttribute( QTextStream & TS ); private : VPNEdit * GUI; VPNData Data; VPNRun * RT; }; |