diff --git a/Source/Collections/IMultiDictionary.cs b/Source/Collections/IMultiDictionary.cs index db377d4..562a7ff 100644 --- a/Source/Collections/IMultiDictionary.cs +++ b/Source/Collections/IMultiDictionary.cs @@ -31,11 +31,7 @@ namespace Nuclex.Support.Collections { /// Type of values stored in the dictionary public interface IMultiDictionary : IDictionary>, -#if WINRT - ICollection, -#else IDictionary, -#endif ICollection>, IEnumerable>, IEnumerable { diff --git a/Source/Collections/MultiDictionary.Interfaces.cs b/Source/Collections/MultiDictionary.Interfaces.cs index 512c61c..b37c6ac 100644 --- a/Source/Collections/MultiDictionary.Interfaces.cs +++ b/Source/Collections/MultiDictionary.Interfaces.cs @@ -38,8 +38,6 @@ namespace Nuclex.Support.Collections { #region IDictionary implementation -#if !WINRT - /// Adds an item into the dictionary /// Key under which the item will be added /// Item that will be added @@ -89,22 +87,16 @@ namespace Nuclex.Support.Collections { set { this[(TKey)key] = (ICollection)value; } } -#endif // !WINRT - #endregion #region IDictionaryEnumerator implementation -#if !WINRT - /// Returns a new entry enumerator for the dictionary /// The new entry enumerator IDictionaryEnumerator IDictionary.GetEnumerator() { return new Enumerator(this); } -#endif // !WINRT - #endregion // IDictionaryEnumerator implementation #region ICollection> implementation diff --git a/Source/Collections/MultiDictionary.cs b/Source/Collections/MultiDictionary.cs index 5073147..98dcd1e 100644 --- a/Source/Collections/MultiDictionary.cs +++ b/Source/Collections/MultiDictionary.cs @@ -34,9 +34,7 @@ namespace Nuclex.Support.Collections { /// Enumerates the values stored in a multi dictionary private class Enumerator : -#if !WINRT IDictionaryEnumerator, -#endif IEnumerator> { /// Initializes a new multi dictionary enumerator @@ -128,8 +126,6 @@ namespace Nuclex.Support.Collections { #region IDictionaryEnumerator implementation -#if !WINRT - /// The current entry the enumerator is pointing to DictionaryEntry IDictionaryEnumerator.Entry { get { @@ -157,8 +153,6 @@ namespace Nuclex.Support.Collections { } } -#endif // !WINRT - #endregion // IDictionaryEnumerator implementation /// @@ -227,9 +221,7 @@ namespace Nuclex.Support.Collections { /// Dictionary the multi dictionary will be based on internal MultiDictionary(IDictionary> dictionary) { this.typedDictionary = dictionary; -#if !WINRT this.objectDictionary = (this.typedDictionary as IDictionary); -#endif foreach(ICollection values in dictionary.Values) { this.count += values.Count; @@ -411,10 +403,8 @@ namespace Nuclex.Support.Collections { /// The wrapped Dictionary under its type-safe interface private IDictionary> typedDictionary; -#if !WINRT /// The wrapped Dictionary under its object interface private IDictionary objectDictionary; -#endif /// The number of items currently in the multi dictionary private int count; /// Provides the values stores in the dictionary in sequence diff --git a/Source/Collections/ObservableDictionary.cs b/Source/Collections/ObservableDictionary.cs index 21bcd47..9987f17 100644 --- a/Source/Collections/ObservableDictionary.cs +++ b/Source/Collections/ObservableDictionary.cs @@ -40,11 +40,7 @@ namespace Nuclex.Support.Collections { IDeserializationCallback, #endif IDictionary, -#if WINRT - ICollection, -#else IDictionary, -#endif #if !NO_SPECIALIZED_COLLECTIONS INotifyCollectionChanged, #endif @@ -333,8 +329,6 @@ namespace Nuclex.Support.Collections { #region IDictionary implementation -#if !WINRT - /// Adds an item into the Dictionary /// Key under which the item will be added /// Item that will be added @@ -395,22 +389,16 @@ namespace Nuclex.Support.Collections { } } -#endif // !WINRT - #endregion // IDictionary implementation #region IDictionaryEnumerator implementation -#if !WINRT - /// Returns a new entry enumerator for the dictionary /// The new entry enumerator IDictionaryEnumerator IDictionary.GetEnumerator() { return this.objectDictionary.GetEnumerator(); } -#endif // !WINRT - #endregion // IDictionaryEnumerator implementation #region ICollection<> implementation @@ -493,10 +481,8 @@ namespace Nuclex.Support.Collections { /// The wrapped Dictionary under its type-safe interface private IDictionary typedDictionary; -#if !WINRT /// The wrapped Dictionary under its object interface private IDictionary objectDictionary; -#endif } diff --git a/Source/Collections/ReadOnlyDictionary.cs b/Source/Collections/ReadOnlyDictionary.cs index 2992a27..ecd8ff6 100644 --- a/Source/Collections/ReadOnlyDictionary.cs +++ b/Source/Collections/ReadOnlyDictionary.cs @@ -102,7 +102,6 @@ namespace Nuclex.Support.Collections { this.objectDictionary = (this.typedDictionary as IDictionary); } - /// Whether the directory is write-protected public bool IsReadOnly { get { return true; } @@ -237,8 +236,6 @@ namespace Nuclex.Support.Collections { #region IDictionary implementation -#if !WINRT - /// Removes all items from the Dictionary void IDictionary.Clear() { throw new NotSupportedException( @@ -313,22 +310,16 @@ namespace Nuclex.Support.Collections { } } -#endif // !WINRT - #endregion // IDictionary implementation #region IDictionaryEnumerator implementation -#if !WINRT - /// Returns a new entry enumerator for the dictionary /// The new entry enumerator IDictionaryEnumerator IDictionary.GetEnumerator() { return this.objectDictionary.GetEnumerator(); } -#endif // !WINRT - #endregion // IDictionaryEnumerator implementation #region ICollection<> implementation @@ -410,10 +401,8 @@ namespace Nuclex.Support.Collections { /// The wrapped Dictionary under its type-safe interface private IDictionary typedDictionary; -#if !WINRT /// The wrapped Dictionary under its object interface private IDictionary objectDictionary; -#endif /// ReadOnly wrapper for the keys collection of the Dictionary private ReadOnlyCollection readonlyKeyCollection; /// ReadOnly wrapper for the values collection of the Dictionary