← Back to branch summary

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

« back to all changes in this revision

Viewing changes to dragonplayer/src/dbus/trackListDbusHandler.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:
dragonplayer/src/dbus/trackListDbusHandler.cpp
6
6
 * published by the Free Software Foundation; either version 2 of
7
7
 * the License or (at your option) version 3 or any later version
8
8
 * accepted by the membership of KDE e.V. (or its successor approved
9
 
 * by the membership of KDE e.V.), which shall act as a proxy 
 
9
 * by the membership of KDE e.V.), which shall act as a proxy
10
10
 * defined in Section 14 of version 3 of the license.
11
11
 *
12
12
 * This program is distributed in the hope that it will be useful,
33
33
    : QObject(parent)
34
34
{
35
35
    QObject* pa = new TrackListDbusAdaptor( this );
36
 
    setObjectName("TrackListDbusHandler");
 
36
    setObjectName( QLatin1String("TrackListDbusHandler" ));
37
37
 
38
38
    connect( Dragon::engine(), SIGNAL( currentSourceChanged( Phonon::MediaSource ) ), this, SLOT( slotTrackChange() )  );
39
39
    connect( this, SIGNAL( TrackListChange( int ) ), pa, SIGNAL( TrackListChange( int ) ) );
40
40
 
41
 
    QDBusConnection::sessionBus().registerObject("/TrackList", this);
 
41
    QDBusConnection::sessionBus().registerObject(QLatin1String( "/TrackList" ), this);
42
42
}
43
43
 
44
44
TrackListDbusHandler::~TrackListDbusHandler()
80
80
{
81
81
    if( position == 0 )
82
82
    {
83
 
        return parent()->findChild<PlayerDbusHandler *>("PlayerDbusHandler")->GetMetadata();
 
83
        return parent()->findChild<PlayerDbusHandler *>(QLatin1String( "PlayerDbusHandler" ))->GetMetadata();
84
84
    }
85
85
    else
86
86
        return QVariantMap();