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, 11 insertions, 11 deletions

diff --git a/src/plugins/General/hal/halfactory.cpp b/src/plugins/General/hal/halfactory.cpp
index 139c80040..0637bab71 100644
--- a/src/plugins/General/hal/halfactory.cpp
+++ b/src/plugins/General/hal/halfactory.cpp
@@ -31,7 +31,7 @@ const GeneralProperties HalFactory::properties() const
     properties.shortName = "hal";
     properties.hasAbout = true;
     properties.hasSettings = true;
-    properties.visibilityControl = FALSE;
+    properties.visibilityControl = false;
     return properties;
 }
 
diff --git a/src/plugins/General/hal/halplugin.cpp b/src/plugins/General/hal/halplugin.cpp
index 94364f44d..f91e97194 100644
--- a/src/plugins/General/hal/halplugin.cpp
+++ b/src/plugins/General/hal/halplugin.cpp
@@ -43,17 +43,17 @@ HalPlugin::HalPlugin(QObject *parent)
     settings.beginGroup("HAL");
     m_detectCDA = settings.value("cda", true).toBool();
     m_detectRemovable = settings.value("removable", true).toBool();
-    m_addTracks = FALSE; //do not load tracks on startup
-    m_addFiles = FALSE;
+    m_addTracks = false; //do not load tracks on startup
+    m_addFiles = false;
     //find existing devices
     QStringList udis = m_manager->findDeviceByCapability("volume");
     foreach(QString udi, udis)
     addDevice(udi);
     //load remaining settings
-    m_addTracks = settings.value("add_tracks", FALSE).toBool();
-    m_removeTracks = settings.value("remove_tracks", FALSE).toBool();
-    m_addFiles = settings.value("add_files", FALSE).toBool();
-    m_removeFiles = settings.value("remove_files", FALSE).toBool();
+    m_addTracks = settings.value("add_tracks", false).toBool();
+    m_removeTracks = settings.value("remove_tracks", false).toBool();
+    m_addFiles = settings.value("add_files", false).toBool();
+    m_removeFiles = settings.value("remove_files", false).toBool();
     settings.endGroup();
 }
 
diff --git a/src/plugins/General/hal/settingsdialog.cpp b/src/plugins/General/hal/settingsdialog.cpp
index 45987a3d7..17fbea323 100644
--- a/src/plugins/General/hal/settingsdialog.cpp
+++ b/src/plugins/General/hal/settingsdialog.cpp
@@ -31,11 +31,11 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("HAL");
     ui.cdGroupBox->setChecked(settings.value("cda", true).toBool());
-    ui.addTracksCheckBox->setChecked(settings.value("add_tracks", FALSE).toBool());
-    ui.removeTracksCheckBox->setChecked(settings.value("remove_tracks", FALSE).toBool());
+    ui.addTracksCheckBox->setChecked(settings.value("add_tracks", false).toBool());
+    ui.removeTracksCheckBox->setChecked(settings.value("remove_tracks", false).toBool());
     ui.removableGroupBox->setChecked(settings.value("removable", true).toBool());
-    ui.addFilesCheckBox->setChecked(settings.value("add_files", FALSE).toBool());
-    ui.removeFilesCheckBox->setChecked(settings.value("remove_files", FALSE).toBool());
+    ui.addFilesCheckBox->setChecked(settings.value("add_files", false).toBool());
+    ui.removeFilesCheckBox->setChecked(settings.value("remove_files", false).toBool());
     settings.endGroup();
 }