[nemiver] Revert "Initial import of variable monitor work"

[Dodji Seketeli <dodji src gnome org>]

commit b945e27067520ae2d2f7a27fff3533c3f4dccee2
Author: Dodji Seketeli <dodji seketeli org>
Date:   Sun Nov 13 19:43:53 2011 +0100

    Revert "Initial import of variable monitor work"
    
    This reverts commit 11940f85da451c6b933f59e255863dba01f1001b.

 src/dbgengine/nmv-i-debugger.h                     |   50 +---
 src/persp/dbgperspective/Makefile.am               |    2 -
 src/persp/dbgperspective/menus/menus.xml           |    2 -
 .../nmv-dbg-perspective-default-layout.cc          |    2 +-
 src/persp/dbgperspective/nmv-dbg-perspective.cc    |   55 +---
 src/persp/dbgperspective/nmv-dbg-perspective.h     |    3 +-
 src/persp/dbgperspective/nmv-variables-utils.cc    |   27 +--
 src/persp/dbgperspective/nmv-variables-utils.h     |    8 +-
 src/persp/dbgperspective/nmv-vars-monitor.cc       |  359 --------------------
 src/persp/dbgperspective/nmv-vars-monitor.h        |   67 ----
 10 files changed, 13 insertions(+), 562 deletions(-)
---
diff --git a/src/dbgengine/nmv-i-debugger.h b/src/dbgengine/nmv-i-debugger.h
index d9232b0..6fb5fff 100644
--- a/src/dbgengine/nmv-i-debugger.h
+++ b/src/dbgengine/nmv-i-debugger.h
@@ -351,7 +351,7 @@ public:
         FrameArgsSlot;
 
     typedef sigc::slot<void, const VariableSafePtr> ConstVariableSlot;
-    typedef sigc::slot<void, const VariableList&> ConstVariableListSlot;
+    typedef sigc::slot<void, const VariableList> ConstVariableListSlot;
     typedef sigc::slot<void, const UString&> ConstUStringSlot;
 
     class Variable : public Object {
@@ -507,7 +507,7 @@ public:
 
         /// Tests value equality between two variables.
         /// Two variables are considered equal by value if their
-        /// respective members have the same values and same type.
+        /// respective memebers have the same values and same type.
         /// \param a_other the other variable to test against
         /// \return true if a_other equals the current instance
         ///         by value.
@@ -579,28 +579,6 @@ public:
             return m_parent != 0;
         }
 
-        /// If this variable has a backend counterpart (e.g GDB
-        /// Backend variable object) then, there are cases where a
-        /// variable sub-object can be returned by the backend without
-        /// being linked to its ancestor tree.  Such a variable
-        /// appears as being structurally root (it has no parent), but
-        /// is morally a sub-variable.  A variable that is
-        /// structurally non-root is also morally non-root.
-        ///
-        /// To know if a variable is morally root, this function
-        /// detects if the fully qualified internal name of the
-        /// variable has dot (".") in it (e.g, "variable.member").  If
-        /// does not, then the function assumes the variable is
-        /// morally root and returns true.
-        bool is_morally_root () const
-        {
-            if (has_parent ())
-                return false;
-            if (internal_name ().empty ())
-                return !has_parent ();
-            return (internal_name ().find (".") == UString::npos);
-        }
-
         /// A getter of the parent Variable of the current instance.
         const VariableSafePtr parent () const
         {
@@ -1117,12 +1095,6 @@ public:
     virtual sigc::signal<void, const VariableSafePtr, const UString&>&
                                  variable_expression_evaluated_signal () const = 0;
 
-    /// This is a callback slot called upon completion of the
-    /// IDebugger::list_changed_variables entry point.
-    ///
-    /// The parameters of are the slots are: the list of variables
-    /// that changed, and the cookie passed to
-    /// IDebugger::list_changed_variables.
     virtual sigc::signal<void, const VariableList&, const UString&>&
                                 changed_variables_signal () const  = 0;
 
@@ -1445,26 +1417,8 @@ public:
              const ConstVariableSlot &a_slot,
              const UString &a_cookie = "")= 0;
 
-    /// List the sub-variables of a_root (included a_root) which value
-    /// changed since the last time this function was called.
-    ///
-    /// \param a_root the variable to consider
-    /// \a_cookie the cookie to be passed to the callback function
-    /// IDebugger::changed_variables_signal
     virtual void list_changed_variables (VariableSafePtr a_root,
                                          const UString &a_cookie = "") = 0;
