Minor changes.

(bzr r2507.1.4)

4 files changed, 2 insertions, 7 deletions

diff --git a/launcher/DeviceLauncherSection.cpp b/launcher/DeviceLauncherSection.cpp
index 570894180..3cbad6c17 100644
--- a/launcher/DeviceLauncherSection.cpp
+++ b/launcher/DeviceLauncherSection.cpp
@@ -38,9 +38,7 @@ DeviceLauncherSection::DeviceLauncherSection(VolumeMonitorWrapper::Ptr volume_mo
 
 void DeviceLauncherSection::PopulateEntries()
 {
- auto const& volumes = monitor_->GetVolumes();
-
- for (auto volume : volumes)
+ for (auto volume : monitor_->GetVolumes())
 {
 // Sanity check. Avoid duplicates.
 if (map_.find(volume) != map_.end())
diff --git a/launcher/DeviceLauncherSection.h b/launcher/DeviceLauncherSection.h
index 361390ca3..45d923bac 100644
--- a/launcher/DeviceLauncherSection.h
+++ b/launcher/DeviceLauncherSection.h
@@ -27,9 +27,6 @@
 #include "DeviceLauncherIcon.h"
 #include "VolumeMonitorWrapper.h"
 
-class Launcher;
-class LauncherIcon;
-
 namespace unity
 {
 namespace launcher
diff --git a/launcher/VolumeMonitorWrapper.cpp b/launcher/VolumeMonitorWrapper.cpp
index 37bb32c0d..d8b6024aa 100644
--- a/launcher/VolumeMonitorWrapper.cpp
+++ b/launcher/VolumeMonitorWrapper.cpp
@@ -66,3 +66,4 @@ void VolumeMonitorWrapper::OnVolumeRemoved(GVolumeMonitor* monitor, GVolume* vol
 
 } // namespace launcher
 } // namespace unity
+
diff --git a/launcher/VolumeMonitorWrapper.h b/launcher/VolumeMonitorWrapper.h
index 867736e5d..9ca205e51 100644
--- a/launcher/VolumeMonitorWrapper.h
+++ b/launcher/VolumeMonitorWrapper.h
@@ -28,7 +28,6 @@
 
 #include <UnityCore/GLibWrapper.h>
 #include <UnityCore/GLibSignal.h>
-#include <UnityCore/GLibSource.h>
 
 namespace unity
 {