From 11b7655bb103974d3a855d64dc0b6ec1b0df4ba1 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Thu, 11 Mar 2010 19:32:01 +0000
Subject: reapplied previous patch

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1620 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/General/statusicon/settingsdialog.cpp        | 2 +-
 src/plugins/General/statusicon/statusicon.cpp            | 4 ++--
 src/plugins/General/statusicon/statusiconpopupwidget.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/plugins/General/statusicon')

diff --git a/src/plugins/General/statusicon/settingsdialog.cpp b/src/plugins/General/statusicon/settingsdialog.cpp
index 7ee4a5add..1d2843376 100644
--- a/src/plugins/General/statusicon/settingsdialog.cpp
+++ b/src/plugins/General/statusicon/settingsdialog.cpp
@@ -37,7 +37,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     ui.transparencySlider->setValue(settings.value("tooltip_transparency",0).toInt());
     ui.coverSizeSlider->setValue(settings.value("tooltip_cover_size", 100).toInt());
     ui.niceTooltipSplitCheckBox->setChecked(settings.value("split_file_name",true).toBool());
-    ui.standardIconsCheckBox->setChecked(settings.value("use_standard_icons",FALSE).toBool());
+    ui.standardIconsCheckBox->setChecked(settings.value("use_standard_icons",false).toBool());
     ui.progressCheckBox->setChecked(settings.value("tooltip_progress",true).toBool());
     m_template = settings.value("tooltip_template", DEFAULT_TEMPLATE).toString();
     settings.endGroup();
diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp
index fb4fb2ed1..78302ecd1 100644
--- a/src/plugins/General/statusicon/statusicon.cpp
+++ b/src/plugins/General/statusicon/statusicon.cpp
@@ -46,8 +46,8 @@ StatusIcon::StatusIcon(QObject *parent)
     settings.beginGroup("Tray");
     m_showMessage = settings.value("show_message",true).toBool();
     m_messageDelay = settings.value("message_delay", 2000).toInt();
-    m_hideToTray = settings.value("hide_on_close", FALSE).toBool();
-    m_useStandardIcons = settings.value("use_standard_icons",FALSE).toBool();
+    m_hideToTray = settings.value("hide_on_close", false).toBool();
+    m_useStandardIcons = settings.value("use_standard_icons",false).toBool();
     m_tray->showNiceToolTip(settings.value("show_nicetooltip",true).toBool());
     if(m_useStandardIcons)
         m_tray->setIcon(QApplication::style ()->standardIcon(QStyle::SP_MediaStop));
diff --git a/src/plugins/General/statusicon/statusiconpopupwidget.cpp b/src/plugins/General/statusicon/statusiconpopupwidget.cpp
index 51811c984..e1ed9cdba 100644
--- a/src/plugins/General/statusicon/statusiconpopupwidget.cpp
+++ b/src/plugins/General/statusicon/statusiconpopupwidget.cpp
@@ -44,7 +44,7 @@ StatusIconPopupWidget::StatusIconPopupWidget(QWidget * parent)
     setWindowFlags(Qt::X11BypassWindowManagerHint |
                    Qt::WindowStaysOnTopHint | Qt::Dialog | Qt::FramelessWindowHint);
     setFrameStyle(QFrame::NoFrame | QFrame::Plain);
-    setAttribute(Qt::WA_QuitOnClose, FALSE);
+    setAttribute(Qt::WA_QuitOnClose, false);
 
     m_hLayout = new QHBoxLayout();
     m_vLayout = new QVBoxLayout();
-- 
cgit v1.2.3-13-gbd6f