Diffstat (limited to 'noncore/settings/networksettings2/network') (more/less context) (ignore whitespace changes)
4 files changed, 13 insertions, 14 deletions
diff --git a/noncore/settings/networksettings2/network/network_NN.cpp b/noncore/settings/networksettings2/network/network_NN.cpp index 2fa31bd..80a7fac 100644 --- a/noncore/settings/networksettings2/network/network_NN.cpp +++ b/noncore/settings/networksettings2/network/network_NN.cpp @@ -13,5 +13,5 @@ static const char * NetworkNeeds[] = static const char * NetworkProvides[] = - { "connection", + { "NetworkSetup", 0 }; diff --git a/noncore/settings/networksettings2/network/network_NNI.cpp b/noncore/settings/networksettings2/network/network_NNI.cpp index 34dac54..c183d5e 100644 --- a/noncore/settings/networksettings2/network/network_NNI.cpp +++ b/noncore/settings/networksettings2/network/network_NNI.cpp @@ -118,5 +118,5 @@ short ANetwork::generateFile( SystemFile &SF, SF << "iface " << "A" - << connection()->number() + << networkSetup()->number() << NIC << " inet dhcp" @@ -125,5 +125,5 @@ short ANetwork::generateFile( SystemFile &SF, << NIC << "\" > /tmp/profile-" - << connection()->number() + << networkSetup()->number() << ".up" << endl; @@ -135,5 +135,5 @@ short ANetwork::generateFile( SystemFile &SF, SF << " down rm -f /tmp/profile-" - << connection()->number() + << networkSetup()->number() << ".up" << endl; @@ -141,5 +141,5 @@ short ANetwork::generateFile( SystemFile &SF, SF << "iface " << "A" - << connection()->number() + << networkSetup()->number() << NIC << " inet static" @@ -148,9 +148,9 @@ short ANetwork::generateFile( SystemFile &SF, << NIC << "\" > /tmp/profile-" - << connection()->number() + << networkSetup()->number() << ".up" << endl; SF << " down rm -f /tmp/profile-" - << connection()->number() + << networkSetup()->number() << ".up" << endl; @@ -212,5 +212,5 @@ short ANetwork::generateFile( SystemFile &SF, // embed other info in it - rvd = connection()->getToplevel()->generateFileEmbedded( SF, DevNr ); + rvd = networkSetup()->getToplevel()->generateFileEmbedded( SF, DevNr ); return (rvd == 2 || rvl == 2 ) ? 2 : diff --git a/noncore/settings/networksettings2/network/networkrun.cpp b/noncore/settings/networksettings2/network/networkrun.cpp index 74467ad..7039a36 100644 --- a/noncore/settings/networksettings2/network/networkrun.cpp +++ b/noncore/settings/networksettings2/network/networkrun.cpp @@ -5,7 +5,6 @@ State_t NetworkRun::detectState( void ) { - InterfaceInfo * II = nodeCollection()->assignedInterface(); + InterfaceInfo * II = networkSetup()->assignedInterface(); - Log(( "Interface %p %p : %d\n", II, nodeCollection(), (II) ? II->IsUp : 0 )); if( II && II->IsUp ) { // device has assigned interface @@ -14,10 +13,10 @@ State_t NetworkRun::detectState( void ) { // had no interface or interface is no longer up -> release - nodeCollection()->assignInterface( 0 ); + networkSetup()->assignInterface( 0 ); return Unknown; } -QString NetworkRun::setMyState( NodeCollection * NC, Action_t A, bool ) { +QString NetworkRun::setMyState( NetworkSetup * NC, Action_t A, bool ) { // we handle UP and DOWN InterfaceInfo * II = NC->assignedInterface(); @@ -41,5 +40,5 @@ QString NetworkRun::setMyState( NodeCollection * NC, Action_t A, bool ) { SL << QString().sprintf( "%s=A%ld%s", II->Name.latin1(), - nodeCollection()->number(), + networkSetup()->number(), II->Name.latin1() ); diff --git a/noncore/settings/networksettings2/network/networkrun.h b/noncore/settings/networksettings2/network/networkrun.h index 78a1694..ac186e7 100644 --- a/noncore/settings/networksettings2/network/networkrun.h +++ b/noncore/settings/networksettings2/network/networkrun.h @@ -17,4 +17,4 @@ public : protected : - QString setMyState( NodeCollection * , Action_t, bool ); + QString setMyState( NetworkSetup * , Action_t, bool ); }; |