1 files changed, 189 insertions, 79 deletions

diff --git a/noncore/settings/networksettings2/networksettings2/netnode.h b/noncore/settings/networksettings2/networksettings2/netnode.h
index ca35c27..d3d7b34 100644
--- a/noncore/settings/networksettings2/networksettings2/netnode.h
+++ b/noncore/settings/networksettings2/networksettings2/netnode.h
@@ -5,6 +5,7 @@
 #include <qlist.h>
 #include <qdict.h>
 #include <qpixmap.h>
+#include <qstringlist.h>
 #include <qobject.h>
 #include <time.h>
 
@@ -77,32 +78,58 @@ public:
   ANetNode( const char * Name ) : QObject( 0, Name ) {}
   virtual ~ANetNode(){};
 
-  // pixmap needed for this NetNode
-  virtual const QString pixmapName() = 0;
+    //
+    //
+    // standard methods with sensible default
+    //
+    //
 
-  // description for  this NetNode
-  virtual const QString nodeDescription() = 0;
+    inline int done( void ) 
+      { return Done; }
+    inline void setDone( int D ) 
+      { Done = D; }
 
-  // create a blank instance of a net node
-  virtual ANetNodeInstance * createInstance( void ) = 0;
+    // does this Node provide a Connection
+    inline bool isToplevel( void )
+      { return strcmp( provides(), "fullsetup") == 0 ; }
 
-  // return feature this NetNode provides
-  virtual const char * provides( void ) = 0;
-  virtual const char ** needs( void ) = 0;
+    // set the value of an attribute
+    void setAttribute( QString & Attr, QString & Value ) ;
+    void saveAttributes( QTextStream & TS ) ;
 
-  // 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 ) = 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 ) = 0;
+    // compiled references to 'needed' NetNodes -> needs list
+    inline void setAlternatives( NetNodeList * Alt )
+      { Alternatives = Alt; }
+    inline NetNodeList & alternatives( void ) 
+      { return *Alternatives; }
+
+    //
+    //
+    // Virtual methods with sensible default
+    //
+    //
+
+    // do instances of this noce class have data for this file
+    virtual bool hasDataForFile( const QString & ) 
+      { return 0; }
+
+    // generate instance independent stuff
+    // 0 : data output, 1 no data, 2 error
+    virtual short generateFile( const QString & ,
+                               const QString & ,
+                               QTextStream & ,
+                               long ) 
+      { return 1; }
+
+    // generate instance dependent but profile common stuff
+    // 0 : data output, 1 no data, 2 error
+    virtual short generateFile( const QString & ,
+                               const QString & ,
+                               QTextStream & ,
+                               ANetNodeInstance * ,
+                               long ) 
+      { return 1; }
 
-  // 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
@@ -114,15 +141,28 @@ public:
   virtual long instanceCount( void ) 
     { return 1; }
 
-  // set the value of an attribute
-  void setAttribute( QString & Attr, QString & Value ) ;
-  void saveAttributes( QTextStream & TS ) ;
+    // return list of files that are specific for this node class
+    virtual QStringList * properFiles( void )
+      { return 0; }
 
-  // compiled references to 'needed' NetNodes -> needs list
-  void setAlternatives( NetNodeList * Alt )
-    { Alternatives = Alt; }
-  NetNodeList & alternatives( void ) 
-    { return *Alternatives; }
+    //
+    //
+    // pure virtual methods with sensible default
+    //
+    //
+
+    // pixmap needed for this NetNode
+    virtual const QString pixmapName() = 0;
+
+    // description for  this NetNode
+    virtual const QString nodeDescription() = 0;
+
+    // create a blank instance of a net node
+    virtual ANetNodeInstance * createInstance( void ) = 0;
+
+    // return feature this NetNode provides
+    virtual const char * provides( void ) = 0;
+    virtual const char ** needs( void ) = 0;
 
 protected :
 
@@ -132,6 +172,7 @@ private :
 
   virtual void setSpecificAttribute( QString & , QString & ) = 0;
   virtual void saveSpecificAttribute( QTextStream & ) = 0;
+    int Done;
 
 };
 
