Using scoped ptr to ripcd window, removing extra parenthesis again
This commit is contained in:
parent
af34bf6062
commit
4b7c3a2f8c
@ -145,7 +145,6 @@ RipCD::RipCD(QWidget* parent)
|
||||
}
|
||||
|
||||
RipCD::~RipCD() {
|
||||
delete ui_;
|
||||
cdio_destroy(cdio_);
|
||||
}
|
||||
|
||||
@ -307,7 +306,7 @@ void RipCD::ThreadedTranscoding() {
|
||||
|
||||
void RipCD::ClickedRipButton() {
|
||||
if (cdio_ && cdio_get_media_changed(cdio_)) {
|
||||
QMessageBox cdio_fail(QMessageBox::Critical, tr("Error"),
|
||||
QMessageBox cdio_fail(QMessageBox::Critical, tr("Error Ripping CD"),
|
||||
tr("Media has changed. Reloading"));
|
||||
cdio_fail.exec();
|
||||
if (CheckCDIOIsValid()) {
|
||||
@ -416,7 +415,7 @@ bool RipCD::CheckCDIOIsValid() {
|
||||
// Refresh the status of the cd media. This will prevent unnecessary
|
||||
// rebuilds of the track list table.
|
||||
cdio_get_media_changed(cdio_);
|
||||
return (cdio_);
|
||||
return cdio_;
|
||||
}
|
||||
|
||||
void RipCD::SetWorking(bool working) {
|
||||
|
@ -22,6 +22,7 @@
|
||||
#include <QCheckBox>
|
||||
#include <QThread>
|
||||
#include <QFile>
|
||||
#include <QScopedPointer>
|
||||
#include <cdio/cdio.h>
|
||||
#include "ui_ripcd.h"
|
||||
|
||||
@ -51,7 +52,7 @@ class RipCD : public QDialog {
|
||||
int finished_success_;
|
||||
int finished_failed_;
|
||||
track_t i_tracks_;
|
||||
Ui_RipCD* ui_;
|
||||
QScopedPointer<Ui_RipCD> ui_;
|
||||
CdIo_t* cdio_;
|
||||
QList<QCheckBox*> checkboxes_;
|
||||
QList<QString> generated_files_;
|
||||
|
Loading…
x
Reference in New Issue
Block a user