Diffstat (limited to 'noncore/settings/networksettings2/bluetooth') (more/less context) (ignore whitespace changes)
5 files changed, 24 insertions, 27 deletions
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEP_NNI.h b/noncore/settings/networksettings2/bluetooth/bluetoothBNEP_NNI.h index a21f574..bb3e7e7 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEP_NNI.h +++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEP_NNI.h @@ -29,2 +29,5 @@ public : + virtual bool hasDataFor( const QString & S ); + virtual bool generateDataForCommonFile( SystemFile & SF, long ); + protected : diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h index 347da0c..4a773cd 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h +++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h @@ -11,7 +11,2 @@ public : - virtual long count( void ) - { return 3; } - virtual QString genNic( long nr ) - { QString S; return S.sprintf( "bnep%ld", nr ); } - virtual AsDevice * asDevice( void ) diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.h b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.h index 57ff95e..97bd29c 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.h +++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.h @@ -29,2 +29,5 @@ public : + virtual bool hasDataFor( const QString & S ); + virtual bool generateDataForCommonFile( SystemFile & SF, long ); + protected : diff --git a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp index 47272c4..3d1aa69 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp +++ b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp @@ -51,10 +51,9 @@ bool BluetoothBNEPNetNode::generateProperFilesFor( -bool BluetoothBNEPNetNode::hasDataFor( const QString & S, bool DS ) { - return DS && S == "interfaces"; +bool BluetoothBNEPNetNode::hasDataFor( const QString & S ) { + return S == "interfaces"; } -bool BluetoothBNEPNetNode::generateDataForCommonFile( +bool BluetoothBNEPNetNode::generateDeviceDataForCommonFile( SystemFile & , - long , - ANetNodeInstance * ) { + long ) { return 1; @@ -62,7 +61,5 @@ bool BluetoothBNEPNetNode::generateDataForCommonFile( -bool BluetoothBNEPNetNode::generateDeviceDataForCommonFile( - SystemFile & , - long , - ANetNodeInstance * ) { - return 1; +QString BluetoothBNEPNetNode::genNic( long nr ) { + QString S; + return S.sprintf( "bnep%ld", nr ); } @@ -110,3 +107,3 @@ bool BluetoothRFCOMMNetNode::generateProperFilesFor( -bool BluetoothRFCOMMNetNode::hasDataFor( const QString &, bool ) { +bool BluetoothRFCOMMNetNode::hasDataFor( const QString & ) { return 0; @@ -114,6 +111,5 @@ bool BluetoothRFCOMMNetNode::hasDataFor( const QString &, bool ) { -bool BluetoothRFCOMMNetNode::generateDataForCommonFile( +bool BluetoothRFCOMMNetNode::generateDeviceDataForCommonFile( SystemFile & , - long, - ANetNodeInstance * ) { + long ) { return 0; diff --git a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h index d72b0d4..5cd6c52 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h +++ b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h @@ -30,7 +30,9 @@ public: 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 & S ); virtual bool generateDeviceDataForCommonFile( - SystemFile & SF, long DevNr, ANetNodeInstance * NNI ); + SystemFile & , long DevNr ); + + virtual long instanceCount( void ) + { return 7; } + virtual QString genNic( long ); @@ -63,7 +65,5 @@ public: virtual bool generateProperFilesFor( ANetNodeInstance * NNI ); - virtual bool hasDataFor( const QString & S, bool ); - virtual bool generateDataForCommonFile( - SystemFile & SF, long, ANetNodeInstance * NNI ); + virtual bool hasDataFor( const QString & S ); virtual bool generateDeviceDataForCommonFile( - SystemFile & SF, long, ANetNodeInstance * NNI ); + SystemFile & , long ); |