Refactoring: layColor -> tlColor

src/plugins/tools/net_tracer/lay_plugin/layNetTracerDialog.cc

@@ -477,7 +477,7 @@ NetTracerDialog::configure (const std::string &name, const std::string &value)
 
   } else if (name == cfg_nt_marker_color) {
 
-    lay::Color color;
+    tl::Color color;
     if (! value.empty ()) {
       lay::ColorConverter ().from_string (value, color);
     }
@@ -1093,7 +1093,7 @@ NetTracerDialog::update_list ()
 
     item->setData (Qt::DisplayRole, tl::to_qstring (mp_nets [i]->name ()));
 
-    if (lay::Color (mp_nets [i]->color ()).is_valid ()) {
+    if (tl::Color (mp_nets [i]->color ()).is_valid ()) {
 
       QPixmap pxmp (icon_size);
       QPainter pxpainter (&pxmp);
@@ -1596,7 +1596,7 @@ NetTracerDialog::update_highlights ()
 
       std::map <unsigned int, unsigned int> llmap;
 
-      lay::Color net_color = mp_nets [item_index]->color ();
+      tl::Color net_color = mp_nets [item_index]->color ();
 
       //  Create markers for the shapes 
       for (db::NetTracerNet::iterator net_shape = mp_nets [item_index]->begin (); net_shape != mp_nets [item_index]->end () && n_marker < m_max_marker_count; ++net_shape) {

src/plugins/tools/net_tracer/lay_plugin/layNetTracerDialog.h

@@ -92,7 +92,7 @@ private:
   nt_window_type m_window;
   double m_window_dim;
   unsigned int m_max_marker_count;
-  lay::Color m_marker_color;
+  tl::Color m_marker_color;
   int m_marker_line_width;
   int m_marker_vertex_size;
   int m_marker_halo;

src/plugins/tools/view_25d/lay_plugin/layD25View.cc

@@ -196,7 +196,7 @@ D25View::begin (const std::string &generator)
 }
 
 void
-D25View::open_display (const color_t *frame_color, const color_t *fill_color, const db::LayerProperties *like, const std::string *name)
+D25View::open_display (const tl::color_t *frame_color, const tl::color_t *fill_color, const db::LayerProperties *like, const std::string *name)
 {
   if (! mp_ui->d25_view->has_error ()) {
     mp_ui->d25_view->open_display (frame_color, fill_color, like, name);

src/plugins/tools/view_25d/lay_plugin/layD25View.h

@@ -68,7 +68,7 @@ public:
   void close ();
   void clear ();
   void begin (const std::string &generator);
-  void open_display (const color_t *frame_color, const color_t *fill_color, const db::LayerProperties *like, const std::string *name);
+  void open_display (const tl::color_t *frame_color, const tl::color_t *fill_color, const db::LayerProperties *like, const std::string *name);
   void close_display ();
   void entry (const db::Region &data, double dbu, double zstart, double zstop);
   void entry_edge (const db::Edges &data, double dbu, double zstart, double zstop);

src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.cc

@@ -531,7 +531,7 @@ D25ViewWidget::clear ()
   }
 }
 
-static void color_to_gl (color_t color, GLfloat (&gl_color) [4])
+static void color_to_gl (tl::color_t color, GLfloat (&gl_color) [4])
 {
   gl_color[0] = ((color >> 16) & 0xff) / 255.0f;
   gl_color[1] = ((color >> 8) & 0xff) / 255.0f;
@@ -539,7 +539,7 @@ static void color_to_gl (color_t color, GLfloat (&gl_color) [4])
   gl_color[3] = 1.0f;
 }
 
-static void color_to_gl (const color_t *color, GLfloat (&gl_color) [4])
+static void color_to_gl (const tl::color_t *color, GLfloat (&gl_color) [4])
 {
   if (! color) {
     for (unsigned int i = 0; i < 4; ++i) {
@@ -567,7 +567,7 @@ static void lp_to_info (const lay::LayerPropertiesNode &lp, D25ViewWidget::Layer
 }
 
 void
-D25ViewWidget::open_display (const color_t *frame_color, const color_t *fill_color, const db::LayerProperties *like, const std::string *name)
+D25ViewWidget::open_display (const tl::color_t *frame_color, const tl::color_t *fill_color, const db::LayerProperties *like, const std::string *name)
 {
   m_vertex_chunks.push_back (triangle_chunks_type ());
   m_line_chunks.push_back (line_chunks_type ());
@@ -648,7 +648,7 @@ D25ViewWidget::enter (const db::RecursiveShapeIterator *iter, double zstart, dou
     } else {
 
       //  sequential assignment
-      lay::color_t color = mp_view->get_palette ().luminous_color_by_index (m_layers.size ());
+      tl::color_t color = mp_view->get_palette ().luminous_color_by_index (m_layers.size ());
       color_to_gl (color, info.fill_color);
 
     }
@@ -1089,7 +1089,7 @@ D25ViewWidget::paintGL ()
   const qreal retina_scale = devicePixelRatio ();
   glViewport (0, 0, width () * retina_scale, height () * retina_scale);
 
-  lay::Color c = mp_view->background_color ();
+  tl::Color c = mp_view->background_color ();
   float foreground_rgb = (c.to_mono () ? 0.0f : 1.0f);
   float ambient = (c.to_mono () ? 0.8f : 0.25f);
   float mist_factor = (c.to_mono () ? 0.2f : 0.4f);

src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.h

@@ -159,7 +159,7 @@ public:
   void set_material_visible (size_t index, bool visible);
 
   void clear ();
-  void open_display (const color_t *frame_color, const color_t *fill_color, const db::LayerProperties *like, const std::string *name);
+  void open_display (const tl::color_t *frame_color, const tl::color_t *fill_color, const db::LayerProperties *like, const std::string *name);
   void close_display ();
   void entry (const db::Region &data, double dbu, double zstart, double zstop);
   void entry (const db::Edges &data, double dbu, double zstart, double zstop);