Moved the declaration of osgDB::Field, FieldReader and FieldReaderIterator into include/osg/Input to centralise all the deprecated .osg parsing code into one place.

src/osgDB/CMakeLists.txt

@@ -34,9 +34,6 @@ SET(LIB_PUBLIC_HEADERS
     ${HEADER_PATH}/DotOsgWrapper
     ${HEADER_PATH}/DynamicLibrary
     ${HEADER_PATH}/Export
-    ${HEADER_PATH}/Field
-    ${HEADER_PATH}/FieldReader
-    ${HEADER_PATH}/FieldReaderIterator
     ${HEADER_PATH}/FileCache
     ${HEADER_PATH}/FileNameUtils
     ${HEADER_PATH}/FileUtils

src/osgDB/Field.cpp

@@ -14,7 +14,7 @@
 #include <osg/Notify>
 #include <osg/Math>
 
-#include <osgDB/Field>
+#include <osgDB/Input>
 
 #include <string.h>
 #include <stdlib.h>

src/osgDB/FieldReader.cpp

@@ -10,8 +10,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
  * OpenSceneGraph Public License for more details.
 */
-#include <osgDB/Field>
-#include <osgDB/FieldReader>
+#include <osgDB/Input>
+#include <istream>
+
 #include <stdio.h>
 
 using namespace osgDB;

src/osgDB/FieldReaderIterator.cpp

@@ -10,7 +10,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
  * OpenSceneGraph Public License for more details.
 */
-#include <osgDB/FieldReaderIterator>
+#include <osgDB/Input>
 
 using namespace osgDB;