[nemiver] Renamed variable handling types

From: Dodji Seketeli <dodji src gnome org>
To: svn-commits-list gnome org
Subject: [nemiver] Renamed variable handling types
Date: Sun, 12 Jul 2009 08:59:55 +0000 (UTC)
commit a89de98313f9faa4e6a4321583e988dfe1e03285
Author: Dodji Seketeli <dodji redhat com>
Date:   Sun Jul 12 10:52:50 2009 +0200

    Renamed variable handling types
    
    	* src/persp/dbgperspective/nmv-local-vars-inspector.[cc|h]:
    	Renamed nmv-local-vars-inspector2.[cc|h] into this.
    	Renamed LocalVarsInspector2 into LocalVarsInspector as well.
    	* src/persp/dbgperspective/nmv-var-inspector.[cc|h]: Renamed
    	nmv-var-inspector2.[cc|h] into this. Renamed VarInspector2 into
    	VarInspector.
    	* po/POTFILES.in: Adjust.
    	* src/persp/dbgperspective/Makefile.am: Likewise.
    	* src/persp/dbgperspective/nmv-dbg-perspective.cc: Likewise.
    	* src/persp/dbgperspective/nmv-var-inspector-dialog.cc: Likewise.
    	* src/persp/dbgperspective/nmv-watchpoint-dialog.cc: Likewise.

 po/POTFILES.in                                     |    6 ++--
 src/persp/dbgperspective/Makefile.am               |    8 +++---
 src/persp/dbgperspective/nmv-dbg-perspective.cc    |   22 ++++++++--------
 ...s-inspector2.cc => nmv-local-vars-inspector.cc} |   16 +++++-----
 ...ars-inspector2.h => nmv-local-vars-inspector.h} |   14 +++++-----
 .../dbgperspective/nmv-var-inspector-dialog.cc     |    6 ++--
 ...{nmv-var-inspector2.cc => nmv-var-inspector.cc} |   28 ++++++++++----------
 .../{nmv-var-inspector2.h => nmv-var-inspector.h}  |   14 +++++-----
 src/persp/dbgperspective/nmv-watchpoint-dialog.cc  |    6 ++--
 9 files changed, 60 insertions(+), 60 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9d203b6..84ddc24 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -31,10 +31,10 @@ src/persp/dbgperspective/nmv-registers-view.cc
 src/persp/dbgperspective/nmv-run-program-dialog.cc
 src/persp/dbgperspective/nmv-saved-sessions-dialog.cc
 src/persp/dbgperspective/nmv-thread-list.cc
-src/persp/dbgperspective/nmv-var-inspector2.cc
+src/persp/dbgperspective/nmv-var-inspector.cc
 src/persp/dbgperspective/nmv-var-inspector-dialog.cc
-src/persp/dbgperspective/nmv-local-vars-inspector2.cc
-src/persp/dbgperspective/nmv-var-inspector2.cc
+src/persp/dbgperspective/nmv-local-vars-inspector.cc
+src/persp/dbgperspective/nmv-var-inspector.cc
 src/uicommon/nmv-source-editor.cc
 src/uicommon/nmv-ui-utils.cc
 src/workbench/nmv-workbench.cc
diff --git a/src/persp/dbgperspective/Makefile.am b/src/persp/dbgperspective/Makefile.am
index dc7e243..334bef1 100644
--- a/src/persp/dbgperspective/Makefile.am
+++ b/src/persp/dbgperspective/Makefile.am
@@ -48,12 +48,12 @@ nmv-call-stack.cc \
 nmv-call-stack.h \
 nmv-variables-utils.cc \
 nmv-variables-utils.h \
-nmv-local-vars-inspector2.cc \
-nmv-local-vars-inspector2.h \
+nmv-local-vars-inspector.cc \
+nmv-local-vars-inspector.h \
 nmv-global-vars-inspector-dialog.cc \
 nmv-global-vars-inspector-dialog.h \
