diff --git a/PocketSharp/PocketReader.cs b/PocketSharp/PocketReader.cs index f846ee7..6def6bc 100644 --- a/PocketSharp/PocketReader.cs +++ b/PocketSharp/PocketReader.cs @@ -1,4 +1,4 @@ -using NReadability; +using PocketSharp.Ports.NReadability; using System; using System.Net; using System.Net.Http; diff --git a/PocketSharp/PocketSharp.csproj b/PocketSharp/PocketSharp.csproj index 962b3a1..b8c8094 100644 --- a/PocketSharp/PocketSharp.csproj +++ b/PocketSharp/PocketSharp.csproj @@ -77,9 +77,6 @@ ..\packages\Microsoft.Bcl.Async.1.0.16\lib\portable-net40+sl4+win8+wp71\Microsoft.Threading.Tasks.Extensions.dll - - ..\packages\Newtonsoft.Json.5.0.6\lib\portable-net40+sl4+wp7+win8\Newtonsoft.Json.dll - ..\packages\Microsoft.Bcl.1.1.3\lib\portable-net40+sl4+win8+wp71\System.IO.dll diff --git a/PocketSharp/packages.config b/PocketSharp/packages.config index 4a510aa..d9fa510 100644 --- a/PocketSharp/packages.config +++ b/PocketSharp/packages.config @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/PortablePorts/NReadability/AttributeTransformationInput.cs b/PortablePorts/NReadability/AttributeTransformationInput.cs index 0467487..a08a7b6 100644 --- a/PortablePorts/NReadability/AttributeTransformationInput.cs +++ b/PortablePorts/NReadability/AttributeTransformationInput.cs @@ -1,6 +1,6 @@ using System.Xml.Linq; -namespace NReadability +namespace PocketSharp.Ports.NReadability { public class AttributeTransformationInput { diff --git a/PortablePorts/NReadability/AttributeTransformationResult.cs b/PortablePorts/NReadability/AttributeTransformationResult.cs index 17b6b84..69c8678 100644 --- a/PortablePorts/NReadability/AttributeTransformationResult.cs +++ b/PortablePorts/NReadability/AttributeTransformationResult.cs @@ -1,4 +1,4 @@ -namespace NReadability +namespace PocketSharp.Ports.NReadability { public class AttributeTransformationResult { diff --git a/PortablePorts/NReadability/ChildNodesTraverser.cs b/PortablePorts/NReadability/ChildNodesTraverser.cs index 5d6d966..238044f 100644 --- a/PortablePorts/NReadability/ChildNodesTraverser.cs +++ b/PortablePorts/NReadability/ChildNodesTraverser.cs @@ -21,7 +21,7 @@ using System; using System.Xml.Linq; -namespace NReadability +namespace PocketSharp.Ports.NReadability { internal class ChildNodesTraverser { diff --git a/PortablePorts/NReadability/Consts.cs b/PortablePorts/NReadability/Consts.cs index b2b1eb8..12d99b7 100644 --- a/PortablePorts/NReadability/Consts.cs +++ b/PortablePorts/NReadability/Consts.cs @@ -1,6 +1,6 @@ using System.Reflection; -namespace NReadability +namespace PocketSharp.Ports.NReadability { public static class Consts { diff --git a/PortablePorts/NReadability/DomExtensions.cs b/PortablePorts/NReadability/DomExtensions.cs index 1df86b9..d28ea46 100644 --- a/PortablePorts/NReadability/DomExtensions.cs +++ b/PortablePorts/NReadability/DomExtensions.cs @@ -24,7 +24,7 @@ using System.Linq; using System.Text; using System.Xml.Linq; -namespace NReadability +namespace PocketSharp.Ports.NReadability { public static class DomExtensions { diff --git a/PortablePorts/NReadability/DomSerializationParams.cs b/PortablePorts/NReadability/DomSerializationParams.cs index 87d8a26..9f66b1a 100644 --- a/PortablePorts/NReadability/DomSerializationParams.cs +++ b/PortablePorts/NReadability/DomSerializationParams.cs @@ -1,6 +1,6 @@ using System; -namespace NReadability +namespace PocketSharp.Ports.NReadability { public class DomSerializationParams { diff --git a/PortablePorts/NReadability/ElementsTraverser.cs b/PortablePorts/NReadability/ElementsTraverser.cs index c4e7fbf..56db197 100644 --- a/PortablePorts/NReadability/ElementsTraverser.cs +++ b/PortablePorts/NReadability/ElementsTraverser.cs @@ -21,7 +21,7 @@ using System; using System.Xml.Linq; -namespace NReadability +namespace PocketSharp.Ports.NReadability { public class ElementsTraverser { diff --git a/PortablePorts/NReadability/EncodedStringWriter.cs b/PortablePorts/NReadability/EncodedStringWriter.cs index 92df082..25dcffc 100644 --- a/PortablePorts/NReadability/EncodedStringWriter.cs +++ b/PortablePorts/NReadability/EncodedStringWriter.cs @@ -22,7 +22,7 @@ using System; using System.IO; using System.Text; -namespace NReadability +namespace PocketSharp.Ports.NReadability { internal class EncodedStringWriter : StringWriter { diff --git a/PortablePorts/NReadability/EnumerableExtensions.cs b/PortablePorts/NReadability/EnumerableExtensions.cs index e869d38..d6abefb 100644 --- a/PortablePorts/NReadability/EnumerableExtensions.cs +++ b/PortablePorts/NReadability/EnumerableExtensions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace NReadability +namespace PocketSharp.Ports.NReadability { public static class EnumerableExtensions { diff --git a/PortablePorts/NReadability/Enums.cs b/PortablePorts/NReadability/Enums.cs index 1e18bf4..72f0aba 100644 --- a/PortablePorts/NReadability/Enums.cs +++ b/PortablePorts/NReadability/Enums.cs @@ -18,7 +18,7 @@ * limitations under the License. */ -namespace NReadability +namespace PocketSharp.Ports.NReadability { /// /// Determines how the extracted article will be styled. diff --git a/PortablePorts/NReadability/HtmlUtils.cs b/PortablePorts/NReadability/HtmlUtils.cs index 0e4b8e2..19ffb7f 100644 --- a/PortablePorts/NReadability/HtmlUtils.cs +++ b/PortablePorts/NReadability/HtmlUtils.cs @@ -1,6 +1,6 @@ using System; -namespace NReadability +namespace PocketSharp.Ports.NReadability { public static class HtmlUtils { diff --git a/PortablePorts/NReadability/InternalErrorException.cs b/PortablePorts/NReadability/InternalErrorException.cs index 53cdefa..cb55a3e 100644 --- a/PortablePorts/NReadability/InternalErrorException.cs +++ b/PortablePorts/NReadability/InternalErrorException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace NReadability +namespace PocketSharp.Ports.NReadability { /// /// An exception that is thrown when an internal error occurrs in the application. diff --git a/PortablePorts/NReadability/NReadabilityTranscoder.cs b/PortablePorts/NReadability/NReadabilityTranscoder.cs index 130a18a..1d14d3f 100644 --- a/PortablePorts/NReadability/NReadabilityTranscoder.cs +++ b/PortablePorts/NReadability/NReadabilityTranscoder.cs @@ -28,7 +28,7 @@ using System.Reflection; using System.Xml; using System.Xml.Linq; -namespace NReadability +namespace PocketSharp.Ports.NReadability { /// /// A class that extracts main content from a HTML page. diff --git a/PortablePorts/NReadability/SgmlDomBuilder.cs b/PortablePorts/NReadability/SgmlDomBuilder.cs index d826667..7df0b69 100644 --- a/PortablePorts/NReadability/SgmlDomBuilder.cs +++ b/PortablePorts/NReadability/SgmlDomBuilder.cs @@ -23,10 +23,10 @@ using System.Text; using System.Text.RegularExpressions; using System.Xml; using System.Xml.Linq; -using Sgml; +using PocketSharp.Ports.Sgml; using System.IO; -namespace NReadability +namespace PocketSharp.Ports.NReadability { /// /// A class for constructing a DOM from HTML markup. diff --git a/PortablePorts/NReadability/SgmlDomSerializer.cs b/PortablePorts/NReadability/SgmlDomSerializer.cs index 10308e7..7a075a8 100644 --- a/PortablePorts/NReadability/SgmlDomSerializer.cs +++ b/PortablePorts/NReadability/SgmlDomSerializer.cs @@ -22,7 +22,7 @@ using System; using System.Linq; using System.Xml.Linq; -namespace NReadability +namespace PocketSharp.Ports.NReadability { /// /// A class for serializing a DOM to string. diff --git a/PortablePorts/NReadability/TranscodingInput.cs b/PortablePorts/NReadability/TranscodingInput.cs index 3d999b8..82c2b9e 100644 --- a/PortablePorts/NReadability/TranscodingInput.cs +++ b/PortablePorts/NReadability/TranscodingInput.cs @@ -1,6 +1,6 @@ using System; -namespace NReadability +namespace PocketSharp.Ports.NReadability { public class TranscodingInput { diff --git a/PortablePorts/NReadability/TranscodingResult.cs b/PortablePorts/NReadability/TranscodingResult.cs index 15d06bd..0b98c4d 100644 --- a/PortablePorts/NReadability/TranscodingResult.cs +++ b/PortablePorts/NReadability/TranscodingResult.cs @@ -1,5 +1,7 @@ +using System; using System.Xml.Linq; -namespace NReadability + +namespace PocketSharp.Ports.NReadability { public class TranscodingResult { diff --git a/PortablePorts/NReadability/UtilityExtensions.cs b/PortablePorts/NReadability/UtilityExtensions.cs index 18ed14e..e071568 100644 --- a/PortablePorts/NReadability/UtilityExtensions.cs +++ b/PortablePorts/NReadability/UtilityExtensions.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; -namespace NReadability +namespace PocketSharp.Ports.NReadability { internal static class UtilityExtensions { diff --git a/PortablePorts/NReadability/WebTranscodingInput.cs b/PortablePorts/NReadability/WebTranscodingInput.cs index 945e03d..20b8b74 100644 --- a/PortablePorts/NReadability/WebTranscodingInput.cs +++ b/PortablePorts/NReadability/WebTranscodingInput.cs @@ -1,6 +1,6 @@ using System; -namespace NReadability +namespace PocketSharp.Ports.NReadability { public class WebTranscodingInput { diff --git a/PortablePorts/NReadability/WebTranscodingResult.cs b/PortablePorts/NReadability/WebTranscodingResult.cs index b1f964d..3a5cb1b 100644 --- a/PortablePorts/NReadability/WebTranscodingResult.cs +++ b/PortablePorts/NReadability/WebTranscodingResult.cs @@ -1,4 +1,4 @@ -namespace NReadability +namespace PocketSharp.Ports.NReadability { public class WebTranscodingResult { diff --git a/PortablePorts/SgmlReader/SgmlParser.cs b/PortablePorts/SgmlReader/SgmlParser.cs index 1daf38d..906d411 100644 --- a/PortablePorts/SgmlReader/SgmlParser.cs +++ b/PortablePorts/SgmlReader/SgmlParser.cs @@ -31,7 +31,7 @@ using System.Text; using System.Threading; using System.Xml; -namespace Sgml { +namespace PocketSharp.Ports.Sgml { /// /// Thrown if any errors occur while parsing the source. /// diff --git a/PortablePorts/SgmlReader/SgmlReader.cs b/PortablePorts/SgmlReader/SgmlReader.cs index 1039e64..f6b9082 100644 --- a/PortablePorts/SgmlReader/SgmlReader.cs +++ b/PortablePorts/SgmlReader/SgmlReader.cs @@ -40,7 +40,7 @@ using System.Reflection; using System.Text; using System.Xml; -namespace Sgml +namespace PocketSharp.Ports.Sgml { /// /// SGML is case insensitive, so here you can choose between converting