[nemiver] Rename "Variable Inspector" into "Expression Inspector"



commit b8d01e52d1cdab0aaae0b469f5a64a6e36065b9a
Author: Dodji Seketeli <dodji seketeli org>
Date:   Fri Jun 15 17:24:24 2012 +0200

    Rename "Variable Inspector" into "Expression Inspector"
    
    	* src/persp/dbgperspective/nmv-expr-inspector-dialog.cc: Renamed
    	src/persp/dbgperspective/nmv-var-inspector-dialog.cc into this,
    	and renamed most references to "variable monitor" to "expression
    	monitor.
    	* src/persp/dbgperspective/nmv-expr-inspector-dialog.h: Renamed
    	src/persp/dbgperspective/nmv-var-inspector-dialog.h into this and
    	and renamed most references to "variable monitor" to "expression
    	monitor..
    	* src/persp/dbgperspective/nmv-expr-inspector.cc: Renamed
    	src/persp/dbgperspective/nmv-var-inspector.cc in to this and
    	renamed most references to "variable monitor" to "expression
    	monitor.
    	* src/persp/dbgperspective/nmv-expr-inspector.h: Renamed
    	src/persp/dbgperspective/nmv-var-inspector.h into this and renamed
    	most references to "variable monitor" to "expression monitor.
    	* po/POTFILES.in: Adjust.
    	* src/persp/dbgperspective/Makefile.am: Likewise.
    	* src/persp/dbgperspective/menus/menus.xml: Likewise.
    	* src/persp/dbgperspective/nmv-dbg-perspective.cc: Likewise.

 po/POTFILES.in                                     |    7 +-
 src/persp/dbgperspective/Makefile.am               |    8 +-
 src/persp/dbgperspective/menus/menus.xml           |    4 +-
 src/persp/dbgperspective/nmv-dbg-perspective.cc    |   70 +++++-----
 ...ctor-dialog.cc => nmv-expr-inspector-dialog.cc} |   78 +++++-----
 ...pector-dialog.h => nmv-expr-inspector-dialog.h} |   36 +++---
 ...{nmv-var-inspector.cc => nmv-expr-inspector.cc} |  152 ++++++++++----------
 .../{nmv-var-inspector.h => nmv-expr-inspector.h}  |   30 ++--
 src/persp/dbgperspective/nmv-watchpoint-dialog.cc  |    8 +-
 src/persp/dbgperspective/ui/Makefile.am            |    2 +-
 ...arinspectordialog.ui => exprinspectordialog.ui} |    4 +-
 11 files changed, 199 insertions(+), 200 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 48bb0c6..1813030 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,9 +19,8 @@ src/persp/dbgperspective/nmv-run-program-dialog.cc
 src/persp/dbgperspective/nmv-saved-sessions-dialog.cc
 src/persp/dbgperspective/nmv-set-breakpoint-dialog.cc
 src/persp/dbgperspective/nmv-thread-list.cc
-src/persp/dbgperspective/nmv-var-inspector.cc
-src/persp/dbgperspective/nmv-var-inspector.cc
-src/persp/dbgperspective/nmv-var-inspector-dialog.cc
+src/persp/dbgperspective/nmv-expr-inspector.cc
+src/persp/dbgperspective/nmv-expr-inspector-dialog.cc
 src/persp/dbgperspective/nmv-vars-treeview.cc
 [type: gettext/glade]src/persp/dbgperspective/ui/callfunctiondialog.ui
 [type: gettext/glade]src/persp/dbgperspective/ui/chooseoverloadsdialog.ui
@@ -36,7 +35,7 @@ src/persp/dbgperspective/nmv-vars-treeview.cc
 [type: gettext/glade]src/persp/dbgperspective/ui/savedsessionsdialog.ui
 [type: gettext/glade]src/persp/dbgperspective/ui/setbreakpointdialog.ui
 [type: gettext/glade]src/persp/dbgperspective/ui/setjumptodialog.ui
-[type: gettext/glade]src/persp/dbgperspective/ui/varinspectordialog.ui
+[type: gettext/glade]src/persp/dbgperspective/ui/exprinspectordialog.ui
 [type: gettext/glade]src/persp/dbgperspective/ui/watchpointdialog.ui
 src/uicommon/nmv-locate-file-dialog.cc
 src/uicommon/nmv-source-editor.cc
diff --git a/src/persp/dbgperspective/Makefile.am b/src/persp/dbgperspective/Makefile.am
index 7852432..8fcfa95 100644
--- a/src/persp/dbgperspective/Makefile.am
+++ b/src/persp/dbgperspective/Makefile.am
@@ -26,8 +26,8 @@ $(h)/nmv-preferences-dialog.h \
 $(h)/nmv-preferences-dialog.cc \
 $(h)/nmv-proc-list-dialog.cc \
 $(h)/nmv-proc-list-dialog.h \
-$(h)/nmv-var-inspector-dialog.cc \
-$(h)/nmv-var-inspector-dialog.h \
+$(h)/nmv-expr-inspector-dialog.cc \
+$(h)/nmv-expr-inspector-dialog.h \
 $(h)/nmv-find-text-dialog.cc \
 $(h)/nmv-find-text-dialog.h \
 $(h)/nmv-sess-mgr.cc \
