summaryrefslogtreecommitdiff
path: root/noncore/settings/networksettings2/editconnection.cpp
Unidiff
Diffstat (limited to 'noncore/settings/networksettings2/editconnection.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/networksettings2/editconnection.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/noncore/settings/networksettings2/editconnection.cpp b/noncore/settings/networksettings2/editconnection.cpp
index ce13573..4bbe502 100644
--- a/noncore/settings/networksettings2/editconnection.cpp
+++ b/noncore/settings/networksettings2/editconnection.cpp
@@ -105,5 +105,4 @@ NodeCollection * EditConnection::getTmpCollection( void ) {
105 105
106 // reset collection -> delete all NEW NetNodes 106 // reset collection -> delete all NEW NetNodes
107 { ANetNodeInstance * NNI;
108 for( QListIterator<ANetNodeInstance> it(TmpCollection); 107 for( QListIterator<ANetNodeInstance> it(TmpCollection);
109 it.current(); 108 it.current();
@@ -114,5 +113,4 @@ NodeCollection * EditConnection::getTmpCollection( void ) {
114 } 113 }
115 TmpCollection.clear(); 114 TmpCollection.clear();
116 }
117 115
118 // update content 116 // update content
@@ -136,5 +134,5 @@ NodeCollection * EditConnection::getTmpCollection( void ) {
136 if( SelectedNodes == 0 || 134 if( SelectedNodes == 0 ||
137 NNI == 0 || 135 NNI == 0 ||
138 NNI->netNode()->nodeName() != it->text(0) ) { 136 NNI->nodeClass()->nodeName() != it->text(0) ) {
139 // new item not in previous collection 137 // new item not in previous collection
140 ANetNodeInstance * NNI = (*Mapping)[it]->createInstance(); 138 ANetNodeInstance * NNI = (*Mapping)[it]->createInstance();
@@ -199,8 +197,8 @@ void EditConnection::setConnection( NodeCollection * NC ) {
199 Found = 0; 197 Found = 0;
200 while( it ) { 198 while( it ) {
201 if( NNI && NNI->netNode()->nodeName() == it->text(0) ) { 199 if( NNI && NNI->nodeClass()->nodeName() == it->text(0) ) {
202 // this radio is part of the collection 200 // this radio is part of the collection
203 ((QCheckListItem *)it)->setOn( 1 ); 201 ((QCheckListItem *)it)->setOn( 1 );
204 updateGUI( it, NNI->netNode() ); 202 updateGUI( it, NNI->nodeClass() );
205 // check its children 203 // check its children
206 Found = 1; 204 Found = 1;
@@ -241,6 +239,4 @@ NodeCollection * EditConnection::connection( void ) {
241 239
242 // transfer 240 // transfer
243 { ANetNodeInstance * NNI;
244
245 for( QListIterator<ANetNodeInstance> it(TmpCollection); 241 for( QListIterator<ANetNodeInstance> it(TmpCollection);
246 it.current(); 242 it.current();
@@ -248,5 +244,4 @@ NodeCollection * EditConnection::connection( void ) {
248 SelectedNodes->append( it.current() ); 244 SelectedNodes->append( it.current() );
249 } 245 }
250 }
251 246
252 if( TmpCollection.isModified() ) 247 if( TmpCollection.isModified() )
@@ -449,6 +444,6 @@ void EditConnection::SLOT_AlterTab( const QString & S ) {
449 NNI = it.current(); 444 NNI = it.current();
450 Devices_CB->insertItem( 445 Devices_CB->insertItem(
451 NSResources->getPixmap( NNI->netNode()->pixmapName() ), 446 NSResources->getPixmap( NNI->nodeClass()->pixmapName() ),
452 NNI->netNode()->nodeName() 447 NNI->nodeClass()->nodeName()
453 ); 448 );
454 449