Merge lp:~unity-team/unity/unity.launcher-icon-smart-pointers into lp:unity

[Jason Smith]

Makes unity use nux::ObjectPtr for AbstractLauncherIcon's rather than doing manual memory management.

[Gord Allott (gordallott)]

mostly just changes to ::Ptr versions, skipped that for the most part as its impossible to review without context, +1 on the rest

review: Approve

=== added file 'plugins/unityshell/src/AbstractLauncherIcon.cpp'
--- plugins/unityshell/src/AbstractLauncherIcon.cpp	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/AbstractLauncherIcon.cpp	2012-02-12 19:58:19 +0000
@@ -0,0 +1,27 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Jason Smith <[e-mail]>
+ */
+
+#include "AbstractLauncherIcon.h"
+
+namespace unity {
+namespace launcher {
+  // needed for ungodly stupid reasons
+  NUX_IMPLEMENT_OBJECT_TYPE(AbstractLauncherIcon);
+}
+}
 \ No newline at end of file
 
=== modified file 'plugins/unityshell/src/AbstractLauncherIcon.h'
--- plugins/unityshell/src/AbstractLauncherIcon.h	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/AbstractLauncherIcon.h	2012-02-12 19:58:19 +0000
@@ -75,8 +75,9 @@
 
 class AbstractLauncherIcon : public ui::IconTextureSource, public debug::Introspectable
 {
+  NUX_DECLARE_OBJECT_TYPE(AbstractLauncherIcon, ui::IconTextureSource);
 public:
-
+  typedef nux::ObjectPtr<AbstractLauncherIcon> Ptr;
   typedef std::vector<nux::Vector4> TransformVector;
 
   typedef enum
@@ -168,7 +169,7 @@
 
   virtual void ResetQuirkTime(Quirk quirk) = 0;
 
-  virtual IconType Type() = 0;
+  virtual IconType GetIconType() = 0;
 
   virtual const gchar* RemoteUri() = 0;
 
@@ -186,16 +187,26 @@
 
   virtual void RemoveEntryRemote(LauncherEntryRemote* remote) = 0;
 
+  virtual std::string DesktopFile() = 0;
+
+  virtual bool IsSticky() const = 0;
+
+  virtual bool IsVisible() const = 0;
+
+  virtual void AboutToRemove() = 0;
+  
+  virtual void Stick(bool save = true) = 0;
+  
+  virtual void UnStick() = 0;
+
   sigc::signal<void, int, int> mouse_down;
   sigc::signal<void, int, int> mouse_up;
   sigc::signal<void, int, int> mouse_click;
   sigc::signal<void, int>      mouse_enter;
   sigc::signal<void, int>      mouse_leave;
 
-  sigc::signal<void, AbstractLauncherIcon*> show;
-  sigc::signal<void, AbstractLauncherIcon*> hide;
-  sigc::signal<void, AbstractLauncherIcon*> needs_redraw;
-  sigc::signal<void, AbstractLauncherIcon*> remove;
+  sigc::signal<void, AbstractLauncherIcon::Ptr> needs_redraw;
+  sigc::signal<void, AbstractLauncherIcon::Ptr> remove;
 
   sigc::connection needs_redraw_connection;
   sigc::connection on_icon_added_connection;
 
=== modified file 'plugins/unityshell/src/BamfLauncherIcon.cpp'
--- plugins/unityshell/src/BamfLauncherIcon.cpp	2012-02-11 07:34:27 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.cpp	2012-02-12 19:58:19 +0000
@@ -39,6 +39,8 @@
 namespace launcher
 {
 
+NUX_IMPLEMENT_OBJECT_TYPE(BamfLauncherIcon);
+
 BamfLauncherIcon::BamfLauncherIcon(BamfApplication* app)
   : SimpleLauncherIcon()
   , _bamf_app(app, glib::AddRef())
@@ -120,7 +122,7 @@
   WindowManager::Default()->compiz_screen_viewport_switch_ended.connect(sigc::mem_fun(this, &BamfLauncherIcon::EnsureWindowState));
   WindowManager::Default()->terminate_expo.connect(sigc::mem_fun(this, &BamfLauncherIcon::EnsureWindowState));
 
-  EnsureWindowState();
+  //EnsureWindowState();
   UpdateMenus();
   UpdateDesktopFile();
 
@@ -653,7 +655,7 @@
   for (int i = 0; i < max_num_monitors; i++)
     SetWindowVisibleOnMonitor(monitors[i], i);
 
-  needs_redraw.emit(this);
+  EmitNeedsRedraw();
 
   g_list_free(children);
 }
 
=== modified file 'plugins/unityshell/src/BamfLauncherIcon.h'
--- plugins/unityshell/src/BamfLauncherIcon.h	2012-02-08 00:32:46 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.h	2012-02-12 19:58:19 +0000
@@ -38,6 +38,7 @@
 
 class BamfLauncherIcon : public SimpleLauncherIcon
 {
+  NUX_DECLARE_OBJECT_TYPE(BamfLauncherIcon, SimpleLauncherIcon);
 public:
   BamfLauncherIcon(BamfApplication* app);
   virtual ~BamfLauncherIcon();
 
=== modified file 'plugins/unityshell/src/DesktopLauncherIcon.cpp'
--- plugins/unityshell/src/DesktopLauncherIcon.cpp	2012-02-08 00:32:46 +0000
+++ plugins/unityshell/src/DesktopLauncherIcon.cpp	2012-02-12 19:58:19 +0000
@@ -36,6 +36,7 @@
   SetQuirk(QUIRK_VISIBLE, true);
   SetQuirk(QUIRK_RUNNING, false);
   SetIconType(TYPE_BEGIN);
+  SetShowInSwitcher(false);
 }
 
 DesktopLauncherIcon::~DesktopLauncherIcon()
 
=== modified file 'plugins/unityshell/src/DeviceLauncherSection.cpp'
--- plugins/unityshell/src/DeviceLauncherSection.cpp	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/DeviceLauncherSection.cpp	2012-02-12 19:58:19 +0000
@@ -81,7 +81,7 @@
     DeviceLauncherIcon* icon = new DeviceLauncherIcon(volume);
 
     self->map_[volume] = icon;
-    self->IconAdded.emit(icon);
+    self->IconAdded.emit(AbstractLauncherIcon::Ptr(icon));
   }
 
   g_list_free(volumes);
@@ -102,7 +102,7 @@
   DeviceLauncherIcon* icon = new DeviceLauncherIcon(volume);
   
   self->map_[volume] = icon;
-  self->IconAdded.emit(icon);
+  self->IconAdded.emit(AbstractLauncherIcon::Ptr(icon));
 }
 
 void DeviceLauncherSection::OnVolumeRemoved(GVolumeMonitor* monitor,
 
=== modified file 'plugins/unityshell/src/DeviceLauncherSection.h'
--- plugins/unityshell/src/DeviceLauncherSection.h	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/DeviceLauncherSection.h	2012-02-12 19:58:19 +0000
@@ -42,7 +42,7 @@
   DeviceLauncherSection();
   ~DeviceLauncherSection();
 
-  sigc::signal<void, LauncherIcon*> IconAdded;
+  sigc::signal<void, AbstractLauncherIcon::Ptr> IconAdded;
 
 private:
   static bool PopulateEntries(DeviceLauncherSection* self);
 
=== modified file 'plugins/unityshell/src/IconTextureSource.cpp'
--- plugins/unityshell/src/IconTextureSource.cpp	2012-02-01 05:22:29 +0000
+++ plugins/unityshell/src/IconTextureSource.cpp	2012-02-12 19:58:19 +0000
@@ -24,6 +24,7 @@
 {
 namespace ui
 {
+NUX_IMPLEMENT_OBJECT_TYPE(IconTextureSource);
 
 IconTextureSource::IconTextureSource()
 {
 
=== modified file 'plugins/unityshell/src/IconTextureSource.h'
--- plugins/unityshell/src/IconTextureSource.h	2012-02-01 03:39:14 +0000
+++ plugins/unityshell/src/IconTextureSource.h	2012-02-12 19:58:19 +0000
@@ -32,6 +32,7 @@
 
 class IconTextureSource : public nux::InitiallyUnownedObject
 {
+  NUX_DECLARE_OBJECT_TYPE(IconTextureSource, nux::InitiallyUnownedObject);
 public:
   typedef nux::ObjectPtr<IconTextureSource> Ptr;
 
 
=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-02-11 08:11:04 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-02-12 19:58:19 +0000
@@ -498,7 +498,7 @@
   NeedRedraw();
 }
 
-bool Launcher::IconNeedsAnimation(AbstractLauncherIcon* icon, struct timespec const& current) const
+bool Launcher::IconNeedsAnimation(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
   struct timespec time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_VISIBLE);
   if (unity::TimeUtil::TimeDelta(&current, &time) < ANIM_DURATION_SHORT)
@@ -618,7 +618,7 @@
 }
 
 
-float Launcher::IconVisibleProgress(AbstractLauncherIcon* icon, struct timespec const& current) const
+float Launcher::IconVisibleProgress(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
   if (icon->GetQuirk(AbstractLauncherIcon::QUIRK_VISIBLE))
   {
@@ -636,16 +636,15 @@
 
 void Launcher::SetDndDelta(float x, float y, nux::Geometry const& geo, timespec const& current)
 {
-  AbstractLauncherIcon* anchor = nullptr;
-  LauncherModel::iterator it;
+  AbstractLauncherIcon::Ptr anchor;
   anchor = MouseIconIntersection(x, _enter_y);
 
   if (anchor)
   {
     float position = y;
-    for (it = _model->begin(); it != _model->end(); it++)
+    for (AbstractLauncherIcon::Ptr model_icon : *_model)
     {
-      if (*it == anchor)
+      if (model_icon == anchor)
       {
         position += _icon_size / 2;
         _launcher_drag_delta = _enter_y - position;
@@ -655,12 +654,12 @@
 
         break;
       }
-      position += (_icon_size + _space_between_icons) * IconVisibleProgress(*it, current);
+      position += (_icon_size + _space_between_icons) * IconVisibleProgress(model_icon, current);
     }
   }
 }
 
-float Launcher::IconPresentProgress(AbstractLauncherIcon* icon, struct timespec const& current) const
+float Launcher::IconPresentProgress(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
   struct timespec icon_present_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_PRESENTED);
   int ms = unity::TimeUtil::TimeDelta(&current, &icon_present_time);
@@ -672,7 +671,7 @@
     return 1.0f - result;
 }
 
-float Launcher::IconUrgentProgress(AbstractLauncherIcon* icon, struct timespec const& current) const
+float Launcher::IconUrgentProgress(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
   struct timespec urgent_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_URGENT);
   int urgent_ms = unity::TimeUtil::TimeDelta(&current, &urgent_time);
@@ -689,7 +688,7 @@
     return 1.0f - result;
 }
 
-float Launcher::IconDropDimValue(AbstractLauncherIcon* icon, struct timespec const& current) const
+float Launcher::IconDropDimValue(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
   struct timespec dim_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_DROP_DIM);
   int dim_ms = unity::TimeUtil::TimeDelta(&current, &dim_time);
@@ -701,7 +700,7 @@
     return result;
 }
 
-float Launcher::IconDesatValue(AbstractLauncherIcon* icon, struct timespec const& current) const
+float Launcher::IconDesatValue(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
   struct timespec dim_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_DESAT);
   int ms = unity::TimeUtil::TimeDelta(&current, &dim_time);
@@ -713,21 +712,21 @@
     return result;
 }
 
-float Launcher::IconShimmerProgress(AbstractLauncherIcon* icon, struct timespec const& current) const
+float Launcher::IconShimmerProgress(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
   struct timespec shimmer_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_SHIMMER);
   int shimmer_ms = unity::TimeUtil::TimeDelta(&current, &shimmer_time);
   return CLAMP((float) shimmer_ms / (float) ANIM_DURATION_LONG, 0.0f, 1.0f);
 }
 