@@ -40,8 +40,8 @@ $(h)/nmv-local-vars-inspector.cc \
 $(h)/nmv-local-vars-inspector.h \
 $(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-expr-inspector.cc \
+$(h)/nmv-expr-inspector.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 9273add..c9a52e2 100644
--- a/src/persp/dbgperspective/menus/menus.xml
+++ b/src/persp/dbgperspective/menus/menus.xml
@@ -74,8 +74,8 @@
             <menuitem action="SetWatchPointUsingDialogMenuItemAction"
                 name="SetWatchUsingDialogMenuItem"/>
             <separator/>
-            <menuitem action="InspectVariableMenuItemAction"
-                name="InspectVariableMenuItem"/>
+            <menuitem action="InspectExpressionMenuItemAction"
+                name="InspectExpressionMenuItem"/>
             <menuitem action="CallFunctionMenuItemAction"
                 name="CallFunctionMenuItem"/>
             <menuitem action="ActivateGlobalVariablesDialogMenuAction"
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
index 905a67f..d30d922 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
+++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
@@ -66,7 +66,7 @@
 #include "nmv-call-stack.h"
 #include "nmv-spinner-tool-item.h"
 #include "nmv-local-vars-inspector.h"
-#include "nmv-var-inspector.h"
+#include "nmv-expr-inspector.h"
 #include "nmv-global-vars-inspector-dialog.h"
 #include "nmv-terminal.h"
 #include "nmv-breakpoints-view.h"
@@ -75,7 +75,7 @@
 #include "nmv-preferences-dialog.h"
 #include "nmv-popup-tip.h"
 #include "nmv-thread-list.h"
-#include "nmv-var-inspector-dialog.h"
+#include "nmv-expr-inspector-dialog.h"
 #include "nmv-find-text-dialog.h"
 #include "nmv-set-breakpoint-dialog.h"
 #include "nmv-choose-overloads-dialog.h"
@@ -282,7 +282,7 @@ private:
     void on_toggle_breakpoint_action ();
     void on_toggle_breakpoint_enabled_action ();
     void on_toggle_countpoint_action ();
-    void on_inspect_variable_action ();
+    void on_inspect_expression_action ();
     void on_call_function_action ();
     void on_find_text_response_signal (int);
     void on_breakpoint_delete_action
@@ -473,7 +473,7 @@ private:
                                          const UString &a_text);
     void show_underline_tip_at_position (int a_x, int a_y,
                                          IDebugger::VariableSafePtr a_var);
-    VarInspector& get_popup_var_inspector ();
+    ExprInspector& get_popup_expr_inspector ();
     void restart_mouse_immobile_timer ();
     void stop_mouse_immobile_timer ();
     PopupTip& get_popup_tip ();
@@ -683,8 +683,8 @@ public:
     void disassemble_around_address_and_do (const Address &adress,
                                             IDebugger::DisassSlot &what_to_do);
 
-    void inspect_variable ();
-    void inspect_variable (const UString &a_variable_name);
+    void inspect_expression ();
+    void inspect_expression (const UString &a_variable_name);
     void call_function ();
     void call_function (const UString &a_call_expr);
     void toggle_breakpoint ();
@@ -946,7 +946,7 @@ struct DBGPerspective::Priv {
     //<variable value popup tip related data>
     //****************************************
     SafePtr<PopupTip> popup_tip;
-    SafePtr<VarInspector> popup_var_inspector;
+    SafePtr<ExprInspector> popup_expr_inspector;
     bool in_show_var_value_at_pos_transaction;
     UString var_to_popup;
     int var_popup_tip_x;
@@ -1619,11 +1619,11 @@ DBGPerspective::on_toggle_countpoint_action ()
 }
 
 void
-DBGPerspective::on_inspect_variable_action ()
+DBGPerspective::on_inspect_expression_action ()
 {
     LOG_FUNCTION_SCOPE_NORMAL_DD;
     NEMIVER_TRY
-    inspect_variable ();
+    inspect_expression ();
     NEMIVER_CATCH
 }
 
@@ -2746,7 +2746,7 @@ DBGPerspective::on_popup_tip_hide ()
     NEMIVER_TRY
 
     m_priv->popup_tip.reset ();
-    m_priv->popup_var_inspector.reset ();
+    m_priv->popup_expr_inspector.reset ();
 
     NEMIVER_CATCH
 }
@@ -3266,12 +3266,12 @@ DBGPerspective::init_actions ()
             false
         },
         {
-            "InspectVariableMenuItemAction",
+            "InspectExpressionMenuItemAction",
             nil_stock_id,
-            _("Inspect a Variable"),
-            _("Inspect a global or local variable"),
+            _("Inspect an Expression"),
+            _("Inspect a global or local expression"),
             sigc::mem_fun (*this,
-                           &DBGPerspective::on_inspect_variable_action),
+                           &DBGPerspective::on_inspect_expression_action),
             ActionEntry::DEFAULT,
             "F12",
             false
@@ -4394,8 +4394,8 @@ DBGPerspective::get_contextual_menu ()
         workbench ().get_ui_manager ()->add_ui
             (m_priv->contextual_menu_merge_id,
              "/ContextualMenu",
-             "InspectVariableMenuItem",
-             "InspectVariableMenuItemAction",
+             "InspectExpressionMenuItem",
+             "InspectExpressionMenuItemAction",
              Gtk::UI_MANAGER_AUTO,
              false);
 
@@ -4828,22 +4828,22 @@ DBGPerspective::show_underline_tip_at_position
 {
     LOG_FUNCTION_SCOPE_NORMAL_DD
     get_popup_tip ().show_at_position (a_x, a_y);
-    get_popup_var_inspector ().set_variable (a_var,
-                                             true/*expand variable*/,
-                                             m_priv->pretty_printing_toggled);
+    get_popup_expr_inspector ().set_expression (a_var,
+                                               true/*expand variable*/,
+                                               m_priv->pretty_printing_toggled);
 }
 
-VarInspector&
-DBGPerspective::get_popup_var_inspector ()
+ExprInspector&
+DBGPerspective::get_popup_expr_inspector ()
 {
     LOG_FUNCTION_SCOPE_NORMAL_DD
 
-    if (!m_priv->popup_var_inspector)
-        m_priv->popup_var_inspector.reset
-                    (new VarInspector (*debugger (),
+    if (!m_priv->popup_expr_inspector)
+        m_priv->popup_expr_inspector.reset
+                    (new ExprInspector (*debugger (),
                                        *const_cast<DBGPerspective*> (this)));
-    THROW_IF_FAIL (m_priv->popup_var_inspector);
-    return *m_priv->popup_var_inspector;
+    THROW_IF_FAIL (m_priv->popup_expr_inspector);
+    return *m_priv->popup_expr_inspector;
 }
 
 void
@@ -4883,7 +4883,7 @@ DBGPerspective::get_popup_tip ()
         Gtk::ScrolledWindow *w = Gtk::manage (new PopupScrolledWindow ());
         w->set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
         m_priv->popup_tip->set_child (*w);
-        w->add (get_popup_var_inspector ().widget ());
+        w->add (get_popup_expr_inspector ().widget ());
         m_priv->popup_tip->signal_hide ().connect (sigc::mem_fun
                    (*this, &DBGPerspective::on_popup_tip_hide));
     }
@@ -7829,11 +7829,11 @@ DBGPerspective::update_src_dependant_bp_actions_sensitiveness ()
 }
 
 void
