Diffstat (limited to 'noncore/settings/networksettings2/modem') (more/less context) (show whitespace changes)
4 files changed, 15 insertions, 17 deletions
diff --git a/noncore/settings/networksettings2/modem/modem_NN.cpp b/noncore/settings/networksettings2/modem/modem_NN.cpp index 2807963..65b06ee 100644 --- a/noncore/settings/networksettings2/modem/modem_NN.cpp +++ b/noncore/settings/networksettings2/modem/modem_NN.cpp @@ -21,47 +21,35 @@ const QString ModemNetNode::nodeDescription(){ return tr("\ <p>Sets up a dialing procedures.</p>\ <p>Use this to dial up over modems, ISDN, GSM, ...</p>\ " ); } ANetNodeInstance * ModemNetNode::createInstance( void ) { return new AModem( this ); } const char ** ModemNetNode::needs( void ) { return ModemNeeds; } const char * ModemNetNode::provides( void ) { return "line"; } bool ModemNetNode::generateProperFilesFor( ANetNodeInstance * ) { return 1; } -bool ModemNetNode::hasDataFor( const QString &, bool ) { - return 0; -} - -bool ModemNetNode::generateDataForCommonFile( - SystemFile & , - long , - ANetNodeInstance * ) { - return 1; -} - bool ModemNetNode::generateDeviceDataForCommonFile( SystemFile & , - long , - ANetNodeInstance * ) { + long ) { return 1; } extern "C" { void create_plugin( QList<ANetNode> & PNN ) { PNN.append( new ModemNetNode() ); } } diff --git a/noncore/settings/networksettings2/modem/modem_NN.h b/noncore/settings/networksettings2/modem/modem_NN.h index bd921c6..49244b2 100644 --- a/noncore/settings/networksettings2/modem/modem_NN.h +++ b/noncore/settings/networksettings2/modem/modem_NN.h @@ -7,40 +7,39 @@ class AModem; class ModemNetNode : public ANetNode{ Q_OBJECT public: ModemNetNode(); virtual ~ModemNetNode(); virtual const QString pixmapName() { return "Devices/modem"; } virtual const QString nodeName() { return tr("Dialup modem"); } 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, 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 ); private: }; extern "C" { void create_plugin( QList<ANetNode> & PNN ); }; #endif diff --git a/noncore/settings/networksettings2/modem/modem_NNI.cpp b/noncore/settings/networksettings2/modem/modem_NNI.cpp index 91df22b..6c76b56 100644 --- a/noncore/settings/networksettings2/modem/modem_NNI.cpp +++ b/noncore/settings/networksettings2/modem/modem_NNI.cpp @@ -8,24 +8,30 @@ AModem::AModem( ModemNetNode * PNN ) : ANetNodeInstance( PNN ) { RT = 0; } void AModem::setSpecificAttribute( QString & , QString & ) { } void AModem::saveSpecificAttribute( QTextStream & ) { } QWidget * AModem::edit( QWidget * parent ) { GUI = new ModemEdit( parent ); GUI->showData( Data ); return GUI; } QString AModem::acceptable( void ) { return ( GUI ) ? GUI->acceptable( ) : QString(); } void AModem::commit( void ) { if( GUI && GUI->commit( Data ) ) setModified( 1 ); } +bool AModem::generateDataForCommonFile( + SystemFile & , + long ) { + return 1; +} + diff --git a/noncore/settings/networksettings2/modem/modem_NNI.h b/noncore/settings/networksettings2/modem/modem_NNI.h index 7543e7d..a623704 100644 --- a/noncore/settings/networksettings2/modem/modem_NNI.h +++ b/noncore/settings/networksettings2/modem/modem_NNI.h @@ -6,38 +6,43 @@ #include "modemrun.h" class ModemNetNode; class ModemEdit; class AModem : public ANetNodeInstance { public : AModem( ModemNetNode * PNN ); QWidget * edit( QWidget * parent ); QString acceptable( void ); void commit( void ); RuntimeInfo * runtime( void ) { if( RT == 0 ) RT = new ModemRun( this, Data ); return RT; } 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 ); virtual void saveSpecificAttribute( QTextStream & TS ); private : ModemEdit * GUI; ModemData Data; ModemRun * RT; }; #endif |