From 11b7655bb103974d3a855d64dc0b6ec1b0df4ba1 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 11 Mar 2010 19:32:01 +0000 Subject: reapplied previous patch git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1620 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/cue/cueparser.cpp | 10 +++++----- src/plugins/Input/cue/decoder_cue.cpp | 10 +++++----- src/plugins/Input/cue/decodercuefactory.cpp | 2 +- src/plugins/Input/cue/settingsdialog.cpp | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/plugins/Input/cue') diff --git a/src/plugins/Input/cue/cueparser.cpp b/src/plugins/Input/cue/cueparser.cpp index 313c7f6fe..c21276229 100644 --- a/src/plugins/Input/cue/cueparser.cpp +++ b/src/plugins/Input/cue/cueparser.cpp @@ -46,7 +46,7 @@ CUEParser::CUEParser(const QString &fileName) codec = QTextCodec::codecForName("UTF-8"); #ifdef WITH_ENCA EncaAnalyser analyser = 0; - if(settings.value("use_enca", FALSE).toBool()) + if(settings.value("use_enca", false).toBool()) { analyser = enca_analyser_alloc(settings.value("enca_lang").toByteArray ().constData()); if(analyser) @@ -68,7 +68,7 @@ CUEParser::CUEParser(const QString &fileName) //qDebug("CUEParser: using %s encoding", codec->name().constData()); textStream.setCodec(codec); QString album, genre, date, comment, artist, file_path; - bool new_file = FALSE; + bool new_file = false; while (!textStream.atEnd()) { @@ -81,7 +81,7 @@ CUEParser::CUEParser(const QString &fileName) { if(!m_infoList.isEmpty()) { - QList f_list = MetaDataManager::instance()->createPlayList(file_path, FALSE); + QList f_list = MetaDataManager::instance()->createPlayList(file_path, false); qint64 l = f_list.isEmpty() ? 0 : f_list.at(0)->length() * 1000; if (l > m_offsets.last()) m_infoList.last().setLength(l - m_offsets.last()); @@ -131,7 +131,7 @@ CUEParser::CUEParser(const QString &fileName) int c = m_infoList.count(); if(c > 1 && !new_file) m_infoList[c - 2].setLength(m_offsets[c - 1] - m_offsets[c - 2]); - new_file = FALSE; + new_file = false; } else if (words[0] == "REM") { @@ -156,7 +156,7 @@ CUEParser::CUEParser(const QString &fileName) return; } //calculate last item length - QList f_list = MetaDataManager::instance()->createPlayList(file_path, FALSE); + QList f_list = MetaDataManager::instance()->createPlayList(file_path, false); qint64 l = f_list.isEmpty() ? 0 : f_list.at(0)->length() * 1000; if (l > m_offsets.last()) m_infoList.last().setLength(l - m_offsets.last()); diff --git a/src/plugins/Input/cue/decoder_cue.cpp b/src/plugins/Input/cue/decoder_cue.cpp index abaedaf66..d996329a6 100644 --- a/src/plugins/Input/cue/decoder_cue.cpp +++ b/src/plugins/Input/cue/decoder_cue.cpp @@ -69,20 +69,20 @@ bool DecoderCUE::initialize() if (m_parser->count() == 0) { qWarning("DecoderCUE: invalid cue file"); - return FALSE; + return false; } m_track = m_path.section("#", -1).toInt(); m_path = m_parser->filePath(m_track); if (!QFile::exists(m_path)) { qWarning("DecoderCUE: file \"%s\" doesn't exist", qPrintable(m_path)); - return FALSE; + return false; } DecoderFactory *df = Decoder::findByPath(m_path); if (!df) { qWarning("DecoderCUE: unsupported file format"); - return FALSE; + return false; } m_length = m_parser->length(m_track); m_offset = m_parser->offset(m_track); @@ -92,14 +92,14 @@ bool DecoderCUE::initialize() if(!m_input->open(QIODevice::ReadOnly)) { qWarning("DecoderCUE: error: %s", qPrintable(m_input->errorString())); - return FALSE; + return false; } } m_decoder = df->create(m_path, m_input); if(!m_decoder->initialize()) { qWarning("DecoderCUE: invalid audio file"); - return FALSE; + return false; } m_decoder->seek(m_offset); diff --git a/src/plugins/Input/cue/decodercuefactory.cpp b/src/plugins/Input/cue/decodercuefactory.cpp index fe259c307..9a36cc948 100644 --- a/src/plugins/Input/cue/decodercuefactory.cpp +++ b/src/plugins/Input/cue/decodercuefactory.cpp @@ -35,7 +35,7 @@ bool DecoderCUEFactory::supports(const QString &source) const bool DecoderCUEFactory::canDecode(QIODevice *) const { - return FALSE; + return false; } const DecoderProperties DecoderCUEFactory::properties() const diff --git a/src/plugins/Input/cue/settingsdialog.cpp b/src/plugins/Input/cue/settingsdialog.cpp index aa2d73a93..4ed9cfb5f 100644 --- a/src/plugins/Input/cue/settingsdialog.cpp +++ b/src/plugins/Input/cue/settingsdialog.cpp @@ -47,11 +47,11 @@ SettingsDialog::SettingsDialog(QWidget *parent) int pos = ui.cueEncComboBox->findText(settings.value("encoding","ISO-8859-1").toString()); ui.cueEncComboBox->setCurrentIndex(pos); #ifdef WITH_ENCA - ui.autoCharsetCheckBox->setChecked(settings.value("use_enca", FALSE).toBool()); + ui.autoCharsetCheckBox->setChecked(settings.value("use_enca", false).toBool()); pos = ui.encaAnalyserComboBox->findText(settings.value("enca_lang", langs[n-1]).toString()); ui.encaAnalyserComboBox->setCurrentIndex(pos); #else - ui.autoCharsetCheckBox->setEnabled(FALSE); + ui.autoCharsetCheckBox->setEnabled(false); #endif settings.endGroup(); } -- cgit v1.2.3-13-gbd6f