← Back to branch summary

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

« back to all changes in this revision

Viewing changes to dragonplayer/src/dbus/rootDbusHandler.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/rootDbusHandler.cpp
7
7
 * published by the Free Software Foundation; either version 2 of
8
8
 * the License or (at your option) version 3 or any later version
9
9
 * accepted by the membership of KDE e.V. (or its successor approved
10
 
 * by the membership of KDE e.V.), which shall act as a proxy 
 
10
 * by the membership of KDE e.V.), which shall act as a proxy
11
11
 * defined in Section 14 of version 3 of the license.
12
12
 *
13
13
 * This program is distributed in the hope that it will be useful,
32
32
    : QObject( parent )
33
33
{
34
34
    new RootDbusHandlerBase( this );
35
 
    setObjectName("RootDbusHandler");
36
 
    bool successful = QDBusConnection::sessionBus().registerObject("/", this);
 
35
    setObjectName( QLatin1String("RootDbusHandler" ));
 
36
    bool successful = QDBusConnection::sessionBus().registerObject(QLatin1String( "/" ), this);
37
37
    kDebug() << "registering root? " << successful;
38
38
}
39
39
 
40
40
RootDbusHandler::~RootDbusHandler()
41
41
{ }
42
42
 
43
 
QString 
 
43
QString
44
44
RootDbusHandler::Identity()
45
45
{
46
46
    const KAboutData* aboutData = KCmdLineArgs::aboutData();
47
 
    return QString( "%1 %2" ).arg( aboutData->productName(), aboutData->version() );
 
47
    return QString::fromLatin1( "%1 %2" ).arg( aboutData->productName(), aboutData->version() );
48
48
}
49
49
 
50
50
void