Use an implementation file for SGReaderWriterOptions.

diff --git a/simgear/scene/util/CMakeLists.txt b/simgear/scene/util/CMakeLists.txt
index 8ec8d11960eced8a9a074890e70e953b07fde115..8b9221573f9ef1d644f3ca94afd764552e17d332 100644 (file)
--- a/simgear/scene/util/CMakeLists.txt
+++ b/simgear/scene/util/CMakeLists.txt
@@ -31,6 +31,7 @@ set(SOURCES
     PrimitiveUtils.cxx
     QuadTreeBuilder.cxx
     SGEnlargeBoundingBox.cxx
+    SGReaderWriterOptions.cxx
     SGSceneFeatures.cxx
     SGSceneUserData.cxx
     SGStateAttributeVisitor.cxx

diff --git a/simgear/scene/util/SGReaderWriterOptions.cxx b/simgear/scene/util/SGReaderWriterOptions.cxx
new file mode 100644 (file)
index 0000000..d2951cc
--- /dev/null
+++ b/simgear/scene/util/SGReaderWriterOptions.cxx
@@ -0,0 +1,51 @@
+// Copyright (C) 2007 Tim Moore timoore@redhat.com
+// Copyright (C) 2008 Till Busch buti@bux.at
+// Copyright (C) 2011 Mathias Froehlich
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program 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 GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+//
+
+#include "SGReaderWriterOptions.hxx"
+
+#include <osgDB/Registry>
+
+namespace simgear
+{
+
+SGReaderWriterOptions::~SGReaderWriterOptions()
+{
+}
+
+SGReaderWriterOptions*
+SGReaderWriterOptions::copyOrCreate(const osgDB::Options* options)
+{
+    if (!options)
+        options = osgDB::Registry::instance()->getOptions();
+    if (!options)
+        return new SGReaderWriterOptions;
+    if (!dynamic_cast<const SGReaderWriterOptions*>(options))
+        return new SGReaderWriterOptions(*options);
+    return new SGReaderWriterOptions(*static_cast<const SGReaderWriterOptions*>(options));
+}
+
+SGReaderWriterOptions*
+SGReaderWriterOptions::fromPath(const std::string& path)
+{
+    SGReaderWriterOptions* options = copyOrCreate(0);
+    options->setDatabasePath(path);
+    return options;
+}
+
+}

diff --git a/simgear/scene/util/SGReaderWriterOptions.hxx b/simgear/scene/util/SGReaderWriterOptions.hxx
index 798c85fef3ca4c35da3979cb2774cd31859e043f..2a4b983d283194b8c00985e5f89d6f5f94ea0ab3 100644 (file)
--- a/simgear/scene/util/SGReaderWriterOptions.hxx
+++ b/simgear/scene/util/SGReaderWriterOptions.hxx
@@ -21,7 +21,6 @@
 #define SGREADERWRITEROPTIONS_HXX 1
 
 #include <osgDB/Options>
-#include <osgDB/Registry>
 #include <simgear/scene/model/modellib.hxx>
 #include <simgear/props/props.hxx>
 
@@ -93,26 +92,11 @@ public:
     void setInstantiateEffects(bool instantiateEffects)
     { _instantiateEffects = instantiateEffects; }
 
-    static SGReaderWriterOptions* copyOrCreate(const osgDB::Options* options)
-    {
-        if (!options)
-            options = osgDB::Registry::instance()->getOptions();
-        if (!options)
-            return new SGReaderWriterOptions;
-        if (!dynamic_cast<const SGReaderWriterOptions*>(options))
-            return new SGReaderWriterOptions(*options);
-        return new SGReaderWriterOptions(*static_cast<const SGReaderWriterOptions*>(options));
-    }
-
-    static SGReaderWriterOptions* fromPath(const std::string& path)
-    {
-        SGReaderWriterOptions* options = copyOrCreate(0);
-        options->setDatabasePath(path);
-        return options;
-    }
+    static SGReaderWriterOptions* copyOrCreate(const osgDB::Options* options);
+    static SGReaderWriterOptions* fromPath(const std::string& path);
 
 protected:
-    virtual ~SGReaderWriterOptions() {}
+    virtual ~SGReaderWriterOptions();
 
 private:
     SGSharedPtr<SGPropertyNode> _propertyNode;