From ef7d7fce2e6ea7f747794a7bcb2794bb941166b2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 11 Jan 2003 12:50:39 +0000 Subject: [PATCH] Moved some in inline methods in ParamterOutput into the new ParamterOutput.cpp file to clean up the interface. --- VisualStudio/osgDB/osgDB.dsp | 4 ++++ include/osgDB/ParameterOutput | 33 +++++++-------------------------- src/osgDB/Makefile | 1 + src/osgDB/ParameterOutput.cpp | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 26 deletions(-) create mode 100644 src/osgDB/ParameterOutput.cpp diff --git a/VisualStudio/osgDB/osgDB.dsp b/VisualStudio/osgDB/osgDB.dsp index ec0bd47e6..693cf35aa 100755 --- a/VisualStudio/osgDB/osgDB.dsp +++ b/VisualStudio/osgDB/osgDB.dsp @@ -129,6 +129,10 @@ SOURCE=..\..\Src\osgDB\Output.cpp # End Source File # Begin Source File +SOURCE=..\..\Src\osgDB\ParameterOutput.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Src\osgDB\ReadFile.cpp # End Source File # Begin Source File diff --git a/include/osgDB/ParameterOutput b/include/osgDB/ParameterOutput index 243463ff4..692a1ae89 100644 --- a/include/osgDB/ParameterOutput +++ b/include/osgDB/ParameterOutput @@ -13,21 +13,13 @@ class OSGDB_EXPORT ParameterOutput { public: - ParameterOutput(Output& fw): - _fw(fw), - _numItemsPerLine(fw.getNumIndicesPerLine()), - _column(0) {} + ParameterOutput(Output& fw); - ParameterOutput(Output& fw,int numItemsPerLine): - _fw(fw), - _numItemsPerLine(numItemsPerLine), - _column(0) {} + ParameterOutput(Output& fw,int numItemsPerLine); - void begin() - { - _fw.indent() << "{"< void write(const T& t) @@ -73,19 +65,8 @@ class OSGDB_EXPORT ParameterOutput } - void newLine() - { - if (_column!=0) _fw << std::endl; - _column = 0; - } - - void end() - { - if (_column!=0) _fw << std::endl; - _fw.moveOut(); - _fw.indent() << "}"< + +using namespace osgDB; + +ParameterOutput::ParameterOutput(Output& fw): + _fw(fw), + _numItemsPerLine(fw.getNumIndicesPerLine()), + _column(0) {} + +ParameterOutput::ParameterOutput(Output& fw,int numItemsPerLine): + _fw(fw), + _numItemsPerLine(numItemsPerLine), + _column(0) {} + +void ParameterOutput::begin() +{ + _fw.indent() << "{"<