reapplied previous patch

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1620 90c681e8-e032-0410-971d-27865f9a5e38

3 files changed, 13 insertions, 13 deletions

diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
index 80da4b979..54dc2084f 100644
--- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
+++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
@@ -172,7 +172,7 @@ QList <CDATrack> DecoderCDAudio::generateTrackList(const QString &device)
             t.info.setMetaData(Qmmp::TITLE, QString::fromLocal8Bit(cdtext->field[CDTEXT_TITLE]));
             t.info.setMetaData(Qmmp::ARTIST, QString::fromLocal8Bit(cdtext->field[CDTEXT_PERFORMER]));
             t.info.setMetaData(Qmmp::GENRE, QString::fromLocal8Bit(cdtext->field[CDTEXT_GENRE]));
-            use_cddb = FALSE;
+            use_cddb = false;
         }
         else
             t.info.setMetaData(Qmmp::TITLE, QString("CDA Track %1").arg(i, 2, 10, QChar('0')));
@@ -180,7 +180,7 @@ QList <CDATrack> DecoderCDAudio::generateTrackList(const QString &device)
     }
     qDebug("DecoderCDAudio: found %d audio tracks", tracks.size());
 
-    use_cddb = use_cddb && settings.value("cdaudio/use_cddb", FALSE).toBool();
+    use_cddb = use_cddb && settings.value("cdaudio/use_cddb", false).toBool();
     if(use_cddb)
     {
         qDebug("DecoderCDAudio: reading CDDB...");
@@ -209,7 +209,7 @@ QList <CDATrack> DecoderCDAudio::generateTrackList(const QString &device)
                     cddb_set_http_proxy_password (cddb_conn, proxy.password().toAscii());
                 }
             }
-            else if (settings.value("cddb_http", FALSE).toBool())
+            else if (settings.value("cddb_http", false).toBool())
             {
                 cddb_http_enable (cddb_conn);
                 cddb_set_http_path_query (cddb_conn, settings.value("cddb_path").toByteArray());
@@ -308,11 +308,11 @@ bool DecoderCDAudio::readFromCache(QList <CDATrack> *tracks, uint disc_id)
     QString path = QFileInfo(Qmmp::configFile()).absoluteDir().path();
     path += QString("/cddbcache/%1").arg(disc_id, 0, 16);
     if(!QFile::exists(path))
-        return FALSE;
+        return false;
     QSettings settings(path, QSettings::IniFormat);
     int count = settings.value("count").toInt();
     if(count != tracks->count())
-        return FALSE;
+        return false;
     for(int i = 0; i < count; ++i)
     {
         (*tracks)[i].info.setMetaData(Qmmp::ARTIST, settings.value(QString("artist%1").arg(i)).toString());
@@ -339,7 +339,7 @@ bool DecoderCDAudio::initialize()
     if (tracks.isEmpty())
     {
         qWarning("DecoderCDAudio: initialize failed");
-        return FALSE;
+        return false;
     }
     //find track by number
     int track_at = -1;
@@ -352,7 +352,7 @@ bool DecoderCDAudio::initialize()
     if (track_at < 0)
     {
         qWarning("DecoderCDAudio: invalid track number");
-        return FALSE;
+        return false;
     }
 
     if (QUrl(m_url).path().isEmpty() || QUrl(m_url).path() == "/") //try default path from config
@@ -372,14 +372,14 @@ bool DecoderCDAudio::initialize()
             {
                 qWarning("DecoderCDAudio: failed to open CD.");
                 cdio_free_device_list(cd_drives);
-                return FALSE;
+                return false;
             }
             qDebug("DecoderCDAudio: found cd audio capable drive \"%s\"", *cd_drives);
         }
         else
         {
             qWarning("DecoderCDAudio: unable to find cd audio drive.");
-            return FALSE;
+            return false;
         }
         if (cd_drives && *cd_drives) //free device list
             cdio_free_device_list(cd_drives);
@@ -390,7 +390,7 @@ bool DecoderCDAudio::initialize()
         if (!m_cdio)
         {
             qWarning("DecoderCDAudio: failed to open CD.");
-            return FALSE;
+            return false;
         }
         qDebug("DecoderCDAudio: using cd audio capable drive \"%s\"", QUrl(m_url).path().toAscii().constData());
     }
diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
index 546cc7a2d..cb334c4d5 100644
--- a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
+++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
@@ -36,7 +36,7 @@ bool DecoderCDAudioFactory::supports(const QString &source) const
 
 bool DecoderCDAudioFactory::canDecode(QIODevice *) const
 {
-    return FALSE;
+    return false;
 }
 
 const DecoderProperties DecoderCDAudioFactory::properties() const
diff --git a/src/plugins/Input/cdaudio/settingsdialog.cpp b/src/plugins/Input/cdaudio/settingsdialog.cpp
index ee9ce04f0..a873e823c 100644
--- a/src/plugins/Input/cdaudio/settingsdialog.cpp
+++ b/src/plugins/Input/cdaudio/settingsdialog.cpp
@@ -36,8 +36,8 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     ui.speedCheckBox->setChecked(speed > 0);
     ui.speedSpinBox->setValue(speed);
     ui.cdtextCheckBox->setChecked(settings.value("cdtext", true).toBool());
-    ui.cddbGroupBox->setChecked(settings.value("use_cddb", FALSE).toBool());
-    ui.httpCheckBox->setChecked(settings.value("cddb_http", FALSE).toBool());
+    ui.cddbGroupBox->setChecked(settings.value("use_cddb", false).toBool());
+    ui.httpCheckBox->setChecked(settings.value("cddb_http", false).toBool());
     ui.serverLineEdit->setText(settings.value("cddb_server", "freedb.org").toString());
     ui.pathLineEdit->setText(settings.value("cddb_path").toString());
     ui.portLineEdit->setText(settings.value("cddb_port", 8880).toString());