From fd9146de7698a796659b68606429da490f817138 Mon Sep 17 00:00:00 2001
From: wimpie <wimpie>
Date: Sun, 04 Apr 2004 15:23:16 +0000
Subject: Many changes

---
(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 be4a2bc..30c72db 100644
--- a/noncore/settings/networksettings2/usb/usb_NN.cpp
+++ b/noncore/settings/networksettings2/usb/usb_NN.cpp
@@ -42,22 +42,26 @@ bool USBNetNode::generateProperFilesFor(
       return 1;
 }
 
-bool USBNetNode::hasDataFor( const QString & S, bool ) {
+bool USBNetNode::hasDataFor( const QString & S ) {
       return (S== "interfaces");
 }
 
-bool USBNetNode::generateDataForCommonFile( 
+bool USBNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & S , 
-                                long DevNr,
-                                ANetNodeInstance * NNI) {
-      return ((AUSB *)NNI)->generateDataForCommonFile(S, DevNr);
+                                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;
 }
 
-bool USBNetNode::generateDeviceDataForCommonFile( 
-                                SystemFile & S , 
-                                long DevNr,
-                                ANetNodeInstance * NNI) {
-      return ((AUSB *)NNI)->generateDeviceDataForCommonFile(S, DevNr);
+QString USBNetNode::genNic( long ) {
+    return QString( "usbf" ); 
 }
 
 extern "C" {
diff --git a/noncore/settings/networksettings2/usb/usb_NN.h b/noncore/settings/networksettings2/usb/usb_NN.h
index 8ff5289..ba22b1c 100644
--- a/noncore/settings/networksettings2/usb/usb_NN.h
+++ b/noncore/settings/networksettings2/usb/usb_NN.h
@@ -28,11 +28,11 @@ public:
     virtual const char * provides( void );
 
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-    virtual bool hasDataFor( const QString & S, bool DeviceSpec );
-    virtual bool generateDataForCommonFile( 
-        SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
+    virtual bool hasDataFor( const QString & S);
     virtual bool generateDeviceDataForCommonFile( 
-        SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
+        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 6fcd6d5..e90204c 100644
--- a/noncore/settings/networksettings2/usb/usb_NNI.cpp
+++ b/noncore/settings/networksettings2/usb/usb_NNI.cpp
@@ -32,26 +32,21 @@ void AUSB::commit( void ) {
     }
 }
 
-bool AUSB::generateDataForCommonFile( SystemFile & S, long DevNr ) {
-    AsDevice * Dev = runtime()->device();
-    QString NIC = Dev->genNic( DevNr );
-
-    if( S.name() == "interfaces" ) {
-      // generate mapping stanza for this interface
-      S << "  pre-up " << QPEApplication::qpeDir() << "bin/setmacaddress.sh " << NIC << " || true" << endl;
-    }
-    return 0;
+bool AUSB::hasDataFor( const QString & S ) {
+      return (S== "interfaces");
 }
 
-bool AUSB::generateDeviceDataForCommonFile( SystemFile & S, long DevNr ) {
-    AsDevice * Dev = runtime()->device();
-    QString NIC = Dev->genNic( DevNr );
+bool AUSB::generateDataForCommonFile( SystemFile & S, long DevNr ) {
+    QString NIC = runtime()->device()->netNode()->nodeClass()->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;
+      S << "  pre-up " 
+        << QPEApplication::qpeDir() 
+        << "bin/setmacaddress.sh " 
+        << NIC 
+        << " || true" 
+        << endl;
     }
     return 0;
 }
diff --git a/noncore/settings/networksettings2/usb/usb_NNI.h b/noncore/settings/networksettings2/usb/usb_NNI.h
index 5dead36..d2ee217 100644
--- a/noncore/settings/networksettings2/usb/usb_NNI.h
+++ b/noncore/settings/networksettings2/usb/usb_NNI.h
@@ -27,8 +27,9 @@ public :
       virtual void * data( void ) 
         { return (void *)&Data; }
 
-      bool generateDataForCommonFile( SystemFile & S, long DevNr );
-      bool generateDeviceDataForCommonFile( SystemFile & S, long DevNr );
+      virtual bool hasDataFor( const QString & S);
+      virtual bool generateDataForCommonFile( 
+          SystemFile & SF, long DevNr );
 
 protected :
 
diff --git a/noncore/settings/networksettings2/usb/usbrun.cpp b/noncore/settings/networksettings2/usb/usbrun.cpp
index 3007e79..4ce6721 100644
--- a/noncore/settings/networksettings2/usb/usbrun.cpp
+++ b/noncore/settings/networksettings2/usb/usbrun.cpp
@@ -174,9 +174,3 @@ bool USBRun::handlesInterface( const QString & S ) {
     return Pat.match( S ) >= 0;
 }
 
-QString USBRun::genNic( long nr ) {
-    QString S; 
-    S.sprintf( "usbf" ); 
-    return S;
-}
-
diff --git a/noncore/settings/networksettings2/usb/usbrun.h b/noncore/settings/networksettings2/usb/usbrun.h
index 60f9fe8..6c6e4e4 100644
--- a/noncore/settings/networksettings2/usb/usbrun.h
+++ b/noncore/settings/networksettings2/usb/usbrun.h
@@ -15,10 +15,6 @@ public :
                 Pat( "usb[0-9abcdef]" )
         { }
 
-      virtual long count( void )
-        { return 1; }
-      virtual QString genNic( long nr );
-
       virtual AsDevice * device( void ) 
         { return (AsDevice *)this; }
 
--
cgit v0.9.0.2