From a0cbc2355aaaeb96f52c68674c7f53da87bc41dd Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Mon, 7 Mar 2022 21:49:48 +0100
Subject: [PATCH] Some cleanup

---
 src/gtfui/gtfUiDialog.cc                                  | 2 +-
 src/plugins/tools/view_25d/lay_plugin/D25View.ui          | 3 +++
 src/plugins/tools/view_25d/lay_plugin/layD25View.cc       | 6 +++---
 src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.cc | 1 -
 src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.h  | 2 --
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gtfui/gtfUiDialog.cc b/src/gtfui/gtfUiDialog.cc
index 395dc2eec..504760616 100644
--- a/src/gtfui/gtfUiDialog.cc
+++ b/src/gtfui/gtfUiDialog.cc
@@ -264,7 +264,7 @@ static std::string
 log_event_to_text (const gtf::LogEventBase *e)
 {
   std::string t = e->name ();
-  /* @@@ too much:
+  /* too much:
   std::vector< std::pair<std::string, std::string> > attrs;
   e->attributes (attrs);
   for (std::vector< std::pair<std::string, std::string> >::const_iterator a = attrs.begin (); a != attrs.end (); ++a) {
diff --git a/src/plugins/tools/view_25d/lay_plugin/D25View.ui b/src/plugins/tools/view_25d/lay_plugin/D25View.ui
index 9fa88b45a..a38817f62 100644
--- a/src/plugins/tools/view_25d/lay_plugin/D25View.ui
+++ b/src/plugins/tools/view_25d/lay_plugin/D25View.ui
@@ -61,6 +61,9 @@
       </property>
       <item>
        <widget class="QToolButton" name="rerun_button">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
         <property name="toolTip">
          <string>Execute script again</string>
         </property>
diff --git a/src/plugins/tools/view_25d/lay_plugin/layD25View.cc b/src/plugins/tools/view_25d/lay_plugin/layD25View.cc
index e01ad1507..019dedecd 100644
--- a/src/plugins/tools/view_25d/lay_plugin/layD25View.cc
+++ b/src/plugins/tools/view_25d/lay_plugin/layD25View.cc
@@ -68,9 +68,8 @@ D25View::D25View (lay::Dispatcher *root, lay::LayoutView *view)
   connect (mp_ui->show_all_action, SIGNAL (triggered()), this, SLOT (show_all_triggered()));
   connect (mp_ui->show_selected_action, SIGNAL (triggered()), this, SLOT (show_selected_triggered()));
 
-  mp_ui->rerun_button->setEnabled (false);
-
   mp_ui->gl_stack->setCurrentIndex (2);
+  mp_ui->rerun_button->setEnabled (false);
 
   lay::activate_help_links (mp_ui->doc_label);
   lay::activate_help_links (mp_ui->empty_label);
@@ -193,7 +192,6 @@ D25View::begin (const std::string &generator)
 
   if (! mp_ui->d25_view->has_error ()) {
     m_generator = generator;
-    mp_ui->rerun_button->setEnabled (true);
   }
 }
 
@@ -293,6 +291,7 @@ D25View::finish ()
     //  NOTE: needs to be delayed to allow the geometry to be updated before (initial call)
     dm_fit ();
 
+    mp_ui->rerun_button->setEnabled (true);
     mp_ui->gl_stack->setCurrentIndex (0);
 
   }
@@ -314,6 +313,7 @@ D25View::init_failed ()
 {
   mp_ui->error_text->setPlainText (tl::to_qstring (mp_ui->d25_view->error ()));
   mp_ui->gl_stack->setCurrentIndex (1);
+  mp_ui->rerun_button->setEnabled (false);
 }
 
 void
diff --git a/src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.cc b/src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.cc
index 131119032..94e7f2705 100644
--- a/src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.cc
+++ b/src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.cc
@@ -517,7 +517,6 @@ void
 D25ViewWidget::clear ()
 {
   m_layers.clear ();
-  m_layer_to_info.clear ();
   m_vertex_chunks.clear ();
   m_line_chunks.clear ();
 
diff --git a/src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.h b/src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.h
index 843a41681..af5dd0a54 100644
--- a/src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.h
+++ b/src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.h
@@ -107,7 +107,6 @@ public:
   void mouseMoveEvent (QMouseEvent *event);
 
   void attach_view(lay::LayoutView *view);
-  // @@@ void refresh_view ();
 
   QVector3D hit_point_with_scene(const QVector3D &line_dir);
   void refresh ();
@@ -198,7 +197,6 @@ private:
   std::list<line_chunks_type> m_line_chunks;
 
   std::vector<LayerInfo> m_layers;
-  std::multimap<std::pair<size_t, size_t>, size_t> m_layer_to_info; // @@@
 
   void initializeGL ();
   void paintGL ();