From b31a63fd00f12865cc3248f3cbb431dca7269daa Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Fri, 14 Aug 2009 12:09:25 +0200 Subject: [PATCH] MidiAlsaSeq: QString related fixups Use QString::isEmpty() rather than comparing against an empty string. Furthermore use QStrin::toUtf8() instead of QString::toAscii() for retrieving name of a MidiPort. (cherry picked from commit 295b332650b06c40416cb9bbbb47677aaf8869fb) --- src/core/midi/MidiAlsaSeq.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/midi/MidiAlsaSeq.cpp b/src/core/midi/MidiAlsaSeq.cpp index 87977286c..b7b7c6f55 100644 --- a/src/core/midi/MidiAlsaSeq.cpp +++ b/src/core/midi/MidiAlsaSeq.cpp @@ -112,7 +112,7 @@ MidiAlsaSeq::~MidiAlsaSeq() QString MidiAlsaSeq::probeDevice() { QString dev = configManager::inst()->value( "Midialsaseq", "device" ); - if( dev == "" ) + if( dev.isEmpty() ) { if( getenv( "MIDIDEV" ) != NULL ) { @@ -241,7 +241,7 @@ void MidiAlsaSeq::applyPortMode( MidiPort * _port ) m_portIDs[_port][i] = snd_seq_create_simple_port( m_seqHandle, - _port->displayName().toAscii().constData(), + _port->displayName().toUtf8().constData(), caps[i], SND_SEQ_PORT_TYPE_MIDI_GENERIC | SND_SEQ_PORT_TYPE_APPLICATION ); @@ -284,7 +284,7 @@ void MidiAlsaSeq::applyPortName( MidiPort * _port ) snd_seq_get_port_info( m_seqHandle, m_portIDs[_port][i], port_info ); snd_seq_port_info_set_name( port_info, - _port->displayName().toAscii().constData() ); + _port->displayName().toUtf8().constData() ); snd_seq_set_port_info( m_seqHandle, m_portIDs[_port][i], port_info ); snd_seq_port_info_free( port_info );