← Back to branch summary

~ubuntu-branches/ubuntu/precise/kde4libs/precise-security

« back to all changes in this revision

Viewing changes to solid/solid/backends/hal/halcdrom.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Kolberg
  • Date: 2012-03-03 00:25:28 UTC
  • mfrom: (1.14.15)
  • Revision ID: package-import@ubuntu.com-20120303002528-chhwyfluldkicy5k
Tags: 4:4.8.1-0ubuntu1
* New upstream release
  - Update symbol files

Show diffs side-by-side

added added

removed removed

Lines of Context:
solid/solid/backends/hal/halcdrom.cpp
33
33
Cdrom::Cdrom(HalDevice *device)
34
34
    : Storage(device), m_ejectInProgress(false)
35
35
{
36
 
    connect(device, SIGNAL(conditionRaised(const QString &, const QString &)),
37
 
             this, SLOT(slotCondition(const QString &, const QString &)));
 
36
    connect(device, SIGNAL(conditionRaised(QString,QString)),
 
37
             this, SLOT(slotCondition(QString,QString)));
38
38
    m_device->registerAction("eject", this,
39
39
                             SLOT(slotEjectRequested()),
40
 
                             SLOT(slotEjectDone(int, const QString&)));
 
40
                             SLOT(slotEjectDone(int,QString)));
41
41
}
42
42
 
43
43
Cdrom::~Cdrom()
164
164
 
165
165
 
166
166
    return c.callWithCallback(msg, this,
167
 
                              SLOT(slotDBusReply(const QDBusMessage &)),
168
 
                              SLOT(slotDBusError(const QDBusError &)));
 
167
                              SLOT(slotDBusReply(QDBusMessage)),
 
168
                              SLOT(slotDBusError(QDBusError)));
169
169
}
170
170
 
171
171
bool Solid::Backends::Hal::Cdrom::callSystemEject()
172
172
{
173
173
    const QString device = m_device->prop("block.device").toString();
174
174
    m_process = FstabHandling::callSystemCommand("eject", device,
175
 
                                                 this, SLOT(slotProcessFinished(int, QProcess::ExitStatus)));
 
175
                                                 this, SLOT(slotProcessFinished(int,QProcess::ExitStatus)));
176
176
 
177
177
    return m_process!=0;
178
178
}