nemiver r885 - in trunk: . src/persp/dbgperspective

[dodji svn gnome org]

Author: dodji
Date: Tue Jul  8 22:16:28 2008
New Revision: 885
URL: http://svn.gnome.org/viewvc/nemiver?rev=885&view=rev

Log:
properly close 524168 - make LocalVarInspector2 the default variable inspector


Modified:
   trunk/ChangeLog
   trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc
   trunk/src/persp/dbgperspective/nmv-local-vars-inspector.cc
   trunk/src/persp/dbgperspective/nmv-local-vars-inspector.h
   trunk/src/persp/dbgperspective/nmv-variables-utils.h

Modified: trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc	(original)
+++ trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc	Tue Jul  8 22:16:28 2008
@@ -547,7 +547,7 @@
 
     Gtk::HPaned& get_call_stack_paned () ;
 
-    LocalVarsInspector2& get_local_vars_inspector () ;
+    LocalVarsInspector& get_local_vars_inspector () ;
 
     Gtk::ScrolledWindow& get_local_vars_inspector_scrolled_win () ;
 
@@ -746,7 +746,7 @@
 #endif // WITH_GIO
     Path2MonitorMap path_2_monitor_map;
     Gtk::Notebook *statuses_notebook ;
-    SafePtr<LocalVarsInspector2> variables_editor ;
+    SafePtr<LocalVarsInspector> variables_editor ;
     SafePtr<Gtk::ScrolledWindow> variables_editor_scrolled_win ;
     SafePtr<Terminal> terminal ;
     SafePtr<Gtk::Box> terminal_box ;
@@ -5686,7 +5686,7 @@
     return *m_priv->thread_list_scrolled_win ;
 }
 
-LocalVarsInspector2&
+LocalVarsInspector&
 DBGPerspective::get_local_vars_inspector ()
 {
     THROW_IF_FAIL (m_priv) ;
@@ -5694,9 +5694,9 @@
 
     if (!m_priv->variables_editor) {
         m_priv->variables_editor.reset
-            (new LocalVarsInspector2 (debugger (),
-                                      *m_priv->workbench,
-                                      *this)) ;
+            (new LocalVarsInspector (debugger (),
+                                     *m_priv->workbench,
+                                     *this)) ;
     }
     THROW_IF_FAIL (m_priv->variables_editor) ;
     return *m_priv->variables_editor ;

Modified: trunk/src/persp/dbgperspective/nmv-local-vars-inspector.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-local-vars-inspector.cc	(original)
+++ trunk/src/persp/dbgperspective/nmv-local-vars-inspector.cc	Tue Jul  8 22:16:28 2008
@@ -42,7 +42,7 @@
 
 NEMIVER_BEGIN_NAMESPACE (nemiver)
 
-struct LocalVarsInspector2::Priv : public sigc::trackable {
+struct LocalVarsInspector::Priv : public sigc::trackable {
 private:
     Priv ();
 public:
@@ -221,7 +221,7 @@
             local_var_list_walker->variable_visited_signal ().connect
             (sigc::mem_fun
              (*this,
-              &LocalVarsInspector2::Priv::on_local_variable_visited_signal));
+              &LocalVarsInspector::Priv::on_local_variable_visited_signal));
         }
         return local_var_list_walker;
     }
@@ -234,7 +234,7 @@
             function_args_var_list_walker->variable_visited_signal ().connect
             (sigc::mem_fun
              (*this,
-              &LocalVarsInspector2::Priv::on_func_arg_visited_signal));
+              &LocalVarsInspector::Priv::on_func_arg_visited_signal));
         }
         return function_args_var_list_walker;
     }
@@ -247,7 +247,7 @@
             derefed_variables_walker_list->variable_visited_signal ().connect
             (sigc::mem_fun
              (*this,
-              &LocalVarsInspector2::Priv::on_derefed_variable_visited_signal));
+              &LocalVarsInspector::Priv::on_derefed_variable_visited_signal));
         }
         return derefed_variables_walker_list;
     }
@@ -837,22 +837,22 @@
         ui_utils::display_info (message);
     }
 
-};//end LocalVarInspector2::Priv
+};//end LocalVarsInspector::Priv
 
