From 2d6d136418014b70ee0d939d1b9a3e7eaf9a93b2 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 30 Jul 2015 18:46:45 +0200
Subject: [PATCH] Moved INamed to Perspex.Styling.

---
 Perspex.Controls/Perspex.Controls.csproj                | 1 -
 Perspex.Controls/Presenters/IPresenter.cs               | 2 +-
 Perspex.Styling/Perspex.Styling.csproj                  | 1 +
 {Perspex.Controls => Perspex.Styling/Styling}/INamed.cs | 2 +-
 Perspex.Styling/Styling/IStyleable.cs                   | 7 +------
 5 files changed, 4 insertions(+), 9 deletions(-)
 rename {Perspex.Controls => Perspex.Styling/Styling}/INamed.cs (93%)

diff --git a/Perspex.Controls/Perspex.Controls.csproj b/Perspex.Controls/Perspex.Controls.csproj
index 4e28263fed..907abbdef2 100644
--- a/Perspex.Controls/Perspex.Controls.csproj
+++ b/Perspex.Controls/Perspex.Controls.csproj
@@ -53,7 +53,6 @@
     <Compile Include="DropDown.cs" />
     <Compile Include="IContentControl.cs" />
     <Compile Include="IReparentingControl.cs" />
-    <Compile Include="INamed.cs" />
     <Compile Include="INavigablePanel.cs" />
     <Compile Include="Deck.cs" />
     <Compile Include="Platform\IPopupImpl.cs" />
diff --git a/Perspex.Controls/Presenters/IPresenter.cs b/Perspex.Controls/Presenters/IPresenter.cs
index ddc3d39589..1638ce8f13 100644
--- a/Perspex.Controls/Presenters/IPresenter.cs
+++ b/Perspex.Controls/Presenters/IPresenter.cs
@@ -6,7 +6,7 @@
 
 namespace Perspex.Controls.Presenters
 {
-    using Perspex.Controls.Primitives;
+    using Perspex.Styling;
 
     /// <summary>
     /// Interface for presenters such as <see cref="ContentPresenter"/> and
diff --git a/Perspex.Styling/Perspex.Styling.csproj b/Perspex.Styling/Perspex.Styling.csproj
index b1e7937084..998efd32ef 100644
--- a/Perspex.Styling/Perspex.Styling.csproj
+++ b/Perspex.Styling/Perspex.Styling.csproj
@@ -42,6 +42,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Styling\Classes.cs" />
     <Compile Include="Styling\IGlobalStyles.cs" />
+    <Compile Include="Styling\INamed.cs" />
     <Compile Include="Styling\IStyle.cs" />
     <Compile Include="Styling\IStyleable.cs" />
     <Compile Include="Styling\IStyleHost.cs" />
diff --git a/Perspex.Controls/INamed.cs b/Perspex.Styling/Styling/INamed.cs
similarity index 93%
rename from Perspex.Controls/INamed.cs
rename to Perspex.Styling/Styling/INamed.cs
index 579c731f5f..07bac0f0a2 100644
--- a/Perspex.Controls/INamed.cs
+++ b/Perspex.Styling/Styling/INamed.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Controls
+namespace Perspex.Styling
 {
     public interface INamed
     {
diff --git a/Perspex.Styling/Styling/IStyleable.cs b/Perspex.Styling/Styling/IStyleable.cs
index 007b4cbd3e..742ce3a4ad 100644
--- a/Perspex.Styling/Styling/IStyleable.cs
+++ b/Perspex.Styling/Styling/IStyleable.cs
@@ -11,18 +11,13 @@ namespace Perspex.Styling
     /// <summary>
     /// Interface for styleable elements.
     /// </summary>
-    public interface IStyleable : IObservablePropertyBag
+    public interface IStyleable : IObservablePropertyBag, INamed
     {
         /// <summary>
         /// Gets the list of classes for the control.
         /// </summary>
         Classes Classes { get; }
 
-        /// <summary>
-        /// Gets the ID of the control.
-        /// </summary>
-        string Name { get; }
-
         /// <summary>
         /// Gets the type by which the control is styled.
         /// </summary>