Removes several instances of 'friend' classes in unity where they're not strictly required.. Fixes: . Approved by Jason Smith.

(bzr r1924)

2 files changed, 7 insertions, 12 deletions

diff --git a/plugins/unityshell/src/LauncherEntryRemote.h b/plugins/unityshell/src/LauncherEntryRemote.h
index c66e82648..1adede076 100644
--- a/plugins/unityshell/src/LauncherEntryRemote.h
+++ b/plugins/unityshell/src/LauncherEntryRemote.h
@@ -52,6 +52,12 @@ public:
 gboolean CountVisible();
 gboolean ProgressVisible();
 gboolean Urgent();
+ /// Update this instance using details from another:
+ void Update(LauncherEntryRemote* other);
+ /// Update this instance from a GVariant property iterator.
+ void Update(GVariantIter* prop_iter);
+ /// Set a new DBus name. This destroys the current quicklist.
+ void SetDBusName(const gchar* dbus_name);
 
 sigc::signal<void, LauncherEntryRemote*, const gchar* > dbus_name_changed; // gives the old name as arg
 sigc::signal<void, LauncherEntryRemote*> emblem_changed;
@@ -81,23 +87,15 @@ private:
 gboolean _progress_visible;
 gboolean _urgent;
 
- void SetDBusName(const gchar* dbus_name);
 void SetEmblem(const gchar* emblem);
 void SetCount(gint64 count);
 void SetProgress(gdouble progress);
 void SetQuicklistPath(const gchar* dbus_path);
 void SetQuicklist(DbusmenuClient* quicklist);
-
 void SetEmblemVisible(gboolean visible);
 void SetCountVisible(gboolean visible);
 void SetProgressVisible(gboolean visible);
-
 void SetUrgent(gboolean urgent);
-
- void Update(LauncherEntryRemote* other);
- void Update(GVariantIter* prop_iter);
-
- friend class LauncherEntryRemoteModel;
 };
 
 #endif // LAUNCHER_ENTRY_REMOTE_H
diff --git a/plugins/unityshell/src/LauncherIcon.h b/plugins/unityshell/src/LauncherIcon.h
index 235948991..0155f2325 100644
--- a/plugins/unityshell/src/LauncherIcon.h
+++ b/plugins/unityshell/src/LauncherIcon.h
@@ -271,9 +271,6 @@ protected:
 
 DbusmenuClient* _menuclient_dynamic_quicklist;
 
- friend class Launcher;
- friend class LauncherModel;
-
 private:
 typedef struct
 {
@@ -301,7 +298,7 @@ private:
 int _last_monitor;
 nux::Color _background_color;
 nux::Color _glow_color;
- 
+
 gint64 _shortcut;
 
 std::vector<nux::Point3> _center;