From c09a947193eabaaf7e32a2b94ad29da5532d5af8 Mon Sep 17 00:00:00 2001
From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>
Date: Fri, 25 Sep 2009 17:52:59 +0800
Subject: [PATCH] BUG: avoid using 'using'
---
Code/IO/otbKMLVectorDataIO.h | 35 +++++++++++++---------------------
Code/IO/otbKMLVectorDataIO.txx | 8 ++++----
2 files changed, 17 insertions(+), 26 deletions(-)
diff --git a/Code/IO/otbKMLVectorDataIO.h b/Code/IO/otbKMLVectorDataIO.h
index daea998129..7988d8448a 100644
--- a/Code/IO/otbKMLVectorDataIO.h
+++ b/Code/IO/otbKMLVectorDataIO.h
@@ -26,11 +26,6 @@
#include "kml/dom.h"
#include "kml/base/file.h"
-using kmldom::KmlPtr;
-using kmldom::ElementPtr;
-using kmldom::FeaturePtr;
-using kmldom::GeometryPtr;
-using kmldom::ContainerPtr;
namespace otb
{
@@ -110,34 +105,30 @@ protected:
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
- static const FeaturePtr GetRootFeature(const ElementPtr& root);
+ static const kmldom::FeaturePtr GetRootFeature(const kmldom::ElementPtr& root);
static void PrintIndented(std::string item, int depth);
- static void PrintFeature(const FeaturePtr& feature, int depth);
+ static void PrintFeature(const kmldom::FeaturePtr& feature, int depth);
- void WalkGeometry(const GeometryPtr& geometry, DataNodePointerType father);
+ void WalkGeometry(const kmldom::GeometryPtr& geometry, DataNodePointerType father);
- void WalkFeature(const FeaturePtr& feature, DataNodePointerType father);
+ void WalkFeature(const kmldom::FeaturePtr& feature, DataNodePointerType father);
- void WalkContainer(const ContainerPtr& container, DataNodePointerType father);
+ void WalkContainer(const kmldom::ContainerPtr& container, DataNodePointerType father);
/** Conversion tools */
- DataNodePointerType ConvertGeometryToPointNode(const GeometryPtr& geometry);
- DataNodePointerType ConvertGeometryToLineStringNode(const GeometryPtr& geometry);
- DataNodePointerType ConvertGeometryToLinearRingNode(const GeometryPtr& geometry);
- DataNodePointerType ConvertGeometryToPolygonNode(const GeometryPtr& geometry);
+ DataNodePointerType ConvertGeometryToPointNode(const kmldom::GeometryPtr& geometry);
+ DataNodePointerType ConvertGeometryToLineStringNode(const kmldom::GeometryPtr& geometry);
+ DataNodePointerType ConvertGeometryToLinearRingNode(const kmldom::GeometryPtr& geometry);
+ DataNodePointerType ConvertGeometryToPolygonNode(const kmldom::GeometryPtr& geometry);
/** end conversion tools */
- typedef kmldom::KmlPtr KmlPtr;
- typedef kmldom::KmlFactory KmlFactory;
- typedef kmldom::DocumentPtr DocumentPtr;
- typedef kmldom::FolderPtr FolderPtr;
- typedef kmldom::MultiGeometryPtr MultiGeometryPtr;
- void ProcessNodeWrite(InternalTreeNodeType * source, KmlFactory* factory,
- KmlPtr kml, DocumentPtr currentDocument, FolderPtr currentFolder,
- MultiGeometryPtr currentMultiGeometry);
+
+ void ProcessNodeWrite(InternalTreeNodeType * source, kmldom::KmlFactory* factory,
+ kmldom::KmlPtr kml, kmldom::DocumentPtr currentDocument, kmldom::FolderPtr currentFolder,
+ kmldom::MultiGeometryPtr currentMultiGeometry);
private:
KMLVectorDataIO(const Self&); //purposely not implemented
diff --git a/Code/IO/otbKMLVectorDataIO.txx b/Code/IO/otbKMLVectorDataIO.txx
index 97f8e7053d..560bae0765 100644
--- a/Code/IO/otbKMLVectorDataIO.txx
+++ b/Code/IO/otbKMLVectorDataIO.txx
@@ -45,12 +45,12 @@ namespace otb
template<class TData>
KMLVectorDataIO<TData>
::KMLVectorDataIO()
-{
-}
+{}
+
template<class TData>
KMLVectorDataIO<TData>::~KMLVectorDataIO()
-{
-}
+{}
+
template<class TData>
bool
KMLVectorDataIO<TData>::CanReadFile( const char* filename ) const
--
GitLab