Diffstat (limited to 'noncore/settings/networksettings2/ppp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/ppp/ppp_NN.cpp | 17 | ||||
-rw-r--r-- | noncore/settings/networksettings2/ppp/ppp_NN.h | 9 | ||||
-rw-r--r-- | noncore/settings/networksettings2/ppp/ppp_NNI.cpp | 6 | ||||
-rw-r--r-- | noncore/settings/networksettings2/ppp/ppp_NNI.h | 5 | ||||
-rw-r--r-- | noncore/settings/networksettings2/ppp/ppprun.h | 2 |
5 files changed, 21 insertions, 18 deletions
diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.cpp b/noncore/settings/networksettings2/ppp/ppp_NN.cpp index 51d17ec..b3f70c5 100644 --- a/noncore/settings/networksettings2/ppp/ppp_NN.cpp +++ b/noncore/settings/networksettings2/ppp/ppp_NN.cpp @@ -46,10 +46,5 @@ bool PPPNetNode::generateProperFilesFor( -bool PPPNetNode::hasDataFor( const QString &, bool ) { - return 0; -} - -bool PPPNetNode::generateDataForCommonFile( +bool PPPNetNode::generateDeviceDataForCommonFile( SystemFile & , - long, - ANetNodeInstance * ) { + long ) { return 1; @@ -57,7 +52,5 @@ bool PPPNetNode::generateDataForCommonFile( -bool PPPNetNode::generateDeviceDataForCommonFile( - SystemFile & , - long , - ANetNodeInstance * ) { - return 1; +QString PPPNetNode::genNic( long NicNr ) { + QString S; + return S.sprintf( "ppp%ld", NicNr ); } diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.h b/noncore/settings/networksettings2/ppp/ppp_NN.h index 8d56e7f..c33f281 100644 --- a/noncore/settings/networksettings2/ppp/ppp_NN.h +++ b/noncore/settings/networksettings2/ppp/ppp_NN.h @@ -30,7 +30,8 @@ public: virtual bool generateProperFilesFor( ANetNodeInstance * NNI ); - virtual bool hasDataFor( const QString & S, bool DS ); - virtual bool generateDataForCommonFile( - SystemFile & SF, long DevNr, ANetNodeInstance * NNI ); + virtual bool hasDataFor( const QString & ) + { return 0; } virtual bool generateDeviceDataForCommonFile( - SystemFile & SF, long DevNr, ANetNodeInstance * NNI ); + SystemFile & SF, long DevNr ); + + virtual QString genNic( long NicNr ); diff --git a/noncore/settings/networksettings2/ppp/ppp_NNI.cpp b/noncore/settings/networksettings2/ppp/ppp_NNI.cpp index d09ecf9..d0fd31c 100644 --- a/noncore/settings/networksettings2/ppp/ppp_NNI.cpp +++ b/noncore/settings/networksettings2/ppp/ppp_NNI.cpp @@ -115 +115,7 @@ void APPP::commit( void ) { +bool APPP::generateDataForCommonFile( + SystemFile & , + long) { + return 1; +} + diff --git a/noncore/settings/networksettings2/ppp/ppp_NNI.h b/noncore/settings/networksettings2/ppp/ppp_NNI.h index a17721a..989c2f0 100644 --- a/noncore/settings/networksettings2/ppp/ppp_NNI.h +++ b/noncore/settings/networksettings2/ppp/ppp_NNI.h @@ -29,2 +29,7 @@ public : + virtual bool hasDataFor( const QString & ) + { return 0; } + + virtual bool generateDataForCommonFile( + SystemFile & SF, long DevNr ); protected : diff --git a/noncore/settings/networksettings2/ppp/ppprun.h b/noncore/settings/networksettings2/ppp/ppprun.h index 765aff2..af51fbe 100644 --- a/noncore/settings/networksettings2/ppp/ppprun.h +++ b/noncore/settings/networksettings2/ppp/ppprun.h @@ -14,4 +14,2 @@ public : PPPData & Data ); - virtual QString genNic( long NicNr ) - { QString S; return S.sprintf( "ppp%ld", NicNr ); } |