From 8f215ba9ceb395f262517855a99d7d2d303ca760 Mon Sep 17 00:00:00 2001
From: wimpie <wimpie>
Date: Thu, 12 Aug 2004 12:46:55 +0000
Subject: MANY changes

  - now generates peers/pap-chap secrets files
      (no chatscript yet)
      (not all usefull ppp options included yet)
  - still not ready for prime time yet
---
(limited to 'noncore/settings/networksettings2/usb')

diff --git a/noncore/settings/networksettings2/usb/usb_NN.cpp b/noncore/settings/networksettings2/usb/usb_NN.cpp
index c10a09c..14c479a 100644
--- a/noncore/settings/networksettings2/usb/usb_NN.cpp
+++ b/noncore/settings/networksettings2/usb/usb_NN.cpp
@@ -37,29 +37,6 @@ const char * USBNetNode::provides( void ) {
       return "device";
 }
 
-bool USBNetNode::generateProperFilesFor( 
-            ANetNodeInstance * ) {
-      return 0;
-}
-
-bool USBNetNode::hasDataFor( const QString & S ) {
-      return (S== "interfaces");
-}
-
-bool USBNetNode::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 USBNetNode::genNic( long ) {
     return QString( "usbf" ); 
 }
diff --git a/noncore/settings/networksettings2/usb/usb_NN.h b/noncore/settings/networksettings2/usb/usb_NN.h
index fea89f0..73da15a 100644
--- a/noncore/settings/networksettings2/usb/usb_NN.h
+++ b/noncore/settings/networksettings2/usb/usb_NN.h
@@ -18,17 +18,10 @@ public:
       { return "Devices/usb"; }
 
     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 & SF, long DevNr );
-
     virtual QString genNic( long nr );
 
 private:
diff --git a/noncore/settings/networksettings2/usb/usb_NNI.cpp b/noncore/settings/networksettings2/usb/usb_NNI.cpp
index e90204c..50c6e8d 100644
--- a/noncore/settings/networksettings2/usb/usb_NNI.cpp
+++ b/noncore/settings/networksettings2/usb/usb_NNI.cpp
@@ -32,21 +32,30 @@ void AUSB::commit( void ) {
     }
 }
 
-bool AUSB::hasDataFor( const QString & S ) {
-      return (S== "interfaces");
-}
-
-bool AUSB::generateDataForCommonFile( SystemFile & S, long DevNr ) {
+short AUSB::generateFileEmbedded( const QString & ID,
+                                 const QString & Path,
+                                 QTextStream & TS,
+                                 long DevNr ) {
+ 
     QString NIC = runtime()->device()->netNode()->nodeClass()->genNic( DevNr );
+    short rvl, rvd;
+
+    rvl = 1;
 
-    if( S.name() == "interfaces" ) {
+    if( ID == "interfaces" ) {
+      Log(("Generate USB for %s\n", ID.latin1() ));
       // generate mapping stanza for this interface
-      S << "  pre-up " 
-        << QPEApplication::qpeDir() 
-        << "bin/setmacaddress.sh " 
-        << NIC 
-        << " || true" 
-        << endl;
+      TS << "  pre-up " 
+         << QPEApplication::qpeDir() 
+         << "bin/setmacaddress.sh " 
+         << NIC 
+         << " || true" 
+         << endl;
+      rvl = 0;
     }
-    return 0;
+    rvd = ANetNodeInstance::generateFileEmbedded( ID, Path, TS, DevNr );
+
+    return (rvd == 2 || rvl == 2 ) ? 2 :
+           (rvd == 0 || rvl == 0 ) ? 0 : 1;
+
 }
diff --git a/noncore/settings/networksettings2/usb/usb_NNI.h b/noncore/settings/networksettings2/usb/usb_NNI.h
index d2ee217..fcdfd91 100644
--- a/noncore/settings/networksettings2/usb/usb_NNI.h
+++ b/noncore/settings/networksettings2/usb/usb_NNI.h
@@ -14,22 +14,22 @@ public :
 
       AUSB( USBNetNode * PNN );
 
+      RuntimeInfo * runtime( void ) 
+        { return
+            ( RT ) ? RT : ( RT = new USBRun( this, Data ) );
+        }
+
       QWidget * edit( QWidget * parent );
       QString acceptable( void );
       void commit( void );
 
-      RuntimeInfo * runtime( void ) 
-        { if( RT == 0 ) 
-            RT = new USBRun( this, Data );
-          return RT;
-        }
-
       virtual void * data( void ) 
         { return (void *)&Data; }
 
-      virtual bool hasDataFor( const QString & S);
-      virtual bool generateDataForCommonFile( 
-          SystemFile & SF, long DevNr );
+      virtual short generateFileEmbedded( const QString & ID,
+                                         const QString & Path,
+                                         QTextStream & TS,
+                                         long DevNr );
 
 protected :
 
--
cgit v0.9.0.2