Removed DefaultHandler typedef

Removed DefaultHandler typedef. JSON::Parser is now default constructed with built-in parsing handler (i.e. without requirement that user explicitly provides handler). Handler is now a SharedPtr so old code with handler on the stack would cause undefined behavior, hence best to break it now in development release ... apologies to anyone affected.
2025-04-15 06:35:25 +02:00 · 2013-03-28 22:18:57 -05:00 · 2013-03-28 22:18:57 -05:00 · 0d79572848
commit 0d79572848
parent 579842bce4
15 changed files with 85 additions and 169 deletions
--- a/3
+++ b/3
@ -25,8 +25,7 @@ Release 1.5.2 (2013-03-??)
 - fixed GH #124: Possible buffer overrun in Foundation/EventLogChannel
 - fixed GH #119: JSON::Object holds values in ordered map
 - added JSON::PrintHandler
- renamed JSON::DefaultHandler to ParseHandler
- redefined JSON::DefaultHandler as typedef to ParseHandler
+- renamed JSON::DefaultHandler to ParseHandler (breaking change!)
 - fixed GH #127: Eliminate -Wshadow warnings
 - fixed GH #79: Poco::Thread leak on Linux
 - fixed GH #61: static_md build configs for Crypto and NetSSL
--- a/JSON/JSON_CE_vs90.vcproj
+++ b/JSON/JSON_CE_vs90.vcproj
@ -457,8 +457,6 @@
 			Name="Header Files">
 			<File
 				RelativePath=".\include\Poco\JSON\Array.h"/>
-			<File
-				RelativePath=".\include\Poco\JSON\DefaultHandler.h"/>
 			<File
 				RelativePath=".\include\Poco\JSON\Handler.h"/>
 			<File
--- a/JSON/JSON_vs100.vcxproj
+++ b/JSON/JSON_vs100.vcxproj
@ -268,7 +268,6 @@
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="include\Poco\JSON\Array.h" />
-    <ClInclude Include="include\Poco\JSON\DefaultHandler.h" />
    <ClInclude Include="include\Poco\JSON\Handler.h" />
    <ClInclude Include="include\Poco\JSON\JSON.h" />
    <ClInclude Include="include\Poco\JSON\JSONException.h" />
--- a/JSON/JSON_vs100.vcxproj.filters
+++ b/JSON/JSON_vs100.vcxproj.filters
@ -12,9 +12,6 @@
    <ClInclude Include="include\Poco\JSON\Array.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="include\Poco\JSON\DefaultHandler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="include\Poco\JSON\Handler.h">
      <Filter>Header Files</Filter>
    </ClInclude>
--- a/JSON/JSON_vs110.vcxproj
+++ b/JSON/JSON_vs110.vcxproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="debug_shared|Win32">
@ -32,82 +32,82 @@
    <RootNamespace>JSON</RootNamespace>
    <Keyword>Win32Proj</Keyword>
  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;" Label="Configuration">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v110</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v110</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v110</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v110</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v110</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v110</PlatformToolset>
  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
-  <ImportGroup Label="ExtensionSettings"/>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;" Label="PropertySheets">
-    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
  </ImportGroup>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;" Label="PropertySheets">
-    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
  </ImportGroup>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;" Label="PropertySheets">
-    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
  </ImportGroup>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;" Label="PropertySheets">
-    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
  </ImportGroup>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;" Label="PropertySheets">
-    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
  </ImportGroup>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;" Label="PropertySheets">
-    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
  </ImportGroup>
-  <PropertyGroup Label="UserMacros"/>
+  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">..\bin\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">true</LinkIncremental>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">..\bin\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">false</LinkIncremental>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">..\lib\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">obj\$(Configuration)\</IntDir>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">..\lib\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">obj\$(Configuration)\</IntDir>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">..\lib\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">obj\$(Configuration)\</IntDir>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">..\lib\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">obj\$(Configuration)\</IntDir>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">PocoJSONd</TargetName>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">PocoJSONmdd</TargetName>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">PocoJSONmtd</TargetName>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">PocoJSON</TargetName>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">PocoJSONmd</TargetName>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">PocoJSONmt</TargetName>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">..\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">..\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">obj\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoJSONd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoJSONmdd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoJSONmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoJSON</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoJSONmd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoJSONmt</TargetName>
  </PropertyGroup>
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -120,7 +120,7 @@
      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
@ -138,7 +138,7 @@
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@ -153,9 +153,9 @@
      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
      <CompileAs>Default</CompileAs>
      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
    </ClCompile>
