reapplied previous patch

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

4 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp
index ef4610a3a..307b6cd08 100644
--- a/src/plugins/General/scrobbler/scrobbler.cpp
+++ b/src/plugins/General/scrobbler/scrobbler.cpp
@@ -212,7 +212,7 @@ void Scrobbler::processResponse(QNetworkReply *reply)
             else
             {
                 qWarning("Scrobbler[%s]: service error: %s", qPrintable(m_name), qPrintable(strlist[0]));
-                m_disabled = FALSE;
+                m_disabled = false;
                 m_handshake_count++;
                 QTimer::singleShot (60000 * qMin(m_handshake_count^2, 120) , this, SLOT(handshake()));
                 qWarning("Scrobbler[%s]: waiting %d minutes...", qPrintable(m_name),
diff --git a/src/plugins/General/scrobbler/scrobblerfactory.cpp b/src/plugins/General/scrobbler/scrobblerfactory.cpp
index 332dd22ac..579efb4bc 100644
--- a/src/plugins/General/scrobbler/scrobblerfactory.cpp
+++ b/src/plugins/General/scrobbler/scrobblerfactory.cpp
@@ -31,7 +31,7 @@ const GeneralProperties ScrobblerFactory::properties() const
     properties.shortName = "scrobbler";
     properties.hasAbout = true;
     properties.hasSettings = true;
-    properties.visibilityControl = FALSE;
+    properties.visibilityControl = false;
     return properties;
 }
 
diff --git a/src/plugins/General/scrobbler/scrobblerhandler.cpp b/src/plugins/General/scrobbler/scrobblerhandler.cpp
index 1bb627d62..2b9163672 100644
--- a/src/plugins/General/scrobbler/scrobblerhandler.cpp
+++ b/src/plugins/General/scrobbler/scrobblerhandler.cpp
@@ -29,13 +29,13 @@ ScrobblerHandler::ScrobblerHandler(QObject *parent) : General(parent)
 {
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Scrobbler");
-    if(settings.value("use_lastfm", FALSE).toBool())
+    if(settings.value("use_lastfm", false).toBool())
     {
         new Scrobbler(SCROBBLER_LASTFM_URL, settings.value("lastfm_login").toString(),
                    settings.value("lastfm_password").toString(), "lastfm", this);
 
     }
-    if(settings.value("use_librefm", FALSE).toBool())
+    if(settings.value("use_librefm", false).toBool())
     {
         new Scrobbler(SCROBBLER_LIBREFM_URL, settings.value("librefm_login").toString(),
                    settings.value("librefm_password").toString(), "librefm", this);
diff --git a/src/plugins/General/scrobbler/settingsdialog.cpp b/src/plugins/General/scrobbler/settingsdialog.cpp
index 1015a1a6b..eb627dc7b 100644
--- a/src/plugins/General/scrobbler/settingsdialog.cpp
+++ b/src/plugins/General/scrobbler/settingsdialog.cpp
@@ -29,10 +29,10 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     ui.setupUi(this);
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Scrobbler");
-    ui.lastfmGroupBox->setChecked(settings.value("use_lastfm", FALSE).toBool());
+    ui.lastfmGroupBox->setChecked(settings.value("use_lastfm", false).toBool());
     ui.userLineEdit->setText(settings.value("lastfm_login").toString());
     ui.passwordLineEdit->setText(settings.value("lastfm_password").toString());
-    ui.librefmGroupBox->setChecked(settings.value("use_librefm", FALSE).toBool());
+    ui.librefmGroupBox->setChecked(settings.value("use_librefm", false).toBool());
     ui.userLineEdit_libre->setText(settings.value("librefm_login").toString());
     ui.passwordLineEdit_libre->setText(settings.value("librefm_password").toString());
     settings.endGroup();