From f0661ba0b364a609aa410f812f7461a2597df5aa Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 9 Oct 2018 00:35:03 +0200 Subject: [PATCH] Some wrong header includes fixed. --- src/buddies/src/bd/bdWriterOptions.cc | 24 ++++++++++++------------ src/buddies/src/bd/bdWriterOptions.h | 20 ++++++++++---------- src/buddies/src/bd/strm2cif.cc | 4 ++-- src/buddies/src/bd/strm2dxf.cc | 4 ++-- src/buddies/src/bd/strm2gds.cc | 4 ++-- src/buddies/src/bd/strm2gdstxt.cc | 4 ++-- src/buddies/src/bd/strm2oas.cc | 4 ++-- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/buddies/src/bd/bdWriterOptions.cc b/src/buddies/src/bd/bdWriterOptions.cc index 210d39468..e7ecfd08c 100644 --- a/src/buddies/src/bd/bdWriterOptions.cc +++ b/src/buddies/src/bd/bdWriterOptions.cc @@ -58,11 +58,11 @@ GenericWriterOptions::GenericWriterOptions () // .. nothing yet .. } -const std::string GenericWriterOptions::m_gds2_format_name = "GDS2"; -const std::string GenericWriterOptions::m_gds2text_format_name = "GDS2Text"; // no special options -const std::string GenericWriterOptions::m_oasis_format_name = "OASIS"; -const std::string GenericWriterOptions::m_dxf_format_name = "DXF"; -const std::string GenericWriterOptions::m_cif_format_name = "CIF"; +const std::string GenericWriterOptions::gds2_format_name = "GDS2"; +const std::string GenericWriterOptions::gds2text_format_name = "GDS2Text"; // no special options +const std::string GenericWriterOptions::oasis_format_name = "OASIS"; +const std::string GenericWriterOptions::dxf_format_name = "DXF"; +const std::string GenericWriterOptions::cif_format_name = "CIF"; void GenericWriterOptions::add_options (tl::CommandLineOptions &cmd, const std::string &format) @@ -75,7 +75,7 @@ GenericWriterOptions::add_options (tl::CommandLineOptions &cmd, const std::strin "given factor." ); - if (format.empty () || format == m_gds2_format_name || format == m_gds2text_format_name || format == m_oasis_format_name) { + if (format.empty () || format == gds2_format_name || format == gds2text_format_name || format == oasis_format_name) { cmd << tl::arg (group + "-od|--dbu-out=dbu", &m_dbu, "Uses the specified database unit", "Specifies the database unit to save the layout in. The database unit is given " @@ -90,7 +90,7 @@ GenericWriterOptions::add_options (tl::CommandLineOptions &cmd, const std::strin "If given, empty cells won't be written. See --keep-instances for more options." ); - if (format.empty () || format == m_gds2_format_name || format == m_gds2text_format_name) { + if (format.empty () || format == gds2_format_name || format == gds2text_format_name) { cmd << tl::arg (group + "#--keep-instances", &m_keep_instances, "Keeps instances of dropped cells", "If given, instances of dropped cell's won't be removed. Hence, ghost cells are " @@ -101,7 +101,7 @@ GenericWriterOptions::add_options (tl::CommandLineOptions &cmd, const std::strin ); } - if (format.empty () || format == m_gds2_format_name || format == m_gds2text_format_name || format == m_oasis_format_name) { + if (format.empty () || format == gds2_format_name || format == gds2text_format_name || format == oasis_format_name) { cmd << tl::arg (group + "!#--no-context-info", &m_write_context_info, "Does not write context information", "Context information is included to maintain PCell parameters and library connections. " @@ -132,7 +132,7 @@ GenericWriterOptions::add_options (tl::CommandLineOptions &cmd, const std::strin "* \"TOP,-A\" - Select cell TOP (plus children), then remove A (with children)" ); - if (format.empty () || format == m_gds2_format_name || format == m_gds2text_format_name) { + if (format.empty () || format == gds2_format_name || format == gds2text_format_name) { // Add GDS2 and GDS2Text format options std::string group = "[Output options - GDS2 specific]"; @@ -186,7 +186,7 @@ GenericWriterOptions::add_options (tl::CommandLineOptions &cmd, const std::strin } - if (format.empty () || format == m_oasis_format_name) { + if (format.empty () || format == oasis_format_name) { // Add OASIS format options std::string group = "[Output options - OASIS specific]"; @@ -231,7 +231,7 @@ GenericWriterOptions::add_options (tl::CommandLineOptions &cmd, const std::strin } - if (format.empty () || format == m_dxf_format_name) { + if (format.empty () || format == dxf_format_name) { // Add DXF format options std::string group = "[Output options - DXF specific]"; @@ -248,7 +248,7 @@ GenericWriterOptions::add_options (tl::CommandLineOptions &cmd, const std::strin } - if (format.empty () || format == m_cif_format_name) { + if (format.empty () || format == cif_format_name) { // Add CIF format options std::string group = "[Output options - CIF specific]"; diff --git a/src/buddies/src/bd/bdWriterOptions.h b/src/buddies/src/bd/bdWriterOptions.h index 2f42b3f8b..87104c612 100644 --- a/src/buddies/src/bd/bdWriterOptions.h +++ b/src/buddies/src/bd/bdWriterOptions.h @@ -65,7 +65,7 @@ public: */ void add_options_for_gds2 (tl::CommandLineOptions &cmd) { - add_options (cmd, m_gds2_format_name); + add_options (cmd, gds2_format_name); } /** @@ -73,7 +73,7 @@ public: */ void add_options_for_oasis (tl::CommandLineOptions &cmd) { - add_options (cmd, m_oasis_format_name); + add_options (cmd, oasis_format_name); } /** @@ -81,7 +81,7 @@ public: */ void add_options_for_cif (tl::CommandLineOptions &cmd) { - add_options (cmd, m_cif_format_name); + add_options (cmd, cif_format_name); } /** @@ -89,7 +89,7 @@ public: */ void add_options_for_dxf (tl::CommandLineOptions &cmd) { - add_options (cmd, m_dxf_format_name); + add_options (cmd, dxf_format_name); } /** @@ -98,6 +98,12 @@ public: */ void configure (db::SaveLayoutOptions &save_options, const db::Layout &layout) const; + static const std::string gds2_format_name; + static const std::string gds2text_format_name; + static const std::string oasis_format_name; + static const std::string cif_format_name; + static const std::string dxf_format_name; + private: double m_scale_factor; double m_dbu; @@ -129,12 +135,6 @@ private: int m_dxf_polygon_mode; - static const std::string m_gds2_format_name; - static const std::string m_gds2text_format_name; - static const std::string m_oasis_format_name; - static const std::string m_cif_format_name; - static const std::string m_dxf_format_name; - void set_oasis_substitution_char (const std::string &text); }; diff --git a/src/buddies/src/bd/strm2cif.cc b/src/buddies/src/bd/strm2cif.cc index 3502dd240..77f3e43ce 100644 --- a/src/buddies/src/bd/strm2cif.cc +++ b/src/buddies/src/bd/strm2cif.cc @@ -21,9 +21,9 @@ */ #include "bdConverterMain.h" -#include "dbCIFFormat.h" +#include "bdWriterOptions.h" BD_PUBLIC int strm2cif (int argc, char *argv[]) { - return bd::converter_main (argc, argv, db::CIFWriterOptions ().format_name ()); + return bd::converter_main (argc, argv, bd::GenericWriterOptions::cif_format_name); } diff --git a/src/buddies/src/bd/strm2dxf.cc b/src/buddies/src/bd/strm2dxf.cc index bfdb480f2..4ddc26cda 100644 --- a/src/buddies/src/bd/strm2dxf.cc +++ b/src/buddies/src/bd/strm2dxf.cc @@ -21,9 +21,9 @@ */ #include "bdConverterMain.h" -#include "dbDXFFormat.h" +#include "bdWriterOptions.h" BD_PUBLIC int strm2dxf (int argc, char *argv[]) { - return bd::converter_main (argc, argv, db::DXFWriterOptions ().format_name ()); + return bd::converter_main (argc, argv, bd::GenericWriterOptions::dxf_format_name); } diff --git a/src/buddies/src/bd/strm2gds.cc b/src/buddies/src/bd/strm2gds.cc index 55f5198cf..b9d8ebdc1 100644 --- a/src/buddies/src/bd/strm2gds.cc +++ b/src/buddies/src/bd/strm2gds.cc @@ -21,9 +21,9 @@ */ #include "bdConverterMain.h" -#include "dbGDS2Format.h" +#include "bdWriterOptions.h" BD_PUBLIC int strm2gds (int argc, char *argv[]) { - return bd::converter_main (argc, argv, db::GDS2WriterOptions ().format_name ()); + return bd::converter_main (argc, argv, bd::GenericWriterOptions::gds2_format_name); } diff --git a/src/buddies/src/bd/strm2gdstxt.cc b/src/buddies/src/bd/strm2gdstxt.cc index 403beacea..590e49a33 100644 --- a/src/buddies/src/bd/strm2gdstxt.cc +++ b/src/buddies/src/bd/strm2gdstxt.cc @@ -21,9 +21,9 @@ */ #include "bdConverterMain.h" -#include "dbGDS2Format.h" +#include "bdWriterOptions.h" BD_PUBLIC int strm2gdstxt (int argc, char *argv[]) { - return bd::converter_main (argc, argv, db::GDS2WriterOptions ().format_name () + "Text"); + return bd::converter_main (argc, argv, bd::GenericWriterOptions::gds2text_format_name); } diff --git a/src/buddies/src/bd/strm2oas.cc b/src/buddies/src/bd/strm2oas.cc index 51df95a69..f70ba59c9 100644 --- a/src/buddies/src/bd/strm2oas.cc +++ b/src/buddies/src/bd/strm2oas.cc @@ -21,9 +21,9 @@ */ #include "bdConverterMain.h" -#include "dbOASISFormat.h" +#include "bdWriterOptions.h" BD_PUBLIC int strm2oas (int argc, char *argv[]) { - return bd::converter_main (argc, argv, db::OASISWriterOptions ().format_name ()); + return bd::converter_main (argc, argv, bd::GenericWriterOptions::gds2_format_name); }