CONTROL files : changed version string

NS2 many changes and first release of OT2

10 files changed, 40 insertions, 44 deletions

diff --git a/noncore/settings/networksettings2/cable/cable_NN.cpp b/noncore/settings/networksettings2/cable/cable_NN.cpp
index 38568df..dc4205c 100644
--- a/noncore/settings/networksettings2/cable/cable_NN.cpp
+++ b/noncore/settings/networksettings2/cable/cable_NN.cpp
@@ -5,6 +5,11 @@ static const char * CableNeeds[] =
     { 0
     };
 
+static const char * CableProvides[] = 
+    { "line",
+      0
+    };
+
 /**
  * Constructor, find all of the possible interfaces
  */
@@ -32,8 +37,8 @@ const char ** CableNetNode::needs( void ) {
       return CableNeeds;
 }
 
-const char * CableNetNode::provides( void ) {
-      return "line";
+const char ** CableNetNode::provides( void ) {
+      return CableProvides;
 }
 
 void CableNetNode::setSpecificAttribute( QString & , QString &  ) {
diff --git a/noncore/settings/networksettings2/cable/cable_NN.h b/noncore/settings/networksettings2/cable/cable_NN.h
index 5cc2b2d..8d649cc 100644
--- a/noncore/settings/networksettings2/cable/cable_NN.h
+++ b/noncore/settings/networksettings2/cable/cable_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/cable/cable_NNI.cpp b/noncore/settings/networksettings2/cable/cable_NNI.cpp
index 4bd9421..12a00a2 100644
--- a/noncore/settings/networksettings2/cable/cable_NNI.cpp
+++ b/noncore/settings/networksettings2/cable/cable_NNI.cpp
@@ -49,25 +49,23 @@ void ACable::saveSpecificAttribute( QTextStream & TS ) {
       ((Data.SoftwareControl) ? "yes" : "no") << endl;
 }
 
-short ACable::generateFileEmbedded( const QString & ID,
-                                    const QString & Path,
-                                    QTextStream & TS,
+short ACable::generateFileEmbedded( SystemFile & SF,
                                     long DevNr ) {
       short rvl, rvd;
 
       rvl = 1;
-      if( ID == "peers" ) {
-        TS << Data.Device
+      if( SF.name() == "peers" ) {
+        SF << Data.Device
            << endl;
-        TS << Data.Speed
+        SF << Data.Speed
            << endl;
-        TS << "lock " 
+        SF << "lock " 
            << Data.LockFile
            << endl;
         rvl = 0;
       }
 
-      rvd = ANetNodeInstance::generateFileEmbedded( ID, Path, TS, DevNr );
+      rvd = ANetNodeInstance::generateFileEmbedded( SF, DevNr );
       return (rvd == 2 || rvl == 2 ) ? 2 :
              (rvd == 0 || rvl == 0 ) ? 0 : 1;
 }
diff --git a/noncore/settings/networksettings2/cable/cable_NNI.h b/noncore/settings/networksettings2/cable/cable_NNI.h
index d06cbbe..18a52de 100644
--- a/noncore/settings/networksettings2/cable/cable_NNI.h
+++ b/noncore/settings/networksettings2/cable/cable_NNI.h
@@ -26,9 +26,7 @@ public :
       virtual void * data( void ) 
         { return (void *)&Data; }
 
-      short generateFileEmbedded( const QString & ID, 
-                                  const QString & Path,
-                                  QTextStream & TS,
+      short generateFileEmbedded( SystemFile & Sf,
                                   long DevNr );
 protected :
 
@@ -38,7 +36,7 @@ protected :
 private :
 
       CableEdit * GUI;
-      CableData_t Data;
+      CableData Data;
       CableRun * RT;
 
 };
diff --git a/noncore/settings/networksettings2/cable/cabledata.h b/noncore/settings/networksettings2/cable/cabledata.h
index c449d96..ea81f8d 100644
--- a/noncore/settings/networksettings2/cable/cabledata.h
+++ b/noncore/settings/networksettings2/cable/cabledata.h
@@ -3,7 +3,10 @@
 
 #include <qstring.h>
 
-typedef struct CableData {
+class CableData {
+
+public :
+
       QString Device;
       QString LockFile;
       long Speed;
@@ -13,6 +16,6 @@ typedef struct CableData {
       bool HardwareControl;
       bool SoftwareControl;
 
-} CableData_t; 
+}; 
 
 #endif
diff --git a/noncore/settings/networksettings2/cable/cableedit.cpp b/noncore/settings/networksettings2/cable/cableedit.cpp
index 6e1a13b..4e57845 100644
--- a/noncore/settings/networksettings2/cable/cableedit.cpp
+++ b/noncore/settings/networksettings2/cable/cableedit.cpp
@@ -17,7 +17,7 @@ static long SpeedTable[] = {
 CableEdit::CableEdit( QWidget * Parent ) : CableGUI( Parent ) {
 }
 
-void CableEdit::showData( CableData_t & D ) {
+void CableEdit::showData( CableData & D ) {
       DeviceFile_LE->setText( D.Device );
       LockFile_LE->setText( D.LockFile );
       for( long * Run = SpeedTable; *Run != -1; *Run ++ ) {
@@ -40,7 +40,7 @@ QString CableEdit::acceptable( void ) {
     return QString();
 }
 
-bool CableEdit::commit( CableData_t & D ) {
+bool CableEdit::commit( CableData & D ) {
       bool SM = 0;
 
       TXTM( D.Device, DeviceFile_LE, SM );
diff --git a/noncore/settings/networksettings2/cable/cableedit.h b/noncore/settings/networksettings2/cable/cableedit.h
index ffacc61..ad1e832 100644
--- a/noncore/settings/networksettings2/cable/cableedit.h
+++ b/noncore/settings/networksettings2/cable/cableedit.h
@@ -7,6 +7,6 @@ public :
 
     CableEdit( QWidget * parent );
     QString acceptable( void );
-    bool commit( CableData_t & D );
-    void showData( CableData_t & D );
+    bool commit( CableData & D );
+    void showData( CableData & D );
 };
diff --git a/noncore/settings/networksettings2/cable/cablerun.cpp b/noncore/settings/networksettings2/cable/cablerun.cpp
index 85660f6..7a8deb9 100644
--- a/noncore/settings/networksettings2/cable/cablerun.cpp
+++ b/noncore/settings/networksettings2/cable/cablerun.cpp
@@ -2,27 +2,19 @@
 #include <unistd.h>
 #include "cablerun.h"
 
-void CableRun::detectState( NodeCollection * NC ) { 
+State_t CableRun::detectState( void ) { 
 
       int fd = open( Data->Device.latin1(), O_RDWR );
 
       if( fd < 0 ) {
-        NC->setCurrentState( Unavailable );
+        return Unavailable;
       }
       close( fd );
-      NC->setCurrentState( Available );
+      return Available;
 }
 
-bool CableRun::setState( NodeCollection * NC, Action_t A, bool ) { 
-      if( A == Activate ) {
-        detectState(NC);
-        return (NC->currentState() == Available);
-      }
-      return 1;
-}
-
-bool CableRun::canSetState( State_t , Action_t  ) { 
-      return 1;
+QString CableRun::setMyState( NodeCollection *, Action_t , bool ) { 
+      return QString();
 }
 
 QString CableRun::deviceFile( void ) {
diff --git a/noncore/settings/networksettings2/cable/cablerun.h b/noncore/settings/networksettings2/cable/cablerun.h
index 20608f6..41aea01 100644
--- a/noncore/settings/networksettings2/cable/cablerun.h
+++ b/noncore/settings/networksettings2/cable/cablerun.h
@@ -1,26 +1,26 @@
-#include <asline.h>
+#include <netnode.h>
 #include "cabledata.h"
 
-class CableRun  : public AsLine {
+class CableRun  : public RuntimeInfo {
 
 public :
 
       CableRun( ANetNodeInstance * NNI, 
-                CableData_t & D ) : AsLine( NNI )
+                CableData & D ) : RuntimeInfo( NNI )
         { Data = &D; }
 
-      virtual AsLine * asLine( void ) 
-        { return (AsLine *)this; }
+      virtual RuntimeInfo * line( void ) 
+        { return this; }
 
       virtual QString deviceFile( void );
 
+      State_t detectState( void );
+
 protected :
 
-      void detectState( NodeCollection * NC );
-      bool setState( NodeCollection * NC, Action_t A, bool Force );
-      bool canSetState( State_t Curr, Action_t A );
+      QString setMyState( NodeCollection * , Action_t, bool );
 
 private :
 
-      CableData_t * Data;
+      CableData * Data;
 };
diff --git a/noncore/settings/networksettings2/cable/opie-networksettings2plugin-cable.control b/noncore/settings/networksettings2/cable/opie-networksettings2plugin-cable.control
index 79520e2..dd08279 100644
--- a/noncore/settings/networksettings2/cable/opie-networksettings2plugin-cable.control
+++ b/noncore/settings/networksettings2/cable/opie-networksettings2plugin-cable.control
@@ -1,4 +1,4 @@
-Package: opie-networksettingsplugin2-bluetooth
+Package: opie-networksettings2plugin-cable
 Files: plugins/networksettings2/libcable.so*
 Priority: optional
 Section: opie/settings