1 files changed, 34 insertions, 16 deletions

diff --git a/noncore/settings/networksettings2/networksettings2/netnode.h b/noncore/settings/networksettings2/networksettings2/netnode.h
index f4a5e30..9681c6e 100644
--- a/noncore/settings/networksettings2/networksettings2/netnode.h
+++ b/noncore/settings/networksettings2/networksettings2/netnode.h
@@ -92,26 +92,32 @@ public:
   virtual const char ** needs( void ) = 0;
 
   // generate files specific for this node (if any)
   virtual bool generateProperFilesFor( ANetNodeInstance * NNI ) = 0;
   // return TRUE if this node has data to be inserted in systemfile
   // with name S
-  virtual bool hasDataFor( const QString & S, bool DeviceSpecific ) = 0;
-  // generate data specific for a profile and for the system file S
-  // called only IF data was needed
-  virtual bool generateDataForCommonFile( 
-      SystemFile & SF, long DevNr, ANetNodeInstance * NNI ) = 0;
+  virtual bool hasDataFor( const QString & S ) = 0;
   // generate data specific for the device for the system file S
   // called only IF data was needed
   virtual bool generateDeviceDataForCommonFile( 
-      SystemFile & SF, long DevNr, ANetNodeInstance * NNI ) = 0;
+      SystemFile & SF, long DevNr ) = 0;
 
   // does this Node provide a Connection
   bool isToplevel( void )
     { return strcmp( provides(), "fullsetup") == 0 ; }
 
+  // generate NIC name based on instance nr
+  // only relevant if node instances are devices
+  virtual QString genNic( long ) 
+    { return QString(""); }
+
+  // max number of instances for this node type
+  // only relevant if node instances are devices
+  virtual long instanceCount( void ) 
+    { return 1; }
+
   // compiled references to 'needed' NetNodes -> needs list
   void setAlternatives( NetNodeList * Alt )
     { Alternatives = Alt; }
   NetNodeList & alternatives( void ) 
     { return *Alternatives; }
 
@@ -151,13 +157,13 @@ public:
   // get data from GUI and store in node
   virtual void commit( void ) = 0;
 
   // get next node
   ANetNodeInstance * nextNode();
   // return NetNode this is an instance of
-  ANetNode * netNode( void ) 
+  ANetNode * nodeClass( void ) 
       { return NodeType; }
 
   // intialize am instance of a net node
   void initialize( void );
 
   // set the value of an attribute
@@ -191,12 +197,21 @@ public:
   const char ** needs( void )
     { return NodeType->needs(); }
 
   // returns node specific data -> only useful for 'buddy'
   virtual void * data( void ) = 0;
 
+  // return TRUE if this node has data to be inserted in systemfile
+  // with name S
+  virtual bool hasDataFor( const QString & S ) = 0;
+
+  // generate data specific for a profile and for the system file S
+  // called only IF data was needed
+  virtual bool generateDataForCommonFile( 
+      SystemFile & SF, long DevNr ) = 0;
+
 protected :
 
   virtual void setSpecificAttribute( QString & , QString & ) = 0;
   virtual void saveSpecificAttribute( QTextStream & ) = 0;
 
   ANetNode * NodeType;
@@ -217,19 +232,19 @@ class RuntimeInfo : public QObject {
 public :
 
       RuntimeInfo( ANetNodeInstance * TheNNI )
         { NNI = TheNNI; }
 
       // downcast implemented by specify runtime classes
-      AsDevice * asDevice( void )
+      virtual AsDevice * asDevice( void )
         { return 0; }
-      AsConnection * asConnection( void )
+      virtual AsConnection * asConnection( void )
         { return 0; }
-      AsLine * asLine( void )
+      virtual AsLine * asLine( void )
         { return 0; }
-      AsFullSetup * asFullSetup( void )
+      virtual AsFullSetup * asFullSetup( void )
         { return 0; }
 
       // does this node handles this interface e.g.eth0
       // recurse deeper if this node cannot answer that question
       virtual bool handlesInterface( const QString & )
         { return 0; }
@@ -385,19 +400,16 @@ public:
   const char * provides( void )
     { return ""; }
   virtual const char ** needs( void )
     { return 0; }
   virtual bool generateProperFilesFor( ANetNodeInstance * )
     { return 0; }
-  virtual bool hasDataFor( const QString &, bool DS )
+  virtual bool hasDataFor( const QString & )
     { return 0; }
-  virtual bool generateDataForCommonFile( 
-      SystemFile & , long , ANetNodeInstance * )
-    {return 1; }
   virtual bool generateDeviceDataForCommonFile( 
-      SystemFile & , long , ANetNodeInstance * )
+      SystemFile & , long )
     {return 1; }
 
 private :
 
 };
 
@@ -431,12 +443,18 @@ public:
   void initialize( void ){}
 
   // returns node specific data -> only useful for 'buddy'
   virtual void * data( void ) 
     { return 0; }
 
+  virtual bool hasDataFor( const QString & )
+    { return 0; }
+
+  virtual bool generateDataForCommonFile( SystemFile & , long )
+    { return 1; }
+
 protected :
 
   virtual void setSpecificAttribute( QString & , QString & );
   virtual void saveSpecificAttribute( QTextStream & );
 
   QDict<QString>        ValAttrPairs;