diff options
144 files changed, 469 insertions, 469 deletions
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp index a8bdfea32..9ba8566ee 100644 --- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp +++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp @@ -35,7 +35,7 @@ bool IncDecVolumeCommandLineOption::identify(const QString & str) const return true; } - return FALSE; + return false; } const QString IncDecVolumeCommandLineOption::helpString() const diff --git a/src/plugins/Effect/srconverter/srconverter.cpp b/src/plugins/Effect/srconverter/srconverter.cpp index bec360a4f..6b22292af 100644 --- a/src/plugins/Effect/srconverter/srconverter.cpp +++ b/src/plugins/Effect/srconverter/srconverter.cpp @@ -27,7 +27,7 @@ SRConverter::SRConverter() : Effect() { - m_isSrcAlloc = FALSE; + m_isSrcAlloc = false; int converter_type_array[] = {SRC_SINC_BEST_QUALITY, SRC_SINC_MEDIUM_QUALITY, SRC_SINC_FASTEST, SRC_ZERO_ORDER_HOLD, SRC_LINEAR}; m_srcIn = 0; @@ -53,7 +53,7 @@ SRConverter::~SRConverter() delete [] m_srcIn; delete [] m_srcOut; delete [] m_wOut; - m_isSrcAlloc = FALSE; + m_isSrcAlloc = false; } } @@ -64,7 +64,7 @@ void SRConverter::applyEffect(Buffer *b) delete [] m_srcIn; delete [] m_srcOut; delete [] m_wOut; - m_isSrcAlloc = FALSE; + m_isSrcAlloc = false; } ulong wbytes = 0; diff --git a/src/plugins/Engines/mplayer/mplayerengine.cpp b/src/plugins/Engines/mplayer/mplayerengine.cpp index 89c35015d..29a353039 100644 --- a/src/plugins/Engines/mplayer/mplayerengine.cpp +++ b/src/plugins/Engines/mplayer/mplayerengine.cpp @@ -101,7 +101,7 @@ MplayerEngine::~MplayerEngine() bool MplayerEngine::play() { if(m_process->state() != QProcess::NotRunning) - return FALSE; + return false; startMplayerProcess(); return true; } @@ -110,7 +110,7 @@ bool MplayerEngine::enqueue(InputSource *source) { QString url = source->url(); QStringList filters = MplayerInfo::filters(); - bool supports = FALSE; + bool supports = false; foreach(QString filter, filters) { QRegExp regexp(filter, Qt::CaseInsensitive, QRegExp::Wildcard); @@ -119,7 +119,7 @@ bool MplayerEngine::enqueue(InputSource *source) break; } if(!supports) - return FALSE; + return false; source->deleteLater(); if(m_process->state() == QProcess::NotRunning) m_url = url; @@ -143,7 +143,7 @@ bool MplayerEngine::initialize() if (vo_str != "default") m_args << "vo=" + vo_str; - if (settings.value("autosync", FALSE).toBool()) + if (settings.value("autosync", false).toBool()) m_args << QString("-autosync %1").arg(settings.value("autosync_factor", 100).toInt()); m_args << m_url; diff --git a/src/plugins/Engines/mplayer/mplayerenginefactory.cpp b/src/plugins/Engines/mplayer/mplayerenginefactory.cpp index 7398fd46d..48de7f5fe 100644 --- a/src/plugins/Engines/mplayer/mplayerenginefactory.cpp +++ b/src/plugins/Engines/mplayer/mplayerenginefactory.cpp @@ -50,7 +50,7 @@ bool MplayerEngineFactory::supports(const QString &source) const if (regexp.exactMatch(source)) return true; } - return FALSE; + return false; } AbstractEngine *MplayerEngineFactory::create(QObject *parent) diff --git a/src/plugins/Engines/mplayer/settingsdialog.cpp b/src/plugins/Engines/mplayer/settingsdialog.cpp index 029890eb1..21707e2cc 100644 --- a/src/plugins/Engines/mplayer/settingsdialog.cpp +++ b/src/plugins/Engines/mplayer/settingsdialog.cpp @@ -47,7 +47,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) settings.beginGroup("mplayer"); ui.audioComboBox->setEditText(settings.value("ao","default").toString().replace("default", tr("default"))); ui.videoComboBox->setEditText(settings.value("vo","default").toString().replace("default", tr("default"))); - ui.autoSyncCheckBox->setChecked(settings.value("autosync", FALSE).toBool()); + ui.autoSyncCheckBox->setChecked(settings.value("autosync", false).toBool()); ui.syncFactorSpinBox->setValue(settings.value("autosync_factor", 100).toInt()); settings.endGroup(); } diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp index d02a06083..43c1ec6fb 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp @@ -39,7 +39,7 @@ void QmmpFileDialog::handleSelected(/*const QStringList& s */) bool QmmpFileDialog::modal()const { - return FALSE; + return false; } QmmpFileDialog::~QmmpFileDialog() diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp index 73aab2ce9..a35387a6e 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp @@ -60,11 +60,11 @@ static QStringList qt_clean_filter_list(const QString &filter) QmmpFileDialogImpl::QmmpFileDialogImpl(QWidget * parent, Qt::WindowFlags f) : QDialog(parent,f) { setupUi(this); - setAttribute(Qt::WA_QuitOnClose, FALSE); + setAttribute(Qt::WA_QuitOnClose, false); #if QT_VERSION >= 0x040400 m_model = new QFileSystemModel(this); - m_model->setNameFilterDisables (FALSE); - m_model->setReadOnly(FALSE); + m_model->setNameFilterDisables (false); + m_model->setReadOnly(false); #else m_model = new QDirModel(this); m_model->setSorting(QDir::Type); @@ -73,9 +73,9 @@ QmmpFileDialogImpl::QmmpFileDialogImpl(QWidget * parent, Qt::WindowFlags f) : QD fileListView->setModel(m_model); treeView->setModel(m_model); treeView->setSortingEnabled(true); - treeView->setItemsExpandable(FALSE); + treeView->setItemsExpandable(false); treeView->header()->setSortIndicator(0, Qt::AscendingOrder); - treeView->header()->setStretchLastSection (FALSE); + treeView->header()->setStretchLastSection (false); listToolButton->setChecked(true); upToolButton->setIcon(qApp->style()->standardIcon(QStyle::SP_ArrowUp)); listToolButton->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogListView)); @@ -90,7 +90,7 @@ QmmpFileDialogImpl::QmmpFileDialogImpl(QWidget * parent, Qt::WindowFlags f) : QD PathCompleter* completer = new PathCompleter (m_model, fileListView, this); fileNameLineEdit->setCompleter (completer); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - closeOnAddToolButton->setChecked(settings.value("QMMPFileDialog/close_on_add", FALSE).toBool()); + closeOnAddToolButton->setChecked(settings.value("QMMPFileDialog/close_on_add", false).toBool()); restoreGeometry(settings.value("QMMPFileDialog/geometry").toByteArray()); m_history = settings.value("QMMPFileDialog/history").toStringList(); lookInComboBox->addItems(m_history); @@ -255,7 +255,7 @@ void QmmpFileDialogImpl::setModeAndMask(const QString& d,FileDialog::Mode m, con fileListView->clearSelection (); treeView->clearSelection (); fileTypeComboBox->clear(); - addPushButton->setEnabled(FALSE); + addPushButton->setEnabled(false); addPushButton->setText(tr("Add")); QString fileName; @@ -286,7 +286,7 @@ void QmmpFileDialogImpl::setModeAndMask(const QString& d,FileDialog::Mode m, con { m_model->setFilter(QDir::AllDirs | QDir::NoDotAndDotDot); //dirs only fileTypeComboBox->addItem(tr("Directories")); - fileTypeComboBox->setEnabled(FALSE); + fileTypeComboBox->setEnabled(false); } else { @@ -379,7 +379,7 @@ void QmmpFileDialogImpl::updateSelection () { if (QFileInfo(str).isDir()) { - addPushButton->setEnabled(FALSE); + addPushButton->setEnabled(false); break; } } @@ -390,7 +390,7 @@ void QmmpFileDialogImpl::updateSelection () else { fileNameLineEdit->clear(); - addPushButton->setEnabled(FALSE); + addPushButton->setEnabled(false); } } @@ -425,7 +425,7 @@ void QmmpFileDialogImpl::addFiles(const QStringList &list) { //check file extension QString f_name = fileNameLineEdit->text(); - bool contains = FALSE; + bool contains = false; foreach(QString str, qt_clean_filter_list(fileTypeComboBox->currentText())) { QRegExp regExp(str); diff --git a/src/plugins/General/covermanager/covermanagerfactory.cpp b/src/plugins/General/covermanager/covermanagerfactory.cpp index 041e797d0..722f37675 100644 --- a/src/plugins/General/covermanager/covermanagerfactory.cpp +++ b/src/plugins/General/covermanager/covermanagerfactory.cpp @@ -29,8 +29,8 @@ const GeneralProperties CoverManagerFactory::properties() const properties.name = tr("Cover Manager Plugin"); properties.shortName = "cover_manager"; properties.hasAbout = true; - properties.hasSettings = FALSE; - properties.visibilityControl = FALSE; + properties.hasSettings = false; + properties.visibilityControl = false; return properties; } diff --git a/src/plugins/General/fileops/fileops.cpp b/src/plugins/General/fileops/fileops.cpp index f9555592b..1cfe6e6d9 100644 --- a/src/plugins/General/fileops/fileops.cpp +++ b/src/plugins/General/fileops/fileops.cpp @@ -104,7 +104,7 @@ void FileOps::execAction(int n) progress.setWindowTitle(tr("Copying")); progress.setCancelButtonText(tr("Stop")); progress.show(); - progress.setAutoClose (FALSE); + progress.setAutoClose (false); int i = 0; foreach(PlayListItem *item, items) { diff --git a/src/plugins/General/fileops/fileopsfactory.cpp b/src/plugins/General/fileops/fileopsfactory.cpp index 13b126afa..9221ac7bd 100644 --- a/src/plugins/General/fileops/fileopsfactory.cpp +++ b/src/plugins/General/fileops/fileopsfactory.cpp @@ -31,7 +31,7 @@ const GeneralProperties FileOpsFactory::properties() const properties.shortName = "fileops"; properties.hasAbout = true; properties.hasSettings = true; - properties.visibilityControl = FALSE; + properties.visibilityControl = false; return properties; } 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(); } diff --git a/src/plugins/General/hotkey/hotkeyfactory.cpp b/src/plugins/General/hotkey/hotkeyfactory.cpp index 2add2eecb..01035e4a1 100644 --- a/src/plugins/General/hotkey/hotkeyfactory.cpp +++ b/src/plugins/General/hotkey/hotkeyfactory.cpp @@ -31,7 +31,7 @@ const GeneralProperties HotkeyFactory::properties() const properties.shortName = "hotkey"; properties.hasAbout = true; properties.hasSettings = true; - properties.visibilityControl = FALSE; + properties.visibilityControl = false; return properties; } diff --git a/src/plugins/General/hotkey/hotkeymanager.cpp b/src/plugins/General/hotkey/hotkeymanager.cpp index 23d93571e..c21431cea 100644 --- a/src/plugins/General/hotkey/hotkeymanager.cpp +++ b/src/plugins/General/hotkey/hotkeymanager.cpp @@ -193,7 +193,7 @@ long HotkeyManager::m_meta_mask = 0; long HotkeyManager::m_super_mask = 0; long HotkeyManager::m_hyper_mask = 0; long HotkeyManager::m_numlock_mask = 0; -bool HotkeyManager::m_haveMods = FALSE; +bool HotkeyManager::m_haveMods = false; //copied from globalshortcutmanager_x11.cpp by Justin Karneges and Michail Pishchagin (Psi project) void HotkeyManager::ensureModifiers() diff --git a/src/plugins/General/kdenotify/kdenotifyfactory.cpp b/src/plugins/General/kdenotify/kdenotifyfactory.cpp index ffeaffafe..59fca89b7 100644 --- a/src/plugins/General/kdenotify/kdenotifyfactory.cpp +++ b/src/plugins/General/kdenotify/kdenotifyfactory.cpp @@ -31,7 +31,7 @@ const GeneralProperties KdeNotifyFactory::properties() const properties.shortName = "kdenotify_icon"; properties.hasAbout = true; properties.hasSettings = true; - properties.visibilityControl = FALSE; + properties.visibilityControl = false; return properties; } diff --git a/src/plugins/General/lyrics/lyricsfactory.cpp b/src/plugins/General/lyrics/lyricsfactory.cpp index d8ba2e224..577484a32 100644 --- a/src/plugins/General/lyrics/lyricsfactory.cpp +++ b/src/plugins/General/lyrics/lyricsfactory.cpp @@ -29,8 +29,8 @@ const GeneralProperties LyricsFactory::properties() const properties.name = tr("Lyrics Plugin"); properties.shortName = "lyrics"; properties.hasAbout = true; - properties.hasSettings = FALSE; - properties.visibilityControl = FALSE; + properties.hasSettings = false; + properties.visibilityControl = false; return properties; } diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp index 70d385345..9dac146c2 100644 --- a/src/plugins/General/lyrics/lyricswindow.cpp +++ b/src/plugins/General/lyrics/lyricswindow.cpp @@ -33,7 +33,7 @@ LyricsWindow::LyricsWindow(const QString &artist, const QString &title, QWidget ui.setupUi(this); setWindowFlags(Qt::Dialog); setAttribute(Qt::WA_DeleteOnClose); - setAttribute(Qt::WA_QuitOnClose, FALSE); + setAttribute(Qt::WA_QuitOnClose, false); ui.artistLineEdit->setText(artist); ui.titleLineEdit->setText(title); m_http = new QNetworkAccessManager(this); diff --git a/src/plugins/General/mpris/mprisfactory.cpp b/src/plugins/General/mpris/mprisfactory.cpp index 1adc96458..059ea056c 100644 --- a/src/plugins/General/mpris/mprisfactory.cpp +++ b/src/plugins/General/mpris/mprisfactory.cpp @@ -29,8 +29,8 @@ const GeneralProperties MPRISFactory::properties() const properties.name = tr("MPRIS Plugin"); properties.shortName = "mpris"; properties.hasAbout = true; - properties.hasSettings = FALSE; - properties.visibilityControl = FALSE; + properties.hasSettings = false; + properties.visibilityControl = false; return properties; } diff --git a/src/plugins/General/notifier/notifier.cpp b/src/plugins/General/notifier/notifier.cpp index 80ac2d245..89bbad0e1 100644 --- a/src/plugins/General/notifier/notifier.cpp +++ b/src/plugins/General/notifier/notifier.cpp @@ -38,7 +38,7 @@ Notifier::Notifier(QObject *parent) settings.beginGroup("Notifier"); m_desktop = settings.value("song_notification", true).toBool(); m_showVolume = settings.value("volume_notification", true).toBool(); - m_psi = settings.value("psi_notification", FALSE).toBool(); + m_psi = settings.value("psi_notification", false).toBool(); settings.endGroup(); m_core = SoundCore::instance(); connect (m_core, SIGNAL(metaDataChanged ()), SLOT(showMetaData())); diff --git a/src/plugins/General/notifier/notifierfactory.cpp b/src/plugins/General/notifier/notifierfactory.cpp index 6efa8e802..a8259f16d 100644 --- a/src/plugins/General/notifier/notifierfactory.cpp +++ b/src/plugins/General/notifier/notifierfactory.cpp @@ -31,7 +31,7 @@ const GeneralProperties NotifierFactory::properties() const properties.shortName = "notifier"; properties.hasAbout = true; properties.hasSettings = true; - properties.visibilityControl = FALSE; + properties.visibilityControl = false; return properties; } diff --git a/src/plugins/General/notifier/popupwidget.cpp b/src/plugins/General/notifier/popupwidget.cpp index dfc860224..63049f3c5 100644 --- a/src/plugins/General/notifier/popupwidget.cpp +++ b/src/plugins/General/notifier/popupwidget.cpp @@ -40,7 +40,7 @@ PopupWidget::PopupWidget(QWidget *parent) setWindowFlags(Qt::X11BypassWindowManagerHint | Qt::WindowStaysOnTopHint | Qt::Dialog | Qt::FramelessWindowHint); setFrameStyle(QFrame::Box | QFrame::Plain); - setAttribute(Qt::WA_QuitOnClose, FALSE); + setAttribute(Qt::WA_QuitOnClose, false); QHBoxLayout *hlayout = new QHBoxLayout(this); //layout m_pixlabel = new QLabel(this); m_pixlabel->setPixmap(QPixmap(":/notifier_icon.png")); diff --git a/src/plugins/General/notifier/settingsdialog.cpp b/src/plugins/General/notifier/settingsdialog.cpp index 7bcf253cb..98ad8d218 100644 --- a/src/plugins/General/notifier/settingsdialog.cpp +++ b/src/plugins/General/notifier/settingsdialog.cpp @@ -45,7 +45,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.messageDelaySpinBox->setValue(settings.value("message_delay", 2000).toInt()); uint pos = settings.value("message_pos", PopupWidget::BOTTOMLEFT).toUInt(); m_buttons.value(pos)->setChecked(true); - ui.psiCheckBox->setChecked(settings.value("psi_notification", FALSE).toBool()); + ui.psiCheckBox->setChecked(settings.value("psi_notification", false).toBool()); ui.songCheckBox->setChecked(settings.value("song_notification", true).toBool()); ui.volumeCheckBox->setChecked(settings.value("volume_notification", true).toBool()); ui.transparencySlider->setValue(100 - settings.value("opacity", 1.0).toDouble()*100); 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(); diff --git a/src/plugins/General/statusicon/settingsdialog.cpp b/src/plugins/General/statusicon/settingsdialog.cpp index 7ee4a5add..1d2843376 100644 --- a/src/plugins/General/statusicon/settingsdialog.cpp +++ b/src/plugins/General/statusicon/settingsdialog.cpp @@ -37,7 +37,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.transparencySlider->setValue(settings.value("tooltip_transparency",0).toInt()); ui.coverSizeSlider->setValue(settings.value("tooltip_cover_size", 100).toInt()); ui.niceTooltipSplitCheckBox->setChecked(settings.value("split_file_name",true).toBool()); - ui.standardIconsCheckBox->setChecked(settings.value("use_standard_icons",FALSE).toBool()); + ui.standardIconsCheckBox->setChecked(settings.value("use_standard_icons",false).toBool()); ui.progressCheckBox->setChecked(settings.value("tooltip_progress",true).toBool()); m_template = settings.value("tooltip_template", DEFAULT_TEMPLATE).toString(); settings.endGroup(); diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp index fb4fb2ed1..78302ecd1 100644 --- a/src/plugins/General/statusicon/statusicon.cpp +++ b/src/plugins/General/statusicon/statusicon.cpp @@ -46,8 +46,8 @@ StatusIcon::StatusIcon(QObject *parent) settings.beginGroup("Tray"); m_showMessage = settings.value("show_message",true).toBool(); m_messageDelay = settings.value("message_delay", 2000).toInt(); - m_hideToTray = settings.value("hide_on_close", FALSE).toBool(); - m_useStandardIcons = settings.value("use_standard_icons",FALSE).toBool(); + m_hideToTray = settings.value("hide_on_close", false).toBool(); + m_useStandardIcons = settings.value("use_standard_icons",false).toBool(); m_tray->showNiceToolTip(settings.value("show_nicetooltip",true).toBool()); if(m_useStandardIcons) m_tray->setIcon(QApplication::style ()->standardIcon(QStyle::SP_MediaStop)); diff --git a/src/plugins/General/statusicon/statusiconpopupwidget.cpp b/src/plugins/General/statusicon/statusiconpopupwidget.cpp index 51811c984..e1ed9cdba 100644 --- a/src/plugins/General/statusicon/statusiconpopupwidget.cpp +++ b/src/plugins/General/statusicon/statusiconpopupwidget.cpp @@ -44,7 +44,7 @@ StatusIconPopupWidget::StatusIconPopupWidget(QWidget * parent) setWindowFlags(Qt::X11BypassWindowManagerHint | Qt::WindowStaysOnTopHint | Qt::Dialog | Qt::FramelessWindowHint); setFrameStyle(QFrame::NoFrame | QFrame::Plain); - setAttribute(Qt::WA_QuitOnClose, FALSE); + setAttribute(Qt::WA_QuitOnClose, false); m_hLayout = new QHBoxLayout(); m_vLayout = new QVBoxLayout(); diff --git a/src/plugins/Input/aac/aacfile.cpp b/src/plugins/Input/aac/aacfile.cpp index 032945d26..6d1a67f48 100644 --- a/src/plugins/Input/aac/aacfile.cpp +++ b/src/plugins/Input/aac/aacfile.cpp @@ -33,7 +33,7 @@ static int adts_sample_rates[] = {96000,88200,64000,48000,44100,32000,24000,2205 AACFile::AACFile(QIODevice *i, bool metaData) { - m_isValid = FALSE; + m_isValid = false; m_length = 0; m_bitrate = 0; m_samplerate = 0; diff --git a/src/plugins/Input/aac/decoder_aac.cpp b/src/plugins/Input/aac/decoder_aac.cpp index 1b5fe510a..f78a54576 100644 --- a/src/plugins/Input/aac/decoder_aac.cpp +++ b/src/plugins/Input/aac/decoder_aac.cpp @@ -68,7 +68,7 @@ bool DecoderAAC::initialize() if (!input()) { qWarning("DecoderAAC: cannot initialize. No input."); - return FALSE; + return false; } if (!m_input_buf) m_input_buf = new char[AAC_BUFFER_SIZE]; @@ -79,14 +79,14 @@ bool DecoderAAC::initialize() if (!input()->open(QIODevice::ReadOnly)) { qWarning("DecoderAAC: %s", qPrintable(input()->errorString ())); - return FALSE; + return false; } } AACFile aac_file(input()); if (!aac_file.isValid()) { qWarning("DecoderAAC: unsupported AAC file"); - return FALSE; + return false; } m_totalTime = aac_file.length() * 1000; m_bitrate = aac_file.bitrate(); @@ -132,12 +132,12 @@ bool DecoderAAC::initialize() if (res < 0) { qWarning("DecoderAAC: NeAACDecInit() failed"); - return FALSE; + return false; } if (!freq || !chan) { qWarning("DecoderAAC: invalid sound parameters"); - return FALSE; + return false; } memmove(m_input_buf, m_input_buf + res, m_input_at - res); @@ -152,7 +152,7 @@ qint64 DecoderAAC::read(char *audio, qint64 maxSize) NeAACDecFrameInfo frame_info; qint64 size = 0, to_read, read; void *out = 0; - bool eof = FALSE; + bool eof = false; while (size <= 0 && !eof) { diff --git a/src/plugins/Input/aac/decoderaacfactory.cpp b/src/plugins/Input/aac/decoderaacfactory.cpp index 72307450c..bce1e2f51 100644 --- a/src/plugins/Input/aac/decoderaacfactory.cpp +++ b/src/plugins/Input/aac/decoderaacfactory.cpp @@ -36,7 +36,7 @@ bool DecoderAACFactory::supports(const QString &source) const bool DecoderAACFactory::canDecode(QIODevice *) const { - return FALSE; + return false; } const DecoderProperties DecoderAACFactory::properties() const @@ -48,7 +48,7 @@ const DecoderProperties DecoderAACFactory::properties() const //properties.contentType = ; properties.shortName = "aac"; properties.hasAbout = true; - properties.hasSettings = FALSE; + properties.hasSettings = false; return properties; } 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()); diff --git a/src/plugins/Input/cue/cueparser.cpp b/src/plugins/Input/cue/cueparser.cpp index 313c7f6fe..c21276229 100644 --- a/src/plugins/Input/cue/cueparser.cpp +++ b/src/plugins/Input/cue/cueparser.cpp @@ -46,7 +46,7 @@ CUEParser::CUEParser(const QString &fileName) codec = QTextCodec::codecForName("UTF-8"); #ifdef WITH_ENCA EncaAnalyser analyser = 0; - if(settings.value("use_enca", FALSE).toBool()) + if(settings.value("use_enca", false).toBool()) { analyser = enca_analyser_alloc(settings.value("enca_lang").toByteArray ().constData()); if(analyser) @@ -68,7 +68,7 @@ CUEParser::CUEParser(const QString &fileName) //qDebug("CUEParser: using %s encoding", codec->name().constData()); textStream.setCodec(codec); QString album, genre, date, comment, artist, file_path; - bool new_file = FALSE; + bool new_file = false; while (!textStream.atEnd()) { @@ -81,7 +81,7 @@ CUEParser::CUEParser(const QString &fileName) { if(!m_infoList.isEmpty()) { - QList <FileInfo *> f_list = MetaDataManager::instance()->createPlayList(file_path, FALSE); + QList <FileInfo *> f_list = MetaDataManager::instance()->createPlayList(file_path, false); qint64 l = f_list.isEmpty() ? 0 : f_list.at(0)->length() * 1000; if (l > m_offsets.last()) m_infoList.last().setLength(l - m_offsets.last()); @@ -131,7 +131,7 @@ CUEParser::CUEParser(const QString &fileName) int c = m_infoList.count(); if(c > 1 && !new_file) m_infoList[c - 2].setLength(m_offsets[c - 1] - m_offsets[c - 2]); - new_file = FALSE; + new_file = false; } else if (words[0] == "REM") { @@ -156,7 +156,7 @@ CUEParser::CUEParser(const QString &fileName) return; } //calculate last item length - QList <FileInfo *> f_list = MetaDataManager::instance()->createPlayList(file_path, FALSE); + QList <FileInfo *> f_list = MetaDataManager::instance()->createPlayList(file_path, false); qint64 l = f_list.isEmpty() ? 0 : f_list.at(0)->length() * 1000; if (l > m_offsets.last()) m_infoList.last().setLength(l - m_offsets.last()); diff --git a/src/plugins/Input/cue/decoder_cue.cpp b/src/plugins/Input/cue/decoder_cue.cpp index abaedaf66..d996329a6 100644 --- a/src/plugins/Input/cue/decoder_cue.cpp +++ b/src/plugins/Input/cue/decoder_cue.cpp @@ -69,20 +69,20 @@ bool DecoderCUE::initialize() if (m_parser->count() == 0) { qWarning("DecoderCUE: invalid cue file"); - return FALSE; + return false; } m_track = m_path.section("#", -1).toInt(); m_path = m_parser->filePath(m_track); if (!QFile::exists(m_path)) { qWarning("DecoderCUE: file \"%s\" doesn't exist", qPrintable(m_path)); - return FALSE; + return false; } DecoderFactory *df = Decoder::findByPath(m_path); if (!df) { qWarning("DecoderCUE: unsupported file format"); - return FALSE; + return false; } m_length = m_parser->length(m_track); m_offset = m_parser->offset(m_track); @@ -92,14 +92,14 @@ bool DecoderCUE::initialize() if(!m_input->open(QIODevice::ReadOnly)) { qWarning("DecoderCUE: error: %s", qPrintable(m_input->errorString())); - return FALSE; + return false; } } m_decoder = df->create(m_path, m_input); if(!m_decoder->initialize()) { qWarning("DecoderCUE: invalid audio file"); - return FALSE; + return false; } m_decoder->seek(m_offset); diff --git a/src/plugins/Input/cue/decodercuefactory.cpp b/src/plugins/Input/cue/decodercuefactory.cpp index fe259c307..9a36cc948 100644 --- a/src/plugins/Input/cue/decodercuefactory.cpp +++ b/src/plugins/Input/cue/decodercuefactory.cpp @@ -35,7 +35,7 @@ bool DecoderCUEFactory::supports(const QString &source) const bool DecoderCUEFactory::canDecode(QIODevice *) const { - return FALSE; + return false; } const DecoderProperties DecoderCUEFactory::properties() const diff --git a/src/plugins/Input/cue/settingsdialog.cpp b/src/plugins/Input/cue/settingsdialog.cpp index aa2d73a93..4ed9cfb5f 100644 --- a/src/plugins/Input/cue/settingsdialog.cpp +++ b/src/plugins/Input/cue/settingsdialog.cpp @@ -47,11 +47,11 @@ SettingsDialog::SettingsDialog(QWidget *parent) int pos = ui.cueEncComboBox->findText(settings.value("encoding","ISO-8859-1").toString()); ui.cueEncComboBox->setCurrentIndex(pos); #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/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index 97dffb244..1d8c9476f 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -68,7 +68,7 @@ DecoderFFmpeg::DecoderFFmpeg(const QString &path, QIODevice *i) : Decoder(i) { m_bitrate = 0; - m_skip = FALSE; + m_skip = false; m_totalTime = 0; ic = 0; m_path = path; @@ -98,7 +98,7 @@ DecoderFFmpeg::~DecoderFFmpeg() bool DecoderFFmpeg::initialize() { m_bitrate = 0; - m_skip = FALSE; + m_skip = false; m_totalTime = 0; m_seekTime = -1; av_register_all(); @@ -109,12 +109,12 @@ bool DecoderFFmpeg::initialize() pd.buf_size = input()->peek((char*)buf, sizeof(buf) - AVPROBE_PADDING_SIZE); pd.buf = buf; if(pd.buf_size < 8192) - return FALSE; + return false; AVInputFormat *fmt = av_probe_input_format(&pd, 1); if(!fmt) { qWarning("DecoderFFmpeg: usupported format"); - return FALSE; + return false; } qDebug("DecoderFFmpeg: detected format: %s", fmt->long_name); @@ -132,7 +132,7 @@ bool DecoderFFmpeg::initialize() fmt, &ap) != 0) { qDebug("DecoderFFmpeg: av_open_input_stream() failed"); - return FALSE; + return false; } AVCodec *codec; @@ -160,13 +160,13 @@ bool DecoderFFmpeg::initialize() if (!codec) { qWarning("DecoderFFmpeg: unsupported codec for output stream"); - return FALSE; + return false; } if (avcodec_open(c, codec) < 0) { qWarning("DecoderFFmpeg: error while opening codec for output stream"); - return FALSE; + return false; } m_totalTime = input()->isSequential() ? 0 : ic->duration * 1000 / AV_TIME_BASE; @@ -197,7 +197,7 @@ qint64 DecoderFFmpeg::read(char *audio, qint64 maxSize) while(m_temp_pkt.size) ffmpeg_decode(m_output_buf); m_output_at = 0; - m_skip = FALSE; + m_skip = false; } if(!m_output_at) fillBuffer(); diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index 89fb95c88..43477702b 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -61,7 +61,7 @@ bool DecoderFFmpegFactory::supports(const QString &source) const if (regexp.exactMatch(source)) return true; } - return FALSE; + return false; } bool DecoderFFmpegFactory::canDecode(QIODevice *i) const @@ -82,18 +82,18 @@ bool DecoderFFmpegFactory::canDecode(QIODevice *i) const pd.buf_size = i->peek((char*)buf, sizeof(buf) - AVPROBE_PADDING_SIZE); pd.buf = buf; if(pd.buf_size < 8192) - return FALSE; + return false; AVInputFormat *fmt = av_probe_input_format(&pd, 1); if(!fmt) { qWarning("DecoderFFmpegFactory: usupported format"); - return FALSE; + return false; } if(filters.contains("*.mp3") && !memcmp(fmt->name, "mp3", 3)) return true; if(filters.contains("*.aac") && !memcmp(fmt->name, "aac", 3)) return true; - return FALSE; + return false; } const DecoderProperties DecoderFFmpegFactory::properties() const @@ -122,7 +122,7 @@ const DecoderProperties DecoderFFmpegFactory::properties() const properties.shortName = "ffmpeg"; properties.hasAbout = true; properties.hasSettings = true; - properties.noInput = FALSE; + properties.noInput = false; return properties; } diff --git a/src/plugins/Input/ffmpeg/settingsdialog.cpp b/src/plugins/Input/ffmpeg/settingsdialog.cpp index 230dbb295..5044f789e 100644 --- a/src/plugins/Input/ffmpeg/settingsdialog.cpp +++ b/src/plugins/Input/ffmpeg/settingsdialog.cpp @@ -66,8 +66,8 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.apeCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_APE)); ui.apeCheckBox->setChecked(filters.contains("*.ape") && avcodec_find_decoder(CODEC_ID_APE)); #else - ui.apeCheckBox->setChecked(FALSE); - ui.apeCheckBox->setEnabled(FALSE); + ui.apeCheckBox->setChecked(false); + ui.apeCheckBox->setEnabled(false); #endif ui.ttaCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_TTA)); ui.ttaCheckBox->setChecked(filters.contains("*.tta") && avcodec_find_decoder(CODEC_ID_TTA)); diff --git a/src/plugins/Input/flac/cueparser.cpp b/src/plugins/Input/flac/cueparser.cpp index 16682dd25..16f10017d 100644 --- a/src/plugins/Input/flac/cueparser.cpp +++ b/src/plugins/Input/flac/cueparser.cpp @@ -94,7 +94,7 @@ CUEParser::CUEParser(const QByteArray &array, const QString &fileName) return; } //calculate last item length - QList <FileInfo *> f_list = MetaDataManager::instance()->createPlayList(m_filePath, FALSE); + QList <FileInfo *> f_list = MetaDataManager::instance()->createPlayList(m_filePath, false); qint64 l = f_list.isEmpty() ? 0 : f_list.at(0)->length() * 1000; if (l > m_offsets.last()) m_infoList.last().setLength(l - m_offsets.last()); diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp index b4212b19c..a7335b782 100644 --- a/src/plugins/Input/flac/decoder_flac.cpp +++ b/src/plugins/Input/flac/decoder_flac.cpp @@ -222,7 +222,7 @@ static void flac_callback_metadata (const FLAC__StreamDecoder *, static FLAC__bool flac_callback_eof (const FLAC__StreamDecoder *, void *) { - return FALSE; + return false; } static void flac_callback_error (const FLAC__StreamDecoder *, @@ -277,7 +277,7 @@ bool DecoderFLAC::initialize() if (!p.endsWith(".flac")) { qWarning("DecoderFLAC: invalid url."); - return FALSE; + return false; } p.replace(QString(QUrl::toPercentEncoding("#")), "#"); p.replace(QString(QUrl::toPercentEncoding("?")), "?"); @@ -295,7 +295,7 @@ bool DecoderFLAC::initialize() if(m_track > m_parser->count()) { qWarning("DecoderFLAC: invalid cuesheet xiph comment"); - return FALSE; + return false; } data()->input = new QFile(p); data()->input->open(QIODevice::ReadOnly); @@ -307,20 +307,20 @@ bool DecoderFLAC::initialize() else { qWarning("DecoderFLAC: unable to find cuesheet comment."); - return FALSE; + return false; } } else { qWarning("DecoderFLAC: cannot initialize. No input."); - return FALSE; + return false; } } if (!data()->input->isOpen()) { qWarning("DecoderFLAC: unable to open input file"); - return FALSE; + return false; } m_data->bitrate = -1; @@ -349,7 +349,7 @@ bool DecoderFLAC::initialize() if(!FLAC_API_SUPPORTS_OGG_FLAC) { qWarning("DecoderFLAC: unsupported format"); - return FALSE; + return false; } if (FLAC__stream_decoder_init_ogg_stream( m_data->decoder, @@ -364,7 +364,7 @@ bool DecoderFLAC::initialize() this) != FLAC__STREAM_DECODER_INIT_STATUS_OK) { data()->ok = 0; - return FALSE; + return false; } } else if (!memcmp(buf, "fLaC", 4)) @@ -382,20 +382,20 @@ bool DecoderFLAC::initialize() this) != FLAC__STREAM_DECODER_INIT_STATUS_OK) { data()->ok = 0; - return FALSE; + return false; } } else { qWarning("DecoderFLAC: unsupported format"); - return FALSE; + return false; } if (!FLAC__stream_decoder_process_until_end_of_metadata( data()->decoder)) { data()->ok = 0; - return FALSE; + return false; } switch(data()->bits_per_sample) { @@ -410,7 +410,7 @@ bool DecoderFLAC::initialize() configure(data()->sample_rate, data()->channels, Qmmp::PCM_S32LE); break; default: - return FALSE; + return false; } if(!m_path.contains("://")) { diff --git a/src/plugins/Input/flac/decoderflacfactory.cpp b/src/plugins/Input/flac/decoderflacfactory.cpp index f60445219..1fb0cbc54 100644 --- a/src/plugins/Input/flac/decoderflacfactory.cpp +++ b/src/plugins/Input/flac/decoderflacfactory.cpp @@ -42,7 +42,7 @@ bool DecoderFLACFactory::supports(const QString &source) const bool DecoderFLACFactory::canDecode(QIODevice *input) const { Q_UNUSED(input); - return FALSE; + return false; } const DecoderProperties DecoderFLACFactory::properties() const @@ -55,7 +55,7 @@ const DecoderProperties DecoderFLACFactory::properties() const properties.shortName = "flac"; properties.protocols = "flac"; properties.hasAbout = true; - properties.hasSettings = FALSE; + properties.hasSettings = false; return properties; } diff --git a/src/plugins/Input/mad/decoder_mad.cpp b/src/plugins/Input/mad/decoder_mad.cpp index d36239911..42f7873ae 100644 --- a/src/plugins/Input/mad/decoder_mad.cpp +++ b/src/plugins/Input/mad/decoder_mad.cpp @@ -60,7 +60,7 @@ bool DecoderMAD::initialize() if (!input()) { qWarning("DecoderMAD: cannot initialize. No input."); - return FALSE; + return false; } if (!m_input_buf) @@ -71,7 +71,7 @@ bool DecoderMAD::initialize() if (!input()->open(QIODevice::ReadOnly)) { qWarning("DecoderMAD: %s", qPrintable(input()->errorString ())); - return FALSE; + return false; } } @@ -89,7 +89,7 @@ bool DecoderMAD::initialize() if (!findHeader()) { qDebug("DecoderMAD: Can't find a valid MPEG header."); - return FALSE; + return false; } mad_stream_buffer(&stream, (unsigned char *) m_input_buf, m_input_bytes); stream.error = MAD_ERROR_BUFLEN; @@ -111,7 +111,7 @@ void DecoderMAD::deinit() mad_frame_finish(&frame); mad_stream_finish(&stream); - m_inited = FALSE; + m_inited = false; m_totalTime = 0; m_channels = 0; m_bitrate = 0; @@ -184,10 +184,10 @@ fail: bool DecoderMAD::findHeader() { - bool result = FALSE; + bool result = false; int count = 0; - bool has_xing = FALSE; - bool is_vbr = FALSE; + bool has_xing = false; + bool is_vbr = false; mad_timer_t duration = mad_timer_zero; struct mad_header header; mad_header_init (&header); @@ -277,7 +277,7 @@ bool DecoderMAD::findHeader() } if (!result) - return FALSE; + return false; if (!is_vbr && !input()->isSequential()) { @@ -385,12 +385,12 @@ bool DecoderMAD::fillBuffer() if (!len) { qDebug("DecoderMAD: end of file"); - return FALSE; + return false; } else if(len < 0) { qWarning("DecoderMAD: error"); - return FALSE; + return false; } m_input_bytes += len; mad_stream_buffer(&stream, (unsigned char *) m_input_buf, m_input_bytes); diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp index e58a80ff5..3e38cb4b0 100644 --- a/src/plugins/Input/mad/decodermadfactory.cpp +++ b/src/plugins/Input/mad/decodermadfactory.cpp @@ -55,7 +55,7 @@ bool DecoderMADFactory::supports(const QString &source) const return true; } } - return FALSE; + return false; } bool DecoderMADFactory::canDecode(QIODevice *input) const @@ -76,9 +76,9 @@ bool DecoderMADFactory::canDecode(QIODevice *input) const while ((dec_res = mad_header_decode(&header, &stream)) == -1 && MAD_RECOVERABLE(stream.error)) ; - return dec_res != -1 ? true: FALSE; + return dec_res != -1 ? true: false; } - return FALSE; + return false; } const DecoderProperties DecoderMADFactory::properties() const diff --git a/src/plugins/Input/mad/mpegmetadatamodel.cpp b/src/plugins/Input/mad/mpegmetadatamodel.cpp index b8dc260ee..32eef53e4 100644 --- a/src/plugins/Input/mad/mpegmetadatamodel.cpp +++ b/src/plugins/Input/mad/mpegmetadatamodel.cpp @@ -338,7 +338,7 @@ void MpegFileTagModel::remove() void MpegFileTagModel::save() { if(m_tag) - m_file->save(m_tagType, FALSE); + m_file->save(m_tagType, false); else m_file->strip(m_tagType); } diff --git a/src/plugins/Input/mad/tagextractor.cpp b/src/plugins/Input/mad/tagextractor.cpp index b771560b3..ee433a53f 100644 --- a/src/plugins/Input/mad/tagextractor.cpp +++ b/src/plugins/Input/mad/tagextractor.cpp @@ -58,7 +58,7 @@ const QMap<Qmmp::MetaData, QString> TagExtractor::id3v2tag() QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("MAD"); QByteArray name = settings.value("ID3v2_encoding","UTF-8").toByteArray (); - bool utf = FALSE; + bool utf = false; QTextCodec *codec = 0; if (name.contains("UTF")) { diff --git a/src/plugins/Input/modplug/decoder_modplug.cpp b/src/plugins/Input/modplug/decoder_modplug.cpp index 99e9ba127..fe92d90f4 100644 --- a/src/plugins/Input/modplug/decoder_modplug.cpp +++ b/src/plugins/Input/modplug/decoder_modplug.cpp @@ -79,7 +79,7 @@ bool DecoderModPlug::initialize() if (!file.open(QIODevice::ReadOnly)) { qWarning("DecoderModPlug: error: %s", qPrintable(file.errorString ())); - return FALSE; + return false; } m_input_buf = file.readAll(); file.close(); @@ -87,7 +87,7 @@ bool DecoderModPlug::initialize() if (m_input_buf.isEmpty()) { qWarning("DecoderModPlug: error reading moplug file"); - return FALSE; + return false; } m_soundFile = new CSoundFile(); readSettings(); @@ -189,13 +189,13 @@ void DecoderModPlug::readSettings() ( settings.value("Surround", true).toBool(), true, - settings.value("Reverb", FALSE).toBool(), + settings.value("Reverb", false).toBool(), true, - settings.value("Megabass", FALSE).toBool(), - settings.value("NoiseReduction", FALSE).toBool(), - FALSE + settings.value("Megabass", false).toBool(), + settings.value("NoiseReduction", false).toBool(), + false ); - if (settings.value("Reverb", FALSE).toBool()) + if (settings.value("Reverb", false).toBool()) { CSoundFile::SetReverbParameters ( @@ -203,7 +203,7 @@ void DecoderModPlug::readSettings() settings.value("ReverbDelay", 100).toInt() ); } - if (settings.value("Megabass", FALSE).toBool()) + if (settings.value("Megabass", false).toBool()) { CSoundFile::SetXBassParameters ( @@ -227,7 +227,7 @@ void DecoderModPlug::readSettings() /* settings.value("GrabAmigaMOD", true).toBool());*/ //preamp - m_usePreamp = settings.value("PreAmp", FALSE).toBool(); + m_usePreamp = settings.value("PreAmp", false).toBool(); m_preampFactor = exp(settings.value("PreAmpLevel", 0.0f).toDouble()); settings.endGroup(); } diff --git a/src/plugins/Input/modplug/decodermodplugfactory.cpp b/src/plugins/Input/modplug/decodermodplugfactory.cpp index 1343898ff..bc80f549d 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.cpp +++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp @@ -46,12 +46,12 @@ bool DecoderModPlugFactory::supports(const QString &source) const << ".xm" << ".mtm" << ".psm" << ".ft2"; if (lExtList.contains(lExt)) return true; - return FALSE; + return false; } bool DecoderModPlugFactory::canDecode(QIODevice *) const { - return FALSE; + return false; } const DecoderProperties DecoderModPlugFactory::properties() const @@ -81,7 +81,7 @@ QList<FileInfo *> DecoderModPlugFactory::createPlayList(const QString &fileName, { QList <FileInfo*> list; QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - if (!useMetaData || settings.value("UseFileName", FALSE).toBool()) + if (!useMetaData || settings.value("UseFileName", false).toBool()) { list << new FileInfo(fileName); list.at(0)->setMetaData(Qmmp::TITLE, fileName.section('/',-1)); diff --git a/src/plugins/Input/modplug/settingsdialog.cpp b/src/plugins/Input/modplug/settingsdialog.cpp index 6d33f5d7b..d38d4e8a7 100644 --- a/src/plugins/Input/modplug/settingsdialog.cpp +++ b/src/plugins/Input/modplug/settingsdialog.cpp @@ -37,8 +37,8 @@ SettingsDialog::SettingsDialog(QWidget *parent) QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("ModPlug"); //general - ui.noiseCheckBox->setChecked(settings.value("NoiseReduction", FALSE).toBool()); - ui.fileNameCheckBox->setChecked(settings.value("UseFileName", FALSE).toBool()); + ui.noiseCheckBox->setChecked(settings.value("NoiseReduction", false).toBool()); + ui.fileNameCheckBox->setChecked(settings.value("UseFileName", false).toBool()); ui.amigaCheckBox->setChecked(settings.value("GrabAmigaMOD", true).toBool()); //settings.value("Oversampling", true).toBool(); //settings.value("VolumeRamp", true).toBool(); @@ -74,7 +74,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) else ui.resampPolyphaseRadioButton->setChecked(true); //reverberation - ui.reverbGroupBox->setChecked(settings.value("Reverb", FALSE).toBool()); + ui.reverbGroupBox->setChecked(settings.value("Reverb", false).toBool()); ui.reverbDepthSlider->setValue(settings.value("ReverbDepth", 30).toInt()); ui.reverbDelaySlider->setValue(settings.value("ReverbDelay", 100).toInt()); //surround @@ -82,11 +82,11 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.surDepthSlider->setValue(settings.value("SurroundDepth", 20).toInt()); ui.surDelaySlider->setValue(settings.value("SurroundDelay", 20).toInt()); //bass - ui.bassGroupBox->setChecked(settings.value("Megabass", FALSE).toBool()); + ui.bassGroupBox->setChecked(settings.value("Megabass", false).toBool()); ui.bassAmountSlider->setValue(settings.value("BassAmount", 40).toInt()); ui.bassRangeSlider->setValue(settings.value("BassRange", 30).toInt()); //preamp - ui.preampGroupBox->setChecked(settings.value("PreAmp", FALSE).toBool()); + ui.preampGroupBox->setChecked(settings.value("PreAmp", false).toBool()); connect(ui.preampSlider, SIGNAL(valueChanged(int)), SLOT(setPreamp(int))); ui.preampSlider->setValue(int(settings.value("PreAmpLevel", 0.0f).toDouble()*10)); //looping diff --git a/src/plugins/Input/mpc/decoder_mpc.cpp b/src/plugins/Input/mpc/decoder_mpc.cpp index 763a5b477..93751a51f 100644 --- a/src/plugins/Input/mpc/decoder_mpc.cpp +++ b/src/plugins/Input/mpc/decoder_mpc.cpp @@ -153,7 +153,7 @@ bool DecoderMPC::initialize() if (!input()) { qWarning("DecoderMPC: cannot initialize. No input."); - return FALSE; + return false; } if (!input()->isOpen()) @@ -161,7 +161,7 @@ bool DecoderMPC::initialize() if (!input()->open(QIODevice::ReadOnly)) { qWarning("DecoderMPC: unable to open input."); - return FALSE; + return false; } } if (!m_data) @@ -180,12 +180,12 @@ bool DecoderMPC::initialize() #ifdef MPC_OLD_API mpc_streaminfo_init (&m_data->info); if (mpc_streaminfo_read (&m_data->info, &m_data->reader) != ERROR_CODE_OK) - return FALSE; + return false; #else m_data->demuxer = mpc_demux_init (&m_data->reader); if (!m_data->demuxer) - return FALSE; + return false; mpc_demux_get_info (m_data->demuxer, &m_data->info); #endif @@ -199,7 +199,7 @@ bool DecoderMPC::initialize() if (!mpc_decoder_initialize (&data()->decoder, &data()->info)) { qWarning("DecoderMPC: cannot get info."); - return FALSE; + return false; } rg_info[Qmmp::REPLAYGAIN_ALBUM_GAIN] = data()->info.gain_album/100.0; rg_info[Qmmp::REPLAYGAIN_TRACK_GAIN] = data()->info.gain_title/100.0; diff --git a/src/plugins/Input/mpc/decodermpcfactory.cpp b/src/plugins/Input/mpc/decodermpcfactory.cpp index d862b2de6..43366bc89 100644 --- a/src/plugins/Input/mpc/decodermpcfactory.cpp +++ b/src/plugins/Input/mpc/decodermpcfactory.cpp @@ -38,7 +38,7 @@ bool DecoderMPCFactory::supports(const QString &source) const bool DecoderMPCFactory::canDecode(QIODevice *) const { - return FALSE; + return false; } const DecoderProperties DecoderMPCFactory::properties() const @@ -50,7 +50,7 @@ const DecoderProperties DecoderMPCFactory::properties() const //properties.contentType = ; properties.shortName = "mpc"; properties.hasAbout = true; - properties.hasSettings = FALSE; + properties.hasSettings = false; return properties; } diff --git a/src/plugins/Input/sndfile/decoder_sndfile.cpp b/src/plugins/Input/sndfile/decoder_sndfile.cpp index abcc65d78..9195a8469 100644 --- a/src/plugins/Input/sndfile/decoder_sndfile.cpp +++ b/src/plugins/Input/sndfile/decoder_sndfile.cpp @@ -57,7 +57,7 @@ bool DecoderSndFile::initialize() if (!m_sndfile) { qWarning("DecoderSndFile: failed to open: %s", qPrintable(m_path)); - return FALSE; + return false; } m_freq = snd_info.samplerate; diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.cpp b/src/plugins/Input/sndfile/decodersndfilefactory.cpp index 82075e124..5ffbb8ddb 100644 --- a/src/plugins/Input/sndfile/decodersndfilefactory.cpp +++ b/src/plugins/Input/sndfile/decodersndfilefactory.cpp @@ -47,17 +47,17 @@ bool DecoderSndFileFactory::supports(const QString &source) const SF_INFO snd_info; SNDFILE *sndfile = sf_open(source.toLocal8Bit(), SFM_READ, &snd_info); if (!sndfile) - return FALSE; + return false; sf_close (sndfile); sndfile = 0; return true; } - return FALSE; + return false; } bool DecoderSndFileFactory::canDecode(QIODevice *) const { - return FALSE; + return false; } const DecoderProperties DecoderSndFileFactory::properties() const @@ -69,7 +69,7 @@ const DecoderProperties DecoderSndFileFactory::properties() const //properties.contentType = ""; properties.shortName = "sndfile"; properties.hasAbout = true; - properties.hasSettings = FALSE; + properties.hasSettings = false; properties.noInput = true; properties.protocols = "file"; return properties; diff --git a/src/plugins/Input/vorbis/decoder_vorbis.cpp b/src/plugins/Input/vorbis/decoder_vorbis.cpp index 59fefb79f..7c87822e3 100644 --- a/src/plugins/Input/vorbis/decoder_vorbis.cpp +++ b/src/plugins/Input/vorbis/decoder_vorbis.cpp @@ -72,7 +72,7 @@ static long oggtell(void *src) DecoderVorbis::DecoderVorbis(const QString &url, QIODevice *i) : Decoder(i) { - inited = FALSE; + inited = false; m_totalTime = 0; m_section = 0; m_last_section = -1; @@ -89,12 +89,12 @@ DecoderVorbis::~DecoderVorbis() bool DecoderVorbis::initialize() { qDebug("DecoderVorbis: initialize"); - inited = FALSE; + inited = false; m_totalTime = 0; if (!input()) { qDebug("DecoderVorbis: cannot initialize. No input"); - return FALSE; + return false; } if (!input()->isOpen()) @@ -103,7 +103,7 @@ bool DecoderVorbis::initialize() { qWarning("%s",qPrintable("DecoderVorbis: failed to open input. " + input()->errorString () + ".")); - return FALSE; + return false; } } @@ -118,7 +118,7 @@ bool DecoderVorbis::initialize() { qWarning("DecoderVorbis: cannot open stream"); - return FALSE; + return false; } quint32 freq = 0; diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp index a2b8d3474..12ed9ba0a 100644 --- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp +++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp @@ -41,7 +41,7 @@ bool DecoderVorbisFactory::canDecode(QIODevice *input) const && !memcmp(buf + 29, "vorbis", 6)) return true; - return FALSE; + return false; } const DecoderProperties DecoderVorbisFactory::properties() const @@ -53,8 +53,8 @@ const DecoderProperties DecoderVorbisFactory::properties() const properties.description = tr("Ogg Vorbis Files"); properties.contentType = "application/ogg;audio/x-vorbis+ogg"; properties.hasAbout = true; - properties.hasSettings = FALSE; - properties.noInput = FALSE; + properties.hasSettings = false; + properties.noInput = false; return properties; } diff --git a/src/plugins/Input/wavpack/cueparser.cpp b/src/plugins/Input/wavpack/cueparser.cpp index 00ce3d688..fcf415e82 100644 --- a/src/plugins/Input/wavpack/cueparser.cpp +++ b/src/plugins/Input/wavpack/cueparser.cpp @@ -94,7 +94,7 @@ CUEParser::CUEParser(const QByteArray &array, const QString &fileName) return; } //calculate last item length - QList <FileInfo *> f_list = MetaDataManager::instance()->createPlayList(m_filePath, FALSE); + QList <FileInfo *> f_list = MetaDataManager::instance()->createPlayList(m_filePath, false); qint64 l = f_list.isEmpty() ? 0 : f_list.at(0)->length() * 1000; if (l > m_offsets.last()) m_infoList.last().setLength(l - m_offsets.last()); diff --git a/src/plugins/Input/wavpack/decoder_wavpack.cpp b/src/plugins/Input/wavpack/decoder_wavpack.cpp index df17c8b76..75b09dff0 100644 --- a/src/plugins/Input/wavpack/decoder_wavpack.cpp +++ b/src/plugins/Input/wavpack/decoder_wavpack.cpp @@ -86,7 +86,7 @@ bool DecoderWavPack::initialize() if(m_track > m_parser->count()) { qWarning("DecoderWavPack: invalid cuesheet comment"); - return FALSE; + return false; } m_path = p; //send metadata @@ -100,7 +100,7 @@ bool DecoderWavPack::initialize() if (!m_context) { qWarning("DecoderWavPack: error: %s", err); - return FALSE; + return false; } m_chan = WavpackGetNumChannels(m_context); diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp index c1b0e8a41..50a81c6c7 100644 --- a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp +++ b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp @@ -35,7 +35,7 @@ bool DecoderWavPackFactory::supports(const QString &source) const bool DecoderWavPackFactory::canDecode(QIODevice *) const { - return FALSE; + return false; } const DecoderProperties DecoderWavPackFactory::properties() const @@ -47,7 +47,7 @@ const DecoderProperties DecoderWavPackFactory::properties() const //properties.contentType = ; properties.shortName = "wavpack"; properties.hasAbout = true; - properties.hasSettings = FALSE; + properties.hasSettings = false; properties.noInput = true; properties.protocols = "file wvpack"; return properties; diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp index 98c9bb8a8..620d758b2 100644 --- a/src/plugins/Output/alsa/outputalsa.cpp +++ b/src/plugins/Output/alsa/outputalsa.cpp @@ -37,18 +37,18 @@ #include "outputalsa.h" OutputALSA::OutputALSA(QObject * parent) - : Output(parent), m_inited(FALSE) + : Output(parent), m_inited(false) { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); QString dev_name = settings.value("ALSA/device","default").toString(); - m_use_mmap = settings.value("ALSA/use_mmap", FALSE).toBool(); + m_use_mmap = settings.value("ALSA/use_mmap", false).toBool(); pcm_name = strdup(dev_name.toAscii().data()); pcm_handle = 0; m_prebuf = 0; m_prebuf_size = 0; m_prebuf_fill = 0; - m_pause = FALSE; - m_can_pause = FALSE; + m_pause = false; + m_can_pause = false; } OutputALSA::~OutputALSA() @@ -69,7 +69,7 @@ void OutputALSA::configure(quint32 freq, int chan, Qmmp::AudioFormat format) settings.beginGroup("ALSA"); uint buffer_time = settings.value("buffer_time",500).toUInt()*1000; uint period_time = settings.value("period_time",100).toUInt()*1000; - bool use_pause = settings.value("use_snd_pcm_pause", FALSE).toBool(); + bool use_pause = settings.value("use_snd_pcm_pause", false).toBool(); settings.endGroup(); snd_pcm_hw_params_t *hwparams = 0; @@ -88,7 +88,7 @@ void OutputALSA::configure(quint32 freq, int chan, Qmmp::AudioFormat format) if ((err = snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_MMAP_INTERLEAVED)) < 0) { qWarning("OutputALSA: Error setting mmap access: %s", snd_strerror(err)); - m_use_mmap = FALSE; + m_use_mmap = false; } } if (!m_use_mmap) @@ -207,15 +207,15 @@ void OutputALSA::reset() bool OutputALSA::initialize() { - m_inited = FALSE; + m_inited = false; if (pcm_handle) - return FALSE; + return false; if (snd_pcm_open(&pcm_handle, pcm_name, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK) < 0) { qWarning ("OutputALSA: Error opening PCM device %s", pcm_name); - return FALSE; + return false; } m_inited = true; @@ -358,7 +358,7 @@ void OutputALSA::uninitialize() { if (!m_inited) return; - m_inited = FALSE; + m_inited = false; if (pcm_handle) { snd_pcm_drop(pcm_handle); diff --git a/src/plugins/Output/alsa/settingsdialog.cpp b/src/plugins/Output/alsa/settingsdialog.cpp index 86001bfe3..5bcaaccf0 100644 --- a/src/plugins/Output/alsa/settingsdialog.cpp +++ b/src/plugins/Output/alsa/settingsdialog.cpp @@ -55,8 +55,8 @@ SettingsDialog::SettingsDialog ( QWidget *parent ) if (d >= 0) ui.mixerDeviceComboBox->setCurrentIndex(d); - ui.mmapCheckBox->setChecked(settings.value("use_mmap", FALSE).toBool()); - ui.pauseCheckBox->setChecked(settings.value("use_snd_pcm_pause", FALSE).toBool()); + ui.mmapCheckBox->setChecked(settings.value("use_mmap", false).toBool()); + ui.pauseCheckBox->setChecked(settings.value("use_snd_pcm_pause", false).toBool()); settings.endGroup(); } diff --git a/src/plugins/Output/jack/outputjack.cpp b/src/plugins/Output/jack/outputjack.cpp index 8f6cd272e..45807e4a1 100644 --- a/src/plugins/Output/jack/outputjack.cpp +++ b/src/plugins/Output/jack/outputjack.cpp @@ -32,7 +32,7 @@ #include <string.h> OutputJACK::OutputJACK(QObject *parent) - : Output(parent), m_inited(FALSE), m_configure(FALSE) + : Output(parent), m_inited(false), m_configure(FALSE) { JACK_Init(); } @@ -47,8 +47,8 @@ void OutputJACK::configure(quint32 freq, int chan, Qmmp::AudioFormat format) qDebug("OutputJACK: configure"); if(JACK_Open(&jack_device, AudioParameters::sampleSize(format)*8, (unsigned long *)&freq, chan)) { - m_configure = FALSE; - m_inited = FALSE; + m_configure = false; + m_inited = false; return; } else @@ -60,8 +60,8 @@ void OutputJACK::configure(quint32 freq, int chan, Qmmp::AudioFormat format) bool OutputJACK::initialize() { - m_inited = FALSE; - m_configure = FALSE; + m_inited = false; + m_configure = false; jack_options_t options = JackNoStartServer; jack_status_t status; jack_client_t *client = jack_client_open ("test_qmmp", options, &status, NULL); @@ -72,7 +72,7 @@ bool OutputJACK::initialize() { qDebug("Unable to connect to JACK server."); } - return FALSE; + return false; } jack_client_close (client); m_inited = true; diff --git a/src/plugins/Output/jack/outputjackfactory.cpp b/src/plugins/Output/jack/outputjackfactory.cpp index 1f988486d..82e21588a 100644 --- a/src/plugins/Output/jack/outputjackfactory.cpp +++ b/src/plugins/Output/jack/outputjackfactory.cpp @@ -29,7 +29,7 @@ const OutputProperties OutputJACKFactory::properties() const OutputProperties properties; properties.name = tr("JACK Plugin"); properties.hasAbout = true; - properties.hasSettings = FALSE; + properties.hasSettings = false; properties.shortName = "jack"; return properties; } diff --git a/src/plugins/Output/null/outputnullfactory.cpp b/src/plugins/Output/null/outputnullfactory.cpp index ea20f9bfe..15ac4ee18 100644 --- a/src/plugins/Output/null/outputnullfactory.cpp +++ b/src/plugins/Output/null/outputnullfactory.cpp @@ -29,7 +29,7 @@ const OutputProperties OutputNullFactory::properties() const OutputProperties properties; properties.name = tr("Null Plugin"); properties.hasAbout = true; - properties.hasSettings = FALSE; + properties.hasSettings = false; properties.shortName = "null"; return properties; } diff --git a/src/plugins/Output/oss/outputoss.cpp b/src/plugins/Output/oss/outputoss.cpp index 860766b39..7125dc981 100644 --- a/src/plugins/Output/oss/outputoss.cpp +++ b/src/plugins/Output/oss/outputoss.cpp @@ -64,7 +64,7 @@ OutputOSS* OutputOSS::instance() } OutputOSS::OutputOSS(QObject * parent) - : Output(parent), m_inited(FALSE), + : Output(parent), m_inited(false), m_frequency(-1), m_channels(-1), do_select(true), m_audio_fd(-1) @@ -212,7 +212,7 @@ bool OutputOSS::initialize() { reset(); if (m_audio_fd < 0) - return FALSE; + return false; m_inited = true; return true; } @@ -221,7 +221,7 @@ void OutputOSS::uninitialize() { if (!m_inited) return; - m_inited = FALSE; + m_inited = false; m_frequency = -1; m_channels = -1; resetDSP(); @@ -283,7 +283,7 @@ VolumeControlOSS::VolumeControlOSS(QObject *parent) : VolumeControl(parent) #else m_mixer_device = settings.value("OSS/device","/dev/dsp").toString(); int mixer_fd = -1; - bool to_close = FALSE; + bool to_close = false; if (OutputOSS::instance() && OutputOSS::instance()->audio_fd() > 0) mixer_fd = OutputOSS::instance()->audio_fd(); else diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp index 747b8d180..26326f38f 100644 --- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp +++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp @@ -29,7 +29,7 @@ const OutputProperties OutputPulseAudioFactory::properties() const OutputProperties properties; properties.name = tr("PulseAudio Plugin"); properties.hasAbout = true; - properties.hasSettings = FALSE; + properties.hasSettings = false; properties.shortName = "pulse"; return properties; } diff --git a/src/plugins/Output/waveout/outputwaveout.cpp b/src/plugins/Output/waveout/outputwaveout.cpp index 6fba551d2..90fb19337 100644 --- a/src/plugins/Output/waveout/outputwaveout.cpp +++ b/src/plugins/Output/waveout/outputwaveout.cpp @@ -137,7 +137,7 @@ bool OutputWaveOut::initialize() if (!waveOutGetNumDevs ())
{
qWarning("OutputWaveOut: no audio device found");
- return FALSE;
+ return false;
}
return true;
diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.cpp b/src/plugins/Output/waveout/outputwaveoutfactory.cpp index b2d836c70..a0ad4a847 100644 --- a/src/plugins/Output/waveout/outputwaveoutfactory.cpp +++ b/src/plugins/Output/waveout/outputwaveoutfactory.cpp @@ -29,7 +29,7 @@ const OutputProperties OutputWaveOutFactory::properties() const OutputProperties properties;
properties.name = tr("WaveOut Plugin");
properties.hasAbout = true;
- properties.hasSettings = FALSE;
+ properties.hasSettings = false;
properties.shortName = "waveout";
return properties;
}
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 diff --git a/src/plugins/Visual/analyzer/analyzer.cpp b/src/plugins/Visual/analyzer/analyzer.cpp index 7a80aa231..c071b12f2 100644 --- a/src/plugins/Visual/analyzer/analyzer.cpp +++ b/src/plugins/Visual/analyzer/analyzer.cpp @@ -182,7 +182,7 @@ bool Analyzer::process (VisualNode *node) calc_freq (dest_r, node->right); } else - return FALSE; + return false; const double y_scale = 3.60673760222; /* 20.0 / log(256) */ int yl,yr, j; diff --git a/src/plugins/Visual/projectm/visualprojectmfactory.cpp b/src/plugins/Visual/projectm/visualprojectmfactory.cpp index e42a736ff..d52378a73 100644 --- a/src/plugins/Visual/projectm/visualprojectmfactory.cpp +++ b/src/plugins/Visual/projectm/visualprojectmfactory.cpp @@ -28,7 +28,7 @@ const VisualProperties VisualProjectMFactory::properties() const VisualProperties properties; properties.name = tr("ProjectM"); properties.shortName = "projectm"; - properties.hasSettings = FALSE; + properties.hasSettings = false; properties.hasAbout = true; return properties; } diff --git a/src/qmmp/abstractengine.cpp b/src/qmmp/abstractengine.cpp index be7c0c4e3..2aa468375 100644 --- a/src/qmmp/abstractengine.cpp +++ b/src/qmmp/abstractengine.cpp @@ -130,7 +130,7 @@ bool AbstractEngine::isEnabled(EngineFactory* factory) { checkFactories(); if (!m_factories->contains(factory)) - return FALSE; + return false; QString name = factory->properties().shortName; QSettings settings ( Qmmp::configFile(), QSettings::IniFormat ); QStringList disabledList = settings.value("Engine/disabled_plugins").toStringList(); diff --git a/src/qmmp/decoder.cpp b/src/qmmp/decoder.cpp index d5046d6c0..af633a7c1 100644 --- a/src/qmmp/decoder.cpp +++ b/src/qmmp/decoder.cpp @@ -205,7 +205,7 @@ bool Decoder::isEnabled(DecoderFactory* factory) { checkFactories(); if (!m_factories->contains(factory)) - return FALSE; + return false; QString name = factory->properties().shortName; QSettings settings ( Qmmp::configFile(), QSettings::IniFormat ); QStringList disabledList = settings.value("Decoder/disabled_plugins").toStringList(); diff --git a/src/qmmp/decoderfactory.h b/src/qmmp/decoderfactory.h index a9534b136..c72fa68c8 100644 --- a/src/qmmp/decoderfactory.h +++ b/src/qmmp/decoderfactory.h @@ -43,10 +43,10 @@ public: */ DecoderProperties() { - hasAbout = FALSE; - hasSettings = FALSE; - noInput = FALSE; - noOutput = FALSE; + hasAbout = false; + hasSettings = false; + noInput = false; + noOutput = false; } QString name; /*!< Input plugin full name */ diff --git a/src/qmmp/effect.cpp b/src/qmmp/effect.cpp index 87d342001..d4c030c57 100644 --- a/src/qmmp/effect.cpp +++ b/src/qmmp/effect.cpp @@ -166,7 +166,7 @@ bool Effect::isEnabled(EffectFactory* factory) { checkFactories(); if(!m_factories->contains(factory)) - return FALSE; + return false; QString name = factory->properties().shortName; QSettings settings (Qmmp::configFile(), QSettings::IniFormat); QStringList effList = settings.value("Effect/enabled_plugins").toStringList(); diff --git a/src/qmmp/effectfactory.h b/src/qmmp/effectfactory.h index 7d9d140f1..c5cd35e6c 100644 --- a/src/qmmp/effectfactory.h +++ b/src/qmmp/effectfactory.h @@ -38,8 +38,8 @@ public: */ EffectProperties() { - hasAbout = FALSE; - hasSettings = FALSE; + hasAbout = false; + hasSettings = false; } QString name; /*!< Effect plugin full name */ QString shortName; /*!< Effect plugin short name for internal usage */ diff --git a/src/qmmp/emptyinputsource.cpp b/src/qmmp/emptyinputsource.cpp index 98f5f6f9a..43a92af2b 100644 --- a/src/qmmp/emptyinputsource.cpp +++ b/src/qmmp/emptyinputsource.cpp @@ -22,7 +22,7 @@ EmptyInputSource::EmptyInputSource(const QString &url, QObject *parent) : InputSource(url,parent) { - m_ok = FALSE; + m_ok = false; } QIODevice *EmptyInputSource::ioDevice() diff --git a/src/qmmp/enginefactory.h b/src/qmmp/enginefactory.h index e24c056c0..6f081b841 100644 --- a/src/qmmp/enginefactory.h +++ b/src/qmmp/enginefactory.h @@ -41,8 +41,8 @@ public: */ EngineProperties() { - hasAbout = FALSE; - hasSettings = FALSE; + hasAbout = false; + hasSettings = false; } QString name; /*!< Input plugin full name */ QString shortName; /*!< Input plugin short name for internal usage */ diff --git a/src/qmmp/inputsourcefactory.h b/src/qmmp/inputsourcefactory.h index f738f4b95..00159c9b9 100644 --- a/src/qmmp/inputsourcefactory.h +++ b/src/qmmp/inputsourcefactory.h @@ -37,8 +37,8 @@ public: */ InputSourceProperties() { - hasSettings = FALSE; - hasAbout = FALSE; + hasSettings = false; + hasAbout = false; } QString name; /*!< Transport plugin full name */ diff --git a/src/qmmp/metadatamanager.cpp b/src/qmmp/metadatamanager.cpp index 8d18c8df0..667d9bdff 100644 --- a/src/qmmp/metadatamanager.cpp +++ b/src/qmmp/metadatamanager.cpp @@ -174,14 +174,14 @@ bool MetaDataManager::supports(const QString &fileName) const if (!fileName.contains("://")) //local file { if (!QFile::exists(fileName)) - return FALSE; + return false; if((fact = Decoder::findByPath(fileName))) return true; else if((efact = AbstractEngine::findByPath(fileName))) return true; - return FALSE; + return false; } - return FALSE; + return false; } QPixmap MetaDataManager::getCover(const QString &url) @@ -236,7 +236,7 @@ QFileInfoList MetaDataManager::findCoverFiles(QDir dir, int depth) const QFileInfoList file_list = dir.entryInfoList(m_settings->coverNameFilters()); foreach(QFileInfo i, file_list) { - foreach(QString pattern, m_settings->coverNameFilters(FALSE)) + foreach(QString pattern, m_settings->coverNameFilters(false)) { if(QRegExp (pattern, Qt::CaseInsensitive, QRegExp::Wildcard).exactMatch(i.fileName())) { diff --git a/src/qmmp/output.cpp b/src/qmmp/output.cpp index 26c4c8024..972def1f7 100644 --- a/src/qmmp/output.cpp +++ b/src/qmmp/output.cpp @@ -48,9 +48,9 @@ Output::Output (QObject* parent) : QThread (parent), m_recycler (stackSize()) m_totalWritten = 0; m_currentMilliseconds = -1; m_bytesPerMillisecond = 0; - m_userStop = FALSE; - m_pause = FALSE; - m_finish = FALSE; + m_userStop = false; + m_pause = false; + m_finish = false; m_visBuffer = 0; m_visBufferSize = 0; m_kbps = 0; @@ -235,7 +235,7 @@ void Output::run() } mutex()->unlock (); - bool done = FALSE; + bool done = false; Buffer *b = 0; qint64 l, m = 0; diff --git a/src/qmmp/outputfactory.h b/src/qmmp/outputfactory.h index 3871552d1..6c9646ac1 100644 --- a/src/qmmp/outputfactory.h +++ b/src/qmmp/outputfactory.h @@ -41,8 +41,8 @@ public: */ OutputProperties() { - hasAbout = FALSE; - hasSettings = FALSE; + hasAbout = false; + hasSettings = false; } QString name; /*!< Effect plugin full name */ QString shortName; /*!< Effect plugin short name for internal usage */ diff --git a/src/qmmp/qmmpaudioengine.cpp b/src/qmmp/qmmpaudioengine.cpp index 909862628..549d51ac7 100644 --- a/src/qmmp/qmmpaudioengine.cpp +++ b/src/qmmp/qmmpaudioengine.cpp @@ -39,8 +39,8 @@ extern "C" } QmmpAudioEngine::QmmpAudioEngine(QObject *parent) - : AbstractEngine(parent), m_factory(0), m_output(0), m_eqInited(FALSE), - m_useEq(FALSE), m_eqEnabled(FALSE) + : AbstractEngine(parent), m_factory(0), m_output(0), m_eqInited(false), + m_useEq(false), m_eqEnabled(FALSE) { m_output_buf = new unsigned char[QMMP_BUFFER_SIZE]; double b[] = {0,0,0,0,0,0,0,0,0,0}; @@ -72,26 +72,26 @@ QmmpAudioEngine::~QmmpAudioEngine() void QmmpAudioEngine::reset() { - m_done = FALSE; - m_finish = FALSE; + m_done = false; + m_finish = false; m_totalTime = 0; m_seekTime = -1; m_output_at = 0; - m_user_stop = FALSE; + m_user_stop = false; m_bitrate = 0; m_chan = 0; m_bps = 0; - m_next = FALSE; + m_next = false; } bool QmmpAudioEngine::play() { if(isRunning() || m_decoders.isEmpty() || (m_output && m_output->isRunning())) - return FALSE; + return false; if(m_output) delete m_output; if(!(m_output = createOutput(m_decoders.head()))) - return FALSE; + return false; start(); return true; } @@ -121,7 +121,7 @@ bool QmmpAudioEngine::enqueue(InputSource *source) if(!factory) { qWarning("QmmpAudioEngine: unsupported file format"); - return FALSE; + return false; } qDebug("QmmpAudioEngine: selected decoder: %s",qPrintable(factory->properties().shortName)); if(factory->properties().noInput && source->ioDevice()) @@ -131,7 +131,7 @@ bool QmmpAudioEngine::enqueue(InputSource *source) { qWarning("QmmpAudioEngine: invalid file format"); delete decoder; - return FALSE; + return false; } m_decoders.enqueue(decoder); m_inputs.insert(decoder, source); @@ -358,7 +358,7 @@ void QmmpAudioEngine::run() Q_ASSERT(m_chan == 0); Q_ASSERT(!m_output_buf); mutex()->lock (); - m_next = FALSE; + m_next = false; qint64 len = 0; if(m_decoders.isEmpty()) { @@ -401,7 +401,7 @@ void QmmpAudioEngine::run() { if(m_next) //decoder can play next track without initialization { - m_next = FALSE; + m_next = false; qDebug("QmmpAudioEngine: switching to the next track"); emit playbackFinished(); StateHandler::instance()->dispatch(Qmmp::Stopped); //fake stop/start cycle @@ -486,7 +486,7 @@ void QmmpAudioEngine::run() } mutex()->lock (); - m_next = FALSE; + m_next = false; if (m_finish) finish(); m_output->recycler()->cond()->wakeAll(); @@ -579,7 +579,7 @@ Output *QmmpAudioEngine::createOutput(Decoder *d) delete output; output = 0; StateHandler::instance()->dispatch(Qmmp::FatalError); - return FALSE; + return false; } m_effects = Effect::create(); AudioParameters ap = m_ap; diff --git a/src/qmmp/qmmpaudioengine.h b/src/qmmp/qmmpaudioengine.h index 9394732f3..47b5cca01 100644 --- a/src/qmmp/qmmpaudioengine.h +++ b/src/qmmp/qmmpaudioengine.h @@ -64,7 +64,7 @@ private slots: private: void run(); void reset(); - void flush(bool = FALSE); + void flush(bool = false); void addOffset(); qint64 produceSound(char *data, qint64 size, quint32 brate, int chan); void sendMetaData(); diff --git a/src/qmmp/qmmpsettings.cpp b/src/qmmp/qmmpsettings.cpp index 5aa04951e..9186951cc 100644 --- a/src/qmmp/qmmpsettings.cpp +++ b/src/qmmp/qmmpsettings.cpp @@ -35,11 +35,11 @@ QmmpSettings::QmmpSettings(QObject *parent) : QObject(parent) m_rg_mode = (ReplayGainMode) settings.value("mode", REPLAYGAIN_DISABLED).toInt(); m_rg_preamp = settings.value("preamp", 0.0).toDouble(); m_rg_defaut_gain = settings.value("default_gain", 0.0).toDouble(); - m_rg_prevent_clipping = settings.value("prevent_clipping", FALSE).toBool(); + m_rg_prevent_clipping = settings.value("prevent_clipping", false).toBool(); settings.endGroup(); //audio settings - m_aud_software_volume = settings.value("Output/software_volume", FALSE).toBool(); - m_aud_16bit = settings.value("Output/use_16bit", FALSE).toBool(); + m_aud_software_volume = settings.value("Output/software_volume", false).toBool(); + m_aud_16bit = settings.value("Output/use_16bit", false).toBool(); //cover settings settings.beginGroup("Cover"); m_cover_inc = settings.value("include", (QStringList() << "*.jpg" << "*.png")).toStringList(); @@ -48,8 +48,8 @@ QmmpSettings::QmmpSettings(QObject *parent) : QObject(parent) m_cover_use_files = settings.value("use_files", true).toBool(); settings.endGroup(); //network settings - m_proxy_enabled = settings.value("Proxy/use_proxy", FALSE).toBool(); - m_proxy_auth = settings.value("Proxy/authentication", FALSE).toBool(); + m_proxy_enabled = settings.value("Proxy/use_proxy", false).toBool(); + m_proxy_auth = settings.value("Proxy/authentication", false).toBool(); m_proxy_url = settings.value("Proxy/url").toUrl(); } diff --git a/src/qmmp/replaygain.cpp b/src/qmmp/replaygain.cpp index 79cad22d3..ccd3bf28e 100644 --- a/src/qmmp/replaygain.cpp +++ b/src/qmmp/replaygain.cpp @@ -28,7 +28,7 @@ ReplayGain::ReplayGain() m_mode = QmmpSettings::REPLAYGAIN_DISABLED; m_preamp = 0.0; m_default_gain = 0.0; - m_prevent_clipping = FALSE; + m_prevent_clipping = false; } void ReplayGain::setSampleSize(int size) diff --git a/src/qmmp/soundcore.cpp b/src/qmmp/soundcore.cpp index 87bf027c8..fbab2472a 100644 --- a/src/qmmp/soundcore.cpp +++ b/src/qmmp/soundcore.cpp @@ -41,10 +41,10 @@ SoundCore::SoundCore(QObject *parent) { m_instance = this; m_decoder = 0; - m_paused = FALSE; - m_useEQ = FALSE; - m_update = FALSE; - m_block = FALSE; + m_paused = false; + m_useEQ = false; + m_update = false; + m_block = false; m_preamp = 0; m_vis = 0; m_parentWidget = 0; @@ -276,7 +276,7 @@ bool SoundCore::enqueue(InputSource *s) if(!engine) //unsupported file format { s->deleteLater(); - return FALSE; + return false; } connect(engine, SIGNAL(playbackFinished()), SIGNAL(finished())); engine->setEQ(m_bands, m_preamp); diff --git a/src/qmmp/soundcore.h b/src/qmmp/soundcore.h index 2c0ae5a62..51b6b440a 100644 --- a/src/qmmp/soundcore.h +++ b/src/qmmp/soundcore.h @@ -124,7 +124,7 @@ public slots: * Returns \b true if playback has been started successful or source is not a local file, * otherwise returns \b false. Useful for invalid files skipping. */ - bool play(const QString &source, bool queue = FALSE, qint64 offset = -1); + bool play(const QString &source, bool queue = false, qint64 offset = -1); /*! * Stops playback */ diff --git a/src/qmmp/statehandler.cpp b/src/qmmp/statehandler.cpp index 1a69012e9..43a97a56a 100644 --- a/src/qmmp/statehandler.cpp +++ b/src/qmmp/statehandler.cpp @@ -69,7 +69,7 @@ void StateHandler::dispatch(qint64 elapsed, && (SoundCore::instance()->totalTime() - m_elapsed < PREFINISH_TIME) && m_sendAboutToFinish) { - m_sendAboutToFinish = FALSE; + m_sendAboutToFinish = false; emit aboutToFinish(); } } diff --git a/src/qmmp/visual.cpp b/src/qmmp/visual.cpp index 70de78296..7b4008570 100644 --- a/src/qmmp/visual.cpp +++ b/src/qmmp/visual.cpp @@ -33,7 +33,7 @@ Visual::Visual(QWidget *parent) : QWidget(parent) { setAttribute(Qt::WA_DeleteOnClose, true); - setAttribute(Qt::WA_QuitOnClose, FALSE); + setAttribute(Qt::WA_QuitOnClose, false); m_decoder = 0; m_output = 0; } @@ -55,7 +55,7 @@ void Visual::closeEvent (QCloseEvent *event) { VisualFactory *factory = m_vis_map.key(this); m_vis_map.remove(factory); - Visual::setEnabled(factory, FALSE); + Visual::setEnabled(factory, false); emit closedByUser(); } else @@ -132,7 +132,7 @@ bool Visual::isEnabled(VisualFactory* factory) { checkFactories(); if (!m_factories->contains(factory)) - return FALSE; + return false; QString name = factory->properties().shortName; QSettings settings ( Qmmp::configFile(), QSettings::IniFormat ); QStringList visList = settings.value("Visualization/enabled_plugins").toStringList(); diff --git a/src/qmmp/visualfactory.h b/src/qmmp/visualfactory.h index fdb3a1abf..89ab1dfef 100644 --- a/src/qmmp/visualfactory.h +++ b/src/qmmp/visualfactory.h @@ -38,8 +38,8 @@ public: */ VisualProperties() { - hasAbout = FALSE; - hasSettings = FALSE; + hasAbout = false; + hasSettings = false; } QString name; /*!< Effect plugin full name */ QString shortName; /*!< Effect plugin short name for internal usage */ diff --git a/src/qmmp/volumecontrol.cpp b/src/qmmp/volumecontrol.cpp index 40341e95a..d1df63371 100644 --- a/src/qmmp/volumecontrol.cpp +++ b/src/qmmp/volumecontrol.cpp @@ -30,7 +30,7 @@ VolumeControl::VolumeControl(QObject *parent) { m_left = 0; m_right = 0; - m_prev_block = FALSE; + m_prev_block = false; } VolumeControl::~VolumeControl() @@ -91,7 +91,7 @@ SoftwareVolume::SoftwareVolume(QObject *parent) m_right = settings.value("Volume/right", 80).toInt(); blockSignals(true); checkVolume(); - blockSignals(FALSE); + blockSignals(false); QTimer::singleShot(125, this, SLOT(checkVolume())); m_scaleLeft = (double)m_left/100.0; m_scaleRight = (double)m_right/100.0; 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(); } diff --git a/src/ui/aboutdialog.cpp b/src/ui/aboutdialog.cpp index f9a407f07..5728697b9 100644 --- a/src/ui/aboutdialog.cpp +++ b/src/ui/aboutdialog.cpp @@ -55,7 +55,7 @@ AboutDialog::AboutDialog(QWidget* parent, Qt::WFlags fl) : QDialog( parent, fl ) { setupUi(this); - setAttribute(Qt::WA_QuitOnClose, FALSE); + setAttribute(Qt::WA_QuitOnClose, false); licenseTextEdit->setPlainText(getstringFromResource(":COPYING")); aboutTextEdit->setHtml(loadAbout()); authorsTextEdit->setPlainText(getstringFromResource(tr(":/txt/authors_en.txt"))); diff --git a/src/ui/addurldialog.cpp b/src/ui/addurldialog.cpp index 92db9ab39..eb14071aa 100644 --- a/src/ui/addurldialog.cpp +++ b/src/ui/addurldialog.cpp @@ -39,7 +39,7 @@ AddUrlDialog::AddUrlDialog( QWidget * parent, Qt::WindowFlags f) : QDialog(paren { setupUi(this); setAttribute(Qt::WA_DeleteOnClose); - setAttribute(Qt::WA_QuitOnClose, FALSE); + setAttribute(Qt::WA_QuitOnClose, false); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); m_history = settings.value("URLDialog/history").toStringList(); urlComboBox->addItems(m_history); @@ -100,7 +100,7 @@ void AddUrlDialog::accept( ) request.setUrl(QUrl(s)); request.setRawHeader("User-Agent", QString("qmmp/%1").arg(Qmmp::strVersion()).toAscii()); m_http->get(request); - addButton->setEnabled(FALSE); + addButton->setEnabled(false); return; } } diff --git a/src/ui/balancebar.cpp b/src/ui/balancebar.cpp index 2984577aa..6b4774a2e 100644 --- a/src/ui/balancebar.cpp +++ b/src/ui/balancebar.cpp @@ -32,11 +32,11 @@ BalanceBar::BalanceBar(QWidget *parent) m_skin = Skin::instance(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); setPixmap(m_skin->getBalanceBar(0)); - m_moving = FALSE; + m_moving = false; m_min = -100; m_max = 100; m_old = m_value = 0; - draw(FALSE); + draw(false); } @@ -82,8 +82,8 @@ void BalanceBar::mouseMoveEvent (QMouseEvent *e) void BalanceBar::mouseReleaseEvent(QMouseEvent*) { - m_moving = FALSE; - draw(FALSE); + m_moving = false; + draw(false); m_old = m_value; } @@ -92,19 +92,19 @@ void BalanceBar::setValue(int v) if (m_moving || m_max == 0) return; m_value = v; - draw(FALSE); + draw(false); } void BalanceBar::setMax(int max) { m_max = max; - draw(FALSE); + draw(false); } void BalanceBar::updateSkin() { resize(m_skin->getBalanceBar(0).size()); - draw(FALSE); + draw(false); } void BalanceBar::draw(bool pressed) diff --git a/src/ui/builtincommandlineoption.cpp b/src/ui/builtincommandlineoption.cpp index 3a51d7190..25dee45e1 100644 --- a/src/ui/builtincommandlineoption.cpp +++ b/src/ui/builtincommandlineoption.cpp @@ -48,7 +48,7 @@ bool BuiltinCommandLineOption::identify(const QString & str) const str == "--add-file" || str == "--add-dir") return true; - return FALSE; + return false; } const QString BuiltinCommandLineOption::helpString() const @@ -117,7 +117,7 @@ void BuiltinCommandLineOption::executeCommand(const QString &option_string, } else if (option_string == "--volume" && !args.isEmpty()) { - bool ok = FALSE; + bool ok = false; int volume = args.at(0).toInt(&ok); if (ok) mw->soundCore()->setVolume(volume,volume); diff --git a/src/ui/button.cpp b/src/ui/button.cpp index 18279b0e0..9b96f8f52 100644 --- a/src/ui/button.cpp +++ b/src/ui/button.cpp @@ -32,7 +32,7 @@ Button::Button (QWidget *parent, uint normal, uint pressed, uint cursor) name_pressed = pressed; name_cursor = cursor; skin = Skin::instance(); - setON (FALSE); + setON (false); setCursor (skin->getCursor (name_cursor)); connect (skin, SIGNAL (skinChanged()), this, SLOT (updateSkin())); } @@ -63,7 +63,7 @@ void Button::mousePressEvent (QMouseEvent *e) void Button::mouseReleaseEvent (QMouseEvent*) { - setON (FALSE); + setON (false); if (m_cursorin) emit clicked(); } @@ -74,7 +74,7 @@ void Button::mouseMoveEvent (QMouseEvent *e) m_cursorin = true; setON (true); } else if ( m_cursorin && !rect().contains(e->pos()) ) { - m_cursorin = FALSE; - setON (FALSE); + m_cursorin = false; + setON (false); } } diff --git a/src/ui/configdialog.cpp b/src/ui/configdialog.cpp index 061245957..16858a0fb 100644 --- a/src/ui/configdialog.cpp +++ b/src/ui/configdialog.cpp @@ -55,10 +55,10 @@ ConfigDialog::ConfigDialog (QWidget *parent) : QDialog (parent) { ui.setupUi (this); - setAttribute(Qt::WA_QuitOnClose, FALSE); - setAttribute(Qt::WA_DeleteOnClose, FALSE); - ui.preferencesButton->setEnabled(FALSE); - ui.informationButton->setEnabled(FALSE); + setAttribute(Qt::WA_QuitOnClose, false); + setAttribute(Qt::WA_DeleteOnClose, false); + ui.preferencesButton->setEnabled(false); + ui.informationButton->setEnabled(false); connect (ui.mainFontButton, SIGNAL (clicked()), SLOT (setMainFont())); connect (ui.plFontButton, SIGNAL (clicked()), SLOT (setPlFont())); connect (this, SIGNAL(rejected()),SLOT(saveSettings())); @@ -92,10 +92,10 @@ void ConfigDialog::readSettings() ui.underscoresCheckBox->setChecked(player->playListManager()->convertUnderscore()); ui.per20CheckBox->setChecked(player->playListManager()->convertTwenty()); } - ui.protocolCheckBox->setChecked(settings.value ("PlayList/show_protocol", FALSE).toBool()); + ui.protocolCheckBox->setChecked(settings.value ("PlayList/show_protocol", false).toBool()); ui.numbersCheckBox->setChecked(settings.value ("PlayList/show_numbers", true).toBool()); - ui.playlistsCheckBox->setChecked(settings.value("PlayList/show_plalists", FALSE).toBool()); - ui.popupCheckBox->setChecked(settings.value("PlayList/show_popup", FALSE).toBool()); + ui.playlistsCheckBox->setChecked(settings.value("PlayList/show_plalists", false).toBool()); + ui.popupCheckBox->setChecked(settings.value("PlayList/show_popup", false).toBool()); QmmpSettings *gs = QmmpSettings::instance(); //proxy settings ui.enableProxyCheckBox->setChecked(gs->isProxyEnabled()); @@ -111,23 +111,23 @@ void ConfigDialog::readSettings() ui.proxyUserLineEdit->setEnabled(ui.authProxyCheckBox->isChecked()); ui.proxyPasswLineEdit->setEnabled(ui.authProxyCheckBox->isChecked()); - ui.hiddenCheckBox->setChecked(settings.value("MainWindow/start_hidden", FALSE).toBool()); - ui.hideOnCloseCheckBox->setChecked(settings.value("MainWindow/hide_on_close", FALSE).toBool()); + ui.hiddenCheckBox->setChecked(settings.value("MainWindow/start_hidden", false).toBool()); + ui.hideOnCloseCheckBox->setChecked(settings.value("MainWindow/hide_on_close", false).toBool()); //transparency ui.mwTransparencySlider->setValue(100 - settings.value("MainWindow/opacity", 1.0).toDouble()*100); ui.eqTransparencySlider->setValue(100 - settings.value("Equalizer/opacity", 1.0).toDouble()*100); ui.plTransparencySlider->setValue(100 - settings.value("PlayList/opacity", 1.0).toDouble()*100); //compatibility - ui.openboxCheckBox->setChecked(settings.value("General/openbox_compat", FALSE).toBool()); - ui.metacityCheckBox->setChecked(settings.value("General/metacity_compat", FALSE).toBool()); + ui.openboxCheckBox->setChecked(settings.value("General/openbox_compat", false).toBool()); + ui.metacityCheckBox->setChecked(settings.value("General/metacity_compat", false).toBool()); //skin options - ui.skinCursorsCheckBox->setChecked(settings.value("General/skin_cursors", FALSE).toBool()); - ui.doubleSizeCheckBox->setChecked(settings.value("General/double_size", FALSE).toBool()); + ui.skinCursorsCheckBox->setChecked(settings.value("General/skin_cursors", false).toBool()); + ui.doubleSizeCheckBox->setChecked(settings.value("General/double_size", false).toBool()); //resume playback - ui.continuePlaybackCheckBox->setChecked(settings.value("General/resume_on_startup", FALSE).toBool()); + ui.continuePlaybackCheckBox->setChecked(settings.value("General/resume_on_startup", false).toBool()); //cover options ui.coverIncludeLineEdit->setText(gs->coverNameFilters(true).join(",")); - ui.coverExcludeLineEdit->setText(gs->coverNameFilters(FALSE).join(",")); + ui.coverExcludeLineEdit->setText(gs->coverNameFilters(false).join(",")); ui.coverDepthSpinBox->setValue(gs->coverSearchDepth()); ui.useCoverFilesCheckBox->setChecked(gs->useCoverFiles()); //replay gain @@ -279,14 +279,14 @@ void ConfigDialog::loadPluginsInfo() ui.treeWidget->addTopLevelItem(item); item->setExpanded(true); - ui.treeWidget->blockSignals(FALSE); + ui.treeWidget->blockSignals(false); ui.treeWidget->resizeColumnToContents(0); ui.treeWidget->resizeColumnToContents(1); /* load output plugins information */ - ui.outputInformationButton->setEnabled(FALSE); - ui.outputPreferencesButton->setEnabled(FALSE); + ui.outputInformationButton->setEnabled(false); + ui.outputPreferencesButton->setEnabled(false); QList <OutputFactory *> *outputs = Output::factories(); for (int i = 0; i < outputs->count (); ++i) { @@ -324,7 +324,7 @@ void ConfigDialog::loadFonts() font.fromString(fontname); ui.mainFontLabel->setText (font.family () + " " + QString::number(font.pointSize ())); ui.mainFontLabel->setFont(font); - ui.useBitmapCheckBox->setChecked(settings.value("MainWindow/bitmap_font", FALSE).toBool()); + ui.useBitmapCheckBox->setChecked(settings.value("MainWindow/bitmap_font", false).toBool()); } void ConfigDialog::setPlFont() @@ -499,8 +499,8 @@ void ConfigDialog::on_treeWidget_currentItemChanged (QTreeWidgetItem *current, Q } else { - ui.preferencesButton->setEnabled(FALSE); - ui.informationButton->setEnabled(FALSE); + ui.preferencesButton->setEnabled(false); + ui.informationButton->setEnabled(false); } } diff --git a/src/ui/cursorimage.cpp b/src/ui/cursorimage.cpp index 2dbe1353b..30fcf0173 100644 --- a/src/ui/cursorimage.cpp +++ b/src/ui/cursorimage.cpp @@ -110,7 +110,7 @@ QCursor createCursor(QString path) // now we need the mask (transparency) QByteArray maskData = bmpData.right((width * height) / 8); - QImage maskImage = QBitmap::fromData(QSize(width, height), (const uchar*) maskData.constData(), QImage::Format_Mono).toImage().mirrored(FALSE, true); + QImage maskImage = QBitmap::fromData(QSize(width, height), (const uchar*) maskData.constData(), QImage::Format_Mono).toImage().mirrored(false, true); maskImage.invertPixels(); pix.setMask(QBitmap::fromImage(maskImage)); diff --git a/src/ui/display.cpp b/src/ui/display.cpp index 82a0edc89..641857a38 100644 --- a/src/ui/display.cpp +++ b/src/ui/display.cpp @@ -44,7 +44,7 @@ MainDisplay::MainDisplay (QWidget *parent) : PixmapWidget (parent) { - m_shaded = FALSE; + m_shaded = false; m_skin = Skin::instance(); setPixmap (m_skin->getMain()); setCursor(m_skin->getCursor(Skin::CUR_NORMAL)); @@ -181,7 +181,7 @@ void MainDisplay::setState(Qmmp::State state) case Qmmp::Stopped: m_playstatus->setStatus(PlayStatus::STOP); m_monoster->setChannels (0); - m_timeIndicator->setNeedToShowTime(FALSE); + m_timeIndicator->setNeedToShowTime(false); m_posbar->setValue (0); m_posbar->setMax (0); m_titlebar->setTime(-1); diff --git a/src/ui/dock.cpp b/src/ui/dock.cpp index d5d373e86..ee6658331 100644 --- a/src/ui/dock.cpp +++ b/src/ui/dock.cpp @@ -50,7 +50,7 @@ void Dock::setMainWidget (QWidget *widget) { m_mainWidget = widget; m_widgetList.prepend (widget); - m_dockedList.prepend (FALSE); + m_dockedList.prepend (false); } @@ -109,7 +109,7 @@ QPoint Dock::snap (QPoint npos, QWidget* mv, QWidget* st) void Dock::addWidget (QWidget *widget) { m_widgetList.append (widget); - m_dockedList.append (FALSE); + m_dockedList.append (false); widget->addActions(m_actions); } @@ -157,7 +157,7 @@ void Dock::move (QWidget* mv, QPoint npos) { for (int i = 0; i<m_widgetList.size(); ++i) { - m_dockedList[i] = FALSE; + m_dockedList[i] = false; if (mv != m_widgetList.at (i) && !m_dockedList.at (i) && m_widgetList.at (i)->isVisible()) { npos = snap (npos, mv, m_widgetList.at (i)); @@ -234,7 +234,7 @@ bool Dock::isDocked (QWidget* mv, QWidget* st) ny = mv->y() - st->y(); if (nx < 2 && ny > -mv->height() && ny < st->height()) //right return true; - return FALSE; + return false; } void Dock::addActions (QList<QAction *> actions) diff --git a/src/ui/eqslider.cpp b/src/ui/eqslider.cpp index 1ddf7699b..8779bb6ac 100644 --- a/src/ui/eqslider.cpp +++ b/src/ui/eqslider.cpp @@ -32,11 +32,11 @@ EqSlider::EqSlider(QWidget *parent): PixmapWidget(parent) m_skin = Skin::instance(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); setPixmap(m_skin->getEqSlider(0)); - m_moving = FALSE; + m_moving = false; m_min = -20; m_max = 20; m_old = m_value = 0; - draw(FALSE); + draw(false); setCursor(m_skin->getCursor(Skin::CUR_EQSLID)); } @@ -66,8 +66,8 @@ void EqSlider::mousePressEvent(QMouseEvent *e) void EqSlider::mouseReleaseEvent(QMouseEvent*) { - m_moving = FALSE; - draw(FALSE); + m_moving = false; + draw(false); } void EqSlider::mouseMoveEvent(QMouseEvent* e) @@ -102,19 +102,19 @@ void EqSlider::setValue(double p) if (m_moving) return; m_value = -p; - draw(FALSE); + draw(false); } void EqSlider::setMax(double m) { m_max = m; - draw(FALSE); + draw(false); } void EqSlider::updateSkin() { resize(m_skin->getEqSlider(0).size()); - draw(FALSE); + draw(false); setCursor(m_skin->getCursor(Skin::CUR_EQSLID)); } @@ -141,7 +141,7 @@ void EqSlider::wheelEvent(QWheelEvent *e) m_value -= e->delta()/60; m_value = m_value > m_max ? m_max : m_value; m_value = m_value < m_min ? m_min : m_value; - draw(FALSE); + draw(false); emit sliderMoved(m_value); } diff --git a/src/ui/eqtitlebar.cpp b/src/ui/eqtitlebar.cpp index 97d2626cb..b46ec1720 100644 --- a/src/ui/eqtitlebar.cpp +++ b/src/ui/eqtitlebar.cpp @@ -36,8 +36,8 @@ EqTitleBar::EqTitleBar(QWidget *parent) m_shade2 = 0; m_left = 0; m_right = 0; - m_shaded = FALSE; - m_align = FALSE; + m_shaded = false; + m_align = false; m_skin = Skin::instance(); m_eq = parentWidget(); m_mw = qobject_cast<MainWindow*>(m_eq->parent()); @@ -46,10 +46,10 @@ EqTitleBar::EqTitleBar(QWidget *parent) m_shade = new Button(this, Skin::EQ_BT_SHADE1_N, Skin::EQ_BT_SHADE1_P, Skin::CUR_EQNORMAL); connect(m_shade, SIGNAL(clicked()), SLOT(shade())); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - if (settings.value("Equalizer/shaded", FALSE).toBool()) + if (settings.value("Equalizer/shaded", false).toBool()) shade(); m_align = true; - setActive(FALSE); + setActive(false); setCursor(m_skin->getCursor(Skin::CUR_EQTITLE)); connect(m_skin, SIGNAL(skinChanged()), SLOT(updateSkin())); updatePositions(); diff --git a/src/ui/eqwidget.cpp b/src/ui/eqwidget.cpp index d84de2c37..68e9307a2 100644 --- a/src/ui/eqwidget.cpp +++ b/src/ui/eqwidget.cpp @@ -39,7 +39,7 @@ EqWidget::EqWidget (QWidget *parent) : PixmapWidget (parent) { - m_shaded = FALSE; + m_shaded = false; m_skin = Skin::instance(); setPixmap (m_skin->getEqPart (Skin::EQ_MAIN)); setCursor (m_skin->getCursor (Skin::CUR_EQNORMAL)); @@ -120,7 +120,7 @@ void EqWidget::closeEvent (QCloseEvent* e) void EqWidget::updateSkin() { - m_titleBar->setActive (FALSE); + m_titleBar->setActive (false); setPixmap (m_skin->getEqPart (Skin::EQ_MAIN)); setCursor (m_skin->getCursor (Skin::CUR_EQNORMAL)); setMimimalMode(m_shaded); @@ -142,8 +142,8 @@ void EqWidget::setMimimalMode(bool b) void EqWidget::readSettings() { QSettings settings (Qmmp::configFile(), QSettings::IniFormat); - if (settings.value("General/openbox_compat", FALSE).toBool() || - settings.value("General/metacity_compat", FALSE).toBool()) + if (settings.value("General/openbox_compat", false).toBool() || + settings.value("General/metacity_compat", false).toBool()) setWindowFlags (Qt::Tool | Qt::FramelessWindowHint); else setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint); @@ -156,7 +156,7 @@ void EqWidget::readSettings() m_sliders.at(i)->setValue(settings.value("band_"+ QString("%1").arg(i), 0).toDouble()); m_preamp->setValue(settings.value("preamp", 0).toDouble()); - m_on->setON(settings.value("enabled", FALSE).toBool()); + m_on->setON(settings.value("enabled", false).toBool()); settings.endGroup(); setGain(); //equalizer presets diff --git a/src/ui/jumptotrackdialog.cpp b/src/ui/jumptotrackdialog.cpp index 815740bcd..5c98a6042 100644 --- a/src/ui/jumptotrackdialog.cpp +++ b/src/ui/jumptotrackdialog.cpp @@ -30,7 +30,7 @@ JumpToTrackDialog::JumpToTrackDialog(PlayListManager *manager, QWidget* parent) : QDialog (parent) { setupUi(this); - setAttribute(Qt::WA_QuitOnClose, FALSE); + setAttribute(Qt::WA_QuitOnClose, false); m_pl_manager = manager; m_listModel = new QStringListModel(this); diff --git a/src/ui/keyboardmanager.cpp b/src/ui/keyboardmanager.cpp index 3e4056eab..cbdc70c33 100644 --- a/src/ui/keyboardmanager.cpp +++ b/src/ui/keyboardmanager.cpp @@ -60,14 +60,14 @@ bool KeyboardManager::handleKeyPress (QKeyEvent* ke) keyEnd(ke); break; default: - handled = FALSE; + handled = false; } return handled; } bool KeyboardManager::handleKeyRelease (QKeyEvent*) { - return FALSE; + return false; } void KeyboardManager::keyUp (QKeyEvent * ke) diff --git a/src/ui/keyboardmanager.h b/src/ui/keyboardmanager.h index 95ea57b07..120dbe9dc 100644 --- a/src/ui/keyboardmanager.h +++ b/src/ui/keyboardmanager.h @@ -41,13 +41,13 @@ class KeyboardManager /*! * Handles key press events from \b PlayList object. Returns \b true - * if the key was handled, otherwise \b FALSE. + * if the key was handled, otherwise \b false. */ bool handleKeyPress (QKeyEvent*); /*! * Handles key release events from \b PlayList object. Returns \b true - * if the key was handled, otherwise \b FALSE. + * if the key was handled, otherwise \b false. */ bool handleKeyRelease (QKeyEvent*); diff --git a/src/ui/listwidget.cpp b/src/ui/listwidget.cpp index 5f3a20528..2b17935e2 100644 --- a/src/ui/listwidget.cpp +++ b/src/ui/listwidget.cpp @@ -41,7 +41,7 @@ ListWidget::ListWidget(QWidget *parent) : QWidget(parent) { - m_update = FALSE; + m_update = false; m_skin = Skin::instance(); m_popupWidget = 0; loadColors(); @@ -53,8 +53,8 @@ ListWidget::ListWidget(QWidget *parent) connect (m_player, SIGNAL(repeatableChanged(bool)), SLOT(updateList())); m_first = 0; m_rows = 0; - m_scroll = FALSE; - m_select_on_release = FALSE; + m_scroll = false; + m_select_on_release = false; readSettings(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); setAcceptDrops(true); @@ -69,9 +69,9 @@ void ListWidget::readSettings() { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); m_font.fromString(settings.value("PlayList/Font", QApplication::font().toString()).toString()); - m_show_protocol = settings.value ("PlayList/show_protocol", FALSE).toBool(); + m_show_protocol = settings.value ("PlayList/show_protocol", false).toBool(); m_show_number = settings.value ("PlayList/show_numbers", true).toBool(); - bool show_popup = settings.value("PlayList/show_popup", FALSE).toBool(); + bool show_popup = settings.value("PlayList/show_popup", false).toBool(); if (m_update) { @@ -240,7 +240,7 @@ void ListWidget::wheelEvent (QWheelEvent *e) if (m_first > m_model->count() - m_rows) m_first = m_model->count() - m_rows; - m_scroll = FALSE; + m_scroll = false; updateList(); } @@ -288,7 +288,7 @@ void ListWidget::updateList() m_titles = m_model->getTitles(m_first, m_rows); m_times = m_model->getTimes(m_first, m_rows); - m_scroll = FALSE; + m_scroll = false; //add numbers for (int i = 0; i < m_titles.size() && m_show_number; ++i) { @@ -315,7 +315,7 @@ void ListWidget::setModel(PlayListModel *selected, PlayListModel *previous) qApp->processEvents(); m_model = selected; m_first = 0; - m_scroll = FALSE; + m_scroll = false; recenterCurrent(); updateList(); connect (m_model, SIGNAL(currentChanged()), SLOT(recenterCurrent())); @@ -436,13 +436,13 @@ void ListWidget::mouseMoveEvent(QMouseEvent *e) void ListWidget::mouseReleaseEvent(QMouseEvent *e) { - if (FALSE != m_select_on_release) + if (false != m_select_on_release) { m_model->clearSelection(); m_model->setSelected(m_pressed_row,true); //if(e->modifiers() != Qt::ShiftModifier) m_anchor_row = m_pressed_row; - m_select_on_release = FALSE; + m_select_on_release = false; } m_pressed_row = INVALID_ROW; m_scroll_direction = NONE; diff --git a/src/ui/mainvisual.cpp b/src/ui/mainvisual.cpp index 2522e6311..c2493267d 100644 --- a/src/ui/mainvisual.cpp +++ b/src/ui/mainvisual.cpp @@ -42,7 +42,7 @@ MainVisual *MainVisual::instance() } MainVisual::MainVisual (QWidget *parent) - : Visual (parent), m_vis (0), m_playing (FALSE) + : Visual (parent), m_vis (0), m_playing (false) { m_skin = Skin::instance(); m_ratio = m_skin->ratio(); @@ -407,7 +407,7 @@ void MainVisual::readSettings() act->setChecked(true); m_transparentAction->setChecked( - settings.value("Visualization/transparent_bg", FALSE).toBool()); + settings.value("Visualization/transparent_bg", false).toBool()); updateSettings(); } @@ -475,7 +475,7 @@ bool Analyzer::process (VisualNode *node) calc_freq (dest, node->left); } else - return FALSE; + return false; const double y_scale = 3.60673760222; /* 20.0 / log(256) */ int max = m_lines ? 75 : 19, y, j; @@ -590,7 +590,7 @@ Scope::~Scope() bool Scope::process(VisualNode *node) { if (!node) - return FALSE; + return false; int step = (node->length << 8)/76; int pos = 0; diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index d3ef10a5f..be6f709c7 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -56,7 +56,7 @@ MainWindow::MainWindow(const QStringList& args, BuiltinCommandLineOption* option : QMainWindow(parent) { m_vis = 0; - m_update = FALSE; + m_update = false; m_option_manager = option_manager; setWindowIcon(QIcon(":/32x32/qmmp.png")); #if QT_VERSION >= 0x040500 @@ -296,31 +296,31 @@ void MainWindow::readSettings() move(settings.value("pos", QPoint(100, 100)).toPoint()); //last directory m_lastDir = settings.value("last_dir","/").toString(); - m_startHidden = settings.value("start_hidden", FALSE).toBool(); + m_startHidden = settings.value("start_hidden", false).toBool(); settings.endGroup(); show(); qApp->processEvents(); //visibility m_playlist->setVisible(settings.value("Playlist/visible",true).toBool()); m_equalizer->setVisible(settings.value("Equalizer/visible",true).toBool()); - bool val = settings.value("Playlist/repeatable",FALSE).toBool(); + bool val = settings.value("Playlist/repeatable",false).toBool(); // Repeat/Shuffle m_pl_manager->setRepeatableList(val); m_display->setIsRepeatable(val); - val = settings.value("Playlist/shuffle",FALSE).toBool(); + val = settings.value("Playlist/shuffle",false).toBool(); m_display->setIsShuffle(val); m_pl_manager->setShuffle(val); m_update = true; } - if(!settings.value("General/metacity_compat", FALSE).toBool()) + if(!settings.value("General/metacity_compat", false).toBool()) { setWindowOpacity(settings.value("MainWindow/opacity", 1.0).toDouble()); m_equalizer->setWindowOpacity(settings.value("Equalizer/opacity", 1.0).toDouble()); m_playlist->setWindowOpacity(settings.value("PlayList/opacity", 1.0).toDouble()); } - m_hideOnClose = settings.value("MainWindow/hide_on_close", FALSE).toBool(); + m_hideOnClose = settings.value("MainWindow/hide_on_close", false).toBool(); } void MainWindow::writeSettings() @@ -340,7 +340,7 @@ void MainWindow::writeSettings() // playback state settings.beginGroup("General"); settings.setValue("resume_playback", m_core->state() == Qmmp::Playing && - settings.value("resume_on_startup", FALSE).toBool()); + settings.value("resume_on_startup", false).toBool()); settings.setValue("resume_playback_time", m_core->totalTime() > 0 ? m_core->elapsed() : 0); settings.endGroup(); } @@ -553,14 +553,14 @@ bool MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd } QHash<QString, QStringList> commands = m_option_manager->splitArgs(slist); if(commands.isEmpty()) - return FALSE; + return false; foreach(QString key, commands.keys()) { if(key == "--enqueue" || key == "-e") { QStringList args = commands.value(key); if(args.isEmpty()) - return FALSE; + return false; QStringList full_path_list; foreach(QString s, args) { @@ -576,7 +576,7 @@ bool MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd else if (m_option_manager->identify(key)) m_option_manager->executeCommand(key, commands.value(key), this); else - return FALSE; + return false; } return true; } @@ -624,7 +624,7 @@ void MainWindow::resume() { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("General"); - if(settings.value("resume_playback", FALSE).toBool()) + if(settings.value("resume_playback", false).toBool()) { qint64 pos = settings.value("resume_playback_time").toLongLong(); m_player->play(pos); diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp index 1b26ab5e0..87047731f 100644 --- a/src/ui/playlist.cpp +++ b/src/ui/playlist.cpp @@ -52,11 +52,11 @@ PlayList::PlayList (PlayListManager *manager, QWidget *parent) { setAttribute(Qt::WA_AlwaysShowToolTips,true); m_pl_manager = manager; - m_update = FALSE; - m_resize = FALSE; + m_update = false; + m_resize = false; m_skin = Skin::instance(); m_ratio = m_skin->ratio(); - m_shaded = FALSE; + m_shaded = false; m_pl_browser = 0; m_pl_selector = 0; @@ -413,7 +413,7 @@ void PlayList::mousePressEvent (QMouseEvent *e) setCursor (m_skin->getCursor (Skin::CUR_PSIZE)); } else - m_resize = FALSE; + m_resize = false; } void PlayList::mouseMoveEvent (QMouseEvent *e) @@ -443,7 +443,7 @@ void PlayList::mouseReleaseEvent (QMouseEvent *) setCursor (m_skin->getCursor (Skin::CUR_PNORMAL)); /*if (m_resize) m_listWidget->updateList();*/ - m_resize = FALSE; + m_resize = false; Dock::instance()->updateDock(); } @@ -458,7 +458,7 @@ void PlayList::changeEvent (QEvent * event) void PlayList::readSettings() { QSettings settings (Qmmp::configFile(), QSettings::IniFormat); - if (settings.value("PlayList/show_plalists", FALSE).toBool()) + if (settings.value("PlayList/show_plalists", false).toBool()) { if(!m_pl_selector) m_pl_selector = new PlayListSelector(m_pl_manager, this); @@ -480,8 +480,8 @@ void PlayList::readSettings() } else { - if (settings.value("General/openbox_compat", FALSE).toBool() || - settings.value("General/metacity_compat", FALSE).toBool()) + if (settings.value("General/openbox_compat", false).toBool() || + settings.value("General/metacity_compat", false).toBool()) setWindowFlags (Qt::Tool | Qt::FramelessWindowHint); else setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint); diff --git a/src/ui/playlistbrowser.cpp b/src/ui/playlistbrowser.cpp index bbfc921fe..7f4a52167 100644 --- a/src/ui/playlistbrowser.cpp +++ b/src/ui/playlistbrowser.cpp @@ -27,7 +27,7 @@ PlayListBrowser::PlayListBrowser(PlayListManager *manager, QWidget *parent) : QDialog(parent) { setAttribute(Qt::WA_DeleteOnClose, true); - setAttribute(Qt::WA_QuitOnClose, FALSE); + setAttribute(Qt::WA_QuitOnClose, false); setWindowModality(Qt::NonModal); ui.setupUi(this); m_pl_manager = manager; diff --git a/src/ui/playlistselector.cpp b/src/ui/playlistselector.cpp index 1a70d8ce9..22cc967ce 100644 --- a/src/ui/playlistselector.cpp +++ b/src/ui/playlistselector.cpp @@ -34,10 +34,10 @@ PlayListSelector::PlayListSelector(PlayListManager *manager, QWidget *parent) : QWidget(parent) { - m_update = FALSE; - m_scrollable = FALSE; - m_left_pressed = FALSE; - m_right_pressed = FALSE; + m_update = false; + m_scrollable = false; + m_left_pressed = false; + m_right_pressed = false; m_offset = 0; m_offset_max = 0; m_skin = Skin::instance(); @@ -106,7 +106,7 @@ void PlayListSelector::updateSkin() void PlayListSelector::renamePlaylist() { - bool ok = FALSE; + bool ok = false; QString name = QInputDialog::getText (this, tr("Rename Playlist"), tr("Playlist name:"), QLineEdit::Normal, @@ -189,8 +189,8 @@ void PlayListSelector::mousePressEvent (QMouseEvent *e) void PlayListSelector::mouseReleaseEvent (QMouseEvent *e) { - m_left_pressed = FALSE; - m_right_pressed = FALSE; + m_left_pressed = false; + m_right_pressed = false; drawButtons(); update(); QWidget::mouseReleaseEvent(e); diff --git a/src/ui/playlistslider.cpp b/src/ui/playlistslider.cpp index 4ca80406f..df958fa6b 100644 --- a/src/ui/playlistslider.cpp +++ b/src/ui/playlistslider.cpp @@ -29,8 +29,8 @@ PlayListSlider::PlayListSlider(QWidget *parent) : QWidget(parent) { m_skin = Skin::instance(); - m_moving = FALSE; - m_pressed = FALSE; + m_moving = false; + m_pressed = false; m_min = 0; m_max = 0; m_value = 0; @@ -87,8 +87,8 @@ void PlayListSlider::mousePressEvent(QMouseEvent *e) void PlayListSlider::mouseReleaseEvent(QMouseEvent*) { - m_moving = FALSE; - m_pressed = FALSE; + m_moving = false; + m_pressed = false; update(); } diff --git a/src/ui/playlisttitlebar.cpp b/src/ui/playlisttitlebar.cpp index 55f625b36..cc0b352ff 100644 --- a/src/ui/playlisttitlebar.cpp +++ b/src/ui/playlisttitlebar.cpp @@ -32,12 +32,12 @@ PlayListTitleBar::PlayListTitleBar(QWidget *parent) : PixmapWidget(parent) { - m_active = FALSE; - m_resize = FALSE; + m_active = false; + m_resize = false; m_shade2 = 0; m_model = 0; - m_shaded = FALSE; - m_align = FALSE; + m_shaded = false; + m_align = false; m_skin = Skin::instance(); m_ratio = m_skin->ratio(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); @@ -56,7 +56,7 @@ PlayListTitleBar::PlayListTitleBar(QWidget *parent) readSettings(); QSettings settings (Qmmp::configFile(), QSettings::IniFormat); m_pl->resize (settings.value ("PlayList/size", QSize (m_ratio*275, m_ratio*116)).toSize()); - if (settings.value ("PlayList/shaded", FALSE).toBool()) + if (settings.value ("PlayList/shaded", false).toBool()) shade(); resize(m_pl->width(),height()); m_align = true; @@ -171,7 +171,7 @@ void PlayListTitleBar::mousePressEvent(QMouseEvent* event) void PlayListTitleBar::mouseReleaseEvent(QMouseEvent*) { Dock::instance()->updateDock(); - m_resize = FALSE; + m_resize = false; } void PlayListTitleBar::mouseMoveEvent(QMouseEvent* event) diff --git a/src/ui/popupwidget.cpp b/src/ui/popupwidget.cpp index 48711cbc7..d670de459 100644 --- a/src/ui/popupwidget.cpp +++ b/src/ui/popupwidget.cpp @@ -38,7 +38,7 @@ PopupWidget::PopupWidget(QWidget *parent) { setWindowFlags(Qt::X11BypassWindowManagerHint | Qt::Dialog | Qt::FramelessWindowHint); //setFrameStyle(QFrame::Box | QFrame::Plain); - setAttribute(Qt::WA_QuitOnClose, FALSE); + setAttribute(Qt::WA_QuitOnClose, false); m_item = 0; QHBoxLayout *hlayout = new QHBoxLayout(this); //layout m_pixlabel = new QLabel(this); diff --git a/src/ui/positionbar.cpp b/src/ui/positionbar.cpp index c0ec42f84..c27a586fe 100644 --- a/src/ui/positionbar.cpp +++ b/src/ui/positionbar.cpp @@ -36,11 +36,11 @@ PositionBar::PositionBar(QWidget *parent) connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); setPixmap(m_skin->getPosBar()); mw = qobject_cast<MainWindow*>(window()); - m_moving = FALSE; + m_moving = false; m_min = 0; m_max = 0; m_old = m_value = 0; - draw(FALSE); + draw(false); setCursor(m_skin->getCursor(Skin::CUR_POSBAR)); } @@ -87,13 +87,13 @@ void PositionBar::mouseMoveEvent (QMouseEvent *e) void PositionBar::mouseReleaseEvent(QMouseEvent*) { - draw(FALSE); + draw(false); if (m_value!=m_old && m_max > 0) { m_old = m_value; mw->seek(m_value); } - m_moving = FALSE; + m_moving = false; } void PositionBar::setValue(qint64 v) @@ -101,19 +101,19 @@ void PositionBar::setValue(qint64 v) if (m_moving || m_max == 0) return; m_value = v; - draw(FALSE); + draw(false); } void PositionBar::setMax(qint64 max) { m_max = max; - draw(FALSE); + draw(false); } void PositionBar::updateSkin() { resize(m_skin->getPosBar().size()); - draw(FALSE); + draw(false); setCursor(m_skin->getCursor(Skin::CUR_POSBAR)); } diff --git a/src/ui/shadedbar.cpp b/src/ui/shadedbar.cpp index b524acd10..bdabbe516 100644 --- a/src/ui/shadedbar.cpp +++ b/src/ui/shadedbar.cpp @@ -38,7 +38,7 @@ ShadedBar::ShadedBar(QWidget *parent, uint slider1, uint slider2, uint slider3) else resize(m_ratio*42,m_ratio*7); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); - m_moving = FALSE; + m_moving = false; m_min = 0; m_max = 100; m_old = m_value = 0; @@ -88,7 +88,7 @@ void ShadedBar::mouseMoveEvent (QMouseEvent *e) void ShadedBar::mouseReleaseEvent(QMouseEvent*) { - m_moving = FALSE; + m_moving = false; draw(); m_old = m_value; } diff --git a/src/ui/skin.cpp b/src/ui/skin.cpp index 225a0e35e..35c01ef2a 100644 --- a/src/ui/skin.cpp +++ b/src/ui/skin.cpp @@ -77,8 +77,8 @@ Skin::~Skin() void Skin::setSkin (const QString& path) { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - m_use_cursors = settings.value("General/skin_cursors", FALSE).toBool(); - m_double_size = settings.value("General/double_size", FALSE).toBool(); + m_use_cursors = settings.value("General/skin_cursors", false).toBool(); + m_double_size = settings.value("General/double_size", false).toBool(); settings.setValue("skin_path",path); qDebug ("Skin: using %s",qPrintable(path)); m_skin_dir = QDir (path); diff --git a/src/ui/skinreader.cpp b/src/ui/skinreader.cpp index 69b976636..297493ebf 100644 --- a/src/ui/skinreader.cpp +++ b/src/ui/skinreader.cpp @@ -64,7 +64,7 @@ void SkinReader::generateThumbs() { if (fileInfo.baseName () == thumbFile.baseName ()) { - del = FALSE; + del = false; break; } } @@ -84,7 +84,7 @@ void SkinReader::generateThumbs() { if (fileInfo.baseName () == thumbInfo.baseName ()) { - create = FALSE; + create = false; break; } } @@ -126,9 +126,9 @@ void SkinReader::unpackSkin(const QString &path) dir.remove(file.fileName()); //unpack if (path.endsWith(".tgz") || path.endsWith(".tar.gz") || path.endsWith(".tar.bz2")) - untar(path, QDir::homePath() +"/.qmmp/cache/skin", FALSE); + untar(path, QDir::homePath() +"/.qmmp/cache/skin", false); if (path.endsWith(".zip") || path.endsWith(".wsz")) - unzip(path, QDir::homePath() +"/.qmmp/cache/skin", FALSE); + unzip(path, QDir::homePath() +"/.qmmp/cache/skin", false); } const QStringList SkinReader::skins() diff --git a/src/ui/textscroller.cpp b/src/ui/textscroller.cpp index 5328d574b..22b823350 100644 --- a/src/ui/textscroller.cpp +++ b/src/ui/textscroller.cpp @@ -51,7 +51,7 @@ TextScroller::TextScroller ( QWidget *parent ) m_progress = -1; m_metrics = 0; m_text = "Qt-based Multimedia Player (Qmmp " + Qmmp::strVersion() + ")"; - m_update = FALSE; + m_update = false; readSettings(); m_timer = new QTimer ( this ); connect (m_timer, SIGNAL (timeout()), SLOT (addOffset())); @@ -141,7 +141,7 @@ void TextScroller::readSettings() { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); QString fontname = settings.value("MainWindow/Font","").toString(); - m_bitmapConf = settings.value("MainWindow/bitmap_font", FALSE).toBool(); + m_bitmapConf = settings.value("MainWindow/bitmap_font", false).toBool(); m_font.fromString(fontname); if (m_update) @@ -152,7 +152,7 @@ void TextScroller::readSettings() else { m_update = true; - m_bitmap = FALSE; + m_bitmap = false; } m_metrics = new QFontMetrics(m_font); @@ -249,7 +249,7 @@ void TextScroller::mouseReleaseEvent (QMouseEvent *e) else if (e->button() == Qt::LeftButton && m_autoscroll) { m_timer->start(); - m_pressing = FALSE; + m_pressing = false; } else QWidget::mouseReleaseEvent(e); diff --git a/src/ui/titlebar.cpp b/src/ui/titlebar.cpp index 02b9d41ac..c628d6acc 100644 --- a/src/ui/titlebar.cpp +++ b/src/ui/titlebar.cpp @@ -37,11 +37,11 @@ TitleBar::TitleBar(QWidget *parent) : PixmapWidget(parent) { - m_align = FALSE; + m_align = false; m_skin = Skin::instance(); setPixmap(m_skin->getTitleBar(Skin::TITLEBAR_A)); m_mw = qobject_cast<MainWindow*>(parent->parent()); - m_shaded = FALSE; + m_shaded = false; m_shade2 = 0; m_currentTime = 0; m_control = 0; @@ -56,10 +56,10 @@ TitleBar::TitleBar(QWidget *parent) connect(m_shade, SIGNAL(clicked()), SLOT(shade())); m_close = new Button(this,Skin::BT_CLOSE_N,Skin::BT_CLOSE_P, Skin::CUR_CLOSE); connect(m_close, SIGNAL(clicked()), m_mw, SLOT(handleCloseRequest())); - setActive(FALSE); + setActive(false); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - if (settings.value("Display/shaded", FALSE).toBool()) + if (settings.value("Display/shaded", false).toBool()) shade(); m_align = true; setCursor(m_skin->getCursor(Skin::CUR_TITLEBAR)); @@ -135,7 +135,7 @@ void TitleBar::setActive(bool a) void TitleBar::updateSkin() { - setActive(FALSE); + setActive(false); setCursor(m_skin->getCursor(Skin::CUR_TITLEBAR)); updatePositions(); } diff --git a/src/ui/togglebutton.cpp b/src/ui/togglebutton.cpp index 5994134ec..994ac9f20 100644 --- a/src/ui/togglebutton.cpp +++ b/src/ui/togglebutton.cpp @@ -32,9 +32,9 @@ ToggleButton::ToggleButton ( QWidget *parent,uint on_n,uint on_p,uint off_n,uint m_on_p = on_p; m_off_n = off_n; m_off_p = off_p; - m_on = FALSE; + m_on = false; skin = Skin::instance(); - setON ( FALSE ); + setON ( false ); connect ( skin, SIGNAL ( skinChanged() ), this, SLOT ( updateSkin() ) ); } @@ -99,7 +99,7 @@ void ToggleButton::mouseMoveEvent (QMouseEvent *e) else setPixmap ( skin->getButton ( m_on_p ) ); } else if ( m_cursorin && !rect().contains(e->pos()) ) { - m_cursorin = FALSE; + m_cursorin = false; if ( m_old_on ) setPixmap ( skin->getButton ( m_on_n ) ); else diff --git a/src/ui/volumebar.cpp b/src/ui/volumebar.cpp index b0c656d4e..6a4169dae 100644 --- a/src/ui/volumebar.cpp +++ b/src/ui/volumebar.cpp @@ -35,11 +35,11 @@ VolumeBar::VolumeBar(QWidget *parent) : PixmapWidget(parent) connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); setPixmap(m_skin->getVolumeBar(0)); mw = qobject_cast<MainWindow*>(window()); - m_moving = FALSE; + m_moving = false; m_min = 0; m_max = 100; m_old = m_value = 0; - draw(FALSE); + draw(false); } @@ -82,8 +82,8 @@ void VolumeBar::mouseMoveEvent (QMouseEvent *e) void VolumeBar::mouseReleaseEvent(QMouseEvent*) { - m_moving = FALSE; - draw(FALSE); + m_moving = false; + draw(false); m_old = m_value; } @@ -92,19 +92,19 @@ void VolumeBar::setValue(int v) if (m_moving || m_max == 0) return; m_value = v; - draw(FALSE); + draw(false); } void VolumeBar::setMax(int max) { m_max = max; - draw(FALSE); + draw(false); } void VolumeBar::updateSkin() { resize(m_skin->getVolumeBar(0).size()); - draw(FALSE); + draw(false); setCursor(m_skin->getCursor(Skin::CUR_VOLBAL)); } |