diff options
Diffstat (limited to 'src/plugins/General')
24 files changed, 49 insertions, 49 deletions
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(); } |