Removed include/osg/Types header defining osg::ubyte, osg::ushort etc. Changed

any reference to these in the distribution across to using unsigned char,
unsigned short etc.  This has been done to keep the OSG code more opaque
to what types are.

include/osg/ColorMask

@@ -16,7 +16,6 @@
 
 #include <osg/Export>
 #include <osg/StateAttribute>
-#include <osg/Types>
 
 namespace osg {
 

include/osg/Depth

@@ -15,7 +15,6 @@
 #define OSG_DEPTH 1
 
 #include <osg/StateAttribute>
-#include <osg/Types>
 
 namespace osg {
 

include/osg/Drawable

@@ -16,7 +16,6 @@
 
 #include <osg/BoundingBox>
 #include <osg/State>
-#include <osg/Types>
 #include <osg/NodeVisitor>
 #include <osg/Shape>
 #include <osg/buffered_value>

include/osg/Fog

@@ -15,7 +15,6 @@
 #define OSG_FOG 1
 
 #include <osg/StateAttribute>
-#include <osg/Types>
 #include <osg/Vec4>
 
 #ifndef GL_FOG_COORDINATE

include/osg/Stencil

@@ -15,7 +15,6 @@
 #define OSG_STENCIL 1
 
 #include <osg/StateAttribute>
-#include <osg/Types>
 
 namespace osg {
 

include/osg/Texture

@@ -15,7 +15,6 @@
 #define OSG_TEXTURE 1
 
 #include <osg/GL>
-#include <osg/Types>
 #include <osg/Image>
 #include <osg/StateAttribute>
 #include <osg/ref_ptr>

include/osg/Types

@@ -1,26 +0,0 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield 
- *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
- * (at your option) any later version.  The full license is in LICENSE file
- * included with this distribution, and on the openscenegraph.org website.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * OpenSceneGraph Public License for more details.
-*/
-
-#ifndef OSG_TYPES
-#define OSG_TYPES 1
-
-namespace osg {
-
-typedef unsigned int uint;
-typedef unsigned short ushort;
-typedef unsigned char uchar;
-typedef uchar ubyte;
-
-}
-
-#endif

include/osg/Viewport

@@ -15,7 +15,6 @@
 #define OSG_VIEWPORT 1
 
 #include <osg/StateAttribute>
-#include <osg/Types>
 #include <osg/Matrix>
 
 namespace osg {

include/osgDB/Field

@@ -14,7 +14,6 @@
 #ifndef OSGDB_FIELD
 #define OSGDB_FIELD 1
 
-#include <osg/Types>
 #include <osgDB/Export>
 
 #include <string>
@@ -83,8 +82,8 @@ class OSGDB_EXPORT Field
         bool getInt(int& i) const;
 
         bool isUInt() const;
-        bool matchUInt(osg::uint i) const;
-        bool getUInt(osg::uint& i) const;
+        bool matchUInt(unsigned int i) const;
+        bool getUInt(unsigned int& i) const;
 
         bool isFloat() const;
         bool matchFloat(float f) const;

include/osgText/Font

@@ -36,6 +36,7 @@
 #include <osg/State>
 
 #include <osgText/Export>
+#include <osgText/EncodedText>
 
 #include <string>
 
@@ -57,8 +58,6 @@ namespace osgText {
         virtual const char* libraryName() const { return #library; } \
         virtual const char* className() const { return #name; } \
 
-class EncodedText;
-
 class OSGTEXT_EXPORT Font : public osg::Object
 {
     public:

include/osgText/Text

@@ -38,7 +38,6 @@
 #include <osg/Vec2>
 
 #include <osgText/Font>
-#include <osgText/EncodedText>
 
 #include <string>