-LocalVarsInspector2::LocalVarsInspector2 (IDebuggerSafePtr &a_debugger,
+LocalVarsInspector::LocalVarsInspector (IDebuggerSafePtr &a_debugger,
                                           IWorkbench &a_workbench,
                                           IPerspective &a_perspective)
 {
     m_priv.reset (new Priv (a_debugger, a_workbench, a_perspective));
 }
 
-LocalVarsInspector2::~LocalVarsInspector2 ()
+LocalVarsInspector::~LocalVarsInspector ()
 {
     LOG_D ("deleted", "destructor-domain");
 }
 
 Gtk::Widget&
-LocalVarsInspector2::widget () const
+LocalVarsInspector::widget () const
 {
     THROW_IF_FAIL (m_priv);
     THROW_IF_FAIL (m_priv->tree_view);
@@ -860,7 +860,7 @@
 }
 
 void
-LocalVarsInspector2::show_local_variables_of_current_function ()
+LocalVarsInspector::show_local_variables_of_current_function ()
 {
     LOG_FUNCTION_SCOPE_NORMAL_DD;
     THROW_IF_FAIL (m_priv);
@@ -872,7 +872,7 @@
 }
 
 void
-LocalVarsInspector2::re_init_widget ()
+LocalVarsInspector::re_init_widget ()
 {
     LOG_FUNCTION_SCOPE_NORMAL_DD;
     THROW_IF_FAIL (m_priv);

Modified: trunk/src/persp/dbgperspective/nmv-local-vars-inspector.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-local-vars-inspector.h	(original)
+++ trunk/src/persp/dbgperspective/nmv-local-vars-inspector.h	Tue Jul  8 22:16:28 2008
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NMV_LOCAL_VARS_INSPECTOR2_H__
-#define __NMV_LOCAL_VARS_INSPECTOR2_H__
+#ifndef __NMV_LOCAL_VARS_INSPECTOR_H__
+#define __NMV_LOCAL_VARS_INSPECTOR_H__
 
 #include <list>
 #include "common/nmv-object.h"
@@ -39,23 +39,23 @@
 
 class IWorkbench ;
 
-class NEMIVER_API LocalVarsInspector2 : public nemiver::common::Object {
+class NEMIVER_API LocalVarsInspector : public nemiver::common::Object {
     //non copyable
-    LocalVarsInspector2 (const LocalVarsInspector2&) ;
-    LocalVarsInspector2& operator= (const LocalVarsInspector2&) ;
+    LocalVarsInspector (const LocalVarsInspector&) ;
+    LocalVarsInspector& operator= (const LocalVarsInspector&) ;
 
     struct Priv ;
     SafePtr<Priv> m_priv ;
 
 protected:
-    LocalVarsInspector2 () ;
+    LocalVarsInspector () ;
 
 public:
 
-    LocalVarsInspector2 (IDebuggerSafePtr &a_dbg,
+    LocalVarsInspector (IDebuggerSafePtr &a_dbg,
                          IWorkbench &a_wb,
                          IPerspective &a_perspective) ;
-    virtual ~LocalVarsInspector2 () ;
+    virtual ~LocalVarsInspector () ;
     Gtk::Widget& widget () const ;
     void set_local_variables
                     (const std::list<IDebugger::VariableSafePtr> &a_vars) ;
@@ -64,6 +64,6 @@
 };//end LocalVarsInspector
 
 NEMIVER_END_NAMESPACE (nemiver)
-#endif //__NMV_LOCAL_VARS_INSPECTOR2_H__
+#endif //__NMV_LOCAL_VARS_INSPECTOR_H__
 
 

Modified: trunk/src/persp/dbgperspective/nmv-variables-utils.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-variables-utils.h	(original)
+++ trunk/src/persp/dbgperspective/nmv-variables-utils.h	Tue Jul  8 22:16:28 2008
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NMV_VARIABLES_UTILS2_H__
-#define __NMV_VARIABLES_UTILS2_H__
+#ifndef __NMV_VARIABLES_UTILS_H__
+#define __NMV_VARIABLES_UTILS_H__
 
 #include <list>
 #include <gtkmm/treeview.h>
@@ -104,5 +104,5 @@
 NEMIVER_END_NAMESPACE (variables_utils2)
 NEMIVER_END_NAMESPACE (nemiver)
 
-#endif //__NMV_VARIABLES_UTILS2_H__
+#endif //__NMV_VARIABLES_UTILS_H__