From e654398e46e37abf457b2b1122ab898d2c51c49f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:43:15 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1157644 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmix/mixer_sun.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kmix/mixer_sun.cpp') diff --git a/kmix/mixer_sun.cpp b/kmix/mixer_sun.cpp index 4b90f4fd..12806bda 100644 --- a/kmix/mixer_sun.cpp +++ b/kmix/mixer_sun.cpp @@ -105,7 +105,7 @@ const uint_t MixerSunPortMasks[] = //====================================================================== -// FUNCTION/METHOD DEFINITIONS +// FUNCTION/TQT_METHOD DEFINITIONS //====================================================================== @@ -155,7 +155,7 @@ int Mixer_SUN::open() // // Open the mixer hardware driver // - QCString audiodev(getenv("AUDIODEV")); + TQCString audiodev(getenv("AUDIODEV")); if(audiodev.isNull()) audiodev = "/dev/audio"; audiodev += "ctl"; @@ -179,7 +179,7 @@ int Mixer_SUN::open() Volume vol( 2, AUDIO_MAX_GAIN ); readVolumeFromHW( idx, vol ); MixDevice* md = new MixDevice( idx, vol, false, true, - QString(MixerDevNames[idx]), MixerChannelTypes[idx]); + TQString(MixerDevNames[idx]), MixerChannelTypes[idx]); md->setRecSource( isRecsrcHW( idx ) ); m_mixDevices.append( md ); } @@ -218,9 +218,9 @@ int Mixer_SUN::close() // FUNCTION : Mixer::errorText // DESCRIPTION : Convert an error code enum to a text string. //====================================================================== -QString Mixer_SUN::errorText( int mixer_error ) +TQString Mixer_SUN::errorText( int mixer_error ) { - QString errmsg; + TQString errmsg; switch (mixer_error) { case Mixer::ERR_PERM: @@ -467,7 +467,7 @@ void Mixer_SUN::GainBalanceToVolume( uint_t& gain, uchar_t& balance, Volume& vol } } -QString SUN_getDriverName() { +TQString SUN_getDriverName() { return "SUNAudio"; } -- cgit v1.2.3