5 files changed, 17 insertions, 45 deletions

diff --git a/noncore/settings/networksettings2/irda/irda_NN.cpp b/noncore/settings/networksettings2/irda/irda_NN.cpp
index 49bc06e..9483e22 100644
--- a/noncore/settings/networksettings2/irda/irda_NN.cpp
+++ b/noncore/settings/networksettings2/irda/irda_NN.cpp
@@ -27,34 +27,23 @@ const QString IRDANetNode::nodeDescription(){
 ANetNodeInstance * IRDANetNode::createInstance( void ) {
       return new AIRDA( this );
 }
 
 const char ** IRDANetNode::needs( void ) {
       return IRDANeeds;
 }
 
 const char * IRDANetNode::provides( void ) {
       return "line";
 }
 
-bool IRDANetNode::generateProperFilesFor( 
-            ANetNodeInstance * ) {
-      return 0;
-}
-
-bool IRDANetNode::generateDeviceDataForCommonFile( 
-                                SystemFile & , 
-                                long ) {
-      return 0;
-}
-
 void IRDANetNode::setSpecificAttribute( QString & , QString & ) {
 }
 
 void IRDANetNode::saveSpecificAttribute( QTextStream & ) {
 }
 
 extern "C" {
 void create_plugin( QList<ANetNode> & PNN ) {
       PNN.append( new IRDANetNode() );
 }
 }
diff --git a/noncore/settings/networksettings2/irda/irda_NN.h b/noncore/settings/networksettings2/irda/irda_NN.h
index fa6408d..900bbc6 100644
--- a/noncore/settings/networksettings2/irda/irda_NN.h
+++ b/noncore/settings/networksettings2/irda/irda_NN.h
@@ -1,43 +1,35 @@
 #ifndef IRDA_NETNODE_H
 #define IRDA_NETNODE_H
 
 #include "netnode.h"
 
 class AIRDA;
 
 class IRDANetNode : public ANetNode {
 
-    Q_OBJECT
+      Q_OBJECT
 
 public:
 
-    IRDANetNode();
-    virtual ~IRDANetNode();
+      IRDANetNode();
+      virtual ~IRDANetNode();
 
-    virtual const QString pixmapName() 
-      { return "Devices/irda"; }
+      virtual const QString pixmapName() 
+        { return "Devices/irda"; }
 
-    virtual const QString nodeDescription() ;
-
-    virtual ANetNodeInstance * createInstance( void );
-
-    virtual const char ** needs( void );
-    virtual const char * provides( void );
-
-    virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-    virtual bool hasDataFor( const QString & )
-        { return 0; }
-    virtual bool generateDeviceDataForCommonFile( 
-        SystemFile & SF, long DevNr );
+      virtual const QString nodeDescription() ;
+      virtual ANetNodeInstance * createInstance( void );
+      virtual const char ** needs( void );
+      virtual const char * provides( void );
 
 private:
 
       virtual void setSpecificAttribute( QString & Attr, QString & Value );
       virtual void saveSpecificAttribute( QTextStream & TS );
 };
 
 extern "C"
 {
   void create_plugin( QList<ANetNode> & PNN );
 };
 
diff --git a/noncore/settings/networksettings2/irda/irda_NNI.cpp b/noncore/settings/networksettings2/irda/irda_NNI.cpp
index f00a1d5..9cf443b 100644
--- a/noncore/settings/networksettings2/irda/irda_NNI.cpp
+++ b/noncore/settings/networksettings2/irda/irda_NNI.cpp
@@ -20,18 +20,12 @@ QWidget * AIRDA::edit( QWidget * parent ) {
     return GUI;
 }
 
 QString AIRDA::acceptable( void ) {
     return ( GUI ) ? GUI->acceptable( ) : QString();
 }
 
 void AIRDA::commit( void ) {
     if( GUI && GUI->commit( Data ) )
       setModified( 1 );
 }
 
-bool AIRDA::generateDataForCommonFile( 
-                                SystemFile & , 
-                                long ) {
-      return 1;
-}
-
diff --git a/noncore/settings/networksettings2/irda/irda_NNI.h b/noncore/settings/networksettings2/irda/irda_NNI.h
index 210d87d..e21b68f 100644
--- a/noncore/settings/networksettings2/irda/irda_NNI.h
+++ b/noncore/settings/networksettings2/irda/irda_NNI.h
@@ -5,42 +5,36 @@
 #include "irdadata.h"
 #include "irdarun.h"
 
 class IRDANetNode;
 class IRDAEdit;
 
 class AIRDA : public ANetNodeInstance {
 
 public :
 
       AIRDA( IRDANetNode * PNN );
 
+      RuntimeInfo * runtime( void )
+        {  return 
+           ( RT ) ? RT : ( RT = new IRDARun( this, Data ) );
+        }
+
       QWidget * edit( QWidget * parent );
       QString acceptable( void );
       void commit( void );
 
-      RuntimeInfo * runtime( void ) 
-        { if( RT == 0 ) 
-            RT = new IRDARun( this, Data );
-          return RT;
-        }
-
       virtual void * data( void ) 
         { return (void *)&Data; }
 
-      virtual bool hasDataFor( const QString & )
-        { return 0; }
-      virtual bool generateDataForCommonFile( 
-          SystemFile & SF, long DevNr );
-
 protected :
 
       virtual void setSpecificAttribute( QString & Attr, QString & Value );
       virtual void saveSpecificAttribute( QTextStream & TS );
 
 private :
 
       IRDAEdit * GUI;
       IRDAData Data;
       IRDARun * RT;
 
 };
diff --git a/noncore/settings/networksettings2/irda/irdarun.h b/noncore/settings/networksettings2/irda/irdarun.h
index 4c903cc..4258aff 100644
--- a/noncore/settings/networksettings2/irda/irdarun.h
+++ b/noncore/settings/networksettings2/irda/irdarun.h
@@ -3,23 +3,26 @@
 
 class IRDARun  : public AsLine {
 
 public :
 
       IRDARun( ANetNodeInstance * NNI, 
                IRDAData & Data ) : AsLine( NNI )
         { }
 
       virtual AsLine * asLine( void ) 
         { return (AsLine *)this; }
 
+      virtual QString deviceFile( void )
+        { return QString( "/dev/irda" ); }
+
 protected :
 
       void detectState( NodeCollection * )
         { }
 
       bool setState( NodeCollection * , Action_t, bool )
         { return 0; }
 
       bool canSetState( State_t , Action_t )
         { return 0; }
 };