Diffstat (limited to 'noncore/settings/networksettings2/networksettings.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/settings/networksettings2/networksettings.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/noncore/settings/networksettings2/networksettings.cpp b/noncore/settings/networksettings2/networksettings.cpp index 78b6cce..80dcb3d 100644 --- a/noncore/settings/networksettings2/networksettings.cpp +++ b/noncore/settings/networksettings2/networksettings.cpp @@ -66,6 +66,6 @@ NetworkSettings::NetworkSettings( QWidget *parent, - { Name2Connection_t & M = NSResources->connections(); - NodeCollection * NC; - // for all connections - for( QDictIterator<NodeCollection> it(M); + { Name2NetworkSetup_t & M = NSResources->networkSetups(); + NetworkSetup * NC; + // for all NetworkSetups + for( QDictIterator<NetworkSetup> it(M); it.current(); @@ -83,3 +83,3 @@ NetworkSettings::NetworkSettings( QWidget *parent, // if no profiles -> auto popup editing - if( NSResources->connections().count() == 0 ) { + if( NSResources->networkSetups().count() == 0 ) { QTimer::singleShot( 100, this, SLOT(SLOT_AddNode() ) ); @@ -138,6 +138,6 @@ void NetworkSettings::SLOT_RefreshStates( void ) { if( LBI ) { - NodeCollection * NC; + NetworkSetup * NC; NSResources->system().probeInterfaces(); // update current selection only - NC = NSResources->findConnection( LBI->text() ); + NC = NSResources->findNetworkSetup( LBI->text() ); if( NC ) { @@ -154,6 +154,6 @@ void NetworkSettings::SLOT_RefreshStates( void ) { bool is; - NodeCollection * NC; + NetworkSetup * NC; for( unsigned int i = 0; i < Profiles_LB->count() ; i ++ ) { - NC = NSResources->findConnection( Profiles_LB->text(i) ); + NC = NSResources->findNetworkSetup( Profiles_LB->text(i) ); if( NC ) { @@ -192,3 +192,3 @@ void NetworkSettings::SLOT_DeleteNode( void ) { 1, 0 ) == 1 ) { - NSResources->removeConnection( LBI->text() ); + NSResources->removeNetworkSetup( LBI->text() ); delete LBI; @@ -201,6 +201,6 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) { - EditConnection EC( this ); + EditNetworkSetup EC( this ); if( LBI ) { - NodeCollection * NC = NSResources->findConnection( LBI->text() ); + NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() ); if( ! NC ) { @@ -209,3 +209,3 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) { OldName = NC->name(); - EC.setConnection( NC ); + EC.setNetworkSetup( NC ); } @@ -220,3 +220,3 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) { // toplevel item -> store - NodeCollection * NC = EC.connection(); + NetworkSetup * NC = EC.networkSetup(); if( NC->isModified() ) { @@ -225,3 +225,3 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) { // find if new name is free - NodeCollection * LCN = NSResources->findConnection( + NetworkSetup * LCN = NSResources->findNetworkSetup( NC->name() ); @@ -236,4 +236,4 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) { // new name -> remove item - NSResources->removeConnection( OldName ); - NSResources->addConnection( NC, 0 ); + NSResources->removeNetworkSetup( OldName ); + NSResources->addNetworkSetup( NC, 0 ); } // else not changed @@ -248,4 +248,4 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) { int ci = Profiles_LB->count(); - NSResources->addConnection( NC, 0 ); - NC->setNumber( NSResources->assignConnectionNumber() ); + NSResources->addNetworkSetup( NC, 0 ); + NC->setNumber( NSResources->assignNetworkSetupNumber() ); Profiles_LB->insertItem( NC->devicePixmap(), NC->name() ); @@ -256,5 +256,5 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) { } else { - // cancelled : reset connection + // cancelled : reset NetworkSetup if( LBI ) { - NodeCollection * NC = NSResources->findConnection( LBI->text() ); + NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() ); NC->reassign(); @@ -272,3 +272,3 @@ void NetworkSettings::SLOT_ShowNode( QListBoxItem * LBI ) { - NodeCollection * NC = NSResources->findConnection( LBI->text() ); + NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() ); @@ -355,3 +355,3 @@ void NetworkSettings::SLOT_Disable( bool T ) { - NodeCollection * NC = NSResources->findConnection( LBI->text() ); + NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() ); @@ -384,4 +384,4 @@ void NetworkSettings::SLOT_Up( void ) { - NodeCollection * NC = - NSResources->findConnection( LBI->text() ); + NetworkSetup * NC = + NSResources->findNetworkSetup( LBI->text() ); @@ -440,4 +440,4 @@ void NetworkSettings::SLOT_Down( void ) { - NodeCollection * NC = - NSResources->findConnection( LBI->text() ); + NetworkSetup * NC = + NSResources->findNetworkSetup( LBI->text() ); |