From 71a481a1206ef3f626209008cc3b9438d308f6e3 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 4 Oct 2009 15:59:47 -0400 Subject: Style --- dvddrive.cpp | 3 +-- main.cpp | 1 - statuslabel.cpp | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dvddrive.cpp b/dvddrive.cpp index 07e4a34..41219b1 100644 --- a/dvddrive.cpp +++ b/dvddrive.cpp @@ -61,9 +61,8 @@ bool DVDDrive::dvdInserted() const } void DVDDrive::eject() { - if (m_halDisc) { + if (m_halDisc) QDBusInterface(QLatin1String("org.freedesktop.Hal"), m_halDisc->path(), QLatin1String("org.freedesktop.Hal.Device.Volume"), QDBusConnection::systemBus(), this).call(QLatin1String("Eject"), QStringList()); - } } DVDDrive* DVDDrive::s_instance = 0; DVDDrive* DVDDrive::instance() diff --git a/main.cpp b/main.cpp index 9f6e83f..0873bef 100644 --- a/main.cpp +++ b/main.cpp @@ -1,6 +1,5 @@ #include "mainwindow.h" #include -#include int main(int argc, char *argv[]) { diff --git a/statuslabel.cpp b/statuslabel.cpp index 8312caa..a885be8 100644 --- a/statuslabel.cpp +++ b/statuslabel.cpp @@ -12,7 +12,7 @@ StatusLabel::StatusLabel(const QString &text, QWidget *parent) : layout->addWidget(m_pixmap); layout->addWidget(new QLabel(text)); setLayout(layout); - setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); + setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); } void StatusLabel::setCompleted(bool complete) { -- cgit v1.2.3-59-g8ed1b