From 090796f7467e946bbecf859fad7c84528d579a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Mon, 9 Feb 2009 17:55:42 +0000
Subject: [PATCH] Fixed inline stuff not building under windows

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@63 fdac6126-5c0c-442c-9429-916003d36597
---
 Apps/Subdivider/MeshViewerWidget.cc           | 63 -------------------
 Apps/Subdivider/MeshViewerWidget.hh           | 11 +++-
 .../SubdividerGui/SubdividerGui.pro           |  2 +-
 3 files changed, 11 insertions(+), 65 deletions(-)
 delete mode 100644 Apps/Subdivider/MeshViewerWidget.cc

diff --git a/Apps/Subdivider/MeshViewerWidget.cc b/Apps/Subdivider/MeshViewerWidget.cc
deleted file mode 100644
index a1cd8464..00000000
--- a/Apps/Subdivider/MeshViewerWidget.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-//=============================================================================
-//                                                                            
-//                               OpenMesh                                     
-//        Copyright (C) 2003 by Computer Graphics Group, RWTH Aachen          
-//                           www.openmesh.org                                 
-//                                                                            
-//-----------------------------------------------------------------------------
-//                                                                            
-//                                License                                     
-//                                                                            
-//   This library is free software; you can redistribute it and/or modify it 
-//   under the terms of the GNU Lesser General Public License as published   
-//   by the Free Software Foundation, version 2.1.                           
-//                                                                             
-//   This library 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         
-//   Lesser General Public License for more details.                           
-//                                                                            
-//   You should have received a copy of the GNU Lesser General Public          
-//   License along with this library; if not, write to the Free Software       
-//   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                 
-//                                                                            
-//-----------------------------------------------------------------------------
-//                                                                            
-//   $Revision: 1800 $
-//   $Date: 2008-05-19 11:51:23 +0200 (Mo, 19. Mai 2008) $
-//                                                                            
-//=============================================================================
-
-
-//== INCLUDES =================================================================
-
-#ifdef _MSC_VER
-#  pragma warning(disable: 4267 4311)
-#endif
-
-
-#include <OpenMesh/Core/IO/MeshIO.hh>
-#include <OpenMesh/Apps/Subdivider/MeshViewerWidget.hh>
-
-
-using namespace OpenMesh;
-
-
-//== IMPLEMENTATION ========================================================== 
-
-
-inline bool 
-MeshViewerWidget::open_mesh(const char* _filename, IO::Options _opt)
-{
-  if ( Base::open_mesh( _filename, _opt ) )
-  {
-    orig_mesh_ = mesh_;
-    return true;
-  }
-  return false;
-}
-
-
-
-
-//=============================================================================
diff --git a/Apps/Subdivider/MeshViewerWidget.hh b/Apps/Subdivider/MeshViewerWidget.hh
index 2a63dc63..87a3dbdf 100644
--- a/Apps/Subdivider/MeshViewerWidget.hh
+++ b/Apps/Subdivider/MeshViewerWidget.hh
@@ -39,6 +39,7 @@
 // -------------------- OpenMesh
 #include <OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh>
 #include <OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh>
+#include <OpenMesh/Core/IO/MeshIO.hh>
 #include <OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeTraits.hh>
 
 //
@@ -66,7 +67,15 @@ public:
   ~MeshViewerWidget() {}
 
   /// open mesh
-  bool open_mesh(const char* _filename, OpenMesh::IO::Options);
+  inline bool open_mesh(const char* _filename, OpenMesh::IO::Options _opt)
+  {
+    if ( Base::open_mesh( _filename, _opt ) )
+    {
+      orig_mesh_ = mesh_;
+      return true;
+    }
+    return false;
+  }
 
   Mesh& orig_mesh() { return orig_mesh_; }
   const Mesh& orig_mesh() const { return orig_mesh_; }
diff --git a/Apps/Subdivider/SubdividerGui/SubdividerGui.pro b/Apps/Subdivider/SubdividerGui/SubdividerGui.pro
index a7c5b1b1..4695b7e0 100644
--- a/Apps/Subdivider/SubdividerGui/SubdividerGui.pro
+++ b/Apps/Subdivider/SubdividerGui/SubdividerGui.pro
@@ -19,7 +19,7 @@ DIRECTORIES = .. ../../QtViewer
 
 # Input
 HEADERS += $$getFilesFromDir($$DIRECTORIES,*.hh)
-SOURCES += ../../QtViewer/QGLViewerWidget.cc ../../QtViewer/MeshViewerWidgetT.cc ../MeshViewerWidget.cc ../SubdivideWidget.cc
+SOURCES += ../../QtViewer/QGLViewerWidget.cc ../../QtViewer/MeshViewerWidgetT.cc ../SubdivideWidget.cc
 SOURCES += ../qtsubdivider.cc
 
 ################################################################################