-nmv-var-inspector2.cc \
-nmv-var-inspector2.h \
+nmv-var-inspector.cc \
+nmv-var-inspector.h \
 nmv-breakpoints-view.cc \
 nmv-breakpoints-view.h \
 nmv-registers-view.cc \
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
index a1e68fc..f1a7b53 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
+++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
@@ -75,8 +75,8 @@
 #include "nmv-ui-utils.h"
 #include "nmv-call-stack.h"
 #include "nmv-spinner-tool-item.h"
-#include "nmv-local-vars-inspector2.h"
-#include "nmv-var-inspector2.h"
+#include "nmv-local-vars-inspector.h"
+#include "nmv-var-inspector.h"
 #include "nmv-global-vars-inspector-dialog.h"
 #include "nmv-terminal.h"
 #include "nmv-breakpoints-view.h"
@@ -444,7 +444,7 @@ private:
                                          const UString &a_text);
     void show_underline_tip_at_position (int a_x, int a_y,
                                          IDebugger::VariableSafePtr a_var);
-    VarInspector2& get_popup_var_inspector ();
+    VarInspector& get_popup_var_inspector ();
     void pack_popup_var_inspector_in_new_scr_win (Gtk::ScrolledWindow *);
     void restart_mouse_immobile_timer ();
     void stop_mouse_immobile_timer ();
@@ -619,7 +619,7 @@ public:
 
     Gtk::HPaned& get_call_stack_paned ();
 
-    LocalVarsInspector2& get_local_vars_inspector ();
+    LocalVarsInspector& get_local_vars_inspector ();
 
     Gtk::ScrolledWindow& get_local_vars_inspector_scrolled_win ();
 
@@ -820,7 +820,7 @@ struct DBGPerspective::Priv {
 #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;
@@ -867,7 +867,7 @@ struct DBGPerspective::Priv {
     //<variable value popup tip related data>
     //****************************************
     SafePtr<PopupTip> popup_tip;
-    SafePtr<VarInspector2> popup_var_inspector;
+    SafePtr<VarInspector> popup_var_inspector;
     bool in_show_var_value_at_pos_transaction;
     UString var_to_popup;
     int var_popup_tip_x;
@@ -4305,15 +4305,15 @@ DBGPerspective::show_underline_tip_at_position
     get_popup_tip ().show_at_position (a_x, a_y);
 }
 
-VarInspector2&
+VarInspector&
 DBGPerspective::get_popup_var_inspector ()
 {
     LOG_FUNCTION_SCOPE_NORMAL_DD
 
     if (!m_priv->popup_var_inspector)
         m_priv->popup_var_inspector.reset
-                    (new VarInspector2 (debugger (),
-                                        *const_cast<DBGPerspective*> (this)));
+                    (new VarInspector (debugger (),
+                                       *const_cast<DBGPerspective*> (this)));
     THROW_IF_FAIL (m_priv->popup_var_inspector);
     return *m_priv->popup_var_inspector;
 }
@@ -6503,7 +6503,7 @@ DBGPerspective::get_thread_list_scrolled_win ()
     return *m_priv->thread_list_scrolled_win;
 }
 