-
-    /// List the sub-variables of a_root (included a_root) which value
-    /// changed since the last time this function was called.
-    ///
-    /// \param a_root the variable to consider
-    /// 
-    /// \param a_slot the slot to be invoked upon completion of this
-    /// function.  That slot is going to be passed the list of
-    /// sub-variables that have changed.
-    /// 
-    /// \a_cookie the cookie to be passed to the callback function
-    /// IDebugger::changed_variables_signal
     virtual void list_changed_variables
             (VariableSafePtr a_root,
              const ConstVariableListSlot &a_slot,
diff --git a/src/persp/dbgperspective/Makefile.am b/src/persp/dbgperspective/Makefile.am
index e79cca7..7852432 100644
--- a/src/persp/dbgperspective/Makefile.am
+++ b/src/persp/dbgperspective/Makefile.am
@@ -42,8 +42,6 @@ $(h)/nmv-global-vars-inspector-dialog.cc \
 $(h)/nmv-global-vars-inspector-dialog.h \
 $(h)/nmv-var-inspector.cc \
 $(h)/nmv-var-inspector.h \
-$(h)/nmv-vars-monitor.cc \
-$(h)/nmv-vars-monitor.h \
 $(h)/nmv-breakpoints-view.cc \
 $(h)/nmv-breakpoints-view.h \
 $(h)/nmv-registers-view.cc \
diff --git a/src/persp/dbgperspective/menus/menus.xml b/src/persp/dbgperspective/menus/menus.xml
index d8fa0f9..9273add 100644
--- a/src/persp/dbgperspective/menus/menus.xml
+++ b/src/persp/dbgperspective/menus/menus.xml
@@ -42,8 +42,6 @@
                 name="ActivateBreakpointsViewMenuItem"/>
             <menuitem action="ActivateRegistersViewMenuAction"
                 name="ActivateRegistersViewMenuItem"/>
-	    <menuitem action="ActivateVarsMonitorViewMenuAction"
-                name="ActivateVarsMonitorViewMenuItem"/>
         </menu>
         <menu action="DebugMenuAction" name="DebugMenu">
             <menuitem action="RunMenuItemAction" name="RunMenuItem"/>
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective-default-layout.cc b/src/persp/dbgperspective/nmv-dbg-perspective-default-layout.cc
index 0c366eb..05f7619 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective-default-layout.cc
+++ b/src/persp/dbgperspective/nmv-dbg-perspective-default-layout.cc
@@ -186,8 +186,8 @@ DBGPerspectiveDefaultLayout::add_view (Gtk::Widget &a_widget,
         return;
     }
 
-    a_widget.show_all ();
     m_priv->views.insert (std::make_pair<int, Gtk::Widget&> (a_index, a_widget));
+    a_widget.show_all ();
     int page_num = m_priv->statuses_notebook->insert_page (a_widget,
                                                            a_title,
                                                            a_index);
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
index 48f4126..89e4fea 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
+++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
@@ -97,7 +97,6 @@
 #include "nmv-dbg-perspective-dynamic-layout.h"
 #endif // WITH_DYNAMICLAYOUT
 #include "nmv-layout-manager.h"
-#include "nmv-vars-monitor.h"
 
 using namespace std;
 using namespace nemiver::common;
@@ -115,12 +114,11 @@ const char *STEP_OVER         = "nmv-step-over";
 const char *STEP_OUT          = "nmv-step-out";
 
 // labels for widget tabs in the status notebook
-const char *CONTEXT_VIEW_TITLE           = _("Context");
-const char *TARGET_TERMINAL_VIEW_TITLE   = _("Target Terminal");
-const char *BREAKPOINTS_VIEW_TITLE       = _("Breakpoints");
-const char *REGISTERS_VIEW_TITLE         = _("Registers");
-const char *MEMORY_VIEW_TITLE            = _("Memory");
-const char *VARS_MONITOR_VIEW_TITLE      = _("Variables Monitor");
+const char *CONTEXT_VIEW_TITLE         = _("Context");
+const char *TARGET_TERMINAL_VIEW_TITLE = _("Target Terminal");
+const char *BREAKPOINTS_VIEW_TITLE     = _("Breakpoints");
+const char *REGISTERS_VIEW_TITLE       = _("Registers");
+const char *MEMORY_VIEW_TITLE          = _("Memory");
 
 const char *SESSION_NAME = "sessionname";
 const char *PROGRAM_NAME = "programname";
@@ -421,7 +419,6 @@ private:
 #ifdef WITH_MEMORYVIEW
     void on_activate_memory_view ();
 #endif // WITH_MEMORYVIEW
-    void on_activate_vars_monitor_view ();
     void on_activate_global_variables ();
     void on_default_config_read ();
 
@@ -760,8 +757,6 @@ public:
     MemoryView& get_memory_view ();
 #endif // WITH_MEMORYVIEW
 
-    VarsMonitor& get_vars_monitor_view ();
-
     ThreadList& get_thread_list ();
 
     bool set_where (const IDebugger::Frame &a_frame,
@@ -912,7 +907,6 @@ struct DBGPerspective::Priv {
 #ifdef WITH_MEMORYVIEW
     SafePtr<MemoryView> memory_view;
 #endif // WITH_MEMORYVIEW
-    SafePtr<VarsMonitor> vars_monitor;
 
     int current_page_num;
     IDebuggerSafePtr debugger;
@@ -1840,7 +1834,6 @@ DBGPerspective::on_going_to_run_target_signal ()
     get_memory_view ().clear ();
 #endif
     get_registers_view ().clear ();
-    get_vars_monitor_view ().re_init_widget ();;
     NEMIVER_CATCH
 }
 
@@ -2875,19 +2868,6 @@ DBGPerspective::on_activate_memory_view ()
 #endif //WITH_MEMORYVIEW
 
 void
-DBGPerspective::on_activate_vars_monitor_view ()
-{
-    LOG_FUNCTION_SCOPE_NORMAL_DD;
-
-    NEMIVER_TRY;
-
-    THROW_IF_FAIL (m_priv);
-    m_priv->layout ().activate_view (VARS_MONITOR_VIEW_INDEX);
-
-    NEMIVER_CATCH;
-}
-
-void
 DBGPerspective::on_activate_global_variables ()
 {
     LOG_FUNCTION_SCOPE_NORMAL_DD;
@@ -3418,16 +3398,6 @@ DBGPerspective::init_actions ()
         },
 #endif // WITH_MEMORYVIEW
         {
-            "ActivateVarsMonitorViewMenuAction",
-            nil_stock_id,
-            VARS_MONITOR_VIEW_TITLE,
-            _("Switch to Variables Monitor View"),
-            sigc::mem_fun (*this, &DBGPerspective::on_activate_vars_monitor_view),
-            ActionEntry::DEFAULT,
-            "<alt>6",
-            false
-        },
-        {
             "DebugMenuAction",
             nil_stock_id,
             _("_Debug"),
@@ -3822,7 +3792,6 @@ DBGPerspective::clear_status_notebook ()
 #ifdef WITH_MEMORYVIEW
     get_memory_view ().clear ();
 #endif // WITH_MEMORYVIEW
-    get_vars_monitor_view ().re_init_widget ();
 }
 
 void
@@ -4962,9 +4931,6 @@ DBGPerspective::add_views_to_layout ()
     m_priv->layout ().add_view (get_terminal_box (),
                                 TARGET_TERMINAL_VIEW_TITLE,
                                 TARGET_TERMINAL_VIEW_INDEX);
-    m_priv->layout ().add_view (get_vars_monitor_view ().widget (),
-                                VARS_MONITOR_VIEW_TITLE,
-                                VARS_MONITOR_VIEW_INDEX);
 
     m_priv->layout ().do_init ();
 
@@ -8126,17 +8092,6 @@ DBGPerspective::get_memory_view ()
 }
 #endif // WITH_MEMORYVIEW
 
-VarsMonitor&
-DBGPerspective::get_vars_monitor_view ()
-{
-    THROW_IF_FAIL (m_priv);
-
-    if (!m_priv->vars_monitor)
-        m_priv->vars_monitor.reset (new VarsMonitor (*debugger (),
-                                                     *this));
-    THROW_IF_FAIL (m_priv->vars_monitor);
-    return *m_priv->vars_monitor;
-}
 
 struct ScrollTextViewToEndClosure {
     Gtk::TextView* text_view;
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.h b/src/persp/dbgperspective/nmv-dbg-perspective.h
index 1eced95..ddb00ff 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective.h
+++ b/src/persp/dbgperspective/nmv-dbg-perspective.h
@@ -47,9 +47,8 @@ enum ViewsIndex
     BREAKPOINTS_VIEW_INDEX,
     REGISTERS_VIEW_INDEX,
 #ifdef WITH_MEMORYVIEW
-    MEMORY_VIEW_INDEX,
+    MEMORY_VIEW_INDEX
 #endif // WITH_MEMORYVIEW
-    VARS_MONITOR_VIEW_INDEX
 };
 
 class SourceEditor;
diff --git a/src/persp/dbgperspective/nmv-variables-utils.cc b/src/persp/dbgperspective/nmv-variables-utils.cc
index 2eed442..cb05a9a 100644
--- a/src/persp/dbgperspective/nmv-variables-utils.cc
+++ b/src/persp/dbgperspective/nmv-variables-utils.cc
@@ -494,7 +494,7 @@ update_a_variable_real (const IDebugger::VariableSafePtr a_var,
 /// variable is added as the root node of the tree view widget.
 /// \return true if a_var was added, false otherwise.
 bool
-append_a_variable (const IDebugger::VariableSafePtr &a_var,
+append_a_variable (const IDebugger::VariableSafePtr a_var,
                    const Gtk::TreeView &a_tree_view,
                    const Glib::RefPtr<Gtk::TreeStore> &a_tree_store,
                    Gtk::TreeModel::iterator &a_parent_row_it,
@@ -521,7 +521,7 @@ append_a_variable (const IDebugger::VariableSafePtr &a_var,
 /// the function returned true.
 /// \return true if a_var was added, false otherwise.
 bool
-append_a_variable (const IDebugger::VariableSafePtr &a_var,
+append_a_variable (const IDebugger::VariableSafePtr a_var,
                    const Gtk::TreeView &a_tree_view,
                    const Glib::RefPtr<Gtk::TreeStore> &a_tree_store,
                    Gtk::TreeModel::iterator &a_parent_row_it,
@@ -617,29 +617,6 @@ set_a_variable (const IDebugger::VariableSafePtr a_var,
     return true;
 }
 
-/// Unlike the graphical node representing a variable a_var.
-///
-/// \param a_var the variable which graphical node to unlink.
-///
-/// \param a_store the tree store of the tree view to act upon.
-///
-/// \param a_parent_row_it the parent graphical row under which we
-/// have to look to find the graphical node to unlink.
-///
-/// \return true upon successful unlinking, false otherwise.
-bool
-unlink_a_variable_row (const IDebugger::VariableSafePtr &a_var,
-                       const Glib::RefPtr<Gtk::TreeStore> &a_store,
-                       Gtk::TreeModel::iterator &a_parent_row_it)
-{
-    Gtk::TreeModel::iterator var_to_unlink_it;
-    if (!find_a_variable (a_var, a_parent_row_it, var_to_unlink_it))
-        return false;
-
-    a_store->erase (var_to_unlink_it);
-    return true;
-}
-
 /// Unlink the graphical nodes representing the member variables of
 /// the variable pointed to by the given row iterator.
 ///
diff --git a/src/persp/dbgperspective/nmv-variables-utils.h b/src/persp/dbgperspective/nmv-variables-utils.h
index 0017f2b..d650ec2 100644
--- a/src/persp/dbgperspective/nmv-variables-utils.h
+++ b/src/persp/dbgperspective/nmv-variables-utils.h
@@ -113,13 +113,13 @@ bool update_a_variable (const IDebugger::VariableSafePtr a_var,
                         bool a_is_new_frame,
                         bool a_update_members = false);
 
-bool append_a_variable (const IDebugger::VariableSafePtr &a_var,
+bool append_a_variable (const IDebugger::VariableSafePtr a_var,
                         const Gtk::TreeView &a_tree_view,
                         const Glib::RefPtr<Gtk::TreeStore> &a_tree_store,
                         Gtk::TreeModel::iterator &a_parent_row_it,
                         bool a_truncate_type);
 
-bool append_a_variable (const IDebugger::VariableSafePtr &a_var,
+bool append_a_variable (const IDebugger::VariableSafePtr a_var,
                         const Gtk::TreeView &a_tree_view,
                         const Glib::RefPtr<Gtk::TreeStore> &a_tree_store,
                         Gtk::TreeModel::iterator &a_parent_row_it,
@@ -132,10 +132,6 @@ bool set_a_variable (const IDebugger::VariableSafePtr a_var,
 		     Gtk::TreeModel::iterator a_row_it,
 		     bool a_truncate_type);
 
-bool unlink_a_variable_row (const IDebugger::VariableSafePtr &a_var,
-			    const Glib::RefPtr<Gtk::TreeStore> &a_store,
-			    Gtk::TreeModel::iterator &a_parent_row_it);
-
 bool unlink_member_variable_rows (const Gtk::TreeModel::iterator &a_row_it,
 				  const Glib::RefPtr<Gtk::TreeStore> &a_store);