7 files changed, 34 insertions, 108 deletions

diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEP_NNI.cpp b/noncore/settings/networksettings2/bluetooth/bluetoothBNEP_NNI.cpp
index d8420b9..398dcdc 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEP_NNI.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEP_NNI.cpp
@@ -40,11 +40,3 @@ void ABluetoothBNEP::commit( void ) {
     if( GUI && GUI->commit( Data ) )
       setModified( 1 );
 }
-
-bool ABluetoothBNEP::hasDataFor( const QString & ) {
-    return 0;
-}
-
-bool ABluetoothBNEP::generateDataForCommonFile( SystemFile & , long ){
-    return 0;
-}
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEP_NNI.h b/noncore/settings/networksettings2/bluetooth/bluetoothBNEP_NNI.h
index bb3e7e7..1bf0f48 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEP_NNI.h
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEP_NNI.h
@@ -14,22 +14,18 @@ public :
 
       ABluetoothBNEP( BluetoothBNEPNetNode * PNN );
 
+      RuntimeInfo * runtime( void ) 
+        { return 
+           ( RT ) ? RT : ( RT = new BluetoothBNEPRun( this, Data ) );
+        }
+
       QWidget * edit( QWidget * parent );
       QString acceptable( void );
       void commit( void );
 
-      RuntimeInfo * runtime( void ) 
-        { if( RT == 0 ) 
-            RT = new BluetoothBNEPRun( this, Data );
-          return RT;
-        }
-
       virtual void * data( void )
         { return (void *)&Data; }
 
-      virtual bool hasDataFor( const QString & S );
-      virtual bool generateDataForCommonFile( SystemFile & SF, long );
-
 protected :
 
       virtual void setSpecificAttribute( QString & Attr, QString & Value );
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.cpp b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.cpp
index cff2639..7ec8288 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.cpp
@@ -28,11 +28,3 @@ void ABluetoothRFCOMM::commit( void ) {
     if( GUI->commit( Data ) )
       setModified( 1 );
 }
-
-bool ABluetoothRFCOMM::hasDataFor( const QString & ) {
-    return 0;
-}
-
-bool ABluetoothRFCOMM::generateDataForCommonFile( SystemFile & , long ){
-    return 0;
-}
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.h b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.h
index 97bd29c..820fc17 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.h
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.h
@@ -14,22 +14,18 @@ public :
 
       ABluetoothRFCOMM( BluetoothRFCOMMNetNode * PNN );
 
+      RuntimeInfo * runtime( void ) 
+        { return 
+           ( RT ) ? RT : ( RT = new BluetoothRFCOMMRun( this, Data ) );
+        }
+
       QWidget * edit( QWidget * parent );
       QString acceptable( void );
       void commit( void );
 
-      RuntimeInfo * runtime( void ) 
-        { if( RT == 0 ) 
-            RT = new BluetoothRFCOMMRun( this, Data );
-          return RT;
-        }
-
       virtual void * data( void )
         { return (void *)&Data; }
 
-      virtual bool hasDataFor( const QString & S );
-      virtual bool generateDataForCommonFile( SystemFile & SF, long );
-
 protected :
 
       virtual void setSpecificAttribute( QString & Attr, QString & Value );
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h
index aff1f59..65fd686 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h
@@ -12,6 +12,9 @@ public :
       virtual AsLine * asLine( void ) 
         { return (AsLine *)this; }
 
+      virtual QString deviceFile( void )
+        { return QString( "/dev/rfcomm..." ); }
+
 protected :
 
       void detectState( NodeCollection * )
diff --git a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp
index b59b4f0..443a627 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp
@@ -46,29 +46,6 @@ const char * BluetoothBNEPNetNode::provides( void ) {
       return "device";
 }
 
-bool BluetoothBNEPNetNode::generateProperFilesFor( 
-            ANetNodeInstance * ) {
-      return 0;
-}
-
-bool BluetoothBNEPNetNode::hasDataFor( const QString & S ) {
-      return S == "interfaces";
-}
-
-bool BluetoothBNEPNetNode::generateDeviceDataForCommonFile( 
-                                SystemFile & S , 
-                                long DevNr) {
-      QString NIC = genNic( DevNr );
-
-      if( S.name() == "interfaces" ) {
-        // generate mapping stanza for this interface
-        S << "# check if " << NIC << " can be brought UP" << endl;
-        S << "mapping " << NIC << endl;
-        S << "  script networksettings2-request" << endl << endl;
-      }
-      return 0;
-}
-
 QString BluetoothBNEPNetNode::genNic( long nr ) { 
       QString S; 
       return S.sprintf( "bnep%ld", nr );
@@ -124,21 +101,6 @@ const char * BluetoothRFCOMMNetNode::provides( void ) {
       return "line";
 }
 
-bool BluetoothRFCOMMNetNode::generateProperFilesFor( 
-            ANetNodeInstance * ) {
-      return 0;
-}
-
-bool BluetoothRFCOMMNetNode::hasDataFor( const QString &  ) {
-      return 0;
-}
-
-bool BluetoothRFCOMMNetNode::generateDeviceDataForCommonFile( 
-                                SystemFile & , 
-                                long ) {
-      return 0;
-}
-
 void BluetoothRFCOMMNetNode::setSpecificAttribute( QString &, QString & ) {
 }
 
diff --git a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h
index 2e5e1d2..4d6a3c1 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h
+++ b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h
@@ -7,31 +7,23 @@ class ABluetoothBNEP;
 
 class BluetoothBNEPNetNode : public ANetNode {
 
-    Q_OBJECT
+      Q_OBJECT
 
 public:
 
-    BluetoothBNEPNetNode();
-    virtual ~BluetoothBNEPNetNode();
+      BluetoothBNEPNetNode();
+      virtual ~BluetoothBNEPNetNode();
 
-    virtual const QString pixmapName() 
-      { return "Devices/bluetooth"; }
+      virtual QString genNic( long );
+      virtual long instanceCount( void )
+        { return InstanceCount; }
+      virtual const QString pixmapName() 
+        { return "Devices/bluetooth"; }
 
-    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 & S );
-    virtual bool generateDeviceDataForCommonFile( 
-        SystemFile & , long DevNr );
-
-    virtual long instanceCount( void )
-      { return InstanceCount; }
-    virtual QString genNic( long );
+      virtual const QString nodeDescription() ;
+      virtual ANetNodeInstance * createInstance( void );
+      virtual const char * provides( void );
+      virtual const char ** needs( void );
 
 private:
 
@@ -45,27 +37,20 @@ private:
 
 class BluetoothRFCOMMNetNode : public ANetNode {
 
-    Q_OBJECT
+      Q_OBJECT
 
 public:
 
-    BluetoothRFCOMMNetNode();
-    virtual ~BluetoothRFCOMMNetNode();
-
-    virtual const QString pixmapName() 
-      { return "Devices/bluetooth"; }
-
-    virtual const QString nodeDescription() ;
-
-    virtual ANetNodeInstance * createInstance( void );
+      BluetoothRFCOMMNetNode();
+      virtual ~BluetoothRFCOMMNetNode();
 
-    virtual const char ** needs( void );
-    virtual const char * provides( void );
+      virtual const QString pixmapName() 
+        { return "Devices/bluetooth"; }
 
-    virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-    virtual bool hasDataFor( const QString & S );
-    virtual bool generateDeviceDataForCommonFile( 
-        SystemFile & , long );
+      virtual const QString nodeDescription() ;
+      virtual ANetNodeInstance * createInstance( void );
+      virtual const char ** needs( void );
+      virtual const char * provides( void );
 
 private: