From 8d2d2664e5f544b8292806e617deb7a0e4170dc0 Mon Sep 17 00:00:00 2001 From: wimpie Date: Sun, 04 Apr 2004 11:42:05 +0000 Subject: Error in generation of files --- (limited to 'noncore/settings/networksettings2/ppp') diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.cpp b/noncore/settings/networksettings2/ppp/ppp_NN.cpp index 309c9a1..51d17ec 100644 --- a/noncore/settings/networksettings2/ppp/ppp_NN.cpp +++ b/noncore/settings/networksettings2/ppp/ppp_NN.cpp @@ -44,7 +44,7 @@ bool PPPNetNode::generateProperFilesFor( return 1; } -bool PPPNetNode::hasDataFor( const QString & ) { +bool PPPNetNode::hasDataFor( const QString &, bool ) { return 0; } @@ -55,6 +55,13 @@ bool PPPNetNode::generateDataForCommonFile( return 1; } +bool PPPNetNode::generateDeviceDataForCommonFile( + SystemFile & , + long , + ANetNodeInstance * ) { + return 1; +} + extern "C" { void create_plugin( QList & PNN ) { PNN.append( new PPPNetNode() ); diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.h b/noncore/settings/networksettings2/ppp/ppp_NN.h index 3f9a338..8d56e7f 100644 --- a/noncore/settings/networksettings2/ppp/ppp_NN.h +++ b/noncore/settings/networksettings2/ppp/ppp_NN.h @@ -28,9 +28,11 @@ public: virtual const char * provides( void ); virtual bool generateProperFilesFor( ANetNodeInstance * NNI ); - virtual bool hasDataFor( const QString & S ); + virtual bool hasDataFor( const QString & S, bool DS ); virtual bool generateDataForCommonFile( SystemFile & SF, long DevNr, ANetNodeInstance * NNI ); + virtual bool generateDeviceDataForCommonFile( + SystemFile & SF, long DevNr, ANetNodeInstance * NNI ); private: diff --git a/noncore/settings/networksettings2/ppp/ppprun.cpp b/noncore/settings/networksettings2/ppp/ppprun.cpp index 4ac0c5a..8c75df3 100644 --- a/noncore/settings/networksettings2/ppp/ppprun.cpp +++ b/noncore/settings/networksettings2/ppp/ppprun.cpp @@ -16,15 +16,7 @@ void PPPRun::detectState( NodeCollection * NC ) { } else { NC->setCurrentState( Off ); // at least this // but could also be unavailable - ANetNodeInstance * NNI; - RuntimeInfo * RI; - NNI = AsDevice::netNode(); - printf( "%p\n", NNI ); - NNI = NNI->nextNode(); - printf( "%p\n", NNI ); - RI = NNI->runtime(); - printf( "%p\n", RI ); - RI->detectState( NC ); + AsDevice::netNode()->nextNode()->runtime()->detectState( NC ); } } diff --git a/noncore/settings/networksettings2/ppp/ppprun.h b/noncore/settings/networksettings2/ppp/ppprun.h index abb9176..765aff2 100644 --- a/noncore/settings/networksettings2/ppp/ppprun.h +++ b/noncore/settings/networksettings2/ppp/ppprun.h @@ -15,8 +15,14 @@ public : virtual QString genNic( long NicNr ) { QString S; return S.sprintf( "ppp%ld", NicNr ); } + virtual AsDevice * asDevice( void ) + { return (AsDevice *)this; } + virtual AsConnection * asConnection( void ) + { return (AsConnection *)this; } + virtual AsDevice * device( void ) - { return AsDevice::asDevice(); } + { return (AsDevice *)this; } + virtual RuntimeInfo * runtimeInfo( void ) { return ( AsConnection *)this; } -- cgit v0.9.0.2