From 00c7558b1b4d40e892e081245f89a4bab7122ab5 Mon Sep 17 00:00:00 2001 From: Tahir Akhlaq Date: Sun, 20 Jan 2019 21:24:36 +0000 Subject: [PATCH] hopefully builds on linux this time --- src/tools/pcb_reader/exporter.h | 13 ------------- src/tools/pcb_reader/navmesh_exporter.h | 6 +++--- src/tools/pcb_reader/obj_exporter.h | 4 ++-- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/tools/pcb_reader/exporter.h b/src/tools/pcb_reader/exporter.h index c0b8a252..5d738cb9 100644 --- a/src/tools/pcb_reader/exporter.h +++ b/src/tools/pcb_reader/exporter.h @@ -52,17 +52,4 @@ struct ExportedZone std::map< std::string, ExportedGroup > groups; }; -class Exporter -{ -public: - Exporter() { } - ~Exporter(){} - - virtual void exportZone( const ExportedZone& zone ) = 0; - virtual void exportGroup( const ExportedGroup& group ) = 0; - -protected: - ExportFileType m_exportFileType; -}; - #endif \ No newline at end of file diff --git a/src/tools/pcb_reader/navmesh_exporter.h b/src/tools/pcb_reader/navmesh_exporter.h index be3fb349..ca4763d5 100644 --- a/src/tools/pcb_reader/navmesh_exporter.h +++ b/src/tools/pcb_reader/navmesh_exporter.h @@ -15,7 +15,7 @@ #include #include -class NavmeshExporter : public Exporter +class NavmeshExporter { public: static void exportZone( const ExportedZone& zone ) @@ -26,7 +26,7 @@ public: auto end = std::chrono::high_resolution_clock::now(); printf( "[Navmesh] Finished exporting %s in %u ms\n", - fileName, + fileName.c_str(), std::chrono::duration_cast< std::chrono::milliseconds >( end - start ).count() ); } @@ -39,7 +39,7 @@ public: auto end = std::chrono::high_resolution_clock::now(); printf( "[Navmesh] Finished exporting %s in %u ms\n", - fileName, + fileName.c_str(), std::chrono::duration_cast< std::chrono::milliseconds >( end - start ).count() ); } private: diff --git a/src/tools/pcb_reader/obj_exporter.h b/src/tools/pcb_reader/obj_exporter.h index 2a39850d..378e14fb 100644 --- a/src/tools/pcb_reader/obj_exporter.h +++ b/src/tools/pcb_reader/obj_exporter.h @@ -11,7 +11,7 @@ #include "exporter.h" -class ObjExporter : public Exporter +class ObjExporter { public: static void exportZone( const ExportedZone& zone ) @@ -51,7 +51,7 @@ public: auto end = std::chrono::high_resolution_clock::now(); printf( "[Obj] Finished exporting %s in %u ms\n", - fileName, + fileName.c_str(), std::chrono::duration_cast< std::chrono::milliseconds >( end - start ).count() ); }