~ubuntu-branches/ubuntu/natty/kdemultimedia/natty-proposed

« back to all changes in this revision

Viewing changes to libkcompactdisc/phonon_interface.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Debian Qt/KDE Maintainers
  • Date: 2011-05-26 02:41:36 UTC
  • mfrom: (0.2.3 upstream)
  • mto: This revision was merged to the branch mainline in revision 108.
  • Revision ID: james.westby@ubuntu.com-20110526024136-jjwsigfy402jhupm
Tags: upstream-4.6.3
ImportĀ upstreamĀ versionĀ 4.6.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
88
88
        m_producerWidget(NULL),
89
89
        m_udi(KCompactDisc::cdromDeviceUdi(dev))
90
90
{
91
 
        m_interface = QString("phonon");
 
91
        m_interface = QLatin1String("phonon");
92
92
}
93
93
 
94
94
KPhononCompactDiscPrivate::~KPhononCompactDiscPrivate()
239
239
        kDebug() << "METADATA";
240
240
        //kDebug() << data;
241
241
 
242
 
        m_trackArtists[0] = data.take("ARTIST");
243
 
        m_trackTitles[0] = data.take("ALBUM");
 
242
        m_trackArtists[0] = data.take(QLatin1String( "ARTIST" ));
 
243
        m_trackTitles[0] = data.take(QLatin1String( "ALBUM" ));
244
244
 
245
 
        m_trackArtists[m_track] = data.take("ARTIST");
246
 
        m_trackTitles[m_track] = data.take("TITLE");
 
245
        m_trackArtists[m_track] = data.take(QLatin1String( "ARTIST" ));
 
246
        m_trackTitles[m_track] = data.take(QLatin1String( "TITLE" ));
247
247
 
248
248
        emit q->discInformation(KCompactDisc::PhononMetadata);
249
249
}