Solved namespace ambiguities caused by the removal of a silly 'using namespace' in meshmodel.h

src/fgt/io_x3d/io_x3d.cpp

@@ -23,6 +23,9 @@
 /****************************************************************************
  History
  $Log$
+ Revision 1.11  2008/04/04 14:08:23  cignoni
+ Solved namespace ambiguities caused by the removal of a silly 'using namespace' in meshmodel.h
+
  Revision 1.10  2008/02/20 21:59:37  gianpaolopalma
  Added support to file .x3dv and .wrl
 
@@ -73,6 +76,7 @@
 #include <QMessageBox>
 #include <QFileDialog>
 
+using namespace std;
 using namespace vcg;
 
 bool IoX3DPlugin::open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, CallBackPos *cb, QWidget *parent)

src/meshlabplugins/cleanfilter/remove_small_cc.h

@@ -24,6 +24,9 @@
   History
 
  $Log$
+ Revision 1.3  2008/04/04 14:08:17  cignoni
+ Solved namespace ambiguities caused by the removal of a silly 'using namespace' in meshmodel.h
+
  Revision 1.2  2007/12/14 11:52:18  cignoni
  now use the correct deleteFace/vert and returns info on the number of deleted stuff
 
@@ -52,19 +55,19 @@ std::pair<int,int>  RemoveSmallConnectedComponentsSize(MeshType &m, int maxCCSiz
       tri::ConnectedIterator<MeshType> ci;
       for(unsigned int i=0;i<CCV.size();++i)
       {
-        vector<typename MeshType::FacePointer> FPV;
+        std::vector<typename MeshType::FacePointer> FPV;
         if(CCV[i].first<maxCCSize)
         {
 					DeletedCC++;
           for(ci.start(m,CCV[i].second);!ci.completed();++ci)
             FPV.push_back(*ci);
           
-          typename vector<typename MeshType::FacePointer>::iterator fpvi;
+          typename std::vector<typename MeshType::FacePointer>::iterator fpvi;
           for(fpvi=FPV.begin(); fpvi!=FPV.end(); ++fpvi)
 						tri::Allocator<MeshType>::DeleteFace(m,(**fpvi));
         }
       }
-			return make_pair<int,int>(TotalCC,DeletedCC);
+			return std::make_pair<int,int>(TotalCC,DeletedCC);
 }
 
 /// Remove the connected components smaller than a given diameter
@@ -79,7 +82,7 @@ std::pair<int,int> RemoveSmallConnectedComponentsDiameter(MeshType &m, typename
       for(unsigned int i=0;i<CCV.size();++i)
       {
         Box3f bb;
-        vector<typename MeshType::FacePointer> FPV;
+        std::vector<typename MeshType::FacePointer> FPV;
         for(ci.start(m,CCV[i].second);!ci.completed();++ci)
         {
             FPV.push_back(*ci);
@@ -90,12 +93,12 @@ std::pair<int,int> RemoveSmallConnectedComponentsDiameter(MeshType &m, typename
         if(bb.Diag()<maxDiameter)
         {
 					DeletedCC++;
-          typename vector<typename MeshType::FacePointer>::iterator fpvi;
+          typename std::vector<typename MeshType::FacePointer>::iterator fpvi;
           for(fpvi=FPV.begin(); fpvi!=FPV.end(); ++fpvi)
 						tri::Allocator<MeshType>::DeleteFace(m,(**fpvi));
         }
       }
-			return make_pair<int,int>(TotalCC,DeletedCC);
+			return std::make_pair<int,int>(TotalCC,DeletedCC);
 }
 } //end namespace
 #endif

src/meshlabplugins/editslice/editslice.cpp

@@ -23,6 +23,8 @@
 #include <vcg/complex/trimesh/update/position.h>
 #include <vcg/complex/trimesh/update/bounding.h>
 #include <vcg/complex/trimesh/update/normal.h>
+
+using namespace std;
 using namespace vcg;
 
 

src/meshlabplugins/editslice/editslice.h

@@ -14,25 +14,22 @@
 #include <vcg/space/index/grid_static_ptr.h>
 
 #include <vcg/simplex/vertex/vertex.h>
-
 #include <vcg/complex/edgemesh/base.h>
-
 #include <vcg/simplex/edge/edge.h>
-
 #include <wrap/io_edgemesh/export_svg.h>
 
 typedef CMeshO n_Mesh;
 
 class n_Face;
 class n_Edge;
-class n_Vertex  : public Vertex<float, n_Edge, n_Face> {};
+class n_Vertex  : public vcg::Vertex<float, n_Edge, n_Face> {};
 class n_Edge    : public vcg::Edge<n_Edge, n_Vertex> {};
 
 
-class n_EdgeMesh: public vcg::edge::EdgeMesh< vector<n_Vertex>, vector<n_Edge> > {};
+class n_EdgeMesh: public vcg::edge::EdgeMesh< std::vector<n_Vertex>, std::vector<n_Edge> > {};
 
 typedef vcg::GridStaticPtr<CMeshO::FaceType, CMeshO::ScalarType> TriMeshGrid;
-typedef vcg::edge::EdgeMesh<vector<n_Vertex>,vector<n_Edge> > Edge_Mesh;
+typedef vcg::edge::EdgeMesh<std::vector<n_Vertex>,std::vector<n_Edge> > Edge_Mesh;
 typedef vcg::edge::io::SVGProperties SVGProperties;
 
 
@@ -64,13 +61,13 @@ private:
 	n_EdgeMesh* edge_mesh;
 	n_Mesh trimesh;
 	std::vector< TriMeshGrid::Cell *> intersected_cells;
-	vector<Point3f> point_Vector;
+	std::vector<vcg::Point3f> point_Vector;
 	QString fileName, dirName, fileN;
 	bool isDragging;
 	GLArea * gla;
 	MeshModel m;
     bool first;
-	Box3f b;
+	vcg::Box3f b;
 	SVGPro *svgpro;
 	float edgeMax;
 SVGProperties pr;

src/meshlabplugins/epoch_io/epoch_camera.h

@@ -1,12 +1,13 @@
 
-
+namespace vcg
+{
 class EpochCamera
 {
 public:
   Matrix33d K;      // parametri intriseci camera
   Matrix33d Kinv;   
 
-  vector<double> k;
+  std::vector<double> k;
   Matrix33d R;
   Matrix44d TR; // [R | -Rt] e.g. la matrice in cui
   Matrix44d TRinv;
@@ -20,3 +21,4 @@ public:
   bool Open(const char * filename);
 };
 
+}

src/meshlabplugins/epoch_io/epoch_io.cpp

@@ -24,6 +24,9 @@
   History
 
  $Log$
+ Revision 1.22  2008/04/04 14:08:07  cignoni
+ Solved namespace ambiguities caused by the removal of a silly 'using namespace' in meshmodel.h
+
  Revision 1.21  2008/03/06 08:20:50  cignoni
  updated to the new histogram
 
@@ -122,6 +125,7 @@
 #include <meshlab/alnParser.h>
 
 FILE *logFP=0; 
+using namespace std;
 using namespace vcg;
 
 void EpochModel::depthFilter(FloatImage &depthImgf, FloatImage &countImgf, float depthJumpThr, 

src/meshlabplugins/epoch_io/epoch_reconstruction.h

@@ -21,7 +21,7 @@ public:
   QString depthName;
   QString textureName;
   QString countName;
-  EpochCamera cam;
+  vcg::EpochCamera cam;
   bool Init(QDomNode &node);
   static QString ThumbName(QString &imageName);
 

src/meshlabplugins/epoch_io/v3dImportDialog.cpp

@@ -26,6 +26,7 @@
 
 #include "v3dImportDialog.h"
 #include "maskImageWidget.h"
+using namespace vcg;
 
 // small helper function for generating a color ramp pixmap to be used in the import dialog.
 

src/meshlabplugins/epoch_io/v3dImportDialog.h

@@ -26,7 +26,7 @@ public:
 	}
 
 public:
-  void setEpochReconstruction(EpochReconstruction *_er,CallBackPos *cb);
+  void setEpochReconstruction(EpochReconstruction *_er,vcg::CallBackPos *cb);
 	bool exportToPLY;  /// when true all the selected range maps are exported as separated ply
 
 public slots:

src/meshlabplugins/filter_ao/AOGLWidget.cpp

@@ -26,7 +26,7 @@ void AOGLWidget::initializeGL ()
 {
 	plugin->initGL(cb,m->cm.vn);
 
-	unsigned int widgetSize = max(plugin->maxTexSize, plugin->depthTexSize);
+	unsigned int widgetSize = std::max(plugin->maxTexSize, plugin->depthTexSize);
 
 	setFixedSize(widgetSize,widgetSize);
 }

src/meshlabplugins/filter_ao/filter_ao.cpp

@@ -24,6 +24,9 @@
 History
 
 $Log$
+Revision 1.32  2008/04/04 14:08:13  cignoni
+Solved namespace ambiguities caused by the removal of a silly 'using namespace' in meshmodel.h
+
 Revision 1.31  2008/02/12 14:39:56  mischitelli
 - Disabled the FP16 path since needs rewriting good part of the code: need time!
 - GPU version works only with FP32 blending capable hardware: aka Shader Model 4.0!
@@ -87,6 +90,8 @@ Revision 1.27  2008/02/09 17:55:19  mischitelli
 #define AMBOCC_USEGPU_BY_DEFAULT false
 #define AMBOCC_USEVBO_BY_DEFAULT false
 
+using namespace std;
+using namespace vcg;
 static GLuint vs, fs, shdrID;
 
 AmbientOcclusionPlugin::AmbientOcclusionPlugin() 

src/meshlabplugins/filter_ao/filter_ao.h

@@ -39,7 +39,7 @@ class AmbientOcclusionPlugin : public QObject, public MeshFilterInterface
 
 // Attributes
 protected:
-	Point3f cameraDir;
+	vcg::Point3f cameraDir;
 	GLuint  fboDepth,
 	        fboResult,
 	        depthBufferTex,
@@ -92,8 +92,8 @@ public:
 	void  vertexCoordsToTexture (MeshModel &m);
 
 	void  renderMesh            (MeshModel &m);
-	void  setCamera             (Point3f camDir,
-	                             Box3f &meshBBox);
+	void  setCamera             (vcg::Point3f camDir,
+	                             vcg::Box3f &meshBBox);
 
 	void  generateOcclusionHW   ();
 	void  generateOcclusionSW   (MeshModel &m,

src/meshlabplugins/filter_poisson/filter_poisson.cpp

@@ -52,6 +52,9 @@ add samplefilter
 #include "src/Geometry.h"
 #include "src/PoissonParam.h"
 
+using namespace std;
+using namespace vcg;
+
 int Execute2(PoissonParam &Par, vector<Point3D<float> > Pts, vector<Point3D<float> > Nor, 	CoredVectorMeshData &mesh, Point3D<float> &newCenter, float &newScale, vcg::CallBackPos *cb );
 
 

src/meshlabplugins/filter_splitter/filter_splitter.cpp

@@ -41,6 +41,9 @@
 
 #include "filter_splitter.h"
 
+using namespace std;
+using namespace vcg;
+
 // Constructor 
 FilterSplitterPlugin::FilterSplitterPlugin() 
 { 

src/meshlabplugins/meshedit/meshedit.cpp

@@ -23,6 +23,9 @@
 /****************************************************************************
   History
 $Log$
+Revision 1.13  2008/04/04 14:08:15  cignoni
+Solved namespace ambiguities caused by the removal of a silly 'using namespace' in meshmodel.h
+
 Revision 1.12  2008/02/28 09:57:40  cignoni
 corrected bug: wrong selection when Tr matrix != identity
 
@@ -72,6 +75,8 @@ Optional data really working. Clustering decimation totally rewrote. History sta
 #include "meshedit.h"
 #include <wrap/gl/pick.h>
 #include<limits>
+
+using namespace std;
 using namespace vcg;
 
 ExtraMeshEditPlugin::ExtraMeshEditPlugin() {

src/meshlabplugins/meshedit/meshedit.h

@@ -56,7 +56,7 @@ public:
     QPoint cur;
     QPoint prev;
     bool isDragging;
-    vector<CMeshO::FacePointer> LastSel;
+    std::vector<CMeshO::FacePointer> LastSel;
 signals:
  void setSelectionRendering(bool);
 

src/sampleplugins/filtercreateiso/filtercreateiso.cpp

@@ -40,6 +40,7 @@ Added the new sample filter plugin that removes border faces
 #include <apps/sample/trimesh_isosurface/simple_volume.h>
 #include <apps/sample/trimesh_isosurface/trivial_walker.h>
 
+using namespace std;
 using namespace vcg;
 
 FilterCreateIso::FilterCreateIso()