-DBGPerspective::inspect_variable ()
+DBGPerspective::inspect_expression ()
 {
     THROW_IF_FAIL (m_priv);
 
-    UString variable_name;
+    UString expression;
     Gtk::TextIter start, end;
     SourceEditor *source_editor = get_current_source_editor ();
     if (source_editor) {
@@ -7841,21 +7841,21 @@ DBGPerspective::inspect_variable ()
             source_editor->source_view ().get_source_buffer ();
         THROW_IF_FAIL (buffer);
         if (buffer->get_selection_bounds (start, end)) {
-            variable_name= buffer->get_slice (start, end);
+            expression = buffer->get_slice (start, end);
         }
     }
-    inspect_variable (variable_name);
+    inspect_expression (expression);
 }
 
 void
-DBGPerspective::inspect_variable (const UString &a_variable_name)
+DBGPerspective::inspect_expression (const UString &a_expression)
 {
     THROW_IF_FAIL (debugger ());
-    VarInspectorDialog dialog (*debugger (),
+    ExprInspectorDialog dialog (*debugger (),
                                *this);
     dialog.set_history (m_priv->var_inspector_dialog_history);
-    if (a_variable_name != "") {
-        dialog.inspect_variable (a_variable_name);
+    if (a_expression != "") {
+        dialog.inspect_expression (a_expression);
     }
     dialog.run ();
     m_priv->var_inspector_dialog_history.clear ();
diff --git a/src/persp/dbgperspective/nmv-var-inspector-dialog.cc b/src/persp/dbgperspective/nmv-expr-inspector-dialog.cc
similarity index 85%
rename from src/persp/dbgperspective/nmv-var-inspector-dialog.cc
rename to src/persp/dbgperspective/nmv-expr-inspector-dialog.cc
index 1c5f0e7..f2dee7d 100644
--- a/src/persp/dbgperspective/nmv-var-inspector-dialog.cc
+++ b/src/persp/dbgperspective/nmv-expr-inspector-dialog.cc
@@ -26,8 +26,8 @@
 #include <glib/gi18n.h>
 #include <gtkmm/liststore.h>
 #include "common/nmv-exception.h"
-#include "nmv-var-inspector-dialog.h"
-#include "nmv-var-inspector.h"
+#include "nmv-expr-inspector-dialog.h"
+#include "nmv-expr-inspector.h"
 #include "nmv-ui-utils.h"
 
 NEMIVER_BEGIN_NAMESPACE (nemiver)
@@ -46,12 +46,12 @@ get_cols ()
     return cols;
 }
 
-class VarInspectorDialog::Priv {
-    friend class VarInspectorDialog;
+class ExprInspectorDialog::Priv {
+    friend class ExprInspectorDialog;
     Gtk::ComboBox *var_name_entry;
     Glib::RefPtr<Gtk::ListStore> m_variable_history;
     Gtk::Button *inspect_button;
-    SafePtr<VarInspector> var_inspector;
+    SafePtr<ExprInspector> expr_inspector;
     Gtk::Dialog &dialog;
     Glib::RefPtr<Gtk::Builder> gtkbuilder;
     IDebugger &debugger;
@@ -101,17 +101,17 @@ public:
             ui_utils::get_widget_from_gtkbuilder<Gtk::Box> (gtkbuilder,
                                                        "inspectorwidgetbox");
 
-        var_inspector.reset (new VarInspector (debugger, perspective));
-        var_inspector->enable_contextual_menu (true);
-        var_inspector->cleared_signal ().connect
+        expr_inspector.reset (new ExprInspector (debugger, perspective));
+        expr_inspector->enable_contextual_menu (true);
+        expr_inspector->cleared_signal ().connect
             (sigc::mem_fun
              (*this,
-              &VarInspectorDialog::Priv::on_variable_inspector_cleared));
+              &ExprInspectorDialog::Priv::on_variable_inspector_cleared));
 
         Gtk::ScrolledWindow *scr = Gtk::manage (new Gtk::ScrolledWindow);
         scr->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
         scr->set_shadow_type (Gtk::SHADOW_IN);
-        scr->add (var_inspector->widget ());
+        scr->add (expr_inspector->widget ());
         box->pack_start (*scr);
         dialog.show_all ();
     }
@@ -122,17 +122,17 @@ public:
         THROW_IF_FAIL (inspect_button);
         THROW_IF_FAIL (var_name_entry);
         inspect_button->signal_clicked ().connect (sigc::mem_fun
-                (*this, &Priv::do_inspect_variable));
+                (*this, &Priv::do_inspect_expression));
         var_name_entry->signal_changed ().connect (sigc::mem_fun
                 (*this, &Priv::on_var_name_changed_signal));
         var_name_entry->get_entry()->signal_activate ().connect (sigc::mem_fun
-                (*this, &Priv::do_inspect_variable));
+                (*this, &Priv::do_inspect_expression));
     }
 
     /// Inspect the variable (or, more generally the expression) which
     /// name the user has typed in the variable name entry, in the UI.
     void 
-    do_inspect_variable ()
+    do_inspect_expression ()
     {
         NEMIVER_TRY;
 
@@ -142,7 +142,7 @@ public:
         if (var_name == "")
             return;
 
-        inspect_variable (var_name, /*expand=*/true);
+        inspect_expression (var_name, /*expand=*/true);
 
         NEMIVER_CATCH;
     }
@@ -154,13 +154,13 @@ public:
     /// \param a_expand whether to expand the resulting expression
     /// tree.
     void
-    inspect_variable (const UString& a_expr,
+    inspect_expression (const UString& a_expr,
                       bool a_expand)
     {
-        inspect_variable (a_expr, a_expand, 
+        inspect_expression (a_expr, a_expand, 
                           sigc::mem_fun
                           (*this,
-                           &VarInspectorDialog::Priv::on_variable_inspected));
+                           &ExprInspectorDialog::Priv::on_variable_inspected));
     }
 
     /// Inspect an expression.
@@ -173,15 +173,15 @@ public:
     /// \param a_s a slot to invoke whenever the expresion has been
     /// inspected.
     void
