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