@@ -143,27 +184,17 @@ public:
       { IsModified=0; NodeType = NN; IsNew = TRUE; }
   virtual ~ANetNodeInstance( void ) { }
 
-  virtual RuntimeInfo * runtime( void ) = 0;
-
-  void setConnection( NodeCollection * NC ) 
-    { Connection = NC; }
-  NodeCollection * connection( void ) 
-    { return Connection; }
-
-  // create edit widget under parent
-  virtual QWidget * edit( QWidget * parent ) = 0;
-  // is given data acceptable
-  virtual QString acceptable( void ) = 0;
+    inline int done( void ) 
+      { return Done; }
+    inline void setDone( int D ) 
+      { Done = D; }
 
   // return data was modified
-  void setModified( bool M ) 
+    inline void setModified( bool M ) 
     {  IsModified = M; }
-  bool isModified( void ) 
+    inline bool isModified( void ) 
     {  return IsModified; }
 
-  // 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
@@ -178,38 +209,94 @@ public:
   void saveAttributes( QTextStream & TS ) ;
 
   // return true if node isntance is NEW and not loaded
-  void setNew( bool IsN ) 
+    inline void setNew( bool IsN ) 
     { IsNew = IsN; }
-  bool isNew( void ) 
+    inline bool isNew( void ) 
     { return IsNew; }
 
   // return description for this instance
-  QString & description( void ) 
+    inline QString & description( void ) 
     { return Description; }
-  void setDescription( const QString & S ) 
+    inline void setDescription( const QString & S ) 
     { Description = S; }
 
   // pixmap for this instance -> from NetNode
-  const QString pixmapName( void )
+    inline const QString pixmapName( void )
     { return NodeType->pixmapName(); }
 
-  const char * provides( void )
+    inline const char * provides( void )
     { return NodeType->provides(); }
 
-  const char ** needs( void )
+    inline const char ** needs( void )
     { return NodeType->needs(); }
 
-  // returns node specific data -> only useful for 'buddy'
-  virtual void * data( void ) = 0;
+    inline void setConnection( NodeCollection * NC ) 
+      { Connection = NC; }
+    inline NodeCollection * connection( void ) 
+      { return Connection; }
+
+    //
+    //
+    // Virtual methods with sensible defaults
+    //
+    //
 
-  // 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;
+
+    // open proper file identified by S
+    virtual QFile * openFile( const QString & ) 
+      { return 0; }
+
+    // check if this node (or sub nodes) have data for this file
+    virtual bool hasDataForFile( const QString & S ) 
+      { return nodeClass()->hasDataForFile( S ); }
+
+    // generate code specific for this node but embedded
+    // in the section of the parent
+    // this is called within the code of the parent
+    virtual short generateFileEmbedded( const QString & ID,
+                                       const QString & Path,
+                                       QTextStream & TS,
+                                       long DevNr ) 
+      { ANetNodeInstance * NNI = nextNode();
+        return (NNI) ? NNI->generateFileEmbedded( ID, Path, TS, DevNr ) : 1;
+      }
+
+    // generate code specific for this node 
+    // (or find the first node that does)
+    virtual short generateFile( const QString & ID,
+                               const QString & Path,
+                               QTextStream & TS,
+                               long  DevNr ) 
+      { ANetNodeInstance * NNI = nextNode();
+        return (NNI) ? NNI->generateFile( ID, Path, TS, DevNr ) : 1;
+      }
+
+    // return true if this node instance is triggered by this trigger
+    // could be delegated to deeper instances
+    virtual bool triggeredBy( const QString & )
+      { return 0; }
+
+    //
+    //
+    // Pure virtual functions
+    //
+    //
+
+    // return runtime information for this node
+    virtual RuntimeInfo * runtime( void ) = 0;
+
+    // create edit widget under parent
+    virtual QWidget * edit( QWidget * parent ) = 0;
+
+    // is given data acceptable
+    virtual QString acceptable( void ) = 0;
+
+    // get data from GUI and store in node
+    virtual void commit( void ) = 0;
+
+    // returns node specific data -> only useful for 'buddy'
+    virtual void * data( void ) = 0;
 
 protected :
 