-    inspect_variable (const UString &a_expr,
+    inspect_expression (const UString &a_expr,
                       bool a_expand,
                       const sigc::slot<void, 
                                        const IDebugger::VariableSafePtr> &a_s)
     {
-        THROW_IF_FAIL (var_inspector);
+        THROW_IF_FAIL (expr_inspector);
         THROW_IF_FAIL (m_variable_history);
 
-        var_inspector->inspect_variable
+        expr_inspector->inspect_expression
             (a_expr, a_expand, a_s);
 
         add_to_history (a_expr,
@@ -318,7 +318,7 @@ public:
         // text that is typed into the entry, but we do want to inspect when
         // they choose an item from the dropdown list
         if (var_name_entry->get_active ()) {
-            inspect_variable (var_name, true);
+            inspect_expression (var_name, true);
         }
 
         NEMIVER_CATCH
@@ -340,29 +340,29 @@ public:
     //************************
     //</signal handlers>
     //*************************
-};//end class VarInspectorDialog::Priv
+};//end class ExprInspectorDialog::Priv
 
-VarInspectorDialog::VarInspectorDialog (IDebugger &a_debugger,
+ExprInspectorDialog::ExprInspectorDialog (IDebugger &a_debugger,
                                         IPerspective &a_perspective) :
     Dialog (a_perspective.plugin_path (),
-            "varinspectordialog.ui",
-            "varinspectordialog")
+            "exprinspectordialog.ui",
+            "exprinspectordialog")
 {
     LOG_FUNCTION_SCOPE_NORMAL_DD;
     m_priv.reset
-        (new VarInspectorDialog::Priv (widget (),
+        (new ExprInspectorDialog::Priv (widget (),
                                        gtkbuilder (), a_debugger,
                                        a_perspective));
     THROW_IF_FAIL (m_priv);
 }
 
-VarInspectorDialog::~VarInspectorDialog ()
+ExprInspectorDialog::~ExprInspectorDialog ()
 {
     LOG_D ("delete", "destructor-domain");
 }
 
 UString
-VarInspectorDialog::variable_name () const
+ExprInspectorDialog::expression_name () const
 {
     THROW_IF_FAIL (m_priv);
     THROW_IF_FAIL (m_priv->var_name_entry);
@@ -373,14 +373,14 @@ VarInspectorDialog::variable_name () const
 ///
 /// \param a_var_name the expression to inspect.
 void
-VarInspectorDialog::inspect_variable (const UString &a_var_name)
+ExprInspectorDialog::inspect_expression (const UString &a_var_name)
 {
     THROW_IF_FAIL (m_priv);
     THROW_IF_FAIL (m_priv->var_name_entry);
 
     if (a_var_name != "") {
         m_priv->var_name_entry->get_entry ()->set_text (a_var_name);
-        m_priv->inspect_variable (a_var_name, true);
+        m_priv->inspect_expression (a_var_name, true);
     }
 }
 
@@ -391,7 +391,7 @@ VarInspectorDialog::inspect_variable (const UString &a_var_name)
 /// \param a_slot a slot to invoke whenever the expression has been
 /// inspected.
 void
-VarInspectorDialog::inspect_variable
+ExprInspectorDialog::inspect_expression
 (const UString &a_var_name,
  const sigc::slot<void, 
                   const IDebugger::VariableSafePtr> &a_slot)
@@ -401,30 +401,30 @@ VarInspectorDialog::inspect_variable
 
     if (a_var_name != "") {
         m_priv->var_name_entry->get_entry ()->set_text (a_var_name);
-        m_priv->inspect_variable (a_var_name, true, a_slot);
+        m_priv->inspect_expression (a_var_name, true, a_slot);
     }
 }
 
 const IDebugger::VariableSafePtr
-VarInspectorDialog::variable () const
+ExprInspectorDialog::expression () const
 {
     THROW_IF_FAIL (m_priv);
-    return m_priv->var_inspector->get_variable ();
+    return m_priv->expr_inspector->get_expression ();
 }
 
 /// Return the variable inspector used by this dialog
-VarInspector& 
-VarInspectorDialog::inspector () const
+ExprInspector& 
+ExprInspectorDialog::inspector () const
 {
     THROW_IF_FAIL (m_priv);
-    return *m_priv->var_inspector;
+    return *m_priv->expr_inspector;
 }
 
 /// Set the history of variable expression to a new one.
 ///
 /// \param a_hist the new history.
 void
-VarInspectorDialog::set_history (const std::list<UString> &a_hist)
+ExprInspectorDialog::set_history (const std::list<UString> &a_hist)
 {
     THROW_IF_FAIL (m_priv);
 
@@ -432,7 +432,7 @@ VarInspectorDialog::set_history (const std::list<UString> &a_hist)
 }
 
 void
-VarInspectorDialog::get_history (std::list<UString> &a_hist) const
+ExprInspectorDialog::get_history (std::list<UString> &a_hist) const
 {
     THROW_IF_FAIL (m_priv);
     m_priv->get_history (a_hist);
diff --git a/src/persp/dbgperspective/nmv-var-inspector-dialog.h b/src/persp/dbgperspective/nmv-expr-inspector-dialog.h
similarity index 60%
rename from src/persp/dbgperspective/nmv-var-inspector-dialog.h
rename to src/persp/dbgperspective/nmv-expr-inspector-dialog.h
index f397423..b0242ec 100644
--- a/src/persp/dbgperspective/nmv-var-inspector-dialog.h
+++ b/src/persp/dbgperspective/nmv-expr-inspector-dialog.h
@@ -22,43 +22,43 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NMV_VAR_INSPECTOR_DIALOG_H__
-#define __NMV_VAR_INSPECTOR_DIALOG_H__
+#ifndef __NMV_EXPR_INSPECTOR_DIALOG_H__
+#define __NMV_EXPR_INSPECTOR_DIALOG_H__
 
 #include "nmv-dialog.h"
 #include "nmv-i-perspective.h"
 #include "nmv-i-debugger.h"
-#include "nmv-var-inspector.h"
+#include "nmv-expr-inspector.h"
 
 NEMIVER_BEGIN_NAMESPACE (nemiver)
 
-class VarInspectorDialog : public Dialog {
+class ExprInspectorDialog : public Dialog {
     //non copyable
-    VarInspectorDialog (const VarInspectorDialog &);
-    VarInspectorDialog& operator= (const VarInspectorDialog &);
+    ExprInspectorDialog (const ExprInspectorDialog &);
+    ExprInspectorDialog& operator= (const ExprInspectorDialog &);
 
     //tell me why you would want to extend this.
-    VarInspectorDialog ();
+    ExprInspectorDialog ();
 
     class Priv;
     SafePtr<Priv> m_priv;
 
 public:
-    VarInspectorDialog (IDebugger &a_debugger,
+    ExprInspectorDialog (IDebugger &a_debugger,
                         IPerspective &a_perspective);
-    virtual ~VarInspectorDialog ();
+    virtual ~ExprInspectorDialog ();
 
-    UString variable_name () const;
-    void inspect_variable (const UString &a_variable_name);
-    void inspect_variable (const UString &a_variable_name,
-			   const sigc::slot<void, 
-			                    const IDebugger::VariableSafePtr> &);
-    const IDebugger::VariableSafePtr variable () const;
-    VarInspector& inspector () const;
+    UString expression_name () const;
+    void inspect_expression (const UString &a_expression_name);
+    void inspect_expression (const UString &a_expression_name,
+			     const sigc::slot<void, 
+			     const IDebugger::VariableSafePtr> &);
+    const IDebugger::VariableSafePtr expression () const;
+    ExprInspector& inspector () const;
     void set_history (const std::list<UString> &);
     void get_history (std::list<UString> &) const;
-};//end class VarInspectorDialog
+};//end class ExprInspectorDialog
 
 NEMIVER_END_NAMESPACE (nemiver)
 
-#endif //__NMV_VAR_INSPECTOR_DIALOG_H__
+#endif //__NMV_EXPR_INSPECTOR_DIALOG_H__
diff --git a/src/persp/dbgperspective/nmv-var-inspector.cc b/src/persp/dbgperspective/nmv-expr-inspector.cc
similarity index 82%
rename from src/persp/dbgperspective/nmv-var-inspector.cc
rename to src/persp/dbgperspective/nmv-expr-inspector.cc
index db178e7..24ecc79 100644
--- a/src/persp/dbgperspective/nmv-var-inspector.cc
+++ b/src/persp/dbgperspective/nmv-expr-inspector.cc
@@ -29,7 +29,7 @@
 #include <gtkmm/treestore.h>
 #include "common/nmv-exception.h"
 #include "common/nmv-dynamic-module.h"
-#include "nmv-var-inspector.h"
+#include "nmv-expr-inspector.h"
 #include "nmv-variables-utils.h"
 #include "nmv-i-var-walker.h"
 #include "nmv-ui-utils.h"
@@ -47,17 +47,17 @@ NEMIVER_BEGIN_NAMESPACE (nemiver)
 
 /// A no-op variable slot.
 static void
-no_op_void_variable_slot (const IDebugger::VariableSafePtr)
+no_op_void_expression_slot (const IDebugger::VariableSafePtr)
 {
 }
 
-class VarInspector::Priv : public sigc::trackable {
-    friend class VarInspector;
+class ExprInspector::Priv : public sigc::trackable {
+    friend class ExprInspector;
     Priv ();
 
-    bool requested_variable;
+    bool requested_expression;
     bool requested_type;
-    bool expand_variable;
+    bool expand_expression;
     bool re_visualize;
     bool enable_contextual_menu;
     IDebugger &debugger;
@@ -69,8 +69,8 @@ class VarInspector::Priv : public sigc::trackable {
     Glib::RefPtr<Gtk::TreeStore> tree_store;
     Gtk::TreeModel::iterator var_row_it;
     Gtk::TreeModel::iterator cur_selected_row;
-    Glib::RefPtr<Gtk::ActionGroup> var_inspector_action_group;
-    Gtk::Widget *var_inspector_menu;
+    Glib::RefPtr<Gtk::ActionGroup> expr_inspector_action_group;
+    Gtk::Widget *expr_inspector_menu;
     IVarWalkerSafePtr varobj_walker;
     DynamicModuleManager *module_manager;
     Glib::RefPtr<Gtk::UIManager> ui_manager;
@@ -129,7 +129,7 @@ class VarInspector::Priv : public sigc::trackable {
 
     void init_actions ()
     {
-        ui_utils::ActionEntry s_var_inspector_action_entries [] = {
+        ui_utils::ActionEntry s_expr_inspector_action_entries [] = {
             {
                 "CopyVariablePathMenuItemAction",
                 Gtk::Stock::COPY,
@@ -137,7 +137,7 @@ class VarInspector::Priv : public sigc::trackable {
                 _("Copy the variable path expression to the clipboard"),
                 sigc::mem_fun
                     (*this,
-                     &Priv::on_variable_path_expr_copy_to_clipboard_action),
+                     &Priv::on_expression_path_expr_copy_to_clipboard_action),
                 ui_utils::ActionEntry::DEFAULT,
                 "",
                 false
@@ -149,31 +149,31 @@ class VarInspector::Priv : public sigc::trackable {
                 _("Copy the variable value to the clipboard"),
                 sigc::mem_fun
                     (*this,
-                     &Priv::on_variable_value_copy_to_clipboard_action),
+                     &Priv::on_expression_value_copy_to_clipboard_action),
                 ui_utils::ActionEntry::DEFAULT,
                 "",
                 false
             }
         };
 
-        var_inspector_action_group =
-            Gtk::ActionGroup::create ("var-inspector-action-group");
-        var_inspector_action_group->set_sensitive (true);
+        expr_inspector_action_group =
+            Gtk::ActionGroup::create ("expr-inspector-action-group");
+        expr_inspector_action_group->set_sensitive (true);
         int num_actions =
-            sizeof (s_var_inspector_action_entries)
+            sizeof (s_expr_inspector_action_entries)
                 /
             sizeof (ui_utils::ActionEntry);
 
         ui_utils::add_action_entries_to_action_group
-            (s_var_inspector_action_entries,
+            (s_expr_inspector_action_entries,
              num_actions,
-             var_inspector_action_group);
+             expr_inspector_action_group);
 
-        get_ui_manager ()->insert_action_group (var_inspector_action_group);
+        get_ui_manager ()->insert_action_group (expr_inspector_action_group);
     }
 
     void
-    graphically_set_variable (const IDebugger::VariableSafePtr a_variable,
+    graphically_set_expression (const IDebugger::VariableSafePtr a_variable,
                               bool a_expand)
     {
         Gtk::TreeModel::iterator parent_iter =
@@ -196,7 +196,7 @@ class VarInspector::Priv : public sigc::trackable {
     }
 
     void
-    set_variable (const IDebugger::VariableSafePtr a_variable,
+    set_expression (const IDebugger::VariableSafePtr a_variable,
                   bool a_expand,
                   bool a_re_visualize)
     {
@@ -216,12 +216,12 @@ class VarInspector::Priv : public sigc::trackable {
                                              &Priv::on_var_revisualized),
                                             a_expand));
         } else {
-            graphically_set_variable (a_variable, a_expand);
+            graphically_set_expression (a_variable, a_expand);
         }
     }
 
     void
-    show_variable_type_in_dialog ()
+    show_expression_type_in_dialog ()
     {
         LOG_FUNCTION_SCOPE_NORMAL_DD;
 
@@ -250,10 +250,10 @@ class VarInspector::Priv : public sigc::trackable {
     /// \param a_expand whethet to expand the tree representing the
     /// expression that is going to be created, or not.
     void
-    create_variable (const UString &a_name,
-                     bool a_expand)
+    create_expression (const UString &a_name,
+                       bool a_expand)
     {
-        create_variable (a_name, a_expand, &no_op_void_variable_slot);
+        create_expression (a_name, a_expand, &no_op_void_expression_slot);
     }
 
     /// Creates a variable (or more generally, an expression).
@@ -268,19 +268,19 @@ class VarInspector::Priv : public sigc::trackable {
     /// that is invoked whenever the resulting expression is added to
     /// the inspector.
     void
-    create_variable (const UString &a_name,
-                     bool a_expand,
-                     const sigc::slot<void, 
-                                      const IDebugger::VariableSafePtr> &a_slot)
+    create_expression (const UString &a_name,
+                       bool a_expand,
+                       const sigc::slot<void, 
+                                        const IDebugger::VariableSafePtr> &a_slot)
     {
         LOG_FUNCTION_SCOPE_NORMAL_DD;
 
-        expand_variable = a_expand;
+        expand_expression = a_expand;
         debugger.create_variable
             (a_name,
              sigc::bind
              (sigc::mem_fun
-              (this, &VarInspector::Priv::on_variable_created_signal),
+              (this, &ExprInspector::Priv::on_expression_created_signal),
               a_slot));
     }
 
@@ -294,11 +294,11 @@ class VarInspector::Priv : public sigc::trackable {
         return ui_manager;
     }
 
-    Gtk::Widget* get_var_inspector_menu ()
+    Gtk::Widget* get_expr_inspector_menu ()
     {
         LOG_FUNCTION_SCOPE_NORMAL_DD;
 
-        if (!var_inspector_menu) {
+        if (!expr_inspector_menu) {
             string relative_path =
                 Glib::build_filename ("menus", "varinspectorpopup.xml");
             string absolute_path;
@@ -306,19 +306,19 @@ class VarInspector::Priv : public sigc::trackable {
                                                 (relative_path, absolute_path));
             get_ui_manager ()->add_ui_from_file (absolute_path);
             get_ui_manager ()->ensure_update ();
-            var_inspector_menu =
-                get_ui_manager ()->get_widget ("/VarInspectorPopup");
+            expr_inspector_menu =
+                get_ui_manager ()->get_widget ("/ExprInspectorPopup");
         }
-        return var_inspector_menu;
+        return expr_inspector_menu;
     }
 
     void
-    popup_var_inspector_menu (GdkEventButton *a_event)
+    popup_expr_inspector_menu (GdkEventButton *a_event)
     {
         LOG_FUNCTION_SCOPE_NORMAL_DD;
 
         Gtk::Menu *menu =
-            dynamic_cast<Gtk::Menu*> (get_var_inspector_menu ());
+            dynamic_cast<Gtk::Menu*> (get_expr_inspector_menu ());
         THROW_IF_FAIL (menu);
 
         // only pop up a menu if a row exists at that position
@@ -362,7 +362,7 @@ class VarInspector::Priv : public sigc::trackable {
             get_module_manager ()->load_iface_with_default_manager<IVarWalker>
                                             ("varobjwalker", "IVarWalker");
         result->visited_variable_signal ().connect
-            (sigc::mem_fun (*this, &Priv::on_visited_variable_signal));
+            (sigc::mem_fun (*this, &Priv::on_visited_expression_signal));
         return result;
     }
 
@@ -381,7 +381,7 @@ class VarInspector::Priv : public sigc::trackable {
     // ******************
 
     void
-    on_visited_variable_signal (const IDebugger::VariableSafePtr a_var)
+    on_visited_expression_signal (const IDebugger::VariableSafePtr a_var)
     {
         LOG_FUNCTION_SCOPE_NORMAL_DD;
 
@@ -404,7 +404,7 @@ class VarInspector::Priv : public sigc::trackable {
 
         NEMIVER_TRY;
 
-        graphically_set_variable (a_var, a_expand);
+        graphically_set_expression (a_var, a_expand);
 
         NEMIVER_CATCH;
     }
@@ -459,7 +459,7 @@ class VarInspector::Priv : public sigc::trackable {
 
         if (a_col != tree_view->get_column (2)) {return;}
         cur_selected_row = it;
-        show_variable_type_in_dialog ();
+        show_expression_type_in_dialog ();
 
         NEMIVER_CATCH
     }
@@ -481,7 +481,7 @@ class VarInspector::Priv : public sigc::trackable {
             (*a_row_it)[vutil::get_variable_columns ().variable];
         debugger.unfold_variable
         (var, sigc::bind (sigc::mem_fun (*this,
-                                         &Priv::on_variable_unfolded_signal),
+                                         &Priv::on_expression_unfolded_signal),
                           a_row_path));
         LOG_DD ("variable unfolding triggered");
 
@@ -504,7 +504,7 @@ class VarInspector::Priv : public sigc::trackable {
         debugger.assign_variable
             (var, a_text,
              sigc::bind (sigc::mem_fun
-                                 (*this, &Priv::on_variable_assigned_signal),
+                                 (*this, &Priv::on_expression_assigned_signal),
                          a_path));
 
         NEMIVER_CATCH
@@ -520,7 +520,7 @@ class VarInspector::Priv : public sigc::trackable {
         if (a_event->type == GDK_BUTTON_PRESS
             && a_event->button == 3
             && enable_contextual_menu) {
-            popup_var_inspector_menu (a_event);
+            popup_expr_inspector_menu (a_event);
         }
 
         NEMIVER_CATCH
@@ -536,7 +536,7 @@ class VarInspector::Priv : public sigc::trackable {
     /// \param a_slot a handler to be called whenever the variable is
     /// added to the inspector.
     void
-    on_variable_created_signal (const IDebugger::VariableSafePtr a_var,
+    on_expression_created_signal (const IDebugger::VariableSafePtr a_var,
                                 sigc::slot<void, 
                                            const IDebugger::VariableSafePtr> &a_slot)
     {
@@ -544,7 +544,7 @@ class VarInspector::Priv : public sigc::trackable {
 
         NEMIVER_TRY;
 
-        set_variable (a_var, expand_variable, re_visualize);
+        set_expression (a_var, expand_expression, re_visualize);
         var_inspected_signal.emit (a_var);
         a_slot (a_var);
 
@@ -552,7 +552,7 @@ class VarInspector::Priv : public sigc::trackable {
     }
 
     void
-    on_variable_unfolded_signal (const IDebugger::VariableSafePtr a_var,
+    on_expression_unfolded_signal (const IDebugger::VariableSafePtr a_var,
                                  const Gtk::TreeModel::Path &a_var_node)
     {
         LOG_FUNCTION_SCOPE_NORMAL_DD;
@@ -569,7 +569,7 @@ class VarInspector::Priv : public sigc::trackable {
     }
 
     void
-    on_variable_assigned_signal (const IDebugger::VariableSafePtr a_var,
+    on_expression_assigned_signal (const IDebugger::VariableSafePtr a_var,
                                  const UString &a_var_path)
     {
         LOG_FUNCTION_SCOPE_NORMAL_DD;
@@ -589,7 +589,7 @@ class VarInspector::Priv : public sigc::trackable {
         NEMIVER_CATCH
     }
 
-    void on_variable_path_expr_copy_to_clipboard_action ()
+    void on_expression_path_expr_copy_to_clipboard_action ()
     {
         LOG_FUNCTION_SCOPE_NORMAL_DD;
 
@@ -604,12 +604,12 @@ class VarInspector::Priv : public sigc::trackable {
 
         debugger.query_variable_path_expr
             (variable,
-             sigc::mem_fun (*this, &Priv::on_variable_path_expression_signal));
+             sigc::mem_fun (*this, &Priv::on_expression_path_expression_signal));
 
         NEMIVER_CATCH
     }
 
-    void on_variable_value_copy_to_clipboard_action ()
+    void on_expression_value_copy_to_clipboard_action ()
     {
         LOG_FUNCTION_SCOPE_NORMAL_DD;
 
@@ -629,7 +629,7 @@ class VarInspector::Priv : public sigc::trackable {
         NEMIVER_CATCH
     }
 
-    void on_variable_path_expression_signal
+    void on_expression_path_expression_signal
                                     (const IDebugger::VariableSafePtr a_var)
     {
         NEMIVER_TRY
@@ -646,15 +646,15 @@ public:
 
     Priv (IDebugger &a_debugger,
           IPerspective &a_perspective) :
-          requested_variable (false),
+          requested_expression (false),
           requested_type (false),
-          expand_variable (false),
+          expand_expression (false),
           re_visualize (false),
           enable_contextual_menu (false),
           debugger (a_debugger),
           perspective (a_perspective),
           tree_view (0),
-          var_inspector_menu (0),
+          expr_inspector_menu (0),
           module_manager (0)
     {
         build_widget ();
@@ -665,21 +665,21 @@ public:
     ~Priv ()
     {
     }
-};//end class VarInspector::Priv
+};//end class ExprInspector::Priv
 
-VarInspector::VarInspector (IDebugger &a_debugger,
+ExprInspector::ExprInspector (IDebugger &a_debugger,
                             IPerspective &a_perspective)
 {
     m_priv.reset (new Priv (a_debugger, a_perspective));
 }
 
-VarInspector::~VarInspector ()
+ExprInspector::~ExprInspector ()
 {
     LOG_D ("deleted", "destructor-domain");
 }
 
 Gtk::Widget&
-VarInspector::widget () const
+ExprInspector::widget () const
 {
     THROW_IF_FAIL (m_priv);
     THROW_IF_FAIL (m_priv->tree_view);
@@ -687,12 +687,12 @@ VarInspector::widget () const
 }
 
 void
-VarInspector::set_variable (IDebugger::VariableSafePtr a_variable,
+ExprInspector::set_expression (IDebugger::VariableSafePtr a_variable,
                             bool a_expand, bool a_revisualize)
 {
     THROW_IF_FAIL (m_priv);
 
-    m_priv->set_variable (a_variable, a_expand, a_revisualize);
+    m_priv->set_expression (a_variable, a_expand, a_revisualize);
 }
 
 /// Inspect a variable/expression.
@@ -703,12 +703,12 @@ VarInspector::set_variable (IDebugger::VariableSafePtr a_variable,
 /// \param a_expand whether to expand the resulting tree representing
 /// the expression.
 void
-VarInspector::inspect_variable (const UString &a_variable_name,
+ExprInspector::inspect_expression (const UString &a_variable_name,
                                 bool a_expand)
 {
-    inspect_variable (a_variable_name,
+    inspect_expression (a_variable_name,
                       a_expand,
-                      &no_op_void_variable_slot);
+                      &no_op_void_expression_slot);
 }
 
 /// Inspect a variable/expression.
@@ -723,21 +723,21 @@ VarInspector::inspect_variable (const UString &a_variable_name,
 /// resulting tree (representing the expression to the inspected) is
 /// added to the inspector.
 void
-VarInspector::inspect_variable (const UString &a_variable_name,
-                                bool a_expand,
-                                const sigc::slot<void, 
-                                                 const IDebugger::VariableSafePtr> &a_s)
+ExprInspector::inspect_expression (const UString &a_variable_name,
+                                   bool a_expand,
+                                   const sigc::slot<void, 
+                                                    const IDebugger::VariableSafePtr> &a_s)
 {
     LOG_FUNCTION_SCOPE_NORMAL_DD;
 
     if (a_variable_name == "") {return;}
     THROW_IF_FAIL (m_priv);
     m_priv->re_init_tree_view ();
-    m_priv->create_variable (a_variable_name, a_expand, a_s);
+    m_priv->create_expression (a_variable_name, a_expand, a_s);
 }
 
 IDebugger::VariableSafePtr
-VarInspector::get_variable () const
+ExprInspector::get_expression () const
 {
     THROW_IF_FAIL (m_priv);
 
@@ -745,21 +745,21 @@ VarInspector::get_variable () const
 }
 
 void
-VarInspector::enable_contextual_menu (bool a_flag)
+ExprInspector::enable_contextual_menu (bool a_flag)
 {
     THROW_IF_FAIL (m_priv);
     m_priv->enable_contextual_menu = a_flag;
 }
 
 bool
-VarInspector::is_contextual_menu_enabled () const
+ExprInspector::is_contextual_menu_enabled () const
 {
     THROW_IF_FAIL (m_priv);
     return m_priv->enable_contextual_menu;
 }
 
 void
-VarInspector::clear ()
+ExprInspector::clear ()
 {
     THROW_IF_FAIL (m_priv);
     m_priv->re_init_tree_view ();
@@ -768,7 +768,7 @@ VarInspector::clear ()
 /// A signal emitted when the variable to be inspected is added to the
 /// inspector.
 sigc::signal<void, const IDebugger::VariableSafePtr>&
-VarInspector::var_inspected_signal () const
+ExprInspector::expr_inspected_signal () const
 {
     THROW_IF_FAIL (m_priv);
     return m_priv->var_inspected_signal;
@@ -776,7 +776,7 @@ VarInspector::var_inspected_signal () const
 
 /// A signal emitted when the inspector is cleared.
 sigc::signal<void>&
-VarInspector::cleared_signal () const
+ExprInspector::cleared_signal () const
 {
     THROW_IF_FAIL (m_priv);
     return m_priv->cleared_signal;
diff --git a/src/persp/dbgperspective/nmv-var-inspector.h b/src/persp/dbgperspective/nmv-expr-inspector.h
similarity index 72%
rename from src/persp/dbgperspective/nmv-var-inspector.h
rename to src/persp/dbgperspective/nmv-expr-inspector.h
index e194619..377e4ae 100644
--- a/src/persp/dbgperspective/nmv-var-inspector.h
+++ b/src/persp/dbgperspective/nmv-expr-inspector.h
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NMV_VAR_INSPECTOR2_H__
-#define __NMV_VAR_INSPECTOR2_H__
+#ifndef __NMV_EXPR_INSPECTOR2_H__
+#define __NMV_EXPR_INSPECTOR2_H__
 
 #include "common/nmv-object.h"
 #include "common/nmv-safe-ptr-utils.h"
@@ -40,40 +40,40 @@ namespace common {
     class UString;
 }
 
-class VarInspector : public nemiver::common::Object {
-    VarInspector (const VarInspector &);
-    VarInspector& operator= (const VarInspector &);
-    VarInspector ();
+class ExprInspector : public nemiver::common::Object {
+    ExprInspector (const ExprInspector &);
+    ExprInspector& operator= (const ExprInspector &);
+    ExprInspector ();
     class Priv;
     SafePtr<Priv> m_priv;
 
 public:
-    VarInspector (IDebugger &a_debugger,
+    ExprInspector (IDebugger &a_debugger,
 		  IPerspective &a_perspective);
-    virtual ~VarInspector ();
+    virtual ~ExprInspector ();
     Gtk::Widget& widget () const;
-    void set_variable (IDebugger::VariableSafePtr a_variable,
+    void set_expression (IDebugger::VariableSafePtr a_variable,
                        bool a_expand = false,
 		       bool a_re_visualize = false);
-    void inspect_variable (const UString &a_variable_name,
+    void inspect_expression (const UString &a_variable_name,
                            bool a_expand = false);
-    void inspect_variable (const UString &a_variable_name,
+    void inspect_expression (const UString &a_variable_name,
                            bool a_expand,
 			   const sigc::slot<void, 
 			              const IDebugger::VariableSafePtr> &a_s);
-    IDebugger::VariableSafePtr get_variable () const;
+    IDebugger::VariableSafePtr get_expression () const;
     void enable_contextual_menu (bool a_flag);
     bool is_contextual_menu_enabled () const;
     void clear ();
 
     // Signals
     sigc::signal<void, const IDebugger::VariableSafePtr>&
-      var_inspected_signal () const;
+      expr_inspected_signal () const;
     sigc::signal<void>& cleared_signal () const;
 
-};//end class VarInspector
+};//end class ExprInspector
 
 NEMIVER_END_NAMESPACE (nemiver)
 
-#endif //__NMV_VAR_INSPECTOR2_H__
+#endif //__NMV_EXPR_INSPECTOR2_H__
 
diff --git a/src/persp/dbgperspective/nmv-watchpoint-dialog.cc b/src/persp/dbgperspective/nmv-watchpoint-dialog.cc
index de2b27d..e1ac371 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-inspector.h"
+#include "nmv-expr-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<VarInspector> var_inspector;
+    SafePtr<ExprInspector> var_inspector;
     IDebugger &debugger;
     IPerspective &perspective;
 
@@ -112,7 +112,7 @@ struct WatchpointDialog::Priv {
                                                        "varinspectorbox");
         THROW_IF_FAIL (box);
 
-        var_inspector.reset (new VarInspector (debugger, perspective));
+        var_inspector.reset (new ExprInspector (debugger, perspective));
         THROW_IF_FAIL (var_inspector);
 
         Gtk::ScrolledWindow *scr = Gtk::manage (new Gtk::ScrolledWindow);
@@ -168,7 +168,7 @@ struct WatchpointDialog::Priv {
         UString expression = expression_entry->get_text ();
         if (expression == "")
             return;
-        var_inspector->inspect_variable (expression);
+        var_inspector->inspect_expression (expression);
 
         NEMIVER_CATCH
     }
diff --git a/src/persp/dbgperspective/ui/Makefile.am b/src/persp/dbgperspective/ui/Makefile.am
index 5091f59..6615993 100644
--- a/src/persp/dbgperspective/ui/Makefile.am
+++ b/src/persp/dbgperspective/ui/Makefile.am
@@ -4,7 +4,7 @@ proclistdialog.ui \
 loadcoredialog.ui \
 savedsessionsdialog.ui \
 preferencesdialog.ui \
-varinspectordialog.ui \
+exprinspectordialog.ui \
 findtextdialog.ui \
 openfiledialog.ui \
 setbreakpointdialog.ui \
diff --git a/src/persp/dbgperspective/ui/varinspectordialog.ui b/src/persp/dbgperspective/ui/exprinspectordialog.ui
similarity index 97%
rename from src/persp/dbgperspective/ui/varinspectordialog.ui
rename to src/persp/dbgperspective/ui/exprinspectordialog.ui
index 5b6bf75..158db4b 100644
--- a/src/persp/dbgperspective/ui/varinspectordialog.ui
+++ b/src/persp/dbgperspective/ui/exprinspectordialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 2.6 -->
-  <object class="GtkDialog" id="varinspectordialog">
+  <object class="GtkDialog" id="exprinspectordialog">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Inspect a Variable</property>
+    <property name="title" translatable="yes">Inspect an Expression</property>
     <property name="window_position">center</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]