Diffstat (limited to 'noncore/settings/networksettings2/profile') (more/less context) (show whitespace changes)
5 files changed, 17 insertions, 9 deletions
diff --git a/noncore/settings/networksettings2/profile/profile_NN.cpp b/noncore/settings/networksettings2/profile/profile_NN.cpp index 1e6912e..007f4a5 100644 --- a/noncore/settings/networksettings2/profile/profile_NN.cpp +++ b/noncore/settings/networksettings2/profile/profile_NN.cpp @@ -6,5 +6,5 @@ static const char * ProfileNeeds[] = - { "connection", + { "NetworkSetup", 0 }; @@ -17,5 +17,5 @@ static const char * ProfileProvides[] = * Constructor, find all of the possible interfaces */ -ProfileNetNode::ProfileNetNode() : ANetNode( tr("Regular connection profile")) { +ProfileNetNode::ProfileNetNode() : ANetNode( tr("Regular NetworkSetup profile")) { NSResources->addSystemFile( @@ -32,6 +32,6 @@ ProfileNetNode::~ProfileNetNode(){ const QString ProfileNetNode::nodeDescription(){ return tr("\ -<p>Define use of an IP connection.</p>\ -<p>Configure if and when this connection needs to be established</p>\ +<p>Define use of an IP NetworkSetup.</p>\ +<p>Configure if and when this NetworkSetup needs to be established</p>\ " ); diff --git a/noncore/settings/networksettings2/profile/profiledata.h b/noncore/settings/networksettings2/profile/profiledata.h index c9577e5..2f7060d 100644 --- a/noncore/settings/networksettings2/profile/profiledata.h +++ b/noncore/settings/networksettings2/profile/profiledata.h @@ -10,5 +10,5 @@ public : // if started up automatically, ask user for confirmation bool Confirm; - // Do not bring this connection up + // Do not bring this networkSetup up bool Disabled; bool TriggerVPN; diff --git a/noncore/settings/networksettings2/profile/profileedit.cpp b/noncore/settings/networksettings2/profile/profileedit.cpp index 88aab15..ad943fe 100644 --- a/noncore/settings/networksettings2/profile/profileedit.cpp +++ b/noncore/settings/networksettings2/profile/profileedit.cpp @@ -15,7 +15,11 @@ ProfileEdit::ProfileEdit( QWidget * Parent, ANetNodeInstance * TNNI ) : InterfaceInfo * II; + II = TNNI->networkSetup()->assignedInterface(); + Log(( "Interface %p %p %p: %d\n", II, + TNNI, TNNI->networkSetup(), (II) ? II->IsUp : 0 )); + NNI = TNNI; Dev = NNI->runtime()->device(); - if( ( II = NNI->connection()->assignedInterface() ) ) { + if( ( II = NNI->networkSetup()->assignedInterface() ) ) { Refresh_CB->setEnabled( TRUE ); @@ -78,5 +82,5 @@ bool ProfileEdit::commit( ProfileData & Data ) { void ProfileEdit::SLOT_Refresh( void ) { - InterfaceInfo * II = NNI->connection()->assignedInterface(); + InterfaceInfo * II = NNI->networkSetup()->assignedInterface(); NSResources->system().refreshStatistics( *II ); RcvBytes_LBL->setText( II->RcvBytes ); diff --git a/noncore/settings/networksettings2/profile/profilerun.cpp b/noncore/settings/networksettings2/profile/profilerun.cpp index acb67bd..48011ea 100644 --- a/noncore/settings/networksettings2/profile/profilerun.cpp +++ b/noncore/settings/networksettings2/profile/profilerun.cpp @@ -4,4 +4,8 @@ State_t ProfileRun::detectState( void ) { + InterfaceInfo * II = networkSetup()->assignedInterface(); + + Log(( "Interface %p %p %p: %d\n", II, + netNode(), netNode()->networkSetup(), (II) ? II->IsUp : 0 )); if( Data->Disabled ) { return Disabled; @@ -10,5 +14,5 @@ State_t ProfileRun::detectState( void ) { } -QString ProfileRun::setMyState( NodeCollection * NC, Action_t A, bool ) { +QString ProfileRun::setMyState( NetworkSetup * NC, Action_t A, bool ) { odebug << "Profile " << Data->Disabled << oendl; if( A == Disable ) { diff --git a/noncore/settings/networksettings2/profile/profilerun.h b/noncore/settings/networksettings2/profile/profilerun.h index 2d48b15..9470c0f 100644 --- a/noncore/settings/networksettings2/profile/profilerun.h +++ b/noncore/settings/networksettings2/profile/profilerun.h @@ -24,5 +24,5 @@ public : protected : - QString setMyState( NodeCollection * , Action_t, bool ); + QString setMyState( NetworkSetup * , Action_t, bool ); private : |