diff options
Diffstat (limited to 'kmix')
48 files changed, 137 insertions, 137 deletions
diff --git a/kmix/dialogviewconfiguration.h b/kmix/dialogviewconfiguration.h index 4b90a168..c0a80bae 100644 --- a/kmix/dialogviewconfiguration.h +++ b/kmix/dialogviewconfiguration.h @@ -15,7 +15,7 @@ class DialogViewConfiguration : public KDialogBase Q_OBJECT TQ_OBJECT public: - DialogViewConfiguration(TQWidget* tqparent, ViewBase& view); + DialogViewConfiguration(TQWidget* parent, ViewBase& view); ~DialogViewConfiguration(); TQSize tqsizeHint() const; diff --git a/kmix/kledbutton.cpp b/kmix/kledbutton.cpp index 366263f4..7e9fbe02 100644 --- a/kmix/kledbutton.cpp +++ b/kmix/kledbutton.cpp @@ -24,17 +24,17 @@ #include "kledbutton.h" -KLedButton::KLedButton(const TQColor &col, TQWidget *tqparent, const char *name) - : KLed( col, tqparent, name ) +KLedButton::KLedButton(const TQColor &col, TQWidget *parent, const char *name) + : KLed( col, parent, name ) { // KLed and thus KLedButtung does not do proper positioning in TQLayout's. // Thus I will do a dirty trick here - installEventFilter(tqparent); + installEventFilter(parent); } KLedButton::KLedButton(const TQColor& col, KLed::State st, KLed::Look look, - KLed::Shape tqshape, TQWidget *tqparent, const char *name) - : KLed( col, st, look, tqshape, tqparent, name ) + KLed::Shape tqshape, TQWidget *parent, const char *name) + : KLed( col, st, look, tqshape, parent, name ) { } diff --git a/kmix/kledbutton.h b/kmix/kledbutton.h index ed7f529b..da07d492 100644 --- a/kmix/kledbutton.h +++ b/kmix/kledbutton.h @@ -34,9 +34,9 @@ class KLedButton : public KLed { Q_OBJECT TQ_OBJECT public: - KLedButton(const TQColor &col=TQt::green, TQWidget *tqparent=0, const char *name=0); + KLedButton(const TQColor &col=TQt::green, TQWidget *parent=0, const char *name=0); KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape tqshape, - TQWidget *tqparent=0, const char *name=0); + TQWidget *parent=0, const char *name=0); ~KLedButton(); TQSize tqsizeHint () const; diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp index 5e37841e..741cbd0e 100644 --- a/kmix/kmixapplet.cpp +++ b/kmix/kmixapplet.cpp @@ -66,11 +66,11 @@ extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kmix"); return new KMixApplet(configFile, KPanelApplet::Normal, - tqparent, "kmixapplet"); + parent, "kmixapplet"); } } @@ -84,10 +84,10 @@ static const TQColor mutedHighColor = "#FFFFFF"; static const TQColor mutedLowColor = "#808080"; static const TQColor mutedBackColor = "#000000"; -AppletConfigDialog::AppletConfigDialog( TQWidget * tqparent, const char * name ) +AppletConfigDialog::AppletConfigDialog( TQWidget * parent, const char * name ) : KDialogBase( KDialogBase::Plain, TQString(), KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel, - KDialogBase::Ok, tqparent, name, false, true) + KDialogBase::Ok, parent, name, false, true) { setPlainCaption(i18n("Configure - Mixer Applet")); TQFrame* page = plainPage(); @@ -150,9 +150,9 @@ bool AppletConfigDialog::useCustomColors() const KMixApplet::KMixApplet( const TQString& configFile, Type t, - TQWidget *tqparent, const char *name ) + TQWidget *parent, const char *name ) - : KPanelApplet( configFile, t, KPanelApplet::Preferences | KPanelApplet::ReportBug | KPanelApplet::About, tqparent, name ), + : KPanelApplet( configFile, t, KPanelApplet::Preferences | KPanelApplet::ReportBug | KPanelApplet::About, parent, name ), m_mixerWidget(0), m_errorLabel(0), m_pref(0), m_aboutData( "kmix", I18N_NOOP("KMix Panel Applet"), APP_VERSION, "Mini Sound Mixer Applet", KAboutData::License_GPL, diff --git a/kmix/kmixapplet.h b/kmix/kmixapplet.h index 1b997a5b..5f7136ad 100644 --- a/kmix/kmixapplet.h +++ b/kmix/kmixapplet.h @@ -45,7 +45,7 @@ class AppletConfigDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - AppletConfigDialog( TQWidget * tqparent=0, const char * name=0 ); + AppletConfigDialog( TQWidget * parent=0, const char * name=0 ); virtual ~AppletConfigDialog() {}; void setActiveColors(const TQColor& high, const TQColor& low, const TQColor& back); @@ -75,7 +75,7 @@ class KMixApplet : public KPanelApplet public: KMixApplet( const TQString& configFile, Type t = Normal, - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); virtual ~KMixApplet(); struct Colors { diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp index d5c254e6..49d96627 100644 --- a/kmix/kmixdockwidget.cpp +++ b/kmix/kmixdockwidget.cpp @@ -48,8 +48,8 @@ #include "kwin.h" #include "viewdockareapopup.h" -KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *tqparent, const char *name, bool volumePopup, bool dockIconMuting ) - : KSystemTray( tqparent, name ), +KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *parent, const char *name, bool volumePopup, bool dockIconMuting ) + : KSystemTray( parent, name ), m_mixer(mixer), _dockAreaPopup(0L), _audioPlayer(0L), diff --git a/kmix/kmixdockwidget.h b/kmix/kmixdockwidget.h index 9efaefb6..bf9c4390 100644 --- a/kmix/kmixdockwidget.h +++ b/kmix/kmixdockwidget.h @@ -44,7 +44,7 @@ class KMixDockWidget : public KSystemTray { friend class KMixWindow; public: - KMixDockWidget(Mixer *, TQWidget *tqparent=0, const char *name=0, bool volumePopup=true, bool dockIconMuting=false); + KMixDockWidget(Mixer *, TQWidget *parent=0, const char *name=0, bool volumePopup=true, bool dockIconMuting=false); ~KMixDockWidget(); void setErrorPixmap(); diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp index b283d830..56c90d03 100644 --- a/kmix/kmixerwidget.cpp +++ b/kmix/kmixerwidget.cpp @@ -57,8 +57,8 @@ */ KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName, MixDevice::DeviceCategory categoryMask, - TQWidget * tqparent, const char * name, ViewBase::ViewFlags vflags ) - : TQWidget( tqparent, name ), _mixer(mixer), m_balanceSlider(0), + TQWidget * parent, const char * name, ViewBase::ViewFlags vflags ) + : TQWidget( parent, name ), _mixer(mixer), m_balanceSlider(0), m_topLayout(0), m_id( _id ), _iconsEnabled( true ), _labelsEnabled( false ), _ticksEnabled( false ), diff --git a/kmix/kmixerwidget.h b/kmix/kmixerwidget.h index 06ea6745..7e03ff79 100644 --- a/kmix/kmixerwidget.h +++ b/kmix/kmixerwidget.h @@ -64,7 +64,7 @@ class KMixerWidget : public TQWidget public: KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName, MixDevice::DeviceCategory categoryMask = MixDevice::ALL , - TQWidget *tqparent=0, const char *name=0, ViewBase::ViewFlags vflags=0 ); + TQWidget *parent=0, const char *name=0, ViewBase::ViewFlags vflags=0 ); ~KMixerWidget(); enum KMixerWidgetIO { OUTPUT=0, INPUT }; diff --git a/kmix/kmixprefdlg.cpp b/kmix/kmixprefdlg.cpp index eebc0c9a..3cfa42e5 100644 --- a/kmix/kmixprefdlg.cpp +++ b/kmix/kmixprefdlg.cpp @@ -36,9 +36,9 @@ #include "kmixerwidget.h" -KMixPrefDlg::KMixPrefDlg( TQWidget *tqparent ) +KMixPrefDlg::KMixPrefDlg( TQWidget *parent ) : KDialogBase( Plain, i18n( "Configure" ), - Ok|Cancel|Apply, Ok, tqparent ) + Ok|Cancel|Apply, Ok, parent ) { // general buttons m_generalTab = plainPage( /* i18n("&General") */ ); diff --git a/kmix/kmixprefdlg.h b/kmix/kmixprefdlg.h index 0840e05e..e719dd50 100644 --- a/kmix/kmixprefdlg.h +++ b/kmix/kmixprefdlg.h @@ -38,7 +38,7 @@ KMixPrefDlg : public KDialogBase friend class KMixWindow; public: - KMixPrefDlg( TQWidget *tqparent ); + KMixPrefDlg( TQWidget *parent ); ~KMixPrefDlg(); signals: diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp index eb03cfc7..fea113b5 100644 --- a/kmix/ksmallslider.cpp +++ b/kmix/ksmallslider.cpp @@ -36,22 +36,22 @@ static const TQColor mutedLowColor2 = "#808080"; static const TQColor backColor2 = "#000000"; */ -KSmallSlider::KSmallSlider( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), _orientation( Qt::Vertical ) +KSmallSlider::KSmallSlider( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), _orientation( Qt::Vertical ) { init(); } -KSmallSlider::KSmallSlider( Qt::Orientation orientation, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), _orientation( orientation ) +KSmallSlider::KSmallSlider( Qt::Orientation orientation, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), _orientation( orientation ) { init(); } KSmallSlider::KSmallSlider( int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, - TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), + TQWidget *parent, const char *name ) + : TQWidget( parent, name ), TQRangeControl( minValue, maxValue, 1, pageStep, value ), _orientation( orientation) { init(); diff --git a/kmix/ksmallslider.h b/kmix/ksmallslider.h index 23a84695..7b672720 100644 --- a/kmix/ksmallslider.h +++ b/kmix/ksmallslider.h @@ -35,10 +35,10 @@ class KSmallSlider : public TQWidget, public TQRangeControl TQ_OBJECT public: - KSmallSlider( TQWidget *tqparent, const char *name=0 ); - KSmallSlider( Qt::Orientation, TQWidget *tqparent, const char *name=0 ); + KSmallSlider( TQWidget *parent, const char *name=0 ); + KSmallSlider( Qt::Orientation, TQWidget *parent, const char *name=0 ); KSmallSlider( int minValue, int maxValue, int pageStep, int value, - Qt::Orientation, TQWidget *tqparent, const char *name=0 ); + Qt::Orientation, TQWidget *parent, const char *name=0 ); //virtual void setTracking( bool enable ); //bool tracking() const; diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp index 17a5887d..90ac1350 100644 --- a/kmix/mdwenum.cpp +++ b/kmix/mdwenum.cpp @@ -46,8 +46,8 @@ */ MDWEnum::MDWEnum(Mixer *mixer, MixDevice* md, Qt::Orientation orientation, - TQWidget* tqparent, ViewBase* mw, const char* name) : - MixDeviceWidget(mixer,md,false,orientation,tqparent,mw,name), + TQWidget* parent, ViewBase* mw, const char* name) : + MixDeviceWidget(mixer,md,false,orientation,parent,mw,name), _label(0), _enumCombo(0), _layout(0) { // create actions (on _mdwActions, see MixDeviceWidget) diff --git a/kmix/mdwenum.h b/kmix/mdwenum.h index d0ec1bec..0a77506f 100644 --- a/kmix/mdwenum.h +++ b/kmix/mdwenum.h @@ -47,7 +47,7 @@ class MDWEnum : public MixDeviceWidget public: MDWEnum( Mixer *mixer, MixDevice* md, Qt::Orientation orientation, - TQWidget* tqparent = 0, ViewBase* mw = 0, const char* name = 0); + TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); ~MDWEnum(); void addActionToPopup( KAction *action ); diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp index 2ea95412..8d363c5e 100644 --- a/kmix/mdwslider.cpp +++ b/kmix/mdwslider.cpp @@ -58,8 +58,8 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md, bool showMuteLED, bool showRecordLED, bool small, Qt::Orientation orientation, - TQWidget* tqparent, ViewBase* mw, const char* name) : - MixDeviceWidget(mixer,md,small,orientation,tqparent,mw,name), + TQWidget* parent, ViewBase* mw, const char* name) : + MixDeviceWidget(mixer,md,small,orientation,parent,mw,name), m_linked(true), m_valueStyle( NNONE), m_iconLabel( 0 ), m_muteLED( 0 ), m_recordLED( 0 ), m_label( 0 ), _layout(0) { // create actions (on _mdwActions, see MixDeviceWidget) diff --git a/kmix/mdwslider.h b/kmix/mdwslider.h index 17836bd1..61a95c96 100644 --- a/kmix/mdwslider.h +++ b/kmix/mdwslider.h @@ -62,7 +62,7 @@ public: MDWSlider( Mixer *mixer, MixDevice* md, bool showMuteLED, bool showRecordLED, bool small, Qt::Orientation, - TQWidget* tqparent = 0, ViewBase* mw = 0, const char* name = 0); + TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); ~MDWSlider() {} void addActionToPopup( KAction *action ); diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp index 7ee2b1e4..056bca57 100644 --- a/kmix/mdwswitch.cpp +++ b/kmix/mdwswitch.cpp @@ -47,8 +47,8 @@ */ MDWSwitch::MDWSwitch(Mixer *mixer, MixDevice* md, bool small, Qt::Orientation orientation, - TQWidget* tqparent, ViewBase* mw, const char* name) : - MixDeviceWidget(mixer,md,small,orientation,tqparent,mw,name), + TQWidget* parent, ViewBase* mw, const char* name) : + MixDeviceWidget(mixer,md,small,orientation,parent,mw,name), _label(0) , _labelV(0) , _switchLED(0), _layout(0) { // create actions (on _mdwActions, see MixDeviceWidget) diff --git a/kmix/mdwswitch.h b/kmix/mdwswitch.h index 4e2258ea..6c6f3bbf 100644 --- a/kmix/mdwswitch.h +++ b/kmix/mdwswitch.h @@ -57,7 +57,7 @@ class MDWSwitch : public MixDeviceWidget public: MDWSwitch( Mixer *mixer, MixDevice* md, bool small, Qt::Orientation orientation, - TQWidget* tqparent = 0, ViewBase* mw = 0, const char* name = 0); + TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); ~MDWSwitch(); void addActionToPopup( KAction *action ); diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp index b7e3b3ce..f90a9455 100644 --- a/kmix/mixdevicewidget.cpp +++ b/kmix/mixdevicewidget.cpp @@ -54,8 +54,8 @@ */ MixDeviceWidget::MixDeviceWidget(Mixer *mixer, MixDevice* md, bool small, Qt::Orientation orientation, - TQWidget* tqparent, ViewBase* mw, const char* name) : - TQWidget( tqparent, name ), m_mixer(mixer), m_mixdevice( md ), m_mixerwidget( mw ), + TQWidget* parent, ViewBase* mw, const char* name) : + TQWidget( parent, name ), m_mixer(mixer), m_mixdevice( md ), m_mixerwidget( mw ), m_disabled( false ), _orientation( orientation ), m_small( small ) { _mdwActions = new KActionCollection( this ); diff --git a/kmix/mixdevicewidget.h b/kmix/mixdevicewidget.h index d652a749..c5a06cc6 100644 --- a/kmix/mixdevicewidget.h +++ b/kmix/mixdevicewidget.h @@ -61,7 +61,7 @@ public: MixDeviceWidget( Mixer *mixer, MixDevice* md, bool small, Qt::Orientation orientation, - TQWidget* tqparent = 0, ViewBase* mw = 0, const char* name = 0); + TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); ~MixDeviceWidget(); void addActionToPopup( KAction *action ); diff --git a/kmix/mixer_hpux.cpp b/kmix/mixer_hpux.cpp index 82e1ad51..20ef91f3 100644 --- a/kmix/mixer_hpux.cpp +++ b/kmix/mixer_hpux.cpp @@ -86,31 +86,31 @@ int Mixer_HPUX::open() else { /* Mixer is open. Now define properties */ - stereodevs = devtqmask = (1<<ID_PCM); /* activate pcm */ - rectqmask = 0; + stereodevs = devmask = (1<<ID_PCM); /* activate pcm */ + recmask = 0; /* check Input devices... */ if (AInputSources(audio) & AMonoMicrophoneMask) { - devtqmask |= (1<<ID_IN_MICROPHONE); - rectqmask |= (1<<ID_IN_MICROPHONE); + devmask |= (1<<ID_IN_MICROPHONE); + recmask |= (1<<ID_IN_MICROPHONE); } if (AInputSources(audio) & (ALeftAuxiliaryMask|ARightAuxiliaryMask)) { - devtqmask |= (1<<ID_IN_AUX); - rectqmask |= (1<<ID_IN_AUX); + devmask |= (1<<ID_IN_AUX); + recmask |= (1<<ID_IN_AUX); stereodevs |= (1<<ID_IN_AUX); } /* check Output devices... */ if (AOutputDestinations(audio) & AMonoIntSpeakerMask) { - devtqmask |= (1<<ID_OUT_INT_SPEAKER); + devmask |= (1<<ID_OUT_INT_SPEAKER); stereodevs |= (1<<ID_OUT_INT_SPEAKER); } /* implement later: ---------------- - if (AOutputDestinations(audio) & AMonoLineOutMask) devtqmask |= 64; // Line - if (AOutputDestinations(audio) & AMonoJackMask) devtqmask |= (1<<14); // Line1 - if (AOutputDestinations(audio) & AMonoHeadphoneMask) devtqmask |= (1<<15); // Line2 + if (AOutputDestinations(audio) & AMonoLineOutMask) devmask |= 64; // Line + if (AOutputDestinations(audio) & AMonoJackMask) devmask |= (1<<14); // Line1 + if (AOutputDestinations(audio) & AMonoHeadphoneMask) devmask |= (1<<15); // Line2 */ MaxVolume = 255; diff --git a/kmix/mixer_hpux.h b/kmix/mixer_hpux.h index 85892b0f..410758c9 100644 --- a/kmix/mixer_hpux.h +++ b/kmix/mixer_hpux.h @@ -28,7 +28,7 @@ protected: virtual int close(); Audio *audio; - unsigned int stereodevs,devtqmask, rectqmask, MaxVolume, i_recsrc; + unsigned int stereodevs,devmask, recmask, MaxVolume, i_recsrc; }; diff --git a/kmix/mixer_irix.cpp b/kmix/mixer_irix.cpp index 4a19e478..eb407567 100644 --- a/kmix/mixer_irix.cpp +++ b/kmix/mixer_irix.cpp @@ -52,8 +52,8 @@ int Mixer_IRIX::open() } else { // Mixer is open. Now define properties - devtqmask = 1+128+2048; - rectqmask = 128; + devmask = 1+128+2048; + recmask = 128; i_recsrc = 128; stereodevs = 1+128+2048; MaxVolume = 255; diff --git a/kmix/mixer_oss.cpp b/kmix/mixer_oss.cpp index 5b51db16..7fcfb38e 100644 --- a/kmix/mixer_oss.cpp +++ b/kmix/mixer_oss.cpp @@ -108,31 +108,31 @@ int Mixer_OSS::open() } } - int devtqmask, rectqmask, i_recsrc, stereodevs; + int devmask, recmask, i_recsrc, stereodevs; // Mixer is open. Now define properties - if (ioctl(m_fd, SOUND_MIXER_READ_DEVMASK, &devtqmask) == -1) + if (ioctl(m_fd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) return Mixer::ERR_READ; - if (ioctl(m_fd, SOUND_MIXER_READ_RECMASK, &rectqmask) == -1) + if (ioctl(m_fd, SOUND_MIXER_READ_RECMASK, &recmask) == -1) return Mixer::ERR_READ; if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1) return Mixer::ERR_READ; if (ioctl(m_fd, SOUND_MIXER_READ_STEREODEVS, &stereodevs) == -1) return Mixer::ERR_READ; - if (!devtqmask) + if (!devmask) return Mixer::ERR_NODEV; int maxVolume =100; if( m_mixDevices.isEmpty() ) { int idx = 0; - while( devtqmask && idx < MAX_MIXDEVS ) + while( devmask && idx < MAX_MIXDEVS ) { - if( devtqmask & ( 1 << idx ) ) // device active? + if( devmask & ( 1 << idx ) ) // device active? { Volume vol( stereodevs & ( 1 << idx ) ? 2 : 1, maxVolume); readVolumeFromHW( idx, vol ); MixDevice* md = - new MixDevice( idx, vol, rectqmask & ( 1 << idx ), true, + new MixDevice( idx, vol, recmask & ( 1 << idx ), true, MixerDevNames[idx], MixerChannelTypes[idx]); md->setRecSource( isRecsrcHW( idx ) ); @@ -268,7 +268,7 @@ bool Mixer_OSS::setRecsrcHW( int devnum, bool on ) } // PORTING: Hint: Do not forget to set i_recsrc to the new valid - // record source tqmask. + // record source mask. return i_recsrc == oldrecsrc; } @@ -280,7 +280,7 @@ bool Mixer_OSS::isRecsrcHW( int devnum ) if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &recsrcMask) == -1) errormsg(Mixer::ERR_READ); else { - // test if device bit is set in record bit tqmask + // test if device bit is set in record bit mask isRecsrc = ( (recsrcMask & ( 1<<devnum)) != 0 ); } return isRecsrc; diff --git a/kmix/mixer_sun.cpp b/kmix/mixer_sun.cpp index 10299add..12806bda 100644 --- a/kmix/mixer_sun.cpp +++ b/kmix/mixer_sun.cpp @@ -89,7 +89,7 @@ const MixDevice::ChannelType MixerChannelTypes[] = }; // -// Mapping from device numbers to Sun port tqmask values +// Mapping from device numbers to Sun port mask values // const uint_t MixerSunPortMasks[] = { @@ -323,7 +323,7 @@ int Mixer_SUN::writeVolumeToHW( int devnum, Volume &volume ) // // Now, based on the devnum that we are writing to, update the appropriate - // volume field and twiddle the appropriate bittqmask to enable/mute the + // volume field and twiddle the appropriate bitmask to enable/mute the // device as necessary. // switch ( devnum ) diff --git a/kmix/verticaltext.cpp b/kmix/verticaltext.cpp index 8db5c60f..aabe8a23 100644 --- a/kmix/verticaltext.cpp +++ b/kmix/verticaltext.cpp @@ -24,9 +24,9 @@ #include <kdebug.h> -VerticalText::VerticalText(TQWidget * tqparent, const char * name, WFlags f) : TQWidget(tqparent,name,f) +VerticalText::VerticalText(TQWidget * parent, const char * name, WFlags f) : TQWidget(parent,name,f) { - resize(20,100 /*tqparent->height() */ ); + resize(20,100 /*parent->height() */ ); setMinimumSize(20,10); // neccesary for smooth integration into layouts (we only care for the widths). } diff --git a/kmix/verticaltext.h b/kmix/verticaltext.h index b7f94f4d..1e621e83 100644 --- a/kmix/verticaltext.h +++ b/kmix/verticaltext.h @@ -6,7 +6,7 @@ class VerticalText : public TQWidget { public: - VerticalText(TQWidget * tqparent, const char * name, WFlags f = 0); + VerticalText(TQWidget * parent, const char * name, WFlags f = 0); ~VerticalText(); TQSize tqsizeHint() const; diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp index 6be7860d..6b25dde0 100644 --- a/kmix/viewapplet.cpp +++ b/kmix/viewapplet.cpp @@ -36,8 +36,8 @@ #include "mdwslider.h" #include "mixer.h" -ViewApplet::ViewApplet(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position position ) - : ViewBase(tqparent, name, TQString(), mixer, WStyle_Customize|WStyle_NoBorder, vflags) +ViewApplet::ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position position ) + : ViewBase(parent, name, TQString(), mixer, WStyle_Customize|WStyle_NoBorder, vflags) { setBackgroundOrigin(AncestorOrigin); // remove the menu bar action, that is put by the "ViewBase" constructor in _actions. @@ -119,7 +119,7 @@ TQWidget* ViewApplet::add(MixDevice *md) false, // Show Record LED true, // Small sliderOrientation, // Qt::Orientation - this, // tqparent + this, // parent this, // View widget md->name().latin1() ); diff --git a/kmix/viewapplet.h b/kmix/viewapplet.h index 9b9e1b9c..38d21465 100644 --- a/kmix/viewapplet.h +++ b/kmix/viewapplet.h @@ -15,7 +15,7 @@ class ViewApplet : public ViewBase Q_OBJECT TQ_OBJECT public: - ViewApplet(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position pos); + ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position pos); ~ViewApplet(); virtual int count(); diff --git a/kmix/viewbase.cpp b/kmix/viewbase.cpp index b140fce7..58767073 100644 --- a/kmix/viewbase.cpp +++ b/kmix/viewbase.cpp @@ -37,8 +37,8 @@ #include "mixer.h" -ViewBase::ViewBase(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, WFlags f, ViewBase::ViewFlags vflags) - : TQWidget(tqparent, name, f), _vflags(vflags), _caption(caption) +ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, WFlags f, ViewBase::ViewFlags vflags) + : TQWidget(parent, name, f), _vflags(vflags), _caption(caption) { _mixer = mixer; _mixSet = new MixSet(); diff --git a/kmix/viewbase.h b/kmix/viewbase.h index d0d4063c..95787198 100644 --- a/kmix/viewbase.h +++ b/kmix/viewbase.h @@ -32,7 +32,7 @@ public: Experimental_GridView = 0x2000 }; - ViewBase(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, WFlags=0, ViewFlags vflags=0); + ViewBase(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, WFlags=0, ViewFlags vflags=0); virtual ~ViewBase(); // Subclasses must define this method. It is called by the ViewBase() constuctor. diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp index 38b942dc..859993bb 100644 --- a/kmix/viewdockareapopup.cpp +++ b/kmix/viewdockareapopup.cpp @@ -40,11 +40,11 @@ #include "mixer.h" #include "kmixdockwidget.h" -// !! Do NOT remove or tqmask out "WType_Popup" +// !! Do NOT remove or mask out "WType_Popup" // Users will not be able to close the Popup without opening the KMix main window then. // See Bug #93443, #96332 and #96404 for further details. -- esken -ViewDockAreaPopup::ViewDockAreaPopup(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW ) - : ViewBase(tqparent, name, TQString(), mixer, WStyle_Customize | WType_Popup | TQt::WStyle_DialogBorder, vflags), _mdw(0), _dock(dockW) +ViewDockAreaPopup::ViewDockAreaPopup(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW ) + : ViewBase(parent, name, TQString(), mixer, WStyle_Customize | WType_Popup | TQt::WStyle_DialogBorder, vflags), _mdw(0), _dock(dockW) { TQBoxLayout *tqlayout = new TQHBoxLayout( this ); _frame = new TQFrame( this ); @@ -128,7 +128,7 @@ TQWidget* ViewDockAreaPopup::add(MixDevice *md) false, // Show Record LED false, // Small Qt::Vertical, // Direction: only 1 device, so doesn't matter - _frame, // tqparent + _frame, // parent 0, // Is "NULL", so that there is no RMB-popup _dockDevice->name().latin1() ); _layoutMDW->addItem( new TQSpacerItem( 5, 20 ), 0, 2 ); diff --git a/kmix/viewdockareapopup.h b/kmix/viewdockareapopup.h index 71100ec1..a31afa4b 100644 --- a/kmix/viewdockareapopup.h +++ b/kmix/viewdockareapopup.h @@ -20,7 +20,7 @@ class ViewDockAreaPopup : public ViewBase Q_OBJECT TQ_OBJECT public: - ViewDockAreaPopup(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW); + ViewDockAreaPopup(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW); ~ViewDockAreaPopup(); MixDevice* dockDevice(); diff --git a/kmix/viewgrid.cpp b/kmix/viewgrid.cpp index 360953f8..1aba7fcf 100644 --- a/kmix/viewgrid.cpp +++ b/kmix/viewgrid.cpp @@ -35,8 +35,8 @@ /** */ -ViewGrid::ViewGrid(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) - : ViewBase(tqparent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) +ViewGrid::ViewGrid(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) + : ViewBase(parent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) { m_spacingHorizontal = 5; m_spacingVertical = 5; @@ -89,7 +89,7 @@ TQWidget* ViewGrid::add(MixDevice *md) _mixer, // the mixer for this device md, // MixDevice (parameter) orientation, // Qt::Orientation - this, // tqparent + this, // parent this, // View widget md->name().latin1() ); @@ -102,7 +102,7 @@ TQWidget* ViewGrid::add(MixDevice *md) md, // MixDevice (parameter) false, // Small orientation, // Qt::Orientation - this, // tqparent + this, // parent this, // View widget md->name().latin1() ); @@ -118,7 +118,7 @@ TQWidget* ViewGrid::add(MixDevice *md) true, // Show Record LED false, // Small orientation, // Qt::Orientation - this, // tqparent + this, // parent this, // View widget md->name().latin1() ); diff --git a/kmix/viewgrid.h b/kmix/viewgrid.h index d0608794..5fd1a183 100644 --- a/kmix/viewgrid.h +++ b/kmix/viewgrid.h @@ -13,7 +13,7 @@ class ViewGrid : public ViewBase Q_OBJECT TQ_OBJECT public: - ViewGrid(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); + ViewGrid(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ~ViewGrid(); virtual int count(); diff --git a/kmix/viewinput.cpp b/kmix/viewinput.cpp index fa6f06e3..eeadc61b 100644 --- a/kmix/viewinput.cpp +++ b/kmix/viewinput.cpp @@ -25,8 +25,8 @@ #include "mixer.h" #include "mixdevicewidget.h" -ViewInput::ViewInput(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) - : ViewSliders(tqparent, name, caption, mixer, vflags) +ViewInput::ViewInput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) + : ViewSliders(parent, name, caption, mixer, vflags) { init(); connect ( _mixer, TQT_SIGNAL(newRecsrc()) , this, TQT_SLOT(refreshVolumeLevels()) ); // only the input widget has record sources diff --git a/kmix/viewinput.h b/kmix/viewinput.h index 03aa101f..e21ef5c9 100644 --- a/kmix/viewinput.h +++ b/kmix/viewinput.h @@ -10,7 +10,7 @@ class ViewInput : public ViewSliders Q_OBJECT TQ_OBJECT public: - ViewInput(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); + ViewInput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ~ViewInput(); virtual void setMixSet(MixSet *mixset); diff --git a/kmix/viewoutput.cpp b/kmix/viewoutput.cpp index 6340291b..9550b1d1 100644 --- a/kmix/viewoutput.cpp +++ b/kmix/viewoutput.cpp @@ -25,8 +25,8 @@ #include "mixer.h" #include "mixdevicewidget.h" -ViewOutput::ViewOutput(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) - : ViewSliders(tqparent, name, caption, mixer, vflags) +ViewOutput::ViewOutput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) + : ViewSliders(parent, name, caption, mixer, vflags) { init(); } diff --git a/kmix/viewoutput.h b/kmix/viewoutput.h index 9f3866dd..9c4b299b 100644 --- a/kmix/viewoutput.h +++ b/kmix/viewoutput.h @@ -10,7 +10,7 @@ class ViewOutput : public ViewSliders Q_OBJECT TQ_OBJECT public: - ViewOutput(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); + ViewOutput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ~ViewOutput(); virtual void setMixSet(MixSet *mixset); diff --git a/kmix/viewsliders.cpp b/kmix/viewsliders.cpp index 1191f202..3cab3c6d 100644 --- a/kmix/viewsliders.cpp +++ b/kmix/viewsliders.cpp @@ -37,8 +37,8 @@ * correctly because init() does not get called. * See ViewInput and ViewOutput for "real" implementations. */ -ViewSliders::ViewSliders(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) - : ViewBase(tqparent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) +ViewSliders::ViewSliders(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) + : ViewBase(parent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) { if ( _vflags & ViewBase::Vertical ) { _layoutMDW = new TQVBoxLayout(this); @@ -94,7 +94,7 @@ TQWidget* ViewSliders::add(MixDevice *md) true, // Show Record LED false, // Small orientation, // Qt::Orientation - this, // tqparent + this, // parent this, // View widget md->name().latin1() ); diff --git a/kmix/viewsliders.h b/kmix/viewsliders.h index c078fb8c..168a425c 100644 --- a/kmix/viewsliders.h +++ b/kmix/viewsliders.h @@ -12,7 +12,7 @@ class ViewSliders : public ViewBase Q_OBJECT TQ_OBJECT public: - ViewSliders(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); + ViewSliders(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ~ViewSliders(); virtual int count(); diff --git a/kmix/viewsurround.cpp b/kmix/viewsurround.cpp index 7e653b32..5b2ac99f 100644 --- a/kmix/viewsurround.cpp +++ b/kmix/viewsurround.cpp @@ -39,8 +39,8 @@ * Demonstration verion of a "surround view" * Not really usable right now. */ -ViewSurround::ViewSurround(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) - : ViewBase(tqparent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) +ViewSurround::ViewSurround(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) + : ViewBase(parent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) { _mdSurroundFront = 0; _mdSurroundBack = 0; @@ -260,7 +260,7 @@ MixDeviceWidget* ViewSurround::createMDW(MixDevice *md, bool small, Qt::Orientat false, // Show Record LED small, // Small orientation, // Qt::Orientation - this, // tqparent + this, // parent this, // View widget md->name().latin1() ); diff --git a/kmix/viewsurround.h b/kmix/viewsurround.h index d0bc3c4e..de469292 100644 --- a/kmix/viewsurround.h +++ b/kmix/viewsurround.h @@ -15,7 +15,7 @@ class ViewSurround : public ViewBase Q_OBJECT TQ_OBJECT public: - ViewSurround(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); + ViewSurround(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ~ViewSurround(); virtual int count(); diff --git a/kmix/viewswitches.cpp b/kmix/viewswitches.cpp index cf5ac958..3d3166bb 100644 --- a/kmix/viewswitches.cpp +++ b/kmix/viewswitches.cpp @@ -31,8 +31,8 @@ #include "mdwenum.h" #include "mixer.h" -ViewSwitches::ViewSwitches(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) - : ViewBase(tqparent, name, caption, mixer, 0, vflags) +ViewSwitches::ViewSwitches(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) + : ViewBase(parent, name, caption, mixer, 0, vflags) { // Create switch buttonGroup if ( _vflags & ViewBase::Vertical ) { @@ -93,7 +93,7 @@ TQWidget* ViewSwitches::add(MixDevice *md) _mixer, // the mixer for this device md, // MixDevice (parameter) orientation, // Qt::Orientation - this, // tqparent + this, // parent this, // View widget md->name().latin1() ); @@ -108,7 +108,7 @@ TQWidget* ViewSwitches::add(MixDevice *md) md, // MixDevice (parameter) false, // Small orientation, // Qt::Orientation - this, // tqparent + this, // parent this, // View widget md->name().latin1() ); diff --git a/kmix/viewswitches.h b/kmix/viewswitches.h index 39b81f40..9e591514 100644 --- a/kmix/viewswitches.h +++ b/kmix/viewswitches.h @@ -12,7 +12,7 @@ class ViewSwitches : public ViewBase Q_OBJECT TQ_OBJECT public: - ViewSwitches(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); + ViewSwitches(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ~ViewSwitches(); virtual int count(); diff --git a/kmix/volume.cpp b/kmix/volume.cpp index d2eb4314..99dd180b 100644 --- a/kmix/volume.cpp +++ b/kmix/volume.cpp @@ -34,9 +34,9 @@ int Volume::_channelMaskEnum[10] = MCUSTOM1, MCUSTOM2 }; -Volume::Volume( ChannelMask chtqmask, long maxVolume, long minVolume, bool isCapture ) +Volume::Volume( ChannelMask chmask, long maxVolume, long minVolume, bool isCapture ) { - init(chtqmask, maxVolume, minVolume, isCapture); + init(chmask, maxVolume, minVolume, isCapture); } @@ -56,22 +56,22 @@ Volume::Volume( int channels, long maxVolume ) { Volume::Volume( const Volume &v ) { - _chtqmask = v._chtqmask; + _chmask = v._chmask; _maxVolume = v._maxVolume; _minVolume = v._minVolume; _muted = v._muted; _isCapture = v._isCapture; - setVolume(v, (ChannelMask)v._chtqmask); + setVolume(v, (ChannelMask)v._chmask); // kdDebug(67100) << "Volume::copy-constructor initialized " << v << "\n"; } -void Volume::init( ChannelMask chtqmask, long maxVolume, long minVolume, bool isCapture ) +void Volume::init( ChannelMask chmask, long maxVolume, long minVolume, bool isCapture ) { for ( int i=0; i<= Volume::CHIDMAX; i++ ) { _volumes[i] = 0; } - _chtqmask = chtqmask; + _chmask = chmask; _maxVolume = maxVolume; _minVolume = minVolume; _isCapture = isCapture; @@ -82,7 +82,7 @@ void Volume::init( ChannelMask chtqmask, long maxVolume, long minVolume, bool is void Volume::setAllVolumes(long vol) { for ( int i=0; i<= Volume::CHIDMAX; i++ ) { - if ( (_channelMaskEnum[i]) & _chtqmask ) { + if ( (_channelMaskEnum[i]) & _chmask ) { // we are supposed to set it _volumes[i] = volrange(vol); } @@ -106,17 +106,17 @@ void Volume::setVolume( ChannelID chid, long vol) */ void Volume::setVolume(const Volume &v) { - setVolume(v, (ChannelMask)(v._chtqmask&_chtqmask) ); + setVolume(v, (ChannelMask)(v._chmask&_chmask) ); } /** * Copy the volume elements contained in v to this Volume object. * Only those elments are copied, that are supported in BOTH Volume objects - * and match the ChannelMask given by chtqmask. + * and match the ChannelMask given by chmask. */ -void Volume::setVolume(const Volume &v, ChannelMask chtqmask) { +void Volume::setVolume(const Volume &v, ChannelMask chmask) { for ( int i=0; i<= Volume::CHIDMAX; i++ ) { - if ( _channelMaskEnum[i] & _chtqmask & (int)chtqmask ) { + if ( _channelMaskEnum[i] & _chmask & (int)chmask ) { // we are supposed to copy it _volumes[i] = volrange(v._volumes[i]); } @@ -149,8 +149,8 @@ long Volume::getVolume(ChannelID chid) { } else { // check if channel is supported - int chtqmask = _channelMaskEnum[chid]; - if ( (chtqmask & _chtqmask) != 0 ) { + int chmask = _channelMaskEnum[chid]; + if ( (chmask & _chmask) != 0 ) { // channel is supported vol = _volumes[chid]; } @@ -162,11 +162,11 @@ long Volume::getVolume(ChannelID chid) { return vol; } -long Volume::getAvgVolume(ChannelMask chtqmask) { +long Volume::getAvgVolume(ChannelMask chmask) { int avgVolumeCounter = 0; long long sumOfActiveVolumes = 0; for ( int i=0; i<= Volume::CHIDMAX; i++ ) { - if ( (_channelMaskEnum[i] & _chtqmask) & (int)chtqmask ) { + if ( (_channelMaskEnum[i] & _chmask) & (int)chmask ) { avgVolumeCounter++; sumOfActiveVolumes += _volumes[i]; } @@ -180,10 +180,10 @@ long Volume::getAvgVolume(ChannelMask chtqmask) { return (long)sumOfActiveVolumes; } -long Volume::getTopStereoVolume(ChannelMask chtqmask) { +long Volume::getTopStereoVolume(ChannelMask chmask) { long long topVolumeCount = 0; for ( int i=0; i<= Volume::CHIDMAX; i++ ) { - if ( (_channelMaskEnum[i] & _chtqmask) & (int)chtqmask ) { + if ( (_channelMaskEnum[i] & _chmask) & (int)chmask ) { if ( topVolumeCount < _volumes[i] ) topVolumeCount = _volumes[i]; } @@ -194,7 +194,7 @@ long Volume::getTopStereoVolume(ChannelMask chtqmask) { int Volume::count() { int counter = 0; for ( int i=0; i<= Volume::CHIDMAX; i++ ) { - if ( _channelMaskEnum[i] & _chtqmask ) { + if ( _channelMaskEnum[i] & _chmask ) { counter++; } } @@ -225,7 +225,7 @@ std::ostream& operator<<(std::ostream& os, const Volume& vol) { if ( i != 0 ) { os << ","; } - if ( Volume::_channelMaskEnum[i] & vol._chtqmask ) { + if ( Volume::_channelMaskEnum[i] & vol._chmask ) { // supported channel: Print Volume os << vol._volumes[i]; } @@ -248,7 +248,7 @@ kdbgstream& operator<<(kdbgstream &os, const Volume& vol) { if ( i != 0 ) { os << ","; } - if ( Volume::_channelMaskEnum[i] & vol._chtqmask ) { + if ( Volume::_channelMaskEnum[i] & vol._chmask ) { // supported channel: Print Volume os << vol._volumes[i]; } diff --git a/kmix/volume.h b/kmix/volume.h index a731ad59..9051ed0c 100644 --- a/kmix/volume.h +++ b/kmix/volume.h @@ -27,7 +27,7 @@ class Volume CUSTOM1 = 8, CUSTOM2 = 9, CHIDMAX = 9 }; - Volume( ChannelMask chtqmask = MALL, long maxVolume = 100, long minVolume=0, bool isCapture=false ); + Volume( ChannelMask chmask = MALL, long maxVolume = 100, long minVolume=0, bool isCapture=false ); Volume( const Volume &v ); Volume( int channels, long maxVolume ); @@ -37,13 +37,13 @@ class Volume void setAllVolumes(long vol); // Set all volumes to the ones given in vol void setVolume(const Volume &vol ); - // Set volumes as specified by the channel tqmask - void setVolume( const Volume &vol, ChannelMask chtqmask); + // Set volumes as specified by the channel mask + void setVolume( const Volume &vol, ChannelMask chmask); void setVolume( ChannelID chid, long volume); long getVolume(ChannelID chid); - long getAvgVolume(ChannelMask chtqmask); - long getTopStereoVolume(ChannelMask chtqmask); + long getAvgVolume(ChannelMask chmask); + long getTopStereoVolume(ChannelMask chmask); long operator[](int); long maxVolume(); long minVolume(); @@ -61,13 +61,13 @@ class Volume static int _channelMaskEnum[10]; bool _muted; bool _isCapture; // true, when the Volume represents capture/record levels - long _chtqmask; + long _chmask; long _volumes[CHIDMAX+1]; long _maxVolume; long _minVolume; private: - void init( ChannelMask chtqmask, long, long, bool ); + void init( ChannelMask chmask, long, long, bool ); long volrange( int vol ); long volrangeRec( int vol ); |