From 7ef01c0f34d9c6732d258154bcd3ba5a88280db9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmix/dialogselectmaster.cpp | 2 +- kmix/dialogviewconfiguration.cpp | 2 +- kmix/kmixapplet.cpp | 2 +- kmix/kmixerwidget.cpp | 2 +- kmix/mixdevice.cpp | 2 +- kmix/mixer.cpp | 4 ++-- kmix/mixer.h | 2 +- kmix/mixer_alsa9.cpp | 18 +++++++++--------- kmix/mixer_oss4.cpp | 12 ++++++------ kmix/mixertoolbox.cpp | 10 +++++----- kmix/viewapplet.cpp | 2 +- 11 files changed, 29 insertions(+), 29 deletions(-) (limited to 'kmix') diff --git a/kmix/dialogselectmaster.cpp b/kmix/dialogselectmaster.cpp index d206429e..b70c2b6c 100644 --- a/kmix/dialogselectmaster.cpp +++ b/kmix/dialogselectmaster.cpp @@ -153,7 +153,7 @@ void DialogSelectMaster::createPage(Mixer* mixer) if ( ! md->isEnum() && ! md->isSwitch() ) { //kdDebug(67100) << "DialogSelectMaster::createPage() mset append qrb" << endl; TQString mdName = md->name(); - mdName.tqreplace('&', "&&"); // Quoting the '&' needed, to prevent TQRadioButton creating an accelerator + mdName.replace('&', "&&"); // Quoting the '&' needed, to prevent TQRadioButton creating an accelerator TQRadioButton* qrb = new TQRadioButton( mdName, m_vboxForScrollView); m_buttonGroupForScrollView->insert(qrb); //(qrb, md->num()); //_qEnabledCB.append(qrb); diff --git a/kmix/dialogviewconfiguration.cpp b/kmix/dialogviewconfiguration.cpp index 948df8fe..28cf3c3f 100644 --- a/kmix/dialogviewconfiguration.cpp +++ b/kmix/dialogviewconfiguration.cpp @@ -50,7 +50,7 @@ DialogViewConfiguration::DialogViewConfiguration( TQWidget*, ViewBase& view) if ( qw->inherits("MixDeviceWidget") ) { MixDeviceWidget *mdw = static_cast(qw); TQString mdName = mdw->mixDevice()->name(); - mdName.tqreplace('&', "&&"); // Quoting the '&' needed, to prevent TQCheckBox creating an accelerator + mdName.replace('&', "&&"); // Quoting the '&' needed, to prevent TQCheckBox creating an accelerator TQCheckBox* cb = new TQCheckBox( mdName, plainPage() ); _qEnabledCB.append(cb); cb->setChecked( !mdw->isDisabled() ); //mdw->isVisible() ); diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp index 51676a57..5e37841e 100644 --- a/kmix/kmixapplet.cpp +++ b/kmix/kmixapplet.cpp @@ -325,7 +325,7 @@ void KMixApplet::selectMixer() lst, 1, FALSE, &ok, this ); if ( ok ) { - Mixer *mixer = Mixer::mixers().at( lst.tqfindIndex( res ) ); + Mixer *mixer = Mixer::mixers().at( lst.findIndex( res ) ); if (!mixer) KMessageBox::sorry( this, i18n("Invalid mixer entered.") ); else diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp index b6491015..b283d830 100644 --- a/kmix/kmixerwidget.cpp +++ b/kmix/kmixerwidget.cpp @@ -49,7 +49,7 @@ /** This widget is embedded in the KMix Main window. Each Hardware Mixer is visualized by one KMixerWidget. - KMixerWidget tqcontains + KMixerWidget contains (a) a headline where you can change Mixer's (if you got more than one Mixer) (b) a Tab with 2-4 Tabs (containing View's with sliders, switches and other GUI elements visualizing the Mixer) (c) A balancing slider diff --git a/kmix/mixdevice.cpp b/kmix/mixdevice.cpp index d647488f..b29c485f 100644 --- a/kmix/mixdevice.cpp +++ b/kmix/mixdevice.cpp @@ -123,7 +123,7 @@ TQString& MixDevice::getPK() { void MixDevice::setPK(TQString &PK) { _pk = PK; // The key is used in the config file. It should not contain spaces - _pk.tqreplace(' ', '_'); + _pk.replace(' ', '_'); } /** diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp index 67960a53..0e7c36fc 100644 --- a/kmix/mixer.cpp +++ b/kmix/mixer.cpp @@ -474,7 +474,7 @@ void Mixer::setRecordSource( int devnum, bool on ) MixDevice* Mixer::masterDevice() { - return tqfind( _masterDevicePK ); + return find( _masterDevicePK ); } void Mixer::setMasterDevice(TQString &devPK) @@ -483,7 +483,7 @@ void Mixer::setMasterDevice(TQString &devPK) } -MixDevice* Mixer::tqfind(TQString& devPK) +MixDevice* Mixer::find(TQString& devPK) { MixDevice* md = 0; for( md = _mixerBackend->m_mixDevices.first(); md != 0; md = _mixerBackend->m_mixDevices.next() ) { diff --git a/kmix/mixer.h b/kmix/mixer.h index 0b6d25c2..15e85e1b 100644 --- a/kmix/mixer.h +++ b/kmix/mixer.h @@ -55,7 +55,7 @@ class Mixer : public TQObject, virtual public MixerIface static int numDrivers(); - MixDevice* tqfind(TQString& devPK); + MixDevice* find(TQString& devPK); void volumeSave( KConfig *config ); void volumeLoad( KConfig *config ); diff --git a/kmix/mixer_alsa9.cpp b/kmix/mixer_alsa9.cpp index 4037f342..dc4935c4 100644 --- a/kmix/mixer_alsa9.cpp +++ b/kmix/mixer_alsa9.cpp @@ -77,7 +77,7 @@ Mixer_ALSA::identify( snd_mixer_selem_id_t *sid ) if ( name == "Master Mono" ) return MixDevice::VOLUME; if ( name == "PC Speaker" ) return MixDevice::VOLUME; if ( name == "Music" || name == "Synth" || name == "FM" ) return MixDevice::MIDI; - if ( name.tqfind( "Headphone", 0, false ) != -1 ) return MixDevice::HEADPHONE; + if ( name.find( "Headphone", 0, false ) != -1 ) return MixDevice::HEADPHONE; if ( name == "Bass" ) return MixDevice::BASS; if ( name == "Treble" ) return MixDevice::TREBLE; if ( name == "CD" ) return MixDevice::CD; @@ -85,14 +85,14 @@ Mixer_ALSA::identify( snd_mixer_selem_id_t *sid ) if ( name == "PCM" || name == "Wave" ) return MixDevice::AUDIO; if ( name == "Surround" ) return MixDevice::SURROUND_BACK; if ( name == "Center" ) return MixDevice::SURROUND_CENTERFRONT; - if ( name.tqfind( "ac97", 0, false ) != -1 ) return MixDevice::AC97; - if ( name.tqfind( "coaxial", 0, false ) != -1 ) return MixDevice::DIGITAL; - if ( name.tqfind( "optical", 0, false ) != -1 ) return MixDevice::DIGITAL; - if ( name.tqfind( "IEC958", 0, false ) != -1 ) return MixDevice::DIGITAL; - if ( name.tqfind( "Mic" ) != -1 ) return MixDevice::MICROPHONE; - if ( name.tqfind( "LFE" ) != -1 ) return MixDevice::SURROUND_LFE; - if ( name.tqfind( "Monitor" ) != -1 ) return MixDevice::RECMONITOR; - if ( name.tqfind( "3D", 0, false ) != -1 ) return MixDevice::SURROUND; // Should be probably some own icon + if ( name.find( "ac97", 0, false ) != -1 ) return MixDevice::AC97; + if ( name.find( "coaxial", 0, false ) != -1 ) return MixDevice::DIGITAL; + if ( name.find( "optical", 0, false ) != -1 ) return MixDevice::DIGITAL; + if ( name.find( "IEC958", 0, false ) != -1 ) return MixDevice::DIGITAL; + if ( name.find( "Mic" ) != -1 ) return MixDevice::MICROPHONE; + if ( name.find( "LFE" ) != -1 ) return MixDevice::SURROUND_LFE; + if ( name.find( "Monitor" ) != -1 ) return MixDevice::RECMONITOR; + if ( name.find( "3D", 0, false ) != -1 ) return MixDevice::SURROUND; // Should be probably some own icon return MixDevice::EXTERNAL; } diff --git a/kmix/mixer_oss4.cpp b/kmix/mixer_oss4.cpp index 8543915b..01b167aa 100644 --- a/kmix/mixer_oss4.cpp +++ b/kmix/mixer_oss4.cpp @@ -120,7 +120,7 @@ MixDevice::ChannelType Mixer_OSS4::classifyAndRename(TQString &name, int flags) } else if ( (*it).startsWith ( "pcm" ) ) { - (*it).tqreplace ( "pcm","PCM" ); + (*it).replace ( "pcm","PCM" ); cType = MixDevice::AUDIO; } else if ( *it == "src" ) @@ -138,7 +138,7 @@ MixDevice::ChannelType Mixer_OSS4::classifyAndRename(TQString &name, int flags) } if ( (*it).startsWith("vmix") ) { - (*it).tqreplace("vmix","Virtual Mixer"); + (*it).replace("vmix","Virtual Mixer"); cType = MixDevice::VOLUME; } else if ( (*it).endsWith("vol") ) @@ -227,8 +227,8 @@ int Mixer_OSS4::open() TQString name = ext.extname; //skip vmix volume controls and mute controls - if ( (name.tqfind("vmix") > -1 && name.tqfind( "pcm") > -1) || - name.tqfind("mute") > -1 + if ( (name.find("vmix") > -1 && name.find( "pcm") > -1) || + name.find("mute") > -1 #ifdef MIXT_MUTE || (ext.type == MIXT_MUTE) #endif @@ -238,12 +238,12 @@ int Mixer_OSS4::open() } //fix for old legacy names, according to Hannu's suggestions - if ( name.tqcontains('_') ) + if ( name.contains('_') ) { name = name.section('_',1,1).lower(); } - if ( ext.flags & MIXF_RECVOL || ext.flags & MIXF_MONVOL || name.tqfind(".in") > -1 ) + if ( ext.flags & MIXF_RECVOL || ext.flags & MIXF_MONVOL || name.find(".in") > -1 ) { isCapture = true; } diff --git a/kmix/mixertoolbox.cpp b/kmix/mixertoolbox.cpp index c4953221..051f0c53 100644 --- a/kmix/mixertoolbox.cpp +++ b/kmix/mixertoolbox.cpp @@ -146,16 +146,16 @@ void MixerToolBox::initMixer(TQPtrList &mixers, bool multiDriverMode, TQS * %3, the mixer number, is a number: it does not contain colons. */ TQString mixerName = mixer->mixerName(); - mixerName.tqreplace(":","_"); + mixerName.replace(":","_"); TQString primaryKeyOfMixer = TQString("%1::%2:%3") .tqarg(driverName) .tqarg(mixerName) .tqarg(mixerNums[mixer->mixerName()]); // The following 3 replaces are for not messing up the config file - primaryKeyOfMixer.tqreplace("]","_"); - primaryKeyOfMixer.tqreplace("[","_"); // not strictly neccesary, but lets play safe - primaryKeyOfMixer.tqreplace(" ","_"); - primaryKeyOfMixer.tqreplace("=","_"); + primaryKeyOfMixer.replace("]","_"); + primaryKeyOfMixer.replace("[","_"); // not strictly neccesary, but lets play safe + primaryKeyOfMixer.replace(" ","_"); + primaryKeyOfMixer.replace("=","_"); mixer->setID(primaryKeyOfMixer); diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp index b26a7374..6be7860d 100644 --- a/kmix/viewapplet.cpp +++ b/kmix/viewapplet.cpp @@ -230,7 +230,7 @@ void ViewApplet::refreshVolumeLevels() { void ViewApplet::configurationUpdate() { updateGeometry(); //_layoutMDW->activate(); - constructionFinished(); // tqcontains "_layoutMDW->activate();" + constructionFinished(); // contains "_layoutMDW->activate();" emit appletContentChanged(); kdDebug(67100) << "ViewApplet::configurationUpdate()" << endl; // the following "emit" is only here to be picked up by KMixApplet, because it has to -- cgit v1.2.1