1 files changed, 14 insertions, 14 deletions

diff --git a/noncore/settings/networksettings2/networksettings2/resources.h b/noncore/settings/networksettings2/networksettings2/resources.h
index 51c4250..f7393d3 100644
--- a/noncore/settings/networksettings2/networksettings2/resources.h
+++ b/noncore/settings/networksettings2/networksettings2/resources.h
@@ -31,41 +31,41 @@ public :
         inline bool known( void )
           { return ! HomeDir.isEmpty() && ! UserName.isEmpty(); }
 
         QString        UserName;
         QString        HomeDir;
         int            Uid;
         int            Gid;
         QArray<char *> EnvList;
 };
 
 typedef QDict<ANetNode>  Name2NetNode_t;
 typedef QDict<ANetNodeInstance > Name2Instance_t;
-typedef QDict<NodeCollection> Name2Connection_t;
+typedef QDict<NetworkSetup> Name2NetworkSetup_t;
 typedef QDict<SystemFile> Name2SystemFile_t;
 
 class TheNSResources {
 
 public :
 
     TheNSResources( void );
     ~TheNSResources( );
 
     // give busy feedback
     void busy( bool B );
 
     System & system()
       { return *TheSystem; }
 
-    int assignConnectionNumber(void);
+    int assignNetworkSetupNumber(void);
     QPixmap getPixmap( const QString & Name );
 
     Name2NetNode_t & netNodes( void ) 
       { return AllNodeTypes; }
     bool netNodeExists( const QString & X )
       { return AllNodeTypes.find(X)!=0; }
     ANetNode * findNetNode( const QString & N )
       { return AllNodeTypes.find(N);
       }
     // define new plugin (=node)
     void addNodeType( const QString & ID,
                       const QString & LongName,
@@ -94,52 +94,52 @@ public :
     Name2Instance_t & netNodeInstances( void ) 
       { return AllNodes; }
     void addNodeInstance( ANetNodeInstance * I )
       { AllNodes.insert( I->name(), I ); }
     void removeNodeInstance( const QString & N )
       { AllNodes.remove( N );}
     ANetNodeInstance * findNodeInstance( const QString & S )
       { return AllNodes[S]; }
 
     const QString & netNode2Name( const char * Type );
     const QString & netNode2Description( const char * Type );
 
-    void addConnection( NodeCollection * NC, bool Dangling );
-    void removeConnection( const QString & N );
-    NodeCollection * findConnection( const QString & N );
-    NodeCollection * getConnection( int nr );
-    Name2Connection_t & connections( void )
-      { return ConnectionsMap; }
-    Name2Connection_t & danglingConnections( void )
-      { return DanglingConnectionsMap; }
+    void addNetworkSetup( NetworkSetup * NC, bool Dangling );
+    void removeNetworkSetup( const QString & N );
+    NetworkSetup * findNetworkSetup( const QString & N );
+    NetworkSetup * getNetworkSetup( int nr );
+    Name2NetworkSetup_t & networkSetups( void )
+      { return NetworkSetupsMap; }
+    Name2NetworkSetup_t & danglingNetworkSetups( void )
+      { return DanglingNetworkSetupsMap; }
 
     inline bool userKnown( void )
       { return CurrentUser.known(); }
     CurrentQPEUser & currentUser( void )
       { return CurrentUser; }
 
 private :
 
     void detectCurrentUser( void );
     QString tr( const char * path );
 
     void findAvailableNetNodes( void );
 
     QMap< QString, QString>   NodeTypeNameMap;
     QMap< QString, QString>   NodeTypeDescriptionMap;
-    // list of connections that are valid
-    Name2Connection_t         ConnectionsMap;
-    // list of connection configurations that are not valid
+    // list of networkSetups that are valid
+    Name2NetworkSetup_t         NetworkSetupsMap;
+    // list of networkSetup configurations that are not valid
     // e.g. because plugins are missing
-    Name2Connection_t         DanglingConnectionsMap;
+    Name2NetworkSetup_t         DanglingNetworkSetupsMap;
     System *                  TheSystem;
     Name2SystemFile_t         SystemFiles;
 
     // all node type classes 
     Name2NetNode_t            AllNodeTypes;
 
     // all nodes
     Name2Instance_t           AllNodes;
 
     CurrentQPEUser            CurrentUser;
 
     Opie::Core::OPluginLoader *  Plugins;