← Back to branch summary

~ubuntu-branches/ubuntu/natty/kdebase-runtime/natty-proposed

« back to all changes in this revision

Viewing changes to phonon/platform_kde/kdeplatformplugin.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-11-24 11:07:10 UTC
  • mto: (0.8.7 upstream)
  • mto: This revision was merged to the branch mainline in revision 129.
  • Revision ID: james.westby@ubuntu.com-20101124110710-6dbsyw0yh21qvn82
Tags: upstream-4.5.80
Import upstream version 4.5.80

Show diffs side-by-side

added added

removed removed

Lines of Context:
phonon/platform_kde/kdeplatformplugin.cpp
30
30
#include <kcomponentdata.h>
31
31
#include <kglobal.h>
32
32
#include <kicon.h>
33
 
#include <klibloader.h>
34
33
#include <klocale.h>
35
34
#include <kmessagebox.h>
36
35
#include <kmimetype.h>
41
40
#include <kstandarddirs.h>
42
41
#include "devicelisting.h"
43
42
 
44
 
typedef QPair<QByteArray, QString> PhononDeviceAccess;
45
 
typedef QList<PhononDeviceAccess> PhononDeviceAccessList;
46
 
#ifndef KDE_USE_FINAL
47
 
Q_DECLARE_METATYPE(PhononDeviceAccessList)
48
 
#endif
49
43
namespace Phonon
50
44
{
51
45
 
246
240
    const KService::List offers = KServiceTypeTrader::self()->query("PhononBackend",
247
241
            "Type == 'Service' and [X-KDE-PhononBackendInfo-InterfaceVersion] == 1");
248
242
    if (!offers.isEmpty()) {
249
 
        return offers.first()->hasMimeType(KMimeType::mimeType(mimeType).data());
 
243
        return offers.first()->hasMimeType(mimeType);
250
244
    }
251
245
    return false;
252
246
}
302
296
{
303
297
    const QVariant &deviceAccessListVariant = deviceDesc.property("deviceAccessList");
304
298
    if (deviceAccessListVariant.isValid()) {
305
 
        return qvariant_cast<PhononDeviceAccessList>(deviceAccessListVariant);
 
299
        return qvariant_cast<Phonon::DeviceAccessList>(deviceAccessListVariant);
306
300
    }
307
 
    PhononDeviceAccessList ret;
 
301
    Phonon::DeviceAccessList ret;
308
302
    const QVariant &v = deviceDesc.property("driver");
309
303
    if (v.isValid()) {
310
304
        const QByteArray &driver = v.toByteArray();