@ -172,7 +172,7 @@
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -185,7 +185,7 @@
      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
      <ProgramDataBaseFileName>..\lib\PocoJSONmtd.pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@ -196,7 +196,7 @@
      <OutputFile>..\lib\PocoJSONmtd.lib</OutputFile>
    </Lib>
  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@ -211,9 +211,9 @@
      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
      <CompileAs>Default</CompileAs>
      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
    </ClCompile>
@ -221,7 +221,7 @@
      <OutputFile>..\lib\PocoJSONmt.lib</OutputFile>
    </Lib>
  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -234,7 +234,7 @@
      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
      <ProgramDataBaseFileName>..\lib\PocoJSONmdd.pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@ -245,7 +245,7 @@
      <OutputFile>..\lib\PocoJSONmdd.lib</OutputFile>
    </Lib>
  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@ -260,10 +260,10 @@
      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader/>
+      <PrecompiledHeader />
      <ProgramDataBaseFileName>..\lib\PocoJSONmd.pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat/>
+      <DebugInformationFormat />
      <CompileAs>Default</CompileAs>
      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
    </ClCompile>
@ -273,33 +273,32 @@
    </Lib>
  </ItemDefinitionGroup>
  <ItemGroup>
-    <ClCompile Include="src\Array.cpp"/>
-    <ClCompile Include="src\ParseHandler.cpp"/>
-    <ClCompile Include="src\Handler.cpp"/>
-    <ClCompile Include="src\JSONException.cpp"/>
-    <ClCompile Include="src\Object.cpp"/>
-    <ClCompile Include="src\Parser.cpp"/>
-    <ClCompile Include="src\PrintHandler.cpp"/>
-    <ClCompile Include="src\Query.cpp"/>
-    <ClCompile Include="src\Stringifier.cpp"/>
-    <ClCompile Include="src\Template.cpp"/>
-    <ClCompile Include="src\TemplateCache.cpp"/>
+    <ClCompile Include="src\Array.cpp" />
+    <ClCompile Include="src\ParseHandler.cpp" />
+    <ClCompile Include="src\Handler.cpp" />
+    <ClCompile Include="src\JSONException.cpp" />
+    <ClCompile Include="src\Object.cpp" />
+    <ClCompile Include="src\Parser.cpp" />
+    <ClCompile Include="src\PrintHandler.cpp" />
+    <ClCompile Include="src\Query.cpp" />
+    <ClCompile Include="src\Stringifier.cpp" />
+    <ClCompile Include="src\Template.cpp" />
+    <ClCompile Include="src\TemplateCache.cpp" />
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="include\Poco\JSON\Array.h"/>
-    <ClInclude Include="include\Poco\JSON\DefaultHandler.h"/>
-    <ClInclude Include="include\Poco\JSON\Handler.h"/>
-    <ClInclude Include="include\Poco\JSON\JSON.h"/>
-    <ClInclude Include="include\Poco\JSON\JSONException.h"/>
-    <ClInclude Include="include\Poco\JSON\Object.h"/>
-    <ClInclude Include="include\Poco\JSON\Parser.h"/>
-    <ClInclude Include="include\Poco\JSON\ParseHandler.h"/>
-    <ClInclude Include="include\Poco\JSON\PrintHandler.h"/>
-    <ClInclude Include="include\Poco\JSON\Query.h"/>
-    <ClInclude Include="include\Poco\JSON\Stringifier.h"/>
-    <ClInclude Include="include\Poco\JSON\Template.h"/>
-    <ClInclude Include="include\Poco\JSON\TemplateCache.h"/>
+    <ClInclude Include="include\Poco\JSON\Array.h" />
+    <ClInclude Include="include\Poco\JSON\Handler.h" />
+    <ClInclude Include="include\Poco\JSON\JSON.h" />
+    <ClInclude Include="include\Poco\JSON\JSONException.h" />
+    <ClInclude Include="include\Poco\JSON\Object.h" />
+    <ClInclude Include="include\Poco\JSON\Parser.h" />
+    <ClInclude Include="include\Poco\JSON\ParseHandler.h" />
+    <ClInclude Include="include\Poco\JSON\PrintHandler.h" />
+    <ClInclude Include="include\Poco\JSON\Query.h" />
+    <ClInclude Include="include\Poco\JSON\Stringifier.h" />
+    <ClInclude Include="include\Poco\JSON\Template.h" />
+    <ClInclude Include="include\Poco\JSON\TemplateCache.h" />
  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
-  <ImportGroup Label="ExtensionTargets"/>
-</Project>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets" />
+</Project>
--- a/JSON/JSON_vs110.vcxproj.filters
+++ b/JSON/JSON_vs110.vcxproj.filters
@ -47,9 +47,6 @@
    <ClInclude Include="include\Poco\JSON\Array.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="include\Poco\JSON\DefaultHandler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="include\Poco\JSON\Handler.h">
      <Filter>Header Files</Filter>
    </ClInclude>