-LocalVarsInspector2&
+LocalVarsInspector&
 DBGPerspective::get_local_vars_inspector ()
 {
     THROW_IF_FAIL (m_priv);
@@ -6511,7 +6511,7 @@ DBGPerspective::get_local_vars_inspector ()
 
     if (!m_priv->variables_editor) {
         m_priv->variables_editor.reset
-            (new LocalVarsInspector2 (debugger (),
+            (new LocalVarsInspector (debugger (),
                                      *m_priv->workbench,
                                      *this));
     }
diff --git a/src/persp/dbgperspective/nmv-local-vars-inspector2.cc b/src/persp/dbgperspective/nmv-local-vars-inspector.cc
similarity index 98%
rename from src/persp/dbgperspective/nmv-local-vars-inspector2.cc
rename to src/persp/dbgperspective/nmv-local-vars-inspector.cc
index 4bbe96d..777df0c 100644
--- a/src/persp/dbgperspective/nmv-local-vars-inspector2.cc
+++ b/src/persp/dbgperspective/nmv-local-vars-inspector.cc
@@ -30,7 +30,7 @@
 #include <gtkmm/treestore.h>
 #include <gtkmm/treerowreference.h>
 #include "common/nmv-exception.h"
-#include "nmv-local-vars-inspector2.h"
+#include "nmv-local-vars-inspector.h"
 #include "nmv-variables-utils.h"
 #include "nmv-ui-utils.h"
 #include "nmv-i-workbench.h"
@@ -45,7 +45,7 @@ using Glib::RefPtr;
 
 NEMIVER_BEGIN_NAMESPACE (nemiver)
 
-struct LocalVarsInspector2::Priv : public sigc::trackable {
+struct LocalVarsInspector::Priv : public sigc::trackable {
 private:
     Priv ();
 public:
@@ -1086,22 +1086,22 @@ public:
 
         NEMIVER_CATCH
     }
-};//end LocalVarsInspector2::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);
@@ -1109,7 +1109,7 @@ LocalVarsInspector2::widget () const
 }
 
 void
-LocalVarsInspector2::show_local_variables_of_current_function
+LocalVarsInspector::show_local_variables_of_current_function
                                             (const IDebugger::Frame &a_frame)
 {
     LOG_FUNCTION_SCOPE_NORMAL_DD;
@@ -1126,7 +1126,7 @@ LocalVarsInspector2::show_local_variables_of_current_function
 }
 
 void
-LocalVarsInspector2::re_init_widget ()
+LocalVarsInspector::re_init_widget ()
 {
     LOG_FUNCTION_SCOPE_NORMAL_DD;
     THROW_IF_FAIL (m_priv);
diff --git a/src/persp/dbgperspective/nmv-local-vars-inspector2.h b/src/persp/dbgperspective/nmv-local-vars-inspector.h
similarity index 83%
rename from src/persp/dbgperspective/nmv-local-vars-inspector2.h
rename to src/persp/dbgperspective/nmv-local-vars-inspector.h
index a00c3f3..ce89182 100644
--- a/src/persp/dbgperspective/nmv-local-vars-inspector2.h
+++ b/src/persp/dbgperspective/nmv-local-vars-inspector.h
@@ -39,30 +39,30 @@ NEMIVER_BEGIN_NAMESPACE (nemiver)
 
 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);
     void show_local_variables_of_current_function
                                         (const IDebugger::Frame &a_frame);
     void re_init_widget ();
-};//end LocalVarsInspector2
+};//end LocalVarsInspector
 
 NEMIVER_END_NAMESPACE (nemiver)
 
diff --git a/src/persp/dbgperspective/nmv-var-inspector-dialog.cc b/src/persp/dbgperspective/nmv-var-inspector-dialog.cc
index 314be1f..447f6cf 100644
--- a/src/persp/dbgperspective/nmv-var-inspector-dialog.cc
+++ b/src/persp/dbgperspective/nmv-var-inspector-dialog.cc
@@ -27,7 +27,7 @@
 #include <gtkmm/liststore.h>
 #include "common/nmv-exception.h"
 #include "nmv-var-inspector-dialog.h"
-#include "nmv-var-inspector2.h"
+#include "nmv-var-inspector.h"
 #include "nmv-ui-utils.h"
 
 NEMIVER_BEGIN_NAMESPACE (nemiver)
