From 816406664830bbb4654b6678067979135be4b1ff Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Tue, 25 May 2010 21:41:53 +0000
Subject: [PATCH] More Qt 4.5 fixes

---
 src/ui/iconloader.cpp     | 6 +++++-
 src/ui/settingsdialog.cpp | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ui/iconloader.cpp b/src/ui/iconloader.cpp
index 0ea738bc8..08b520ddf 100644
--- a/src/ui/iconloader.cpp
+++ b/src/ui/iconloader.cpp
@@ -27,10 +27,14 @@ void IconLoader::Init() {
 }
 
 QIcon IconLoader::Load(const QString &name) {
+  QIcon ret;
+
+#if QT_VERSION >= 0x040600
   // Try to load it from the theme initially
-  QIcon ret = QIcon::fromTheme(name);
+  ret = QIcon::fromTheme(name);
   if (!ret.isNull())
     return ret;
+#endif
 
   // Otherwise use our fallback theme
   const QString path(":/icons/%1x%2/%3.png");
diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp
index 0467ab651..4232d1587 100644
--- a/src/ui/settingsdialog.cpp
+++ b/src/ui/settingsdialog.cpp
@@ -219,7 +219,7 @@ void SettingsDialog::showEvent(QShowEvent*) {
   ui_.gst_device->setText(s.value("device").toString());
   ui_.replaygain->setChecked(s.value("rgenabled", false).toBool());
   ui_.replaygain_mode->setCurrentIndex(s.value("rgmode", 0).toInt());
-  ui_.replaygain_preamp->setValue(s.value("rgpreamp", 0.0).toFloat() * 10 + 150);
+  ui_.replaygain_preamp->setValue(s.value("rgpreamp", 0.0).toDouble() * 10 + 150);
   ui_.replaygain_compression->setChecked(s.value("rgcompression", true).toBool());
   s.endGroup();
 #endif