Diffstat (limited to 'noncore/settings/networksettings2/ppp') (more/less context) (show whitespace changes)
5 files changed, 15 insertions, 16 deletions
diff --git a/noncore/settings/networksettings2/ppp/PPPDialingedit.cpp b/noncore/settings/networksettings2/ppp/PPPDialingedit.cpp index 9264ceb..2b03c73 100644 --- a/noncore/settings/networksettings2/ppp/PPPDialingedit.cpp +++ b/noncore/settings/networksettings2/ppp/PPPDialingedit.cpp @@ -17,7 +17,6 @@ QString PPPDialingEdit::acceptable( void ) { } -bool PPPDialingEdit::commit( PPPData & D ) { - bool SM; - return SM; +bool PPPDialingEdit::commit( PPPData & ) { + return true; } diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.cpp b/noncore/settings/networksettings2/ppp/ppp_NN.cpp index 8c15e9c..884168c 100644 --- a/noncore/settings/networksettings2/ppp/ppp_NN.cpp +++ b/noncore/settings/networksettings2/ppp/ppp_NN.cpp @@ -15,5 +15,5 @@ static const char * PPPNeeds[] = static const char * PPPProvides[] = - { "connection", + { "NetworkSetup", 0 }; @@ -22,5 +22,5 @@ static const char * PPPProvides[] = * Constructor, find all of the possible interfaces */ -PPPNetNode::PPPNetNode() : ANetNode(tr("PPP Connection")) { +PPPNetNode::PPPNetNode() : ANetNode(tr("PPP NetworkSetup")) { NSResources->addSystemFile( diff --git a/noncore/settings/networksettings2/ppp/ppp_NNI.cpp b/noncore/settings/networksettings2/ppp/ppp_NNI.cpp index 9e3bb64..7286d96 100644 --- a/noncore/settings/networksettings2/ppp/ppp_NNI.cpp +++ b/noncore/settings/networksettings2/ppp/ppp_NNI.cpp @@ -150,9 +150,9 @@ bool APPP::openFile( SystemFile & SF ) { if( SF.name() == "peers" ) { SF.setPath( removeSpaces( - QString( "/tmp/ppp/peers/" ) + connection()->name() ) ); + QString( "/tmp/ppp/peers/" ) + networkSetup()->name() ) ); return 1; } else if ( SF.name() == "chatscripts" ) { SF.setPath( removeSpaces( - QString( "/tmp/chatscripts/" ) + connection()->name() ) ); + QString( "/tmp/chatscripts/" ) + networkSetup()->name() ) ); return 1; } @@ -171,5 +171,5 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) { if( Data.Auth.Mode == 1 && Data.Auth.PCEMode == 0 ) { SF << "# secrets for " - << connection()->name().latin1() + << networkSetup()->name().latin1() << endl; SF << Data.Auth.Client @@ -180,5 +180,5 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) { << endl; rvl = 0; - rvd = connection()->getToplevel()->generateFileEmbedded( + rvd = networkSetup()->getToplevel()->generateFileEmbedded( SF, DevNr ); } @@ -188,5 +188,5 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) { // used for both EAP and Chap SF << "# secrets for " - << connection()->name().latin1() + << networkSetup()->name().latin1() << endl; SF << Data.Auth.Client @@ -198,5 +198,5 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) { rvl = 0; - rvd = connection()->getToplevel()->generateFileEmbedded( + rvd = networkSetup()->getToplevel()->generateFileEmbedded( SF, DevNr ); } @@ -222,10 +222,10 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) { // insert other data here rvl = 0; - rvd = connection()->getToplevel()->generateFileEmbedded( + rvd = networkSetup()->getToplevel()->generateFileEmbedded( SF, DevNr ); } else if ( SF.name() == "chatscripts" ) { Log(("Generate PPP for %s\n", SF.name().latin1() )); rvl = 0; - rvd = connection()->getToplevel()->generateFileEmbedded( + rvd = networkSetup()->getToplevel()->generateFileEmbedded( SF, DevNr ); } diff --git a/noncore/settings/networksettings2/ppp/ppprun.cpp b/noncore/settings/networksettings2/ppp/ppprun.cpp index 8403e6d..f548483 100644 --- a/noncore/settings/networksettings2/ppp/ppprun.cpp +++ b/noncore/settings/networksettings2/ppp/ppprun.cpp @@ -14,5 +14,5 @@ State_t PPPRun::detectState( void ) { } -QString PPPRun::setMyState( NodeCollection * NC, Action_t A, bool ) { +QString PPPRun::setMyState( NetworkSetup * , Action_t , bool ) { return QString(); } @@ -35,5 +35,5 @@ bool PPPRun::isMyPPPUp( void ) { ) { // this is a LAN card - if( Run->assignedConnection() == netNode()->connection() ) { + if( Run->assignedToNetworkSetup() == netNode()->networkSetup() ) { // assigned to us return 1; diff --git a/noncore/settings/networksettings2/ppp/ppprun.h b/noncore/settings/networksettings2/ppp/ppprun.h index 2990a96..9535382 100644 --- a/noncore/settings/networksettings2/ppp/ppprun.h +++ b/noncore/settings/networksettings2/ppp/ppprun.h @@ -24,5 +24,5 @@ public : protected : - QString setMyState( NodeCollection * , Action_t, bool ); + QString setMyState( NetworkSetup * , Action_t, bool ); private : |