reapplied previous patch

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

15 files changed, 35 insertions, 35 deletions

diff --git a/src/qmmpui/commandlinemanager.cpp b/src/qmmpui/commandlinemanager.cpp
index cb128dc51..85d822b1e 100644
--- a/src/qmmpui/commandlinemanager.cpp
+++ b/src/qmmpui/commandlinemanager.cpp
@@ -100,7 +100,7 @@ bool CommandLineManager::hasOption(const QString &opt_str)
         if (opt->identify(opt_str))
             return true;
     }
-    return FALSE;
+    return false;
 }
 
 void CommandLineManager::printUsage()
diff --git a/src/qmmpui/detailsdialog.cpp b/src/qmmpui/detailsdialog.cpp
index a63290311..8d72f124b 100644
--- a/src/qmmpui/detailsdialog.cpp
+++ b/src/qmmpui/detailsdialog.cpp
@@ -33,8 +33,8 @@
 DetailsDialog::DetailsDialog(AbstractPlaylistItem *item, QWidget *parent)
         : QDialog(parent)
 {
-    setAttribute(Qt::WA_QuitOnClose, FALSE);
-    setAttribute(Qt::WA_DeleteOnClose, FALSE);
+    setAttribute(Qt::WA_QuitOnClose, false);
+    setAttribute(Qt::WA_DeleteOnClose, false);
     m_metaDataModel = 0;
     m_item = item;
     ui.setupUi(this);
diff --git a/src/qmmpui/filedialog.cpp b/src/qmmpui/filedialog.cpp
index 83b1be2ae..55e297dcb 100644
--- a/src/qmmpui/filedialog.cpp
+++ b/src/qmmpui/filedialog.cpp
@@ -34,7 +34,7 @@ FileDialog* FileDialog::_instance = 0;
 
 QMap<QString,FileDialogFactory*> FileDialog::factories = QMap<QString,FileDialogFactory*>();
 
-FileDialog::FileDialog() : QObject(), m_initialized(FALSE)
+FileDialog::FileDialog() : QObject(), m_initialized(false)
 {
     m_lastDir = 0;
 }
diff --git a/src/qmmpui/filedialogfactory.h b/src/qmmpui/filedialogfactory.h
index d5b790b18..b4aca86cd 100644
--- a/src/qmmpui/filedialogfactory.h
+++ b/src/qmmpui/filedialogfactory.h
@@ -34,7 +34,7 @@ public:
      */
     FileDialogProperties()
     {
-        hasAbout = FALSE;
+        hasAbout = false;
     }
     bool hasAbout;      /*!< Should be \b true if the file dialog plugin has about dialog, otherwise should be
                          * \b false */
diff --git a/src/qmmpui/general.cpp b/src/qmmpui/general.cpp
index d8cfe1989..f6078cd13 100644
--- a/src/qmmpui/general.cpp
+++ b/src/qmmpui/general.cpp
@@ -115,7 +115,7 @@ bool General::isEnabled(GeneralFactory* factory)
 {
     checkFactories();
     if (!m_factories->contains(factory))
-        return FALSE;
+        return false;
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat );
     QStringList genList = settings.value("General/enabled_plugins").toStringList();
     return genList.contains(factory->properties().shortName);
diff --git a/src/qmmpui/generalfactory.h b/src/qmmpui/generalfactory.h
index 02fcedd57..7e6541883 100644
--- a/src/qmmpui/generalfactory.h
+++ b/src/qmmpui/generalfactory.h
@@ -36,9 +36,9 @@ public:
      */
     GeneralProperties()
     {
-        hasAbout = FALSE;
-        hasSettings = FALSE;
-        visibilityControl = FALSE;
+        hasAbout = false;
+        hasSettings = false;
+        visibilityControl = false;
     }
     QString name;           /*!< File dialog plugin full name */
     QString shortName;      /*!< File dialog short name for internal usage */
diff --git a/src/qmmpui/generalhandler.cpp b/src/qmmpui/generalhandler.cpp
index 8981796e3..794156e08 100644
--- a/src/qmmpui/generalhandler.cpp
+++ b/src/qmmpui/generalhandler.cpp
@@ -99,7 +99,7 @@ bool GeneralHandler::visibilityControl()
         if (General::isEnabled(factory) && factory->properties().visibilityControl)
             return true;
     }
