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/Transports/http/downloader.cpp b/src/plugins/Transports/http/downloader.cpp
index e904fced1..9cd695715 100644
--- a/src/plugins/Transports/http/downloader.cpp
+++ b/src/plugins/Transports/http/downloader.cpp
@@ -112,12 +112,12 @@ Downloader::Downloader(QObject *parent, const QString &url)
     curl_global_init(CURL_GLOBAL_ALL);
     m_stream.buf_fill = 0;
     m_stream.buf = 0;
-    m_stream.icy_meta_data = FALSE;
+    m_stream.icy_meta_data = false;
     m_stream.aborted = true;
     m_stream.icy_metaint = 0;
     m_handle = 0;
     m_metacount = 0;
-    m_meta_sent = FALSE;
+    m_meta_sent = false;
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("HTTP");
     m_codec = QTextCodec::codecForName(settings.value("icy_encoding","windows-1252").toByteArray ());
@@ -126,7 +126,7 @@ Downloader::Downloader(QObject *parent, const QString &url)
         m_codec = QTextCodec::codecForName ("UTF-8");
 #ifdef WITH_ENCA
     m_analyser = 0;
-    if(settings.value("use_enca", FALSE).toBool())
+    if(settings.value("use_enca", false).toBool())
         m_analyser = enca_analyser_alloc(settings.value("enca_lang").toByteArray ().constData());
 #endif
     settings.endGroup();
@@ -255,7 +255,7 @@ void Downloader::run()
     curl_easy_setopt(m_handle, CURLOPT_HEADERDATA, this);
     curl_easy_setopt(m_handle, CURLOPT_HEADERFUNCTION, curl_header);
     // Disable SSL
-    curl_easy_setopt(m_handle, CURLOPT_SSL_VERIFYPEER, FALSE);
+    curl_easy_setopt(m_handle, CURLOPT_SSL_VERIFYPEER, false);
     curl_easy_setopt(m_handle, CURLOPT_SSL_VERIFYHOST, 0);
     // Enable progress meter
     curl_easy_setopt(m_handle, CURLOPT_NOPROGRESS, 0);
@@ -282,9 +282,9 @@ void Downloader::run()
     m_mutex.lock();
     m_stream.buf_fill = 0;
     m_stream.buf = 0;
-    m_stream.aborted = FALSE;
+    m_stream.aborted = false;
     m_stream.header.clear ();
-    m_ready  = FALSE;
+    m_ready  = false;
     int return_code;
     qDebug("Downloader: starting libcurl");
     m_mutex.unlock();
diff --git a/src/plugins/Transports/http/settingsdialog.cpp b/src/plugins/Transports/http/settingsdialog.cpp
index 390d2845b..8bbc1fcdc 100644
--- a/src/plugins/Transports/http/settingsdialog.cpp
+++ b/src/plugins/Transports/http/settingsdialog.cpp
@@ -45,11 +45,11 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     ui.icyEncodingComboBox->setCurrentIndex(pos);
     ui.bufferSizeSpinBox->setValue(settings.value("buffer_size",128).toInt());
 #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();
 }
diff --git a/src/plugins/Transports/http/streamreader.cpp b/src/plugins/Transports/http/streamreader.cpp
index de3193315..d1fe6d84a 100644
--- a/src/plugins/Transports/http/streamreader.cpp
+++ b/src/plugins/Transports/http/streamreader.cpp
@@ -37,7 +37,7 @@ StreamReader::~StreamReader()
 
 bool StreamReader::atEnd () const
 {
-    return FALSE;
+    return false;
 }
 
 qint64 StreamReader::bytesAvailable () const
@@ -52,7 +52,7 @@ qint64 StreamReader::bytesToWrite () const
 
 bool StreamReader::canReadLine () const
 {
-    return FALSE;
+    return false;
 }
 
 void StreamReader::close ()
@@ -68,13 +68,13 @@ bool StreamReader::isSequential () const
 bool StreamReader::open ( OpenMode mode )
 {
     if (mode != QIODevice::ReadOnly)
-        return FALSE;
+        return false;
     //downloadFile();
     setOpenMode(QIODevice::ReadOnly);
     if (m_downloader->isReady())
         return true;
     else
-        return FALSE;
+        return false;
 }
 
 bool StreamReader::reset ()
@@ -86,7 +86,7 @@ bool StreamReader::reset ()
 bool StreamReader::seek ( qint64 pos )
 {
     QIODevice::seek(pos);
-    return FALSE;
+    return false;
 }
 
 qint64 StreamReader::size () const