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_alsa9.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'kmix/mixer_alsa9.cpp') diff --git a/kmix/mixer_alsa9.cpp b/kmix/mixer_alsa9.cpp index 751d5f9e..effcd006 100644 --- a/kmix/mixer_alsa9.cpp +++ b/kmix/mixer_alsa9.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include extern "C" { @@ -70,7 +70,7 @@ Mixer_ALSA::~Mixer_ALSA() int Mixer_ALSA::identify( snd_mixer_selem_id_t *sid ) { - QString name = snd_mixer_selem_id_get_name( sid ); + TQString name = snd_mixer_selem_id_get_name( sid ); if ( name == "Master" ) return MixDevice::VOLUME; if ( name == "Capture" ) return MixDevice::RECMONITOR; @@ -115,9 +115,9 @@ Mixer_ALSA::open() // Card information if ((unsigned)m_devnum > 31) m_devnum = -1; - devName = m_devnum == -1 ? "default" : QString("hw:%1").arg(m_devnum); + devName = m_devnum == -1 ? "default" : TQString("hw:%1").arg(m_devnum); - QString probeMessage; + TQString probeMessage; if (virginOpen) probeMessage += "Trying ALSA Device '" + devName + "': "; @@ -224,7 +224,7 @@ Mixer_ALSA::open() //kdDebug() << "--- Loop: name=" << snd_mixer_selem_id_get_name( sid ) << " , mixerIdx=" << mixerIdx << "------------" << endl; Volume* volPlay = 0, *volCapture = 0; - QPtrList enumList; + TQPtrList enumList; if ( snd_mixer_selem_is_enumerated(elem) ) { cc = MixDevice::ENUM; volPlay = new Volume(); // Dummy, unused @@ -240,7 +240,7 @@ Mixer_ALSA::open() char buffer[100]; int ret = snd_mixer_selem_get_enum_item_name(elem, iEnum, 99, buffer); if ( ret == 0 ) { - QString* enumName = new QString(buffer); + TQString* enumName = new TQString(buffer); //enumName->append(buffer); enumList.append( enumName); } // enumName could be read succesfully @@ -335,7 +335,7 @@ Mixer_ALSA::open() if ( enumList.count() > 0 ) { int maxEnumId= enumList.count(); - QPtrList& enumValuesRef = md->enumValues(); // retrieve a ref + TQPtrList& enumValuesRef = md->enumValues(); // retrieve a ref for (int i=0; iconnect(m_sns[i], SIGNAL(activated(int)), mixer, SLOT(readSetFromHW())); + m_sns[i] = new TQSocketNotifier(m_fds[i].fd, TQSocketNotifier::Read); + mixer->connect(m_sns[i], TQT_SIGNAL(activated(int)), mixer, TQT_SLOT(readSetFromHW())); } } @@ -798,7 +798,7 @@ Mixer_ALSA::writeVolumeToHW( int devnum, Volume& volume ) QString Mixer_ALSA::errorText( int mixer_error ) { - QString l_s_errmsg; + TQString l_s_errmsg; switch ( mixer_error ) { case Mixer::ERR_PERM: -- cgit v1.2.1