Blob Blame History Raw
From 9b726962fddf04135afd32e99ac07929d36bc1c7 Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Tue, 5 Feb 2013 12:59:40 +0100
Subject: [PATCH 4/8] --memoryLeak;

it's a minor one, though; so i wouldn't worry about backporting it to 4.10.
---
 gui/osdwidget.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/gui/osdwidget.cpp b/gui/osdwidget.cpp
index 58f87a7..72b8d9c 100644
--- a/gui/osdwidget.cpp
+++ b/gui/osdwidget.cpp
@@ -31,7 +31,7 @@
 #include <KIcon>
 #include <KDialog>
 #include <KWindowSystem>
-#include <Plasma/FrameSvg>
+#include <Plasma/Svg>
 #include <Plasma/Label>
 #include <Plasma/Meter>
 #include <Plasma/Theme>
@@ -151,15 +151,14 @@ void OSDWidget::themeUpdated()
     if (!Plasma::Theme::defaultTheme()->imagePath("icons/audio").isEmpty()) {
         QFontMetrics fm(m_volumeLabel->font());
         iconSize = QSize(fm.height(), fm.height());
-        // Leak | low prio | The old Plasma::Svg is not freed on a themeUpdated(), also it is not freed in the destructor
-        Plasma::Svg *svgIcon = new Plasma::Svg(this);
-        svgIcon->setImagePath("icons/audio");
-        svgIcon->setContainsMultipleImages(true);
-        svgIcon->resize(iconSize);
-        m_volumeHighPixmap = svgIcon->pixmap("audio-volume-high");
-        m_volumeMediumPixmap = svgIcon->pixmap("audio-volume-medium");
-        m_volumeLowPixmap = svgIcon->pixmap("audio-volume-low");
-        m_volumeMutedPixmap = svgIcon->pixmap("audio-volume-muted");
+        Plasma::Svg svgIcon;
+        svgIcon.setImagePath("icons/audio");
+        svgIcon.setContainsMultipleImages(true);
+        svgIcon.resize(iconSize);
+        m_volumeHighPixmap = svgIcon.pixmap("audio-volume-high");
+        m_volumeMediumPixmap = svgIcon.pixmap("audio-volume-medium");
+        m_volumeLowPixmap = svgIcon.pixmap("audio-volume-low");
+        m_volumeMutedPixmap = svgIcon.pixmap("audio-volume-muted");
     } else {
         iconSize = QSize(KIconLoader::SizeSmallMedium, KIconLoader::SizeSmallMedium);
         m_volumeHighPixmap = KIcon( QLatin1String( "audio-volume-high" )).pixmap(iconSize);
-- 
1.8.1.4