@@ -51,7 +51,7 @@ class VarInspectorDialog::Priv {
     Gtk::ComboBoxEntry *var_name_entry;
     Glib::RefPtr<Gtk::ListStore> m_variable_history;
     Gtk::Button *inspect_button;
-    SafePtr<VarInspector2> var_inspector;
+    SafePtr<VarInspector> var_inspector;
     Gtk::Dialog &dialog;
     Glib::RefPtr<Gnome::Glade::Xml> glade;
     IDebuggerSafePtr debugger;
@@ -96,7 +96,7 @@ public:
         Gtk::Box *box =
             ui_utils::get_widget_from_glade<Gtk::Box> (glade,
                                                        "inspectorwidgetbox");
-        var_inspector.reset (new VarInspector2 (debugger, perspective));
+        var_inspector.reset (new VarInspector (debugger, perspective));
         var_inspector->enable_contextual_menu (true);
         THROW_IF_FAIL (var_inspector);
 
diff --git a/src/persp/dbgperspective/nmv-var-inspector2.cc b/src/persp/dbgperspective/nmv-var-inspector.cc
similarity index 96%
rename from src/persp/dbgperspective/nmv-var-inspector2.cc
rename to src/persp/dbgperspective/nmv-var-inspector.cc
index a26ae52..6143e94 100644
--- a/src/persp/dbgperspective/nmv-var-inspector2.cc
+++ b/src/persp/dbgperspective/nmv-var-inspector.cc
@@ -29,7 +29,7 @@
 #include <gtkmm/treestore.h>
 #include "common/nmv-exception.h"
 #include "common/nmv-dynamic-module.h"
-#include "nmv-var-inspector2.h"
+#include "nmv-var-inspector.h"
 #include "nmv-variables-utils.h"
 #include "nmv-i-var-walker.h"
 #include "nmv-ui-utils.h"
@@ -45,8 +45,8 @@ using cmn::DynamicModuleManager;
 
 NEMIVER_BEGIN_NAMESPACE (nemiver)
 
-class VarInspector2::Priv : public sigc::trackable {
-    friend class VarInspector2;
+class VarInspector::Priv : public sigc::trackable {
+    friend class VarInspector;
     Priv ();
 
     bool requested_variable;
@@ -233,7 +233,7 @@ class VarInspector2::Priv : public sigc::trackable {
         expand_variable = a_expand;
         debugger->create_variable
             (a_name, sigc::mem_fun
-                    (this, &VarInspector2::Priv::on_variable_created_signal));
+                    (this, &VarInspector::Priv::on_variable_created_signal));
     }
 
     Glib::RefPtr<Gtk::UIManager> get_ui_manager ()
@@ -586,21 +586,21 @@ public:
     {
         delete_variable_if_needed ();
     }
-};//end class VarInspector2::Priv
+};//end class VarInspector::Priv
 
