5 files changed, 22 insertions, 19 deletions

diff --git a/noncore/settings/networksettings2/irda/irda_NN.cpp b/noncore/settings/networksettings2/irda/irda_NN.cpp
index 9483e22..485cad3 100644
--- a/noncore/settings/networksettings2/irda/irda_NN.cpp
+++ b/noncore/settings/networksettings2/irda/irda_NN.cpp
@@ -5,6 +5,11 @@ static const char * IRDANeeds[] =
     { 0
     };
 
+static const char * IRDAProvides[] = 
+    { "line",
+      0
+    };
+
 /**
  * Constructor, find all of the possible interfaces
  */
@@ -32,8 +37,8 @@ const char ** IRDANetNode::needs( void ) {
       return IRDANeeds;
 }
 
-const char * IRDANetNode::provides( void ) {
-      return "line";
+const char ** IRDANetNode::provides( void ) {
+      return IRDAProvides;
 }
 
 void IRDANetNode::setSpecificAttribute( QString & , QString & ) {
diff --git a/noncore/settings/networksettings2/irda/irda_NN.h b/noncore/settings/networksettings2/irda/irda_NN.h
index 900bbc6..9e5c5e6 100644
--- a/noncore/settings/networksettings2/irda/irda_NN.h
+++ b/noncore/settings/networksettings2/irda/irda_NN.h
@@ -20,7 +20,7 @@ public:
       virtual const QString nodeDescription() ;
       virtual ANetNodeInstance * createInstance( void );
       virtual const char ** needs( void );
-      virtual const char * provides( void );
+      virtual const char ** provides( void );
 
 private:
 
diff --git a/noncore/settings/networksettings2/irda/irdadata.h b/noncore/settings/networksettings2/irda/irdadata.h
index c3c683e..568f796 100644
--- a/noncore/settings/networksettings2/irda/irdadata.h
+++ b/noncore/settings/networksettings2/irda/irdadata.h
@@ -3,7 +3,8 @@
 
 #include <qstring.h>
 
-typedef struct IRDAData {
+class IRDAData {
+public :
       QString Device;
       QString LockFile;
       long Speed;
@@ -13,6 +14,6 @@ typedef struct IRDAData {
       bool HardwareControl;
       bool SoftwareControl;
 
-} IRDAData_t; 
+} ; 
 
 #endif
diff --git a/noncore/settings/networksettings2/irda/irdarun.h b/noncore/settings/networksettings2/irda/irdarun.h
index 4258aff..d3b714b 100644
--- a/noncore/settings/networksettings2/irda/irdarun.h
+++ b/noncore/settings/networksettings2/irda/irdarun.h
@@ -1,28 +1,25 @@
-#include <asline.h>
+#include <netnode.h>
 #include "irdadata.h"
 
-class IRDARun  : public AsLine {
+class IRDARun  : public RuntimeInfo {
 
 public :
 
       IRDARun( ANetNodeInstance * NNI, 
-               IRDAData & Data ) : AsLine( NNI )
+               IRDAData & Data ) : RuntimeInfo( NNI )
         { }
 
-      virtual AsLine * asLine( void ) 
-        { return (AsLine *)this; }
+      virtual RuntimeInfo * line( void ) 
+        { return this; }
 
       virtual QString deviceFile( void )
         { return QString( "/dev/irda" ); }
 
-protected :
-
-      void detectState( NodeCollection * )
-        { }
+      State_t detectState( void )
+        { return Unknown; }
 
-      bool setState( NodeCollection * , Action_t, bool )
-        { return 0; }
+protected :
 
-      bool canSetState( State_t , Action_t )
-        { return 0; }
+      QString setMyState( NodeCollection * , Action_t, bool )
+        { return QString(); }
 };
diff --git a/noncore/settings/networksettings2/irda/opie-networksettings2plugin-irda.control b/noncore/settings/networksettings2/irda/opie-networksettings2plugin-irda.control
index 938bee5..4afbbcf 100644
--- a/noncore/settings/networksettings2/irda/opie-networksettings2plugin-irda.control
+++ b/noncore/settings/networksettings2/irda/opie-networksettings2plugin-irda.control
@@ -1,4 +1,4 @@
-Package: opie-networksettingsplugin2-irda
+Package: opie-networksettings2plugin-irda
 Files: plugins/networksettings2/libirda.so*
 Priority: optional
 Section: opie/settings