@@ -222,6 +309,7 @@ protected :
   QString   Description;
   bool      IsModified;
   bool      IsNew;
+    int       Done;
 
   static long InstanceCounter;
 };
@@ -282,34 +370,39 @@ public :
       NodeCollection( QTextStream & TS );
       ~NodeCollection( void );
 
-      int number( void ) 
+      inline int done( void ) 
+        { return Done; }
+      inline void setDone( int D ) 
+        { Done = D; }
+
+      inline int number( void ) 
         { return Number; }
-      void setNumber( int i ) 
+      inline void setNumber( int i ) 
         { Number = i; }
-      bool isNew( void ) 
+      inline bool isNew( void ) 
         { return IsNew; }
-      void setNew( bool N ) 
+      inline void setNew( bool N ) 
         { IsNew = N ; }
-      bool isModified( void ) 
+      inline bool isModified( void ) 
         { return IsModified; }
-      void setModified( bool N ) 
+      inline void setModified( bool N ) 
         { IsModified = N ; }
 
-      bool handlesInterface( const QString & S ) {
+      inline bool handlesInterface( const QString & S ) {
         return getToplevel()->runtime()->handlesInterface( S );
       }
 
-      InterfaceInfo * assignedInterface( void ) {
+      inline InterfaceInfo * assignedInterface( void ) {
         return getToplevel()->runtime()->assignedInterface();
       }
 
-      AsDevice * device() {
+      inline AsDevice * device() {
         return getToplevel()->runtime()->device();
       }
 
       bool triggersVPN();
 
-      State_t state( bool Update = 0 )
+      inline State_t state( bool Update = 0 )
         { Log(( "%s state %d(=%d?)\n", Name.latin1(), CurrentState,
             Unchecked ));
           if( CurrentState == Unchecked || Update ) {
@@ -325,15 +418,15 @@ public :
       // get the ixmap for this device
       QPixmap devicePixmap( void );
       QPixmap statePixmap( State_t S );
-      QPixmap statePixmap( bool Update = 0 ) 
+      inline QPixmap statePixmap( bool Update = 0 ) 
         { return statePixmap( state(Update) ); }
       QString stateName( State_t );
-      QString stateName( bool Update = 0 ) 
+      inline QString stateName( bool Update = 0 ) 
         { return stateName( state(Update) ); }
 
-      bool setState( Action_t A, bool Force =0 )
+      inline bool setState( Action_t A, bool Force =0 )
         { return getToplevel()->runtime()->setState( this, A, Force ); }
-      bool canSetState( Action_t A )
+      inline bool canSetState( Action_t A )
         { return getToplevel()->runtime()->canSetState( CurrentState, A ); }
 
       void save( QTextStream & TS );
@@ -348,19 +441,35 @@ public :
       ANetNodeInstance * findNext( ANetNodeInstance * NNI );
       ANetNodeInstance * findByName( const QString & S );
 
-      const QString & name()
+      inline const QString & name()
         { return Name; }
 
       const QString & description( void );
 
-      void setName( const QString & N)
+      inline void setName( const QString & N)
         { Name = N; }
 
-      State_t currentState( void )
+      inline State_t currentState( void )
         { return CurrentState; }
-      void setCurrentState( State_t S )
+      inline void setCurrentState( State_t S )
         { CurrentState = S; }
 
+      // return TRUE if this node can have data to be inserted in 
+      // file identified by S
+      bool hasDataForFile( const QString & S );
+      ANetNodeInstance * firstWithDataForFile( const QString & S );
+
+      // generate items for this file -> toplevel call
+      short generateFile( const QString & FID,  // identification of file
+                         const QString & FName, // effective filename of file
+                         QTextStream & TS,  // stream to file
+                         long DN // device number
+                       )
+        { return getToplevel()->generateFile( FID, FName, TS, DN ); }
+
+      bool triggeredBy( const QString & Trigger )
+        { return getToplevel()->triggeredBy( Trigger ); }
+
 private :
 
       int compareItems ( QCollection::Item item1, 
@@ -378,6 +487,7 @@ private :
       // index in listbox
       int Index;
       bool    IsModified;
+      int Done;
 
 };