diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-03-11 18:46:25 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-03-11 18:46:25 +0000 |
| commit | 013ee07b55a3738b28b5d46324392d8498b50f2b (patch) | |
| tree | 50979d3872a15fd3e25a746418da0f56c8e8dadd /src/plugins | |
| parent | 542c1d2d3a26ce23b1d0668011b420db231334d2 (diff) | |
| download | qmmp-013ee07b55a3738b28b5d46324392d8498b50f2b.tar.gz qmmp-013ee07b55a3738b28b5d46324392d8498b50f2b.tar.bz2 qmmp-013ee07b55a3738b28b5d46324392d8498b50f2b.zip | |
removed obsolete members
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1619 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins')
91 files changed, 243 insertions, 243 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; } |