From 3a4b09940b49bfde8a71fffde22e112b5b45c5f4 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 13 May 2005 12:06:58 +0000
Subject: [PATCH] Refinement of includes to help IRIX build

---
 src/osgPlugins/dxf/dxfFile.h    | 49 +++++++++++++++------------------
 src/osgPlugins/dxf/dxfSection.h |  2 +-
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/src/osgPlugins/dxf/dxfFile.h b/src/osgPlugins/dxf/dxfFile.h
index 26191236a..b0ff5c4af 100644
--- a/src/osgPlugins/dxf/dxfFile.h
+++ b/src/osgPlugins/dxf/dxfFile.h
@@ -21,38 +21,33 @@
 #include "dxfSectionBase.h"
 #include "dxfReader.h"
 #include "dxfSection.h"
+#include "scene.h"
 #include "codeValue.h"
 
-class dxfHeader;
-class dxfTables;
-class dxfBlocks;
-class dxfEntities;
-class dxfSection;
-class scene;
-class dxfBlock;
-
 class dxfFile {
 public:
-	dxfFile(std::string fileName) : 
-				_fileName(fileName),
-				_isNewSection(false)
-	{}
-	bool			parseFile();
-	osg::Group*		dxf2osg();
-	dxfBlock*		findBlock(std::string name);
-	VariableList	getVariable(std::string var);
+    dxfFile(std::string fileName) : 
+                _fileName(fileName),
+                _isNewSection(false)
+    {}
+    bool            parseFile();
+    osg::Group*        dxf2osg();
+    dxfBlock*        findBlock(std::string name);
+    VariableList    getVariable(std::string var);
+    
 protected:
-	short							assign(codeValue& cv);
-	std::string						_fileName;
-	bool							_isNewSection;
-	osg::ref_ptr<dxfReader>			_reader;
-	osg::ref_ptr<dxfSection>		_current;
-	osg::ref_ptr<dxfHeader>			_header;
-	osg::ref_ptr<dxfTables>			_tables;
-	osg::ref_ptr<dxfBlocks>			_blocks;
-	osg::ref_ptr<dxfEntities>		_entities;
-	osg::ref_ptr<dxfSection>		_unknown;
-	osg::ref_ptr<scene>				_scene;
+
+    short assign(codeValue& cv);
+    std::string                 _fileName;
+    bool                        _isNewSection;
+    osg::ref_ptr<dxfReader>     _reader;
+    osg::ref_ptr<dxfSection>    _current;
+    osg::ref_ptr<dxfHeader>     _header;
+    osg::ref_ptr<dxfTables>     _tables;
+    osg::ref_ptr<dxfBlocks>     _blocks;
+    osg::ref_ptr<dxfEntities>   _entities;
+    osg::ref_ptr<dxfSection>    _unknown;
+    osg::ref_ptr<scene>         _scene;
 };
 
 
diff --git a/src/osgPlugins/dxf/dxfSection.h b/src/osgPlugins/dxf/dxfSection.h
index ee51dd632..276c67092 100644
--- a/src/osgPlugins/dxf/dxfSection.h
+++ b/src/osgPlugins/dxf/dxfSection.h
@@ -21,7 +21,6 @@
 
 #include "dxfDataTypes.h"
 #include "dxfSectionBase.h"
-#include "dxfFile.h"
 #include "dxfTable.h"
 #include "codeValue.h"
 #include "scene.h"
@@ -31,6 +30,7 @@
 #include <iostream>
 #include <string>
 
+class dxfFile;
 class dxfEntity;
 class dxfBlock;