diff options
Diffstat (limited to 'src')
158 files changed, 409 insertions, 409 deletions
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp index f113c4919..a8bdfea32 100644 --- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp +++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp @@ -32,7 +32,7 @@ bool IncDecVolumeCommandLineOption::identify(const QString & str) const str == QString("--volume-dec") ) { - return TRUE; + return true; } return FALSE; diff --git a/src/plugins/Effect/bs2b/effectbs2bfactory.cpp b/src/plugins/Effect/bs2b/effectbs2bfactory.cpp index 3a61184b2..8fa13ddc0 100644 --- a/src/plugins/Effect/bs2b/effectbs2bfactory.cpp +++ b/src/plugins/Effect/bs2b/effectbs2bfactory.cpp @@ -30,8 +30,8 @@ const EffectProperties EffectBs2bFactory::properties() const EffectProperties properties; properties.name = tr("BS2B Plugin"); properties.shortName = "bs2b"; - properties.hasSettings = TRUE; - properties.hasAbout = TRUE; + properties.hasSettings = true; + properties.hasAbout = true; return properties; } diff --git a/src/plugins/Effect/bs2b/settingsdialog.cpp b/src/plugins/Effect/bs2b/settingsdialog.cpp index 9d29a1a77..ac4cdba8c 100644 --- a/src/plugins/Effect/bs2b/settingsdialog.cpp +++ b/src/plugins/Effect/bs2b/settingsdialog.cpp @@ -28,7 +28,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) { ui.setupUi(this); - setAttribute(Qt::WA_DeleteOnClose, TRUE); + setAttribute(Qt::WA_DeleteOnClose, true); ui.feedSlider->setRange(BS2B_MINFEED, BS2B_MAXFEED); ui.freqSlider->setRange(BS2B_MINFCUT, BS2B_MAXFCUT); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); diff --git a/src/plugins/Effect/ladspa/effectladspafactory.cpp b/src/plugins/Effect/ladspa/effectladspafactory.cpp index f7b3d5263..30b094502 100644 --- a/src/plugins/Effect/ladspa/effectladspafactory.cpp +++ b/src/plugins/Effect/ladspa/effectladspafactory.cpp @@ -29,8 +29,8 @@ const EffectProperties EffectLADSPAFactory::properties() const EffectProperties properties; properties.name = tr("LADSPA Plugin"); properties.shortName = "ladspa"; - properties.hasSettings = TRUE; - properties.hasAbout = TRUE; + properties.hasSettings = true; + properties.hasAbout = true; return properties; } diff --git a/src/plugins/Effect/ladspa/settingsdialog.cpp b/src/plugins/Effect/ladspa/settingsdialog.cpp index fec394d3f..5ea760be9 100644 --- a/src/plugins/Effect/ladspa/settingsdialog.cpp +++ b/src/plugins/Effect/ladspa/settingsdialog.cpp @@ -35,7 +35,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) { ui.setupUi(this); - setAttribute(Qt::WA_DeleteOnClose, TRUE); + setAttribute(Qt::WA_DeleteOnClose, true); ui.loadButton->setIcon(QApplication::style()->standardIcon(QStyle::SP_ArrowRight)); ui.unloadButton->setIcon(QApplication::style()->standardIcon(QStyle::SP_ArrowLeft)); diff --git a/src/plugins/Effect/srconverter/effectsrconverterfactory.cpp b/src/plugins/Effect/srconverter/effectsrconverterfactory.cpp index 86490cdfc..92c3f8832 100644 --- a/src/plugins/Effect/srconverter/effectsrconverterfactory.cpp +++ b/src/plugins/Effect/srconverter/effectsrconverterfactory.cpp @@ -29,8 +29,8 @@ const EffectProperties EffectSRConverterFactory::properties() const EffectProperties properties; properties.name = tr("SRC Plugin"); properties.shortName = "SRC"; - properties.hasSettings = TRUE; - properties.hasAbout = TRUE; + properties.hasSettings = true; + properties.hasAbout = true; return properties; } diff --git a/src/plugins/Effect/srconverter/settingsdialog.cpp b/src/plugins/Effect/srconverter/settingsdialog.cpp index c335a576d..9ab4ad0d9 100644 --- a/src/plugins/Effect/srconverter/settingsdialog.cpp +++ b/src/plugins/Effect/srconverter/settingsdialog.cpp @@ -28,7 +28,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) { ui.setupUi(this); - setAttribute(Qt::WA_DeleteOnClose, TRUE); + setAttribute(Qt::WA_DeleteOnClose, true); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); ui.srSpinBox->setValue(settings.value("SRC/sample_rate",48000).toInt()); ui.engineComboBox->setCurrentIndex(settings.value("SRC/engine", 0).toInt()); diff --git a/src/plugins/Effect/srconverter/srconverter.cpp b/src/plugins/Effect/srconverter/srconverter.cpp index 95c912cb6..bec360a4f 100644 --- a/src/plugins/Effect/srconverter/srconverter.cpp +++ b/src/plugins/Effect/srconverter/srconverter.cpp @@ -76,7 +76,7 @@ void SRConverter::applyEffect(Buffer *b) m_srcOut = new float [overLrLength]; m_wOut = new short[overLrLength]; src_short_to_float_array((short *)b->data, m_srcIn, lrLength); - m_isSrcAlloc = TRUE; + m_isSrcAlloc = true; m_src_data.data_in = m_srcIn; m_src_data.data_out = m_srcOut; m_src_data.end_of_input = 0; diff --git a/src/plugins/Engines/mplayer/mplayerengine.cpp b/src/plugins/Engines/mplayer/mplayerengine.cpp index bf315c2eb..89c35015d 100644 --- a/src/plugins/Engines/mplayer/mplayerengine.cpp +++ b/src/plugins/Engines/mplayer/mplayerengine.cpp @@ -103,7 +103,7 @@ bool MplayerEngine::play() if(m_process->state() != QProcess::NotRunning) return FALSE; startMplayerProcess(); - return TRUE; + return true; } bool MplayerEngine::enqueue(InputSource *source) @@ -125,7 +125,7 @@ bool MplayerEngine::enqueue(InputSource *source) m_url = url; else m_files.enqueue(url); - return TRUE; + return true; } bool MplayerEngine::initialize() @@ -147,7 +147,7 @@ bool MplayerEngine::initialize() m_args << QString("-autosync %1").arg(settings.value("autosync_factor", 100).toInt()); m_args << m_url; - return TRUE; + return true; } qint64 MplayerEngine::totalTime() diff --git a/src/plugins/Engines/mplayer/mplayerenginefactory.cpp b/src/plugins/Engines/mplayer/mplayerenginefactory.cpp index 8dbe80960..7398fd46d 100644 --- a/src/plugins/Engines/mplayer/mplayerenginefactory.cpp +++ b/src/plugins/Engines/mplayer/mplayerenginefactory.cpp @@ -36,8 +36,8 @@ const EngineProperties MplayerEngineFactory::properties() const properties.description = tr("Video Files"); //properties.contentType = "application/ogg;audio/x-vorbis+ogg"; properties.protocols = "file"; - properties.hasAbout = TRUE; - properties.hasSettings = TRUE; + properties.hasAbout = true; + properties.hasSettings = true; return properties; } @@ -48,7 +48,7 @@ bool MplayerEngineFactory::supports(const QString &source) const { QRegExp regexp(filter, Qt::CaseInsensitive, QRegExp::Wildcard); if (regexp.exactMatch(source)) - return TRUE; + return true; } return FALSE; } diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp index e2e90721c..d02a06083 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp @@ -120,7 +120,7 @@ const FileDialogProperties QmmpFileDialogFactory::properties() const FileDialogProperties properties; properties.name = tr("Qmmp File Dialog"); properties.shortName = "qmmp_dialog"; - properties.hasAbout =TRUE; + properties.hasAbout =true; return properties; } diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp index 6f98f810d..73aab2ce9 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp @@ -72,7 +72,7 @@ QmmpFileDialogImpl::QmmpFileDialogImpl(QWidget * parent, Qt::WindowFlags f) : QD fileListView->setModel(m_model); treeView->setModel(m_model); - treeView->setSortingEnabled(TRUE); + treeView->setSortingEnabled(true); treeView->setItemsExpandable(FALSE); treeView->header()->setSortIndicator(0, Qt::AscendingOrder); treeView->header()->setStretchLastSection (FALSE); @@ -291,7 +291,7 @@ void QmmpFileDialogImpl::setModeAndMask(const QString& d,FileDialog::Mode m, con else { m_model->setFilter(QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot); - fileTypeComboBox->setEnabled(TRUE); + fileTypeComboBox->setEnabled(true); fileTypeComboBox->addItems(mask); on_fileTypeComboBox_activated(0); } @@ -374,7 +374,7 @@ void QmmpFileDialogImpl::updateSelection () fileNameLineEdit->setText(str); if (m_mode == FileDialog::AddFiles || m_mode == FileDialog::AddFile/* || FileDialog::SaveFile*/) { - addPushButton->setEnabled(TRUE); + addPushButton->setEnabled(true); foreach(str, files) { if (QFileInfo(str).isDir()) @@ -385,7 +385,7 @@ void QmmpFileDialogImpl::updateSelection () } } else - addPushButton->setEnabled(TRUE); + addPushButton->setEnabled(true); } else { @@ -432,7 +432,7 @@ void QmmpFileDialogImpl::addFiles(const QStringList &list) regExp.setPatternSyntax(QRegExp::Wildcard); if (f_name.contains(regExp)) { - contains = TRUE; + contains = true; break; } } diff --git a/src/plugins/General/covermanager/covermanagerfactory.cpp b/src/plugins/General/covermanager/covermanagerfactory.cpp index f31b96121..041e797d0 100644 --- a/src/plugins/General/covermanager/covermanagerfactory.cpp +++ b/src/plugins/General/covermanager/covermanagerfactory.cpp @@ -28,7 +28,7 @@ const GeneralProperties CoverManagerFactory::properties() const GeneralProperties properties; properties.name = tr("Cover Manager Plugin"); properties.shortName = "cover_manager"; - properties.hasAbout = TRUE; + properties.hasAbout = true; properties.hasSettings = FALSE; properties.visibilityControl = FALSE; return properties; diff --git a/src/plugins/General/covermanager/coverwidget.cpp b/src/plugins/General/covermanager/coverwidget.cpp index f6fd62b91..f00d217f1 100644 --- a/src/plugins/General/covermanager/coverwidget.cpp +++ b/src/plugins/General/covermanager/coverwidget.cpp @@ -32,7 +32,7 @@ CoverWidget::CoverWidget(QWidget *parent) : QWidget(parent) { setWindowFlags(Qt::Window); - setAttribute(Qt::WA_DeleteOnClose, TRUE); + setAttribute(Qt::WA_DeleteOnClose, true); m_menu = new QMenu(this); m_menu->addAction(tr("&Save As..."), this, SLOT(saveAs()), tr("Ctrl+S")); QMenu *sizeMenu = m_menu->addMenu(tr("Size")); @@ -52,10 +52,10 @@ CoverWidget::CoverWidget(QWidget *parent) m_size = settings.value("CoverManager/size", 0).toInt(); foreach(QAction *a, sizeMenu->actions ()) { - a->setCheckable(TRUE); + a->setCheckable(true); if(a->data().toInt() == m_size) { - a->setChecked(TRUE); + a->setChecked(true); processResizeAction(a); } } diff --git a/src/plugins/General/fileops/fileops.cpp b/src/plugins/General/fileops/fileops.cpp index 32aa7b2e2..f9555592b 100644 --- a/src/plugins/General/fileops/fileops.cpp +++ b/src/plugins/General/fileops/fileops.cpp @@ -42,9 +42,9 @@ FileOps::FileOps(QObject *parent) { //separators QAction *separator1 = new QAction(this); - separator1->setSeparator (TRUE); + separator1->setSeparator (true); QAction *separator2 = new QAction(this); - separator2->setSeparator (TRUE); + separator2->setSeparator (true); //load settings QSignalMapper *mapper = new QSignalMapper(this); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); @@ -58,7 +58,7 @@ FileOps::FileOps(QObject *parent) for (int i = 0; i < count; ++i) { - if (settings.value(QString("enabled_%1").arg(i), TRUE).toBool()) + if (settings.value(QString("enabled_%1").arg(i), true).toBool()) { m_types << settings.value(QString("action_%1").arg(i), FileOps::COPY).toInt(); QString name = settings.value(QString("name_%1").arg(i), "Action").toString(); diff --git a/src/plugins/General/fileops/fileopsfactory.cpp b/src/plugins/General/fileops/fileopsfactory.cpp index 20e8aca0e..13b126afa 100644 --- a/src/plugins/General/fileops/fileopsfactory.cpp +++ b/src/plugins/General/fileops/fileopsfactory.cpp @@ -29,8 +29,8 @@ const GeneralProperties FileOpsFactory::properties() const GeneralProperties properties; properties.name = tr("File Operations Plugin"); properties.shortName = "fileops"; - properties.hasAbout = TRUE; - properties.hasSettings = TRUE; + properties.hasAbout = true; + properties.hasSettings = true; properties.visibilityControl = FALSE; return properties; } diff --git a/src/plugins/General/fileops/settingsdialog.cpp b/src/plugins/General/fileops/settingsdialog.cpp index feadafb8c..090cd1e79 100644 --- a/src/plugins/General/fileops/settingsdialog.cpp +++ b/src/plugins/General/fileops/settingsdialog.cpp @@ -55,7 +55,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) comboBox->addItem (tr("Remove"), FileOps::REMOVE); comboBox->setFocusPolicy (Qt::NoFocus); - checkBox->setChecked(settings.value(QString("enabled_%1").arg(i), TRUE).toBool()); + checkBox->setChecked(settings.value(QString("enabled_%1").arg(i), true).toBool()); int ci = comboBox->findData (settings.value(QString("action_%1").arg(i), FileOps::COPY).toInt()); if (ci >= 0) comboBox->setCurrentIndex(ci); @@ -126,7 +126,7 @@ void SettingsDialog::createAction() ui.tableWidget->insertRow (row); QCheckBox *checkBox = new QCheckBox; checkBox->setFocusPolicy (Qt::NoFocus); - checkBox->setChecked(TRUE); + checkBox->setChecked(true); QComboBox *comboBox = new QComboBox; comboBox->addItem (tr("Copy"), FileOps::COPY); diff --git a/src/plugins/General/hal/halfactory.cpp b/src/plugins/General/hal/halfactory.cpp index 97456d1a1..139c80040 100644 --- a/src/plugins/General/hal/halfactory.cpp +++ b/src/plugins/General/hal/halfactory.cpp @@ -29,8 +29,8 @@ const GeneralProperties HalFactory::properties() const GeneralProperties properties; properties.name = tr("HAL Plugin"); properties.shortName = "hal"; - properties.hasAbout = TRUE; - properties.hasSettings = TRUE; + properties.hasAbout = true; + properties.hasSettings = true; properties.visibilityControl = FALSE; return properties; } diff --git a/src/plugins/General/hal/halplugin.cpp b/src/plugins/General/hal/halplugin.cpp index 1d40e0c8b..94364f44d 100644 --- a/src/plugins/General/hal/halplugin.cpp +++ b/src/plugins/General/hal/halplugin.cpp @@ -41,8 +41,8 @@ HalPlugin::HalPlugin(QObject *parent) //load settings QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("HAL"); - m_detectCDA = settings.value("cda", TRUE).toBool(); - m_detectRemovable = settings.value("removable", TRUE).toBool(); + 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; //find existing devices diff --git a/src/plugins/General/hal/settingsdialog.cpp b/src/plugins/General/hal/settingsdialog.cpp index 2c4062de1..45987a3d7 100644 --- a/src/plugins/General/hal/settingsdialog.cpp +++ b/src/plugins/General/hal/settingsdialog.cpp @@ -30,10 +30,10 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.setupUi(this); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("HAL"); - ui.cdGroupBox->setChecked(settings.value("cda", TRUE).toBool()); + 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.removableGroupBox->setChecked(settings.value("removable", TRUE).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()); settings.endGroup(); diff --git a/src/plugins/General/hotkey/hotkeyfactory.cpp b/src/plugins/General/hotkey/hotkeyfactory.cpp index 9e706369d..2add2eecb 100644 --- a/src/plugins/General/hotkey/hotkeyfactory.cpp +++ b/src/plugins/General/hotkey/hotkeyfactory.cpp @@ -29,8 +29,8 @@ const GeneralProperties HotkeyFactory::properties() const GeneralProperties properties; properties.name = tr("Global Hotkey Plugin"); properties.shortName = "hotkey"; - properties.hasAbout = TRUE; - properties.hasSettings = TRUE; + properties.hasAbout = true; + properties.hasSettings = true; properties.visibilityControl = FALSE; return properties; } diff --git a/src/plugins/General/hotkey/hotkeymanager.cpp b/src/plugins/General/hotkey/hotkeymanager.cpp index 7ddb83a4f..23d93571e 100644 --- a/src/plugins/General/hotkey/hotkeymanager.cpp +++ b/src/plugins/General/hotkey/hotkeymanager.cpp @@ -271,7 +271,7 @@ void HotkeyManager::ensureModifiers() m_meta_mask = Mod4Mask; } - m_haveMods = TRUE; + m_haveMods = true; } QList<long> HotkeyManager::ignModifiersList() diff --git a/src/plugins/General/kdenotify/kdenotifyfactory.cpp b/src/plugins/General/kdenotify/kdenotifyfactory.cpp index 967b92305..ffeaffafe 100644 --- a/src/plugins/General/kdenotify/kdenotifyfactory.cpp +++ b/src/plugins/General/kdenotify/kdenotifyfactory.cpp @@ -29,8 +29,8 @@ const GeneralProperties KdeNotifyFactory::properties() const GeneralProperties properties; properties.name = tr("KDE 4 notification plugin"); properties.shortName = "kdenotify_icon"; - properties.hasAbout = TRUE; - properties.hasSettings = TRUE; + properties.hasAbout = true; + properties.hasSettings = true; properties.visibilityControl = FALSE; return properties; } diff --git a/src/plugins/General/lyrics/lyricsfactory.cpp b/src/plugins/General/lyrics/lyricsfactory.cpp index f9e8f1d7c..d8ba2e224 100644 --- a/src/plugins/General/lyrics/lyricsfactory.cpp +++ b/src/plugins/General/lyrics/lyricsfactory.cpp @@ -28,7 +28,7 @@ const GeneralProperties LyricsFactory::properties() const GeneralProperties properties; properties.name = tr("Lyrics Plugin"); properties.shortName = "lyrics"; - properties.hasAbout = TRUE; + properties.hasAbout = true; properties.hasSettings = FALSE; properties.visibilityControl = FALSE; return properties; diff --git a/src/plugins/General/mpris/mprisfactory.cpp b/src/plugins/General/mpris/mprisfactory.cpp index 0b95d9967..1adc96458 100644 --- a/src/plugins/General/mpris/mprisfactory.cpp +++ b/src/plugins/General/mpris/mprisfactory.cpp @@ -28,7 +28,7 @@ const GeneralProperties MPRISFactory::properties() const GeneralProperties properties; properties.name = tr("MPRIS Plugin"); properties.shortName = "mpris"; - properties.hasAbout = TRUE; + properties.hasAbout = true; 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 42b07eb2d..80ac2d245 100644 --- a/src/plugins/General/notifier/notifier.cpp +++ b/src/plugins/General/notifier/notifier.cpp @@ -36,8 +36,8 @@ Notifier::Notifier(QObject *parent) QFile::remove(QDir::homePath()+"/.psi/tune"); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("Notifier"); - m_desktop = settings.value("song_notification", TRUE).toBool(); - m_showVolume = settings.value("volume_notification", TRUE).toBool(); + m_desktop = settings.value("song_notification", true).toBool(); + m_showVolume = settings.value("volume_notification", true).toBool(); m_psi = settings.value("psi_notification", FALSE).toBool(); settings.endGroup(); m_core = SoundCore::instance(); diff --git a/src/plugins/General/notifier/notifierfactory.cpp b/src/plugins/General/notifier/notifierfactory.cpp index 49be44fd6..6efa8e802 100644 --- a/src/plugins/General/notifier/notifierfactory.cpp +++ b/src/plugins/General/notifier/notifierfactory.cpp @@ -29,8 +29,8 @@ const GeneralProperties NotifierFactory::properties() const GeneralProperties properties; properties.name = tr("Notifier Plugin"); properties.shortName = "notifier"; - properties.hasAbout = TRUE; - properties.hasSettings = TRUE; + properties.hasAbout = true; + properties.hasSettings = true; properties.visibilityControl = FALSE; return properties; } diff --git a/src/plugins/General/notifier/popupwidget.cpp b/src/plugins/General/notifier/popupwidget.cpp index 70189e7b8..dfc860224 100644 --- a/src/plugins/General/notifier/popupwidget.cpp +++ b/src/plugins/General/notifier/popupwidget.cpp @@ -68,7 +68,7 @@ PopupWidget::PopupWidget(QWidget *parent) //timer m_timer = new QTimer(this); m_timer->setInterval(delay); - m_timer->setSingleShot (TRUE); + m_timer->setSingleShot (true); connect(m_timer, SIGNAL(timeout ()), SLOT(deleteLater())); } diff --git a/src/plugins/General/notifier/settingsdialog.cpp b/src/plugins/General/notifier/settingsdialog.cpp index 917c82ba0..7bcf253cb 100644 --- a/src/plugins/General/notifier/settingsdialog.cpp +++ b/src/plugins/General/notifier/settingsdialog.cpp @@ -44,10 +44,10 @@ SettingsDialog::SettingsDialog(QWidget *parent) settings.beginGroup("Notifier"); ui.messageDelaySpinBox->setValue(settings.value("message_delay", 2000).toInt()); uint pos = settings.value("message_pos", PopupWidget::BOTTOMLEFT).toUInt(); - m_buttons.value(pos)->setChecked(TRUE); + m_buttons.value(pos)->setChecked(true); 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.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); QString fontname = settings.value ("font").toString(); ui.coverSizeSlider->setValue(settings.value ("cover_size", 64).toInt()); diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp index 13f8f7e5b..ef4610a3a 100644 --- a/src/plugins/General/scrobbler/scrobbler.cpp +++ b/src/plugins/General/scrobbler/scrobbler.cpp @@ -202,7 +202,7 @@ void Scrobbler::processResponse(QNetworkReply *reply) if (!strlist[0].contains("OK") || strlist.size() < 4) { qWarning("Scrobbler[%s]: handshake phase error", qPrintable(m_name)); - m_disabled = TRUE; + m_disabled = true; if(strlist[0].contains("BANNED")) qWarning("Scrobbler[%s]: client has been banned", qPrintable(m_name)); else if(strlist[0].contains("BADAUTH")) diff --git a/src/plugins/General/scrobbler/scrobblerfactory.cpp b/src/plugins/General/scrobbler/scrobblerfactory.cpp index 02a729e7c..332dd22ac 100644 --- a/src/plugins/General/scrobbler/scrobblerfactory.cpp +++ b/src/plugins/General/scrobbler/scrobblerfactory.cpp @@ -29,8 +29,8 @@ const GeneralProperties ScrobblerFactory::properties() const GeneralProperties properties; properties.name = tr("Scrobbler Plugin"); properties.shortName = "scrobbler"; - properties.hasAbout = TRUE; - properties.hasSettings = TRUE; + properties.hasAbout = true; + properties.hasSettings = true; properties.visibilityControl = FALSE; return properties; } diff --git a/src/plugins/General/statusicon/qmmptrayicon.cpp b/src/plugins/General/statusicon/qmmptrayicon.cpp index e335d3079..ed3469484 100644 --- a/src/plugins/General/statusicon/qmmptrayicon.cpp +++ b/src/plugins/General/statusicon/qmmptrayicon.cpp @@ -49,13 +49,13 @@ bool QmmpTrayIcon::event(QEvent *e) { wheelEvent((QWheelEvent *) e); e->accept(); - return TRUE; + return true; } if (e->type() == QEvent::ToolTip) { showToolTip(); e->accept(); - return TRUE; + return true; } return QSystemTrayIcon::event(e); } diff --git a/src/plugins/General/statusicon/settingsdialog.cpp b/src/plugins/General/statusicon/settingsdialog.cpp index 391277c6f..7ee4a5add 100644 --- a/src/plugins/General/statusicon/settingsdialog.cpp +++ b/src/plugins/General/statusicon/settingsdialog.cpp @@ -30,15 +30,15 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.setupUi(this); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("Tray"); - ui.messageGroupBox->setChecked(settings.value("show_message",TRUE).toBool()); + ui.messageGroupBox->setChecked(settings.value("show_message",true).toBool()); ui.messageDelaySpinBox->setValue(settings.value("message_delay", 2000).toInt()); - ui.niceTooltipGroupBox->setChecked(settings.value("show_tooltip", TRUE).toBool()); + ui.niceTooltipGroupBox->setChecked(settings.value("show_tooltip", true).toBool()); ui.niceTooltipDelaySpinBox->setValue(settings.value("tooltip_delay",2000).toInt()); 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.niceTooltipSplitCheckBox->setChecked(settings.value("split_file_name",true).toBool()); ui.standardIconsCheckBox->setChecked(settings.value("use_standard_icons",FALSE).toBool()); - ui.progressCheckBox->setChecked(settings.value("tooltip_progress",TRUE).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 e54ef0ded..fb4fb2ed1 100644 --- a/src/plugins/General/statusicon/statusicon.cpp +++ b/src/plugins/General/statusicon/statusicon.cpp @@ -44,11 +44,11 @@ StatusIcon::StatusIcon(QObject *parent) m_player = MediaPlayer::instance(); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("Tray"); - m_showMessage = settings.value("show_message",TRUE).toBool(); + 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_tray->showNiceToolTip(settings.value("show_nicetooltip",TRUE).toBool()); + m_tray->showNiceToolTip(settings.value("show_nicetooltip",true).toBool()); if(m_useStandardIcons) m_tray->setIcon(QApplication::style ()->standardIcon(QStyle::SP_MediaStop)); else diff --git a/src/plugins/General/statusicon/statusiconfactory.cpp b/src/plugins/General/statusicon/statusiconfactory.cpp index 3476ee1c6..aef5d7703 100644 --- a/src/plugins/General/statusicon/statusiconfactory.cpp +++ b/src/plugins/General/statusicon/statusiconfactory.cpp @@ -29,9 +29,9 @@ const GeneralProperties StatusIconFactory::properties() const GeneralProperties properties; properties.name = tr("Status Icon Plugin"); properties.shortName = "status_icon"; - properties.hasAbout = TRUE; - properties.hasSettings = TRUE; - properties.visibilityControl = TRUE; + properties.hasAbout = true; + properties.hasSettings = true; + properties.visibilityControl = true; return properties; } diff --git a/src/plugins/General/statusicon/statusiconpopupwidget.cpp b/src/plugins/General/statusicon/statusiconpopupwidget.cpp index 0d1fe5e8f..51811c984 100644 --- a/src/plugins/General/statusicon/statusiconpopupwidget.cpp +++ b/src/plugins/General/statusicon/statusiconpopupwidget.cpp @@ -65,7 +65,7 @@ StatusIconPopupWidget::StatusIconPopupWidget(QWidget * parent) setLayout(m_hLayout); m_timer = new QTimer(this); - m_timer->setSingleShot(TRUE); + m_timer->setSingleShot(true); m_bar->setMinimumWidth(110); @@ -80,8 +80,8 @@ StatusIconPopupWidget::StatusIconPopupWidget(QWidget * parent) setWindowOpacity(1.0 - settings.value("tooltip_transparency",0).toInt()/100.0); int size = settings.value("tooltip_cover_size",100).toInt(); m_cover->setFixedSize(size,size); - m_splitFileName = settings.value("split_file_name",TRUE).toBool(); - m_showProgress = settings.value("tooltip_progress",TRUE).toBool(); + m_splitFileName = settings.value("split_file_name",true).toBool(); + m_showProgress = settings.value("tooltip_progress",true).toBool(); m_template = settings.value("tooltip_template", DEFAULT_TEMPLATE).toString(); settings.endGroup(); } diff --git a/src/plugins/Input/aac/aacfile.cpp b/src/plugins/Input/aac/aacfile.cpp index a3117002c..032945d26 100644 --- a/src/plugins/Input/aac/aacfile.cpp +++ b/src/plugins/Input/aac/aacfile.cpp @@ -65,7 +65,7 @@ AACFile::AACFile(QIODevice *i, bool metaData) qDebug("AACFile: ADTS header found"); if (!i->isSequential()) parseADTS(); - m_isValid = TRUE; + m_isValid = true; } else if (memcmp(buf, "ADIF", 4) == 0) { @@ -81,7 +81,7 @@ AACFile::AACFile(QIODevice *i, bool metaData) else m_length = 0; m_bitrate = (int)((float)m_bitrate/1000.0f + 0.5f); - m_isValid = TRUE; + m_isValid = true; } } @@ -198,7 +198,7 @@ void AACFile::parseID3v2() TagLib::String title = taglib_tag.title(); QTextCodec *codec = QTextCodec::codecForName ("UTF-8"); - bool utf = TRUE; + bool utf = true; m_metaData.insert(Qmmp::ALBUM, codec->toUnicode(album.toCString(utf)).trimmed()); diff --git a/src/plugins/Input/aac/aacfile.h b/src/plugins/Input/aac/aacfile.h index 9a470b01e..17c38e246 100644 --- a/src/plugins/Input/aac/aacfile.h +++ b/src/plugins/Input/aac/aacfile.h @@ -42,7 +42,7 @@ class QBuffer; class AACFile { public: - AACFile(QIODevice *i, bool metaData = TRUE); + AACFile(QIODevice *i, bool metaData = true); ~AACFile(); diff --git a/src/plugins/Input/aac/decoder_aac.cpp b/src/plugins/Input/aac/decoder_aac.cpp index 6b65685f1..1b5fe510a 100644 --- a/src/plugins/Input/aac/decoder_aac.cpp +++ b/src/plugins/Input/aac/decoder_aac.cpp @@ -144,7 +144,7 @@ bool DecoderAAC::initialize() m_input_at -= res; configure(freq, chan, Qmmp::PCM_S16LE); qDebug("DecoderAAC: initialize succes"); - return TRUE; + return true; } qint64 DecoderAAC::read(char *audio, qint64 maxSize) diff --git a/src/plugins/Input/aac/decoderaacfactory.cpp b/src/plugins/Input/aac/decoderaacfactory.cpp index 21fe4a310..72307450c 100644 --- a/src/plugins/Input/aac/decoderaacfactory.cpp +++ b/src/plugins/Input/aac/decoderaacfactory.cpp @@ -47,7 +47,7 @@ const DecoderProperties DecoderAACFactory::properties() const properties.description = tr("AAC Files"); //properties.contentType = ; properties.shortName = "aac"; - properties.hasAbout = TRUE; + properties.hasAbout = true; properties.hasSettings = FALSE; return properties; } diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp index b77598d2e..80da4b979 100644 --- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp +++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp @@ -85,7 +85,7 @@ QList <CDATrack> DecoderCDAudio::generateTrackList(const QString &device) //read settings QSettings settings(Qmmp::configFile(), QSettings::IniFormat); int cd_speed = settings.value("cdaudio/speed", 0).toInt(); - bool use_cd_text = settings.value("cdaudio/cdtext", TRUE).toBool(); + bool use_cd_text = settings.value("cdaudio/cdtext", true).toBool(); QList <CDATrack> tracks; cdio_log_set_handler(log_handler); //setup cdio log handler CdIo_t *cdio = 0; @@ -94,7 +94,7 @@ QList <CDATrack> DecoderCDAudio::generateTrackList(const QString &device) device_path = settings.value("device").toString(); if (device_path.isEmpty() || device_path == "/") { - char **cd_drives = cdio_get_devices_with_cap(0, CDIO_FS_AUDIO, TRUE); //get drive list with CDA disks + char **cd_drives = cdio_get_devices_with_cap(0, CDIO_FS_AUDIO, true); //get drive list with CDA disks // open first audio capable cd drive if (cd_drives && *cd_drives) { @@ -147,7 +147,7 @@ QList <CDATrack> DecoderCDAudio::generateTrackList(const QString &device) cdio = 0; return tracks; } - bool use_cddb = TRUE; + bool use_cddb = true; //fill track list for (int i = first_track_number; i <= last_track_number; ++i) { @@ -320,7 +320,7 @@ bool DecoderCDAudio::readFromCache(QList <CDATrack> *tracks, uint disc_id) (*tracks)[i].info.setMetaData(Qmmp::GENRE, settings.value(QString("genre%1").arg(i)).toString()); (*tracks)[i].info.setMetaData(Qmmp::ALBUM, settings.value(QString("album%1").arg(i)).toString()); } - return TRUE; + return true; } qint64 DecoderCDAudio::calculateTrackLength(lsn_t startlsn, lsn_t endlsn) @@ -363,7 +363,7 @@ bool DecoderCDAudio::initialize() if (QUrl(m_url).path() == "/") { - char **cd_drives = cdio_get_devices_with_cap(0, CDIO_FS_AUDIO, TRUE); //get drive list with CDA disks + char **cd_drives = cdio_get_devices_with_cap(0, CDIO_FS_AUDIO, true); //get drive list with CDA disks // open first audio capable cd drive if (cd_drives && *cd_drives) { @@ -402,7 +402,7 @@ bool DecoderCDAudio::initialize() m_last_sector = tracks[track_at].last_sector; StateHandler::instance()->dispatch(tracks[track_at].info.metaData()); //send metadata qDebug("DecoderCDAudio: initialize succes"); - return TRUE; + return true; } diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp index 4786259c5..546cc7a2d 100644 --- a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp +++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp @@ -45,9 +45,9 @@ const DecoderProperties DecoderCDAudioFactory::properties() const properties.name = tr("CD Audio Plugin"); properties.shortName = "cdaudio"; properties.protocols = "cdda"; - properties.hasAbout = TRUE; - properties.noInput = TRUE; - properties.hasSettings = TRUE; + properties.hasAbout = true; + properties.noInput = true; + properties.hasSettings = true; return properties; } diff --git a/src/plugins/Input/cdaudio/settingsdialog.cpp b/src/plugins/Input/cdaudio/settingsdialog.cpp index 9151d06e9..ee9ce04f0 100644 --- a/src/plugins/Input/cdaudio/settingsdialog.cpp +++ b/src/plugins/Input/cdaudio/settingsdialog.cpp @@ -35,7 +35,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) int speed = settings.value("speed", 0).toInt(); ui.speedCheckBox->setChecked(speed > 0); ui.speedSpinBox->setValue(speed); - ui.cdtextCheckBox->setChecked(settings.value("cdtext", TRUE).toBool()); + 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.serverLineEdit->setText(settings.value("cddb_server", "freedb.org").toString()); diff --git a/src/plugins/Input/cue/cueparser.cpp b/src/plugins/Input/cue/cueparser.cpp index 63c55c83d..313c7f6fe 100644 --- a/src/plugins/Input/cue/cueparser.cpp +++ b/src/plugins/Input/cue/cueparser.cpp @@ -89,7 +89,7 @@ CUEParser::CUEParser(const QString &fileName) m_infoList.last().setLength(0); } file_path = QFileInfo(fileName).dir().filePath(words[1]); - new_file = TRUE; + new_file = true; } else if (words[0] == "PERFORMER") diff --git a/src/plugins/Input/cue/decoder_cue.cpp b/src/plugins/Input/cue/decoder_cue.cpp index 895961121..abaedaf66 100644 --- a/src/plugins/Input/cue/decoder_cue.cpp +++ b/src/plugins/Input/cue/decoder_cue.cpp @@ -115,7 +115,7 @@ bool DecoderCUE::initialize() m_sz = audioParameters().sampleSize(); StateHandler::instance()->dispatch(m_parser->info(m_track)->metaData()); - return TRUE; + return true; } qint64 DecoderCUE::totalTime() diff --git a/src/plugins/Input/cue/decodercuefactory.cpp b/src/plugins/Input/cue/decodercuefactory.cpp index 0d4109728..fe259c307 100644 --- a/src/plugins/Input/cue/decodercuefactory.cpp +++ b/src/plugins/Input/cue/decodercuefactory.cpp @@ -47,10 +47,10 @@ const DecoderProperties DecoderCUEFactory::properties() const properties.description = tr("CUE Files"); //properties.contentType = "application/ogg;audio/x-vorbis+ogg"; properties.protocols = "cue"; - properties.hasAbout = TRUE; - properties.hasSettings = TRUE; - properties.noInput = TRUE; - properties.noOutput = TRUE; + properties.hasAbout = true; + properties.hasSettings = true; + properties.noInput = true; + properties.noOutput = true; return properties; } diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index bda8ff7e7..97dffb244 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -175,7 +175,7 @@ bool DecoderFFmpeg::initialize() configure(c->sample_rate, c->channels, Qmmp::PCM_S16LE); m_bitrate = c->bit_rate; qDebug("DecoderFFmpeg: initialize succes"); - return TRUE; + return true; } @@ -241,7 +241,7 @@ void DecoderFFmpeg::seek(qint64 pos) av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD); avcodec_flush_buffers(c); if(m_pkt.size) - m_skip = TRUE; + m_skip = true; } void DecoderFFmpeg::fillBuffer() diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index 95f3244fa..89fb95c88 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -59,7 +59,7 @@ bool DecoderFFmpegFactory::supports(const QString &source) const { QRegExp regexp(filter, Qt::CaseInsensitive, QRegExp::Wildcard); if (regexp.exactMatch(source)) - return TRUE; + return true; } return FALSE; } @@ -90,9 +90,9 @@ bool DecoderFFmpegFactory::canDecode(QIODevice *i) const return FALSE; } if(filters.contains("*.mp3") && !memcmp(fmt->name, "mp3", 3)) - return TRUE; + return true; if(filters.contains("*.aac") && !memcmp(fmt->name, "aac", 3)) - return TRUE; + return true; return FALSE; } @@ -120,8 +120,8 @@ const DecoderProperties DecoderFFmpegFactory::properties() const properties.contentType += " audio/3gpp audio/3gpp2 audio/mp4 audio/MP4A-LATM audio/mpeg4-generic"; properties.contentType = properties.contentType.trimmed(); properties.shortName = "ffmpeg"; - properties.hasAbout = TRUE; - properties.hasSettings = TRUE; + properties.hasAbout = true; + properties.hasSettings = true; properties.noInput = FALSE; return properties; } diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp index 4c6c4d951..b4212b19c 100644 --- a/src/plugins/Input/flac/decoder_flac.cpp +++ b/src/plugins/Input/flac/decoder_flac.cpp @@ -290,7 +290,7 @@ bool DecoderFLAC::initialize() { qDebug("DecoderFLAC: using cuesheet xiph comment."); m_parser = new CUEParser(xiph_comment->fieldListMap()["CUESHEET"].toString() - .toCString(TRUE), p); + .toCString(true), p); m_track = m_path.section("#", -1).toInt(); if(m_track > m_parser->count()) { @@ -431,7 +431,7 @@ bool DecoderFLAC::initialize() m_sz = audioParameters().sampleSize() * audioParameters().channels(); qDebug("DecoderFLAC: initialize succes"); - return TRUE; + return true; } qint64 DecoderFLAC::totalTime() diff --git a/src/plugins/Input/flac/decoderflacfactory.cpp b/src/plugins/Input/flac/decoderflacfactory.cpp index 0315ef125..f60445219 100644 --- a/src/plugins/Input/flac/decoderflacfactory.cpp +++ b/src/plugins/Input/flac/decoderflacfactory.cpp @@ -54,7 +54,7 @@ const DecoderProperties DecoderFLACFactory::properties() const //properties.contentType = ; properties.shortName = "flac"; properties.protocols = "flac"; - properties.hasAbout = TRUE; + properties.hasAbout = true; properties.hasSettings = FALSE; return properties; } @@ -92,21 +92,21 @@ QList<FileInfo *> DecoderFLACFactory::createPlayList(const QString &fileName, bo if (tag && !tag->isEmpty()) { info->setMetaData(Qmmp::ALBUM, - QString::fromUtf8(tag->album().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->album().toCString(true)).trimmed()); info->setMetaData(Qmmp::ARTIST, - QString::fromUtf8(tag->artist().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->artist().toCString(true)).trimmed()); info->setMetaData(Qmmp::COMMENT, - QString::fromUtf8(tag->comment().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->comment().toCString(true)).trimmed()); info->setMetaData(Qmmp::GENRE, - QString::fromUtf8(tag->genre().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->genre().toCString(true)).trimmed()); info->setMetaData(Qmmp::TITLE, - QString::fromUtf8(tag->title().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->title().toCString(true)).trimmed()); info->setMetaData(Qmmp::YEAR, tag->year()); info->setMetaData(Qmmp::TRACK, tag->track()); if (tag->fieldListMap().contains("CUESHEET")) { - CUEParser parser(tag->fieldListMap()["CUESHEET"].toString().toCString(TRUE), fileName); + CUEParser parser(tag->fieldListMap()["CUESHEET"].toString().toCString(true), fileName); list = parser.createPlayList(); delete info; if(flacFile) @@ -120,10 +120,10 @@ QList<FileInfo *> DecoderFLACFactory::createPlayList(const QString &fileName, bo TagLib::StringList fld; if(!(fld = tag->fieldListMap()["COMPOSER"]).isEmpty()) info->setMetaData(Qmmp::COMPOSER, - QString::fromUtf8(fld.toString().toCString(TRUE)).trimmed()); + QString::fromUtf8(fld.toString().toCString(true)).trimmed()); if(!(fld = tag->fieldListMap()["DISCNUMBER"]).isEmpty()) info->setMetaData(Qmmp::DISCNUMBER, - QString::fromUtf8(fld.toString().toCString(TRUE)).trimmed()); + QString::fromUtf8(fld.toString().toCString(true)).trimmed()); } if(ap) info->setLength(ap->length()); diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp index 39633b2aa..d6617357c 100644 --- a/src/plugins/Input/flac/flacmetadatamodel.cpp +++ b/src/plugins/Input/flac/flacmetadatamodel.cpp @@ -27,7 +27,7 @@ #include "flacmetadatamodel.h" #define QStringToTString_qt4(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) -#define TStringToQString_qt4(s) QString::fromUtf8(s.toCString(TRUE)).trimmed() +#define TStringToQString_qt4(s) QString::fromUtf8(s.toCString(true)).trimmed() FLACMetaDataModel::FLACMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent) { @@ -212,7 +212,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value) case Qmmp::COMPOSER: value.isEmpty() ? m_tag->removeField("COMPOSER"): - m_tag->addField("COMPOSER", str, TRUE); + m_tag->addField("COMPOSER", str, true); return; case Qmmp::TRACK: m_tag->setTrack(value.toInt()); @@ -223,7 +223,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value) case Qmmp::DISCNUMBER: value == "0" ? m_tag->removeField("DISCNUMBER"): - m_tag->addField("DISCNUMBER", str, TRUE); + m_tag->addField("DISCNUMBER", str, true); } } diff --git a/src/plugins/Input/mad/decoder_mad.cpp b/src/plugins/Input/mad/decoder_mad.cpp index b6d7c3edb..d36239911 100644 --- a/src/plugins/Input/mad/decoder_mad.cpp +++ b/src/plugins/Input/mad/decoder_mad.cpp @@ -97,8 +97,8 @@ bool DecoderMAD::initialize() stream.next_frame = 0; stream.sync = 0; configure(m_freq, m_channels, Qmmp::PCM_S16LE); - m_inited = TRUE; - return TRUE; + m_inited = true; + return true; } @@ -232,7 +232,7 @@ bool DecoderMAD::findHeader() break; } } - result = TRUE; + result = true; if (input()->isSequential()) break; @@ -245,13 +245,13 @@ bool DecoderMAD::findHeader() if (mad_frame_decode(&frame, &stream) != -1 && findXingHeader(stream.anc_ptr, stream.anc_bitlen)) { - is_vbr = TRUE; + is_vbr = true; qDebug ("DecoderMAD: Xing header detected"); if (xing.flags & XING_FRAMES) { - has_xing = TRUE; + has_xing = true; count = xing.frames; break; } @@ -263,7 +263,7 @@ bool DecoderMAD::findHeader() if (m_bitrate && header.bitrate != m_bitrate) { qDebug ("DecoderMAD: VBR detected"); - is_vbr = TRUE; + is_vbr = true; } else m_bitrate = header.bitrate; @@ -299,7 +299,7 @@ bool DecoderMAD::findHeader() mad_header_finish(&header); input()->seek(0); m_input_bytes = 0; - return TRUE; + return true; } qint64 DecoderMAD::totalTime() @@ -394,7 +394,7 @@ bool DecoderMAD::fillBuffer() } m_input_bytes += len; mad_stream_buffer(&stream, (unsigned char *) m_input_buf, m_input_bytes); - return TRUE; + return true; } uint DecoderMAD::findID3v2(uchar *data, ulong size) //retuns ID3v2 tag size diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp index 2a7df8189..e58a80ff5 100644 --- a/src/plugins/Input/mad/decodermadfactory.cpp +++ b/src/plugins/Input/mad/decodermadfactory.cpp @@ -42,7 +42,7 @@ bool DecoderMADFactory::supports(const QString &source) const { QString ext = source.right(4).toLower(); if (ext == ".mp1" || ext == ".mp2" || ext == ".mp3") - return TRUE; + return true; else if (ext == ".wav") //check for mp3 wav files { QFile file(source); @@ -52,7 +52,7 @@ bool DecoderMADFactory::supports(const QString &source) const file.close(); if (!memcmp(buf + 8, "WAVE", 4) && !memcmp(buf + 20, "U" ,1)) { - return TRUE; + return true; } } return FALSE; @@ -76,7 +76,7 @@ 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; } @@ -89,8 +89,8 @@ const DecoderProperties DecoderMADFactory::properties() const properties.filter = "*.mp1 *.mp2 *.mp3 *.wav"; properties.description = tr("MPEG Files"); properties.contentType = "audio/mp3;audio/mpeg"; - properties.hasAbout = TRUE; - properties.hasSettings = TRUE; + properties.hasAbout = true; + properties.hasSettings = true; return properties; } diff --git a/src/plugins/Input/mad/mpegmetadatamodel.cpp b/src/plugins/Input/mad/mpegmetadatamodel.cpp index b1ae5a130..b8dc260ee 100644 --- a/src/plugins/Input/mad/mpegmetadatamodel.cpp +++ b/src/plugins/Input/mad/mpegmetadatamodel.cpp @@ -323,11 +323,11 @@ void MpegFileTagModel::create() if (m_tag) return; if (m_tagType == TagLib::MPEG::File::ID3v1) - m_tag = m_file->ID3v1Tag(TRUE); + m_tag = m_file->ID3v1Tag(true); else if (m_tagType == TagLib::MPEG::File::ID3v2) - m_tag = m_file->ID3v2Tag(TRUE); + m_tag = m_file->ID3v2Tag(true); else if (m_tagType == TagLib::MPEG::File::APE) - m_tag = m_file->APETag(TRUE); + m_tag = m_file->APETag(true); } void MpegFileTagModel::remove() diff --git a/src/plugins/Input/mad/tagextractor.cpp b/src/plugins/Input/mad/tagextractor.cpp index dd23582ea..b771560b3 100644 --- a/src/plugins/Input/mad/tagextractor.cpp +++ b/src/plugins/Input/mad/tagextractor.cpp @@ -63,7 +63,7 @@ const QMap<Qmmp::MetaData, QString> TagExtractor::id3v2tag() if (name.contains("UTF")) { codec = QTextCodec::codecForName ("UTF-8"); - utf = TRUE; + utf = true; } else codec = QTextCodec::codecForName(name); diff --git a/src/plugins/Input/modplug/decoder_modplug.cpp b/src/plugins/Input/modplug/decoder_modplug.cpp index 6a9acb581..99e9ba127 100644 --- a/src/plugins/Input/modplug/decoder_modplug.cpp +++ b/src/plugins/Input/modplug/decoder_modplug.cpp @@ -96,7 +96,7 @@ bool DecoderModPlug::initialize() m_bitrate = m_soundFile->GetNumChannels(); m_totalTime = (qint64) m_soundFile->GetSongTime() * 1000; configure(m_freq, m_chan, (m_bps == 8 ? Qmmp::PCM_S8 : Qmmp::PCM_S16LE)); - return TRUE; + return true; } qint64 DecoderModPlug::totalTime() @@ -187,10 +187,10 @@ void DecoderModPlug::readSettings() CSoundFile::SetWaveConfigEx ( - settings.value("Surround", TRUE).toBool(), - TRUE, + settings.value("Surround", true).toBool(), + true, settings.value("Reverb", FALSE).toBool(), - TRUE, + true, settings.value("Megabass", FALSE).toBool(), settings.value("NoiseReduction", FALSE).toBool(), FALSE @@ -211,7 +211,7 @@ void DecoderModPlug::readSettings() settings.value("BassRange", 30).toInt() ); } - if (settings.value("Surround", TRUE).toBool()) + if (settings.value("Surround", true).toBool()) { CSoundFile::SetSurroundParameters ( @@ -225,7 +225,7 @@ void DecoderModPlug::readSettings() //general /* - settings.value("GrabAmigaMOD", TRUE).toBool());*/ + settings.value("GrabAmigaMOD", true).toBool());*/ //preamp m_usePreamp = settings.value("PreAmp", FALSE).toBool(); m_preampFactor = exp(settings.value("PreAmpLevel", 0.0f).toDouble()); diff --git a/src/plugins/Input/modplug/decodermodplugfactory.cpp b/src/plugins/Input/modplug/decodermodplugfactory.cpp index 9d9d9e683..1343898ff 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.cpp +++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp @@ -45,7 +45,7 @@ bool DecoderModPlugFactory::supports(const QString &source) const << ".xmgz" << ".itz" << /*".itr" <<*/ ".itgz" << ".dmf" << ".umx" << ".it" << ".669" << ".xm" << ".mtm" << ".psm" << ".ft2"; if (lExtList.contains(lExt)) - return TRUE; + return true; return FALSE; } @@ -64,9 +64,9 @@ const DecoderProperties DecoderModPlugFactory::properties() const properties.description = tr("ModPlug Files"); //properties.contentType = ; properties.shortName = "modplug"; - properties.hasAbout = TRUE; - properties.hasSettings = TRUE; - properties.noInput = TRUE; + properties.hasAbout = true; + properties.hasSettings = true; + properties.noInput = true; properties.protocols = "file"; return properties; } diff --git a/src/plugins/Input/modplug/settingsdialog.cpp b/src/plugins/Input/modplug/settingsdialog.cpp index 7fbdeb5b9..6d33f5d7b 100644 --- a/src/plugins/Input/modplug/settingsdialog.cpp +++ b/src/plugins/Input/modplug/settingsdialog.cpp @@ -39,46 +39,46 @@ SettingsDialog::SettingsDialog(QWidget *parent) //general 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(); - //settings.value("FastInfo", TRUE).toBool(); + ui.amigaCheckBox->setChecked(settings.value("GrabAmigaMOD", true).toBool()); + //settings.value("Oversampling", true).toBool(); + //settings.value("VolumeRamp", true).toBool(); + //settings.value("FastInfo", true).toBool(); //channels number if (settings.value("Channels", 2).toInt() == 2) - ui.stereoRadioButton->setChecked(TRUE); + ui.stereoRadioButton->setChecked(true); else - ui.monoRadioButton->setChecked(TRUE); + ui.monoRadioButton->setChecked(true); //bits number if (settings.value("Bits", 16).toInt() == 8) - ui.bit8RadioButton->setChecked(TRUE); + ui.bit8RadioButton->setChecked(true); else - ui.bit16RadioButton->setChecked(TRUE); + ui.bit16RadioButton->setChecked(true); //resampling frequency int freq = settings.value("Frequency", 44100).toInt(); if (freq == 48000) - ui.khz48RadioButton->setChecked(TRUE); + ui.khz48RadioButton->setChecked(true); else if (freq == 44100) - ui.khz44RadioButton->setChecked(TRUE); + ui.khz44RadioButton->setChecked(true); else if (freq == 22050) - ui.khz22RadioButton->setChecked(TRUE); + ui.khz22RadioButton->setChecked(true); else - ui.khz11RadioButton->setChecked(TRUE); + ui.khz11RadioButton->setChecked(true); //resampling mode int res = settings.value("ResamplineMode", SRCMODE_POLYPHASE).toInt(); if (res == SRCMODE_NEAREST) - ui.resampNearestRadioButton->setChecked(TRUE); + ui.resampNearestRadioButton->setChecked(true); else if (res == SRCMODE_LINEAR) - ui.resampLinearRadioButton->setChecked(TRUE); + ui.resampLinearRadioButton->setChecked(true); else if (res == SRCMODE_SPLINE) - ui.resampSplineRadioButton->setChecked(TRUE); + ui.resampSplineRadioButton->setChecked(true); else - ui.resampPolyphaseRadioButton->setChecked(TRUE); + ui.resampPolyphaseRadioButton->setChecked(true); //reverberation 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 - ui.surGroupBox->setChecked(settings.value("Surround", TRUE).toBool()); + ui.surGroupBox->setChecked(settings.value("Surround", true).toBool()); ui.surDepthSlider->setValue(settings.value("SurroundDepth", 20).toInt()); ui.surDelaySlider->setValue(settings.value("SurroundDelay", 20).toInt()); //bass @@ -92,12 +92,12 @@ SettingsDialog::SettingsDialog(QWidget *parent) //looping int l = settings.value("LoopCount", 0).toInt(); if (l == 0) - ui.dontLoopRadioButton->setChecked(TRUE); + ui.dontLoopRadioButton->setChecked(true); else if (l < 0) - ui.loopForeverRadioButton->setChecked(TRUE); + ui.loopForeverRadioButton->setChecked(true); else { - ui.loopRadioButton->setChecked(TRUE); + ui.loopRadioButton->setChecked(true); ui.loopSpinBox->setValue(l); } settings.endGroup(); @@ -116,9 +116,9 @@ void SettingsDialog::writeSettings() settings.setValue("NoiseReduction", ui.noiseCheckBox->isChecked()); settings.setValue("UseFileName", ui.fileNameCheckBox->isChecked()); settings.setValue("GrabAmigaMOD", ui.amigaCheckBox->isChecked()); - //settings.value("Oversampling", TRUE).toBool(); - //settings.value("VolumeRamp", TRUE).toBool(); - //settings.value("FastInfo", TRUE).toBool(); + //settings.value("Oversampling", true).toBool(); + //settings.value("VolumeRamp", true).toBool(); + //settings.value("FastInfo", true).toBool(); //channels number settings.setValue("Channels", ui.stereoRadioButton->isChecked() ? 2 : 1 ); //bits number diff --git a/src/plugins/Input/mpc/decoder_mpc.cpp b/src/plugins/Input/mpc/decoder_mpc.cpp index 82ba36694..763a5b477 100644 --- a/src/plugins/Input/mpc/decoder_mpc.cpp +++ b/src/plugins/Input/mpc/decoder_mpc.cpp @@ -215,7 +215,7 @@ bool DecoderMPC::initialize() m_totalTime = mpc_streaminfo_get_length(&data()->info) * 1000; qDebug("DecoderMPC: initialize succes"); - return TRUE; + return true; } qint64 DecoderMPC::totalTime() diff --git a/src/plugins/Input/mpc/decodermpcfactory.cpp b/src/plugins/Input/mpc/decodermpcfactory.cpp index 000015b6f..d862b2de6 100644 --- a/src/plugins/Input/mpc/decodermpcfactory.cpp +++ b/src/plugins/Input/mpc/decodermpcfactory.cpp @@ -49,7 +49,7 @@ const DecoderProperties DecoderMPCFactory::properties() const properties.description = tr("Musepack Files"); //properties.contentType = ; properties.shortName = "mpc"; - properties.hasAbout = TRUE; + properties.hasAbout = true; properties.hasSettings = FALSE; return properties; } @@ -68,15 +68,15 @@ QList<FileInfo *> DecoderMPCFactory::createPlayList(const QString &fileName, boo if (tag && !tag->isEmpty()) { info->setMetaData(Qmmp::ALBUM, - QString::fromUtf8(tag->album().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->album().toCString(true)).trimmed()); info->setMetaData(Qmmp::ARTIST, - QString::fromUtf8(tag->artist().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->artist().toCString(true)).trimmed()); info->setMetaData(Qmmp::COMMENT, - QString::fromUtf8(tag->comment().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->comment().toCString(true)).trimmed()); info->setMetaData(Qmmp::GENRE, - QString::fromUtf8(tag->genre().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->genre().toCString(true)).trimmed()); info->setMetaData(Qmmp::TITLE, - QString::fromUtf8(tag->title().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->title().toCString(true)).trimmed()); info->setMetaData(Qmmp::YEAR, tag->year()); info->setMetaData(Qmmp::TRACK, tag->track()); } @@ -88,7 +88,7 @@ QList<FileInfo *> DecoderMPCFactory::createPlayList(const QString &fileName, boo TagLib::APE::Item fld; if(!(fld = tag->itemListMap()["COMPOSER"]).isEmpty()) info->setMetaData(Qmmp::COMPOSER, - QString::fromUtf8(fld.toString().toCString(TRUE)).trimmed()); + QString::fromUtf8(fld.toString().toCString(true)).trimmed()); } QList <FileInfo*> list; diff --git a/src/plugins/Input/mpc/mpcmetadatamodel.cpp b/src/plugins/Input/mpc/mpcmetadatamodel.cpp index 5ae31eeac..de3b4c893 100644 --- a/src/plugins/Input/mpc/mpcmetadatamodel.cpp +++ b/src/plugins/Input/mpc/mpcmetadatamodel.cpp @@ -175,9 +175,9 @@ void MPCFileTagModel::create() if (m_tag) return; if (m_tagType == TagLib::MPC::File::ID3v1) - m_tag = m_file->ID3v1Tag(TRUE); + m_tag = m_file->ID3v1Tag(true); else - m_tag = m_file->APETag(TRUE); + m_tag = m_file->APETag(true); } void MPCFileTagModel::remove() diff --git a/src/plugins/Input/sndfile/decoder_sndfile.cpp b/src/plugins/Input/sndfile/decoder_sndfile.cpp index 73a54ef0b..abcc65d78 100644 --- a/src/plugins/Input/sndfile/decoder_sndfile.cpp +++ b/src/plugins/Input/sndfile/decoder_sndfile.cpp @@ -68,7 +68,7 @@ bool DecoderSndFile::initialize() configure(m_freq, chan, Qmmp::PCM_S16LE); qDebug("DecoderSndFile: detected format: %08X", snd_info.format); qDebug("DecoderSndFile: initialize succes"); - return TRUE; + return true; } void DecoderSndFile::deinit() diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.cpp b/src/plugins/Input/sndfile/decodersndfilefactory.cpp index be9e98feb..82075e124 100644 --- a/src/plugins/Input/sndfile/decodersndfilefactory.cpp +++ b/src/plugins/Input/sndfile/decodersndfilefactory.cpp @@ -40,7 +40,7 @@ bool DecoderSndFileFactory::supports(const QString &source) const (source.right(4).toLower() == ".sph") || (source.right(3).toLower() == ".sf") || (source.right(4).toLower() == ".voc")) - return TRUE; + return true; else if (source.right(4).toLower() == ".wav") { //try top open the file @@ -50,7 +50,7 @@ bool DecoderSndFileFactory::supports(const QString &source) const return FALSE; sf_close (sndfile); sndfile = 0; - return TRUE; + return true; } return FALSE; } @@ -68,9 +68,9 @@ const DecoderProperties DecoderSndFileFactory::properties() const properties.description = tr("PCM Files"); //properties.contentType = ""; properties.shortName = "sndfile"; - properties.hasAbout = TRUE; + properties.hasAbout = true; properties.hasSettings = FALSE; - properties.noInput = TRUE; + 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 c1d563963..59fefb79f 100644 --- a/src/plugins/Input/vorbis/decoder_vorbis.cpp +++ b/src/plugins/Input/vorbis/decoder_vorbis.cpp @@ -135,8 +135,8 @@ bool DecoderVorbis::initialize() chan = ogginfo->channels; } configure(freq, chan, Qmmp::PCM_S16LE); - inited = TRUE; - return TRUE; + inited = true; + return true; } diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp index 6326a92f7..a2b8d3474 100644 --- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp +++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp @@ -39,7 +39,7 @@ bool DecoderVorbisFactory::canDecode(QIODevice *input) const char buf[36]; if (input->peek(buf, 36) == 36 && !memcmp(buf, "OggS", 4) && !memcmp(buf + 29, "vorbis", 6)) - return TRUE; + return true; return FALSE; } @@ -52,7 +52,7 @@ const DecoderProperties DecoderVorbisFactory::properties() const properties.filter = "*.ogg"; properties.description = tr("Ogg Vorbis Files"); properties.contentType = "application/ogg;audio/x-vorbis+ogg"; - properties.hasAbout = TRUE; + properties.hasAbout = true; properties.hasSettings = FALSE; properties.noInput = FALSE; return properties; @@ -84,15 +84,15 @@ QList<FileInfo *> DecoderVorbisFactory::createPlayList(const QString &fileName, if (tag && !tag->isEmpty()) { info->setMetaData(Qmmp::ALBUM, - QString::fromUtf8(tag->album().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->album().toCString(true)).trimmed()); info->setMetaData(Qmmp::ARTIST, - QString::fromUtf8(tag->artist().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->artist().toCString(true)).trimmed()); info->setMetaData(Qmmp::COMMENT, - QString::fromUtf8(tag->comment().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->comment().toCString(true)).trimmed()); info->setMetaData(Qmmp::GENRE, - QString::fromUtf8(tag->genre().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->genre().toCString(true)).trimmed()); info->setMetaData(Qmmp::TITLE, - QString::fromUtf8(tag->title().toCString(TRUE)).trimmed()); + QString::fromUtf8(tag->title().toCString(true)).trimmed()); info->setMetaData(Qmmp::YEAR, tag->year()); info->setMetaData(Qmmp::TRACK, tag->track()); } @@ -105,10 +105,10 @@ QList<FileInfo *> DecoderVorbisFactory::createPlayList(const QString &fileName, TagLib::StringList fld; if(!(fld = tag->fieldListMap()["COMPOSER"]).isEmpty()) info->setMetaData(Qmmp::COMPOSER, - QString::fromUtf8(fld.toString().toCString(TRUE)).trimmed()); + QString::fromUtf8(fld.toString().toCString(true)).trimmed()); if(!(fld = tag->fieldListMap()["DISCNUMBER"]).isEmpty()) info->setMetaData(Qmmp::DISCNUMBER, - QString::fromUtf8(fld.toString().toCString(TRUE)).trimmed()); + QString::fromUtf8(fld.toString().toCString(true)).trimmed()); } QList <FileInfo*> list; diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp index 0ef036402..a7751b30d 100644 --- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp +++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp @@ -26,7 +26,7 @@ #include "vorbismetadatamodel.h" #define QStringToTString_qt4(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) -#define TStringToQString_qt4(s) QString::fromUtf8(s.toCString(TRUE)).trimmed() +#define TStringToQString_qt4(s) QString::fromUtf8(s.toCString(true)).trimmed() VorbisMetaDataModel::VorbisMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent) { @@ -183,7 +183,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value) case Qmmp::COMPOSER: value.isEmpty() ? m_tag->removeField("COMPOSER"): - m_tag->addField("COMPOSER", str, TRUE); + m_tag->addField("COMPOSER", str, true); return; case Qmmp::TRACK: m_tag->setTrack(value.toInt()); @@ -194,7 +194,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value) case Qmmp::DISCNUMBER: value == "0" ? m_tag->removeField("DISCNUMBER"): - m_tag->addField("DISCNUMBER", str, TRUE); + m_tag->addField("DISCNUMBER", str, true); } } diff --git a/src/plugins/Input/wavpack/decoder_wavpack.cpp b/src/plugins/Input/wavpack/decoder_wavpack.cpp index 3541559b7..df17c8b76 100644 --- a/src/plugins/Input/wavpack/decoder_wavpack.cpp +++ b/src/plugins/Input/wavpack/decoder_wavpack.cpp @@ -134,7 +134,7 @@ bool DecoderWavPack::initialize() m_totalBytes = 0; m_sz = audioParameters().sampleSize() * audioParameters().channels(); qDebug("DecoderWavPack: initialize succes"); - return TRUE; + return true; } int DecoderWavPack::bitrate() diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp index 34d88eaed..c1b0e8a41 100644 --- a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp +++ b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp @@ -46,9 +46,9 @@ const DecoderProperties DecoderWavPackFactory::properties() const properties.description = tr("WavPack Files"); //properties.contentType = ; properties.shortName = "wavpack"; - properties.hasAbout = TRUE; + properties.hasAbout = true; properties.hasSettings = FALSE; - properties.noInput = TRUE; + 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 16cc7d0a8..98c9bb8a8 100644 --- a/src/plugins/Output/alsa/outputalsa.cpp +++ b/src/plugins/Output/alsa/outputalsa.cpp @@ -218,8 +218,8 @@ bool OutputALSA::initialize() return FALSE; } - m_inited = TRUE; - return TRUE; + m_inited = true; + return true; } diff --git a/src/plugins/Output/alsa/outputalsafactory.cpp b/src/plugins/Output/alsa/outputalsafactory.cpp index 28a3d6cfd..cccdacd9a 100644 --- a/src/plugins/Output/alsa/outputalsafactory.cpp +++ b/src/plugins/Output/alsa/outputalsafactory.cpp @@ -30,8 +30,8 @@ const OutputProperties OutputALSAFactory::properties() const OutputProperties properties; properties.name = tr("ALSA Plugin"); properties.shortName = "alsa"; - properties.hasAbout = TRUE; - properties.hasSettings = TRUE; + properties.hasAbout = true; + properties.hasSettings = true; return properties; } diff --git a/src/plugins/Output/alsa/settingsdialog.cpp b/src/plugins/Output/alsa/settingsdialog.cpp index 593191086..86001bfe3 100644 --- a/src/plugins/Output/alsa/settingsdialog.cpp +++ b/src/plugins/Output/alsa/settingsdialog.cpp @@ -33,7 +33,7 @@ SettingsDialog::SettingsDialog ( QWidget *parent ) { ui.setupUi (this); setAttribute (Qt::WA_DeleteOnClose); - ui.deviceComboBox->setEditable (TRUE); + ui.deviceComboBox->setEditable (true); getCards(); getSoftDevices(); connect (ui.deviceComboBox, SIGNAL(activated(int)),SLOT(setText(int))); diff --git a/src/plugins/Output/jack/outputjack.cpp b/src/plugins/Output/jack/outputjack.cpp index c60087711..8f6cd272e 100644 --- a/src/plugins/Output/jack/outputjack.cpp +++ b/src/plugins/Output/jack/outputjack.cpp @@ -52,8 +52,8 @@ void OutputJACK::configure(quint32 freq, int chan, Qmmp::AudioFormat format) return; } else - m_configure = TRUE; - m_inited = TRUE; + m_configure = true; + m_inited = true; Output::configure(freq, chan, format); qDebug("OutputJACK: configure end"); } @@ -75,8 +75,8 @@ bool OutputJACK::initialize() return FALSE; } jack_client_close (client); - m_inited = TRUE; - return TRUE; + m_inited = true; + return true; } qint64 OutputJACK::latency() diff --git a/src/plugins/Output/jack/outputjackfactory.cpp b/src/plugins/Output/jack/outputjackfactory.cpp index cd67f32ee..1f988486d 100644 --- a/src/plugins/Output/jack/outputjackfactory.cpp +++ b/src/plugins/Output/jack/outputjackfactory.cpp @@ -28,7 +28,7 @@ const OutputProperties OutputJACKFactory::properties() const { OutputProperties properties; properties.name = tr("JACK Plugin"); - properties.hasAbout = TRUE; + properties.hasAbout = true; properties.hasSettings = FALSE; properties.shortName = "jack"; return properties; diff --git a/src/plugins/Output/null/outputnull.cpp b/src/plugins/Output/null/outputnull.cpp index 796ba8c5b..a6cadd615 100644 --- a/src/plugins/Output/null/outputnull.cpp +++ b/src/plugins/Output/null/outputnull.cpp @@ -50,7 +50,7 @@ void OutputNull::configure(quint32 freq, int chan, Qmmp::AudioFormat format) bool OutputNull::initialize() { - return TRUE; + return true; } diff --git a/src/plugins/Output/null/outputnullfactory.cpp b/src/plugins/Output/null/outputnullfactory.cpp index c55a6bfa3..ea20f9bfe 100644 --- a/src/plugins/Output/null/outputnullfactory.cpp +++ b/src/plugins/Output/null/outputnullfactory.cpp @@ -28,7 +28,7 @@ const OutputProperties OutputNullFactory::properties() const { OutputProperties properties; properties.name = tr("Null Plugin"); - properties.hasAbout = TRUE; + properties.hasAbout = true; 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 84d3d652e..860766b39 100644 --- a/src/plugins/Output/oss/outputoss.cpp +++ b/src/plugins/Output/oss/outputoss.cpp @@ -66,7 +66,7 @@ OutputOSS* OutputOSS::instance() OutputOSS::OutputOSS(QObject * parent) : Output(parent), m_inited(FALSE), m_frequency(-1), m_channels(-1), - do_select(TRUE), + do_select(true), m_audio_fd(-1) { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); @@ -213,8 +213,8 @@ bool OutputOSS::initialize() reset(); if (m_audio_fd < 0) return FALSE; - m_inited = TRUE; - return TRUE; + m_inited = true; + return true; } void OutputOSS::uninitialize() @@ -274,7 +274,7 @@ VolumeControlOSS *VolumeControlOSS::instance() VolumeControlOSS::VolumeControlOSS(QObject *parent) : VolumeControl(parent) { - m_master = TRUE; + m_master = true; m_mixer_fd = -1; QSettings settings(Qmmp::configFile(), QSettings::IniFormat); #if SOUND_VERSION < 0x040000 @@ -289,7 +289,7 @@ VolumeControlOSS::VolumeControlOSS(QObject *parent) : VolumeControl(parent) else { mixer_fd = open(m_audio_device.toAscii(), O_WRONLY, 0); - to_close = TRUE; + to_close = true; } if(mixer_fd > 0) { diff --git a/src/plugins/Output/oss/outputossfactory.cpp b/src/plugins/Output/oss/outputossfactory.cpp index 01bd5edf1..ba5a598dc 100644 --- a/src/plugins/Output/oss/outputossfactory.cpp +++ b/src/plugins/Output/oss/outputossfactory.cpp @@ -35,8 +35,8 @@ const OutputProperties OutputOSSFactory::properties() const OutputProperties properties; properties.name = tr("OSS Plugin"); properties.shortName = "oss"; - properties.hasAbout = TRUE; - properties.hasSettings = TRUE; + properties.hasAbout = true; + properties.hasSettings = true; return properties; } diff --git a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp index 1b5838d19..f92d33b9c 100644 --- a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp +++ b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp @@ -79,7 +79,7 @@ void OutputPulseAudio::configure(quint32 freq, int chan, Qmmp::AudioFormat forma bool OutputPulseAudio::initialize() { - return TRUE; + return true; } diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp index 4e508c51e..747b8d180 100644 --- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp +++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp @@ -28,7 +28,7 @@ const OutputProperties OutputPulseAudioFactory::properties() const { OutputProperties properties; properties.name = tr("PulseAudio Plugin"); - properties.hasAbout = TRUE; + properties.hasAbout = true; 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 9e91f2e73..6fba551d2 100644 --- a/src/plugins/Output/waveout/outputwaveout.cpp +++ b/src/plugins/Output/waveout/outputwaveout.cpp @@ -140,7 +140,7 @@ bool OutputWaveOut::initialize() return FALSE;
}
- return TRUE;
+ return true;
}
diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.cpp b/src/plugins/Output/waveout/outputwaveoutfactory.cpp index ec44e76b2..b2d836c70 100644 --- a/src/plugins/Output/waveout/outputwaveoutfactory.cpp +++ b/src/plugins/Output/waveout/outputwaveoutfactory.cpp @@ -28,7 +28,7 @@ const OutputProperties OutputWaveOutFactory::properties() const {
OutputProperties properties;
properties.name = tr("WaveOut Plugin");
- properties.hasAbout = TRUE;
+ properties.hasAbout = true;
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 7ef56a373..e904fced1 100644 --- a/src/plugins/Transports/http/downloader.cpp +++ b/src/plugins/Transports/http/downloader.cpp @@ -71,7 +71,7 @@ static size_t curl_header(void *data, size_t size, size_t nmemb, else if (str.left(4).contains("ICY")) { qDebug("Downloader: shoutcast header received"); - //dl->stream()->icy_meta_data = TRUE; + //dl->stream()->icy_meta_data = true; } else { @@ -83,7 +83,7 @@ static size_t curl_header(void *data, size_t size, size_t nmemb, if (key == "icy-metaint") { dl->stream()->icy_metaint = value.toInt(); - dl->stream()->icy_meta_data = TRUE; + dl->stream()->icy_meta_data = true; } } dl->mutex()->unlock(); @@ -113,7 +113,7 @@ Downloader::Downloader(QObject *parent, const QString &url) m_stream.buf_fill = 0; m_stream.buf = 0; m_stream.icy_meta_data = FALSE; - m_stream.aborted = TRUE; + m_stream.aborted = true; m_stream.icy_metaint = 0; m_handle = 0; m_metacount = 0; @@ -137,7 +137,7 @@ Downloader::~Downloader() { abort(); curl_global_cleanup(); - m_stream.aborted = TRUE; + m_stream.aborted = true; m_stream.buf_fill = 0; if (m_stream.buf) free(m_stream.buf); @@ -210,7 +210,7 @@ void Downloader::abort() m_mutex.unlock(); return; } - m_stream.aborted = TRUE; + m_stream.aborted = true; m_mutex.unlock(); wait(); if (m_handle) @@ -315,7 +315,7 @@ void Downloader::checkBuffer() { if (m_stream.buf_fill > m_buffer_size && !m_ready) { - m_ready = TRUE; + m_ready = true; qDebug("Downloader: ready"); if(!m_meta_sent && stream()->icy_meta_data) { @@ -398,7 +398,7 @@ void Downloader::parseICYMetaData(char *data, qint64 size) metaData.insert(Qmmp::GENRE, m_stream.header.value("icy-genre")); metaData.insert(Qmmp::URL, m_url); StateHandler::instance()->dispatch(metaData); - m_meta_sent = TRUE; + m_meta_sent = true; break; } } diff --git a/src/plugins/Transports/http/httpinputfactory.cpp b/src/plugins/Transports/http/httpinputfactory.cpp index a7f5e22b8..e1229a04b 100644 --- a/src/plugins/Transports/http/httpinputfactory.cpp +++ b/src/plugins/Transports/http/httpinputfactory.cpp @@ -33,8 +33,8 @@ const InputSourceProperties HTTPInputFactory::properties() const p.protocols = "http"; p.name = tr("HTTP Plugin"); p.shortName = "http"; - p.hasAbout = TRUE; - p.hasSettings = TRUE; + p.hasAbout = true; + p.hasSettings = true; return p; } diff --git a/src/plugins/Transports/http/httpinputsource.cpp b/src/plugins/Transports/http/httpinputsource.cpp index e2b517ce2..3493c5f6c 100644 --- a/src/plugins/Transports/http/httpinputsource.cpp +++ b/src/plugins/Transports/http/httpinputsource.cpp @@ -35,7 +35,7 @@ QIODevice *HTTPInputSource::ioDevice() bool HTTPInputSource::initialize() { m_reader->downloadFile(); - return TRUE; + return true; } bool HTTPInputSource::isReady() diff --git a/src/plugins/Transports/http/streamreader.cpp b/src/plugins/Transports/http/streamreader.cpp index 2cc07d682..de3193315 100644 --- a/src/plugins/Transports/http/streamreader.cpp +++ b/src/plugins/Transports/http/streamreader.cpp @@ -62,7 +62,7 @@ void StreamReader::close () bool StreamReader::isSequential () const { - return TRUE; + return true; } bool StreamReader::open ( OpenMode mode ) @@ -72,7 +72,7 @@ bool StreamReader::open ( OpenMode mode ) //downloadFile(); setOpenMode(QIODevice::ReadOnly); if (m_downloader->isReady()) - return TRUE; + return true; else return FALSE; } @@ -80,7 +80,7 @@ bool StreamReader::open ( OpenMode mode ) bool StreamReader::reset () { QIODevice::reset(); - return TRUE; + return true; } bool StreamReader::seek ( qint64 pos ) @@ -98,14 +98,14 @@ bool StreamReader::waitForBytesWritten (int msecs) { Q_UNUSED(msecs); //usleep(msecs*1000); - return TRUE; + return true; } bool StreamReader::waitForReadyRead (int msecs) { Q_UNUSED(msecs); //usleep(msecs*1000); - return TRUE; + return true; } qint64 StreamReader::readData(char* data, qint64 maxlen) diff --git a/src/plugins/Visual/analyzer/analyzer.cpp b/src/plugins/Visual/analyzer/analyzer.cpp index 20aa6fb78..7a80aa231 100644 --- a/src/plugins/Visual/analyzer/analyzer.cpp +++ b/src/plugins/Visual/analyzer/analyzer.cpp @@ -55,7 +55,7 @@ Analyzer::Analyzer (QWidget *parent) peaks_speed[settings.value("Analyzer/peaks_falloff", 3).toInt()-1]; m_analyzer_falloff = analyzer_speed[settings.value("Analyzer/analyzer_falloff", 3).toInt()-1]; - m_show_peaks = settings.value("Analyzer/show_peaks", TRUE).toBool(); + m_show_peaks = settings.value("Analyzer/show_peaks", true).toBool(); m_timer->setInterval(intervals[settings.value("Analyzer/refresh_rate", 2).toInt() - 1]); m_color1.setNamedColor(settings.value("Analyzer/color1", "Green").toString()); m_color2.setNamedColor(settings.value("Analyzer/color2", "Yellow").toString()); @@ -244,7 +244,7 @@ bool Analyzer::process (VisualNode *node) } } } - return TRUE; + return true; } void Analyzer::draw (QPainter *p) diff --git a/src/plugins/Visual/analyzer/colorwidget.cpp b/src/plugins/Visual/analyzer/colorwidget.cpp index 7117a6cac..c707f01d5 100644 --- a/src/plugins/Visual/analyzer/colorwidget.cpp +++ b/src/plugins/Visual/analyzer/colorwidget.cpp @@ -23,7 +23,7 @@ ColorWidget::ColorWidget(QWidget *parent) : QFrame(parent) { setFrameShape(QFrame::Box); - setAutoFillBackground(TRUE); + setAutoFillBackground(true); } diff --git a/src/plugins/Visual/analyzer/settingsdialog.cpp b/src/plugins/Visual/analyzer/settingsdialog.cpp index 8ad1ec603..839179850 100644 --- a/src/plugins/Visual/analyzer/settingsdialog.cpp +++ b/src/plugins/Visual/analyzer/settingsdialog.cpp @@ -30,7 +30,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.setupUi(this); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); ui.analyzerComboBox->setCurrentIndex(settings.value("Analyzer/analyzer_falloff", 3).toInt()-1); - ui.peaksCheckBox->setChecked(settings.value("Analyzer/show_peaks", TRUE).toBool()); + ui.peaksCheckBox->setChecked(settings.value("Analyzer/show_peaks", true).toBool()); ui.peaksComboBox->setCurrentIndex(settings.value("Analyzer/peaks_falloff", 3).toInt()-1); ui.fpsComboBox->setCurrentIndex(settings.value("Analyzer/refresh_rate", 2).toInt()-1); ui.colorWidget1->setColor(settings.value("Analyzer/color1", "Green").toString()); diff --git a/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp b/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp index 24181ea13..37ee3f800 100644 --- a/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp +++ b/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp @@ -29,8 +29,8 @@ const VisualProperties VisualAnalyzerFactory::properties() const VisualProperties properties; properties.name = tr("Analyzer Plugin"); properties.shortName = "analyzer"; - properties.hasSettings = TRUE; - properties.hasAbout = TRUE; + properties.hasSettings = true; + properties.hasAbout = true; return properties; } diff --git a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp index ed2b93e19..ba23deab4 100644 --- a/src/plugins/Visual/projectm/projectmwidget.cpp +++ b/src/plugins/Visual/projectm/projectmwidget.cpp @@ -38,7 +38,7 @@ ProjectMWidget::ProjectMWidget(QWidget *parent) : QGLWidget(parent) { - setMouseTracking(TRUE); + setMouseTracking(true); m_projectM = 0; QTimer *timer = new QTimer(this); connect(timer, SIGNAL(timeout()),SLOT(updateGL ())); diff --git a/src/plugins/Visual/projectm/visualprojectmfactory.cpp b/src/plugins/Visual/projectm/visualprojectmfactory.cpp index 2637effaa..e42a736ff 100644 --- a/src/plugins/Visual/projectm/visualprojectmfactory.cpp +++ b/src/plugins/Visual/projectm/visualprojectmfactory.cpp @@ -29,7 +29,7 @@ const VisualProperties VisualProjectMFactory::properties() const properties.name = tr("ProjectM"); properties.shortName = "projectm"; properties.hasSettings = FALSE; - properties.hasAbout = TRUE; + properties.hasAbout = true; return properties; } diff --git a/src/qmmp/abstractengine.h b/src/qmmp/abstractengine.h index 120971c8b..b8dc453c3 100644 --- a/src/qmmp/abstractengine.h +++ b/src/qmmp/abstractengine.h @@ -99,7 +99,7 @@ public: * @param factory Engine plugin factory. * @param enable Plugin enable state (\b true - enable, \b false - disable) */ - static void setEnabled(EngineFactory* factory, bool enable = TRUE); + static void setEnabled(EngineFactory* factory, bool enable = true); /*! * Returns \b true if engine is enabled, otherwise returns \b false * @param factory Engine plugin factory. diff --git a/src/qmmp/decoder.h b/src/qmmp/decoder.h index 764491a36..867c2f830 100644 --- a/src/qmmp/decoder.h +++ b/src/qmmp/decoder.h @@ -98,7 +98,7 @@ public: * @param factory Decoder plugin factory. * @param enable Plugin enable state (\b true - enable, \b false - disable) */ - static void setEnabled(DecoderFactory* factory, bool enable = TRUE); + static void setEnabled(DecoderFactory* factory, bool enable = true); /*! * Returns \b true if input plugin is enabled, otherwise returns \b false * @param factory Decoder plugin factory. diff --git a/src/qmmp/effect.h b/src/qmmp/effect.h index ed84815f3..71cd7b63f 100644 --- a/src/qmmp/effect.h +++ b/src/qmmp/effect.h @@ -87,7 +87,7 @@ public: * @param factory Effect plugin factory. * @param enable Plugin enable state (\b true - enable, \b false - disable) */ - static void setEnabled(EffectFactory* factory, bool enable = TRUE); + static void setEnabled(EffectFactory* factory, bool enable = true); /*! * Returns \b true if input plugin is enabled, otherwise returns \b false * @param factory Effect plugin factory. diff --git a/src/qmmp/emptyinputsource.cpp b/src/qmmp/emptyinputsource.cpp index ebbd30773..98f5f6f9a 100644 --- a/src/qmmp/emptyinputsource.cpp +++ b/src/qmmp/emptyinputsource.cpp @@ -32,7 +32,7 @@ QIODevice *EmptyInputSource::ioDevice() bool EmptyInputSource::initialize() { - m_ok = TRUE; //check decoders + m_ok = true; //check decoders if(m_ok) emit ready(this); return m_ok; diff --git a/src/qmmp/metadatamanager.cpp b/src/qmmp/metadatamanager.cpp index ba2c9d43d..8d18c8df0 100644 --- a/src/qmmp/metadatamanager.cpp +++ b/src/qmmp/metadatamanager.cpp @@ -176,9 +176,9 @@ bool MetaDataManager::supports(const QString &fileName) const if (!QFile::exists(fileName)) return FALSE; if((fact = Decoder::findByPath(fileName))) - return TRUE; + return true; else if((efact = AbstractEngine::findByPath(fileName))) - return TRUE; + return true; return FALSE; } return FALSE; diff --git a/src/qmmp/metadatamanager.h b/src/qmmp/metadatamanager.h index 11c57c0ea..8c5e288e7 100644 --- a/src/qmmp/metadatamanager.h +++ b/src/qmmp/metadatamanager.h @@ -46,7 +46,7 @@ public: * @param path Source file path. * @param useMetaData Metadata usage (\b true - use, \b - do not use) */ - QList <FileInfo *> createPlayList(const QString &path, bool useMetaData = TRUE) const; + QList <FileInfo *> createPlayList(const QString &path, bool useMetaData = true) const; /*! * Creats metadata object, which provides full access to file tags. * @param url File path or URL. diff --git a/src/qmmp/output.cpp b/src/qmmp/output.cpp index 827d5bbda..26c4c8024 100644 --- a/src/qmmp/output.cpp +++ b/src/qmmp/output.cpp @@ -96,12 +96,12 @@ void Output::pause() void Output::stop() { - m_userStop = TRUE; + m_userStop = true; } void Output::finish() { - m_finish = TRUE; + m_finish = true; } qint64 Output::written() diff --git a/src/qmmp/qmmpaudioengine.cpp b/src/qmmp/qmmpaudioengine.cpp index b26170b6f..909862628 100644 --- a/src/qmmp/qmmpaudioengine.cpp +++ b/src/qmmp/qmmpaudioengine.cpp @@ -93,7 +93,7 @@ bool QmmpAudioEngine::play() if(!(m_output = createOutput(m_decoders.head()))) return FALSE; start(); - return TRUE; + return true; } bool QmmpAudioEngine::enqueue(InputSource *source) @@ -103,9 +103,9 @@ bool QmmpAudioEngine::enqueue(InputSource *source) { m_inputs.value(m_decoder)->setOffset(source->offset()); delete source; - m_next = TRUE; + m_next = true; mutex()->unlock(); - return TRUE; + return true; } mutex()->unlock(); @@ -138,7 +138,7 @@ bool QmmpAudioEngine::enqueue(InputSource *source) if(!decoder->totalTime()) source->setOffset(-1); source->setParent(this); - return TRUE; + return true; } qint64 QmmpAudioEngine::totalTime() @@ -258,7 +258,7 @@ void QmmpAudioEngine::pause() void QmmpAudioEngine::stop() { mutex()->lock (); - m_user_stop = TRUE; + m_user_stop = true; mutex()->unlock(); if (m_output) @@ -312,7 +312,7 @@ qint64 QmmpAudioEngine::produceSound(char *data, qint64 size, quint32 brate, int if (!m_eqInited) { init_iir(); - m_eqInited = TRUE; + m_eqInited = true; } iir((void*) data, sz, chan); } @@ -435,7 +435,7 @@ void QmmpAudioEngine::run() } else { - flush(TRUE); + flush(true); finish(); //wake up waiting threads cond()->wakeAll(); @@ -457,7 +457,7 @@ void QmmpAudioEngine::run() } } - flush(TRUE); + flush(true); if (m_output) { m_output->recycler()->mutex()->lock (); @@ -471,11 +471,11 @@ void QmmpAudioEngine::run() } m_output->recycler()->mutex()->unlock(); } - m_done = TRUE; + m_done = true; m_finish = !m_user_stop; } else - m_finish = TRUE; + m_finish = true; mutex()->unlock(); } if(m_decoder) @@ -517,7 +517,7 @@ void QmmpAudioEngine::flush(bool final) } if (m_user_stop || m_finish) - m_done = TRUE; + m_done = true; else { m_output_at -= produceSound((char*)m_output_buf, m_output_at, m_bitrate, m_chan); @@ -549,7 +549,7 @@ void QmmpAudioEngine::sendMetaData() QString url = m_inputs.value(m_decoder)->url(); if (QFile::exists(url)) //send metadata for local files only { - QList <FileInfo *> list = MetaDataManager::instance()->createPlayList(url, TRUE); + QList <FileInfo *> list = MetaDataManager::instance()->createPlayList(url, true); if (!list.isEmpty()) { StateHandler::instance()->dispatch(list[0]->metaData()); @@ -587,7 +587,7 @@ Output *QmmpAudioEngine::createOutput(Decoder *d) if(!m_eqInited) { init_iir(); - m_eqInited = TRUE; + m_eqInited = true; } m_useEq = m_eqEnabled && ap.format() == Qmmp::PCM_S16LE; diff --git a/src/qmmp/qmmpsettings.cpp b/src/qmmp/qmmpsettings.cpp index a1a874a19..5aa04951e 100644 --- a/src/qmmp/qmmpsettings.cpp +++ b/src/qmmp/qmmpsettings.cpp @@ -45,7 +45,7 @@ QmmpSettings::QmmpSettings(QObject *parent) : QObject(parent) m_cover_inc = settings.value("include", (QStringList() << "*.jpg" << "*.png")).toStringList(); m_cover_exclude = settings.value("exclude", (QStringList() << "*back*")).toStringList(); m_cover_depth = settings.value("depth", 0).toInt(); - m_cover_use_files = settings.value("use_files", TRUE).toBool(); + m_cover_use_files = settings.value("use_files", true).toBool(); settings.endGroup(); //network settings m_proxy_enabled = settings.value("Proxy/use_proxy", FALSE).toBool(); diff --git a/src/qmmp/qmmpsettings.h b/src/qmmp/qmmpsettings.h index 0bb68ff45..35b87d959 100644 --- a/src/qmmp/qmmpsettings.h +++ b/src/qmmp/qmmpsettings.h @@ -55,7 +55,7 @@ public: * If \b include is \b true, this function returns include cover file name filters, * otherwise returns exclude filters. */ - QStringList coverNameFilters(bool include = TRUE) const; + QStringList coverNameFilters(bool include = true) const; /*! * Returns a depth of recursive cover file search. */ diff --git a/src/qmmp/soundcore.cpp b/src/qmmp/soundcore.cpp index 4dad3b0e4..87bf027c8 100644 --- a/src/qmmp/soundcore.cpp +++ b/src/qmmp/soundcore.cpp @@ -295,7 +295,7 @@ bool SoundCore::enqueue(InputSource *s) m_pendingEngine = 0; } } - return TRUE; + return true; } void SoundCore::startPendingEngine() diff --git a/src/qmmp/statehandler.cpp b/src/qmmp/statehandler.cpp index dcfea90e1..1a69012e9 100644 --- a/src/qmmp/statehandler.cpp +++ b/src/qmmp/statehandler.cpp @@ -38,7 +38,7 @@ StateHandler::StateHandler(QObject *parent) m_frequency = 0; m_precision = 0; m_channels = 0; - m_sendAboutToFinish = TRUE; + m_sendAboutToFinish = true; m_state = Qmmp::Stopped; } @@ -132,7 +132,7 @@ void StateHandler::dispatch(Qmmp::State state) m_frequency = 0; m_precision = 0; m_channels = 0; - m_sendAboutToFinish = TRUE; + m_sendAboutToFinish = true; m_metaData.clear(); } if (m_state != state) diff --git a/src/qmmp/tagmodel.cpp b/src/qmmp/tagmodel.cpp index 272d8022b..52f04308e 100644 --- a/src/qmmp/tagmodel.cpp +++ b/src/qmmp/tagmodel.cpp @@ -52,7 +52,7 @@ int TagModel::caps() bool TagModel::exists() { - return TRUE; + return true; } void TagModel::create() diff --git a/src/qmmp/visual.cpp b/src/qmmp/visual.cpp index ac820d497..70de78296 100644 --- a/src/qmmp/visual.cpp +++ b/src/qmmp/visual.cpp @@ -32,7 +32,7 @@ Visual::Visual(QWidget *parent) : QWidget(parent) { - setAttribute(Qt::WA_DeleteOnClose, TRUE); + setAttribute(Qt::WA_DeleteOnClose, true); setAttribute(Qt::WA_QuitOnClose, FALSE); m_decoder = 0; m_output = 0; diff --git a/src/qmmp/visual.h b/src/qmmp/visual.h index e45eac657..27df2f0b1 100644 --- a/src/qmmp/visual.h +++ b/src/qmmp/visual.h @@ -76,7 +76,7 @@ public: * @param factory Visual plugin factory. * @param enable Plugin enable state (\b true - enable, \b false - disable) */ - static void setEnabled(VisualFactory* factory, bool enable = TRUE); + static void setEnabled(VisualFactory* factory, bool enable = true); /*! * Returns \b true if visual plugin is enabled, otherwise returns \b false * @param factory Effect plugin factory. diff --git a/src/qmmp/volumecontrol.cpp b/src/qmmp/volumecontrol.cpp index f75f9effb..40341e95a 100644 --- a/src/qmmp/volumecontrol.cpp +++ b/src/qmmp/volumecontrol.cpp @@ -89,7 +89,7 @@ SoftwareVolume::SoftwareVolume(QObject *parent) QSettings settings(Qmmp::configFile(), QSettings::IniFormat); m_left = settings.value("Volume/left", 80).toInt(); m_right = settings.value("Volume/right", 80).toInt(); - blockSignals(TRUE); + blockSignals(true); checkVolume(); blockSignals(FALSE); QTimer::singleShot(125, this, SLOT(checkVolume())); diff --git a/src/qmmpui/commandlinemanager.cpp b/src/qmmpui/commandlinemanager.cpp index 82c8d7861..cb128dc51 100644 --- a/src/qmmpui/commandlinemanager.cpp +++ b/src/qmmpui/commandlinemanager.cpp @@ -98,7 +98,7 @@ bool CommandLineManager::hasOption(const QString &opt_str) foreach(CommandLineOption *opt, *m_options) { if (opt->identify(opt_str)) - return TRUE; + return true; } return FALSE; } diff --git a/src/qmmpui/detailsdialog.cpp b/src/qmmpui/detailsdialog.cpp index 3ab9f35ca..a63290311 100644 --- a/src/qmmpui/detailsdialog.cpp +++ b/src/qmmpui/detailsdialog.cpp @@ -53,7 +53,7 @@ DetailsDialog::DetailsDialog(AbstractPlaylistItem *item, QWidget *parent) foreach(QString title, m_metaDataModel->descriptions().keys()) { QTextEdit *textEdit = new QTextEdit(this); - textEdit->setReadOnly(TRUE); + textEdit->setReadOnly(true); textEdit->setPlainText(m_metaDataModel->descriptions().value(title)); ui.tabWidget->addTab(textEdit, title); } @@ -66,7 +66,7 @@ DetailsDialog::~DetailsDialog() void DetailsDialog::printInfo() { - QList <FileInfo *> flist = MetaDataManager::instance()->createPlayList(m_path, TRUE); + QList <FileInfo *> flist = MetaDataManager::instance()->createPlayList(m_path, true); QMap <Qmmp::MetaData, QString> metaData; if(!flist.isEmpty() && QFile::exists(m_item->url())) metaData = flist.at(0)->metaData(); diff --git a/src/qmmpui/filedialog.h b/src/qmmpui/filedialog.h index 7395ffea0..1f0478eb7 100644 --- a/src/qmmpui/filedialog.h +++ b/src/qmmpui/filedialog.h @@ -219,7 +219,7 @@ protected: */ virtual bool modal()const { - return TRUE; + return true; }; /*! * Object destructor diff --git a/src/qmmpui/general.h b/src/qmmpui/general.h index 8ead65b37..700a021b2 100644 --- a/src/qmmpui/general.h +++ b/src/qmmpui/general.h @@ -54,7 +54,7 @@ public: * @param factory General plugin factory. * @param enable Plugin enable state (\b true - enable, \b false - disable) */ - static void setEnabled(GeneralFactory* factory, bool enable = TRUE); + static void setEnabled(GeneralFactory* factory, bool enable = true); /*! * Returns \b true if general plugin is enabled, otherwise returns \b false * @param factory General plugin factory. diff --git a/src/qmmpui/generalhandler.cpp b/src/qmmpui/generalhandler.cpp index fa8659046..8981796e3 100644 --- a/src/qmmpui/generalhandler.cpp +++ b/src/qmmpui/generalhandler.cpp @@ -97,7 +97,7 @@ bool GeneralHandler::visibilityControl() foreach(factory, *General::factories()) { if (General::isEnabled(factory) && factory->properties().visibilityControl) - return TRUE; + return true; } return FALSE; } diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp index bf6648470..a444ad646 100644 --- a/src/qmmpui/mediaplayer.cpp +++ b/src/qmmpui/mediaplayer.cpp @@ -202,7 +202,7 @@ void MediaPlayer::updateNextUrl() { if(m_pl_manager->currentPlayList()->nextItem() && !isRepeatable()) { - m_core->play(m_pl_manager->currentPlayList()->nextItem()->url(), TRUE); + m_core->play(m_pl_manager->currentPlayList()->nextItem()->url(), true); m_nextUrl = m_pl_manager->currentPlayList()->nextItem()->url(); qDebug("MediaPlayer: sending next url"); } diff --git a/src/qmmpui/metadataformatter.cpp b/src/qmmpui/metadataformatter.cpp index 073c6ef88..bd1501b4a 100644 --- a/src/qmmpui/metadataformatter.cpp +++ b/src/qmmpui/metadataformatter.cpp @@ -108,7 +108,7 @@ QString MetaDataFormatter::processIfKeyWord(QString title) return title; } //process condition - bool cond = TRUE; + bool cond = true; foreach(QString arg, args.at(0).split("%&")) { cond &= !arg.isEmpty(); diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp index 01ec148f1..1518db19c 100644 --- a/src/qmmpui/playlistmodel.cpp +++ b/src/qmmpui/playlistmodel.cpp @@ -172,7 +172,7 @@ bool PlayListModel::setCurrent(int c) m_currentItem = m_items.at(c); emit currentChanged(); emit listChanged(); - return TRUE; + return true; } bool PlayListModel::next() @@ -180,7 +180,7 @@ bool PlayListModel::next() if (!isEmptyQueue()) { setCurrentToQueued(); - return TRUE; + return true; } if (isFileLoaderRunning()) @@ -377,7 +377,7 @@ void PlayListModel::invertSelection() void PlayListModel::selectAll() { for (int i = 0; i<m_items.size(); ++i) - m_items.at(i)->setSelected(TRUE); + m_items.at(i)->setSelected(true); emit listChanged(); } @@ -466,7 +466,7 @@ bool PlayListModel::setFileList(const QStringList & l) if (!model_cleared) { clear(); - model_cleared = TRUE; + model_cleared = true; } if (f_info.isDir()) addDirectory(str); @@ -897,7 +897,7 @@ bool PlayListModel::isFileLoaderRunning() const { foreach(FileLoader* l,m_running_loaders) if (l && l->isRunning()) - return TRUE; + return true; return FALSE; } diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h index d61dea152..396b87640 100644 --- a/src/qmmpui/playlistmodel.h +++ b/src/qmmpui/playlistmodel.h @@ -356,7 +356,7 @@ public slots: void addDirectory(const QString& dir); /*! * Removes previous items and loads list of files (regular files or directories), - * returns \b TRUE if at least one file has been successfully loaded, + * returns \b true if at least one file has been successfully loaded, * otherwise returns \b FALSE */ bool setFileList(const QStringList &l); diff --git a/src/qmmpui/playlistsettings.cpp b/src/qmmpui/playlistsettings.cpp index 416da8df5..5fec65c19 100644 --- a/src/qmmpui/playlistsettings.cpp +++ b/src/qmmpui/playlistsettings.cpp @@ -28,9 +28,9 @@ PlaylistSettings::PlaylistSettings() { QSettings s (Qmmp::configFile(), QSettings::IniFormat); m_format = s.value("PlayList/title_format", "%p%if(%p&%t, - ,)%t").toString(); - m_convertUnderscore = s.value ("PlayList/convert_underscore", TRUE).toBool(); - m_convertTwenty = s.value ("PlayList/convert_twenty", TRUE).toBool(); - m_useMetadata = s.value ("PlayList/load_metadata", TRUE).toBool(); + m_convertUnderscore = s.value ("PlayList/convert_underscore", true).toBool(); + m_convertTwenty = s.value ("PlayList/convert_twenty", true).toBool(); + m_useMetadata = s.value ("PlayList/load_metadata", true).toBool(); } PlaylistSettings::~PlaylistSettings() diff --git a/src/qmmpui/playstate.cpp b/src/qmmpui/playstate.cpp index ad9da3bdf..56657beb7 100644 --- a/src/qmmpui/playstate.cpp +++ b/src/qmmpui/playstate.cpp @@ -66,7 +66,7 @@ bool ShufflePlayState::previous() if (itm_count > 1) m_shuffled_current --; m_model->setCurrent(m_shuffled_indexes.at(m_shuffled_current)); - return TRUE; + return true; } return FALSE; } @@ -124,7 +124,7 @@ bool NormalPlayState::previous() if ( m_model->currentRow() < 1 && !m_model->isRepeatableList()) return FALSE; else if (m_model->setCurrent(m_model->currentRow() - 1)) - return TRUE; + return true; else if (m_model->isRepeatableList()) return m_model->setCurrent(m_model->items().count() - 1); } diff --git a/src/qmmpui/templateeditor.cpp b/src/qmmpui/templateeditor.cpp index 203f91e6a..ac6fa45af 100644 --- a/src/qmmpui/templateeditor.cpp +++ b/src/qmmpui/templateeditor.cpp @@ -85,7 +85,7 @@ QString TemplateEditor::getTemplate (QWidget *parent, const QString &title, cons if(editor->exec() == QDialog::Accepted) { if(ok) - *ok = TRUE; + *ok = true; QString t = editor->currentTemplate(); editor->deleteLater(); return t; diff --git a/src/ui/balancebar.cpp b/src/ui/balancebar.cpp index 508cf9f19..2984577aa 100644 --- a/src/ui/balancebar.cpp +++ b/src/ui/balancebar.cpp @@ -45,7 +45,7 @@ BalanceBar::~BalanceBar() void BalanceBar::mousePressEvent(QMouseEvent *e) { - m_moving = TRUE; + m_moving = true; press_pos = e->x(); if(m_pos<e->x() && e->x()<m_pos+11*m_skin->ratio()) { diff --git a/src/ui/balancebar.h b/src/ui/balancebar.h index 508603bc1..4e8af0b5e 100644 --- a/src/ui/balancebar.h +++ b/src/ui/balancebar.h @@ -54,7 +54,7 @@ private: int m_max, m_min, m_pos, m_value, m_old; QPixmap m_pixmap; int convert(int); // value = convert(position); - void draw(bool pressed = TRUE); + void draw(bool pressed = true); protected: void mousePressEvent(QMouseEvent*); diff --git a/src/ui/builtincommandlineoption.cpp b/src/ui/builtincommandlineoption.cpp index 5c3d51ebc..3a51d7190 100644 --- a/src/ui/builtincommandlineoption.cpp +++ b/src/ui/builtincommandlineoption.cpp @@ -47,7 +47,7 @@ bool BuiltinCommandLineOption::identify(const QString & str) const str == "--toggle-visibility" || str == "--add-file" || str == "--add-dir") - return TRUE; + return true; return FALSE; } diff --git a/src/ui/button.cpp b/src/ui/button.cpp index 742cf0907..18279b0e0 100644 --- a/src/ui/button.cpp +++ b/src/ui/button.cpp @@ -56,8 +56,8 @@ void Button::setON (bool on) } void Button::mousePressEvent (QMouseEvent *e) { - setON (TRUE); - m_cursorin = TRUE; + setON (true); + m_cursorin = true; QWidget::mousePressEvent(e); } @@ -71,8 +71,8 @@ void Button::mouseReleaseEvent (QMouseEvent*) void Button::mouseMoveEvent (QMouseEvent *e) { if ( !m_cursorin && rect().contains(e->pos()) ) { - m_cursorin = TRUE; - setON (TRUE); + m_cursorin = true; + setON (true); } else if ( m_cursorin && !rect().contains(e->pos()) ) { m_cursorin = FALSE; setON (FALSE); diff --git a/src/ui/configdialog.cpp b/src/ui/configdialog.cpp index 933769a6e..061245957 100644 --- a/src/ui/configdialog.cpp +++ b/src/ui/configdialog.cpp @@ -93,7 +93,7 @@ void ConfigDialog::readSettings() ui.per20CheckBox->setChecked(player->playListManager()->convertTwenty()); } ui.protocolCheckBox->setChecked(settings.value ("PlayList/show_protocol", FALSE).toBool()); - ui.numbersCheckBox->setChecked(settings.value ("PlayList/show_numbers", TRUE).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()); QmmpSettings *gs = QmmpSettings::instance(); @@ -126,7 +126,7 @@ void ConfigDialog::readSettings() //resume playback ui.continuePlaybackCheckBox->setChecked(settings.value("General/resume_on_startup", FALSE).toBool()); //cover options - ui.coverIncludeLineEdit->setText(gs->coverNameFilters(TRUE).join(",")); + ui.coverIncludeLineEdit->setText(gs->coverNameFilters(true).join(",")); ui.coverExcludeLineEdit->setText(gs->coverNameFilters(FALSE).join(",")); ui.coverDepthSpinBox->setValue(gs->coverSearchDepth()); ui.useCoverFilesCheckBox->setChecked(gs->useCoverFiles()); @@ -216,7 +216,7 @@ void ConfigDialog::findSkins(const QString &path) void ConfigDialog::loadPluginsInfo() { - ui.treeWidget->blockSignals(TRUE); + ui.treeWidget->blockSignals(true); /* load transport plugin information */ @@ -226,7 +226,7 @@ void ConfigDialog::loadPluginsInfo() for (int i = 0; i < transports->count (); ++i) new PluginItem (item, transports->at(i), files.at (i)); ui.treeWidget->addTopLevelItem(item); - item->setExpanded(TRUE); + item->setExpanded(true); /* load input plugins information @@ -237,7 +237,7 @@ void ConfigDialog::loadPluginsInfo() for (int i = 0; i < decoders->count (); ++i) new PluginItem (item, decoders->at(i), files.at (i)); ui.treeWidget->addTopLevelItem(item); - item->setExpanded(TRUE); + item->setExpanded(true); /* load audio engines information */ @@ -247,7 +247,7 @@ void ConfigDialog::loadPluginsInfo() for (int i = 0; i < engines->count (); ++i) new PluginItem (item, engines->at(i), files.at (i)); ui.treeWidget->addTopLevelItem(item); - item->setExpanded(TRUE); + item->setExpanded(true); /* load effect plugin information */ @@ -257,7 +257,7 @@ void ConfigDialog::loadPluginsInfo() for (int i = 0; i < effects->count (); ++i) new PluginItem (item, effects->at(i), files.at (i)); ui.treeWidget->addTopLevelItem(item); - item->setExpanded(TRUE); + item->setExpanded(true); /* load visual plugin information */ @@ -267,7 +267,7 @@ void ConfigDialog::loadPluginsInfo() for (int i = 0; i < visuals->count (); ++i) new PluginItem (item, visuals->at(i), files.at (i)); ui.treeWidget->addTopLevelItem(item); - item->setExpanded(TRUE); + item->setExpanded(true); /* load general plugin information */ @@ -277,7 +277,7 @@ void ConfigDialog::loadPluginsInfo() for (int i = 0; i < generals->count (); ++i) new PluginItem (item, generals->at(i), files.at (i)); ui.treeWidget->addTopLevelItem(item); - item->setExpanded(TRUE); + item->setExpanded(true); ui.treeWidget->blockSignals(FALSE); ui.treeWidget->resizeColumnToContents(0); diff --git a/src/ui/cursorimage.cpp b/src/ui/cursorimage.cpp index 96637728d..2dbe1353b 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 c8c619541..82a0edc89 100644 --- a/src/ui/display.cpp +++ b/src/ui/display.cpp @@ -51,7 +51,7 @@ MainDisplay::MainDisplay (QWidget *parent) m_mw = qobject_cast<MainWindow*>(parent); m_titlebar = new TitleBar(this); m_titlebar->move(0,0); - m_titlebar->setActive(TRUE); + m_titlebar->setActive(true); m_previous = new Button (this, Skin::BT_PREVIOUS_N, Skin::BT_PREVIOUS_P, Skin::CUR_NORMAL); m_previous->setToolTip(tr("Previous")); connect (m_previous, SIGNAL (clicked()), parent, SLOT (previous())); @@ -172,7 +172,7 @@ void MainDisplay::setState(Qmmp::State state) { case Qmmp::Playing: m_playstatus->setStatus(PlayStatus::PLAY); - m_timeIndicator->setNeedToShowTime(TRUE); + m_timeIndicator->setNeedToShowTime(true); setDuration(m_core->totalTime()); break; case Qmmp::Paused: diff --git a/src/ui/display.h b/src/ui/display.h index c776d01db..7f1541081 100644 --- a/src/ui/display.h +++ b/src/ui/display.h @@ -61,7 +61,7 @@ public: bool isShuffle()const; void setIsRepeatable(bool); void setIsShuffle(bool); - void setMinimalMode(bool b = TRUE); + void setMinimalMode(bool b = true); void setActive(bool b); public slots: diff --git a/src/ui/dock.cpp b/src/ui/dock.cpp index c41173710..d5d373e86 100644 --- a/src/ui/dock.cpp +++ b/src/ui/dock.cpp @@ -215,25 +215,25 @@ bool Dock::isDocked (QWidget* mv, QWidget* st) int nx = mv->x() - st->x(); int ny = abs (mv->y() - st->y() + mv->height()); if (ny < 2 && nx > -mv->width() && nx < st->width()) //above - return TRUE; + return true; /***********/ nx = mv->x() - st->x(); ny = abs (mv->y() - st->y() - st->height()); if (ny < 2 && nx > -mv->width() && nx < st->width()) //near - return TRUE; + return true; /**************/ nx = abs (mv->x() - st->x() + mv->width()); ny = mv->y() - st->y(); if (nx < 2 && ny > -mv->height() && ny < st->height()) //left - return TRUE; + return true; /*****************/ nx = abs (mv->x() - st->x() - st->width()); ny = mv->y() - st->y(); if (nx < 2 && ny > -mv->height() && ny < st->height()) //right - return TRUE; + return true; return FALSE; } diff --git a/src/ui/eqslider.cpp b/src/ui/eqslider.cpp index 4c3ef0a05..1ddf7699b 100644 --- a/src/ui/eqslider.cpp +++ b/src/ui/eqslider.cpp @@ -45,7 +45,7 @@ EqSlider::~EqSlider() void EqSlider::mousePressEvent(QMouseEvent *e) { - m_moving = TRUE; + m_moving = true; press_pos = e->y(); if (m_pos<e->y() && e->y()<m_pos+11*m_skin->ratio()) { diff --git a/src/ui/eqslider.h b/src/ui/eqslider.h index a766c575c..0a36a16ee 100644 --- a/src/ui/eqslider.h +++ b/src/ui/eqslider.h @@ -56,7 +56,7 @@ private: double m_max, m_min, m_pos, m_value, m_old; QPixmap m_pixmap; double convert(int); // value = convert(position); - void draw(bool pressed = TRUE); + void draw(bool pressed = true); protected: void mousePressEvent(QMouseEvent*); diff --git a/src/ui/eqtitlebar.cpp b/src/ui/eqtitlebar.cpp index ea0bd1c8b..97d2626cb 100644 --- a/src/ui/eqtitlebar.cpp +++ b/src/ui/eqtitlebar.cpp @@ -48,7 +48,7 @@ EqTitleBar::EqTitleBar(QWidget *parent) QSettings settings(Qmmp::configFile(), QSettings::IniFormat); if (settings.value("Equalizer/shaded", FALSE).toBool()) shade(); - m_align = TRUE; + m_align = true; setActive(FALSE); setCursor(m_skin->getCursor(Skin::CUR_EQTITLE)); connect(m_skin, SIGNAL(skinChanged()), SLOT(updateSkin())); diff --git a/src/ui/eqwidget.cpp b/src/ui/eqwidget.cpp index 092786d2a..d84de2c37 100644 --- a/src/ui/eqwidget.cpp +++ b/src/ui/eqwidget.cpp @@ -161,7 +161,7 @@ void EqWidget::readSettings() setGain(); //equalizer presets QSettings eq_preset (QDir::homePath() +"/.qmmp/eq.preset", QSettings::IniFormat); - for (int i = 1; TRUE; ++i) + for (int i = 1; true; ++i) { if (eq_preset.contains("Presets/Preset"+QString("%1").arg(i))) { @@ -184,7 +184,7 @@ void EqWidget::readSettings() } //equalizer auto-load presets QSettings eq_auto (QDir::homePath() +"/.qmmp/eq.auto_preset", QSettings::IniFormat); - for (int i = 1; TRUE; ++i) + for (int i = 1; true; ++i) { if (eq_auto.contains("Presets/Preset"+QString("%1").arg(i))) { diff --git a/src/ui/eqwidget.h b/src/ui/eqwidget.h index 7a48a00b8..4417cf1c0 100644 --- a/src/ui/eqwidget.h +++ b/src/ui/eqwidget.h @@ -53,7 +53,7 @@ public: * necessary for auto-load presets */ void loadPreset(const QString &name); - void setMimimalMode(bool b = TRUE); + void setMimimalMode(bool b = true); signals: void valueChanged(); diff --git a/src/ui/keyboardmanager.cpp b/src/ui/keyboardmanager.cpp index 024f12bae..3e4056eab 100644 --- a/src/ui/keyboardmanager.cpp +++ b/src/ui/keyboardmanager.cpp @@ -34,7 +34,7 @@ KeyboardManager::KeyboardManager (PlayList* pl) bool KeyboardManager::handleKeyPress (QKeyEvent* ke) { - bool handled = TRUE; + bool handled = true; switch (ke->key()) { case Qt::Key_Up: diff --git a/src/ui/keyboardmanager.h b/src/ui/keyboardmanager.h index 73fa1bd53..95ea57b07 100644 --- a/src/ui/keyboardmanager.h +++ b/src/ui/keyboardmanager.h @@ -40,13 +40,13 @@ class KeyboardManager KeyboardManager (PlayList*); /*! - * Handles key press events from \b PlayList object. Returns \b TRUE + * Handles key press events from \b PlayList object. Returns \b true * if the key was handled, otherwise \b FALSE. */ bool handleKeyPress (QKeyEvent*); /*! - * Handles key release events from \b PlayList object. Returns \b TRUE + * Handles key release events from \b PlayList object. Returns \b true * if the key was handled, otherwise \b FALSE. */ bool handleKeyRelease (QKeyEvent*); diff --git a/src/ui/listwidget.cpp b/src/ui/listwidget.cpp index c4d905195..5f3a20528 100644 --- a/src/ui/listwidget.cpp +++ b/src/ui/listwidget.cpp @@ -70,7 +70,7 @@ 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_number = settings.value ("PlayList/show_numbers", TRUE).toBool(); + m_show_number = settings.value ("PlayList/show_numbers", true).toBool(); bool show_popup = settings.value("PlayList/show_popup", FALSE).toBool(); if (m_update) @@ -87,7 +87,7 @@ void ListWidget::readSettings() } else { - m_update = TRUE; + m_update = true; m_metrics = new QFontMetrics(m_font); } if(show_popup) @@ -166,7 +166,7 @@ void ListWidget::mousePressEvent(QMouseEvent *e) { if(m_popupWidget) m_popupWidget->hide(); - m_scroll = TRUE; + m_scroll = true; int y = e->y(); int row = rowAt(y); @@ -178,7 +178,7 @@ void ListWidget::mousePressEvent(QMouseEvent *e) m_model->clearSelection(); if (m_model->isSelected(row) && (e->modifiers() == Qt::NoModifier)) - m_select_on_release = TRUE; + m_select_on_release = true; //qWarning("m_prev_clicked_row: %d",m_prev_clicked_row); @@ -221,7 +221,7 @@ void ListWidget::mousePressEvent(QMouseEvent *e) void ListWidget::resizeEvent(QResizeEvent *e) { m_rows = (e->size().height() - 10) / m_metrics->ascent (); - m_scroll = TRUE; + m_scroll = true; updateList(); QWidget::resizeEvent(e); } @@ -259,7 +259,7 @@ bool ListWidget::event (QEvent *e) } e->accept(); m_popupWidget->prepare(m_model->item(row), helpEvent->globalPos()); - return TRUE; + return true; } else if(e->type() == QEvent::Leave) m_popupWidget->deactivate(); @@ -327,7 +327,7 @@ void ListWidget::scroll(int sc) if (m_model->count() <= m_rows) return; m_first = sc; //*(m_model->count() - m_rows)/99; - m_scroll = TRUE; + m_scroll = true; updateList(); } diff --git a/src/ui/mainvisual.cpp b/src/ui/mainvisual.cpp index 185107e7a..2522e6311 100644 --- a/src/ui/mainvisual.cpp +++ b/src/ui/mainvisual.cpp @@ -188,7 +188,7 @@ void MainVisual::mousePressEvent (QMouseEvent *e) foreach(QAction *act, m_visModeGroup->actions ()) if (str == act->data().toString()) { - act->setChecked(TRUE); + act->setChecked(true); break; } } @@ -282,13 +282,13 @@ void MainVisual::createMenu() connect(m_menu, SIGNAL(triggered (QAction *)),SLOT(updateSettings())); QMenu *visMode = m_menu->addMenu(tr("Visualization Mode")); m_visModeGroup = new QActionGroup(this); - m_visModeGroup->setExclusive(TRUE); + m_visModeGroup->setExclusive(true); m_visModeGroup->addAction(tr("Analyzer"))->setData("Analyzer"); m_visModeGroup->addAction(tr("Scope"))->setData("Scope"); m_visModeGroup->addAction(tr("Off"))->setData("None"); foreach(QAction *act, m_visModeGroup->actions ()) { - act->setCheckable(TRUE); + act->setCheckable(true); visMode->addAction(act); } @@ -302,36 +302,36 @@ void MainVisual::createMenu() m_analyzerTypeGroup->addAction(tr("Bars"))->setData(1); foreach(QAction *act, m_analyzerModeGroup->actions ()) { - act->setCheckable(TRUE); + act->setCheckable(true); analyzerMode->addAction(act); } analyzerMode->addSeparator (); foreach(QAction *act, m_analyzerTypeGroup->actions ()) { - act->setCheckable(TRUE); + act->setCheckable(true); analyzerMode->addAction(act); } analyzerMode->addSeparator (); m_peaksAction = analyzerMode->addAction(tr("Peaks")); - m_peaksAction->setCheckable(TRUE); + m_peaksAction->setCheckable(true); QMenu *refreshRate = m_menu->addMenu(tr("Refresh Rate")); m_fpsGroup = new QActionGroup(this); - m_fpsGroup->setExclusive(TRUE); + m_fpsGroup->setExclusive(true); m_fpsGroup->addAction(tr("50 fps"))->setData(50); m_fpsGroup->addAction(tr("25 fps"))->setData(25); m_fpsGroup->addAction(tr("10 fps"))->setData(10); m_fpsGroup->addAction(tr("5 fps"))->setData(5); foreach(QAction *act, m_fpsGroup->actions ()) { - act->setCheckable(TRUE); + act->setCheckable(true); refreshRate->addAction(act); } QMenu *analyzerFalloff = m_menu->addMenu(tr("Analyzer Falloff")); m_analyzerFalloffGroup = new QActionGroup(this); - m_analyzerFalloffGroup->setExclusive(TRUE); + m_analyzerFalloffGroup->setExclusive(true); m_analyzerFalloffGroup->addAction(tr("Slowest"))->setData(1); m_analyzerFalloffGroup->addAction(tr("Slow"))->setData(2); m_analyzerFalloffGroup->addAction(tr("Medium"))->setData(3); @@ -339,13 +339,13 @@ void MainVisual::createMenu() m_analyzerFalloffGroup->addAction(tr("Fastest"))->setData(5); foreach(QAction *act, m_analyzerFalloffGroup->actions ()) { - act->setCheckable(TRUE); + act->setCheckable(true); analyzerFalloff->addAction(act); } QMenu *peaksFalloff = m_menu->addMenu(tr("Peaks Falloff")); m_peaksFalloffGroup = new QActionGroup(this); - m_peaksFalloffGroup->setExclusive(TRUE); + m_peaksFalloffGroup->setExclusive(true); m_peaksFalloffGroup->addAction(tr("Slowest"))->setData(1); m_peaksFalloffGroup->addAction(tr("Slow"))->setData(2); m_peaksFalloffGroup->addAction(tr("Medium"))->setData(3); @@ -353,12 +353,12 @@ void MainVisual::createMenu() m_peaksFalloffGroup->addAction(tr("Fastest"))->setData(5); foreach(QAction *act, m_peaksFalloffGroup->actions ()) { - act->setCheckable(TRUE); + act->setCheckable(true); peaksFalloff->addAction(act); } QMenu *background = m_menu->addMenu(tr("Background")); m_transparentAction = background->addAction(tr("Transparent")); - m_transparentAction->setCheckable(TRUE); + m_transparentAction->setCheckable(true); update(); } @@ -368,43 +368,43 @@ void MainVisual::readSettings() QSettings settings(Qmmp::configFile(), QSettings::IniFormat); QString name = settings.value("Visualization/type","Analyzer").toString(); - m_visModeGroup->actions ()[0]->setChecked(TRUE); + m_visModeGroup->actions ()[0]->setChecked(true); foreach(QAction *act, m_visModeGroup->actions ()) if (name == act->data().toString()) - act->setChecked(TRUE); + act->setChecked(true); m_peaksAction->setChecked( - settings.value("Visualization/show_peaks", TRUE).toBool()); + settings.value("Visualization/show_peaks", true).toBool()); int fps = settings.value("Visualization/rate", 25).toInt(); - m_fpsGroup->actions ()[1]->setChecked(TRUE); + m_fpsGroup->actions ()[1]->setChecked(true); foreach(QAction *act, m_fpsGroup->actions ()) if (fps == act->data().toInt()) - act->setChecked(TRUE); + act->setChecked(true); int mode = settings.value("Visualization/analyzer_mode", 0).toInt(); - m_analyzerModeGroup->actions ()[0]->setChecked(TRUE); + m_analyzerModeGroup->actions ()[0]->setChecked(true); foreach(QAction *act, m_analyzerModeGroup->actions ()) if (mode == act->data().toInt()) - act->setChecked(TRUE); + act->setChecked(true); int type = settings.value("Visualization/analyzer_type", 1).toInt(); - m_analyzerTypeGroup->actions ()[1]->setChecked(TRUE); + m_analyzerTypeGroup->actions ()[1]->setChecked(true); foreach(QAction *act, m_analyzerTypeGroup->actions ()) if (type == act->data().toInt()) - act->setChecked(TRUE); + act->setChecked(true); int speed = settings.value("Visualization/peaks_falloff", 3).toInt(); - m_peaksFalloffGroup->actions ()[2]->setChecked(TRUE); + m_peaksFalloffGroup->actions ()[2]->setChecked(true); foreach(QAction *act, m_peaksFalloffGroup->actions ()) if (speed == act->data().toInt()) - act->setChecked(TRUE); + act->setChecked(true); speed = settings.value("Visualization/analyzer_falloff", 3).toInt(); - m_analyzerFalloffGroup->actions ()[2]->setChecked(TRUE); + m_analyzerFalloffGroup->actions ()[2]->setChecked(true); foreach(QAction *act, m_analyzerFalloffGroup->actions ()) if (speed == act->data().toInt()) - act->setChecked(TRUE); + act->setChecked(true); m_transparentAction->setChecked( settings.value("Visualization/transparent_bg", FALSE).toBool()); @@ -429,7 +429,7 @@ Analyzer::Analyzer() peaks_speed[settings.value("Visualization/peaks_falloff", 3).toInt()-1]; m_analyzer_falloff = analyzer_speed[settings.value("Visualization/analyzer_falloff", 3).toInt()-1]; - m_show_peaks = settings.value("Visualization/show_peaks", TRUE).toBool(); + m_show_peaks = settings.value("Visualization/show_peaks", true).toBool(); m_lines = settings.value("Visualization/analyzer_type", 1).toInt() == 0; m_mode = settings.value("Visualization/analyzer_mode", 0).toInt(); @@ -514,7 +514,7 @@ bool Analyzer::process (VisualNode *node) ? magnitude : m_peaks[i]; } } - return TRUE; + return true; } void Analyzer::draw (QPainter *p) @@ -605,7 +605,7 @@ bool Scope::process(VisualNode *node) else if (m_intern_vis_data[i] < -5) m_intern_vis_data[i] = -5; } - return TRUE; + return true; } void Scope::draw(QPainter *p) diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index af68a06b4..d3ef10a5f 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -301,8 +301,8 @@ void MainWindow::readSettings() show(); qApp->processEvents(); //visibility - m_playlist->setVisible(settings.value("Playlist/visible",TRUE).toBool()); - m_equalizer->setVisible(settings.value("Equalizer/visible",TRUE).toBool()); + 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(); // Repeat/Shuffle @@ -312,7 +312,7 @@ void MainWindow::readSettings() m_display->setIsShuffle(val); m_pl_manager->setShuffle(val); - m_update = TRUE; + m_update = true; } if(!settings.value("General/metacity_compat", FALSE).toBool()) { @@ -401,9 +401,9 @@ void MainWindow::createActions() QAction *repeateAllAction = m_mainMenu->addAction(tr("&Repeat Playlist")); QAction *repeateTrackAction = m_mainMenu->addAction(tr("&Repeat Track")); QAction *shuffleAction = m_mainMenu->addAction(tr("&Shuffle")); - repeateAllAction->setCheckable (TRUE); - repeateTrackAction->setCheckable (TRUE); - shuffleAction->setCheckable (TRUE); + repeateAllAction->setCheckable (true); + repeateTrackAction->setCheckable (true); + shuffleAction->setCheckable (true); repeateAllAction->setShortcut(tr("R")) ; repeateTrackAction->setShortcut(tr("Ctrl+R")) ; shuffleAction->setShortcut(tr("S")) ; @@ -529,7 +529,7 @@ void MainWindow::playPause() bool MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd) { if(slist.isEmpty()) - return TRUE; + return true; QStringList paths; foreach(QString arg, slist) { @@ -549,7 +549,7 @@ bool MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd full_path_list << cwd + "/" + s; } setFileList(full_path_list); - return TRUE; + return true; } QHash<QString, QStringList> commands = m_option_manager->splitArgs(slist); if(commands.isEmpty()) @@ -578,7 +578,7 @@ bool MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd else return FALSE; } - return TRUE; + return true; } void MainWindow::jumpToFile() diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp index 32892385f..1b26ab5e0 100644 --- a/src/ui/playlist.cpp +++ b/src/ui/playlist.cpp @@ -50,7 +50,7 @@ PlayList::PlayList (PlayListManager *manager, QWidget *parent) : QWidget (parent) { - setAttribute(Qt::WA_AlwaysShowToolTips,TRUE); + setAttribute(Qt::WA_AlwaysShowToolTips,true); m_pl_manager = manager; m_update = FALSE; m_resize = FALSE; @@ -409,7 +409,7 @@ void PlayList::mousePressEvent (QMouseEvent *e) m_pos = e->pos (); if (m_resizeWidget->underMouse()) { - m_resize = TRUE; + m_resize = true; setCursor (m_skin->getCursor (Skin::CUR_PSIZE)); } else @@ -486,7 +486,7 @@ void PlayList::readSettings() else setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint); move (settings.value ("PlayList/pos", QPoint (100, 332)).toPoint()); //position - m_update = TRUE; + m_update = true; } } diff --git a/src/ui/playlist.h b/src/ui/playlist.h index 990af25ca..0ca76adfa 100644 --- a/src/ui/playlist.h +++ b/src/ui/playlist.h @@ -58,7 +58,7 @@ class PlayList : public QWidget { return m_listWidget; } - void setMinimalMode(bool b = TRUE); + void setMinimalMode(bool b = true); signals: void play(); diff --git a/src/ui/playlistbrowser.cpp b/src/ui/playlistbrowser.cpp index 6ba36c372..bbfc921fe 100644 --- a/src/ui/playlistbrowser.cpp +++ b/src/ui/playlistbrowser.cpp @@ -26,7 +26,7 @@ PlayListBrowser::PlayListBrowser(PlayListManager *manager, QWidget *parent) : QDialog(parent) { - setAttribute(Qt::WA_DeleteOnClose, TRUE); + setAttribute(Qt::WA_DeleteOnClose, true); setAttribute(Qt::WA_QuitOnClose, FALSE); setWindowModality(Qt::NonModal); ui.setupUi(this); @@ -57,7 +57,7 @@ void PlayListBrowser::updateList() int c = m_pl_manager->indexOf(m_pl_manager->selectedPlayList()); ui.listWidget->setCurrentRow (c); QFont font = ui.listWidget->currentItem()->font(); - font.setBold(TRUE); + font.setBold(true); ui.listWidget->currentItem()->setFont(font); } diff --git a/src/ui/playlistselector.cpp b/src/ui/playlistselector.cpp index 8d84750a4..1a70d8ce9 100644 --- a/src/ui/playlistselector.cpp +++ b/src/ui/playlistselector.cpp @@ -70,7 +70,7 @@ void PlayListSelector::readSettings() } else { - m_update = TRUE; + m_update = true; } m_metrics = new QFontMetrics(m_font); @@ -157,7 +157,7 @@ void PlayListSelector::mousePressEvent (QMouseEvent *e) { m_offset += m_rects.at(lastVisible()).right() - m_offset - width() + 42; m_offset = qMin(m_offset, m_offset_max); - m_right_pressed = TRUE; + m_right_pressed = true; drawButtons(); update(); return; @@ -166,7 +166,7 @@ void PlayListSelector::mousePressEvent (QMouseEvent *e) { m_offset -= 11 - m_rects.at(firstVisible()).x() + m_offset; m_offset = qMax(0, m_offset); - m_left_pressed = TRUE; + m_left_pressed = true; drawButtons(); update(); return; diff --git a/src/ui/playlistslider.cpp b/src/ui/playlistslider.cpp index c682906c6..4ca80406f 100644 --- a/src/ui/playlistslider.cpp +++ b/src/ui/playlistslider.cpp @@ -64,8 +64,8 @@ void PlayListSlider::paintEvent(QPaintEvent *) void PlayListSlider::mousePressEvent(QMouseEvent *e) { - m_moving = TRUE; - m_pressed = TRUE; + m_moving = true; + m_pressed = true; press_pos = e->y(); if (m_pos<e->y() && e->y()<m_pos+18*m_skin->ratio()) { diff --git a/src/ui/playlisttitlebar.cpp b/src/ui/playlisttitlebar.cpp index 8646f1192..55f625b36 100644 --- a/src/ui/playlisttitlebar.cpp +++ b/src/ui/playlisttitlebar.cpp @@ -59,7 +59,7 @@ PlayListTitleBar::PlayListTitleBar(QWidget *parent) if (settings.value ("PlayList/shaded", FALSE).toBool()) shade(); resize(m_pl->width(),height()); - m_align = TRUE; + m_align = true; setCursor(m_skin->getCursor(Skin::CUR_PTBAR)); updatePositions(); } @@ -159,7 +159,7 @@ void PlayListTitleBar::mousePressEvent(QMouseEvent* event) pos = event->pos(); if (m_shaded && (width() - 30*m_ratio) < pos.x() && pos.x() < (width() - 22*m_ratio)) { - m_resize = TRUE; + m_resize = true; setCursor (Qt::SizeHorCursor); } break; diff --git a/src/ui/popupsettings.cpp b/src/ui/popupsettings.cpp index e11f00457..837afbf3c 100644 --- a/src/ui/popupsettings.cpp +++ b/src/ui/popupsettings.cpp @@ -34,7 +34,7 @@ PopupSettings::PopupSettings(QWidget *parent) ui.coverSizeSlider->setValue(settings.value ("popup_cover_size", 48).toInt()); ui.textEdit->setPlainText(settings.value ("popup_template", DEFAULT_TEMPLATE).toString()); ui.delaySpinBox->setValue(settings.value("popup_delay", 2500).toInt()); - ui.coverCheckBox->setChecked(settings.value("popup_show_cover",TRUE).toBool()); + ui.coverCheckBox->setChecked(settings.value("popup_show_cover",true).toBool()); settings.endGroup(); createMenu(); } diff --git a/src/ui/popupwidget.cpp b/src/ui/popupwidget.cpp index 8531b9148..48711cbc7 100644 --- a/src/ui/popupwidget.cpp +++ b/src/ui/popupwidget.cpp @@ -54,18 +54,18 @@ PopupWidget::PopupWidget(QWidget *parent) m_coverSize = settings.value("popup_cover_size", 48).toInt(); m_template = settings.value("popup_template",DEFAULT_TEMPLATE).toString(); int delay = settings.value("popup_delay", 2500).toInt(); - bool show_cover = settings.value("popup_show_cover",TRUE).toBool(); + bool show_cover = settings.value("popup_show_cover",true).toBool(); settings.endGroup(); //timer m_timer = new QTimer(this); m_timer->setInterval(delay); - m_timer->setSingleShot (TRUE); + m_timer->setSingleShot (true); if(show_cover) connect(m_timer, SIGNAL(timeout ()), SLOT(loadCover())); else m_pixlabel->hide(); connect(m_timer, SIGNAL(timeout ()), SLOT(show())); - setMouseTracking(TRUE); + setMouseTracking(true); } PopupWidget::~PopupWidget() diff --git a/src/ui/positionbar.cpp b/src/ui/positionbar.cpp index 12396f713..c0ec42f84 100644 --- a/src/ui/positionbar.cpp +++ b/src/ui/positionbar.cpp @@ -50,7 +50,7 @@ PositionBar::~PositionBar() void PositionBar::mousePressEvent(QMouseEvent *e) { - m_moving = TRUE; + m_moving = true; press_pos = e->x(); if (m_pos<e->x() && e->x()<m_pos+29*m_skin->ratio()) { diff --git a/src/ui/positionbar.h b/src/ui/positionbar.h index cbabab9aa..0eb19750d 100644 --- a/src/ui/positionbar.h +++ b/src/ui/positionbar.h @@ -59,7 +59,7 @@ private: QPixmap m_pixmap; MainWindow *mw; qint64 convert(qint64); // value = convert(position); - void draw(bool pressed = TRUE); + void draw(bool pressed = true); protected: void mousePressEvent(QMouseEvent*); diff --git a/src/ui/shadedbar.cpp b/src/ui/shadedbar.cpp index dec2b79fd..b524acd10 100644 --- a/src/ui/shadedbar.cpp +++ b/src/ui/shadedbar.cpp @@ -52,7 +52,7 @@ ShadedBar::~ShadedBar() void ShadedBar::mousePressEvent(QMouseEvent *e) { - m_moving = TRUE; + m_moving = true; press_pos = e->x(); if(m_pos<e->x() && e->x()<m_pos+3) { diff --git a/src/ui/skinreader.cpp b/src/ui/skinreader.cpp index 789fff0b9..69b976636 100644 --- a/src/ui/skinreader.cpp +++ b/src/ui/skinreader.cpp @@ -59,7 +59,7 @@ void SkinReader::generateThumbs() //clear removed skins from cache foreach(QFileInfo thumbFile, d) { - bool del = TRUE; + bool del = true; foreach(QFileInfo fileInfo, f) { if (fileInfo.baseName () == thumbFile.baseName ()) @@ -79,7 +79,7 @@ void SkinReader::generateThumbs() //add new skins to cache foreach(QFileInfo fileInfo, f) { - bool create = TRUE; + bool create = true; foreach(QFileInfo thumbInfo, d) { if (fileInfo.baseName () == thumbInfo.baseName ()) @@ -95,9 +95,9 @@ void SkinReader::generateThumbs() QString name = fileInfo.fileName ().toLower(); if (name.endsWith(".tgz") || name.endsWith(".tar.gz") || name.endsWith(".tar.bz2")) - untar(fileInfo.filePath (), cache_dir.absolutePath (), TRUE); + untar(fileInfo.filePath (), cache_dir.absolutePath (), true); if (name.endsWith(".zip") || name.endsWith(".wsz")) - unzip(fileInfo.filePath (), cache_dir.absolutePath (), TRUE); + unzip(fileInfo.filePath (), cache_dir.absolutePath (), true); } } //add thumbs to map diff --git a/src/ui/textscroller.cpp b/src/ui/textscroller.cpp index 266ddc3a9..5328d574b 100644 --- a/src/ui/textscroller.cpp +++ b/src/ui/textscroller.cpp @@ -59,14 +59,14 @@ TextScroller::TextScroller ( QWidget *parent ) m_timer->start(); updateSkin(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); - m_autoscroll = TRUE; + m_autoscroll = true; m_menu = new QMenu(this); QAction *autoscrollAction = new QAction(tr("Autoscroll Songname"), m_menu); - autoscrollAction->setCheckable (TRUE); + autoscrollAction->setCheckable (true); connect(autoscrollAction, SIGNAL(toggled(bool)), SLOT(setAutoscroll(bool))); m_menu->addAction(autoscrollAction); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - autoscrollAction->setChecked(settings.value("TextScroller/autoscroll", TRUE).toBool()); + autoscrollAction->setChecked(settings.value("TextScroller/autoscroll", true).toBool()); setAutoscroll(autoscrollAction->isChecked()); } @@ -151,7 +151,7 @@ void TextScroller::readSettings() } else { - m_update = TRUE; + m_update = true; m_bitmap = FALSE; } @@ -236,7 +236,7 @@ void TextScroller::mousePressEvent (QMouseEvent *e) { m_timer->stop(); press_pos = e->x() - (x + 154); - m_pressing = TRUE; + m_pressing = true; } else QWidget::mousePressEvent(e); diff --git a/src/ui/timeindicator.cpp b/src/ui/timeindicator.cpp index 679edad10..200168c3d 100644 --- a/src/ui/timeindicator.cpp +++ b/src/ui/timeindicator.cpp @@ -40,7 +40,7 @@ TimeIndicator::TimeIndicator (QWidget *parent) connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); m_timer = new QTimer(this); m_timer->setInterval(125); - m_timer->setSingleShot (TRUE); + m_timer->setSingleShot (true); connect(m_timer, SIGNAL(timeout()),SLOT(reset())); } diff --git a/src/ui/titlebar.cpp b/src/ui/titlebar.cpp index 7f438dcd0..02b9d41ac 100644 --- a/src/ui/titlebar.cpp +++ b/src/ui/titlebar.cpp @@ -61,7 +61,7 @@ TitleBar::TitleBar(QWidget *parent) QSettings settings(Qmmp::configFile(), QSettings::IniFormat); if (settings.value("Display/shaded", FALSE).toBool()) shade(); - m_align = TRUE; + m_align = true; setCursor(m_skin->getCursor(Skin::CUR_TITLEBAR)); updatePositions(); } diff --git a/src/ui/titlebarcontrol.cpp b/src/ui/titlebarcontrol.cpp index 8f339602b..d4f064c75 100644 --- a/src/ui/titlebarcontrol.cpp +++ b/src/ui/titlebarcontrol.cpp @@ -24,7 +24,7 @@ TitleBarControl::TitleBarControl(QWidget *parent) : QWidget(parent) { - //setAutoFillBackground(TRUE); + //setAutoFillBackground(true); m_ratio = Skin::instance()->ratio(); resize(m_ratio*57, m_ratio*10); connect(Skin::instance(), SIGNAL(skinChanged()),SLOT(updateSkin())); diff --git a/src/ui/togglebutton.cpp b/src/ui/togglebutton.cpp index 020ef7c8b..5994134ec 100644 --- a/src/ui/togglebutton.cpp +++ b/src/ui/togglebutton.cpp @@ -70,7 +70,7 @@ void ToggleButton::setON ( bool on ) } void ToggleButton::mousePressEvent ( QMouseEvent* ) { - m_cursorin = TRUE; + m_cursorin = true; m_old_on = m_on; if ( m_on ) setPixmap ( skin->getButton ( m_off_p ) ); @@ -93,7 +93,7 @@ void ToggleButton::mouseReleaseEvent ( QMouseEvent* ) void ToggleButton::mouseMoveEvent (QMouseEvent *e) { if ( !m_cursorin && rect().contains(e->pos()) ) { - m_cursorin = TRUE; + m_cursorin = true; if ( m_old_on ) setPixmap ( skin->getButton ( m_off_p ) ); else diff --git a/src/ui/visualmenu.cpp b/src/ui/visualmenu.cpp index 6e5ff2d90..af8e936d2 100644 --- a/src/ui/visualmenu.cpp +++ b/src/ui/visualmenu.cpp @@ -51,7 +51,7 @@ void VisualMenu::updateActions() VisualAction::VisualAction(VisualFactory *factory, QWidget *parent) : QAction(factory->properties().name, parent) { - setCheckable (TRUE); + setCheckable (true); setChecked (Visual::isEnabled(factory)); m_factory = factory; connect(this, SIGNAL(triggered(bool)), SLOT(select(bool))); diff --git a/src/ui/volumebar.cpp b/src/ui/volumebar.cpp index ae010e4f2..b0c656d4e 100644 --- a/src/ui/volumebar.cpp +++ b/src/ui/volumebar.cpp @@ -48,7 +48,7 @@ VolumeBar::~VolumeBar() void VolumeBar::mousePressEvent(QMouseEvent *e) { - m_moving = TRUE; + m_moving = true; press_pos = e->x(); if(m_pos<e->x() && e->x()<m_pos+11*m_skin->ratio()) { diff --git a/src/ui/volumebar.h b/src/ui/volumebar.h index 21b577cf3..44ff6ac17 100644 --- a/src/ui/volumebar.h +++ b/src/ui/volumebar.h @@ -63,7 +63,7 @@ private: QPixmap m_pixmap; MainWindow *mw; int convert(int); // value = convert(position); - void draw(bool pressed = TRUE); + void draw(bool pressed = true); protected: void mousePressEvent(QMouseEvent*); |