-VarInspector2::VarInspector2 (IDebuggerSafePtr a_debugger,
+VarInspector::VarInspector (IDebuggerSafePtr a_debugger,
                               IPerspective &a_perspective)
 {
     m_priv.reset (new Priv (a_debugger, a_perspective));
 }
 
-VarInspector2::~VarInspector2 ()
+VarInspector::~VarInspector ()
 {
     LOG_D ("deleted", "destructor-domain");
 }
 
 Gtk::Widget&
-VarInspector2::widget () const
+VarInspector::widget () const
 {
     THROW_IF_FAIL (m_priv);
     THROW_IF_FAIL (m_priv->tree_view);
@@ -608,7 +608,7 @@ VarInspector2::widget () const
 }
 
 void
-VarInspector2::set_variable (IDebugger::VariableSafePtr a_variable,
+VarInspector::set_variable (IDebugger::VariableSafePtr a_variable,
                              bool a_expand)
 {
     THROW_IF_FAIL (m_priv);
@@ -617,7 +617,7 @@ VarInspector2::set_variable (IDebugger::VariableSafePtr a_variable,
 }
 
 void
-VarInspector2::inspect_variable (const UString &a_variable_name,
+VarInspector::inspect_variable (const UString &a_variable_name,
                                  bool a_expand)
 {
     LOG_FUNCTION_SCOPE_NORMAL_DD;
@@ -630,7 +630,7 @@ VarInspector2::inspect_variable (const UString &a_variable_name,
 }
 
 IDebugger::VariableSafePtr
-VarInspector2::get_variable () const
+VarInspector::get_variable () const
 {
     THROW_IF_FAIL (m_priv);
 
@@ -638,21 +638,21 @@ VarInspector2::get_variable () const
 }
 
 void
-VarInspector2::enable_contextual_menu (bool a_flag)
+VarInspector::enable_contextual_menu (bool a_flag)
 {
     THROW_IF_FAIL (m_priv);
     m_priv->enable_contextual_menu = a_flag;
 }
 
 bool
-VarInspector2::is_contextual_menu_enabled () const
+VarInspector::is_contextual_menu_enabled () const
 {
     THROW_IF_FAIL (m_priv);
     return m_priv->enable_contextual_menu;
 }
 
 void
-VarInspector2::clear ()
+VarInspector::clear ()
 {
     THROW_IF_FAIL (m_priv);
     m_priv->re_init_tree_view ();
diff --git a/src/persp/dbgperspective/nmv-var-inspector2.h b/src/persp/dbgperspective/nmv-var-inspector.h
similarity index 85%
rename from src/persp/dbgperspective/nmv-var-inspector2.h
rename to src/persp/dbgperspective/nmv-var-inspector.h
index f2471b7..5de547b 100644
--- a/src/persp/dbgperspective/nmv-var-inspector2.h
+++ b/src/persp/dbgperspective/nmv-var-inspector.h
@@ -40,17 +40,17 @@ namespace common {
     class UString;
 }
 
-class VarInspector2 : public nemiver::common::Object {
-    VarInspector2 (const VarInspector2 &);
-    VarInspector2& operator= (const VarInspector2 &);
-    VarInspector2 ();
+class VarInspector : public nemiver::common::Object {
+    VarInspector (const VarInspector &);
+    VarInspector& operator= (const VarInspector &);
+    VarInspector ();
     class Priv;
     SafePtr<Priv> m_priv;
 
 public:
-    VarInspector2 (IDebuggerSafePtr a_debugger,
+    VarInspector (IDebuggerSafePtr a_debugger,
                    IPerspective &a_perspective);
-    virtual ~VarInspector2 ();
+    virtual ~VarInspector ();
     Gtk::Widget& widget () const;
     void set_variable (IDebugger::VariableSafePtr a_variable,
                        bool a_expand = false);
@@ -60,7 +60,7 @@ public:
     void enable_contextual_menu (bool a_flag);
     bool is_contextual_menu_enabled () const;
     void clear ();
-};//end class VarInspector2
+};//end class VarInspector
 
 NEMIVER_END_NAMESPACE (nemiver)
 
diff --git a/src/persp/dbgperspective/nmv-watchpoint-dialog.cc b/src/persp/dbgperspective/nmv-watchpoint-dialog.cc
index e7e169a..2f44f03 100644
--- a/src/persp/dbgperspective/nmv-watchpoint-dialog.cc
+++ b/src/persp/dbgperspective/nmv-watchpoint-dialog.cc
@@ -29,7 +29,7 @@
 #include "common/nmv-env.h"
 #include "common/nmv-ustring.h"
 #include "nmv-ui-utils.h"
-#include "nmv-var-inspector2.h"
+#include "nmv-var-inspector.h"
 
 NEMIVER_BEGIN_NAMESPACE (nemiver)
 
@@ -43,7 +43,7 @@ struct WatchpointDialog::Priv {
     Gtk::CheckButton *write_check_button;
     Gtk::Button *ok_button;
     Gtk::Button *cancel_button;
-    SafePtr<VarInspector2> var_inspector;
+    SafePtr<VarInspector> var_inspector;
     IDebuggerSafePtr debugger;
     IPerspective &perspective;
 
@@ -112,7 +112,7 @@ struct WatchpointDialog::Priv {
                                                        "varinspectorbox");
         THROW_IF_FAIL (box);
 
-        var_inspector.reset (new VarInspector2 (debugger, perspective));
+        var_inspector.reset (new VarInspector (debugger, perspective));
         THROW_IF_FAIL (var_inspector);
 
         Gtk::ScrolledWindow *scr = Gtk::manage (new Gtk::ScrolledWindow);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]