-float Launcher::IconCenterTransitionProgress(AbstractLauncherIcon* icon, struct timespec const& current) const
+float Launcher::IconCenterTransitionProgress(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
   struct timespec save_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_CENTER_SAVED);
   int save_ms = unity::TimeUtil::TimeDelta(&current, &save_time);
   return CLAMP((float) save_ms / (float) ANIM_DURATION, 0.0f, 1.0f);
 }
 
-float Launcher::IconUrgentPulseValue(AbstractLauncherIcon* icon, struct timespec const& current) const
+float Launcher::IconUrgentPulseValue(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
   if (!icon->GetQuirk(AbstractLauncherIcon::QUIRK_URGENT))
     return 1.0f; // we are full on in a normal condition
@@ -736,7 +735,7 @@
   return 0.5f + (float)(std::cos(M_PI * (float)(URGENT_BLINKS * 2) * urgent_progress)) * 0.5f;
 }
 
-float Launcher::IconPulseOnceValue(AbstractLauncherIcon *icon, struct timespec const &current) const
+float Launcher::IconPulseOnceValue(AbstractLauncherIcon::Ptr icon, struct timespec const &current) const
 {
   struct timespec pulse_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_PULSE_ONCE);
   int pulse_ms = unity::TimeUtil::TimeDelta(&current, &pulse_time);
@@ -748,7 +747,7 @@
   return 0.5f + (float) (std::cos(M_PI * 2.0 * pulse_progress)) * 0.5f;
 }
 
-float Launcher::IconUrgentWiggleValue(AbstractLauncherIcon* icon, struct timespec const& current) const
+float Launcher::IconUrgentWiggleValue(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
   if (!icon->GetQuirk(AbstractLauncherIcon::QUIRK_URGENT))
     return 0.0f; // we are full on in a normal condition
@@ -757,7 +756,7 @@
   return 0.3f * (float)(std::sin(M_PI * (float)(WIGGLE_CYCLES * 2) * urgent_progress)) * 0.5f;
 }
 
-float Launcher::IconStartingBlinkValue(AbstractLauncherIcon* icon, struct timespec const& current) const
+float Launcher::IconStartingBlinkValue(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
   struct timespec starting_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_STARTING);
   int starting_ms = unity::TimeUtil::TimeDelta(&current, &starting_time);
@@ -766,7 +765,7 @@
   return 0.5f + (float)(std::cos(M_PI * val * starting_progress)) * 0.5f;
 }
 
-float Launcher::IconStartingPulseValue(AbstractLauncherIcon* icon, struct timespec const& current) const
+float Launcher::IconStartingPulseValue(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
   struct timespec starting_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_STARTING);
   int starting_ms = unity::TimeUtil::TimeDelta(&current, &starting_time);
@@ -781,7 +780,7 @@
   return 0.5f + (float)(std::cos(M_PI * (float)(MAX_STARTING_BLINKS * 2) * starting_progress)) * 0.5f;
 }
 
-float Launcher::IconBackgroundIntensity(AbstractLauncherIcon* icon, struct timespec const& current) const
+float Launcher::IconBackgroundIntensity(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
   float result = 0.0f;
 
@@ -848,7 +847,7 @@
   return result;
 }
 
-float Launcher::IconProgressBias(AbstractLauncherIcon* icon, struct timespec const& current) const
+float Launcher::IconProgressBias(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
   struct timespec icon_progress_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_PROGRESS);
   int ms = unity::TimeUtil::TimeDelta(&current, &icon_progress_time);
@@ -860,7 +859,7 @@
     return result;
 }
 
-bool Launcher::IconDrawEdgeOnly(AbstractLauncherIcon* icon) const
+bool Launcher::IconDrawEdgeOnly(AbstractLauncherIcon::Ptr icon) const
 {
   if (options()->backlight_mode() == BACKLIGHT_EDGE_TOGGLE)
     return true;
@@ -871,10 +870,10 @@
   return false;
 }
 
-void Launcher::SetupRenderArg(AbstractLauncherIcon* icon, struct timespec const& current, RenderArg& arg)
+void Launcher::SetupRenderArg(AbstractLauncherIcon::Ptr icon, struct timespec const& current, RenderArg& arg)
 {
   float desat_value = IconDesatValue(icon, current);
-  arg.icon                = icon;
+  arg.icon                = icon.GetPointer();
   arg.alpha               = 0.5f + 0.5f * desat_value;
   arg.saturation          = desat_value;
   arg.colorify            = nux::color::White;
@@ -892,13 +891,13 @@
   arg.progress_bias       = IconProgressBias(icon, current);
   arg.progress            = CLAMP(icon->GetProgress(), 0.0f, 1.0f);
   arg.draw_shortcut       = _shortcuts_shown && !_hide_machine->GetQuirk(LauncherHideMachine::PLACES_VISIBLE);
-  arg.system_item         = icon->Type() == AbstractLauncherIcon::TYPE_HOME;
-  arg.colorify_background = icon->Type() == AbstractLauncherIcon::TYPE_HOME  ||
-                            icon->Type() == AbstractLauncherIcon::TYPE_TRASH ||
-                            icon->Type() == AbstractLauncherIcon::TYPE_EXPO;
+  arg.system_item         = icon->GetIconType() == AbstractLauncherIcon::TYPE_HOME;
+  arg.colorify_background = icon->GetIconType() == AbstractLauncherIcon::TYPE_HOME  ||
+                            icon->GetIconType() == AbstractLauncherIcon::TYPE_TRASH ||
+                            icon->GetIconType() == AbstractLauncherIcon::TYPE_EXPO;
 
   if (_dash_is_open)
-    arg.active_arrow = icon->Type() == AbstractLauncherIcon::TYPE_HOME;
+    arg.active_arrow = icon->GetIconType() == AbstractLauncherIcon::TYPE_HOME;
   else
     arg.active_arrow = icon->GetQuirk(AbstractLauncherIcon::QUIRK_ACTIVE);
 
@@ -947,7 +946,7 @@
   }
 }
 