--- a/JSON/JSON_vs71.vcproj
+++ b/JSON/JSON_vs71.vcproj
@ -389,8 +389,6 @@
 			Name="Header Files">
 			<File
 				RelativePath=".\include\Poco\JSON\Array.h"/>
-			<File
-				RelativePath=".\include\Poco\JSON\DefaultHandler.h"/>
 			<File
 				RelativePath=".\include\Poco\JSON\Handler.h"/>
 			<File
--- a/JSON/JSON_vs80.vcproj
+++ b/JSON/JSON_vs80.vcproj
@ -410,8 +410,6 @@
 			Name="Header Files">
 			<File
 				RelativePath=".\include\Poco\JSON\Array.h"/>
-			<File
-				RelativePath=".\include\Poco\JSON\DefaultHandler.h"/>
 			<File
 				RelativePath=".\include\Poco\JSON\Handler.h"/>
 			<File
--- a/JSON/JSON_vs90.vcproj
+++ b/JSON/JSON_vs90.vcproj
@ -409,8 +409,6 @@
 			Name="Header Files">
 			<File
 				RelativePath=".\include\Poco\JSON\Array.h"/>
-			<File
-				RelativePath=".\include\Poco\JSON\DefaultHandler.h"/>
 			<File
 				RelativePath=".\include\Poco\JSON\Handler.h"/>
 			<File
--- a/JSON/JSON_x64_vs100.vcxproj
+++ b/JSON/JSON_x64_vs100.vcxproj
@ -285,7 +285,6 @@
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="include\Poco\JSON\Array.h"/>
-    <ClInclude Include="include\Poco\JSON\DefaultHandler.h"/>
    <ClInclude Include="include\Poco\JSON\Handler.h"/>
    <ClInclude Include="include\Poco\JSON\JSON.h"/>
    <ClInclude Include="include\Poco\JSON\JSONException.h"/>
--- a/JSON/JSON_x64_vs100.vcxproj.filters
+++ b/JSON/JSON_x64_vs100.vcxproj.filters
@ -47,9 +47,6 @@
    <ClInclude Include="include\Poco\JSON\Array.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="include\Poco\JSON\DefaultHandler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="include\Poco\JSON\Handler.h">
      <Filter>Header Files</Filter>
    </ClInclude>
--- a/JSON/JSON_x64_vs110.vcxproj
+++ b/JSON/JSON_x64_vs110.vcxproj
@ -285,7 +285,6 @@
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="include\Poco\JSON\Array.h"/>
-    <ClInclude Include="include\Poco\JSON\DefaultHandler.h"/>
    <ClInclude Include="include\Poco\JSON\Handler.h"/>
    <ClInclude Include="include\Poco\JSON\JSON.h"/>
    <ClInclude Include="include\Poco\JSON\JSONException.h"/>
--- a/JSON/JSON_x64_vs110.vcxproj.filters
+++ b/JSON/JSON_x64_vs110.vcxproj.filters
@ -47,9 +47,6 @@
    <ClInclude Include="include\Poco\JSON\Array.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="include\Poco\JSON\DefaultHandler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="include\Poco\JSON\Handler.h">
      <Filter>Header Files</Filter>
    </ClInclude>
--- a/JSON/JSON_x64_vs90.vcproj
+++ b/JSON/JSON_x64_vs90.vcproj
@ -414,8 +414,6 @@
 			Name="Header Files">
 			<File
 				RelativePath=".\include\Poco\JSON\Array.h"/>
-			<File
-				RelativePath=".\include\Poco\JSON\DefaultHandler.h"/>
 			<File
 				RelativePath=".\include\Poco\JSON\Handler.h"/>
 			<File
--- a/JSON/include/Poco/JSON/DefaultHandler.h
+++ b/JSON/include/Poco/JSON/DefaultHandler.h
@ -1,57 +0,0 @@
-//
-// DefaultHandler.h
-//
-// $Id$
-//
-// Library: JSON
-// Package: JSON
-// Module:  DefaultHandler
-//
-// Definition of the DefaultHandler class.
-//
-// Copyright (c) 2012, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef JSON_DefaultHandler_INCLUDED
-#define JSON_DefaultHandler_INCLUDED
-
-
-#include "Poco/JSON/ParseHandler.h"
-
-
-namespace Poco {
-namespace JSON {
-
-
-//@deprecated
-typedef ParseHandler DefaultHandler;
-
-
-}} // namespace Poco::JSON
-
-
-#endif // JSON_DefaultHandler_INCLUDED