5 files changed, 21 insertions, 18 deletions

diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.cpp b/noncore/settings/networksettings2/ppp/ppp_NN.cpp
index 51d17ec..b3f70c5 100644
--- a/noncore/settings/networksettings2/ppp/ppp_NN.cpp
+++ b/noncore/settings/networksettings2/ppp/ppp_NN.cpp
@@ -44,22 +44,15 @@ bool PPPNetNode::generateProperFilesFor(
       return 1;
 }
 
-bool PPPNetNode::hasDataFor( const QString &, bool  ) {
-      return 0;
-}
-
-bool PPPNetNode::generateDataForCommonFile( 
+bool PPPNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & , 
-                                long,
-                                ANetNodeInstance * ) {
+                                long ) {
       return 1;
 }
 
-bool PPPNetNode::generateDeviceDataForCommonFile( 
-                                SystemFile & , 
-                                long ,
-                                ANetNodeInstance * ) {
-      return 1;
+QString PPPNetNode::genNic( long NicNr ) { 
+      QString S; 
+      return S.sprintf( "ppp%ld", NicNr ); 
 }
 
 extern "C" {
diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.h b/noncore/settings/networksettings2/ppp/ppp_NN.h
index 8d56e7f..c33f281 100644
--- a/noncore/settings/networksettings2/ppp/ppp_NN.h
+++ b/noncore/settings/networksettings2/ppp/ppp_NN.h
@@ -28,11 +28,12 @@ public:
     virtual const char * provides( void );
 
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-    virtual bool hasDataFor( const QString & S, bool DS );
-    virtual bool generateDataForCommonFile( 
-        SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
+    virtual bool hasDataFor( const QString & )
+      { return 0; }
     virtual bool generateDeviceDataForCommonFile( 
-        SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
+        SystemFile & SF, long DevNr );
+
+    virtual QString genNic( long NicNr );
 
 private:
 
diff --git a/noncore/settings/networksettings2/ppp/ppp_NNI.cpp b/noncore/settings/networksettings2/ppp/ppp_NNI.cpp
index d09ecf9..d0fd31c 100644
--- a/noncore/settings/networksettings2/ppp/ppp_NNI.cpp
+++ b/noncore/settings/networksettings2/ppp/ppp_NNI.cpp
@@ -113,3 +113,9 @@ void APPP::commit( void ) {
     }
 }
 
+bool APPP::generateDataForCommonFile( 
+                                SystemFile & , 
+                                long) {
+      return 1;
+}
+
diff --git a/noncore/settings/networksettings2/ppp/ppp_NNI.h b/noncore/settings/networksettings2/ppp/ppp_NNI.h
index a17721a..989c2f0 100644
--- a/noncore/settings/networksettings2/ppp/ppp_NNI.h
+++ b/noncore/settings/networksettings2/ppp/ppp_NNI.h
@@ -27,6 +27,11 @@ public :
       virtual void * data( void ) 
         { return (void *)&Data; }
 
+      virtual bool hasDataFor( const QString & )
+        { return 0; }
+
+      virtual bool generateDataForCommonFile( 
+          SystemFile & SF, long DevNr );
 protected :
 
       virtual void setSpecificAttribute( QString & Attr, QString & Value );
diff --git a/noncore/settings/networksettings2/ppp/ppprun.h b/noncore/settings/networksettings2/ppp/ppprun.h
index 765aff2..af51fbe 100644
--- a/noncore/settings/networksettings2/ppp/ppprun.h
+++ b/noncore/settings/networksettings2/ppp/ppprun.h
@@ -12,8 +12,6 @@ public :
 
       PPPRun( ANetNodeInstance * NNI, 
               PPPData & Data );
-      virtual QString genNic( long NicNr )
-        { QString S; return S.sprintf( "ppp%ld", NicNr ); }
 
       virtual AsDevice * asDevice( void ) 
         { return (AsDevice *)this; }