-void Launcher::FillRenderArg(AbstractLauncherIcon* icon,
+void Launcher::FillRenderArg(AbstractLauncherIcon::Ptr icon,
                              RenderArg& arg,
                              nux::Point3& center,
                              nux::Geometry const& parent_abs_geo,
@@ -1190,7 +1189,7 @@
   for (it = _model->main_begin(); it != _model->main_end(); it++)
   {
     RenderArg arg;
-    AbstractLauncherIcon* icon = *it;
+    AbstractLauncherIcon::Ptr icon = *it;
 
     FillRenderArg(icon, arg, center, parent_abs_geo, folding_threshold, folded_size, folded_spacing,
                   autohide_offset, folded_z_distance, animation_neg_rads, current);
@@ -1218,7 +1217,7 @@
   for (it = _model->shelf_begin(); it != _model->shelf_end(); it++)
   {
     RenderArg arg;
-    AbstractLauncherIcon* icon = *it;
+    AbstractLauncherIcon::Ptr icon = *it;
 
     FillRenderArg(icon, arg, center, parent_abs_geo, folding_threshold, folded_size, folded_spacing,
                   autohide_offset, folded_z_distance, animation_neg_rads, current);
@@ -1268,7 +1267,7 @@
 {
   for (auto icon : *_model)
   {
-    if (icon->Type () != AbstractLauncherIcon::TYPE_HOME)
+    if (icon->GetIconType () != AbstractLauncherIcon::TYPE_HOME)
       icon->SetQuirk(AbstractLauncherIcon::QUIRK_DESAT, true);
     icon->HideTooltip();
   }
@@ -1700,14 +1699,14 @@
 
 }
 
-void Launcher::OnIconAdded(AbstractLauncherIcon* icon)
+void Launcher::OnIconAdded(AbstractLauncherIcon::Ptr icon)
 {
   EnsureAnimation();
 
   icon->needs_redraw.connect(sigc::mem_fun(this, &Launcher::OnIconNeedsRedraw));
 }
 
-void Launcher::OnIconRemoved(AbstractLauncherIcon* icon)
+void Launcher::OnIconRemoved(AbstractLauncherIcon::Ptr icon)
 {
   if (icon->needs_redraw_connection.connected())
     icon->needs_redraw_connection.disconnect();
@@ -1742,7 +1741,7 @@
   return _model;
 }
 
-void Launcher::EnsureIconOnScreen(AbstractLauncherIcon* selection)
+void Launcher::EnsureIconOnScreen(AbstractLauncherIcon::Ptr selection)
 {
   nux::Geometry geo = GetGeometry();
 
@@ -1764,7 +1763,7 @@
   _launcher_drag_delta = std::max<int>(min_drag_delta, std::min<int>(max_drag_delta, _launcher_drag_delta));
 }
 
-void Launcher::OnSelectionChanged(AbstractLauncherIcon* selection)
+void Launcher::OnSelectionChanged(AbstractLauncherIcon::Ptr selection)
 {
   if (IsInKeyNavMode())
   {
@@ -1773,7 +1772,7 @@
   }
 }
 
-void Launcher::OnIconNeedsRedraw(AbstractLauncherIcon* icon)
+void Launcher::OnIconNeedsRedraw(AbstractLauncherIcon::Ptr icon)
 {
   EnsureAnimation();
 }
@@ -2007,7 +2006,7 @@
 
 void Launcher::StartIconDragRequest(int x, int y)
 {
-  AbstractLauncherIcon* drag_icon = MouseIconIntersection((int)(GetGeometry().x / 2.0f), y);
+  AbstractLauncherIcon::Ptr drag_icon = MouseIconIntersection((int)(GetGeometry().x / 2.0f), y);
 
   // FIXME: nux doesn't give nux::GetEventButton (button_flags) there, relying
   // on an internal Launcher property then
@@ -2036,7 +2035,7 @@
   }
 }
 
-void Launcher::StartIconDrag(AbstractLauncherIcon* icon)
+void Launcher::StartIconDrag(AbstractLauncherIcon::Ptr icon)
 {
   if (!icon)
     return;
@@ -2065,9 +2064,9 @@
 {
   if (_drag_window)
   {
-    AbstractLauncherIcon* hovered_icon = MouseIconIntersection(_mouse_position.x, _mouse_position.y);
+    AbstractLauncherIcon::Ptr hovered_icon = MouseIconIntersection(_mouse_position.x, _mouse_position.y);
 
-    if (hovered_icon && hovered_icon->Type() == AbstractLauncherIcon::TYPE_TRASH)
+    if (hovered_icon && hovered_icon->GetIconType() == AbstractLauncherIcon::TYPE_TRASH)
     {
       hovered_icon->SetQuirk(AbstractLauncherIcon::QUIRK_PULSE_ONCE, true);
 
@@ -2107,7 +2106,7 @@
     nux::Geometry geo = _drag_window->GetGeometry();
     _drag_window->SetBaseXY(x - geo.width / 2 + _parent->GetGeometry().x, y - geo.height / 2 + _parent->GetGeometry().y);
 
-    AbstractLauncherIcon* hovered_icon = MouseIconIntersection((int)(GetGeometry().x / 2.0f), y);
+    AbstractLauncherIcon::Ptr hovered_icon = MouseIconIntersection((int)(GetGeometry().x / 2.0f), y);
 
     struct timespec current;
     clock_gettime(CLOCK_MONOTONIC, &current);
@@ -2355,7 +2354,7 @@
       GetActionState() == ACTION_DRAG_LAUNCHER)
     return;
 
-  AbstractLauncherIcon* launcher_icon = nullptr;
+  AbstractLauncherIcon::Ptr launcher_icon;
 
   if (!_hidden && !IsInKeyNavMode() && _hovered)
   {
@@ -2380,7 +2379,7 @@
 
 void Launcher::MouseDownLogic(int x, int y, unsigned long button_flags, unsigned long key_flags)
 {
-  AbstractLauncherIcon* launcher_icon = nullptr;
+  AbstractLauncherIcon::Ptr launcher_icon;
   launcher_icon = MouseIconIntersection(_mouse_position.x, _mouse_position.y);
 
   _hide_machine->SetQuirk(LauncherHideMachine::LAST_ACTION_ACTIVATE, false);
@@ -2399,7 +2398,7 @@
 
 void Launcher::MouseUpLogic(int x, int y, unsigned long button_flags, unsigned long key_flags)
 {
-  AbstractLauncherIcon* launcher_icon = nullptr;
+  AbstractLauncherIcon::Ptr launcher_icon;
 
   launcher_icon = MouseIconIntersection(_mouse_position.x, _mouse_position.y);
 
@@ -2430,7 +2429,7 @@
   _icon_mouse_down = nullptr;
 }
 
-AbstractLauncherIcon* Launcher::MouseIconIntersection(int x, int y)
+AbstractLauncherIcon::Ptr Launcher::MouseIconIntersection(int x, int y)
 {
   LauncherModel::iterator it;
   // We are looking for the icon at screen coordinates x, y;
@@ -2454,11 +2453,11 @@
       return (*it);
   }
 
-  return 0;
+  return AbstractLauncherIcon::Ptr();
 }
 
 void
-Launcher::RenderIconToTexture(nux::GraphicsEngine& GfxContext, AbstractLauncherIcon* icon, nux::ObjectPtr<nux::IOpenGLBaseTexture> texture)
+Launcher::RenderIconToTexture(nux::GraphicsEngine& GfxContext, AbstractLauncherIcon::Ptr icon, nux::ObjectPtr<nux::IOpenGLBaseTexture> texture)
 {
   RenderArg arg;
   struct timespec current;
@@ -2671,15 +2670,15 @@
   }
 
   EventLogic();
-  AbstractLauncherIcon* hovered_icon = MouseIconIntersection(_mouse_position.x, _mouse_position.y);
+  AbstractLauncherIcon::Ptr hovered_icon = MouseIconIntersection(_mouse_position.x, _mouse_position.y);
 
   bool hovered_icon_is_appropriate = false;
   if (hovered_icon)
   {
-    if (hovered_icon->Type() == AbstractLauncherIcon::TYPE_TRASH)
+    if (hovered_icon->GetIconType() == AbstractLauncherIcon::TYPE_TRASH)
       _steal_drag = false;
 
-    if (hovered_icon->Type() == AbstractLauncherIcon::TYPE_APPLICATION || hovered_icon->Type() == AbstractLauncherIcon::TYPE_EXPO)
+    if (hovered_icon->GetIconType() == AbstractLauncherIcon::TYPE_APPLICATION || hovered_icon->GetIconType() == AbstractLauncherIcon::TYPE_EXPO)
       hovered_icon_is_appropriate = true;
   }
 
@@ -2788,11 +2787,11 @@
  * Returns the current selected icon if it is in keynavmode
  * It will return NULL if it is not on keynavmode
  */
-AbstractLauncherIcon*
+AbstractLauncherIcon::Ptr
 Launcher::GetSelectedMenuIcon() const
 {
   if (!IsInKeyNavMode())
-    return NULL;
+    return AbstractLauncherIcon::Ptr();
   return _model->Selection();
 }
 
@@ -2822,7 +2821,7 @@
     g_variant_get(parameters, "(ssiiiss)", &title, &icon, &icon_x, &icon_y, &icon_size, &desktop_file, &aptdaemon_task, NULL);
 
     Launcher* self = (Launcher*)user_data;
-    self->launcher_addrequest_special.emit(desktop_file, nullptr, aptdaemon_task, icon);
+    self->launcher_addrequest_special.emit(desktop_file, AbstractLauncherIcon::Ptr(), aptdaemon_task, icon);
 
     g_dbus_method_invocation_return_value(invocation, nullptr);
     g_free(icon);
 
=== modified file 'plugins/unityshell/src/Launcher.h'
--- plugins/unityshell/src/Launcher.h	2012-02-09 22:47:21 +0000
+++ plugins/unityshell/src/Launcher.h	2012-02-12 19:58:19 +0000
@@ -65,7 +65,7 @@
   virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual void PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw);
 
-  AbstractLauncherIcon* GetSelectedMenuIcon() const;
+  AbstractLauncherIcon::Ptr GetSelectedMenuIcon() const;
 
   void SetIconSize(int tile_size, int icon_size);
 
@@ -85,7 +85,7 @@
   void StartKeyShowLauncher();
   void EndKeyShowLauncher();
 
-  void EnsureIconOnScreen(AbstractLauncherIcon* icon);
+  void EnsureIconOnScreen(AbstractLauncherIcon::Ptr icon);
 
   void SetBacklightMode(BacklightMode mode);
   BacklightMode GetBacklightMode() const;
@@ -112,9 +112,9 @@
 
   void Resize();
 
-  sigc::signal<void, char*, AbstractLauncherIcon*> launcher_addrequest;
-  sigc::signal<void, std::string const&, AbstractLauncherIcon*, std::string const&, std::string const&> launcher_addrequest_special;
-  sigc::signal<void, AbstractLauncherIcon*> launcher_removerequest;
+  sigc::signal<void, char*, AbstractLauncherIcon::Ptr> launcher_addrequest;
+  sigc::signal<void, std::string const&, AbstractLauncherIcon::Ptr, std::string const&, std::string const&> launcher_addrequest_special;
+  sigc::signal<void, AbstractLauncherIcon::Ptr> launcher_removerequest;
   sigc::signal<void> selection_change;
   sigc::signal<void> hidden_changed;
 
@@ -181,7 +181,7 @@
 
   void OnPluginStateChanged();
 
-  void OnSelectionChanged(AbstractLauncherIcon* selection);
+  void OnSelectionChanged(AbstractLauncherIcon::Ptr selection);
 
   static gboolean AnimationTimeout(gpointer data);
   static gboolean StrutHack(gpointer data);
@@ -195,8 +195,8 @@
 
   void OnDragWindowAnimCompleted();
 
-  bool IconNeedsAnimation(AbstractLauncherIcon* icon, struct timespec const& current) const;
-  bool IconDrawEdgeOnly(AbstractLauncherIcon* icon) const;
+  bool IconNeedsAnimation(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const;
+  bool IconDrawEdgeOnly(AbstractLauncherIcon::Ptr icon) const;
   bool AnimationInProgress() const;
 
   void SetActionState(LauncherActionState actionstate);
@@ -221,20 +221,20 @@
   float DragThresholdProgress(struct timespec const& current) const;
   float DragHideProgress(struct timespec const& current) const;
   float DragOutProgress(struct timespec const& current) const;
-  float IconDesatValue(AbstractLauncherIcon* icon, struct timespec const& current) const;
-  float IconPresentProgress(AbstractLauncherIcon* icon, struct timespec const& current) const;
-  float IconUrgentProgress(AbstractLauncherIcon* icon, struct timespec const& current) const;
-  float IconShimmerProgress(AbstractLauncherIcon* icon, struct timespec const& current) const;
-  float IconUrgentPulseValue(AbstractLauncherIcon* icon, struct timespec const& current) const;
-  float IconPulseOnceValue(AbstractLauncherIcon *icon, struct timespec const &current) const;
-  float IconUrgentWiggleValue(AbstractLauncherIcon* icon, struct timespec const& current) const;
-  float IconStartingBlinkValue(AbstractLauncherIcon* icon, struct timespec const& current) const;
-  float IconStartingPulseValue(AbstractLauncherIcon* icon, struct timespec const& current) const;
-  float IconBackgroundIntensity(AbstractLauncherIcon* icon, struct timespec const& current) const;
-  float IconProgressBias(AbstractLauncherIcon* icon, struct timespec const& current) const;
-  float IconDropDimValue(AbstractLauncherIcon* icon, struct timespec const& current) const;
-  float IconCenterTransitionProgress(AbstractLauncherIcon* icon, struct timespec const& current) const;
-  float IconVisibleProgress(AbstractLauncherIcon* icon, struct timespec const& current) const;
+  float IconDesatValue(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const;
+  float IconPresentProgress(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const;
+  float IconUrgentProgress(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const;
+  float IconShimmerProgress(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const;
+  float IconUrgentPulseValue(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const;
+  float IconPulseOnceValue(AbstractLauncherIcon::Ptr icon, struct timespec const &current) const;
+  float IconUrgentWiggleValue(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const;
+  float IconStartingBlinkValue(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const;
+  float IconStartingPulseValue(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const;
+  float IconBackgroundIntensity(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const;
+  float IconProgressBias(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const;
+  float IconDropDimValue(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const;
+  float IconCenterTransitionProgress(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const;
+  float IconVisibleProgress(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const;
 
   void SetHover(bool hovered);
   void SetHidden(bool hidden);
@@ -242,8 +242,8 @@
   void  SetDndDelta(float x, float y, nux::Geometry const& geo, timespec const& current);
   float DragLimiter(float x);
 
-  void SetupRenderArg(AbstractLauncherIcon* icon, struct timespec const& current, ui::RenderArg& arg);
-  void FillRenderArg(AbstractLauncherIcon* icon,
+  void SetupRenderArg(AbstractLauncherIcon::Ptr icon, struct timespec const& current, ui::RenderArg& arg);
+  void FillRenderArg(AbstractLauncherIcon::Ptr icon,
                      ui::RenderArg& arg,
                      nux::Point3& center,
                      nux::Geometry const& parent_abs_geo,
@@ -258,11 +258,11 @@
   void RenderArgs(std::list<ui::RenderArg> &launcher_args,
                   nux::Geometry& box_geo, float* launcher_alpha, nux::Geometry const& parent_abs_geo);
 
-  void OnIconAdded(AbstractLauncherIcon* icon);
-  void OnIconRemoved(AbstractLauncherIcon* icon);
+  void OnIconAdded(AbstractLauncherIcon::Ptr icon);
+  void OnIconRemoved(AbstractLauncherIcon::Ptr icon);
   void OnOrderChanged();
 
-  void OnIconNeedsRedraw(AbstractLauncherIcon* icon);
+  void OnIconNeedsRedraw(AbstractLauncherIcon::Ptr icon);
 
   void OnOverlayHidden(GVariant* data);
   void OnOverlayShown(GVariant* data);
@@ -276,15 +276,15 @@
 
   void OnActionDone(GVariant* data);
 
-  void RenderIconToTexture(nux::GraphicsEngine& GfxContext, AbstractLauncherIcon* icon, nux::ObjectPtr<nux::IOpenGLBaseTexture> texture);
+  void RenderIconToTexture(nux::GraphicsEngine& GfxContext, AbstractLauncherIcon::Ptr icon, nux::ObjectPtr<nux::IOpenGLBaseTexture> texture);
 
-  AbstractLauncherIcon* MouseIconIntersection(int x, int y);
+  AbstractLauncherIcon::Ptr MouseIconIntersection(int x, int y);
   void EventLogic();
   void MouseDownLogic(int x, int y, unsigned long button_flags, unsigned long key_flags);
   void MouseUpLogic(int x, int y, unsigned long button_flags, unsigned long key_flags);
 
   void StartIconDragRequest(int x, int y);
-  void StartIconDrag(AbstractLauncherIcon* icon);
+  void StartIconDrag(AbstractLauncherIcon::Ptr icon);
   void EndIconDrag();
   void UpdateDragWindowPosition(int x, int y);
 
@@ -305,9 +305,9 @@
   nux::HLayout* m_Layout;
 
   // used by keyboard/a11y-navigation
-  AbstractLauncherIcon* _icon_under_mouse;
-  AbstractLauncherIcon* _icon_mouse_down;
-  AbstractLauncherIcon* _drag_icon;
+  AbstractLauncherIcon::Ptr _icon_under_mouse;
+  AbstractLauncherIcon::Ptr _icon_mouse_down;
+  AbstractLauncherIcon::Ptr _drag_icon;
 
   QuicklistView* _active_quicklist;
 
@@ -368,7 +368,7 @@
   bool              _data_checked;
   bool              _steal_drag;
   bool              _drag_edge_touching;
-  AbstractLauncherIcon*     _dnd_hovered_icon;
+  AbstractLauncherIcon::Ptr     _dnd_hovered_icon;
   unity::DNDCollectionWindow* _collection_window;
   sigc::connection _on_data_collected_connection;
 
 
=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2012-02-08 08:58:05 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2012-02-12 19:58:19 +0000
@@ -80,12 +80,12 @@
   void Save();
   void SortAndUpdate();
 
-  void OnIconAdded(AbstractLauncherIcon* icon);
-  void OnIconRemoved(AbstractLauncherIcon* icon);
+  void OnIconAdded(AbstractLauncherIcon::Ptr icon);
+  void OnIconRemoved(AbstractLauncherIcon::Ptr icon);
 
-  void OnLauncherAddRequest(char* path, AbstractLauncherIcon* before);
-  void OnLauncherAddRequestSpecial(std::string const& path, AbstractLauncherIcon* before, std::string const& aptdaemon_trans_id, std::string const& icon_path);
-  void OnLauncherRemoveRequest(AbstractLauncherIcon* icon);
+  void OnLauncherAddRequest(char* path, AbstractLauncherIcon::Ptr before);
+  void OnLauncherAddRequestSpecial(std::string const& path, AbstractLauncherIcon::Ptr before, std::string const& aptdaemon_trans_id, std::string const& icon_path);
+  void OnLauncherRemoveRequest(AbstractLauncherIcon::Ptr icon);
 
   void OnLauncherEntryRemoteAdded(LauncherEntryRemote* entry);
   void OnLauncherEntryRemoteRemoved(LauncherEntryRemote* entry);
@@ -111,11 +111,11 @@
 
   void InsertTrash();
 
-  void RegisterIcon(AbstractLauncherIcon* icon);
-
-  AbstractLauncherIcon* CreateFavorite(const char* file_path);
-
-  SoftwareCenterLauncherIcon* CreateSCLauncherIcon(std::string const& file_path, std::string const& aptdaemon_trans_id, std::string const& icon_path);
+  void RegisterIcon(AbstractLauncherIcon::Ptr icon);
+
+  AbstractLauncherIcon::Ptr CreateFavorite(const char* file_path);
+
+  AbstractLauncherIcon::Ptr CreateSCLauncherIcon(std::string const& file_path, std::string const& aptdaemon_trans_id, std::string const& icon_path);
 
   void SetupBamf();
 
@@ -145,9 +145,9 @@
   int                    sort_priority_;
   DeviceLauncherSection* device_section_;
   LauncherEntryRemoteModel remote_model_;
-  SimpleLauncherIcon*    expo_icon_;
-  DesktopLauncherIcon*   desktop_launcher_icon_;
-  nux::ObjectPtr<AbstractLauncherIcon> desktop_icon_;
+  AbstractLauncherIcon::Ptr expo_icon_;
+  AbstractLauncherIcon::Ptr desktop_launcher_icon_;
+  AbstractLauncherIcon::Ptr desktop_icon_;
   int                    num_workspaces_;
   bool                   show_desktop_icon_;
   Display*               display_;
@@ -234,8 +234,8 @@
   FavoriteStore::GetDefault().favorite_removed.connect(sigc::mem_fun(this, &Impl::OnFavoriteStoreFavoriteRemoved));
   FavoriteStore::GetDefault().reordered.connect(sigc::mem_fun(this, &Impl::OnFavoriteStoreReordered));
 
-  RegisterIcon(new BFBLauncherIcon());
-  desktop_icon_ = new DesktopLauncherIcon();
+  RegisterIcon(AbstractLauncherIcon::Ptr(new BFBLauncherIcon()));
+  desktop_icon_ = AbstractLauncherIcon::Ptr(new DesktopLauncherIcon());
 
   uscreen->changed.connect(sigc::mem_fun(this, &Controller::Impl::OnScreenChanged));
 
@@ -333,7 +333,7 @@
   return launcher;
 }
 
-void Controller::Impl::OnLauncherAddRequest(char* path, AbstractLauncherIcon* before)
+void Controller::Impl::OnLauncherAddRequest(char* path, AbstractLauncherIcon::Ptr before)
 {
   for (auto it : model_->GetSublist<BamfLauncherIcon> ())
   {
@@ -346,7 +346,7 @@
     }
   }
 
-  AbstractLauncherIcon* result = CreateFavorite(path);
+  AbstractLauncherIcon::Ptr result = CreateFavorite(path);
   if (result)
   {
     RegisterIcon(result);
@@ -362,7 +362,7 @@
   unity::FavoriteList desktop_paths;
 
   // Updates gsettings favorites.
-  std::list<BamfLauncherIcon*> launchers = model_->GetSublist<BamfLauncherIcon> ();
+  auto launchers = model_->GetSublist<BamfLauncherIcon> ();
   for (auto icon : launchers)
   {
     if (!icon->IsSticky())
@@ -379,20 +379,18 @@
 
 void
 Controller::Impl::OnLauncherAddRequestSpecial(std::string const& path,
-                                              AbstractLauncherIcon* before,
+                                              AbstractLauncherIcon::Ptr before,
                                               std::string const& aptdaemon_trans_id,
                                               std::string const& icon_path)
 {
-  std::list<BamfLauncherIcon*> launchers;
-
-  launchers = model_->GetSublist<BamfLauncherIcon>();
+  auto launchers = model_->GetSublist<BamfLauncherIcon>();
   for (auto icon : launchers)
   {
     if (icon->DesktopFile() == path)
       return;
   }
 
-  SoftwareCenterLauncherIcon* result = CreateSCLauncherIcon(path, aptdaemon_trans_id, icon_path);
+  AbstractLauncherIcon::Ptr result = CreateSCLauncherIcon(path, aptdaemon_trans_id, icon_path);
   if (result)
   {
     RegisterIcon(result);
@@ -407,7 +405,7 @@
 {
   gint   shortcut = 1;
 
-  std::list<BamfLauncherIcon*> launchers = model_->GetSublist<BamfLauncherIcon> ();
+  auto launchers = model_->GetSublist<BamfLauncherIcon> ();
   for (auto icon : launchers)
   {
     if (shortcut <= 10 && icon->IsVisible())
@@ -425,23 +423,23 @@
   }
 }
 
-void Controller::Impl::OnIconAdded(AbstractLauncherIcon* icon)
+void Controller::Impl::OnIconAdded(AbstractLauncherIcon::Ptr icon)
 {
   this->RegisterIcon(icon);
 }
 
-void Controller::Impl::OnIconRemoved(AbstractLauncherIcon* icon)
+void Controller::Impl::OnIconRemoved(AbstractLauncherIcon::Ptr icon)
 {
   SortAndUpdate();
 }
 
-void Controller::Impl::OnLauncherRemoveRequest(AbstractLauncherIcon* icon)
+void Controller::Impl::OnLauncherRemoveRequest(AbstractLauncherIcon::Ptr icon)
 {
-  switch (icon->Type())
+  switch (icon->GetIconType())
   {
     case AbstractLauncherIcon::TYPE_APPLICATION:
     {
-      BamfLauncherIcon* bamf_icon = dynamic_cast<BamfLauncherIcon*>(icon);
+      BamfLauncherIcon* bamf_icon = dynamic_cast<BamfLauncherIcon*>(icon.GetPointer());
 
       if (bamf_icon)
       {
@@ -453,7 +451,7 @@
     }
     case AbstractLauncherIcon::TYPE_DEVICE:
     {
-      DeviceLauncherIcon* device_icon = dynamic_cast<DeviceLauncherIcon*>(icon);
+      DeviceLauncherIcon* device_icon = dynamic_cast<DeviceLauncherIcon*>(icon.GetPointer());
 
       if (device_icon && device_icon->CanEject())
         device_icon->Eject();
@@ -490,7 +488,9 @@
 void Controller::Impl::OnFavoriteStoreFavoriteAdded(std::string const& entry, std::string const& pos, bool before)
 {
   auto bamf_list = model_->GetSublist<BamfLauncherIcon>();
-  AbstractLauncherIcon* other = (bamf_list.size() > 0) ? *(bamf_list.begin()) : nullptr;
+  AbstractLauncherIcon::Ptr other;
+  if (bamf_list.size() > 0)
+    other = *(bamf_list.begin());
 
   if (!pos.empty())
   {
@@ -514,7 +514,7 @@
     }
   }
 
-  AbstractLauncherIcon* result = CreateFavorite(entry.c_str());
+  AbstractLauncherIcon::Ptr result = CreateFavorite(entry.c_str());
   if (result)
   {
     RegisterIcon(result);
@@ -546,7 +546,7 @@
   for (auto it : favs)
   {
     auto icon = std::find_if(bamf_list.begin(), bamf_list.end(),
-    [&it](BamfLauncherIcon* x) { return (x->DesktopFile() == it); });
+    [&it](AbstractLauncherIcon::Ptr x) { return (x->DesktopFile() == it); });
 
     if (icon != bamf_list.end())
     {
@@ -570,8 +570,7 @@
 
 void Controller::Impl::InsertTrash()
 {
-  TrashLauncherIcon* icon;
-  icon = new TrashLauncherIcon();
+  AbstractLauncherIcon::Ptr icon(new TrashLauncherIcon());
   RegisterIcon(icon);
 }
 
@@ -591,17 +590,19 @@
 
 void Controller::Impl::InsertExpoAction()
 {
-  expo_icon_ = new SimpleLauncherIcon();
-
-  expo_icon_->tooltip_text = _("Workspace Switcher");
-  expo_icon_->icon_name = "workspace-switcher";
-  expo_icon_->SetQuirk(AbstractLauncherIcon::QUIRK_VISIBLE, true);
-  expo_icon_->SetQuirk(AbstractLauncherIcon::QUIRK_RUNNING, false);
-  expo_icon_->SetIconType(AbstractLauncherIcon::TYPE_EXPO);
-  expo_icon_->SetShortcut('s');
-
-  on_expoicon_activate_connection_ = expo_icon_->activate.connect(sigc::mem_fun(this, &Impl::OnExpoActivated));
-
+  expo_icon_ = AbstractLauncherIcon::Ptr(new SimpleLauncherIcon());
+
+  SimpleLauncherIcon* icon = static_cast<SimpleLauncherIcon*>(expo_icon_.GetPointer());
+  icon->tooltip_text = _("Workspace Switcher");
+  icon->icon_name = "workspace-switcher";
+  icon->SetQuirk(AbstractLauncherIcon::QUIRK_VISIBLE, true);
+  icon->SetQuirk(AbstractLauncherIcon::QUIRK_RUNNING, false);
+  icon->SetIconType(AbstractLauncherIcon::TYPE_EXPO);
+  icon->SetShortcut('s');
+
+  on_expoicon_activate_connection_ = icon->activate.connect(sigc::mem_fun(this, &Impl::OnExpoActivated));
+
+  
   RegisterIcon(expo_icon_);
 }
 
@@ -614,10 +615,7 @@
 
 void Controller::Impl::InsertDesktopIcon()
 {
-  desktop_launcher_icon_ = new DesktopLauncherIcon();
-  desktop_launcher_icon_->SetIconType(AbstractLauncherIcon::TYPE_DESKTOP);
-  desktop_launcher_icon_->SetShowInSwitcher(false);
-
+  desktop_launcher_icon_ = AbstractLauncherIcon::Ptr(new DesktopLauncherIcon());
   RegisterIcon(desktop_launcher_icon_);
 }
 
@@ -626,20 +624,16 @@
   model_->RemoveIcon(desktop_launcher_icon_);
 }
 
-void Controller::Impl::RegisterIcon(AbstractLauncherIcon* icon)
+void Controller::Impl::RegisterIcon(AbstractLauncherIcon::Ptr icon)
 {
   model_->AddIcon(icon);
 
-  BamfLauncherIcon* bamf_icon = dynamic_cast<BamfLauncherIcon*>(icon);
-  if (bamf_icon)
-  {
-    LauncherEntryRemote* entry = NULL;
-    std::string const& path = bamf_icon->DesktopFile();
-    if (!path.empty())
-      entry = remote_model_.LookupByDesktopFile(path.c_str());
-    if (entry)
-      icon->InsertEntryRemote(entry);
-  }
+  LauncherEntryRemote* entry = NULL;
+  std::string const& path = icon->DesktopFile();
+  if (!path.empty())
+    entry = remote_model_.LookupByDesktopFile(path.c_str());
+  if (entry)
+    icon->InsertEntryRemote(entry);
 }
 
 /* static private */
@@ -659,71 +653,69 @@
     return;
   }
 
-  BamfLauncherIcon* icon = new BamfLauncherIcon(app);
-  icon->SetIconType(AbstractLauncherIcon::TYPE_APPLICATION);
+  AbstractLauncherIcon::Ptr icon (new BamfLauncherIcon(app));
   icon->SetSortPriority(self->sort_priority_++);
 
   self->RegisterIcon(icon);
 }
 
-AbstractLauncherIcon* Controller::Impl::CreateFavorite(const char* file_path)
+AbstractLauncherIcon::Ptr Controller::Impl::CreateFavorite(const char* file_path)
 {
   BamfApplication* app;
-  BamfLauncherIcon* icon;
+  AbstractLauncherIcon::Ptr result;
 
   app = bamf_matcher_get_application_for_desktop_file(matcher_, file_path, true);
   if (!app)
-    return NULL;
+    return result;
 
   if (g_object_get_qdata(G_OBJECT(app), g_quark_from_static_string("unity-seen")))
   {
     bamf_view_set_sticky(BAMF_VIEW(app), true);
-    return 0;
+    return result;
   }
 
   g_object_set_qdata(G_OBJECT(app), g_quark_from_static_string("unity-seen"), GINT_TO_POINTER(1));
 
   bamf_view_set_sticky(BAMF_VIEW(app), true);
-  icon = new BamfLauncherIcon(app);
-  icon->SetIconType(AbstractLauncherIcon::TYPE_APPLICATION);
+  AbstractLauncherIcon::Ptr icon (new BamfLauncherIcon(app));
   icon->SetSortPriority(sort_priority_++);
+  result = icon;
 
-  return icon;
+  return result;
 }
 
-SoftwareCenterLauncherIcon*
+AbstractLauncherIcon::Ptr
 Controller::Impl::CreateSCLauncherIcon(std::string const& file_path,
                                        std::string const& aptdaemon_trans_id,
                                        std::string const& icon_path)
 {
   BamfApplication* app;
-  SoftwareCenterLauncherIcon* icon;
+  AbstractLauncherIcon::Ptr result;
 
   app = bamf_matcher_get_application_for_desktop_file(matcher_, file_path.c_str(), true);
   if (!BAMF_IS_APPLICATION(app))
-    return NULL;
+    return result;
 
   if (g_object_get_qdata(G_OBJECT(app), g_quark_from_static_string("unity-seen")))
   {
     bamf_view_set_sticky(BAMF_VIEW(app), true);
-    return 0;
+    return result;
   }
 
   g_object_set_qdata(G_OBJECT(app), g_quark_from_static_string("unity-seen"), GINT_TO_POINTER(1));
 
   bamf_view_set_sticky(BAMF_VIEW(app), true);
-  icon = new SoftwareCenterLauncherIcon(app, aptdaemon_trans_id, icon_path);
-  icon->SetIconType(LauncherIcon::TYPE_APPLICATION);
+  AbstractLauncherIcon::Ptr icon(new SoftwareCenterLauncherIcon(app, aptdaemon_trans_id, icon_path));
   icon->SetSortPriority(sort_priority_++);
 
-  return icon;
+  result = icon;
+  return result;
 }
 
 void Controller::Impl::SetupBamf()
 {
   GList* apps, *l;
   BamfApplication* app;
-  BamfLauncherIcon* icon;
 
   // Sufficiently large number such that we ensure proper sorting
   // (avoids case where first item gets tacked onto end rather than start)
@@ -736,7 +728,7 @@
   for (FavoriteList::const_iterator i = favs.begin(), end = favs.end();
        i != end; ++i)
   {
-    AbstractLauncherIcon* fav = CreateFavorite(i->c_str());
+    AbstractLauncherIcon::Ptr fav = CreateFavorite(i->c_str());
 
     if (fav)
     {
@@ -757,7 +749,7 @@
       continue;
     g_object_set_qdata(G_OBJECT(app), g_quark_from_static_string("unity-seen"), GINT_TO_POINTER(1));
 
-    icon = new BamfLauncherIcon(app);
+    AbstractLauncherIcon::Ptr icon(new BamfLauncherIcon(app));
     icon->SetSortPriority(sort_priority_++);
     RegisterIcon(icon);
   }
@@ -827,11 +819,11 @@
   return shortcuts;
 }
 
-std::vector<AbstractLauncherIcon*> Controller::GetAltTabIcons(bool current) const
+std::vector<AbstractLauncherIcon::Ptr> Controller::GetAltTabIcons(bool current) const
 {
-  std::vector<AbstractLauncherIcon*> results;
+  std::vector<AbstractLauncherIcon::Ptr> results;
 
-  results.push_back(pimpl->desktop_icon_.GetPointer());
+  results.push_back(pimpl->desktop_icon_);
 
   for (auto icon : *(pimpl->model_))
     if (icon->ShowInSwitcher(current))
 
=== modified file 'plugins/unityshell/src/LauncherController.h'
--- plugins/unityshell/src/LauncherController.h	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/LauncherController.h	2012-02-12 19:58:19 +0000
@@ -53,7 +53,7 @@
 
   void UpdateNumWorkspaces(int workspaces);
   std::vector<char> GetAllShortcuts() const;
-  std::vector<AbstractLauncherIcon*> GetAltTabIcons(bool current) const;
+  std::vector<AbstractLauncherIcon::Ptr> GetAltTabIcons(bool current) const;
 
   void PushToFront();
 
 
=== modified file 'plugins/unityshell/src/LauncherIcon.cpp'
--- plugins/unityshell/src/LauncherIcon.cpp	2012-02-11 07:34:27 +0000
+++ plugins/unityshell/src/LauncherIcon.cpp	2012-02-12 19:58:19 +0000
@@ -706,7 +706,7 @@
     return;
 
   _has_visible_window[monitor] = val;
-  needs_redraw.emit(this);
+  EmitNeedsRedraw();
 }
 
 gboolean
@@ -760,7 +760,7 @@
       _quicklist->Hide();
 
   SetQuirk(QUIRK_VISIBLE, false);
-  remove.emit(this);
+  EmitRemove();
 }
 
 void
@@ -782,7 +782,7 @@
 }
 
 LauncherIcon::IconType
-LauncherIcon::Type()
+LauncherIcon::GetIconType()
 {
   return _icon_type;
 }
@@ -804,7 +804,7 @@
     TimeUtil::SetTimeStruct(&(_quirk_times[quirk]), &(_quirk_times[quirk]), Launcher::ANIM_DURATION_SHORT);
   else
     clock_gettime(CLOCK_MONOTONIC, &(_quirk_times[quirk]));
-  needs_redraw.emit(this);
+  EmitNeedsRedraw();
 
   // Present on urgent as a general policy
   if (quirk == QUIRK_VISIBLE && value)
@@ -828,7 +828,7 @@
   LauncherIcon* self = arg->self;
 
   clock_gettime(CLOCK_MONOTONIC, &(self->_quirk_times[arg->quirk]));
-  self->needs_redraw.emit(self);
+  self->EmitNeedsRedraw();
 
   self->_time_delay_handle = 0;
 
@@ -849,7 +849,7 @@
 LauncherIcon::UpdateQuirkTime(LauncherIcon::Quirk quirk)
 {
   clock_gettime(CLOCK_MONOTONIC, &(_quirk_times[quirk]));
-  needs_redraw.emit(this);
+  EmitNeedsRedraw();
 }
 
 void
@@ -872,7 +872,7 @@
     return;
 
   _progress = progress;
-  needs_redraw.emit(this);
+  EmitNeedsRedraw();
 }
 
 float
@@ -902,7 +902,7 @@
 LauncherIcon::SetEmblem(LauncherIcon::BaseTexturePtr const& emblem)
 {
   _emblem = emblem;
-  needs_redraw.emit(this);
+  EmitNeedsRedraw();
 }
 
 void
@@ -1135,5 +1135,18 @@
     SetProgress((float) remote->Progress());
 }
 
+void LauncherIcon::EmitNeedsRedraw()
+{
+  if (OwnsTheReference())
+    needs_redraw.emit(AbstractLauncherIcon::Ptr(this));
+}
+
+void LauncherIcon::EmitRemove()
+{
+  if (OwnsTheReference())
+    remove.emit(AbstractLauncherIcon::Ptr(this));
+}
+
+
 } // namespace launcher
 } // namespace unity
 
=== modified file 'plugins/unityshell/src/LauncherIcon.h'
--- plugins/unityshell/src/LauncherIcon.h	2012-02-09 04:14:31 +0000
+++ plugins/unityshell/src/LauncherIcon.h	2012-02-12 19:58:19 +0000
@@ -141,7 +141,7 @@
 
   struct timespec GetQuirkTime(Quirk quirk);
 
-  IconType Type();
+  IconType GetIconType();
 
   virtual nux::Color BackgroundColor();
 
@@ -184,6 +184,18 @@
 
   void SetIconType(IconType type);
 
+  virtual std::string DesktopFile() { return std::string(""); }
+
+  virtual bool IsSticky() const { return false; }
+
+  virtual bool IsVisible() const { return false; }
+
+  virtual void AboutToRemove() {}
+  
+  virtual void Stick(bool save = true) {}
+  
+  virtual void UnStick() {}
+
 protected:
   std::vector<nux::Point3> GetCenters();
 
@@ -263,6 +275,9 @@
 
   void OnRemoteProgressVisibleChanged(LauncherEntryRemote* remote);
 
+  void EmitNeedsRedraw();
+
+  void EmitRemove();
 
   // This looks like a case for boost::logical::tribool
   static int _current_theme_is_mono;
 
=== modified file 'plugins/unityshell/src/LauncherModel.cpp'
--- plugins/unityshell/src/LauncherModel.cpp	2012-02-08 00:32:46 +0000
+++ plugins/unityshell/src/LauncherModel.cpp	2012-02-12 19:58:19 +0000
@@ -30,7 +30,7 @@
 
 typedef struct
 {
-  AbstractLauncherIcon* icon;
+  AbstractLauncherIcon::Ptr icon;
   LauncherModel* self;
 } RemoveArg;
 
@@ -41,11 +41,6 @@
 
 LauncherModel::~LauncherModel()
 {
-  for (auto icon : _inner_shelf)
-    icon->UnReference();
-
-  for (auto icon : _inner_main)
-    icon->UnReference();
 }
 
 std::string LauncherModel::GetName() const
@@ -64,21 +59,21 @@
   introspection_results_.clear();
   
   for (auto icon : _inner)
-    introspection_results_.push_back(icon);
+    introspection_results_.push_back(icon.GetPointer());
   
   return introspection_results_;
 }
 
-bool LauncherModel::IconShouldShelf(AbstractLauncherIcon* icon) const
+bool LauncherModel::IconShouldShelf(AbstractLauncherIcon::Ptr icon) const
 {
-  return icon->Type() == AbstractLauncherIcon::TYPE_TRASH;
+  return icon->GetIconType() == AbstractLauncherIcon::TYPE_TRASH;
 }
 
-bool LauncherModel::CompareIcons(AbstractLauncherIcon* first, AbstractLauncherIcon* second)
+bool LauncherModel::CompareIcons(AbstractLauncherIcon::Ptr first, AbstractLauncherIcon::Ptr second)
 {
-  if (first->Type() < second->Type())
+  if (first->GetIconType() < second->GetIconType())
     return true;
-  else if (first->Type() > second->Type())
+  else if (first->GetIconType() > second->GetIconType())
     return false;
 
   return first->SortPriority() < second->SortPriority();
@@ -112,10 +107,8 @@
 }
 
 void
-LauncherModel::AddIcon(AbstractLauncherIcon* icon)
+LauncherModel::AddIcon(AbstractLauncherIcon::Ptr icon)
 {
-  icon->SinkReference();
-
   if (IconShouldShelf(icon))
     _inner_shelf.push_back(icon);
   else
@@ -131,7 +124,7 @@
 }
 
 void
-LauncherModel::RemoveIcon(AbstractLauncherIcon* icon)
+LauncherModel::RemoveIcon(AbstractLauncherIcon::Ptr icon)
 {
   size_t size;
 
@@ -144,7 +137,6 @@
   if (size != _inner.size())
   {
     icon_removed.emit(icon);
-    icon->UnReference();
   }
 }
 
@@ -160,7 +152,7 @@
 }
 
 void
-LauncherModel::OnIconRemove(AbstractLauncherIcon* icon)
+LauncherModel::OnIconRemove(AbstractLauncherIcon::Ptr icon)
 {
   RemoveArg* arg = (RemoveArg*) g_malloc0(sizeof(RemoveArg));
   arg->icon = icon;
@@ -186,12 +178,12 @@
 }
 
 bool
-LauncherModel::IconHasSister(AbstractLauncherIcon* icon) const
+LauncherModel::IconHasSister(AbstractLauncherIcon::Ptr icon) const
 {
   const_iterator it;
   const_iterator end;
 
-  if (icon && icon->Type() == AbstractLauncherIcon::TYPE_DEVICE)
+  if (icon && icon->GetIconType() == AbstractLauncherIcon::TYPE_DEVICE)
     return true;
 
   if (IconShouldShelf(icon))
@@ -207,9 +199,9 @@
 
   for (; it != end; ++it)
   {
-    AbstractLauncherIcon* iter_icon = *it;
+    AbstractLauncherIcon::Ptr iter_icon = *it;
     if ((iter_icon  != icon)
-        && iter_icon->Type() == icon->Type())
+        && iter_icon->GetIconType() == icon->GetIconType())
       return true;
   }
 
@@ -217,7 +209,7 @@
 }
 
 void
-LauncherModel::ReorderAfter(AbstractLauncherIcon* icon, AbstractLauncherIcon* other)
+LauncherModel::ReorderAfter(AbstractLauncherIcon::Ptr icon, AbstractLauncherIcon::Ptr other)
 {
   if (icon == other)
     return;
@@ -247,7 +239,7 @@
 }
 
 void
-LauncherModel::ReorderBefore(AbstractLauncherIcon* icon, AbstractLauncherIcon* other, bool save)
+LauncherModel::ReorderBefore(AbstractLauncherIcon::Ptr icon, AbstractLauncherIcon::Ptr other, bool save)
 {
   if (icon == other)
     return;
@@ -288,7 +280,7 @@
 }
 
 void
-LauncherModel::ReorderSmart(AbstractLauncherIcon* icon, AbstractLauncherIcon* other, bool save)
+LauncherModel::ReorderSmart(AbstractLauncherIcon::Ptr icon, AbstractLauncherIcon::Ptr other, bool save)
 {
   if (icon == other)
     return;
@@ -347,7 +339,7 @@
   return _inner.size();
 }
 
-AbstractLauncherIcon* LauncherModel::Selection () const
+AbstractLauncherIcon::Ptr LauncherModel::Selection () const
 {
   return _inner[selection_];
 }
 
=== modified file 'plugins/unityshell/src/LauncherModel.h'
--- plugins/unityshell/src/LauncherModel.h	2012-02-08 00:32:46 +0000
+++ plugins/unityshell/src/LauncherModel.h	2012-02-12 19:58:19 +0000
@@ -35,7 +35,7 @@
 {
 public:
   typedef std::shared_ptr<LauncherModel> Ptr;
-  typedef std::vector<AbstractLauncherIcon*> Base;
+  typedef std::vector<AbstractLauncherIcon::Ptr> Base;
   typedef Base::iterator iterator;
   typedef Base::const_iterator const_iterator;
   typedef Base::reverse_iterator reverse_iterator;
@@ -44,22 +44,22 @@
   LauncherModel();
   ~LauncherModel();
 
-  void AddIcon(AbstractLauncherIcon* icon);
-  void RemoveIcon(AbstractLauncherIcon* icon);
+  void AddIcon(AbstractLauncherIcon::Ptr icon);
+  void RemoveIcon(AbstractLauncherIcon::Ptr icon);
   void Save();
   void Sort();
   int  Size() const;
 
-  void OnIconRemove(AbstractLauncherIcon* icon);
-
-  bool IconHasSister(AbstractLauncherIcon* icon) const;
-
-  void ReorderAfter(AbstractLauncherIcon* icon, AbstractLauncherIcon* other);
-  void ReorderBefore(AbstractLauncherIcon* icon, AbstractLauncherIcon* other, bool save);
-
-  void ReorderSmart(AbstractLauncherIcon* icon, AbstractLauncherIcon* other, bool save);
-
-  AbstractLauncherIcon* Selection() const;
+  void OnIconRemove(AbstractLauncherIcon::Ptr icon);
+
+  bool IconHasSister(AbstractLauncherIcon::Ptr icon) const;
+
+  void ReorderAfter(AbstractLauncherIcon::Ptr icon, AbstractLauncherIcon::Ptr other);
+  void ReorderBefore(AbstractLauncherIcon::Ptr icon, AbstractLauncherIcon::Ptr other, bool save);
+
+  void ReorderSmart(AbstractLauncherIcon::Ptr icon, AbstractLauncherIcon::Ptr other, bool save);
+
+  AbstractLauncherIcon::Ptr Selection() const;
   int SelectionIndex() const;
   void SetSelection(int selection);
   void SelectNext();
@@ -81,11 +81,11 @@
   reverse_iterator shelf_rbegin();
   reverse_iterator shelf_rend();
 
-  sigc::signal<void, AbstractLauncherIcon*> icon_added;
-  sigc::signal<void, AbstractLauncherIcon*> icon_removed;
+  sigc::signal<void, AbstractLauncherIcon::Ptr> icon_added;
+  sigc::signal<void, AbstractLauncherIcon::Ptr> icon_removed;
   sigc::signal<void> order_changed;
   sigc::signal<void> saved;
-  sigc::signal<void, AbstractLauncherIcon*> selection_changed;
+  sigc::signal<void, AbstractLauncherIcon::Ptr> selection_changed;
 
   IntrospectableList const& GetIntrospectableChildren();
 protected:
@@ -102,26 +102,26 @@
 
   bool Populate();
 
-  bool IconShouldShelf(AbstractLauncherIcon* icon) const;
+  bool IconShouldShelf(AbstractLauncherIcon::Ptr icon) const;
 
   static gboolean RemoveCallback(gpointer data);
 
-  static bool CompareIcons(AbstractLauncherIcon* first, AbstractLauncherIcon* second);
+  static bool CompareIcons(AbstractLauncherIcon::Ptr first, AbstractLauncherIcon::Ptr second);
 
   /* Template Methods */
 public:
   template<class T>
-  std::list<T*> GetSublist()
+  std::list<AbstractLauncherIcon::Ptr> GetSublist()
   {
-    std::list<T*> result;
+    std::list<AbstractLauncherIcon::Ptr> result;
 
     iterator it;
     for (it = begin(); it != end(); it++)
     {
-      T* var = dynamic_cast<T*>(*it);
+      T* var = dynamic_cast<T*>((*it).GetPointer());
 
       if (var)
-        result.push_back(var);
+        result.push_back(*it);
     }
 
     return result;
 
=== modified file 'plugins/unityshell/src/MockLauncherIcon.h'
--- plugins/unityshell/src/MockLauncherIcon.h	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/MockLauncherIcon.h	2012-02-12 19:58:19 +0000
@@ -42,6 +42,7 @@
 
 class MockLauncherIcon : public AbstractLauncherIcon
 {
+  NUX_DECLARE_OBJECT_TYPE(MockLauncherIcon, AbstractLauncherIcon);
 public:
   MockLauncherIcon()
     : icon_(0)
@@ -185,7 +186,7 @@
     return tv;
   }
 
-  IconType Type()
+  IconType GetIconType()
   {
     return type_;
   }
@@ -239,6 +240,18 @@
 
   void SendDndLeave() {}
 
+  std::string DesktopFile() { return std::string(""); }
+
+  bool IsSticky() const { return false; }
+
+  bool IsVisible() const { return false; }
+
+  void AboutToRemove() {}
+  
+  void Stick(bool save = true) {}
+  
+  void UnStick() {}
+
 private:
   nux::BaseTexture* TextureFromGtkTheme(const char* icon_name, int size)
   {
@@ -292,6 +305,8 @@
   IconType type_;
 };
 
+NUX_IMPLEMENT_OBJECT_TYPE(MockLauncherIcon);
+
 }
 }
 
 
=== modified file 'plugins/unityshell/src/SimpleLauncherIcon.cpp'
--- plugins/unityshell/src/SimpleLauncherIcon.cpp	2012-02-08 00:32:46 +0000
+++ plugins/unityshell/src/SimpleLauncherIcon.cpp	2012-02-12 19:58:19 +0000
@@ -40,6 +40,8 @@
   nux::logging::Logger logger("unity.dash.CategoryViewGrid");
 }
 
+NUX_IMPLEMENT_OBJECT_TYPE(SimpleLauncherIcon);
+
 SimpleLauncherIcon::SimpleLauncherIcon()
   : LauncherIcon()
   , icon_name("", sigc::mem_fun(this, &SimpleLauncherIcon::SetIconName))
@@ -130,7 +132,7 @@
       element.second->UnReference();
 
   texture_map.clear ();
-  needs_redraw.emit(this);
+  EmitNeedsRedraw();
 }
 
 void SimpleLauncherIcon::OnIconThemeChanged(GtkIconTheme* icon_theme, gpointer data)
 
=== modified file 'plugins/unityshell/src/SimpleLauncherIcon.h'
--- plugins/unityshell/src/SimpleLauncherIcon.h	2012-02-08 00:32:46 +0000
+++ plugins/unityshell/src/SimpleLauncherIcon.h	2012-02-12 19:58:19 +0000
@@ -31,6 +31,7 @@
 
 class SimpleLauncherIcon : public LauncherIcon
 {
+  NUX_DECLARE_OBJECT_TYPE(SimpleLauncherIcon, LauncherIcon);
 public:
   SimpleLauncherIcon();
   virtual ~SimpleLauncherIcon();
 
=== modified file 'plugins/unityshell/src/SoftwareCenterLauncherIcon.cpp'
--- plugins/unityshell/src/SoftwareCenterLauncherIcon.cpp	2012-02-03 01:24:53 +0000
+++ plugins/unityshell/src/SoftwareCenterLauncherIcon.cpp	2012-02-12 19:58:19 +0000
@@ -43,6 +43,7 @@
     SetProgress(0.0f);
   });
 
+  SetIconType(TYPE_APPLICATION);
   icon_name = icon_path.c_str();
   tooltip_text = _("Waiting to install");
 }
 
=== modified file 'plugins/unityshell/src/SwitcherController.cpp'
--- plugins/unityshell/src/SwitcherController.cpp	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/SwitcherController.cpp	2012-02-12 19:58:19 +0000
@@ -74,7 +74,7 @@
 }
 
 void Controller::Show(ShowMode show, SortMode sort, bool reverse,
-                      std::vector<AbstractLauncherIcon*> results)
+                      std::vector<AbstractLauncherIcon::Ptr> results)
 {
   if (sort == SortMode::FOCUS_ORDER)
   {
@@ -147,7 +147,7 @@
   return FALSE;
 }
 
-void Controller::OnModelSelectionChanged(AbstractLauncherIcon *icon)
+void Controller::OnModelSelectionChanged(AbstractLauncherIcon::Ptr icon)
 {
   if (detail_on_timeout)
   {
@@ -205,7 +205,7 @@
 
   if (accept_state)
   {
-    AbstractLauncherIcon* selection = model_->Selection();
+    AbstractLauncherIcon::Ptr selection = model_->Selection();
     if (selection)
     {
       if (model_->detail_selection)
@@ -374,12 +374,12 @@
   return view_->ExternalTargets();
 }
 
-bool Controller::CompareSwitcherItemsPriority(AbstractLauncherIcon* first,
-                                              AbstractLauncherIcon* second)
+bool Controller::CompareSwitcherItemsPriority(AbstractLauncherIcon::Ptr first,
+                                              AbstractLauncherIcon::Ptr second)
 {
-  if (first->Type() == second->Type())
+  if (first->GetIconType() == second->GetIconType())
     return first->SwitcherPriority() > second->SwitcherPriority();
-  return first->Type() < second->Type();
+  return first->GetIconType() < second->GetIconType();
 }
 
 void Controller::SelectFirstItem()
@@ -387,8 +387,8 @@
   if (!model_)
     return;
 
-  AbstractLauncherIcon* first  = model_->at(1);
-  AbstractLauncherIcon* second = model_->at(2);
+  AbstractLauncherIcon::Ptr first  = model_->at(1);
+  AbstractLauncherIcon::Ptr second = model_->at(2);
 
   if (!first)
   {
 
=== modified file 'plugins/unityshell/src/SwitcherController.h'
--- plugins/unityshell/src/SwitcherController.h	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/SwitcherController.h	2012-02-12 19:58:19 +0000
@@ -70,7 +70,7 @@
   nux::Property<bool> detail_on_timeout;
   nux::Property<int>  detail_timeout_length;
 
-  void Show(ShowMode show, SortMode sort, bool reverse, std::vector<launcher::AbstractLauncherIcon*> results);
+  void Show(ShowMode show, SortMode sort, bool reverse, std::vector<launcher::AbstractLauncherIcon::Ptr> results);
   void Hide(bool accept_state=true);
 
   bool Visible();
@@ -108,7 +108,7 @@
 
   void ConstructView();
 
-  void OnModelSelectionChanged(launcher::AbstractLauncherIcon *icon);
+  void OnModelSelectionChanged(launcher::AbstractLauncherIcon::Ptr icon);
 
   static void OnBackgroundUpdate(GVariant* data, Controller* self);
 
@@ -131,7 +131,7 @@
   static gboolean OnShowTimer(gpointer data);
   static gboolean OnDetailTimer(gpointer data);
 
-  static bool CompareSwitcherItemsPriority(launcher::AbstractLauncherIcon* first, launcher::AbstractLauncherIcon* second);
+  static bool CompareSwitcherItemsPriority(launcher::AbstractLauncherIcon::Ptr first, launcher::AbstractLauncherIcon::Ptr second);
 };
 
 }
 
=== modified file 'plugins/unityshell/src/SwitcherModel.cpp'
--- plugins/unityshell/src/SwitcherModel.cpp	2012-02-07 07:42:12 +0000
+++ plugins/unityshell/src/SwitcherModel.cpp	2012-02-12 19:58:19 +0000
@@ -30,7 +30,7 @@
 namespace switcher
 {
 
-SwitcherModel::SwitcherModel(std::vector<AbstractLauncherIcon*> icons)
+SwitcherModel::SwitcherModel(std::vector<AbstractLauncherIcon::Ptr> icons)
   : _inner(icons)
   , _index(0)
   , _last_index(0)
@@ -41,8 +41,7 @@
 
   for (auto icon : _inner)
   {
-    AddChild(icon);
-    icon->Reference();
+    AddChild(icon.GetPointer());
   }
 }
 
@@ -50,8 +49,7 @@
 {
   for (auto icon : _inner)
   {
-    RemoveChild(icon);
-    icon->UnReference();
+    RemoveChild(icon.GetPointer());
   }
 }
 
@@ -94,11 +92,11 @@
   return _inner.rend();
 }
 
-AbstractLauncherIcon*
+AbstractLauncherIcon::Ptr
 SwitcherModel::at(unsigned int index)
 {
   if ((int) index >= Size ())
-    return 0;
+    return AbstractLauncherIcon::Ptr();
   return _inner[index];
 }
 
@@ -108,7 +106,7 @@
   return _inner.size();
 }
 
-AbstractLauncherIcon*
+AbstractLauncherIcon::Ptr
 SwitcherModel::Selection()
 {
   return _inner.at(_index);
@@ -120,7 +118,7 @@
   return _index;
 }
 
-AbstractLauncherIcon*
+AbstractLauncherIcon::Ptr
 SwitcherModel::LastSelection()
 {
   return _inner.at(_last_index);
@@ -229,7 +227,7 @@
 }
 
 void
-SwitcherModel::Select(AbstractLauncherIcon* selection)
+SwitcherModel::Select(AbstractLauncherIcon::Ptr selection)
 {
   int i = 0;
   for (iterator it = begin(), e = end(); it != e; ++it)
 
=== modified file 'plugins/unityshell/src/SwitcherModel.h'
--- plugins/unityshell/src/SwitcherModel.h	2011-12-08 01:23:11 +0000
+++ plugins/unityshell/src/SwitcherModel.h	2012-02-12 19:58:19 +0000
@@ -41,7 +41,7 @@
 public:
   typedef boost::shared_ptr<SwitcherModel> Ptr;
 
-  typedef std::vector<launcher::AbstractLauncherIcon*> Base;
+  typedef std::vector<launcher::AbstractLauncherIcon::Ptr> Base;
   typedef Base::iterator iterator;
   typedef Base::reverse_iterator reverse_iterator;
 
@@ -52,7 +52,7 @@
   // Icons are owned externally and assumed valid for life of switcher.
   // When AbstractLauncherIcon is complete, it will be passed as a shared pointer and this
   // will no longer be a worry.
-  SwitcherModel(std::vector<launcher::AbstractLauncherIcon*> icons);
+  SwitcherModel(std::vector<launcher::AbstractLauncherIcon::Ptr> icons);
   virtual ~SwitcherModel();
 
   iterator begin();
@@ -61,14 +61,14 @@
   reverse_iterator rbegin();
   reverse_iterator rend();
 
-  launcher::AbstractLauncherIcon* at(unsigned int index);
+  launcher::AbstractLauncherIcon::Ptr at(unsigned int index);
 
   int Size();
 
-  launcher::AbstractLauncherIcon* Selection();
+  launcher::AbstractLauncherIcon::Ptr Selection();
   int SelectionIndex();
 
-  launcher::AbstractLauncherIcon* LastSelection();
+  launcher::AbstractLauncherIcon::Ptr LastSelection();
   int LastSelectionIndex();
 
   std::vector<Window> DetailXids ();
@@ -80,10 +80,10 @@
   void NextDetail();
   void PrevDetail();
 
-  void Select(launcher::AbstractLauncherIcon* selection);
+  void Select(launcher::AbstractLauncherIcon::Ptr selection);
   void Select(int index);
 
-  sigc::signal<void, launcher::AbstractLauncherIcon*> selection_changed;
+  sigc::signal<void, launcher::AbstractLauncherIcon::Ptr> selection_changed;
 
 protected:
   // Introspectable methods
 
=== modified file 'plugins/unityshell/src/SwitcherView.cpp'
--- plugins/unityshell/src/SwitcherView.cpp	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/SwitcherView.cpp	2012-02-12 19:58:19 +0000
@@ -172,7 +172,7 @@
   QueueDraw ();
 }
 
-void SwitcherView::OnSelectionChanged(AbstractLauncherIcon* selection)
+void SwitcherView::OnSelectionChanged(AbstractLauncherIcon::Ptr selection)
 {
   if (selection)
     text_view_->SetText(selection->tooltip_text().c_str());
@@ -185,10 +185,10 @@
   return model_;
 }
 
-RenderArg SwitcherView::CreateBaseArgForIcon(AbstractLauncherIcon* icon)
+RenderArg SwitcherView::CreateBaseArgForIcon(AbstractLauncherIcon::Ptr icon)
 {
   RenderArg arg;
-  arg.icon = icon;
+  arg.icon = icon.GetPointer();
   arg.alpha = 0.95f;
 
   // tells the renderer to render arrows by number
@@ -569,7 +569,7 @@
   std::list<RenderArg>::iterator it;
   for (it = last_args_.begin(); it != last_args_.end(); ++it)
   {
-    if (it->icon == model_->Selection())
+    if (model_->Selection() == it->icon)
     {
       int view_width = text_view_->GetBaseWidth();
       int start_x = it->render_center.x - view_width / 2;
 
=== modified file 'plugins/unityshell/src/SwitcherView.h'
--- plugins/unityshell/src/SwitcherView.h	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/SwitcherView.h	2012-02-12 19:58:19 +0000
@@ -88,9 +88,9 @@
 
   std::list<ui::RenderArg> RenderArgsFlat(nux::Geometry& background_geo, int selection, timespec const& current);
 
-  ui::RenderArg CreateBaseArgForIcon(launcher::AbstractLauncherIcon* icon);
+  ui::RenderArg CreateBaseArgForIcon(launcher::AbstractLauncherIcon::Ptr icon);
 private:
-  void OnSelectionChanged(launcher::AbstractLauncherIcon* selection);
+  void OnSelectionChanged(launcher::AbstractLauncherIcon::Ptr selection);
   void OnDetailSelectionChanged (bool detail);
   void OnDetailSelectionIndexChanged (unsigned int index);
 
 
=== modified file 'plugins/unityshell/src/unity-launcher-accessible.cpp'
--- plugins/unityshell/src/unity-launcher-accessible.cpp	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/unity-launcher-accessible.cpp	2012-02-12 19:58:19 +0000
@@ -64,8 +64,8 @@
 
 /* private */
 static void on_selection_change_cb(UnityLauncherAccessible* launcher_accessible);
-static void on_icon_added_cb(AbstractLauncherIcon* icon, UnityLauncherAccessible* self);
-static void on_icon_removed_cb(AbstractLauncherIcon* icon, UnityLauncherAccessible* self);
+static void on_icon_added_cb(AbstractLauncherIcon::Ptr icon, UnityLauncherAccessible* self);
+static void on_icon_removed_cb(AbstractLauncherIcon::Ptr icon, UnityLauncherAccessible* self);
 static void on_order_change_cb(UnityLauncherAccessible* self);
 static void update_children_index(UnityLauncherAccessible* self);
 
@@ -227,7 +227,7 @@
   it = launcher_model->begin();
   std::advance(it, i);
 
-  child = dynamic_cast<nux::Object*>(*it);
+  child = dynamic_cast<nux::Object*>((*it).GetPointer());
   child_accessible = unity_a11y_get_accessible(child);
 
   parent = atk_object_get_parent(child_accessible);
@@ -287,7 +287,7 @@
                                         gint i)
 {
   Launcher* launcher = NULL;
-  AbstractLauncherIcon* selected_icon = NULL;
+  AbstractLauncherIcon::Ptr selected_icon;
   nux::Object* nux_object = NULL;
   AtkObject* accessible_selected = NULL;
 
@@ -302,9 +302,9 @@
   launcher = dynamic_cast<Launcher*>(nux_object);
   selected_icon = launcher->GetSelectedMenuIcon();
 
-  if (selected_icon != 0)
+  if (selected_icon)
   {
-    accessible_selected = unity_a11y_get_accessible(selected_icon);
+    accessible_selected = unity_a11y_get_accessible(selected_icon.GetPointer());
     g_object_ref(accessible_selected);
   }
 
@@ -315,7 +315,7 @@
 unity_launcher_accessible_get_selection_count(AtkSelection* selection)
 {
   Launcher* launcher = NULL;
-  AbstractLauncherIcon* selected_icon = NULL;
+  AbstractLauncherIcon::Ptr selected_icon;
   nux::Object* nux_object = NULL;
 
   g_return_val_if_fail(UNITY_IS_LAUNCHER_ACCESSIBLE(selection), 0);
@@ -327,7 +327,7 @@
   launcher = dynamic_cast<Launcher*>(nux_object);
   selected_icon = launcher->GetSelectedMenuIcon();
 
-  if (selected_icon == 0)
+  if (!selected_icon)
     return 0;
   else
     return 1;
@@ -338,8 +338,8 @@
                                             gint i)
 {
   Launcher* launcher = NULL;
-  AbstractLauncherIcon* icon = NULL;
-  AbstractLauncherIcon* selected_icon = NULL;
+  AbstractLauncherIcon::Ptr icon;
+  AbstractLauncherIcon::Ptr selected_icon;
   LauncherModel* launcher_model = NULL;
   LauncherModel::iterator it;
   nux::Object* nux_object = NULL;
@@ -354,7 +354,7 @@
   launcher_model = launcher->GetModel();
   it = launcher_model->begin();
   std::advance(it, i);
-  icon = dynamic_cast<AbstractLauncherIcon*>(*it);
+  icon = *it;
 
   selected_icon = launcher->GetSelectedMenuIcon();
 
@@ -372,7 +372,7 @@
 
 
 static void
-on_icon_added_cb(AbstractLauncherIcon* icon,
+on_icon_added_cb(AbstractLauncherIcon::Ptr icon,
                  UnityLauncherAccessible* self)
 {
   AtkObject* icon_accessible = NULL;
@@ -385,7 +385,7 @@
   if (nux_object == NULL) /* state is defunct */
     return;
 
-  icon_accessible = unity_a11y_get_accessible(icon);
+  icon_accessible = unity_a11y_get_accessible(icon.GetPointer());
 
   update_children_index(self);
 
@@ -396,7 +396,7 @@
 }
 
 static void
-on_icon_removed_cb(AbstractLauncherIcon* icon,
+on_icon_removed_cb(AbstractLauncherIcon::Ptr icon,
                    UnityLauncherAccessible* self)
 {
   AtkObject* icon_accessible = NULL;
@@ -409,7 +409,7 @@
   if (nux_object == NULL) /* state is defunct */
     return;
 
-  icon_accessible = unity_a11y_get_accessible(icon);
+  icon_accessible = unity_a11y_get_accessible(icon.GetPointer());
 
   index = atk_object_get_index_in_parent(icon_accessible);
 
@@ -442,7 +442,7 @@
 
   for (it = launcher_model->begin(); it != launcher_model->end(); it++)
   {
-    child =  dynamic_cast<nux::Object*>(*it);
+    child =  dynamic_cast<nux::Object*>((*it).GetPointer());
     child_accessible = unity_a11y_get_accessible(child);
 
     unity_launcher_icon_accessible_set_index(UNITY_LAUNCHER_ICON_ACCESSIBLE(child_accessible),
 
=== modified file 'plugins/unityshell/src/unity-switcher-accessible.cpp'
--- plugins/unityshell/src/unity-switcher-accessible.cpp	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/unity-switcher-accessible.cpp	2012-02-12 19:58:19 +0000
@@ -64,7 +64,7 @@
 static gboolean   unity_switcher_accessible_check_pending_notification(NuxAreaAccessible* self);
 
 /* private */
-static void       on_selection_changed_cb(AbstractLauncherIcon* icon,
+static void       on_selection_changed_cb(AbstractLauncherIcon::Ptr icon,
                                           UnitySwitcherAccessible* switcher_accessible);
 static void       create_children(UnitySwitcherAccessible* self);
 
@@ -311,7 +311,7 @@
 {
   SwitcherView* switcher = NULL;
   SwitcherModel::Ptr switcher_model;
-  AbstractLauncherIcon* selected_icon = NULL;
+  AbstractLauncherIcon::Ptr selected_icon;
   nux::Object* nux_object = NULL;
 
   g_return_val_if_fail(UNITY_IS_SWITCHER_ACCESSIBLE(selection), 0);
@@ -325,7 +325,7 @@
 
   selected_icon = switcher_model->Selection();
 
-  if (selected_icon == 0)
+  if (!selected_icon)
     return 0;
   else
     return 1;
@@ -377,7 +377,7 @@
 
 /* private */
 static void
-on_selection_changed_cb(AbstractLauncherIcon* icon,
+on_selection_changed_cb(AbstractLauncherIcon::Ptr icon,
                         UnitySwitcherAccessible* switcher_accessible)
 {
   g_signal_emit_by_name(ATK_OBJECT(switcher_accessible), "selection-changed");
@@ -391,7 +391,7 @@
   SwitcherView* switcher = NULL;
   SwitcherModel::Ptr switcher_model;
   SwitcherModel::iterator it;
-  AbstractLauncherIcon* child = NULL;
+  AbstractLauncherIcon::Ptr child;
   AtkObject* child_accessible = NULL;
 
   nux_object = nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(self));
@@ -406,8 +406,8 @@
 
   for (it = switcher_model->begin(); it != switcher_model->end(); it++)
   {
-    child =  dynamic_cast<AbstractLauncherIcon*>(*it);
-    child_accessible = unity_launcher_icon_accessible_new(child);
+    child = *it;
+    child_accessible = unity_launcher_icon_accessible_new(child.GetPointer());
     atk_object_set_parent(child_accessible, ATK_OBJECT(self));
     self->priv->children = g_slist_append(self->priv->children,
                                           child_accessible);
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-02-12 05:21:59 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-02-12 19:58:19 +0000
@@ -1595,9 +1595,9 @@
 
   int show_monitor = (show_mode == switcher::ShowMode::CURRENT_VIEWPORT) ? device : -1;
 
-  std::vector<unity::launcher::AbstractLauncherIcon*> results = launcher_controller_->GetAltTabIcons(show_monitor);
+  auto results = launcher_controller_->GetAltTabIcons(show_monitor);
 
-  if (!(results.size() == 1 && results[0]->Type() == AbstractLauncherIcon::IconType::TYPE_BEGIN))
+  if (!(results.size() == 1 && results[0]->GetIconType() == AbstractLauncherIcon::IconType::TYPE_BEGIN))
     switcher_controller_->Show(show_mode, switcher::SortMode::FOCUS_ORDER, false, results);
 
   return true;
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-02-07 13:38:59 +0000
+++ tests/CMakeLists.txt	2012-02-12 19:58:19 +0000
@@ -123,6 +123,7 @@
                  test_grabhandle.cpp
                  test_unityshell_private.cpp
                  ${UNITY_SRC}/AbstractLauncherIcon.h
+                 ${UNITY_SRC}/AbstractLauncherIcon.cpp
                  ${UNITY_SRC}/AbstractShortcutHint.h
                  ${UNITY_SRC}/Animator.cpp
                  ${UNITY_SRC}/Animator.h
 
=== modified file 'tests/test_launcher_model.cpp'
--- tests/test_launcher_model.cpp	2012-01-29 21:50:37 +0000
+++ tests/test_launcher_model.cpp	2012-02-12 19:58:19 +0000
@@ -41,12 +41,12 @@
       icon_removed = false;
     }
 
-    void OnIconAdded (AbstractLauncherIcon* icon)
+    void OnIconAdded (AbstractLauncherIcon::Ptr icon)
     {
       icon_added = true;
     }
 
-    void OnIconRemoved (AbstractLauncherIcon* icon)
+    void OnIconRemoved (AbstractLauncherIcon::Ptr icon)
     {
       icon_removed = true;
     }
@@ -64,7 +64,7 @@
 
 TEST(TestLauncherModel, TestAdd)
 {
-  AbstractLauncherIcon* first  = new MockLauncherIcon();
+  AbstractLauncherIcon::Ptr first(new MockLauncherIcon());
   LauncherModel::Ptr model(new LauncherModel());
 
   EXPECT_EQ(model->Size(), 0);
@@ -74,7 +74,7 @@
 
 TEST(TestLauncherModel, TestRemove)
 {
-  AbstractLauncherIcon* first  = new MockLauncherIcon();
+  AbstractLauncherIcon::Ptr first(new MockLauncherIcon());
   LauncherModel::Ptr model(new LauncherModel());
 
   EXPECT_EQ(model->Size(), 0);
@@ -86,7 +86,7 @@
 
 TEST(TestLauncherModel, TestAddSignal)
 {
-  AbstractLauncherIcon* first  = new MockLauncherIcon();
+  AbstractLauncherIcon::Ptr first(new MockLauncherIcon());
   LauncherModel::Ptr model(new LauncherModel());
 
   EventListener *listener = new EventListener();
@@ -100,7 +100,7 @@
 
 TEST(TestLauncherModel, TestRemoveSignal)
 {
-  AbstractLauncherIcon* first  = new MockLauncherIcon();
+  AbstractLauncherIcon::Ptr first(new MockLauncherIcon());
   LauncherModel::Ptr model(new LauncherModel());
 
   EventListener *listener = new EventListener();
@@ -116,10 +116,10 @@
 
 TEST(TestLauncherModel, TestSort)
 {
-  AbstractLauncherIcon* first = new MockLauncherIcon();
-  AbstractLauncherIcon* second = new MockLauncherIcon();
-  AbstractLauncherIcon* third = new MockLauncherIcon();
-  AbstractLauncherIcon* fourth = new MockLauncherIcon();
+  AbstractLauncherIcon::Ptr first(new MockLauncherIcon());
+  AbstractLauncherIcon::Ptr second(new MockLauncherIcon());
+  AbstractLauncherIcon::Ptr third(new MockLauncherIcon());
+  AbstractLauncherIcon::Ptr fourth(new MockLauncherIcon());
 
   LauncherModel::Ptr model(new LauncherModel());
 
@@ -149,10 +149,10 @@
 
 TEST(TestLauncherModel, TestReorderBefore)
 {
-  AbstractLauncherIcon* first = new MockLauncherIcon();
-  AbstractLauncherIcon* second = new MockLauncherIcon();
-  AbstractLauncherIcon* third = new MockLauncherIcon();
-  AbstractLauncherIcon* fourth = new MockLauncherIcon();
+  AbstractLauncherIcon::Ptr first(new MockLauncherIcon());
+  AbstractLauncherIcon::Ptr second(new MockLauncherIcon());
+  AbstractLauncherIcon::Ptr third(new MockLauncherIcon());
+  AbstractLauncherIcon::Ptr fourth(new MockLauncherIcon());
 
   LauncherModel::Ptr model(new LauncherModel());
 
@@ -182,10 +182,10 @@
 
 TEST(TestLauncherModel, TestReorderSmart)
 {
-  AbstractLauncherIcon* first = new MockLauncherIcon();
-  AbstractLauncherIcon* second = new MockLauncherIcon();
-  AbstractLauncherIcon* third = new MockLauncherIcon();
-  AbstractLauncherIcon* fourth = new MockLauncherIcon();
+  AbstractLauncherIcon::Ptr first(new MockLauncherIcon());
+  AbstractLauncherIcon::Ptr second(new MockLauncherIcon());
+  AbstractLauncherIcon::Ptr third(new MockLauncherIcon());
+  AbstractLauncherIcon::Ptr fourth(new MockLauncherIcon());
 
   LauncherModel::Ptr model(new LauncherModel());