Diffstat (limited to 'noncore/settings/networksettings2/networksettings2/resources.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/networksettings2/resources.cpp | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/noncore/settings/networksettings2/networksettings2/resources.cpp b/noncore/settings/networksettings2/networksettings2/resources.cpp index b81dcaa..0e72c25 100644 --- a/noncore/settings/networksettings2/networksettings2/resources.cpp +++ b/noncore/settings/networksettings2/networksettings2/resources.cpp | |||
@@ -27,3 +27,3 @@ TheNSResources * _NSResources = 0; | |||
27 | TheNSResources::TheNSResources( void ) : NodeTypeNameMap(), | 27 | TheNSResources::TheNSResources( void ) : NodeTypeNameMap(), |
28 | ConnectionsMap(), DanglingConnectionsMap() { | 28 | NetworkSetupsMap(), DanglingNetworkSetupsMap() { |
29 | 29 | ||
@@ -82,8 +82,8 @@ TheNSResources::TheNSResources( void ) : NodeTypeNameMap(), | |||
82 | tr( "<p>Devices that can handle single bytes</p>" ) ); | 82 | tr( "<p>Devices that can handle single bytes</p>" ) ); |
83 | addNodeType( "connection", tr( "IP Connection" ), | 83 | addNodeType( "NetworkSetup", tr( "IP NetworkSetup" ), |
84 | tr( "<p>Nodes that provide working IP connections</p>" ) ); | 84 | tr( "<p>Nodes that provide working IP NetworkSetups</p>" ) ); |
85 | addNodeType( "fullsetup", tr( "Connection Profile" ), | 85 | addNodeType( "fullsetup", tr( "NetworkSetup Profile" ), |
86 | tr( "<p>Fully configured connection profile</p>" ) ); | 86 | tr( "<p>Fully configured NetworkSetup profile</p>" ) ); |
87 | addNodeType( "GPRS", tr( "Connection to GPRS device" ), | 87 | addNodeType( "GPRS", tr( "NetworkSetup to GPRS device" ), |
88 | tr( "<p>Connection to a GPRS capable device</p>" ) ); | 88 | tr( "<p>NetworkSetup to a GPRS capable device</p>" ) ); |
89 | 89 | ||
@@ -203,4 +203,4 @@ void TheNSResources::findAvailableNetNodes( void ){ | |||
203 | 203 | ||
204 | // used to find unique connection number | 204 | // used to find unique NetworkSetup number |
205 | int TheNSResources::assignConnectionNumber( void ) { | 205 | int TheNSResources::assignNetworkSetupNumber( void ) { |
206 | bool found = 1; | 206 | bool found = 1; |
@@ -208,3 +208,3 @@ int TheNSResources::assignConnectionNumber( void ) { | |||
208 | found = 1; | 208 | found = 1; |
209 | for( QDictIterator<NodeCollection> it(ConnectionsMap); | 209 | for( QDictIterator<NetworkSetup> it(NetworkSetupsMap); |
210 | it.current(); | 210 | it.current(); |
@@ -247,10 +247,10 @@ const QString & TheNSResources::netNode2Description( const char * s ) { | |||
247 | 247 | ||
248 | void TheNSResources::addConnection( NodeCollection * NC, bool Dangling ) { | 248 | void TheNSResources::addNetworkSetup( NetworkSetup * NC, bool Dangling ) { |
249 | ANetNodeInstance * NNI; | 249 | ANetNodeInstance * NNI; |
250 | Log(( "Add Connection %s, Dangling %d\n", | 250 | Log(( "Add NetworkSetup %s, Dangling %d\n", |
251 | NC->name().latin1(), Dangling )); | 251 | NC->name().latin1(), Dangling )); |
252 | if( Dangling ) { | 252 | if( Dangling ) { |
253 | DanglingConnectionsMap.insert( NC->name(), NC ); | 253 | DanglingNetworkSetupsMap.insert( NC->name(), NC ); |
254 | } else { | 254 | } else { |
255 | ConnectionsMap.insert( NC->name(), NC ); | 255 | NetworkSetupsMap.insert( NC->name(), NC ); |
256 | } | 256 | } |
@@ -269,4 +269,4 @@ void TheNSResources::addConnection( NodeCollection * NC, bool Dangling ) { | |||
269 | 269 | ||
270 | void TheNSResources::removeConnection( const QString & N ) { | 270 | void TheNSResources::removeNetworkSetup( const QString & N ) { |
271 | NodeCollection * NC = findConnection( N ); | 271 | NetworkSetup * NC = findNetworkSetup( N ); |
272 | if( ! NC ) | 272 | if( ! NC ) |
@@ -274,3 +274,3 @@ void TheNSResources::removeConnection( const QString & N ) { | |||
274 | 274 | ||
275 | // delete netnodes in this connection | 275 | // delete netnodes in this NetworkSetup |
276 | ANetNodeInstance * NNI; | 276 | ANetNodeInstance * NNI; |
@@ -279,6 +279,6 @@ void TheNSResources::removeConnection( const QString & N ) { | |||
279 | } | 279 | } |
280 | if( ConnectionsMap.find( N ) ) { | 280 | if( NetworkSetupsMap.find( N ) ) { |
281 | ConnectionsMap.remove( N ); | 281 | NetworkSetupsMap.remove( N ); |
282 | } else { | 282 | } else { |
283 | DanglingConnectionsMap.remove( N ); | 283 | DanglingNetworkSetupsMap.remove( N ); |
284 | } | 284 | } |
@@ -287,9 +287,9 @@ void TheNSResources::removeConnection( const QString & N ) { | |||
287 | 287 | ||
288 | // dangling connections are filtered out | 288 | // dangling NetworkSetups are filtered out |
289 | NodeCollection * TheNSResources::findConnection( const QString & S ) { | 289 | NetworkSetup * TheNSResources::findNetworkSetup( const QString & S ) { |
290 | return ConnectionsMap[ S ]; | 290 | return NetworkSetupsMap[ S ]; |
291 | } | 291 | } |
292 | 292 | ||
293 | NodeCollection * TheNSResources::getConnection( int nr ) { | 293 | NetworkSetup * TheNSResources::getNetworkSetup( int nr ) { |
294 | for( QDictIterator<NodeCollection> it(ConnectionsMap); | 294 | for( QDictIterator<NetworkSetup> it(NetworkSetupsMap); |
295 | it.current(); | 295 | it.current(); |
@@ -303,9 +303,9 @@ NodeCollection * TheNSResources::getConnection( int nr ) { | |||
303 | /* | 303 | /* |
304 | void TheNSResources::renumberConnections( void ) { | 304 | void TheNSResources::renumberNetworkSetups( void ) { |
305 | Name2Connection_t & M = NSResources->connections(); | 305 | Name2NetworkSetup_t & M = NSResources->NetworkSetups(); |
306 | NodeCollection * NC; | 306 | NetworkSetup * NC; |
307 | 307 | ||
308 | // for all connections | 308 | // for all NetworkSetups |
309 | NodeCollection::resetMaxNr(); | 309 | NetworkSetup::resetMaxNr(); |
310 | for( QDictIterator<NodeCollection> it(M); | 310 | for( QDictIterator<NetworkSetup> it(M); |
311 | it.current(); | 311 | it.current(); |
@@ -313,3 +313,3 @@ void TheNSResources::renumberConnections( void ) { | |||
313 | NC = it.current(); | 313 | NC = it.current(); |
314 | NC->setNumber( NC->maxConnectionNumber()+1 ); | 314 | NC->setNumber( NC->maxNetworkSetupNumber()+1 ); |
315 | NC->setModified( 1 ); | 315 | NC->setModified( 1 ); |