-    return FALSE;
+    return false;
 }
 
 void GeneralHandler::executeCommand(const QString &opt_str, const QStringList &args)
diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp
index a444ad646..0174003fa 100644
--- a/src/qmmpui/mediaplayer.cpp
+++ b/src/qmmpui/mediaplayer.cpp
@@ -36,7 +36,7 @@ MediaPlayer::MediaPlayer(QObject *parent)
     m_pl_manager = 0;
     m_core = 0;
     m_skips = 0;
-    m_repeat = FALSE;
+    m_repeat = false;
     QTranslator *translator = new QTranslator(parent);
     QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/libqmmpui_") + locale);
@@ -57,7 +57,7 @@ void MediaPlayer::initialize(SoundCore *core, PlayListManager *pl_manager)
     Q_CHECK_PTR(pl_manager);
     m_core = core;
     m_pl_manager = pl_manager;
-    m_repeat = FALSE;
+    m_repeat = false;
     connect(m_core, SIGNAL(aboutToFinish()), SLOT(updateNextUrl()));
     connect(m_core, SIGNAL(finished()), SLOT(playNext()));
 }
@@ -96,7 +96,7 @@ void MediaPlayer::play(qint64 offset)
         return;
     }
 
-    if (!m_core->play(s, FALSE, offset))
+    if (!m_core->play(s, false, offset))
     {
         //find out the reason why playback failed
         switch ((int) m_core->state())
diff --git a/src/qmmpui/playlistitem.cpp b/src/qmmpui/playlistitem.cpp
index 3bb57963a..d13d7ab18 100644
--- a/src/qmmpui/playlistitem.cpp
+++ b/src/qmmpui/playlistitem.cpp
@@ -28,14 +28,14 @@
 PlayListItem::PlayListItem() : AbstractPlaylistItem(), m_flag(FREE)
 {
     m_info = 0;
-    m_selected = FALSE;
-    m_current = FALSE;
+    m_selected = false;
+    m_current = false;
 }
 
 PlayListItem::PlayListItem(FileInfo *info) : AbstractPlaylistItem(), m_flag(FREE)
 {
-    m_selected = FALSE;
-    m_current = FALSE;
+    m_selected = false;
+    m_current = false;
     m_info = info;
 
     setMetaData(info->metaData());
diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp
index 0d240c2a6..1c7e7ab79 100644
--- a/src/qmmpui/playlistmanager.cpp
+++ b/src/qmmpui/playlistmanager.cpp
@@ -31,8 +31,8 @@ PlayListManager::PlayListManager(QObject *parent) : QObject(parent)
 {
     m_current = 0;
     m_selected = 0;
-    m_repeatable = FALSE;
-    m_shuffle = FALSE;
+    m_repeatable = false;
+    m_shuffle = false;
     readPlayLists();
 }
 
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index 1518db19c..007eee910 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -167,7 +167,7 @@ int PlayListModel::currentRow()
 bool PlayListModel::setCurrent(int c)
 {
     if (c > count()-1 || c < 0)
-        return FALSE;
+        return false;
     m_current = c;
     m_currentItem = m_items.at(c);
     emit currentChanged();
@@ -232,7 +232,7 @@ void PlayListModel::clear()
 void PlayListModel::clearSelection()
 {
     for (int i = 0; i<m_items.size(); ++i)
-        m_items.at(i)->setSelected(FALSE);
+        m_items.at(i)->setSelected(false);
     emit listChanged();
 }
 
@@ -457,7 +457,7 @@ void PlayListModel::addFileList(const QStringList &l)
 
 bool PlayListModel::setFileList(const QStringList & l)
 {
-    bool model_cleared = FALSE;
+    bool model_cleared = false;
     foreach(QString str,l)
     {
         QFileInfo f_info(str);
@@ -899,7 +899,7 @@ bool PlayListModel::isFileLoaderRunning() const
     if (l && l->isRunning())
         return true;
 
-    return FALSE;
+    return false;
 }
 
 void PlayListModel::preparePlayState()
@@ -911,7 +911,7 @@ void PlayListModel::removeInvalidItems()
 {
     foreach(PlayListItem *item, m_items)
     {
-        bool ok = FALSE;
+        bool ok = false;
         if(!item->url().contains("://"))
             ok = MetaDataManager::instance()->supports(item->url());
         else
diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h
index 396b87640..6f9e9f9d1 100644
--- a/src/qmmpui/playlistmodel.h
+++ b/src/qmmpui/playlistmodel.h
@@ -357,7 +357,7 @@ public slots:
     /*!
      * Removes previous items and loads list of files (regular files or directories),
      * returns \b true if at least one file has been successfully loaded,
-     * otherwise returns \b FALSE
+     * otherwise returns \b false
      */
     bool setFileList(const QStringList &l);
     /*!
diff --git a/src/qmmpui/playstate.cpp b/src/qmmpui/playstate.cpp
index 56657beb7..ad2bbf9fb 100644
--- a/src/qmmpui/playstate.cpp
+++ b/src/qmmpui/playstate.cpp
@@ -34,7 +34,7 @@ bool ShufflePlayState::next()
         if (m_shuffled_current >= m_shuffled_indexes.count() -1 )
         {
             if (!m_model->isRepeatableList())
-                return FALSE;
+                return false;
             else
                 prepare();
         }
@@ -43,7 +43,7 @@ bool ShufflePlayState::next()
 
         return m_model->setCurrent(m_shuffled_indexes.at(m_shuffled_current));
     }
-    return FALSE;
+    return false;
 }
 
 bool ShufflePlayState::previous()
@@ -55,7 +55,7 @@ bool ShufflePlayState::previous()
         if (m_shuffled_current <= 0)
         {
             if (!m_model->isRepeatableList())
-                return FALSE;
+                return false;
             else
             {
                 prepare();
@@ -68,7 +68,7 @@ bool ShufflePlayState::previous()
         m_model->setCurrent(m_shuffled_indexes.at(m_shuffled_current));
         return true;
     }
-    return FALSE;
+    return false;
 }
 
 void ShufflePlayState::prepare()
@@ -107,12 +107,12 @@ bool NormalPlayState::next()
             if (m_model->isRepeatableList())
                 return m_model->setCurrent(0);
             else
-                return FALSE;
+                return false;
         }
         return m_model->setCurrent(m_model->currentRow() + 1);
     }
     else
-        return FALSE;
+        return false;
 }
 
 bool NormalPlayState::previous()
@@ -122,13 +122,13 @@ bool NormalPlayState::previous()
     if (itm_count > 0)
     {
         if ( m_model->currentRow() < 1 && !m_model->isRepeatableList())
-            return FALSE;
+            return false;
         else if (m_model->setCurrent(m_model->currentRow() - 1))
             return true;
         else if (m_model->isRepeatableList())
             return m_model->setCurrent(m_model->items().count() - 1);
     }
 
-    return FALSE;
+    return false;
 }
 
diff --git a/src/qmmpui/qtfiledialog.cpp b/src/qmmpui/qtfiledialog.cpp
index 64652d1f2..d177925da 100644
--- a/src/qmmpui/qtfiledialog.cpp
+++ b/src/qmmpui/qtfiledialog.cpp
@@ -32,7 +32,7 @@ const FileDialogProperties QtFileDialogFactory::properties() const
     FileDialogProperties properties;
     properties.name = tr("Qt File Dialog");
     properties.shortName = "qt_dialog";
-    properties.hasAbout = FALSE;
+    properties.hasAbout = false;
     return properties;
 }
 
diff --git a/src/qmmpui/templateeditor.cpp b/src/qmmpui/templateeditor.cpp
index ac6fa45af..0dd22546b 100644
--- a/src/qmmpui/templateeditor.cpp
+++ b/src/qmmpui/templateeditor.cpp
@@ -93,7 +93,7 @@ QString TemplateEditor::getTemplate (QWidget *parent, const QString &title, cons
     else
     {
         if(ok)
-            *ok = FALSE;
+            *ok = false;
         editor->deleteLater();
         return QString();
     }