nemiver r899 - in trunk: . src/persp/dbgperspective src/uicommon
- From: dodji svn gnome org
- To: svn-commits-list gnome org
- Subject: nemiver r899 - in trunk: . src/persp/dbgperspective src/uicommon
- Date: Tue, 29 Jul 2008 22:45:24 +0000 (UTC)
Author: dodji
Date: Tue Jul 29 22:45:24 2008
New Revision: 899
URL: http://svn.gnome.org/viewvc/nemiver?rev=899&view=rev
Log:
Fix as much coding style issues as possible.
* src/uicommon/*, src/persp/dbgperspective/*:
Did a big review of style issue in the UI related code.
Now this part of the code base should comply more with
the coding style of the project.
I hate doing this.
Modified:
trunk/ChangeLog
trunk/src/persp/dbgperspective/nmv-breakpoints-view.cc
trunk/src/persp/dbgperspective/nmv-breakpoints-view.h
trunk/src/persp/dbgperspective/nmv-call-function-dialog.cc
trunk/src/persp/dbgperspective/nmv-call-stack.cc
trunk/src/persp/dbgperspective/nmv-call-stack.h
trunk/src/persp/dbgperspective/nmv-choose-overloads-dialog.cc
trunk/src/persp/dbgperspective/nmv-choose-overloads-dialog.h
trunk/src/persp/dbgperspective/nmv-dbg-perspective.cc
trunk/src/persp/dbgperspective/nmv-dbg-perspective.h
trunk/src/persp/dbgperspective/nmv-dialog.cc
trunk/src/persp/dbgperspective/nmv-dialog.h
trunk/src/persp/dbgperspective/nmv-file-list.cc
trunk/src/persp/dbgperspective/nmv-file-list.h
trunk/src/persp/dbgperspective/nmv-find-text-dialog.cc
trunk/src/persp/dbgperspective/nmv-find-text-dialog.h
trunk/src/persp/dbgperspective/nmv-global-vars-inspector-dialog.cc
trunk/src/persp/dbgperspective/nmv-global-vars-inspector-dialog.h
trunk/src/persp/dbgperspective/nmv-load-core-dialog.cc
trunk/src/persp/dbgperspective/nmv-load-core-dialog.h
trunk/src/persp/dbgperspective/nmv-local-vars-inspector.cc
trunk/src/persp/dbgperspective/nmv-local-vars-inspector.h
trunk/src/persp/dbgperspective/nmv-locate-file-dialog.cc
trunk/src/persp/dbgperspective/nmv-locate-file-dialog.h
trunk/src/persp/dbgperspective/nmv-memory-view.cc
trunk/src/persp/dbgperspective/nmv-memory-view.h
trunk/src/persp/dbgperspective/nmv-open-file-dialog.cc
trunk/src/persp/dbgperspective/nmv-open-file-dialog.h
trunk/src/persp/dbgperspective/nmv-preferences-dialog.cc
trunk/src/persp/dbgperspective/nmv-preferences-dialog.h
trunk/src/persp/dbgperspective/nmv-proc-list-dialog.cc
trunk/src/persp/dbgperspective/nmv-proc-list-dialog.h
trunk/src/persp/dbgperspective/nmv-registers-view.cc
trunk/src/persp/dbgperspective/nmv-registers-view.h
trunk/src/persp/dbgperspective/nmv-remote-target-dialog.cc
trunk/src/persp/dbgperspective/nmv-remote-target-dialog.h
trunk/src/persp/dbgperspective/nmv-run-program-dialog.cc
trunk/src/persp/dbgperspective/nmv-run-program-dialog.h
trunk/src/persp/dbgperspective/nmv-saved-sessions-dialog.cc
trunk/src/persp/dbgperspective/nmv-saved-sessions-dialog.h
trunk/src/persp/dbgperspective/nmv-sess-mgr.cc
trunk/src/persp/dbgperspective/nmv-sess-mgr.h
trunk/src/persp/dbgperspective/nmv-set-breakpoint-dialog.cc
trunk/src/persp/dbgperspective/nmv-set-breakpoint-dialog.h
trunk/src/persp/dbgperspective/nmv-thread-list.cc
trunk/src/persp/dbgperspective/nmv-thread-list.h
trunk/src/persp/dbgperspective/nmv-var-inspector-dialog.cc
trunk/src/persp/dbgperspective/nmv-var-inspector-dialog.h
trunk/src/persp/dbgperspective/nmv-var-inspector.cc
trunk/src/persp/dbgperspective/nmv-var-inspector.h
trunk/src/persp/dbgperspective/nmv-variables-utils.cc
trunk/src/persp/dbgperspective/nmv-variables-utils.h
trunk/src/persp/dbgperspective/nmv-vars-treeview.cc
trunk/src/persp/dbgperspective/nmv-vars-treeview.h
trunk/src/uicommon/nmv-hex-document.cc
trunk/src/uicommon/nmv-hex-document.h
trunk/src/uicommon/nmv-hex-editor.cc
trunk/src/uicommon/nmv-hex-editor.h
Modified: trunk/src/persp/dbgperspective/nmv-breakpoints-view.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-breakpoints-view.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-breakpoints-view.cc Tue Jul 29 22:45:24 2008
@@ -36,25 +36,25 @@
namespace nemiver {
struct BPColumns : public Gtk::TreeModelColumnRecord {
- Gtk::TreeModelColumn<int> id ;
- Gtk::TreeModelColumn<bool> enabled ;
- Gtk::TreeModelColumn<Glib::ustring> address ;
- Gtk::TreeModelColumn<Glib::ustring> filename ;
- Gtk::TreeModelColumn<Glib::ustring> function ;
- Gtk::TreeModelColumn<int> line ;
+ Gtk::TreeModelColumn<int> id;
+ Gtk::TreeModelColumn<bool> enabled;
+ Gtk::TreeModelColumn<Glib::ustring> address;
+ Gtk::TreeModelColumn<Glib::ustring> filename;
+ Gtk::TreeModelColumn<Glib::ustring> function;
+ Gtk::TreeModelColumn<int> line;
Gtk::TreeModelColumn<Glib::ustring> condition;
Gtk::TreeModelColumn<int> hits;
- Gtk::TreeModelColumn<IDebugger::BreakPoint> breakpoint ;
+ Gtk::TreeModelColumn<IDebugger::BreakPoint> breakpoint;
BPColumns ()
{
- add (id) ;
- add (enabled) ;
- add (address) ;
- add (filename) ;
- add (function) ;
- add (line) ;
- add (breakpoint) ;
+ add (id);
+ add (enabled);
+ add (address);
+ add (filename);
+ add (function);
+ add (line);
+ add (breakpoint);
add (condition);
add (hits);
}
@@ -63,14 +63,14 @@
static BPColumns&
get_bp_columns ()
{
- static BPColumns s_cols ;
- return s_cols ;
+ static BPColumns s_cols;
+ return s_cols;
}
struct BreakpointsView::Priv {
public:
- SafePtr<Gtk::TreeView> tree_view ;
- Glib::RefPtr<Gtk::ListStore> list_store ;
+ SafePtr<Gtk::TreeView> tree_view;
+ Glib::RefPtr<Gtk::ListStore> list_store;
Gtk::Widget *breakpoints_menu;
sigc::signal<void,
const IDebugger::BreakPoint&> go_to_breakpoint_signal;
@@ -90,16 +90,16 @@
is_up2date (true)
{
init_actions ();
- build_tree_view () ;
+ build_tree_view ();
void set_breakpoints
(const std::map<int, IDebugger::BreakPoint> &a_breakpoints);
// update breakpoint list when debugger indicates that the list of
// breakpoints has changed.
debugger->breakpoint_deleted_signal ().connect (sigc::mem_fun
- (*this, &Priv::on_debugger_breakpoint_deleted_signal)) ;
+ (*this, &Priv::on_debugger_breakpoint_deleted_signal));
debugger->breakpoints_set_signal ().connect (sigc::mem_fun
- (*this, &Priv::on_debugger_breakpoints_set_signal)) ;
+ (*this, &Priv::on_debugger_breakpoints_set_signal));
debugger->stopped_signal ().connect (sigc::mem_fun
(*this, &Priv::on_debugger_stopped_signal));
breakpoints_menu = load_menu ("breakpointspopup.xml",
@@ -110,17 +110,17 @@
{
if (tree_view) {return;}
//create a default tree store and a tree view
- list_store = Gtk::ListStore::create (get_bp_columns ()) ;
- tree_view.reset (new Gtk::TreeView (list_store)) ;
- tree_view->get_selection ()->set_mode (Gtk::SELECTION_MULTIPLE) ;
+ list_store = Gtk::ListStore::create (get_bp_columns ());
+ tree_view.reset (new Gtk::TreeView (list_store));
+ tree_view->get_selection ()->set_mode (Gtk::SELECTION_MULTIPLE);
//create the columns of the tree view
- tree_view->append_column_editable ("", get_bp_columns ().enabled) ;
- tree_view->append_column (_("ID"), get_bp_columns ().id) ;
- tree_view->append_column (_("Filename"), get_bp_columns ().filename) ;
- tree_view->append_column (_("Line"), get_bp_columns ().line) ;
- tree_view->append_column (_("Function"), get_bp_columns ().function) ;
- tree_view->append_column (_("Address"), get_bp_columns ().address) ;
+ tree_view->append_column_editable ("", get_bp_columns ().enabled);
+ tree_view->append_column (_("ID"), get_bp_columns ().id);
+ tree_view->append_column (_("Filename"), get_bp_columns ().filename);
+ tree_view->append_column (_("Line"), get_bp_columns ().line);
+ tree_view->append_column (_("Function"), get_bp_columns ().function);
+ tree_view->append_column (_("Address"), get_bp_columns ().address);
tree_view->append_column (_("Condition"), get_bp_columns ().condition);
tree_view->append_column (_("Hits"), get_bp_columns ().hits);
Gtk::CellRendererToggle *enabled_toggle =
@@ -163,9 +163,11 @@
tree_view->get_model ()->get_iter (path);
if (tree_iter) {
if ((*tree_iter)[get_bp_columns ().enabled]) {
- debugger->enable_breakpoint((*tree_iter)[get_bp_columns ().id]);
+ debugger->enable_breakpoint
+ ((*tree_iter)[get_bp_columns ().id]);
} else {
- debugger->disable_breakpoint((*tree_iter)[get_bp_columns ().id]);
+ debugger->disable_breakpoint
+ ((*tree_iter)[get_bp_columns ().id]);
}
}
}
@@ -181,7 +183,7 @@
if (list_store->children ().empty ()) {
// there are no breakpoints in the list yet, so no need to do any
// searching for things to update, just add them all directly
- add_breakpoints(a_breakpoints);
+ add_breakpoints (a_breakpoints);
} else {
//find breakpoints that need adding or updating
std::map<int, IDebugger::BreakPoint>::const_iterator breakmap_iter;
@@ -189,7 +191,7 @@
breakmap_iter != a_breakpoints.end ();
++breakmap_iter) {
Gtk::TreeModel::iterator tree_iter =
- find_breakpoint_in_model(breakmap_iter->second);
+ find_breakpoint_in_model (breakmap_iter->second);
if (tree_iter) {
LOG_DD ("Updating breakpoint "
<< breakmap_iter->second.number ());
@@ -197,7 +199,7 @@
} else {
LOG_DD ("Adding breakpoint "
<< breakmap_iter->second.number ());
- append_breakpoint(breakmap_iter->second);
+ append_breakpoint (breakmap_iter->second);
}
}
}
@@ -206,20 +208,21 @@
void add_breakpoints
(const std::map<int, IDebugger::BreakPoint> &a_breakpoints)
{
- THROW_IF_FAIL (list_store) ;
+ THROW_IF_FAIL (list_store);
std::map<int, IDebugger::BreakPoint>::const_iterator break_iter;
for (break_iter = a_breakpoints.begin ();
break_iter != a_breakpoints.end ();
++break_iter) {
- append_breakpoint(break_iter->second);
+ append_breakpoint (break_iter->second);
}
}
- bool breakpoint_list_has_id (const std::map<int, IDebugger::BreakPoint>
- &a_breakpoints, int a_id)
+ bool breakpoint_list_has_id
+ (const std::map<int, IDebugger::BreakPoint> &a_breakpoints,
+ int a_id)
{
- std::map<int, IDebugger::BreakPoint>::const_iterator breakmap_iter ;
+ std::map<int, IDebugger::BreakPoint>::const_iterator breakmap_iter;
for (breakmap_iter = a_breakpoints.begin ();
breakmap_iter != a_breakpoints.end (); ++ breakmap_iter) {
if (a_id == breakmap_iter->second.number ()) {
@@ -232,7 +235,7 @@
Gtk::TreeModel::iterator find_breakpoint_in_model
(const IDebugger::BreakPoint &a_breakpoint)
{
- THROW_IF_FAIL (list_store) ;
+ THROW_IF_FAIL (list_store);
Gtk::TreeModel::iterator iter;
for (iter = list_store->children ().begin ();
@@ -246,14 +249,14 @@
return Gtk::TreeModel::iterator();
}
- void update_breakpoint(Gtk::TreeModel::iterator& a_iter,
- const IDebugger::BreakPoint &a_breakpoint)
+ void update_breakpoint (Gtk::TreeModel::iterator& a_iter,
+ const IDebugger::BreakPoint &a_breakpoint)
{
(*a_iter)[get_bp_columns ().breakpoint] = a_breakpoint;
- (*a_iter)[get_bp_columns ().enabled] = a_breakpoint.enabled () ;
- (*a_iter)[get_bp_columns ().id] = a_breakpoint.number () ;
+ (*a_iter)[get_bp_columns ().enabled] = a_breakpoint.enabled ();
+ (*a_iter)[get_bp_columns ().id] = a_breakpoint.number ();
(*a_iter)[get_bp_columns ().function] = a_breakpoint.function ();
- (*a_iter)[get_bp_columns ().address] = a_breakpoint.address () ;
+ (*a_iter)[get_bp_columns ().address] = a_breakpoint.address ();
(*a_iter)[get_bp_columns ().filename] = a_breakpoint.file_name ();
(*a_iter)[get_bp_columns ().line] = a_breakpoint.line ();
(*a_iter)[get_bp_columns ().condition] = a_breakpoint.condition ();
@@ -309,32 +312,33 @@
{
if (a_break.number () || a_cookie.empty()) {}
NEMIVER_TRY
- list<Gtk::TreeModel::iterator> iters_to_erase ;
+ list<Gtk::TreeModel::iterator> iters_to_erase;
for (Gtk::TreeModel::iterator iter = list_store->children ().begin ();
- iter != list_store->children ().end ();
- ++iter) {
+ iter != list_store->children ().end ();
+ ++iter) {
if ((*iter)[get_bp_columns ().id] == a_break_number) {
- iters_to_erase.push_back (iter) ;
+ iters_to_erase.push_back (iter);
break;
}
}
- for (list<Gtk::TreeModel::iterator>::iterator it =
- iters_to_erase.begin ();
+ list<Gtk::TreeModel::iterator>::iterator it;
+ for (it = iters_to_erase.begin ();
it != iters_to_erase.end ();
++it) {
- list_store->erase (*it) ;
+ list_store->erase (*it);
}
NEMIVER_CATCH
}
bool on_breakpoints_view_button_press_signal (GdkEventButton *a_event)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
bool handled = false;
NEMIVER_TRY
- // double-clicking a breakpoint item should go to the source location for
+ // double-clicking a breakpoint item should go
+ // to the source location for
// the breakpoint
if (a_event->type == GDK_2BUTTON_PRESS) {
if (a_event->button == 1) {
@@ -354,13 +358,15 @@
static_cast<int>(a_event->x),
static_cast<int>(a_event->y),
path, p_column, cell_x, cell_y)) {
- popup_breakpoints_view_menu (a_event) ;
+ popup_breakpoints_view_menu (a_event);
Glib::RefPtr<Gtk::TreeView::Selection> selection =
tree_view->get_selection ();
if (selection->is_selected(path)) {
- // don't continue to handle this event. This is necessary
- // because if multiple items are selected, we don't want
- // them to become de-selected when we pop up a context menu
+ // don't continue to handle this event.
+ // This is necessary
+ // because if multiple items are selected,
+ // we don't want them to become de-selected
+ // when we pop up a context menu
handled = true;
}
}
@@ -376,18 +382,19 @@
NEMIVER_TRY
THROW_IF_FAIL(tree_view)
- Glib::RefPtr<Gtk::Action> action = workbench.get_ui_manager ()->get_action
- ("/BreakpointsPopup/GoToSourceBreakpointMenuItem");
+ Glib::RefPtr<Gtk::Action> action =
+ workbench.get_ui_manager ()->get_action
+ ("/BreakpointsPopup/GoToSourceBreakpointMenuItem");
if (action) {
if (tree_view->get_selection ()->count_selected_rows () > 1) {
- action->set_sensitive (false) ;
+ action->set_sensitive (false);
} else {
- action->set_sensitive (true) ;
+ action->set_sensitive (true);
}
} else {
LOG_ERROR
("Could not get action "
- "/BreakpointsPopup/GoToSourceBreakpointMenuItem") ;
+ "/BreakpointsPopup/GoToSourceBreakpointMenuItem");
}
NEMIVER_CATCH
}
@@ -395,11 +402,12 @@
void on_breakpoint_go_to_source_action ()
{
THROW_IF_FAIL(tree_view)
- Glib::RefPtr<Gtk::TreeSelection> selection = tree_view->get_selection ();
+ Glib::RefPtr<Gtk::TreeSelection> selection =
+ tree_view->get_selection ();
vector<Gtk::TreeModel::Path> paths = selection->get_selected_rows ();
if (paths.empty ())
- return ;
- Gtk::TreeModel::iterator tree_iter = list_store->get_iter (paths[0]) ;
+ return;
+ Gtk::TreeModel::iterator tree_iter = list_store->get_iter (paths[0]);
if (tree_iter) {
go_to_breakpoint_signal.emit
((*tree_iter)[get_bp_columns ().breakpoint]);
@@ -409,15 +417,15 @@
void on_breakpoint_delete_action ()
{
THROW_IF_FAIL (tree_view)
- THROW_IF_FAIL (list_store) ;
+ THROW_IF_FAIL (list_store);
Glib::RefPtr<Gtk::TreeSelection> selection =
tree_view->get_selection ();
vector<Gtk::TreeModel::Path> paths = selection->get_selected_rows ();
- vector<Gtk::TreeModel::Path>::const_iterator it ;
- Gtk::TreeModel::iterator tree_iter ;
- for (it=paths.begin () ; it != paths.end (); ++it) {
- tree_iter = list_store->get_iter (*it) ;
+ vector<Gtk::TreeModel::Path>::const_iterator it;
+ Gtk::TreeModel::iterator tree_iter;
+ for (it=paths.begin (); it != paths.end (); ++it) {
+ tree_iter = list_store->get_iter (*it);
if (tree_iter) {
debugger->delete_breakpoint
((*tree_iter)[get_bp_columns ().id]);
@@ -439,13 +447,13 @@
Gtk::Widget* load_menu (UString a_filename, UString a_widget_name)
{
NEMIVER_TRY
- string relative_path = Glib::build_filename ("menus", a_filename) ;
- string absolute_path ;
+ string relative_path = Glib::build_filename ("menus", a_filename);
+ string absolute_path;
THROW_IF_FAIL (perspective.build_absolute_resource_path
- (Glib::locale_to_utf8 (relative_path), absolute_path)) ;
+ (Glib::locale_to_utf8 (relative_path), absolute_path));
workbench.get_ui_manager ()->add_ui_from_file
- (Glib::locale_to_utf8 (absolute_path)) ;
+ (Glib::locale_to_utf8 (absolute_path));
NEMIVER_CATCH
return workbench.get_ui_manager ()->get_widget (a_widget_name);
}
@@ -458,11 +466,11 @@
void popup_breakpoints_view_menu (GdkEventButton *a_event)
{
- THROW_IF_FAIL (a_event) ;
- THROW_IF_FAIL (tree_view) ;
- Gtk::Menu *menu = dynamic_cast<Gtk::Menu*> (get_breakpoints_menu ()) ;
- THROW_IF_FAIL (menu) ;
- menu->popup (a_event->button, a_event->time) ;
+ THROW_IF_FAIL (a_event);
+ THROW_IF_FAIL (tree_view);
+ Gtk::Menu *menu = dynamic_cast<Gtk::Menu*> (get_breakpoints_menu ());
+ THROW_IF_FAIL (menu);
+ menu->popup (a_event->button, a_event->time);
}
void init_actions()
@@ -490,15 +498,17 @@
};
breakpoints_action_group =
- Gtk::ActionGroup::create ("breakpoints-action-group") ;
- breakpoints_action_group->set_sensitive (true) ;
+ Gtk::ActionGroup::create ("breakpoints-action-group");
+ breakpoints_action_group->set_sensitive (true);
int num_actions =
- sizeof (s_breakpoints_action_entries)/sizeof (ui_utils::ActionEntry) ;
+ sizeof (s_breakpoints_action_entries)
+ /
+ sizeof (ui_utils::ActionEntry);
ui_utils::add_action_entries_to_action_group
(s_breakpoints_action_entries, num_actions,
- breakpoints_action_group) ;
+ breakpoints_action_group);
workbench.get_ui_manager ()->insert_action_group
(breakpoints_action_group);
@@ -521,47 +531,48 @@
};//end class BreakpointsView::Priv
BreakpointsView::BreakpointsView (IWorkbench& a_workbench,
- IPerspective& a_perspective, IDebuggerSafePtr& a_debugger)
+ IPerspective& a_perspective,
+ IDebuggerSafePtr& a_debugger)
{
m_priv.reset (new Priv (a_workbench, a_perspective, a_debugger));
}
BreakpointsView::~BreakpointsView ()
{
- LOG_D ("deleted", "destructor-domain") ;
+ LOG_D ("deleted", "destructor-domain");
}
Gtk::Widget&
BreakpointsView::widget () const
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->tree_view) ;
- THROW_IF_FAIL (m_priv->list_store) ;
- return *m_priv->tree_view ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->tree_view);
+ THROW_IF_FAIL (m_priv->list_store);
+ return *m_priv->tree_view;
}
void
BreakpointsView::set_breakpoints
(const std::map<int, IDebugger::BreakPoint> &a_breakpoints)
{
- THROW_IF_FAIL (m_priv) ;
- m_priv->set_breakpoints (a_breakpoints) ;
+ THROW_IF_FAIL (m_priv);
+ m_priv->set_breakpoints (a_breakpoints);
}
void
BreakpointsView::clear ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (m_priv->list_store) {
- m_priv->list_store->clear () ;
+ m_priv->list_store->clear ();
}
}
void
BreakpointsView::re_init ()
{
- THROW_IF_FAIL (m_priv) ;
- clear () ;
+ THROW_IF_FAIL (m_priv);
+ clear ();
m_priv->re_init ();
}
Modified: trunk/src/persp/dbgperspective/nmv-breakpoints-view.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-breakpoints-view.h (original)
+++ trunk/src/persp/dbgperspective/nmv-breakpoints-view.h Tue Jul 29 22:45:24 2008
@@ -34,34 +34,38 @@
namespace Gtk {
class UIManager;
}
-namespace nemiver {
+
+NEMIVER_BEGIN_NAMESPACE (nemiver)
class IWorkbench;
class IPerspective;
class NEMIVER_API BreakpointsView : public nemiver::common::Object {
//non copyable
- BreakpointsView (const BreakpointsView&) ;
- BreakpointsView& operator= (const BreakpointsView&) ;
+ BreakpointsView (const BreakpointsView&);
+ BreakpointsView& operator= (const BreakpointsView&);
- struct Priv ;
- SafePtr<Priv> m_priv ;
+ struct Priv;
+ SafePtr<Priv> m_priv;
public:
- BreakpointsView (IWorkbench& a_workbench, IPerspective& a_perspective, IDebuggerSafePtr& a_debugger) ;
- virtual ~BreakpointsView () ;
- Gtk::Widget& widget () const ;
+ BreakpointsView (IWorkbench& a_workbench,
+ IPerspective& a_perspective,
+ IDebuggerSafePtr& a_debugger);
+ virtual ~BreakpointsView ();
+ Gtk::Widget& widget () const;
void set_breakpoints
- (const std::map<int, IDebugger::BreakPoint> &a_breakpoints) ;
- void clear () ;
- void re_init () ;
+ (const std::map<int, IDebugger::BreakPoint> &a_breakpoints);
+ void clear ();
+ void re_init ();
sigc::signal<void,
- const IDebugger::BreakPoint&>& go_to_breakpoint_signal () const ;
+ const IDebugger::BreakPoint&>&
+ go_to_breakpoint_signal () const;
};//end BreakpointsView
-}//end namespace nemiver
+NEMIVER_END_NAMESPACE (nemiver)
#endif //__NMV_BREAKPOINTS_VIEW_H__
Modified: trunk/src/persp/dbgperspective/nmv-call-function-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-call-function-dialog.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-call-function-dialog.cc Tue Jul 29 22:45:24 2008
@@ -42,13 +42,14 @@
{
a_dialog.set_default_response (Gtk::RESPONSE_OK);
ok_button =
- ui_utils::get_widget_from_glade<Gtk::Button> (a_glade, "okbutton");
+ ui_utils::get_widget_from_glade<Gtk::Button> (a_glade,
+ "okbutton");
THROW_IF_FAIL (ok_button);
ok_button->set_sensitive (false);
call_expr_entry =
- ui_utils::get_widget_from_glade<Gtk::Entry> (a_glade,
- "callexpressionentry");
+ ui_utils::get_widget_from_glade<Gtk::Entry>
+ (a_glade, "callexpressionentry");
THROW_IF_FAIL (call_expr_entry);
call_expr_entry->signal_changed ().connect
(sigc::mem_fun (*this, &Priv::on_call_expr_entry_changed_signal));
Modified: trunk/src/persp/dbgperspective/nmv-call-stack.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-call-stack.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-call-stack.cc Tue Jul 29 22:45:24 2008
@@ -39,7 +39,7 @@
void operator () (Glib::Object *a_obj)
{
if (a_obj) {
- a_obj->reference () ;
+ a_obj->reference ();
}
}
};//end GlibObjectRef
@@ -48,16 +48,16 @@
void operator () (Glib::Object *a_obj)
{
if (a_obj) {
- a_obj->unreference () ;
+ a_obj->unreference ();
}
}
};//end GlibObjectRef
-typedef SafePtr<Glib::Object, GObjectMMRef, GObjectMMUnref> GObjectMMSafePtr ;
+typedef SafePtr<Glib::Object, GObjectMMRef, GObjectMMUnref> GObjectMMSafePtr;
struct CallStackCols : public Gtk::TreeModelColumnRecord {
- Gtk::TreeModelColumn<Glib::ustring> location ;
- Gtk::TreeModelColumn<Glib::ustring> function_name ;
+ Gtk::TreeModelColumn<Glib::ustring> location;
+ Gtk::TreeModelColumn<Glib::ustring> function_name;
Gtk::TreeModelColumn<Glib::ustring> function_args;
Gtk::TreeModelColumn<Glib::ustring> frame_index_caption;
Gtk::TreeModelColumn<int> frame_index;
@@ -71,42 +71,42 @@
CallStackCols ()
{
- add (location) ;
- add (function_name) ;
- add (function_args) ;
- add (frame_index_caption) ;
- add (frame_index) ;
- add (is_expansion_row) ;
+ add (location);
+ add (function_name);
+ add (function_args);
+ add (frame_index_caption);
+ add (frame_index);
+ add (is_expansion_row);
}
};//end cols
static CallStackCols&
columns ()
{
- static CallStackCols s_cols ;
- return s_cols ;
+ static CallStackCols s_cols;
+ return s_cols;
}
static const UString CONF_KEY_NEMIVER_CALLSTACK_EXPANSION_CHUNK =
"/apps/nemiver/dbgperspective/callstack-expansion-chunk";
struct CallStack::Priv {
- IDebuggerSafePtr debugger ;
+ IDebuggerSafePtr debugger;
IWorkbench& workbench;
IPerspective& perspective;
- vector<IDebugger::Frame> frames ;
+ vector<IDebugger::Frame> frames;
map<int, list<IDebugger::VariableSafePtr> > params;
- Glib::RefPtr<Gtk::ListStore> store ;
- SafePtr<Gtk::TreeView> widget ;
- bool waiting_for_stack_args ;
- bool in_set_cur_frame_trans ;
- IDebugger::Frame cur_frame ;
+ Glib::RefPtr<Gtk::ListStore> store;
+ SafePtr<Gtk::TreeView> widget;
+ bool waiting_for_stack_args;
+ bool in_set_cur_frame_trans;
+ IDebugger::Frame cur_frame;
int cur_frame_index;
unsigned nb_frames_expansion_chunk;
unsigned max_frames_to_show;
- sigc::signal<void, int, const IDebugger::Frame&> frame_selected_signal ;
- sigc::connection on_selection_changed_connection ;
- Gtk::Widget *callstack_menu ;
+ sigc::signal<void, int, const IDebugger::Frame&> frame_selected_signal;
+ sigc::connection on_selection_changed_connection;
+ Gtk::Widget *callstack_menu;
Glib::RefPtr<Gtk::ActionGroup> call_stack_action_group;
bool is_up2date;
@@ -124,7 +124,7 @@
callstack_menu (0),
is_up2date (true)
{
- connect_debugger_signals () ;
+ connect_debugger_signals ();
init_actions ();
init_conf ();
}
@@ -166,17 +166,17 @@
};
call_stack_action_group =
- Gtk::ActionGroup::create ("callstack-action-group") ;
- call_stack_action_group->set_sensitive (true) ;
+ Gtk::ActionGroup::create ("callstack-action-group");
+ call_stack_action_group->set_sensitive (true);
int num_actions =
sizeof (s_call_stack_action_entries)
/
- sizeof (ui_utils::ActionEntry) ;
+ sizeof (ui_utils::ActionEntry);
ui_utils::add_action_entries_to_action_group
(s_call_stack_action_entries,
num_actions,
- call_stack_action_group) ;
+ call_stack_action_group);
workbench.get_ui_manager ()->insert_action_group
(call_stack_action_group);
@@ -194,14 +194,14 @@
Gtk::Widget* load_menu (UString a_filename, UString a_widget_name)
{
NEMIVER_TRY
- string relative_path = Glib::build_filename ("menus", a_filename) ;
- string absolute_path ;
+ string relative_path = Glib::build_filename ("menus", a_filename);
+ string absolute_path;
THROW_IF_FAIL (perspective.build_absolute_resource_path
(Glib::locale_to_utf8 (relative_path),
- absolute_path)) ;
+ absolute_path));
workbench.get_ui_manager ()->add_ui_from_file
- (Glib::locale_to_utf8 (absolute_path)) ;
+ (Glib::locale_to_utf8 (absolute_path));
NEMIVER_CATCH
return workbench.get_ui_manager ()->get_widget (a_widget_name);
@@ -223,10 +223,10 @@
THROW_IF_FAIL (a_row_iter);
- cur_frame_index = (*a_row_iter)[columns ().frame_index] ;
- cur_frame = frames[cur_frame_index] ;
- THROW_IF_FAIL (cur_frame.level () >= 0) ;
- in_set_cur_frame_trans = true ;
+ cur_frame_index = (*a_row_iter)[columns ().frame_index];
+ cur_frame = frames[cur_frame_index];
+ THROW_IF_FAIL (cur_frame.level () >= 0);
+ in_set_cur_frame_trans = true;
//if the selected row is the "expand number of stack lines" row, trigger
//a redraw of the with more raws.
@@ -236,15 +236,15 @@
return;
}
- LOG_DD ("frame selected: '"<< (int) cur_frame_index << "'") ;
- LOG_DD ("frame level: '" << (int) cur_frame.level () << "'") ;
- debugger->select_frame (cur_frame_index) ;
+ LOG_DD ("frame selected: '"<< (int) cur_frame_index << "'");
+ LOG_DD ("frame level: '" << (int) cur_frame.level () << "'");
+ debugger->select_frame (cur_frame_index);
}
void finish_handling_debugger_stopped_event ()
{
- THROW_IF_FAIL (debugger) ;
- debugger->list_frames () ;
+ THROW_IF_FAIL (debugger);
+ debugger->list_frames ();
}
void on_debugger_stopped_signal (IDebugger::StopReason a_reason,
@@ -254,15 +254,15 @@
int /*a_bp_num*/,
const UString &/*a_cookie*/)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- LOG_DD ("stopped, reason: " << a_reason) ;
+ LOG_DD ("stopped, reason: " << a_reason);
if (a_reason == IDebugger::EXITED_SIGNALLED
|| a_reason == IDebugger::EXITED_NORMALLY
|| a_reason == IDebugger::EXITED) {
- return ;
+ return;
}
if (should_process_now ()) {
@@ -277,14 +277,14 @@
void on_frames_listed_signal (const vector<IDebugger::Frame> &a_stack,
const UString &a_cookie)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
if (a_cookie.empty ()) {}
NEMIVER_TRY
- THROW_IF_FAIL (debugger) ;
- waiting_for_stack_args = true ;
+ THROW_IF_FAIL (debugger);
+ waiting_for_stack_args = true;
//**************************************************************
//set the frame list without frame parameters,
@@ -296,9 +296,9 @@
//request to IDebugger fail (the one to get the parameters).
//This way, we have at least the frame list withouht params.
//**************************************************************
- map<int, list<IDebugger::VariableSafePtr> > frames_params ;
- set_frame_list (a_stack, frames_params) ;
- debugger->list_frames_arguments () ;
+ map<int, list<IDebugger::VariableSafePtr> > frames_params;
+ set_frame_list (a_stack, frames_params);
+ debugger->list_frames_arguments ();
NEMIVER_CATCH
}
@@ -307,21 +307,21 @@
(const map<int, list<IDebugger::VariableSafePtr> > &a_frames_params,
const UString &a_cookie)
{
- LOG_D ("frames params listed", NMV_DEFAULT_DOMAIN) ;
+ LOG_D ("frames params listed", NMV_DEFAULT_DOMAIN);
if (a_cookie.empty ()) {}
if (waiting_for_stack_args) {
- set_frame_list (frames, a_frames_params) ;
- waiting_for_stack_args = false ;
+ set_frame_list (frames, a_frames_params);
+ waiting_for_stack_args = false;
} else {
- LOG_D ("not in the frame setting transaction", NMV_DEFAULT_DOMAIN) ;
+ LOG_D ("not in the frame setting transaction", NMV_DEFAULT_DOMAIN);
}
}
void on_command_done_signal (const UString &a_command,
const UString &a_cookie)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
if (a_cookie == "") {}
@@ -329,42 +329,42 @@
if (in_set_cur_frame_trans
&& a_command == "select-frame") {
- in_set_cur_frame_trans = false ;
- frame_selected_signal.emit (cur_frame_index, cur_frame) ;
- LOG_DD ("sent the frame selected signal") ;
+ in_set_cur_frame_trans = false;
+ frame_selected_signal.emit (cur_frame_index, cur_frame);
+ LOG_DD ("sent the frame selected signal");
}
NEMIVER_CATCH
}
void on_selection_changed_signal ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
Gtk::TreeView *tree_view = dynamic_cast<Gtk::TreeView*> (widget.get ());
- THROW_IF_FAIL (tree_view) ;
- Glib::RefPtr<Gtk::TreeSelection> selection = tree_view->get_selection () ;
- THROW_IF_FAIL (selection) ;
- list<Gtk::TreePath> selected_rows = selection->get_selected_rows () ;
+ THROW_IF_FAIL (tree_view);
+ Glib::RefPtr<Gtk::TreeSelection> selection = tree_view->get_selection ();
+ THROW_IF_FAIL (selection);
+ list<Gtk::TreePath> selected_rows = selection->get_selected_rows ();
if (selected_rows.empty ()) {return;}
Gtk::TreeModel::iterator row_iter =
- store->get_iter (selected_rows.front ()) ;
+ store->get_iter (selected_rows.front ());
update_selected_frame (row_iter);
NEMIVER_CATCH
}
void on_row_activated_signal ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
Gtk::TreeView *tree_view = dynamic_cast<Gtk::TreeView*> (widget.get ());
- THROW_IF_FAIL (tree_view) ;
- Glib::RefPtr<Gtk::TreeSelection> selection = tree_view->get_selection () ;
- THROW_IF_FAIL (selection) ;
+ THROW_IF_FAIL (tree_view);
+ Glib::RefPtr<Gtk::TreeSelection> selection = tree_view->get_selection ();
+ THROW_IF_FAIL (selection);
Gtk::TreeModel::iterator row_it = selection->get_selected ();
update_selected_frame (row_it);
@@ -395,27 +395,27 @@
void connect_debugger_signals ()
{
- THROW_IF_FAIL (debugger) ;
+ THROW_IF_FAIL (debugger);
debugger->stopped_signal ().connect (sigc::mem_fun
- (*this, &CallStack::Priv::on_debugger_stopped_signal)) ;
+ (*this, &CallStack::Priv::on_debugger_stopped_signal));
debugger->frames_listed_signal ().connect (sigc::mem_fun
- (*this, &CallStack::Priv::on_frames_listed_signal)) ;
+ (*this, &CallStack::Priv::on_frames_listed_signal));
debugger->frames_arguments_listed_signal ().connect (sigc::mem_fun
- (*this, &CallStack::Priv::on_frames_params_listed_signal)) ;
+ (*this, &CallStack::Priv::on_frames_params_listed_signal));
debugger->command_done_signal ().connect (sigc::mem_fun
- (*this, &CallStack::Priv::on_command_done_signal)) ;
+ (*this, &CallStack::Priv::on_command_done_signal));
}
void on_call_stack_button_press_signal (GdkEventButton *a_event)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
// right-clicking should pop up a context menu
if ((a_event->type == GDK_BUTTON_PRESS) && (a_event->button == 3)) {
- popup_call_stack_menu (a_event) ;
+ popup_call_stack_menu (a_event);
}
NEMIVER_CATCH
@@ -426,8 +426,8 @@
THROW_IF_FAIL (a_event);
THROW_IF_FAIL (widget);
- Gtk::Menu *menu = dynamic_cast<Gtk::Menu*> (get_call_stack_menu ()) ;
- THROW_IF_FAIL (menu) ;
+ Gtk::Menu *menu = dynamic_cast<Gtk::Menu*> (get_call_stack_menu ());
+ THROW_IF_FAIL (menu);
//only pop up a menu if a row exists at that position
Gtk::TreeModel::Path path;
@@ -439,7 +439,7 @@
column,
cell_x,
cell_y)) {
- menu->popup (a_event->button, a_event->time) ;
+ menu->popup (a_event->button, a_event->time);
}
}
@@ -484,29 +484,29 @@
Gtk::Widget* get_widget ()
{
if (!widget) {return 0;}
- return widget.get () ;
+ return widget.get ();
}
void build_widget ()
{
if (widget) {
- return ;
+ return;
}
store = Gtk::ListStore::create (columns ());
- Gtk::TreeView *tree_view = new Gtk::TreeView (store) ;
- THROW_IF_FAIL (tree_view) ;
- widget.reset (tree_view) ;
- tree_view->append_column (_("Frame"), columns ().frame_index_caption) ;
- tree_view->append_column (_("Location"), columns ().location) ;
- tree_view->append_column (_("Function"), columns ().function_name) ;
- tree_view->append_column (_("Arguments"), columns ().function_args) ;
- tree_view->set_headers_visible (true) ;
- tree_view->get_selection ()->set_mode (Gtk::SELECTION_SINGLE) ;
+ Gtk::TreeView *tree_view = new Gtk::TreeView (store);
+ THROW_IF_FAIL (tree_view);
+ widget.reset (tree_view);
+ tree_view->append_column (_("Frame"), columns ().frame_index_caption);
+ tree_view->append_column (_("Location"), columns ().location);
+ tree_view->append_column (_("Function"), columns ().function_name);
+ tree_view->append_column (_("Arguments"), columns ().function_args);
+ tree_view->set_headers_visible (true);
+ tree_view->get_selection ()->set_mode (Gtk::SELECTION_SINGLE);
on_selection_changed_connection =
tree_view->get_selection ()->signal_changed ().connect
(sigc::mem_fun (*this,
- &CallStack::Priv::on_selection_changed_signal)) ;
+ &CallStack::Priv::on_selection_changed_signal));
tree_view->signal_row_activated ().connect
(sigc::hide (sigc::hide
(sigc::mem_fun (*this,
@@ -518,19 +518,19 @@
tree_view->set_events (Gdk::EXPOSURE_MASK);
Gtk::TreeViewColumn* column =
- tree_view->get_column (CallStackCols::FUNCTION_NAME) ;
- THROW_IF_FAIL (column) ;
- column->set_clickable (false) ;
- column->set_reorderable (false) ;
-
- THROW_IF_FAIL (column = tree_view->get_column (CallStackCols::LOCATION)) ;
- column->set_clickable (false) ;
- column->set_reorderable (false) ;
+ tree_view->get_column (CallStackCols::FUNCTION_NAME);
+ THROW_IF_FAIL (column);
+ column->set_clickable (false);
+ column->set_reorderable (false);
+
+ THROW_IF_FAIL (column = tree_view->get_column (CallStackCols::LOCATION));
+ column->set_clickable (false);
+ column->set_reorderable (false);
THROW_IF_FAIL (column = tree_view->get_column
- (CallStackCols::FUNCTION_ARGS)) ;
- column->set_clickable (false) ;
- column->set_reorderable (false) ;
+ (CallStackCols::FUNCTION_ARGS));
+ column->set_clickable (false);
+ column->set_reorderable (false);
tree_view->signal_button_press_event ().connect_notify
(sigc::mem_fun (*this,
@@ -542,87 +542,89 @@
const map<int, list<IDebugger::VariableSafePtr> >&a_params,
bool a_emit_signal=false)
{
- THROW_IF_FAIL (get_widget ()) ;
+ THROW_IF_FAIL (get_widget ());
- clear_frame_list () ;
- frames = a_frames ;
+ clear_frame_list ();
+ frames = a_frames;
// save the list of params around so that we can use it when converting
// to a string later
params = a_params;
- Gtk::TreeModel::iterator store_iter ;
+ Gtk::TreeModel::iterator store_iter;
unsigned nb_frames = MIN (a_frames.size (), max_frames_to_show);
unsigned i = 0;
for (i = 0; i < nb_frames; ++i) {
- store_iter = store->append () ;
+ store_iter = store->append ();
(*store_iter)[columns ().is_expansion_row] = false;
- (*store_iter)[columns ().function_name] = a_frames[i].function_name ();
+ (*store_iter)[columns ().function_name] =
+ a_frames[i].function_name ();
if (!a_frames[i].file_name ().empty ()) {
(*store_iter)[columns ().location] =
a_frames[i].file_name () + ":"
- + UString::from_int (a_frames[i].line ()) ;
+ + UString::from_int (a_frames[i].line ());
} else {
(*store_iter)[columns ().location] =
a_frames[i].address ();
}
- (*store_iter)[columns ().frame_index] = i ;
- (*store_iter)[columns ().frame_index_caption] = UString::from_int (i) ;
+ (*store_iter)[columns ().frame_index] = i;
+ (*store_iter)[columns ().frame_index_caption] =
+ UString::from_int (i);
UString params_string = "(";
- map<int, list<IDebugger::VariableSafePtr> >::const_iterator iter ;
- list<IDebugger::VariableSafePtr>::const_iterator params_iter ;
- iter = a_params.find (i) ;
+ map<int, list<IDebugger::VariableSafePtr> >::const_iterator iter;
+ list<IDebugger::VariableSafePtr>::const_iterator params_iter;
+ iter = a_params.find (i);
if (iter != a_params.end ()) {
LOG_D ("for frame "
<< (int) i
<< " NB params: "
- << (int) iter->second.size (), NMV_DEFAULT_DOMAIN) ;
+ << (int) iter->second.size (), NMV_DEFAULT_DOMAIN);
- params_iter = iter->second.begin () ;
+ params_iter = iter->second.begin ();
if (params_iter != iter->second.end ()) {
if (*params_iter) {
- params_string += (*params_iter)->name () ;
+ params_string += (*params_iter)->name ();
}
- ++params_iter ;
+ ++params_iter;
}
- for ( ; params_iter != iter->second.end (); ++params_iter) {
+ for (; params_iter != iter->second.end (); ++params_iter) {
if (!*params_iter) {continue;}
- params_string += ", " + (*params_iter)->name () ;
+ params_string += ", " + (*params_iter)->name ();
}
}
- params_string += ")" ;
- (*store_iter)[columns ().function_args] = params_string ;
+ params_string += ")";
+ (*store_iter)[columns ().function_args] = params_string;
}
if (a_frames.size () && i < a_frames.size () - 1) {
- store_iter = store->append () ;
+ store_iter = store->append ();
UString msg;
msg.printf (_("(Click here to see the next %d rows of the %d "
"call stack rows)"),
nb_frames_expansion_chunk,
frames.size ());
(*store_iter)[columns ().frame_index_caption] = "...";
- (*store_iter)[columns ().location] = msg ;
+ (*store_iter)[columns ().location] = msg;
(*store_iter)[columns ().is_expansion_row] = true;
}
Gtk::TreeView *tree_view =
- dynamic_cast<Gtk::TreeView*> (widget.get ()) ;
- THROW_IF_FAIL (tree_view) ;
+ dynamic_cast<Gtk::TreeView*> (widget.get ());
+ THROW_IF_FAIL (tree_view);
if (!a_emit_signal) {
- on_selection_changed_connection.block () ;
+ on_selection_changed_connection.block ();
}
- tree_view->get_selection ()->select (Gtk::TreePath ("0")) ;
+ tree_view->get_selection ()->select (Gtk::TreePath ("0"));
if (!a_emit_signal) {
- on_selection_changed_connection.unblock () ;
+ on_selection_changed_connection.unblock ();
}
}
void clear_frame_list ()
{
- THROW_IF_FAIL (store) ;
- store->clear () ;
+ THROW_IF_FAIL (store);
+ store->clear ();
}
};//end struct CallStack::Priv
@@ -630,70 +632,70 @@
IWorkbench& a_workbench,
IPerspective &a_perspective)
{
- THROW_IF_FAIL (a_debugger) ;
- m_priv.reset (new Priv (a_debugger, a_workbench, a_perspective)) ;
+ THROW_IF_FAIL (a_debugger);
+ m_priv.reset (new Priv (a_debugger, a_workbench, a_perspective));
}
CallStack::~CallStack ()
{
- LOG_D ("deleted", "destructor-domain") ;
+ LOG_D ("deleted", "destructor-domain");
}
bool
CallStack::is_empty ()
{
- THROW_IF_FAIL (m_priv) ;
- return m_priv->frames.empty () ;
+ THROW_IF_FAIL (m_priv);
+ return m_priv->frames.empty ();
}
const vector<IDebugger::Frame>&
CallStack::frames () const
{
- THROW_IF_FAIL (m_priv) ;
- return m_priv->frames ;
+ THROW_IF_FAIL (m_priv);
+ return m_priv->frames;
}
Gtk::Widget&
CallStack::widget () const
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->get_widget ()) {
- m_priv->build_widget () ;
- THROW_IF_FAIL (m_priv->widget) ;
+ m_priv->build_widget ();
+ THROW_IF_FAIL (m_priv->widget);
}
- return *m_priv->get_widget () ;
+ return *m_priv->get_widget ();
}
void
CallStack::update_stack ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->debugger) ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->debugger);
- m_priv->debugger->list_frames () ;
+ m_priv->debugger->list_frames ();
}
void
CallStack::clear ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
- THROW_IF_FAIL (m_priv) ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
+ THROW_IF_FAIL (m_priv);
if (m_priv->store) {
- m_priv->store->clear () ;
+ m_priv->store->clear ();
}
- m_priv->cur_frame_index = - 1 ;
- m_priv->waiting_for_stack_args = false ;
- m_priv->in_set_cur_frame_trans = false ;
+ m_priv->cur_frame_index = - 1;
+ m_priv->waiting_for_stack_args = false;
+ m_priv->in_set_cur_frame_trans = false;
}
sigc::signal<void, int, const IDebugger::Frame&>&
CallStack::frame_selected_signal () const
{
- THROW_IF_FAIL (m_priv) ;
- return m_priv->frame_selected_signal ;
+ THROW_IF_FAIL (m_priv);
+ return m_priv->frame_selected_signal;
}
}//end namespace nemiver
Modified: trunk/src/persp/dbgperspective/nmv-call-stack.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-call-stack.h (original)
+++ trunk/src/persp/dbgperspective/nmv-call-stack.h Tue Jul 29 22:45:24 2008
@@ -32,10 +32,10 @@
#include "common/nmv-object.h"
#include "nmv-i-debugger.h"
-using namespace std ;
-using nemiver::common::SafePtr ;
-using nemiver::common::Object ;
-using nemiver::IDebugger ;
+using namespace std;
+using nemiver::common::SafePtr;
+using nemiver::common::Object;
+using nemiver::IDebugger;
NEMIVER_BEGIN_NAMESPACE (nemiver)
@@ -45,28 +45,28 @@
class NEMIVER_API CallStack : public Object {
//non copyable
- CallStack (const CallStack &) ;
- CallStack& operator= (const CallStack &) ;
+ CallStack (const CallStack &);
+ CallStack& operator= (const CallStack &);
- struct Priv ;
- SafePtr<Priv> m_priv ;
+ struct Priv;
+ SafePtr<Priv> m_priv;
protected:
- CallStack () ;
+ CallStack ();
public:
CallStack (IDebuggerSafePtr &a_debugger, IWorkbench& a_workbench,
IPerspective& a_perspective);
- virtual ~CallStack () ;
- bool is_empty () ;
- const vector<IDebugger::Frame>& frames () const ;
- void update_stack () ;
- void clear () ;
- Gtk::Widget& widget () const ;
+ virtual ~CallStack ();
+ bool is_empty ();
+ const vector<IDebugger::Frame>& frames () const;
+ void update_stack ();
+ void clear ();
+ Gtk::Widget& widget () const;
sigc::signal<void,
int,
- const IDebugger::Frame&>& frame_selected_signal () const ;
+ const IDebugger::Frame&>& frame_selected_signal () const;
};//end class CallStack
NEMIVER_END_NAMESPACE (nemiver)
Modified: trunk/src/persp/dbgperspective/nmv-choose-overloads-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-choose-overloads-dialog.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-choose-overloads-dialog.cc Tue Jul 29 22:45:24 2008
@@ -31,130 +31,130 @@
#include "nmv-ui-utils.h"
NEMIVER_BEGIN_NAMESPACE (nemiver)
-using namespace std ;
+using namespace std;
struct Cols : public Gtk::TreeModel::ColumnRecord {
- Gtk::TreeModelColumn<Glib::ustring> function_name ;
- Gtk::TreeModelColumn<Glib::ustring> function_location ;
- Gtk::TreeModelColumn<IDebugger::OverloadsChoiceEntry> overload ;
+ Gtk::TreeModelColumn<Glib::ustring> function_name;
+ Gtk::TreeModelColumn<Glib::ustring> function_location;
+ Gtk::TreeModelColumn<IDebugger::OverloadsChoiceEntry> overload;
Cols ()
{
- add (function_name) ;
- add (function_location) ;
- add (overload) ;
+ add (function_name);
+ add (function_location);
+ add (overload);
}
};//end Cols
static Cols&
columns ()
{
- static Cols s_choice_cols ;
- return s_choice_cols ;
+ static Cols s_choice_cols;
+ return s_choice_cols;
}
struct ChooseOverloadsDialog::Priv {
- friend class ChooseOverloadsDialog ;
- Gtk::Dialog &dialog ;
- Glib::RefPtr<Gnome::Glade::Xml> glade ;
- Gtk::TreeView *tree_view ;
- Glib::RefPtr<Gtk::ListStore> list_store ;
- vector<IDebugger::OverloadsChoiceEntry> current_overloads ;
+ friend class ChooseOverloadsDialog;
+ Gtk::Dialog &dialog;
+ Glib::RefPtr<Gnome::Glade::Xml> glade;
+ Gtk::TreeView *tree_view;
+ Glib::RefPtr<Gtk::ListStore> list_store;
+ vector<IDebugger::OverloadsChoiceEntry> current_overloads;
- Priv () ;
+ Priv ();
Priv (Gtk::Dialog &a_dialog,
const Glib::RefPtr<Gnome::Glade::Xml> &a_glade) :
dialog (a_dialog),
glade (a_glade)
{
- init_members () ;
- init_tree_view () ;
- pack_tree_view_into_glade () ;
+ init_members ();
+ init_tree_view ();
+ pack_tree_view_into_glade ();
Gtk::Widget *button =
- ui_utils::get_widget_from_glade<Gtk::Widget> (glade, "okbutton") ;
- button->set_sensitive (false) ;
- a_dialog.set_default_response (Gtk::RESPONSE_OK) ;
+ ui_utils::get_widget_from_glade<Gtk::Widget> (glade, "okbutton");
+ button->set_sensitive (false);
+ a_dialog.set_default_response (Gtk::RESPONSE_OK);
}
void init_members ()
{
- tree_view = 0 ;
+ tree_view = 0;
}
void pack_tree_view_into_glade ()
{
Gtk::ScrolledWindow *sw =
- ui_utils::get_widget_from_glade<Gtk::ScrolledWindow> (glade,
- "treeviewscrolledwindow");
- sw->add (*tree_view) ;
+ ui_utils::get_widget_from_glade<Gtk::ScrolledWindow>
+ (glade, "treeviewscrolledwindow");
+ sw->add (*tree_view);
}
void clear ()
{
if (list_store) {
- list_store->clear () ;
+ list_store->clear ();
}
}
void init_tree_view ()
{
if (tree_view)
- return ;
+ return;
if (!list_store) {
- list_store = Gtk::ListStore::create (columns ()) ;
+ list_store = Gtk::ListStore::create (columns ());
}
- tree_view = Gtk::manage (new Gtk::TreeView (list_store)) ;
+ tree_view = Gtk::manage (new Gtk::TreeView (list_store));
tree_view->append_column (_("Function Name"),
- columns ().function_name) ;
+ columns ().function_name);
tree_view->append_column (_("Location"),
- columns ().function_location) ;
+ columns ().function_location);
- tree_view->get_selection ()->set_mode (Gtk::SELECTION_MULTIPLE) ;
+ tree_view->get_selection ()->set_mode (Gtk::SELECTION_MULTIPLE);
tree_view->get_selection ()->signal_changed ().connect
- (sigc::mem_fun (*this, &Priv::on_selection_changed)) ;
- tree_view->show_all () ;
+ (sigc::mem_fun (*this, &Priv::on_selection_changed));
+ tree_view->show_all ();
}
void add_choice_entry (const IDebugger::OverloadsChoiceEntry &a_entry)
{
- Gtk::TreeModel::iterator tree_it = list_store->append () ;
- THROW_IF_FAIL (tree_it) ;
+ Gtk::TreeModel::iterator tree_it = list_store->append ();
+ THROW_IF_FAIL (tree_it);
- tree_it->set_value (columns ().overload, a_entry) ;
+ tree_it->set_value (columns ().overload, a_entry);
tree_it->set_value (columns ().function_name,
(Glib::ustring)a_entry.function_name ());
UString location (a_entry.file_name ()
- + ":" + UString::from_int (a_entry.line_number ())) ;
+ + ":" + UString::from_int (a_entry.line_number ()));
tree_it->set_value (columns ().function_location,
- (Glib::ustring)location) ;
+ (Glib::ustring)location);
}
void on_selection_changed ()
{
NEMIVER_TRY
- THROW_IF_FAIL (tree_view) ;
- THROW_IF_FAIL (list_store) ;
+ THROW_IF_FAIL (tree_view);
+ THROW_IF_FAIL (list_store);
vector<Gtk::TreeModel::Path> iters =
- tree_view->get_selection ()->get_selected_rows () ;
+ tree_view->get_selection ()->get_selected_rows ();
- current_overloads.clear () ;
- vector<Gtk::TreeModel::Path>::const_iterator it ;
- for (it = iters.begin () ; it != iters.end () ; ++it) {
+ current_overloads.clear ();
+ vector<Gtk::TreeModel::Path>::const_iterator it;
+ for (it = iters.begin (); it != iters.end (); ++it) {
current_overloads.push_back
(list_store->get_iter (*it)->get_value (columns ().overload));
}
Gtk::Widget *ok_button =
ui_utils::get_widget_from_glade<Gtk::Button>
- (glade, "okbutton") ;
+ (glade, "okbutton");
if (current_overloads.empty ()) {
- ok_button->set_sensitive (false) ;
+ ok_button->set_sensitive (false);
} else {
- ok_button->set_sensitive (true) ;
+ ok_button->set_sensitive (true);
}
NEMIVER_CATCH
@@ -169,35 +169,35 @@
"chooseoverloadsdialog.glade",
"chooseoverloadsdialog")
{
- m_priv.reset (new Priv (widget (), glade ())) ;
- THROW_IF_FAIL (m_priv) ;
- set_overloads_choice_entries (a_entries) ;
+ m_priv.reset (new Priv (widget (), glade ()));
+ THROW_IF_FAIL (m_priv);
+ set_overloads_choice_entries (a_entries);
}
ChooseOverloadsDialog::~ChooseOverloadsDialog ()
{
- LOG_D ("destroyed", "destructor-domain") ;
+ LOG_D ("destroyed", "destructor-domain");
}
const vector<IDebugger::OverloadsChoiceEntry>&
ChooseOverloadsDialog::overloaded_functions () const
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
- return m_priv->current_overloads ;
+ return m_priv->current_overloads;
}
void
ChooseOverloadsDialog::overloaded_function (int a_in) const
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
- Gtk::TreeModel::iterator it ;
+ Gtk::TreeModel::iterator it;
for (it = m_priv->list_store->children ().begin ();
it != m_priv->list_store->children ().end () && it;
++it) {
if (it->get_value (columns ().overload).index () == a_in) {
- m_priv->tree_view->get_selection ()->select (it) ;
+ m_priv->tree_view->get_selection ()->select (it);
}
}
}
@@ -206,13 +206,13 @@
ChooseOverloadsDialog::set_overloads_choice_entries
(const vector<IDebugger::OverloadsChoiceEntry> &a_in)
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
- vector<IDebugger::OverloadsChoiceEntry>::const_iterator it ;
- for (it = a_in.begin () ; it != a_in.end () ; ++it) {
+ vector<IDebugger::OverloadsChoiceEntry>::const_iterator it;
+ for (it = a_in.begin (); it != a_in.end (); ++it) {
if (it->kind () ==
nemiver::IDebugger::OverloadsChoiceEntry::LOCATION) {
- m_priv->add_choice_entry (*it) ;
+ m_priv->add_choice_entry (*it);
}
}
}
@@ -220,8 +220,8 @@
void
ChooseOverloadsDialog::clear ()
{
- THROW_IF_FAIL (m_priv) ;
- m_priv->clear () ;
+ THROW_IF_FAIL (m_priv);
+ m_priv->clear ();
}
NEMIVER_END_NAMESPACE (nemiver)
Modified: trunk/src/persp/dbgperspective/nmv-choose-overloads-dialog.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-choose-overloads-dialog.h (original)
+++ trunk/src/persp/dbgperspective/nmv-choose-overloads-dialog.h Tue Jul 29 22:45:24 2008
@@ -32,21 +32,21 @@
NEMIVER_BEGIN_NAMESPACE (nemiver)
class ChooseOverloadsDialog : public Dialog {
- struct Priv ;
- SafePtr<Priv> m_priv ;
+ struct Priv;
+ SafePtr<Priv> m_priv;
public:
ChooseOverloadsDialog
(const UString &a_res_root_path,
const vector<IDebugger::OverloadsChoiceEntry> &a_entries);
- virtual ~ChooseOverloadsDialog () ;
+ virtual ~ChooseOverloadsDialog ();
void set_overloads_choice_entries
(const vector<IDebugger::OverloadsChoiceEntry> &a_in);
const std::vector<IDebugger::OverloadsChoiceEntry>&
overloaded_functions () const;
- void overloaded_function (int a_in) const ;
- void clear () ;
+ void overloaded_function (int a_in) const;
+ void clear ();
};//end ChooserOverloadsDialog
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 29 22:45:24 2008
@@ -92,20 +92,20 @@
#include "nmv-memory-view.h"
#endif // WITH_MEMORYVIEW
-using namespace std ;
-using namespace nemiver::common ;
+using namespace std;
+using namespace nemiver::common;
using namespace nemiver::ui_utils;
-using namespace gtksourceview ;
+using namespace gtksourceview;
NEMIVER_BEGIN_NAMESPACE (nemiver)
-const char *SET_BREAKPOINT = "nmv-set-breakpoint" ;
-const char *LINE_POINTER = "nmv-line-pointer" ;
-const char *RUN_TO_CURSOR = "nmv-run-to-cursor" ;
-const char *STEP_INTO = "nmv-step-into" ;
-const char *STEP_OVER = "nmv-step-over" ;
-const char *STEP_OUT = "nmv-step-out" ;
+const char *SET_BREAKPOINT = "nmv-set-breakpoint";
+const char *LINE_POINTER = "nmv-line-pointer";
+const char *RUN_TO_CURSOR = "nmv-run-to-cursor";
+const char *STEP_INTO = "nmv-step-into";
+const char *STEP_OVER = "nmv-step-over";
+const char *STEP_OUT = "nmv-step-out";
// labels for widget tabs in the status notebook
const char *CALL_STACK_TITLE = _("Call Stack");
@@ -115,50 +115,50 @@
const char *REGISTERS_VIEW_TITLE = _("Registers");
const char *MEMORY_VIEW_TITLE = _("Memory");
-const char *SESSION_NAME = "sessionname" ;
-const char *PROGRAM_NAME= "programname" ;
-const char *PROGRAM_ARGS= "programarguments" ;
-const char *PROGRAM_CWD= "programcwd" ;
-const char *LAST_RUN_TIME= "lastruntime" ;
+const char *SESSION_NAME = "sessionname";
+const char *PROGRAM_NAME= "programname";
+const char *PROGRAM_ARGS= "programarguments";
+const char *PROGRAM_CWD= "programcwd";
+const char *LAST_RUN_TIME= "lastruntime";
const char *DBG_PERSPECTIVE_MOUSE_MOTION_DOMAIN =
- "dbg-perspective-mouse-motion-domain" ;
+ "dbg-perspective-mouse-motion-domain";
const char* CONF_KEY_NEMIVER_SOURCE_DIRS =
- "/apps/nemiver/dbgperspective/source-search-dirs" ;
+ "/apps/nemiver/dbgperspective/source-search-dirs";
const char* CONF_KEY_SHOW_DBG_ERROR_DIALOGS =
"/apps/nemiver/dbgperspective/show-dbg-error-dialogs";
const char* CONF_KEY_SHOW_SOURCE_LINE_NUMBERS =
- "/apps/nemiver/dbgperspective/show-source-line-numbers" ;
+ "/apps/nemiver/dbgperspective/show-source-line-numbers";
const char* CONF_KEY_CONFIRM_BEFORE_RELOAD_SOURCE =
- "/apps/nemiver/dbgperspective/confirm-before-reload-source" ;
+ "/apps/nemiver/dbgperspective/confirm-before-reload-source";
const char* CONF_KEY_ALLOW_AUTO_RELOAD_SOURCE =
"/apps/nemiver/dbgperspective/allow-auto-reload-source";
const char* CONF_KEY_HIGHLIGHT_SOURCE_CODE =
- "/apps/nemiver/dbgperspective/highlight-source-code" ;
+ "/apps/nemiver/dbgperspective/highlight-source-code";
const char* CONF_KEY_SOURCE_FILE_ENCODING_LIST =
- "/apps/nemiver/dbgperspective/source-file-encoding-list" ;
+ "/apps/nemiver/dbgperspective/source-file-encoding-list";
const char* CONF_KEY_USE_SYSTEM_FONT =
- "/apps/nemiver/dbgperspective/use-system-font" ;
+ "/apps/nemiver/dbgperspective/use-system-font";
const char* CONF_KEY_CUSTOM_FONT_NAME=
- "/apps/nemiver/dbgperspective/custom-font-name" ;
+ "/apps/nemiver/dbgperspective/custom-font-name";
const char* CONF_KEY_SYSTEM_FONT_NAME=
- "/desktop/gnome/interface/monospace_font_name" ;
+ "/desktop/gnome/interface/monospace_font_name";
const char* CONF_KEY_STATUS_WIDGET_MINIMUM_WIDTH=
- "/apps/nemiver/dbgperspective/status-widget-minimum-width" ;
+ "/apps/nemiver/dbgperspective/status-widget-minimum-width";
const char* CONF_KEY_STATUS_WIDGET_MINIMUM_HEIGHT=
- "/apps/nemiver/dbgperspective/status-widget-minimum-height" ;
+ "/apps/nemiver/dbgperspective/status-widget-minimum-height";
const char* CONF_KEY_STATUS_PANE_LOCATION=
- "/apps/nemiver/dbgperspective/status-pane-location" ;
+ "/apps/nemiver/dbgperspective/status-pane-location";
const char* CONF_KEY_DEBUGGER_ENGINE_DYNMOD_NAME =
- "/apps/nemiver/dbgperspective/debugger-engine-dynmod" ;
+ "/apps/nemiver/dbgperspective/debugger-engine-dynmod";
-const Gtk::StockID STOCK_SET_BREAKPOINT (SET_BREAKPOINT) ;
-const Gtk::StockID STOCK_LINE_POINTER (LINE_POINTER) ;
-const Gtk::StockID STOCK_RUN_TO_CURSOR (RUN_TO_CURSOR) ;
-const Gtk::StockID STOCK_STEP_INTO (STEP_INTO) ;
-const Gtk::StockID STOCK_STEP_OVER (STEP_OVER) ;
-const Gtk::StockID STOCK_STEP_OUT (STEP_OUT) ;
+const Gtk::StockID STOCK_SET_BREAKPOINT (SET_BREAKPOINT);
+const Gtk::StockID STOCK_LINE_POINTER (LINE_POINTER);
+const Gtk::StockID STOCK_RUN_TO_CURSOR (RUN_TO_CURSOR);
+const Gtk::StockID STOCK_STEP_INTO (STEP_INTO);
+const Gtk::StockID STOCK_STEP_OVER (STEP_OVER);
+const Gtk::StockID STOCK_STEP_OUT (STEP_OUT);
const char* SUPPORTED_ENCODINGS[] =
{
@@ -190,10 +190,10 @@
class DBGPerspective : public IDBGPerspective, public sigc::trackable {
//non copyable
- DBGPerspective (const IPerspective&) ;
- DBGPerspective& operator= (const IPerspective&) ;
- struct Priv ;
- SafePtr<Priv> m_priv ;
+ DBGPerspective (const IPerspective&);
+ DBGPerspective& operator= (const IPerspective&);
+ struct Priv;
+ SafePtr<Priv> m_priv;
#ifdef WITH_GIO
friend void gio_file_monitor_cb (const Glib::RefPtr<Gio::File>& a_f,
@@ -212,8 +212,8 @@
struct SlotedButton : Gtk::Button {
UString file_path;
- DBGPerspective *perspective ;
- SafePtr<Gtk::Tooltips> tooltips ;
+ DBGPerspective *perspective;
+ SafePtr<Gtk::Tooltips> tooltips;
SlotedButton () :
Gtk::Button (),
@@ -228,7 +228,7 @@
void on_clicked ()
{
if (perspective) {
- perspective->close_file (file_path) ;
+ perspective->close_file (file_path);
}
}
@@ -240,430 +240,431 @@
//************
//<signal slots>
//************
- void on_open_action () ;
- void on_close_action () ;
- void on_reload_action () ;
- void on_find_action () ;
- void on_execute_program_action () ;
- void on_load_core_file_action () ;
- void on_attach_to_program_action () ;
- void on_connect_to_remote_target_action () ;
- void on_detach_from_program_action () ;
- void on_choose_a_saved_session_action () ;
- void on_current_session_properties_action () ;
+ void on_open_action ();
+ void on_close_action ();
+ void on_reload_action ();
+ void on_find_action ();
+ void on_execute_program_action ();
+ void on_load_core_file_action ();
+ void on_attach_to_program_action ();
+ void on_connect_to_remote_target_action ();
+ void on_detach_from_program_action ();
+ void on_choose_a_saved_session_action ();
+ void on_current_session_properties_action ();
void on_stop_debugger_action ();
- void on_run_action () ;
- void on_save_session_action () ;
- void on_next_action () ;
- void on_step_into_action () ;
- void on_step_out_action () ;
- void on_continue_action () ;
- void on_continue_until_action () ;
- void on_set_breakpoint_action () ;
+ void on_run_action ();
+ void on_save_session_action ();
+ void on_next_action ();
+ void on_step_into_action ();
+ void on_step_out_action ();
+ void on_continue_action ();
+ void on_continue_until_action ();
+ void on_set_breakpoint_action ();
void on_set_breakpoint_using_dialog_action ();
- void on_refresh_locals_action () ;
- void on_toggle_breakpoint_action () ;
- void on_toggle_breakpoint_enabled_action () ;
- void on_inspect_variable_action () ;
- void on_call_function_action () ;
- void on_show_commands_action () ;
- void on_show_errors_action () ;
- void on_show_target_output_action () ;
+ void on_refresh_locals_action ();
+ void on_toggle_breakpoint_action ();
+ void on_toggle_breakpoint_enabled_action ();
+ void on_inspect_variable_action ();
+ void on_call_function_action ();
+ void on_show_commands_action ();
+ void on_show_errors_action ();
+ void on_show_target_output_action ();
void on_breakpoint_delete_action
- (const IDebugger::BreakPoint& a_breakpoint) ;
+ (const IDebugger::BreakPoint& a_breakpoint);
void on_breakpoint_go_to_source_action
- (const IDebugger::BreakPoint& a_breakpoint) ;
- void on_thread_list_thread_selected_signal (int a_tid) ;
+ (const IDebugger::BreakPoint& a_breakpoint);
+ void on_thread_list_thread_selected_signal (int a_tid);
- void on_switch_page_signal (GtkNotebookPage *a_page, guint a_page_num) ;
+ void on_switch_page_signal (GtkNotebookPage *a_page, guint a_page_num);
- void on_attached_to_target_signal (bool a_is_attached) ;
+ void on_attached_to_target_signal (bool a_is_attached);
- void on_debugger_ready_signal (bool a_is_ready) ;
+ void on_debugger_ready_signal (bool a_is_ready);
- void on_debugger_not_started_signal () ;
+ void on_debugger_not_started_signal ();
- void on_going_to_run_target_signal () ;
+ void on_going_to_run_target_signal ();
void on_insert_in_command_view_signal
(const Gtk::TextBuffer::iterator &a_iter,
const Glib::ustring &a_text,
- int a_dont_know) ;
+ int a_dont_know);
- void on_source_view_markers_region_clicked_signal (int a_line,
- bool a_dialog_requested) ;
+ void on_source_view_markers_region_clicked_signal
+ (int a_line, bool a_dialog_requested);
- bool on_button_pressed_in_source_view_signal (GdkEventButton *a_event) ;
+ bool on_button_pressed_in_source_view_signal (GdkEventButton *a_event);
- bool on_motion_notify_event_signal (GdkEventMotion *a_event) ;
+ bool on_motion_notify_event_signal (GdkEventMotion *a_event);
- void on_leave_notify_event_signal (GdkEventCrossing *a_event) ;
+ void on_leave_notify_event_signal (GdkEventCrossing *a_event);
- bool on_mouse_immobile_timer_signal () ;
+ bool on_mouse_immobile_timer_signal ();
void on_insertion_changed_signal (const Gtk::TextBuffer::iterator& iter,
SourceEditor *a_editor);
- void update_toggle_menu_text (const UString& a_current_file, int a_current_line);
+ void update_toggle_menu_text (const UString& a_current_file,
+ int a_current_line);
- void on_shutdown_signal () ;
+ void on_shutdown_signal ();
- void on_show_command_view_changed_signal (bool) ;
+ void on_show_command_view_changed_signal (bool);
- void on_show_target_output_view_changed_signal (bool) ;
+ void on_show_target_output_view_changed_signal (bool);
- void on_show_log_view_changed_signal (bool) ;
+ void on_show_log_view_changed_signal (bool);
void on_conf_key_changed_signal (const UString &a_key,
- IConfMgr::Value &a_value) ;
+ IConfMgr::Value &a_value);
- void on_debugger_connected_to_remote_target_signal () ;
+ void on_debugger_connected_to_remote_target_signal ();
- void on_debugger_detached_from_target_signal () ;
+ void on_debugger_detached_from_target_signal ();
void on_debugger_got_target_info_signal (int a_pid,
- const UString &a_exe_path) ;
+ const UString &a_exe_path);
- void on_debugger_console_message_signal (const UString &a_msg) ;
+ void on_debugger_console_message_signal (const UString &a_msg);
void on_debugger_target_output_message_signal (const UString &a_msg);
- void on_debugger_log_message_signal (const UString &a_msg) ;
+ void on_debugger_log_message_signal (const UString &a_msg);
void on_debugger_command_done_signal (const UString &a_command_name,
- const UString &a_cookie) ;
+ const UString &a_cookie);
void on_debugger_breakpoints_set_signal
(const map<int, IDebugger::BreakPoint> &,
- const UString &a_cookie) ;
+ const UString &a_cookie);
void on_debugger_breakpoint_deleted_signal
(const IDebugger::BreakPoint&,
int,
- const UString &a_cookie) ;
+ const UString &a_cookie);
void on_debugger_got_overloads_choice_signal
(const vector<IDebugger::OverloadsChoiceEntry> &entries,
- const UString &a_cookie) ;
+ const UString &a_cookie);
void on_debugger_stopped_signal (IDebugger::StopReason a_reason,
bool a_has_frame,
const IDebugger::Frame &,
int a_thread_id,
int,
- const UString&) ;
- void on_program_finished_signal () ;
+ const UString&);
+ void on_program_finished_signal ();
void on_frame_selected_signal (int, const IDebugger::Frame &);
- void on_debugger_running_signal () ;
+ void on_debugger_running_signal ();
void on_signal_received_by_target_signal (const UString &a_signal,
- const UString &a_meaning) ;
+ const UString &a_meaning);
- void on_debugger_error_signal (const UString &a_msg) ;
+ void on_debugger_error_signal (const UString &a_msg);
- void on_debugger_state_changed_signal (IDebugger::State a_state) ;
+ void on_debugger_state_changed_signal (IDebugger::State a_state);
void on_debugger_variable_value_signal
(const UString &a_var_name,
const IDebugger::VariableSafePtr &a_var,
- const UString &a_cooker) ;
+ const UString &a_cooker);
bool on_file_content_changed (const UString &a_path);
- void on_activate_call_stack_view () ;
- void on_activate_variables_view () ;
- void on_activate_output_view () ;
- void on_activate_target_terminal_view () ;
+ void on_activate_call_stack_view ();
+ void on_activate_variables_view ();
+ void on_activate_output_view ();
+ void on_activate_target_terminal_view ();
void on_activate_breakpoints_view ();
void on_activate_logs_view ();
- void on_activate_registers_view () ;
+ void on_activate_registers_view ();
#ifdef WITH_MEMORYVIEW
- void on_activate_memory_view () ;
+ void on_activate_memory_view ();
#endif // WITH_MEMORYVIEW
- void on_activate_global_variables () ;
+ void on_activate_global_variables ();
void on_default_config_read ();
//************
//</signal slots>
//************
- string build_resource_path (const UString &a_dir, const UString &a_name) ;
+ string build_resource_path (const UString &a_dir, const UString &a_name);
void add_stock_icon (const UString &a_stock_id,
const UString &icon_dir,
- const UString &icon_name) ;
- void add_perspective_menu_entries () ;
- void init_perspective_menu_entries () ;
- void add_perspective_toolbar_entries () ;
- void init_icon_factory () ;
- void init_actions () ;
- void init_toolbar () ;
- void init_body () ;
- void init_signals () ;
- void init_debugger_signals () ;
- void clear_status_notebook () ;
- void clear_session_data () ;
+ const UString &icon_name);
+ void add_perspective_menu_entries ();
+ void init_perspective_menu_entries ();
+ void add_perspective_toolbar_entries ();
+ void init_icon_factory ();
+ void init_actions ();
+ void init_toolbar ();
+ void init_body ();
+ void init_signals ();
+ void init_debugger_signals ();
+ void clear_status_notebook ();
+ void clear_session_data ();
void append_source_editor (SourceEditor &a_sv,
- const UString &a_path) ;
- SourceEditor* get_current_source_editor () ;
- ISessMgr* session_manager_ptr () ;
- UString get_current_file_path () ;
+ const UString &a_path);
+ SourceEditor* get_current_source_editor ();
+ ISessMgr* session_manager_ptr ();
+ UString get_current_file_path ();
SourceEditor* get_source_editor_from_path (const UString &a_path,
- bool a_basename_only=false) ;
+ bool a_basename_only=false);
SourceEditor* get_source_editor_from_path (const UString &a_path,
UString &a_actual_file_path,
- bool a_basename_only=false) ;
- IWorkbench& workbench () const ;
- void bring_source_as_current (const UString &a_path) ;
- int get_n_pages () ;
- void popup_source_view_contextual_menu (GdkEventButton *a_event) ;
- void record_and_save_new_session () ;
- void record_and_save_session (ISessMgr::Session &a_session) ;
- IProcMgr* get_process_manager () ;
- void try_to_request_show_variable_value_at_position (int a_x, int a_y) ;
+ bool a_basename_only=false);
+ IWorkbench& workbench () const;
+ void bring_source_as_current (const UString &a_path);
+ int get_n_pages ();
+ void popup_source_view_contextual_menu (GdkEventButton *a_event);
+ void record_and_save_new_session ();
+ void record_and_save_session (ISessMgr::Session &a_session);
+ IProcMgr* get_process_manager ();
+ void try_to_request_show_variable_value_at_position (int a_x, int a_y);
void show_underline_tip_at_position (int a_x, int a_y,
const UString &a_text);
- void restart_mouse_immobile_timer () ;
- void stop_mouse_immobile_timer () ;
- PopupTip& get_popup_tip () ;
- FindTextDialog& get_find_text_dialog () ;
+ void restart_mouse_immobile_timer ();
+ void stop_mouse_immobile_timer ();
+ PopupTip& get_popup_tip ();
+ FindTextDialog& get_find_text_dialog ();
public:
- DBGPerspective (DynamicModule *a_dynmod) ;
+ DBGPerspective (DynamicModule *a_dynmod);
- virtual ~DBGPerspective () ;
+ virtual ~DBGPerspective ();
- void do_init (IWorkbench *a_workbench) ;
+ void do_init (IWorkbench *a_workbench);
- const UString& get_perspective_identifier () ;
+ const UString& get_perspective_identifier ();
- void get_toolbars (list<Gtk::Widget*> &a_tbs) ;
+ void get_toolbars (list<Gtk::Widget*> &a_tbs) ;
- Gtk::Widget* get_body () ;
+ Gtk::Widget* get_body () ;
- void edit_workbench_menu () ;
+ void edit_workbench_menu ();
- void open_file () ;
+ void open_file ();
bool load_file (const UString &a_file,
- Glib::RefPtr<SourceBuffer> &a_source_buffer) ;
+ Glib::RefPtr<SourceBuffer> &a_source_buffer);
bool open_file (const UString &a_path,
- int current_line=-1) ;
+ int current_line=-1);
bool open_file (const UString &a_path,
int current_line,
- bool a_reload_visual_breakpoint) ;
+ bool a_reload_visual_breakpoint);
- void close_current_file () ;
+ void close_current_file ();
- void find_in_current_file () ;
+ void find_in_current_file ();
- void close_file (const UString &a_path) ;
+ void close_file (const UString &a_path);
- void close_opened_files () ;
+ void close_opened_files ();
void update_file_maps ();
- bool reload_file (const UString &a_file) ;
- bool reload_file () ;
+ bool reload_file (const UString &a_file);
+ bool reload_file ();
- ISessMgr& session_manager () ;
+ ISessMgr& session_manager ();
- void execute_session (ISessMgr::Session &a_session) ;
+ void execute_session (ISessMgr::Session &a_session);
- void execute_program () ;
+ void execute_program ();
void execute_program (const UString &a_prog_and_args,
const map<UString, UString> &a_env,
const UString &a_cwd=".",
- bool a_close_opened_files=false) ;
+ bool a_close_opened_files=false);
void execute_program (const UString &a_prog,
const UString &a_args,
const map<UString, UString> &a_env,
const UString &a_cwd,
const vector<IDebugger::BreakPoint> &a_breaks,
- bool a_close_opened_files=false) ;
+ bool a_close_opened_files=false);
- void attach_to_program () ;
+ void attach_to_program ();
void attach_to_program (unsigned int a_pid,
- bool a_close_opened_files=false) ;
- void connect_to_remote_target () ;
+ bool a_close_opened_files=false);
+ void connect_to_remote_target ();
void connect_to_remote_target (const UString &a_server_address,
- int a_server_port) ;
- void connect_to_remote_target (const UString &a_serial_line) ;
- void detach_from_program () ;
- void load_core_file () ;
+ int a_server_port);
+ void connect_to_remote_target (const UString &a_serial_line);
+ void detach_from_program ();
+ void load_core_file ();
void load_core_file (const UString &a_prog_file,
- const UString &a_core_file_path) ;
- void save_current_session () ;
- void choose_a_saved_session () ;
- void edit_preferences () ;
-
- void run () ;
- void stop () ;
- void step_over () ;
- void step_into () ;
- void step_out () ;
- void do_continue () ;
- void do_continue_until () ;
+ const UString &a_core_file_path);
+ void save_current_session ();
+ void choose_a_saved_session ();
+ void edit_preferences ();
+
+ void run ();
+ void stop ();
+ void step_over ();
+ void step_into ();
+ void step_out ();
+ void do_continue ();
+ void do_continue_until ();
void set_breakpoint_at_current_line_using_dialog ();
- void set_breakpoint () ;
+ void set_breakpoint ();
void set_breakpoint (const UString &a_file,
int a_line,
- const UString &a_cond) ;
+ const UString &a_cond);
void set_breakpoint (const UString &a_func_name,
- const UString &a_cond) ;
+ const UString &a_cond);
void append_breakpoint (int a_bp_num,
- const IDebugger::BreakPoint &a_breakpoint) ;
+ const IDebugger::BreakPoint &a_breakpoint);
void append_breakpoints
- (const map<int, IDebugger::BreakPoint> &a_breaks) ;
+ (const map<int, IDebugger::BreakPoint> &a_breaks);
bool get_breakpoint_number (const UString &a_file_name,
int a_linenum,
int &a_break_num,
- bool &a_enabled) ;
- bool delete_breakpoint () ;
- bool delete_breakpoint (int a_breakpoint_num) ;
+ bool &a_enabled);
+ bool delete_breakpoint ();
+ bool delete_breakpoint (int a_breakpoint_num);
bool delete_breakpoint (const UString &a_file_path,
- int a_linenum) ;
+ int a_linenum);
bool is_breakpoint_set_at_line (const UString &a_file_path,
int a_linenum,
- bool &a_enabled) ;
+ bool &a_enabled);
void toggle_breakpoint (const UString &a_file_path,
- int a_linenum) ;
+ int a_linenum);
void set_breakpoint_using_dialog ();
void set_breakpoint_using_dialog (const UString &a_file_path,
const int a_line_num);
void set_breakpoint_using_dialog (const UString &a_function_name);
void set_breakpoint_from_dialog (SetBreakpointDialog &a_dialog);
- void refresh_locals () ;
+ void refresh_locals ();
- void inspect_variable () ;
- void inspect_variable (const UString &a_variable_name) ;
+ void inspect_variable ();
+ void inspect_variable (const UString &a_variable_name);
void call_function ();
void call_function (const UString &a_call_expr);
- void toggle_breakpoint () ;
+ void toggle_breakpoint ();
void toggle_breakpoint_enabled (const UString &a_file_path,
- int a_linenum) ;
- void toggle_breakpoint_enabled () ;
+ int a_linenum);
+ void toggle_breakpoint_enabled ();
bool append_visual_breakpoint (const UString &a_file_name,
int a_linenum,
UString &a_actual_file_name,
- bool enabled=true) ;
+ bool enabled=true);
bool append_visual_breakpoint (const UString &a_file_name,
int a_linenum,
- bool enabled=true) ;
- void delete_visual_breakpoint (const UString &a_file_name, int a_linenum) ;
- void delete_visual_breakpoint (int a_breaknum) ;
+ bool enabled=true);
+ void delete_visual_breakpoint (const UString &a_file_name, int a_linenum);
+ void delete_visual_breakpoint (int a_breaknum);
void choose_function_overload
- (const vector<IDebugger::OverloadsChoiceEntry> &a_entries) ;
+ (const vector<IDebugger::OverloadsChoiceEntry> &a_entries);
- bool apply_decorations_to_text (const UString &a_file_path) ;
+ bool apply_decorations_to_text (const UString &a_file_path);
- IDebuggerSafePtr& debugger () ;
+ IDebuggerSafePtr& debugger ();
- IConfMgr& get_conf_mgr () ;
+ IConfMgr& get_conf_mgr ();
- Gtk::TextView& get_command_view () ;
+ Gtk::TextView& get_command_view ();
- Gtk::ScrolledWindow& get_command_view_scrolled_win () ;
+ Gtk::ScrolledWindow& get_command_view_scrolled_win ();
- Gtk::TextView& get_target_output_view () ;
+ Gtk::TextView& get_target_output_view ();
- Gtk::ScrolledWindow& get_target_output_view_scrolled_win () ;
+ Gtk::ScrolledWindow& get_target_output_view_scrolled_win ();
- Gtk::TextView& get_log_view () ;
+ Gtk::TextView& get_log_view ();
- Gtk::ScrolledWindow& get_log_view_scrolled_win () ;
+ Gtk::ScrolledWindow& get_log_view_scrolled_win ();
- CallStack& get_call_stack () ;
+ CallStack& get_call_stack ();
- Gtk::ScrolledWindow& get_call_stack_scrolled_win () ;
+ Gtk::ScrolledWindow& get_call_stack_scrolled_win ();
- Gtk::ScrolledWindow& get_thread_list_scrolled_win () ;
+ Gtk::ScrolledWindow& get_thread_list_scrolled_win ();
- Gtk::HPaned& get_call_stack_paned () ;
+ Gtk::HPaned& get_call_stack_paned ();
- LocalVarsInspector& get_local_vars_inspector () ;
+ LocalVarsInspector& get_local_vars_inspector ();
- Gtk::ScrolledWindow& get_local_vars_inspector_scrolled_win () ;
+ Gtk::ScrolledWindow& get_local_vars_inspector_scrolled_win ();
- Terminal& get_terminal () ;
+ Terminal& get_terminal ();
- Gtk::Box& get_terminal_box () ;
+ Gtk::Box& get_terminal_box ();
- Gtk::ScrolledWindow& get_breakpoints_scrolled_win () ;
+ Gtk::ScrolledWindow& get_breakpoints_scrolled_win ();
- BreakpointsView& get_breakpoints_view () ;
+ BreakpointsView& get_breakpoints_view ();
- Gtk::ScrolledWindow& get_registers_scrolled_win () ;
+ Gtk::ScrolledWindow& get_registers_scrolled_win ();
- RegistersView& get_registers_view () ;
+ RegistersView& get_registers_view ();
#ifdef WITH_MEMORYVIEW
- MemoryView& get_memory_view () ;
+ MemoryView& get_memory_view ();
#endif // WITH_MEMORYVIEW
- ThreadList& get_thread_list () ;
+ ThreadList& get_thread_list ();
- void set_show_command_view (bool) ;
+ void set_show_command_view (bool);
- void set_show_target_output_view (bool) ;
+ void set_show_target_output_view (bool);
- void set_show_log_view (bool) ;
+ void set_show_log_view (bool);
- void set_show_call_stack_view (bool) ;
+ void set_show_call_stack_view (bool);
- void set_show_variables_editor_view (bool) ;
+ void set_show_variables_editor_view (bool);
- void set_show_terminal_view (bool) ;
+ void set_show_terminal_view (bool);
- void set_show_breakpoints_view (bool) ;
+ void set_show_breakpoints_view (bool);
- void set_show_registers_view (bool) ;
+ void set_show_registers_view (bool);
#ifdef WITH_MEMORYVIEW
- void set_show_memory_view (bool) ;
+ void set_show_memory_view (bool);
#endif // WITH_MEMORYVIEW
void add_text_to_command_view (const UString &a_text,
- bool a_no_repeat=false) ;
+ bool a_no_repeat=false);
- void add_text_to_target_output_view (const UString &a_text) ;
+ void add_text_to_target_output_view (const UString &a_text);
- void add_text_to_log_view (const UString &a_text) ;
+ void add_text_to_log_view (const UString &a_text);
- void set_where (const UString &a_path, int line, bool a_do_scroll=true) ;
+ void set_where (const UString &a_path, int line, bool a_do_scroll=true);
- void unset_where () ;
+ void unset_where ();
- Gtk::Widget* load_menu (UString a_filename, UString a_widget_name) ;
- Gtk::Widget* get_contextual_menu () ;
- Gtk::Widget* get_call_stack_menu () ;
+ Gtk::Widget* load_menu (UString a_filename, UString a_widget_name);
+ Gtk::Widget* get_contextual_menu ();
+ Gtk::Widget* get_call_stack_menu ();
- void read_default_config () ;
+ void read_default_config ();
- vector<UString>& get_source_dirs () ;
+ vector<UString>& get_source_dirs ();
bool find_file_in_source_dirs (const UString &a_file_name,
- UString &a_file_path) ;
+ UString &a_file_path);
- bool do_monitor_file (const UString &a_path) ;
+ bool do_monitor_file (const UString &a_path);
- bool do_unmonitor_file (const UString &a_path) ;
+ bool do_unmonitor_file (const UString &a_path);
void activate_status_view(Gtk::Widget& page);
- sigc::signal<void, bool>& show_command_view_signal () ;
- sigc::signal<void, bool>& show_target_output_view_signal () ;
- sigc::signal<void, bool>& show_log_view_signal () ;
- sigc::signal<void, bool>& activated_signal () ;
- sigc::signal<void, bool>& attached_to_target_signal () ;
- sigc::signal<void, bool>& debugger_ready_signal () ;
- sigc::signal<void>& debugger_not_started_signal () ;
- sigc::signal<void>& going_to_run_target_signal () ;
+ sigc::signal<void, bool>& show_command_view_signal ();
+ sigc::signal<void, bool>& show_target_output_view_signal ();
+ sigc::signal<void, bool>& show_log_view_signal ();
+ sigc::signal<void, bool>& activated_signal ();
+ sigc::signal<void, bool>& attached_to_target_signal ();
+ sigc::signal<void, bool>& debugger_ready_signal ();
+ sigc::signal<void>& debugger_not_started_signal ();
+ sigc::signal<void>& going_to_run_target_signal ();
sigc::signal<void>& default_config_read_signal ();
};//end class DBGPerspective
@@ -694,7 +695,7 @@
void operator () (void *a_object)
{
if (a_object && G_IS_OBJECT (a_object)) {
- g_object_unref (G_OBJECT (a_object)) ;
+ g_object_unref (G_OBJECT (a_object));
}
}
};
@@ -704,123 +705,123 @@
void gio_file_monitor_cb (const Glib::RefPtr<Gio::File>& file,
const Glib::RefPtr<Gio::File>& other_file,
Gio::FileMonitorEvent event,
- DBGPerspective *a_persp) ;
+ DBGPerspective *a_persp);
#else
static
void gnome_vfs_file_monitor_cb (GnomeVFSMonitorHandle *a_handle,
const gchar *a_monitor_uri,
const gchar *a_info_uri,
GnomeVFSMonitorEventType a_event_type,
- DBGPerspective *a_persp) ;
+ DBGPerspective *a_persp);
#endif // WITH_GIO
struct DBGPerspective::Priv {
- bool initialized ;
- bool reused_session ;
- bool debugger_has_just_run ;
- UString prog_path ;
- UString prog_args ;
- UString prog_cwd ;
- map<UString, UString> env_variables ;
- list<UString> search_paths ;
- Glib::RefPtr<Gnome::Glade::Xml> body_glade ;
- SafePtr<Gtk::Window> body_window ;
- SafePtr<Gtk::TextView> command_view ;
- SafePtr<Gtk::ScrolledWindow> command_view_scrolled_win ;
+ bool initialized;
+ bool reused_session;
+ bool debugger_has_just_run;
+ UString prog_path;
+ UString prog_args;
+ UString prog_cwd;
+ map<UString, UString> env_variables;
+ list<UString> search_paths;
+ Glib::RefPtr<Gnome::Glade::Xml> body_glade;
+ SafePtr<Gtk::Window> body_window;
+ SafePtr<Gtk::TextView> command_view;
+ SafePtr<Gtk::ScrolledWindow> command_view_scrolled_win;
SafePtr<Gtk::TextView> target_output_view;
SafePtr<Gtk::ScrolledWindow> target_output_view_scrolled_win;
- SafePtr<Gtk::TextView> log_view ;
- SafePtr<Gtk::ScrolledWindow> log_view_scrolled_win ;
- SafePtr<CallStack> call_stack ;
- SafePtr<Gtk::ScrolledWindow> call_stack_scrolled_win ;
- SafePtr<Gtk::ScrolledWindow> thread_list_scrolled_win ;
- SafePtr<Gtk::HPaned> call_stack_paned ;
-
- Glib::RefPtr<Gtk::ActionGroup> target_connected_action_group ;
- Glib::RefPtr<Gtk::ActionGroup> target_not_started_action_group ;
- Glib::RefPtr<Gtk::ActionGroup> debugger_ready_action_group ;
- Glib::RefPtr<Gtk::ActionGroup> debugger_busy_action_group ;
+ SafePtr<Gtk::TextView> log_view;
+ SafePtr<Gtk::ScrolledWindow> log_view_scrolled_win;
+ SafePtr<CallStack> call_stack;
+ SafePtr<Gtk::ScrolledWindow> call_stack_scrolled_win;
+ SafePtr<Gtk::ScrolledWindow> thread_list_scrolled_win;
+ SafePtr<Gtk::HPaned> call_stack_paned;
+
+ Glib::RefPtr<Gtk::ActionGroup> target_connected_action_group;
+ Glib::RefPtr<Gtk::ActionGroup> target_not_started_action_group;
+ Glib::RefPtr<Gtk::ActionGroup> debugger_ready_action_group;
+ Glib::RefPtr<Gtk::ActionGroup> debugger_busy_action_group;
Glib::RefPtr<Gtk::ActionGroup> default_action_group;
Glib::RefPtr<Gtk::ActionGroup> opened_file_action_group;
- Glib::RefPtr<Gtk::UIManager> ui_manager ;
- Glib::RefPtr<Gtk::IconFactory> icon_factory ;
- Gtk::UIManager::ui_merge_id menubar_merge_id ;
- Gtk::UIManager::ui_merge_id toolbar_merge_id ;
+ Glib::RefPtr<Gtk::UIManager> ui_manager;
+ Glib::RefPtr<Gtk::IconFactory> icon_factory;
+ Gtk::UIManager::ui_merge_id menubar_merge_id;
+ Gtk::UIManager::ui_merge_id toolbar_merge_id;
Gtk::UIManager::ui_merge_id contextual_menu_merge_id;
- Gtk::Widget *contextual_menu ;
+ Gtk::Widget *contextual_menu;
Gtk::Box *top_box;
- SafePtr<Gtk::Paned> body_main_paned ;
- IWorkbench *workbench ;
- SafePtr<Gtk::HBox> toolbar ;
- SpinnerToolItemSafePtr throbber ;
+ SafePtr<Gtk::Paned> body_main_paned;
+ IWorkbench *workbench;
+ SafePtr<Gtk::HBox> toolbar;
+ SpinnerToolItemSafePtr throbber;
sigc::signal<void, bool> activated_signal;
sigc::signal<void, bool> attached_to_target_signal;
sigc::signal<void, bool> debugger_ready_signal;
- sigc::signal<void> debugger_not_started_signal ;
- sigc::signal<void> going_to_run_target_signal ;
- sigc::signal<void> default_config_read_signal ;
- sigc::signal<void, bool> show_command_view_signal ;
- sigc::signal<void, bool> show_target_output_view_signal ;
- sigc::signal<void, bool> show_log_view_signal ;
- bool command_view_is_visible ;
- bool target_output_view_is_visible ;
- bool log_view_is_visible ;
- bool call_stack_view_is_visible ;
- bool variables_editor_view_is_visible ;
- bool terminal_view_is_visible ;
- bool breakpoints_view_is_visible ;
- bool registers_view_is_visible ;
+ sigc::signal<void> debugger_not_started_signal;
+ sigc::signal<void> going_to_run_target_signal;
+ sigc::signal<void> default_config_read_signal;
+ sigc::signal<void, bool> show_command_view_signal ;
+ sigc::signal<void, bool> show_target_output_view_signal ;
+ sigc::signal<void, bool> show_log_view_signal;
+ bool command_view_is_visible;
+ bool target_output_view_is_visible;
+ bool log_view_is_visible;
+ bool call_stack_view_is_visible;
+ bool variables_editor_view_is_visible;
+ bool terminal_view_is_visible;
+ bool breakpoints_view_is_visible;
+ bool registers_view_is_visible;
#ifdef WITH_MEMORYVIEW
- bool memory_view_is_visible ;
+ bool memory_view_is_visible;
#endif // WITH_MEMORYVIEW
- Gtk::Notebook *sourceviews_notebook ;
- map<UString, int> path_2_pagenum_map ;
- map<UString, int> basename_2_pagenum_map ;
- map<int, SourceEditor*> pagenum_2_source_editor_map ;
- map<int, UString> pagenum_2_path_map ;
+ Gtk::Notebook *sourceviews_notebook;
+ map<UString, int> path_2_pagenum_map;
+ map<UString, int> basename_2_pagenum_map;
+ map<int, SourceEditor*> pagenum_2_source_editor_map;
+ map<int, UString> pagenum_2_path_map;
#ifdef WITH_GIO
- typedef map<UString, Glib::RefPtr<Gio::FileMonitor> > Path2MonitorMap ;
+ typedef map<UString, Glib::RefPtr<Gio::FileMonitor> > Path2MonitorMap;
#else
- typedef map<UString, GnomeVFSMonitorHandle*> Path2MonitorMap ;
+ typedef map<UString, GnomeVFSMonitorHandle*> Path2MonitorMap;
#endif // WITH_GIO
Path2MonitorMap path_2_monitor_map;
- Gtk::Notebook *statuses_notebook ;
- SafePtr<LocalVarsInspector> variables_editor ;
- SafePtr<Gtk::ScrolledWindow> variables_editor_scrolled_win ;
- SafePtr<Terminal> terminal ;
- SafePtr<Gtk::Box> terminal_box ;
- SafePtr<Gtk::ScrolledWindow> breakpoints_scrolled_win ;
- SafePtr<BreakpointsView> breakpoints_view ;
- SafePtr<ThreadList> thread_list ;
- SafePtr<Gtk::ScrolledWindow> registers_scrolled_win ;
- SafePtr<RegistersView> registers_view ;
+ Gtk::Notebook *statuses_notebook;
+ SafePtr<LocalVarsInspector> variables_editor;
+ SafePtr<Gtk::ScrolledWindow> variables_editor_scrolled_win;
+ SafePtr<Terminal> terminal;
+ SafePtr<Gtk::Box> terminal_box;
+ SafePtr<Gtk::ScrolledWindow> breakpoints_scrolled_win;
+ SafePtr<BreakpointsView> breakpoints_view;
+ SafePtr<ThreadList> thread_list;
+ SafePtr<Gtk::ScrolledWindow> registers_scrolled_win;
+ SafePtr<RegistersView> registers_view;
#ifdef WITH_MEMORYVIEW
- SafePtr<MemoryView> memory_view ;
+ SafePtr<MemoryView> memory_view;
#endif // WITH_MEMORYVIEW
- int current_page_num ;
- IDebuggerSafePtr debugger ;
- IDebugger::Frame current_frame ;
- map<int, IDebugger::BreakPoint> breakpoints ;
- ISessMgrSafePtr session_manager ;
- ISessMgr::Session session ;
- IProcMgrSafePtr process_manager ;
- UString last_command_text ;
- vector<UString> source_dirs ;
- bool show_dbg_errors ;
- bool use_system_font ;
- bool show_line_numbers ;
+ int current_page_num;
+ IDebuggerSafePtr debugger;
+ IDebugger::Frame current_frame;
+ map<int, IDebugger::BreakPoint> breakpoints;
+ ISessMgrSafePtr session_manager;
+ ISessMgr::Session session;
+ IProcMgrSafePtr process_manager;
+ UString last_command_text;
+ vector<UString> source_dirs;
+ bool show_dbg_errors;
+ bool use_system_font;
+ bool show_line_numbers;
bool confirm_before_reload_source;
bool allow_auto_reload_source;
- bool enable_syntax_highlight ;
- UString custom_font_name ;
- UString system_font_name ;
- sigc::connection timeout_source_connection ;
+ bool enable_syntax_highlight;
+ UString custom_font_name;
+ UString system_font_name;
+ sigc::connection timeout_source_connection;
//**************************************
//<detect mouse immobility > N seconds
//**************************************
- int mouse_in_source_editor_x ;
- int mouse_in_source_editor_y ;
+ int mouse_in_source_editor_x;
+ int mouse_in_source_editor_y;
//**************************************
//</detect mouse immobility > N seconds
//**************************************
@@ -828,17 +829,17 @@
//****************************************
//<variable value popup tip related data>
//****************************************
- SafePtr<PopupTip> popup_tip ;
- bool in_show_var_value_at_pos_transaction ;
- UString var_to_popup ;
- int var_popup_tip_x ;
- int var_popup_tip_y ;
+ SafePtr<PopupTip> popup_tip;
+ bool in_show_var_value_at_pos_transaction;
+ UString var_to_popup;
+ int var_popup_tip_x;
+ int var_popup_tip_y;
//****************************************
//</variable value popup tip related data>
//****************************************
//find text dialog
- FindTextDialogSafePtr find_text_dialog ;
+ FindTextDialogSafePtr find_text_dialog;
Priv () :
@@ -885,8 +886,8 @@
modify_source_editor_fonts (const UString &a_font_name)
{
Pango::FontDescription font_desc (a_font_name);
- map<int, SourceEditor*>::iterator it ;
- for (it = pagenum_2_source_editor_map.begin () ;
+ map<int, SourceEditor*>::iterator it;
+ for (it = pagenum_2_source_editor_map.begin ();
it != pagenum_2_source_editor_map.end ();
++it) {
if (it->second) {
@@ -928,7 +929,7 @@
UString &a_output,
std::string &a_current_charset)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
UString buf_content;
@@ -993,9 +994,10 @@
THROW_IF_FAIL (!a_path.empty ());
UString message;
message.printf (_("File %s has an encoding that is not listed in "
- "the value of gconf key %s. Please add the encoding "
- "of that file to the values of the gconf key, and "
- "resume debugging"),
+ "the value of gconf key %s. "
+ "Please add the encoding "
+ "of that file to the values of the gconf "
+ "key, and resume debugging"),
a_path.c_str (),
CONF_KEY_SOURCE_FILE_ENCODING_LIST);
THROW (message);
@@ -1034,7 +1036,7 @@
};
#ifndef CHECK_P_INIT
-#define CHECK_P_INIT THROW_IF_FAIL(m_priv && m_priv->initialized) ;
+#define CHECK_P_INIT THROW_IF_FAIL(m_priv && m_priv->initialized);
#endif
#ifdef WITH_GIO
@@ -1044,19 +1046,20 @@
Gio::FileMonitorEvent event,
DBGPerspective *a_persp)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
- RETURN_IF_FAIL (file) ;
+ RETURN_IF_FAIL (file);
if (other_file) {}
NEMIVER_TRY
if (event == Gio::FILE_MONITOR_EVENT_CHANGED) {
- UString path = Glib::filename_to_utf8 (file->get_path ()) ;
+ UString path = Glib::filename_to_utf8 (file->get_path ());
Glib::signal_idle ().connect
(sigc::bind
- (sigc::mem_fun (*a_persp, &DBGPerspective::on_file_content_changed),
- path)) ;
+ (sigc::mem_fun (*a_persp,
+ &DBGPerspective::on_file_content_changed),
+ path));
}
NEMIVER_CATCH
}
@@ -1068,30 +1071,30 @@
GnomeVFSMonitorEventType a_event_type,
DBGPerspective *a_persp)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
- RETURN_IF_FAIL (a_info_uri) ;
+ RETURN_IF_FAIL (a_info_uri);
NEMIVER_TRY
if (a_handle) {}
LOG_DD ("monitor_uri: " << a_monitor_uri << "\n"
- "info_uri: " << a_info_uri) ;
+ "info_uri: " << a_info_uri);
if (a_event_type == GNOME_VFS_MONITOR_EVENT_CHANGED) {
- LOG_DD ("file content changed") ;
- GnomeVFSURI *uri = gnome_vfs_uri_new (a_info_uri) ;
+ LOG_DD ("file content changed");
+ GnomeVFSURI *uri = gnome_vfs_uri_new (a_info_uri);
if (gnome_vfs_uri_get_path (uri)) {
UString path = Glib::filename_to_utf8
- (gnome_vfs_uri_get_path (uri)) ;
+ (gnome_vfs_uri_get_path (uri));
Glib::signal_idle ().connect
(sigc::bind
(sigc::mem_fun (*a_persp,
&DBGPerspective::on_file_content_changed),
path));
}
- gnome_vfs_uri_unref (uri) ;
+ gnome_vfs_uri_unref (uri);
}
NEMIVER_CATCH
}
@@ -1105,7 +1108,7 @@
<< "file-name: " << a_frame.file_name () << "\n"
<< "line number: " << a_frame.line () << "\n";
- return a_out ;
+ return a_out;
}
//****************************
@@ -1114,10 +1117,10 @@
void
DBGPerspective::on_open_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- open_file () ;
+ open_file ();
NEMIVER_CATCH
}
@@ -1125,10 +1128,10 @@
void
DBGPerspective::on_close_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- close_current_file () ;
+ close_current_file ();
NEMIVER_CATCH
}
@@ -1138,7 +1141,7 @@
{
NEMIVER_TRY
- reload_file () ;
+ reload_file ();
NEMIVER_CATCH
}
@@ -1146,10 +1149,10 @@
void
DBGPerspective::on_find_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- find_in_current_file () ;
+ find_in_current_file ();
NEMIVER_CATCH
}
@@ -1157,10 +1160,10 @@
void
DBGPerspective::on_execute_program_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- execute_program () ;
+ execute_program ();
NEMIVER_CATCH
}
@@ -1168,10 +1171,10 @@
void
DBGPerspective::on_load_core_file_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- load_core_file () ;
+ load_core_file ();
NEMIVER_CATCH
}
@@ -1179,10 +1182,10 @@
void
DBGPerspective::on_attach_to_program_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- attach_to_program () ;
+ attach_to_program ();
NEMIVER_CATCH
}
@@ -1190,11 +1193,11 @@
void
DBGPerspective::on_connect_to_remote_target_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- connect_to_remote_target () ;
+ connect_to_remote_target ();
NEMIVER_CATCH
}
@@ -1202,10 +1205,10 @@
void
DBGPerspective::on_detach_from_program_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- detach_from_program () ;
+ detach_from_program ();
NEMIVER_CATCH
}
@@ -1213,10 +1216,10 @@
void
DBGPerspective::on_choose_a_saved_session_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- choose_a_saved_session () ;
+ choose_a_saved_session ();
NEMIVER_CATCH
}
@@ -1224,10 +1227,10 @@
void
DBGPerspective::on_current_session_properties_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- edit_preferences () ;
+ edit_preferences ();
NEMIVER_CATCH
}
@@ -1235,10 +1238,10 @@
void
DBGPerspective::on_run_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- run () ;
+ run ();
NEMIVER_CATCH
}
@@ -1246,10 +1249,10 @@
void
DBGPerspective::on_save_session_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- save_current_session () ;
+ save_current_session ();
NEMIVER_CATCH
}
@@ -1257,10 +1260,10 @@
void
DBGPerspective::on_stop_debugger_action (void)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- stop () ;
+ stop ();
NEMIVER_CATCH
}
@@ -1268,10 +1271,10 @@
void
DBGPerspective::on_next_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- step_over () ;
+ step_over ();
NEMIVER_CATCH
}
@@ -1279,10 +1282,10 @@
void
DBGPerspective::on_step_into_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- step_into () ;
+ step_into ();
NEMIVER_CATCH
}
@@ -1290,10 +1293,10 @@
void
DBGPerspective::on_step_out_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- step_out () ;
+ step_out ();
NEMIVER_CATCH
}
@@ -1301,36 +1304,36 @@
void
DBGPerspective::on_continue_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- do_continue () ;
+ do_continue ();
NEMIVER_CATCH
}
void
DBGPerspective::on_continue_until_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- do_continue_until () ;
+ do_continue_until ();
NEMIVER_CATCH
}
void
DBGPerspective::on_toggle_breakpoint_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- toggle_breakpoint () ;
+ toggle_breakpoint ();
NEMIVER_CATCH
}
void
DBGPerspective::on_set_breakpoint_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- set_breakpoint_using_dialog () ;
+ set_breakpoint_using_dialog ();
NEMIVER_CATCH
}
@@ -1347,27 +1350,27 @@
void
DBGPerspective::on_refresh_locals_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- refresh_locals () ;
+ refresh_locals ();
NEMIVER_CATCH
}
void
DBGPerspective::on_toggle_breakpoint_enabled_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- toggle_breakpoint_enabled () ;
+ toggle_breakpoint_enabled ();
NEMIVER_CATCH
}
void
DBGPerspective::on_inspect_variable_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- inspect_variable () ;
+ inspect_variable ();
NEMIVER_CATCH
}
@@ -1383,15 +1386,15 @@
void
DBGPerspective::on_show_commands_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
Glib::RefPtr<Gtk::ToggleAction> action =
Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic
(workbench ().get_ui_manager ()->get_action
- ("/MenuBar/MenuBarAdditions/ViewMenu/ShowCommandsMenuItem")) ;
- THROW_IF_FAIL (action) ;
+ ("/MenuBar/MenuBarAdditions/ViewMenu/ShowCommandsMenuItem"));
+ THROW_IF_FAIL (action);
- set_show_command_view (action->get_active ()) ;
+ set_show_command_view (action->get_active ());
NEMIVER_CATCH
}
@@ -1399,16 +1402,16 @@
void
DBGPerspective::on_show_errors_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
Glib::RefPtr<Gtk::ToggleAction> action =
Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic
(workbench ().get_ui_manager ()->get_action
- ("/MenuBar/MenuBarAdditions/ViewMenu/ShowErrorsMenuItem")) ;
- THROW_IF_FAIL (action) ;
+ ("/MenuBar/MenuBarAdditions/ViewMenu/ShowErrorsMenuItem"));
+ THROW_IF_FAIL (action);
- set_show_log_view (action->get_active ()) ;
+ set_show_log_view (action->get_active ());
NEMIVER_CATCH
}
@@ -1416,16 +1419,16 @@
void
DBGPerspective::on_show_target_output_action ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
Glib::RefPtr<Gtk::ToggleAction> action =
Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic
(workbench ().get_ui_manager ()->get_action
- ("/MenuBar/MenuBarAdditions/ViewMenu/ShowTargetOutputMenuItem")) ;
- THROW_IF_FAIL (action) ;
+ ("/MenuBar/MenuBarAdditions/ViewMenu/ShowTargetOutputMenuItem"));
+ THROW_IF_FAIL (action);
- set_show_target_output_view (action->get_active ()) ;
+ set_show_target_output_view (action->get_active ());
NEMIVER_CATCH
}
@@ -1434,7 +1437,7 @@
DBGPerspective::on_breakpoint_delete_action
(const IDebugger::BreakPoint& a_breakpoint)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
delete_breakpoint (a_breakpoint.number ());
NEMIVER_CATCH
@@ -1442,29 +1445,30 @@
void
DBGPerspective::on_breakpoint_go_to_source_action
- (const IDebugger::BreakPoint& a_breakpoint)
+ (const IDebugger::BreakPoint& a_breakpoint)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
- // FIXME: this should put the same effort into finding the source file that
- // append_visual_breakpoint() does. Maybe this should be abstracted out
- // somehow
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
+ // FIXME: this should put the same effort into
+ // finding the source file that
+ // append_visual_breakpoint() does.
+ // Maybe this should be abstracted out somehow
NEMIVER_TRY
UString file_path = a_breakpoint.file_full_name ();
if (file_path == "") {
- file_path = a_breakpoint.file_name () ;
+ file_path = a_breakpoint.file_name ();
if (!find_file_in_source_dirs (file_path, file_path)) {
UString message;
message.printf (_("File path info is missing "
"for breakpoint '%i'"), a_breakpoint.number ());
display_warning (message);
- return ;
+ return;
}
}
bring_source_as_current (file_path);
- SourceEditor *source_editor = get_source_editor_from_path (file_path) ;
+ SourceEditor *source_editor = get_source_editor_from_path (file_path);
THROW_IF_FAIL (source_editor);
- source_editor->scroll_to_line (a_breakpoint.line ()) ;
+ source_editor->scroll_to_line (a_breakpoint.line ());
NEMIVER_CATCH
}
@@ -1472,22 +1476,23 @@
void
DBGPerspective::on_thread_list_thread_selected_signal (int a_tid)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
if (a_tid) {}
NEMIVER_TRY
- get_call_stack ().update_stack () ;
- get_local_vars_inspector ().show_local_variables_of_current_function () ;
+ get_call_stack ().update_stack ();
+ get_local_vars_inspector ().show_local_variables_of_current_function ();
NEMIVER_CATCH
}
void
-DBGPerspective::on_switch_page_signal (GtkNotebookPage *a_page, guint a_page_num)
+DBGPerspective::on_switch_page_signal (GtkNotebookPage *a_page,
+ guint a_page_num)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
if (a_page) {}
NEMIVER_TRY
@@ -1499,29 +1504,29 @@
void
DBGPerspective::on_debugger_ready_signal (bool a_is_ready)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->debugger_ready_action_group) ;
- THROW_IF_FAIL (m_priv->throbber) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->debugger_ready_action_group);
+ THROW_IF_FAIL (m_priv->throbber);
LOG_DD ("a_is_ready: " << (int)a_is_ready);
if (a_is_ready) {
// reset to default cursor
workbench ().get_root_window ().get_window ()->set_cursor ();
- m_priv->throbber->stop () ;
- m_priv->debugger_ready_action_group->set_sensitive (true) ;
- m_priv->target_not_started_action_group->set_sensitive (true) ;
- m_priv->debugger_busy_action_group->set_sensitive (false) ;
+ m_priv->throbber->stop ();
+ m_priv->debugger_ready_action_group->set_sensitive (true);
+ m_priv->target_not_started_action_group->set_sensitive (true);
+ m_priv->debugger_busy_action_group->set_sensitive (false);
if (debugger ()->is_attached_to_target ()) {
- attached_to_target_signal ().emit (true) ;
+ attached_to_target_signal ().emit (true);
}
} else {
- m_priv->target_not_started_action_group->set_sensitive (false) ;
- m_priv->debugger_ready_action_group->set_sensitive (false) ;
- m_priv->debugger_busy_action_group->set_sensitive (true) ;
+ m_priv->target_not_started_action_group->set_sensitive (false);
+ m_priv->debugger_ready_action_group->set_sensitive (false);
+ m_priv->debugger_busy_action_group->set_sensitive (true);
}
NEMIVER_CATCH
@@ -1530,37 +1535,37 @@
void
DBGPerspective::on_debugger_not_started_signal ()
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->throbber) ;
- THROW_IF_FAIL (m_priv->default_action_group) ;
- THROW_IF_FAIL (m_priv->target_connected_action_group) ;
- THROW_IF_FAIL (m_priv->target_not_started_action_group) ;
- THROW_IF_FAIL (m_priv->debugger_ready_action_group) ;
- THROW_IF_FAIL (m_priv->debugger_busy_action_group) ;
- THROW_IF_FAIL (m_priv->opened_file_action_group) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->throbber);
+ THROW_IF_FAIL (m_priv->default_action_group);
+ THROW_IF_FAIL (m_priv->target_connected_action_group);
+ THROW_IF_FAIL (m_priv->target_not_started_action_group);
+ THROW_IF_FAIL (m_priv->debugger_ready_action_group);
+ THROW_IF_FAIL (m_priv->debugger_busy_action_group);
+ THROW_IF_FAIL (m_priv->opened_file_action_group);
// reset to default cursor
workbench ().get_root_window ().get_window ()->set_cursor ();
- m_priv->throbber->stop () ;
- m_priv->default_action_group->set_sensitive (true) ;
- m_priv->target_connected_action_group->set_sensitive (false) ;
- m_priv->target_not_started_action_group->set_sensitive (false) ;
- m_priv->debugger_ready_action_group->set_sensitive (false) ;
- m_priv->debugger_busy_action_group->set_sensitive (false) ;
+ m_priv->throbber->stop ();
+ m_priv->default_action_group->set_sensitive (true);
+ m_priv->target_connected_action_group->set_sensitive (false);
+ m_priv->target_not_started_action_group->set_sensitive (false);
+ m_priv->debugger_ready_action_group->set_sensitive (false);
+ m_priv->debugger_busy_action_group->set_sensitive (false);
m_priv->opened_file_action_group->set_sensitive (false);
if (get_n_pages ()) {
- close_opened_files () ;
+ close_opened_files ();
}
}
void
DBGPerspective::on_going_to_run_target_signal ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- clear_session_data () ;
- get_local_vars_inspector ().re_init_widget () ;
+ clear_session_data ();
+ get_local_vars_inspector ().re_init_widget ();
get_breakpoints_view ().re_init ();
NEMIVER_CATCH
}
@@ -1568,20 +1573,20 @@
void
DBGPerspective::on_attached_to_target_signal (bool a_is_ready)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
if (a_is_ready) {
- m_priv->target_connected_action_group->set_sensitive (true) ;
+ m_priv->target_connected_action_group->set_sensitive (true);
} else {
//reset to default cursor, in case the busy cursor was spinning
workbench ().get_root_window ().get_window ()->set_cursor ();
- m_priv->throbber->stop () ;
- m_priv->target_connected_action_group->set_sensitive (false) ;
- m_priv->default_action_group->set_sensitive (true) ;
- m_priv->target_not_started_action_group->set_sensitive (false) ;
- m_priv->debugger_ready_action_group->set_sensitive (false) ;
- m_priv->debugger_busy_action_group->set_sensitive (false) ;
+ m_priv->throbber->stop ();
+ m_priv->target_connected_action_group->set_sensitive (false);
+ m_priv->default_action_group->set_sensitive (true);
+ m_priv->target_not_started_action_group->set_sensitive (false);
+ m_priv->debugger_ready_action_group->set_sensitive (false);
+ m_priv->debugger_busy_action_group->set_sensitive (false);
m_priv->opened_file_action_group->set_sensitive (false);
}
@@ -1590,38 +1595,38 @@
void
DBGPerspective::on_insert_in_command_view_signal
- (const Gtk::TextBuffer::iterator &a_it,
- const Glib::ustring &a_text,
- int a_dont_know)
+ (const Gtk::TextBuffer::iterator &a_it,
+ const Glib::ustring &a_text,
+ int a_dont_know)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
if (a_dont_know) {}
if (a_text == "") {return;}
if (a_text == "\n") {
//get the command that is on the current line
- UString line ;
- Gtk::TextBuffer::iterator iter = a_it, tmp_iter, eol_iter = a_it ;
+ UString line;
+ Gtk::TextBuffer::iterator iter = a_it, tmp_iter, eol_iter = a_it;
for (;;) {
- --iter ;
+ --iter;
if (iter.is_start ()) {break;}
- tmp_iter = iter ;
+ tmp_iter = iter;
if (tmp_iter.get_char () == ')'
&& (--tmp_iter).get_char () == 'b'
&& (--tmp_iter).get_char () == 'd'
&& (--tmp_iter).get_char () == 'g'
&& (--tmp_iter).get_char () == '(') {
- ++ iter ;
- line = iter.get_visible_text (eol_iter) ;
- break ;
+ ++ iter;
+ line = iter.get_visible_text (eol_iter);
+ break;
}
}
if (!line.empty ()) {
- IDebuggerSafePtr dbg = debugger () ;
- THROW_IF_FAIL (dbg) ;
- //dbg->execute_command (IDebugger::Command (line)) ;
- m_priv->last_command_text = "" ;
+ IDebuggerSafePtr dbg = debugger ();
+ THROW_IF_FAIL (dbg);
+ //dbg->execute_command (IDebugger::Command (line));
+ m_priv->last_command_text = "";
}
}
NEMIVER_CATCH
@@ -1629,21 +1634,21 @@
void
DBGPerspective::on_source_view_markers_region_clicked_signal
- (int a_line,
- bool a_dialog_requested)
+ (int a_line,
+ bool a_dialog_requested)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
if (m_priv->debugger->get_state () != IDebugger::NOT_STARTED) {
- SourceEditor *cur_editor = get_current_source_editor () ;
- THROW_IF_FAIL (cur_editor) ;
- UString path ;
- cur_editor->get_path (path) ;
+ SourceEditor *cur_editor = get_current_source_editor ();
+ THROW_IF_FAIL (cur_editor);
+ UString path;
+ cur_editor->get_path (path);
if (a_dialog_requested) {
set_breakpoint_using_dialog (path, a_line + 1);
} else {
- toggle_breakpoint (path, a_line + 1 ) ;
+ toggle_breakpoint (path, a_line + 1 );
}
}
@@ -1651,40 +1656,41 @@
}
bool
-DBGPerspective::on_button_pressed_in_source_view_signal (GdkEventButton *a_event)
+DBGPerspective::on_button_pressed_in_source_view_signal
+ (GdkEventButton *a_event)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
if (get_popup_tip ().is_visible ()) {
- get_popup_tip ().hide () ;
+ get_popup_tip ().hide ();
}
if (a_event->type != GDK_BUTTON_PRESS) {
- return false ;
+ return false;
}
if (a_event->button == 3) {
- popup_source_view_contextual_menu (a_event) ;
- return true ;
+ popup_source_view_contextual_menu (a_event);
+ return true;
}
NEMIVER_CATCH
- return false ;
+ return false;
}
bool
DBGPerspective::on_motion_notify_event_signal (GdkEventMotion *a_event)
{
- LOG_FUNCTION_SCOPE_NORMAL_D(DBG_PERSPECTIVE_MOUSE_MOTION_DOMAIN) ;
+ LOG_FUNCTION_SCOPE_NORMAL_D(DBG_PERSPECTIVE_MOUSE_MOTION_DOMAIN);
NEMIVER_TRY
int x=0, y=0;
GdkModifierType state=(GdkModifierType)0;
if (a_event->is_hint) {
- gdk_window_get_pointer (a_event->window, &x, &y, &state) ;
+ gdk_window_get_pointer (a_event->window, &x, &y, &state);
} else {
x = (int) a_event->x;
y = (int) a_event->y;
@@ -1692,23 +1698,23 @@
}
LOG_D ("(x,y) => (" << (int)x << ", " << (int)y << ")",
- DBG_PERSPECTIVE_MOUSE_MOTION_DOMAIN) ;
- m_priv->mouse_in_source_editor_x = x ;
- m_priv->mouse_in_source_editor_y = y ;
+ DBG_PERSPECTIVE_MOUSE_MOTION_DOMAIN);
+ m_priv->mouse_in_source_editor_x = x;
+ m_priv->mouse_in_source_editor_y = y;
if (m_priv->debugger->get_state () != IDebugger::NOT_STARTED) {
- restart_mouse_immobile_timer () ;
+ restart_mouse_immobile_timer ();
}
NEMIVER_CATCH
- return false ;
+ return false;
}
void
DBGPerspective::on_leave_notify_event_signal (GdkEventCrossing *a_event)
{
NEMIVER_TRY
- LOG_FUNCTION_SCOPE_NORMAL_D(DBG_PERSPECTIVE_MOUSE_MOTION_DOMAIN) ;
+ LOG_FUNCTION_SCOPE_NORMAL_D(DBG_PERSPECTIVE_MOUSE_MOTION_DOMAIN);
if (a_event) {}
- stop_mouse_immobile_timer () ;
+ stop_mouse_immobile_timer ();
NEMIVER_CATCH
}
@@ -1720,7 +1726,7 @@
if (get_contextual_menu ()
&& get_contextual_menu ()->is_visible ()) {
- return false ;
+ return false;
}
if (!debugger ()->is_attached_to_target ()) {
@@ -1729,9 +1735,9 @@
try_to_request_show_variable_value_at_position
(m_priv->mouse_in_source_editor_x,
- m_priv->mouse_in_source_editor_y) ;
+ m_priv->mouse_in_source_editor_y);
NEMIVER_CATCH
- return false ;
+ return false;
}
void
@@ -1741,8 +1747,8 @@
{
NEMIVER_TRY
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (a_editor) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (a_editor);
UString path;
a_editor->get_path (path);
@@ -1759,17 +1765,17 @@
int brk_num;
// check if there's a breakpoint set at this line and file
bool found_bkpt = get_breakpoint_number (a_current_file,
- a_current_line,
- brk_num,
- enabled) ;
+ a_current_line,
+ brk_num,
+ enabled);
Glib::RefPtr<Gtk::Action> toggle_enable_action =
workbench ().get_ui_manager ()->get_action
- ("/MenuBar/MenuBarAdditions/DebugMenu/ToggleEnableBreakMenuItem") ;
+ ("/MenuBar/MenuBarAdditions/DebugMenu/ToggleEnableBreakMenuItem");
THROW_IF_FAIL (toggle_enable_action);
Glib::RefPtr<Gtk::Action> toggle_break_action =
workbench ().get_ui_manager ()->get_action
- ("/MenuBar/MenuBarAdditions/DebugMenu/ToggleBreakMenuItem") ;
+ ("/MenuBar/MenuBarAdditions/DebugMenu/ToggleBreakMenuItem");
THROW_IF_FAIL (toggle_break_action);
toggle_enable_action->set_sensitive (found_bkpt);
@@ -1789,17 +1795,18 @@
void
DBGPerspective::on_shutdown_signal ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- // save the location of the status pane so that it'll open in the same place
+ // save the location of the status pane so
+ // that it'll open in the same place
// next time.
- IConfMgr &conf_mgr = get_conf_mgr () ;
+ IConfMgr &conf_mgr = get_conf_mgr ();
int pane_location = m_priv->body_main_paned->get_position();
- conf_mgr.set_key_value (CONF_KEY_STATUS_PANE_LOCATION, pane_location) ;
+ conf_mgr.set_key_value (CONF_KEY_STATUS_PANE_LOCATION, pane_location);
if (m_priv->prog_path == "") {
- return ;
+ return;
}
// stop the debugger so that the target executable doesn't go on running
@@ -1807,11 +1814,11 @@
debugger ()->exit_engine ();
if (m_priv->reused_session) {
- record_and_save_session (m_priv->session) ;
- LOG_DD ("saved current session") ;
+ record_and_save_session (m_priv->session);
+ LOG_DD ("saved current session");
} else {
- LOG_DD ("recorded a new session") ;
- record_and_save_new_session () ;
+ LOG_DD ("recorded a new session");
+ record_and_save_new_session ();
}
NEMIVER_CATCH
@@ -1820,63 +1827,63 @@
void
DBGPerspective::on_show_command_view_changed_signal (bool a_show)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
Glib::RefPtr<Gtk::ToggleAction> action =
- Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic
- (workbench ().get_ui_manager ()->get_action
- ("/MenuBar/MenuBarAdditions/ViewMenu/ShowCommandsMenuItem"));
- THROW_IF_FAIL (action) ;
- action->set_active (a_show) ;
+ Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic
+ (workbench ().get_ui_manager ()->get_action
+ ("/MenuBar/MenuBarAdditions/ViewMenu/ShowCommandsMenuItem"));
+ THROW_IF_FAIL (action);
+ action->set_active (a_show);
}
void
DBGPerspective::on_show_target_output_view_changed_signal (bool a_show)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
- m_priv->target_output_view_is_visible = a_show ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
+ m_priv->target_output_view_is_visible = a_show;
Glib::RefPtr<Gtk::ToggleAction> action =
Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic
- (workbench ().get_ui_manager ()->get_action
- ("/MenuBar/MenuBarAdditions/ViewMenu/ShowTargetOutputMenuItem"));
- THROW_IF_FAIL (action) ;
- action->set_active (a_show) ;
+ (workbench ().get_ui_manager ()->get_action
+ ("/MenuBar/MenuBarAdditions/ViewMenu/ShowTargetOutputMenuItem"));
+ THROW_IF_FAIL (action);
+ action->set_active (a_show);
}
void
DBGPerspective::on_show_log_view_changed_signal (bool a_show)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
- m_priv->log_view_is_visible = a_show ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
+ m_priv->log_view_is_visible = a_show;
Glib::RefPtr<Gtk::ToggleAction> action =
Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic
(workbench ().get_ui_manager ()->get_action
- ("/MenuBar/MenuBarAdditions/ViewMenu/ShowErrorsMenuItem"));
- THROW_IF_FAIL (action) ;
+ ("/MenuBar/MenuBarAdditions/ViewMenu/ShowErrorsMenuItem"));
+ THROW_IF_FAIL (action);
- action->set_active (a_show) ;
+ action->set_active (a_show);
}
void
DBGPerspective::on_conf_key_changed_signal (const UString &a_key,
IConfMgr::Value &a_value)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
if (a_key == CONF_KEY_NEMIVER_SOURCE_DIRS) {
- LOG_DD ("updated key source-dirs") ;
- m_priv->source_dirs = boost::get<UString> (a_value).split (":") ;
+ LOG_DD ("updated key source-dirs");
+ m_priv->source_dirs = boost::get<UString> (a_value).split (":");
} else if (a_key == CONF_KEY_SHOW_DBG_ERROR_DIALOGS) {
- m_priv->show_dbg_errors = boost::get<bool> (a_value) ;
+ m_priv->show_dbg_errors = boost::get<bool> (a_value);
} else if (a_key == CONF_KEY_SHOW_SOURCE_LINE_NUMBERS) {
- map<int, SourceEditor*>::iterator it ;
- for (it = m_priv->pagenum_2_source_editor_map.begin () ;
+ map<int, SourceEditor*>::iterator it;
+ for (it = m_priv->pagenum_2_source_editor_map.begin ();
it != m_priv->pagenum_2_source_editor_map.end ();
++it) {
if (it->second) {
it->second->source_view ().set_show_line_numbers
- (boost::get<bool> (a_value)) ;
+ (boost::get<bool> (a_value));
}
}
} else if (a_key == CONF_KEY_CONFIRM_BEFORE_RELOAD_SOURCE) {
@@ -1884,8 +1891,8 @@
} else if (a_key == CONF_KEY_ALLOW_AUTO_RELOAD_SOURCE) {
m_priv->allow_auto_reload_source = boost::get<bool> (a_value);
} else if (a_key == CONF_KEY_HIGHLIGHT_SOURCE_CODE) {
- map<int, SourceEditor*>::iterator it ;
- for (it = m_priv->pagenum_2_source_editor_map.begin () ;
+ map<int, SourceEditor*>::iterator it;
+ for (it = m_priv->pagenum_2_source_editor_map.begin ();
it != m_priv->pagenum_2_source_editor_map.end ();
++it) {
if (it->second && it->second->source_view ().get_buffer ()) {
@@ -1895,7 +1902,7 @@
#else
it->second->source_view ().get_source_buffer ()->set_highlight
#endif // WITH_SOURCEVIEWMM2
- (boost::get<bool> (a_value)) ;
+ (boost::get<bool> (a_value));
}
}
} else if (a_key == CONF_KEY_USE_SYSTEM_FONT) {
@@ -1924,13 +1931,13 @@
void
DBGPerspective::on_debugger_got_target_info_signal (int a_pid,
- const UString &a_exe_path)
+ const UString &a_exe_path)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (a_exe_path != "") {
- m_priv->prog_path = a_exe_path ;
+ m_priv->prog_path = a_exe_path;
}
UString prog_info;
@@ -1945,10 +1952,10 @@
void
DBGPerspective::on_debugger_connected_to_remote_target_signal ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- ui_utils::display_info (_("Connected to remote target !")) ;
+ ui_utils::display_info (_("Connected to remote target !"));
NEMIVER_CATCH
}
@@ -1956,11 +1963,11 @@
void
DBGPerspective::on_debugger_detached_from_target_signal ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- clear_status_notebook () ;
+ clear_status_notebook ();
workbench ().set_title_extension ("");
//****************************
//grey out all the menu
@@ -1968,10 +1975,10 @@
//to restart the debugger etc
//***************************
THROW_IF_FAIL (m_priv);
- m_priv->debugger_ready_action_group->set_sensitive (false) ;
- m_priv->debugger_busy_action_group->set_sensitive (false) ;
+ m_priv->debugger_ready_action_group->set_sensitive (false);
+ m_priv->debugger_busy_action_group->set_sensitive (false);
m_priv->target_connected_action_group->set_sensitive (false);
- m_priv->target_not_started_action_group->set_sensitive (true) ;
+ m_priv->target_not_started_action_group->set_sensitive (true);
NEMIVER_CATCH
}
@@ -1979,10 +1986,10 @@
void
DBGPerspective::on_debugger_console_message_signal (const UString &a_msg)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- add_text_to_command_view (a_msg + "\n") ;
+ add_text_to_command_view (a_msg + "\n");
NEMIVER_CATCH
}
@@ -1991,10 +1998,10 @@
DBGPerspective::on_debugger_target_output_message_signal
(const UString &a_msg)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- add_text_to_target_output_view (a_msg + "\n") ;
+ add_text_to_target_output_view (a_msg + "\n");
NEMIVER_CATCH
}
@@ -2002,10 +2009,10 @@
void
DBGPerspective::on_debugger_log_message_signal (const UString &a_msg)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- add_text_to_log_view (a_msg + "\n") ;
+ add_text_to_log_view (a_msg + "\n");
NEMIVER_CATCH
}
@@ -2014,16 +2021,16 @@
DBGPerspective::on_debugger_command_done_signal (const UString &a_command,
const UString &a_cookie)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
- LOG_DD ("a_command: " << a_command) ;
- LOG_DD ("a_cookie: " << a_cookie) ;
+ LOG_DD ("a_command: " << a_command);
+ LOG_DD ("a_cookie: " << a_cookie);
NEMIVER_TRY
if (a_command == "attach-to-program") {
- //attached_to_target_signal ().emit (true) ;
- debugger ()->step_instruction () ;
- debugger ()->get_target_info () ;
+ //attached_to_target_signal ().emit (true);
+ debugger ()->step_instruction ();
+ debugger ()->get_target_info ();
}
NEMIVER_CATCH
}
@@ -2033,12 +2040,13 @@
(const map<int, IDebugger::BreakPoint> &a_breaks,
const UString &a_cookie)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
if (a_cookie.empty ()) {}
NEMIVER_TRY
- // if a breakpoint was stored in the session db as disabled, it must be set
- // initially and then immediately disabled. When the breakpoint is set, it
+ // if a breakpoint was stored in the session db as disabled,
+ // it must be set initially and then immediately disabled.
+ // When the breakpoint is set, it
// will send a 'cookie' along of the form
// "initiallly-disabled#filename.cc#123"
if (a_cookie.find("initially-disabled") != UString::npos) {
@@ -2049,7 +2057,7 @@
int line = atoi
(a_cookie.substr (start_of_line,
a_cookie.size () - start_of_line).c_str ());
- map<int, IDebugger::BreakPoint>::const_iterator break_iter ;
+ map<int, IDebugger::BreakPoint>::const_iterator break_iter;
for (break_iter = a_breaks.begin ();
break_iter != a_breaks.end ();
++break_iter) {
@@ -2060,12 +2068,12 @@
}
}
}
- LOG_DD ("debugger engine set breakpoints") ;
- append_breakpoints (a_breaks) ;
+ LOG_DD ("debugger engine set breakpoints");
+ append_breakpoints (a_breaks);
SourceEditor* editor = get_current_source_editor ();
if (!editor) {
- LOG_ERROR ("no editor was found") ;
- return ;
+ LOG_ERROR ("no editor was found");
+ return;
}
UString path;
editor->get_path (path);
@@ -2081,57 +2089,57 @@
int , int, const UString &)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- LOG_DD ("stopped, reason: " << (int)a_reason) ;
+ LOG_DD ("stopped, reason: " << (int)a_reason);
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
UString file_path (a_frame.file_full_name ());
if (a_has_frame
&& a_frame.file_full_name () == ""
&& a_frame.file_name () != "") {
- file_path = a_frame.file_name () ;
+ file_path = a_frame.file_name ();
if (!find_file_in_source_dirs (file_path, file_path)) {
UString message;
message.printf(_("Could not find file %s"), file_path.c_str ());
- display_error (message) ;
- return ;
+ display_error (message);
+ return;
}
}
if (a_has_frame && file_path != "") {
- m_priv->current_frame = a_frame ;
- m_priv->current_frame.file_name (file_path) ;
- set_where (file_path, a_frame.line ()) ;
+ m_priv->current_frame = a_frame;
+ m_priv->current_frame.file_name (file_path);
+ set_where (file_path, a_frame.line ());
} else if (a_has_frame &&
a_frame.file_full_name () == ""
&& a_frame.file_name () == "") {
UString message;
message.printf(_("File path info is missing for function '%s'"),
- a_frame.function_name ().c_str ()) ;
+ a_frame.function_name ().c_str ());
LOG_ERROR (message);
}
if (m_priv->debugger_has_just_run) {
- debugger ()->get_target_info () ;
- m_priv->debugger_has_just_run = false ;
+ debugger ()->get_target_info ();
+ m_priv->debugger_has_just_run = false;
}
- add_text_to_command_view ("\n(gdb)", true) ;
+ add_text_to_command_view ("\n(gdb)", true);
NEMIVER_CATCH
}
void
DBGPerspective::on_program_finished_signal ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- unset_where () ;
- attached_to_target_signal ().emit (false) ;
- display_info (_("Program exited")) ;
+ unset_where ();
+ attached_to_target_signal ().emit (false);
+ display_info (_("Program exited"));
workbench ().set_title_extension ("");
//****************************
@@ -2139,17 +2147,17 @@
//items but those to
//to restart the debugger etc
//***************************
- THROW_IF_FAIL (m_priv) ;
- m_priv->target_not_started_action_group->set_sensitive (true) ;
- m_priv->debugger_ready_action_group->set_sensitive (false) ;
- m_priv->debugger_busy_action_group->set_sensitive (false) ;
+ THROW_IF_FAIL (m_priv);
+ m_priv->target_not_started_action_group->set_sensitive (true);
+ m_priv->debugger_ready_action_group->set_sensitive (false);
+ m_priv->debugger_busy_action_group->set_sensitive (false);
m_priv->target_connected_action_group->set_sensitive (false);
//**********************
//clear threads list and
//call stack
//**********************
- clear_status_notebook () ;
+ clear_status_notebook ();
NEMIVER_CATCH
}
@@ -2157,34 +2165,34 @@
DBGPerspective::on_frame_selected_signal (int a_index,
const IDebugger::Frame &a_frame)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
if (a_index) {}
NEMIVER_TRY
- UString file_path = a_frame.file_full_name () ;
+ UString file_path = a_frame.file_full_name ();
if (file_path == "") {
- file_path = a_frame.file_name () ;
+ file_path = a_frame.file_name ();
if (!find_file_in_source_dirs (file_path, file_path)) {
UString message;
message.printf (_("File path info is missing for function '%s'"),
a_frame.function_name ().c_str ());
LOG_ERROR (message);
- return ;
+ return;
//TODO: we should disassemble the current frame and display it.
}
}
if (a_frame.line () == 0) {
LOG_ERROR ("Line info is missing for function '"
- + a_frame.function_name () + "'") ;
- return ;
+ + a_frame.function_name () + "'");
+ return;
//TODO: we should disassemble the current frame and display it.
}
- get_local_vars_inspector ().show_local_variables_of_current_function () ;
- set_where (file_path, a_frame.line ()) ;
+ get_local_vars_inspector ().show_local_variables_of_current_function ();
+ set_where (file_path, a_frame.line ());
NEMIVER_CATCH
}
@@ -2196,12 +2204,12 @@
int a_break_number,
const UString &a_cookie)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
if (a_break.number () || a_cookie.empty ()) {}
NEMIVER_TRY
- delete_visual_breakpoint (a_break_number) ;
+ delete_visual_breakpoint (a_break_number);
SourceEditor* editor = get_current_source_editor ();
THROW_IF_FAIL (editor);
UString path;
@@ -2215,25 +2223,25 @@
(const vector<IDebugger::OverloadsChoiceEntry> &entries,
const UString &a_cookie)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
if (a_cookie.empty ()) {}
NEMIVER_TRY
- choose_function_overload (entries) ;
+ choose_function_overload (entries);
NEMIVER_CATCH
}
void
DBGPerspective::on_debugger_running_signal ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- THROW_IF_FAIL (m_priv->throbber) ;
- THROW_IF_FAIL (m_priv->sourceviews_notebook) ;
+ THROW_IF_FAIL (m_priv->throbber);
+ THROW_IF_FAIL (m_priv->sourceviews_notebook);
workbench ().get_root_window ().get_window ()->set_cursor
(Gdk::Cursor (Gdk::WATCH));
- m_priv->throbber->start () ;
+ m_priv->throbber->start ();
NEMIVER_CATCH
}
@@ -2241,13 +2249,13 @@
DBGPerspective::on_signal_received_by_target_signal (const UString &a_signal,
const UString &a_meaning)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
UString message;
// translators: first %s is the signal name, second one is the reason
message.printf (_("Target received a signal: %s, %s"),
- a_signal.c_str (), a_meaning.c_str ()) ;
+ a_signal.c_str (), a_meaning.c_str ());
ui_utils::display_info (message);
NEMIVER_CATCH
@@ -2256,12 +2264,12 @@
void
DBGPerspective::on_debugger_error_signal (const UString &a_msg)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
if (m_priv->show_dbg_errors) {
UString message;
- message.printf (_("An error occured: %s"), a_msg.c_str ()) ;
+ message.printf (_("An error occured: %s"), a_msg.c_str ());
ui_utils::display_error (message);
}
@@ -2271,15 +2279,15 @@
void
DBGPerspective::on_debugger_state_changed_signal (IDebugger::State a_state)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- LOG_DD ("state is '" << IDebugger::state_to_string (a_state) << "'") ;
+ LOG_DD ("state is '" << IDebugger::state_to_string (a_state) << "'");
if (a_state == IDebugger::READY) {
- debugger_ready_signal ().emit (true) ;
+ debugger_ready_signal ().emit (true);
} else {
- debugger_ready_signal ().emit (false) ;
+ debugger_ready_signal ().emit (false);
}
NEMIVER_CATCH
@@ -2287,25 +2295,25 @@
void
DBGPerspective::on_debugger_variable_value_signal
- (const UString &a_var_name,
- const IDebugger::VariableSafePtr &a_var,
- const UString &a_cookie)
+ (const UString &a_var_name,
+ const IDebugger::VariableSafePtr &a_var,
+ const UString &a_cookie)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
if (a_cookie.empty ()) {}
NEMIVER_TRY
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
- UString var_str ;
+ UString var_str;
if (m_priv->in_show_var_value_at_pos_transaction
&& m_priv->var_to_popup == a_var_name) {
- a_var->to_string (var_str, true) ;
+ a_var->to_string (var_str, true);
show_underline_tip_at_position (m_priv->var_popup_tip_x,
m_priv->var_popup_tip_y,
- var_str) ;
- m_priv->in_show_var_value_at_pos_transaction = false ;
- m_priv->var_to_popup = "" ;
+ var_str);
+ m_priv->in_show_var_value_at_pos_transaction = false;
+ m_priv->var_to_popup = "";
}
NEMIVER_CATCH
}
@@ -2314,7 +2322,7 @@
DBGPerspective::on_file_content_changed (const UString &a_path)
{
static std::list<UString> pending_notifications;
- LOG_DD ("file content changed") ;
+ LOG_DD ("file content changed");
NEMIVER_TRY
if (!a_path.empty ()) {
@@ -2325,7 +2333,7 @@
a_path)
== pending_notifications.end ()) {
pending_notifications.push_back (a_path);
- UString msg ;
+ UString msg;
msg.printf (_("File %s has been modified. "
"Do want to reload it ?"),
a_path.c_str ());
@@ -2361,38 +2369,32 @@
}
}
NEMIVER_CATCH
- return false ;
+ return false;
}
void
-DBGPerspective::activate_status_view(Gtk::Widget& page)
+DBGPerspective::activate_status_view (Gtk::Widget &a_page)
{
- int pagenum;
-
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ int pagenum = 0;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
- NEMIVER_TRY
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->statuses_notebook) ;
-
- pagenum = m_priv->statuses_notebook->page_num(page);
- if ( pagenum != -1 ) {
- if (m_priv->statuses_notebook->get_current_page()!=pagenum)
- m_priv->statuses_notebook->set_current_page (pagenum);
-
- page.grab_focus();
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->statuses_notebook);
+
+ pagenum = m_priv->statuses_notebook->page_num (a_page);
+ if (pagenum != -1) {
+ if (m_priv->statuses_notebook->get_current_page () != pagenum)
+ m_priv->statuses_notebook->set_current_page (pagenum);
+ a_page.grab_focus ();
} else {
- LOG_DD ("Invalid Pagenum") ;
+ LOG_DD ("Invalid Pagenum");
}
-
-
- NEMIVER_CATCH
}
void
DBGPerspective::on_activate_call_stack_view ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
activate_status_view (get_call_stack_paned ());
@@ -2402,7 +2404,7 @@
void
DBGPerspective::on_activate_variables_view ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
activate_status_view (get_local_vars_inspector_scrolled_win ());
@@ -2412,7 +2414,7 @@
void
DBGPerspective::on_activate_output_view ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
@@ -2425,7 +2427,7 @@
void
DBGPerspective::on_activate_target_terminal_view ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
@@ -2437,7 +2439,7 @@
void
DBGPerspective::on_activate_breakpoints_view ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
@@ -2449,7 +2451,7 @@
void
DBGPerspective::on_activate_logs_view ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
@@ -2462,7 +2464,7 @@
void
DBGPerspective::on_activate_registers_view ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
@@ -2475,11 +2477,11 @@
void
DBGPerspective::on_activate_memory_view ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- activate_status_view(get_memory_view ().widget ());
+ activate_status_view (get_memory_view ().widget ());
NEMIVER_CATCH
}
@@ -2488,14 +2490,14 @@
void
DBGPerspective::on_activate_global_variables ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
GlobalVarsInspectorDialog dialog (plugin_path (),
debugger (),
- workbench ()) ;
- dialog.run () ;
+ workbench ());
+ dialog.run ();
NEMIVER_CATCH
}
@@ -2508,9 +2510,9 @@
NEMIVER_TRY
THROW_IF_FAIL (m_priv);
- Pango::FontDescription font_desc(m_priv->get_source_font_name ());
+ Pango::FontDescription font_desc (m_priv->get_source_font_name ());
#ifdef WITH_MEMORYVIEW
- get_memory_view ().modify_font (font_desc) ;
+ get_memory_view ().modify_font (font_desc);
#endif // WITH_MEMORYVIEW
NEMIVER_CATCH
@@ -2532,10 +2534,10 @@
string relative_path =
Glib::build_filename (Glib::filename_from_utf8 (a_dir),
Glib::filename_from_utf8 (a_name));
- string absolute_path ;
+ string absolute_path;
THROW_IF_FAIL (build_absolute_resource_path
- (Glib::filename_to_utf8 (relative_path), absolute_path)) ;
- return absolute_path ;
+ (Glib::filename_to_utf8 (relative_path), absolute_path));
+ return absolute_path;
}
@@ -2545,86 +2547,86 @@
const UString &a_icon_name)
{
if (!m_priv->icon_factory) {
- m_priv->icon_factory = Gtk::IconFactory::create () ;
- m_priv->icon_factory->add_default () ;
+ m_priv->icon_factory = Gtk::IconFactory::create ();
+ m_priv->icon_factory->add_default ();
}
- Gtk::StockID stock_id (a_stock_id) ;
- string icon_path = build_resource_path (a_icon_dir, a_icon_name) ;
+ Gtk::StockID stock_id (a_stock_id);
+ string icon_path = build_resource_path (a_icon_dir, a_icon_name);
Glib::RefPtr<Gdk::Pixbuf> pixbuf =
- Gdk::Pixbuf::create_from_file (icon_path) ;
- Gtk::IconSet icon_set (pixbuf) ;
- m_priv->icon_factory->add (stock_id, icon_set) ;
+ Gdk::Pixbuf::create_from_file (icon_path);
+ Gtk::IconSet icon_set (pixbuf);
+ m_priv->icon_factory->add (stock_id, icon_set);
}
void
DBGPerspective::add_perspective_menu_entries ()
{
string relative_path = Glib::build_filename ("menus",
- "menus.xml") ;
- string absolute_path ;
+ "menus.xml");
+ string absolute_path;
THROW_IF_FAIL (build_absolute_resource_path
- (Glib::filename_to_utf8 (relative_path), absolute_path)) ;
+ (Glib::filename_to_utf8 (relative_path), absolute_path));
m_priv->menubar_merge_id =
workbench ().get_ui_manager ()->add_ui_from_file
(Glib::filename_to_utf8 (absolute_path));
- relative_path = Glib::build_filename ("menus", "contextualmenu.xml") ;
+ relative_path = Glib::build_filename ("menus", "contextualmenu.xml");
THROW_IF_FAIL (build_absolute_resource_path
- (Glib::filename_to_utf8 (relative_path), absolute_path)) ;
+ (Glib::filename_to_utf8 (relative_path), absolute_path));
m_priv->contextual_menu_merge_id =
workbench ().get_ui_manager ()->add_ui_from_file
- (Glib::filename_to_utf8 (absolute_path)) ;
+ (Glib::filename_to_utf8 (absolute_path));
}
void
DBGPerspective::init_perspective_menu_entries ()
{
- set_show_command_view (false) ;
- set_show_target_output_view (false) ;
- set_show_log_view (false) ;
- set_show_terminal_view (true) ;
- set_show_call_stack_view (true) ;
- set_show_variables_editor_view (true) ;
- set_show_breakpoints_view (true) ;
- set_show_registers_view (true) ;
+ set_show_command_view (false);
+ set_show_target_output_view (false);
+ set_show_log_view (false);
+ set_show_terminal_view (true);
+ set_show_call_stack_view (true);
+ set_show_variables_editor_view (true);
+ set_show_breakpoints_view (true);
+ set_show_registers_view (true);
#ifdef WITH_MEMORYVIEW
- set_show_memory_view (true) ;
+ set_show_memory_view (true);
#endif // WITH_MEMORYVIEW
- m_priv->statuses_notebook->set_current_page (0) ;
+ m_priv->statuses_notebook->set_current_page (0);
}
void
DBGPerspective::add_perspective_toolbar_entries ()
{
string relative_path = Glib::build_filename ("menus",
- "toolbar.xml") ;
- string absolute_path ;
+ "toolbar.xml");
+ string absolute_path;
THROW_IF_FAIL (build_absolute_resource_path
- (Glib::filename_to_utf8 (relative_path), absolute_path)) ;
+ (Glib::filename_to_utf8 (relative_path), absolute_path));
m_priv->toolbar_merge_id =
workbench ().get_ui_manager ()->add_ui_from_file
- (Glib::filename_to_utf8 (absolute_path)) ;
+ (Glib::filename_to_utf8 (absolute_path));
}
void
DBGPerspective::init_icon_factory ()
{
- add_stock_icon (nemiver::SET_BREAKPOINT, "icons", "set-breakpoint.xpm") ;
- add_stock_icon (nemiver::LINE_POINTER, "icons", "line-pointer.png") ;
- add_stock_icon (nemiver::RUN_TO_CURSOR, "icons", "run-to-cursor.xpm") ;
- add_stock_icon (nemiver::STEP_INTO, "icons", "step-into.xpm") ;
- add_stock_icon (nemiver::STEP_OVER, "icons", "step-over.xpm") ;
- add_stock_icon (nemiver::STEP_OUT, "icons", "step-out.xpm") ;
+ add_stock_icon (nemiver::SET_BREAKPOINT, "icons", "set-breakpoint.xpm");
+ add_stock_icon (nemiver::LINE_POINTER, "icons", "line-pointer.png");
+ add_stock_icon (nemiver::RUN_TO_CURSOR, "icons", "run-to-cursor.xpm");
+ add_stock_icon (nemiver::STEP_INTO, "icons", "step-into.xpm");
+ add_stock_icon (nemiver::STEP_OVER, "icons", "step-over.xpm");
+ add_stock_icon (nemiver::STEP_OUT, "icons", "step-out.xpm");
}
void
DBGPerspective::init_actions ()
{
- Gtk::StockID nil_stock_id ("") ;
- sigc::slot<void> nil_slot ;
+ Gtk::StockID nil_stock_id ("");
+ sigc::slot<void> nil_slot;
static ui_utils::ActionEntry s_target_connected_action_entries [] = {
{
"SaveSessionMenuItemAction",
@@ -2653,7 +2655,8 @@
"RunMenuItemAction",
Gtk::Stock::GOTO_FIRST,
_("_Restart"),
- _("Restart the target, killing this process and starting a new one"),
+ _("Restart the target, killing this process "
+ "and starting a new one"),
sigc::mem_fun (*this, &DBGPerspective::on_run_action),
ActionEntry::DEFAULT,
"<shift>F5"
@@ -2713,7 +2716,8 @@
//don't translate, name will be overwritten based on context
"Toggle _Breakpoint",
_("Set/Unset a breakpoint at the current cursor location"),
- sigc::mem_fun (*this, &DBGPerspective::on_toggle_breakpoint_action),
+ sigc::mem_fun (*this,
+ &DBGPerspective::on_toggle_breakpoint_action),
ActionEntry::DEFAULT,
"F8"
},
@@ -2725,8 +2729,8 @@
_("Enable or disable the breakpoint that is set at "
"the current cursor location"),
sigc::mem_fun
- (*this,
- &DBGPerspective::on_toggle_breakpoint_enabled_action),
+ (*this,
+ &DBGPerspective::on_toggle_breakpoint_enabled_action),
ActionEntry::DEFAULT,
"<shift>F8"
},
@@ -2744,8 +2748,9 @@
nil_stock_id,
_("Set Breakpoint with dialog..."),
_("Set a breakpoint at the current line using a dialog"),
- sigc::mem_fun (*this,
- &DBGPerspective::on_set_breakpoint_using_dialog_action),
+ sigc::mem_fun
+ (*this,
+ &DBGPerspective::on_set_breakpoint_using_dialog_action),
ActionEntry::DEFAULT,
"<control><shift>B"
},
@@ -2754,7 +2759,8 @@
nil_stock_id,
_("Inspect a Variable"),
_("Inspect a global or local variable"),
- sigc::mem_fun (*this, &DBGPerspective::on_inspect_variable_action),
+ sigc::mem_fun (*this,
+ &DBGPerspective::on_inspect_variable_action),
ActionEntry::DEFAULT,
"F12"
},
@@ -2772,7 +2778,8 @@
nil_stock_id,
_("Show Global Variables"),
_("Display all global variables"),
- sigc::mem_fun(*this, &DBGPerspective::on_activate_global_variables),
+ sigc::mem_fun(*this,
+ &DBGPerspective::on_activate_global_variables),
ActionEntry::DEFAULT,
"<control>G"
},
@@ -2814,7 +2821,8 @@
nil_stock_id,
CALL_STACK_TITLE,
_("Switch to Call Stack View"),
- sigc::mem_fun(*this, &DBGPerspective::on_activate_call_stack_view),
+ sigc::mem_fun (*this,
+ &DBGPerspective::on_activate_call_stack_view),
ActionEntry::DEFAULT,
"<alt>1"
},
@@ -2823,7 +2831,8 @@
nil_stock_id,
LOCAL_VARIABLES_TITLE,
_("Switch to Variables View"),
- sigc::mem_fun(*this, &DBGPerspective::on_activate_variables_view),
+ sigc::mem_fun (*this,
+ &DBGPerspective::on_activate_variables_view),
ActionEntry::DEFAULT,
"<alt>2"
},
@@ -2832,7 +2841,8 @@
nil_stock_id,
TARGET_TERMINAL_TITLE,
_("Switch to Target Terminal View"),
- sigc::mem_fun(*this, &DBGPerspective::on_activate_target_terminal_view),
+ sigc::mem_fun (*this,
+ &DBGPerspective::on_activate_target_terminal_view),
ActionEntry::DEFAULT,
"<alt>3"
},
@@ -2841,7 +2851,8 @@
nil_stock_id,
BREAKPOINTS_TITLE,
_("Switch to Breakpoints View"),
- sigc::mem_fun(*this, &DBGPerspective::on_activate_breakpoints_view),
+ sigc::mem_fun (*this,
+ &DBGPerspective::on_activate_breakpoints_view),
ActionEntry::DEFAULT,
"<alt>4"
},
@@ -2850,7 +2861,8 @@
nil_stock_id,
REGISTERS_VIEW_TITLE,
_("Switch to Registers View"),
- sigc::mem_fun(*this, &DBGPerspective::on_activate_registers_view),
+ sigc::mem_fun (*this,
+ &DBGPerspective::on_activate_registers_view),
ActionEntry::DEFAULT,
"<alt>5"
},
@@ -2860,7 +2872,7 @@
nil_stock_id,
MEMORY_VIEW_TITLE,
_("Switch to Memory View"),
- sigc::mem_fun(*this, &DBGPerspective::on_activate_memory_view),
+ sigc::mem_fun (*this, &DBGPerspective::on_activate_memory_view),
ActionEntry::DEFAULT,
"<alt>6"
},
@@ -2888,7 +2900,8 @@
nil_stock_id,
_("Show Output"),
_("Show the debugged target output tab"),
- sigc::mem_fun (*this, &DBGPerspective::on_show_target_output_action),
+ sigc::mem_fun (*this,
+ &DBGPerspective::on_show_target_output_action),
ActionEntry::TOGGLE,
""
},
@@ -2945,8 +2958,9 @@
Gtk::Stock::NETWORK,
_("_Connect to Remote Target..."),
_("Connect to a debugging server to debug a remote target"),
- sigc::mem_fun (*this,
- &DBGPerspective::on_connect_to_remote_target_action),
+ sigc::mem_fun
+ (*this,
+ &DBGPerspective::on_connect_to_remote_target_action),
ActionEntry::DEFAULT,
""
},
@@ -2965,8 +2979,9 @@
Gtk::Stock::PREFERENCES,
_("_Preferences"),
_("Edit the properties of the current session"),
- sigc::mem_fun (*this,
- &DBGPerspective::on_current_session_properties_action),
+ sigc::mem_fun
+ (*this,
+ &DBGPerspective::on_current_session_properties_action),
ActionEntry::DEFAULT,
""
}
@@ -3003,179 +3018,187 @@
};
m_priv->target_connected_action_group =
- Gtk::ActionGroup::create ("target-connected-action-group") ;
- m_priv->target_connected_action_group->set_sensitive (false) ;
+ Gtk::ActionGroup::create ("target-connected-action-group");
+ m_priv->target_connected_action_group->set_sensitive (false);
m_priv->target_not_started_action_group =
- Gtk::ActionGroup::create ("target-not-started-action-group") ;
- m_priv->target_not_started_action_group->set_sensitive (false) ;
+ Gtk::ActionGroup::create ("target-not-started-action-group");
+ m_priv->target_not_started_action_group->set_sensitive (false);
m_priv->debugger_ready_action_group =
- Gtk::ActionGroup::create ("debugger-ready-action-group") ;
- m_priv->debugger_ready_action_group->set_sensitive (false) ;
+ Gtk::ActionGroup::create ("debugger-ready-action-group");
+ m_priv->debugger_ready_action_group->set_sensitive (false);
m_priv->debugger_busy_action_group =
- Gtk::ActionGroup::create ("debugger-busy-action-group") ;
- m_priv->debugger_busy_action_group->set_sensitive (false) ;
+ Gtk::ActionGroup::create ("debugger-busy-action-group");
+ m_priv->debugger_busy_action_group->set_sensitive (false);
m_priv->default_action_group =
- Gtk::ActionGroup::create ("debugger-default-action-group") ;
- m_priv->default_action_group->set_sensitive (true) ;
+ Gtk::ActionGroup::create ("debugger-default-action-group");
+ m_priv->default_action_group->set_sensitive (true);
m_priv->opened_file_action_group =
- Gtk::ActionGroup::create ("opened-file-action-group") ;
- m_priv->opened_file_action_group->set_sensitive (false) ;
+ Gtk::ActionGroup::create ("opened-file-action-group");
+ m_priv->opened_file_action_group->set_sensitive (false);
int num_actions =
- sizeof (s_target_connected_action_entries)/sizeof (ui_utils::ActionEntry);
+ sizeof (s_target_connected_action_entries)
+ /
+ sizeof (ui_utils::ActionEntry);
ui_utils::add_action_entries_to_action_group
(s_target_connected_action_entries,
num_actions,
- m_priv->target_connected_action_group) ;
+ m_priv->target_connected_action_group);
num_actions =
- sizeof (s_target_not_started_action_entries)/sizeof (ui_utils::ActionEntry);
+ sizeof (s_target_not_started_action_entries)
+ /
+ sizeof (ui_utils::ActionEntry);
ui_utils::add_action_entries_to_action_group
(s_target_not_started_action_entries,
num_actions,
- m_priv->target_not_started_action_group) ;
+ m_priv->target_not_started_action_group);
num_actions =
- sizeof (s_debugger_ready_action_entries)/sizeof (ui_utils::ActionEntry) ;
+ sizeof (s_debugger_ready_action_entries)
+ /
+ sizeof (ui_utils::ActionEntry);
ui_utils::add_action_entries_to_action_group
(s_debugger_ready_action_entries,
num_actions,
- m_priv->debugger_ready_action_group) ;
+ m_priv->debugger_ready_action_group);
num_actions =
- sizeof (s_debugger_busy_action_entries)/sizeof (ui_utils::ActionEntry) ;
+ sizeof (s_debugger_busy_action_entries)
+ /
+ sizeof (ui_utils::ActionEntry);
ui_utils::add_action_entries_to_action_group
(s_debugger_busy_action_entries,
num_actions,
- m_priv->debugger_busy_action_group) ;
+ m_priv->debugger_busy_action_group);
num_actions =
- sizeof (s_default_action_entries)/sizeof (ui_utils::ActionEntry) ;
+ sizeof (s_default_action_entries)/sizeof (ui_utils::ActionEntry);
ui_utils::add_action_entries_to_action_group
(s_default_action_entries,
num_actions,
- m_priv->default_action_group) ;
+ m_priv->default_action_group);
num_actions =
- sizeof (s_file_opened_action_entries)/sizeof (ui_utils::ActionEntry) ;
+ sizeof (s_file_opened_action_entries)/sizeof (ui_utils::ActionEntry);
ui_utils::add_action_entries_to_action_group
(s_file_opened_action_entries,
num_actions,
- m_priv->opened_file_action_group) ;
+ m_priv->opened_file_action_group);
workbench ().get_ui_manager ()->insert_action_group
- (m_priv->target_connected_action_group);
+ (m_priv->target_connected_action_group);
workbench ().get_ui_manager ()->insert_action_group
- (m_priv->target_not_started_action_group);
+ (m_priv->target_not_started_action_group);
workbench ().get_ui_manager ()->insert_action_group
- (m_priv->debugger_busy_action_group) ;
+ (m_priv->debugger_busy_action_group);
workbench ().get_ui_manager ()->insert_action_group
- (m_priv->debugger_ready_action_group);
+ (m_priv->debugger_ready_action_group);
workbench ().get_ui_manager ()->insert_action_group
- (m_priv->default_action_group);
+ (m_priv->default_action_group);
workbench ().get_ui_manager ()->insert_action_group
- (m_priv->opened_file_action_group);
+ (m_priv->opened_file_action_group);
workbench ().get_root_window ().add_accel_group
- (workbench ().get_ui_manager ()->get_accel_group ()) ;
+ (workbench ().get_ui_manager ()->get_accel_group ());
}
-
void
DBGPerspective::init_toolbar ()
{
- add_perspective_toolbar_entries () ;
+ add_perspective_toolbar_entries ();
- m_priv->throbber = SpinnerToolItem::create () ;
- m_priv->toolbar.reset ((new Gtk::HBox)) ;
- THROW_IF_FAIL (m_priv->toolbar) ;
+ m_priv->throbber = SpinnerToolItem::create ();
+ m_priv->toolbar.reset ((new Gtk::HBox));
+ THROW_IF_FAIL (m_priv->toolbar);
Gtk::Toolbar *glade_toolbar = dynamic_cast<Gtk::Toolbar*>
- (workbench ().get_ui_manager ()->get_widget ("/ToolBar")) ;
- THROW_IF_FAIL (glade_toolbar) ;
- Gtk::SeparatorToolItem *sep = Gtk::manage (new Gtk::SeparatorToolItem) ;
- gtk_separator_tool_item_set_draw (sep->gobj (), false) ;
- sep->set_expand (true) ;
- glade_toolbar->insert (*sep, -1) ;
- glade_toolbar->insert (m_priv->throbber->get_widget (), -1) ;
+ (workbench ().get_ui_manager ()->get_widget ("/ToolBar"));
+ THROW_IF_FAIL (glade_toolbar);
+ Gtk::SeparatorToolItem *sep = Gtk::manage (new Gtk::SeparatorToolItem);
+ gtk_separator_tool_item_set_draw (sep->gobj (), false);
+ sep->set_expand (true);
+ glade_toolbar->insert (*sep, -1);
+ glade_toolbar->insert (m_priv->throbber->get_widget (), -1);
m_priv->toolbar->pack_start (*glade_toolbar);
- m_priv->toolbar->show_all () ;
+ m_priv->toolbar->show_all ();
}
void
DBGPerspective::init_body ()
{
string relative_path = Glib::build_filename ("glade",
- "bodycontainer.glade") ;
- string absolute_path ;
+ "bodycontainer.glade");
+ string absolute_path;
THROW_IF_FAIL (build_absolute_resource_path
- (Glib::filename_to_utf8 (relative_path), absolute_path)) ;
- m_priv->body_glade = Gnome::Glade::Xml::create (absolute_path) ;
+ (Glib::filename_to_utf8 (relative_path), absolute_path));
+ m_priv->body_glade = Gnome::Glade::Xml::create (absolute_path);
m_priv->body_window.reset
(ui_utils::get_widget_from_glade<Gtk::Window> (m_priv->body_glade,
- "bodycontainer")) ;
+ "bodycontainer"));
m_priv->top_box =
ui_utils::get_widget_from_glade<Gtk::Box> (m_priv->body_glade,
- "topbox") ;
+ "topbox");
m_priv->body_main_paned.reset
(ui_utils::get_widget_from_glade<Gtk::Paned> (m_priv->body_glade,
- "mainbodypaned")) ;
+ "mainbodypaned"));
// set the position of the status pane to the last saved position
- IConfMgr &conf_mgr = get_conf_mgr () ;
+ IConfMgr &conf_mgr = get_conf_mgr ();
int pane_location = -1; // don't specifically set a location
// if we can't read the last location from gconf
- conf_mgr.get_key_value (CONF_KEY_STATUS_PANE_LOCATION, pane_location) ;
+ conf_mgr.get_key_value (CONF_KEY_STATUS_PANE_LOCATION, pane_location);
if (pane_location > 0) {
m_priv->body_main_paned->set_position (pane_location);
}
m_priv->sourceviews_notebook =
ui_utils::get_widget_from_glade<Gtk::Notebook> (m_priv->body_glade,
- "sourceviewsnotebook") ;
- m_priv->sourceviews_notebook->remove_page () ;
- m_priv->sourceviews_notebook->set_show_tabs () ;
- m_priv->sourceviews_notebook->set_scrollable () ;
+ "sourceviewsnotebook");
+ m_priv->sourceviews_notebook->remove_page ();
+ m_priv->sourceviews_notebook->set_show_tabs ();
+ m_priv->sourceviews_notebook->set_scrollable ();
m_priv->statuses_notebook =
ui_utils::get_widget_from_glade<Gtk::Notebook> (m_priv->body_glade,
- "statusesnotebook") ;
- int width=100, height=70 ;
- conf_mgr.get_key_value (CONF_KEY_STATUS_WIDGET_MINIMUM_WIDTH, width) ;
- conf_mgr.get_key_value (CONF_KEY_STATUS_WIDGET_MINIMUM_HEIGHT, height) ;
+ "statusesnotebook");
+ int width=100, height=70;
+ conf_mgr.get_key_value (CONF_KEY_STATUS_WIDGET_MINIMUM_WIDTH, width);
+ conf_mgr.get_key_value (CONF_KEY_STATUS_WIDGET_MINIMUM_HEIGHT, height);
LOG_DD ("setting status widget min size: width: "
<< width
<< ", height: "
- << height) ;
- m_priv->statuses_notebook->set_size_request (width, height) ;
+ << height);
+ m_priv->statuses_notebook->set_size_request (width, height);
- m_priv->command_view.reset (new Gtk::TextView) ;
- THROW_IF_FAIL (m_priv->command_view) ;
- get_command_view_scrolled_win ().add (*m_priv->command_view) ;
- m_priv->command_view->set_editable (true) ;
- m_priv->command_view->get_buffer ()->signal_insert ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_insert_in_command_view_signal)) ;
+ m_priv->command_view.reset (new Gtk::TextView);
+ THROW_IF_FAIL (m_priv->command_view);
+ get_command_view_scrolled_win ().add (*m_priv->command_view);
+ m_priv->command_view->set_editable (true);
+ m_priv->command_view->get_buffer ()
+ ->signal_insert ().connect (sigc::mem_fun
+ (*this, &DBGPerspective::on_insert_in_command_view_signal));
m_priv->target_output_view.reset (new Gtk::TextView);
- THROW_IF_FAIL (m_priv->target_output_view) ;
- get_target_output_view_scrolled_win ().add (*m_priv->target_output_view) ;
- m_priv->target_output_view->set_editable (false) ;
-
- m_priv->log_view.reset (new Gtk::TextView) ;
- get_log_view_scrolled_win ().add (*m_priv->log_view) ;
- m_priv->log_view->set_editable (false) ;
-
- get_thread_list_scrolled_win ().add (get_thread_list ().widget ()) ;
- get_call_stack_paned ().add1 (get_thread_list_scrolled_win ()) ;
- get_call_stack_scrolled_win ().add (get_call_stack ().widget ()) ;
- get_call_stack_paned ().add2 (get_call_stack_scrolled_win ()) ;
+ THROW_IF_FAIL (m_priv->target_output_view);
+ get_target_output_view_scrolled_win ().add (*m_priv->target_output_view);
+ m_priv->target_output_view->set_editable (false);
+
+ m_priv->log_view.reset (new Gtk::TextView);
+ get_log_view_scrolled_win ().add (*m_priv->log_view);
+ m_priv->log_view->set_editable (false);
+
+ get_thread_list_scrolled_win ().add (get_thread_list ().widget ());
+ get_call_stack_paned ().add1 (get_thread_list_scrolled_win ());
+ get_call_stack_scrolled_win ().add (get_call_stack ().widget ());
+ get_call_stack_paned ().add2 (get_call_stack_scrolled_win ());
get_local_vars_inspector_scrolled_win ().add
(get_local_vars_inspector ().widget ());
get_breakpoints_scrolled_win ().add (get_breakpoints_view ().widget());
@@ -3183,36 +3206,37 @@
//unparent the body_main_paned, so that we can pack it
//in the workbench later
- m_priv->top_box->remove (*m_priv->body_main_paned) ;
- m_priv->body_main_paned->show_all () ;
+ m_priv->top_box->remove (*m_priv->body_main_paned);
+ m_priv->body_main_paned->show_all ();
//must be last
- init_perspective_menu_entries () ;
+ init_perspective_menu_entries ();
}
void
DBGPerspective::init_signals ()
{
m_priv->sourceviews_notebook->signal_switch_page ().connect
- (sigc::mem_fun (*this, &DBGPerspective::on_switch_page_signal)) ;
+ (sigc::mem_fun (*this, &DBGPerspective::on_switch_page_signal));
debugger_ready_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_debugger_ready_signal)) ;
+ (*this, &DBGPerspective::on_debugger_ready_signal));
debugger_not_started_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_debugger_not_started_signal)) ;
+ (*this, &DBGPerspective::on_debugger_not_started_signal));
going_to_run_target_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_going_to_run_target_signal)) ;
+ (*this, &DBGPerspective::on_going_to_run_target_signal));
attached_to_target_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_attached_to_target_signal)) ;
+ (*this, &DBGPerspective::on_attached_to_target_signal));
show_command_view_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_show_command_view_changed_signal)) ;
+ (*this, &DBGPerspective::on_show_command_view_changed_signal));
show_target_output_view_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_show_target_output_view_changed_signal));
+ (*this,
+ &DBGPerspective::on_show_target_output_view_changed_signal));
show_log_view_signal ().connect (sigc::mem_fun
(*this, &DBGPerspective::on_show_log_view_changed_signal));
@@ -3221,10 +3245,11 @@
(sigc::mem_fun (*this, &DBGPerspective::on_frame_selected_signal));
get_breakpoints_view ().go_to_breakpoint_signal ().connect
- (sigc::mem_fun (*this, &DBGPerspective::on_breakpoint_go_to_source_action));
+ (sigc::mem_fun (*this,
+ &DBGPerspective::on_breakpoint_go_to_source_action));
get_thread_list ().thread_selected_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_thread_list_thread_selected_signal)) ;
+ (*this, &DBGPerspective::on_thread_list_thread_selected_signal));
default_config_read_signal ().connect (sigc::mem_fun (this,
&DBGPerspective::on_default_config_read));
@@ -3235,78 +3260,78 @@
{
debugger ()->connected_to_server_signal ().connect (sigc::mem_fun
(*this,
- &DBGPerspective::on_debugger_connected_to_remote_target_signal)) ;
+ &DBGPerspective::on_debugger_connected_to_remote_target_signal));
debugger ()->detached_from_target_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_debugger_detached_from_target_signal)) ;
+ (*this, &DBGPerspective::on_debugger_detached_from_target_signal));
debugger ()->console_message_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_debugger_console_message_signal)) ;
+ (*this, &DBGPerspective::on_debugger_console_message_signal));
debugger ()->target_output_message_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_debugger_target_output_message_signal)) ;
+ (*this, &DBGPerspective::on_debugger_target_output_message_signal));
debugger ()->log_message_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_debugger_log_message_signal)) ;
+ (*this, &DBGPerspective::on_debugger_log_message_signal));
debugger ()->command_done_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_debugger_command_done_signal)) ;
+ (*this, &DBGPerspective::on_debugger_command_done_signal));
debugger ()->breakpoints_set_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_debugger_breakpoints_set_signal)) ;
+ (*this, &DBGPerspective::on_debugger_breakpoints_set_signal));
debugger ()->breakpoint_deleted_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_debugger_breakpoint_deleted_signal)) ;
+ (*this, &DBGPerspective::on_debugger_breakpoint_deleted_signal));
debugger ()->got_overloads_choice_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_debugger_got_overloads_choice_signal)) ;
+ (*this, &DBGPerspective::on_debugger_got_overloads_choice_signal));
debugger ()->stopped_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_debugger_stopped_signal)) ;
+ (*this, &DBGPerspective::on_debugger_stopped_signal));
debugger ()->program_finished_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_program_finished_signal)) ;
+ (*this, &DBGPerspective::on_program_finished_signal));
debugger ()->running_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_debugger_running_signal)) ;
+ (*this, &DBGPerspective::on_debugger_running_signal));
debugger ()->signal_received_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_signal_received_by_target_signal)) ;
+ (*this, &DBGPerspective::on_signal_received_by_target_signal));
debugger ()->error_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_debugger_error_signal)) ;
+ (*this, &DBGPerspective::on_debugger_error_signal));
debugger ()->state_changed_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_debugger_state_changed_signal)) ;
+ (*this, &DBGPerspective::on_debugger_state_changed_signal));
debugger ()->variable_value_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_debugger_variable_value_signal)) ;
+ (*this, &DBGPerspective::on_debugger_variable_value_signal));
debugger ()->got_target_info_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_debugger_got_target_info_signal)) ;
+ (*this, &DBGPerspective::on_debugger_got_target_info_signal));
}
void
DBGPerspective::clear_status_notebook ()
{
- get_thread_list ().clear () ;
- get_call_stack ().clear () ;
- get_local_vars_inspector ().re_init_widget () ;
- get_breakpoints_view ().clear () ;
- get_registers_view ().clear () ;
+ get_thread_list ().clear ();
+ get_call_stack ().clear ();
+ get_local_vars_inspector ().re_init_widget ();
+ get_breakpoints_view ().clear ();
+ get_registers_view ().clear ();
#ifdef WITH_MEMORYVIEW
- get_memory_view ().clear () ;
+ get_memory_view ().clear ();
#endif // WITH_MEMORYVIEW
}
void
DBGPerspective::clear_session_data ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
- m_priv->env_variables.clear () ;
- m_priv->search_paths.clear () ;
- m_priv->breakpoints.clear () ;
- m_priv->source_dirs.clear () ;
+ m_priv->env_variables.clear ();
+ m_priv->search_paths.clear ();
+ m_priv->breakpoints.clear ();
+ m_priv->source_dirs.clear ();
}
void
@@ -3317,74 +3342,75 @@
if (m_priv->path_2_pagenum_map.find (a_path)
!= m_priv->path_2_pagenum_map.end ()) {
- THROW (UString ("File of '") + a_path + "' is already loaded") ;
+ THROW (UString ("File of '") + a_path + "' is already loaded");
}
UString basename = Glib::filename_to_utf8
- (Glib::path_get_basename (Glib::filename_from_utf8 (a_path))) ;
+ (Glib::path_get_basename (Glib::filename_from_utf8 (a_path)));
SafePtr<Gtk::Label> label (Gtk::manage
- (new Gtk::Label (basename))) ;
+ (new Gtk::Label (basename)));
SafePtr<Gtk::Image> cicon (manage
(new Gtk::Image (Gtk::StockID (Gtk::Stock::CLOSE),
- Gtk::ICON_SIZE_MENU))) ;
+ Gtk::ICON_SIZE_MENU)));
- SafePtr<SlotedButton> close_button (Gtk::manage (new SlotedButton ())) ;
+ SafePtr<SlotedButton> close_button (Gtk::manage (new SlotedButton ()));
//okay, make the button as small as possible.
close_button->get_modifier_style ()->set_xthickness (0);
close_button->get_modifier_style ()->set_ythickness (0);
- int w=0, h=0 ;
- Gtk::IconSize::lookup (Gtk::ICON_SIZE_MENU, w, h) ;
- close_button->set_size_request (w+2, h+2) ;
-
- close_button->perspective = this ;
- close_button->set_relief (Gtk::RELIEF_NONE) ;
- close_button->set_focus_on_click (false) ;
- close_button->add (*cicon) ;
- close_button->file_path = a_path ;
+ int w=0, h=0;
+ Gtk::IconSize::lookup (Gtk::ICON_SIZE_MENU, w, h);
+ close_button->set_size_request (w+2, h+2);
+
+ close_button->perspective = this;
+ close_button->set_relief (Gtk::RELIEF_NONE);
+ close_button->set_focus_on_click (false);
+ close_button->add (*cicon);
+ close_button->file_path = a_path;
close_button->signal_clicked ().connect
- (sigc::mem_fun (*close_button, &SlotedButton::on_clicked)) ;
- close_button->tooltips.reset (new Gtk::Tooltips) ;
+ (sigc::mem_fun (*close_button, &SlotedButton::on_clicked));
+ close_button->tooltips.reset (new Gtk::Tooltips);
UString message;
- message.printf (_("Close %s"), a_path.c_str ()) ;
+ message.printf (_("Close %s"), a_path.c_str ());
close_button->tooltips->set_tip (*close_button, message);
- SafePtr<Gtk::Table> table (Gtk::manage (new Gtk::Table (1, 2))) ;
+ SafePtr<Gtk::Table> table (Gtk::manage (new Gtk::Table (1, 2)));
// add a bit of space between the label and the close button
table->set_col_spacings (4);
- Gtk::EventBox *event_box = Gtk::manage (new Gtk::EventBox) ;
+ Gtk::EventBox *event_box = Gtk::manage (new Gtk::EventBox);
event_box->set_visible_window (false);
- event_box->add (*label) ;
- table->attach (*event_box, 0, 1, 0, 1) ;
- table->attach (*close_button, 1, 2, 0, 1) ;
- close_button->tooltips->set_tip (*event_box, a_path) ;
- table->show_all () ;
+ event_box->add (*label);
+ table->attach (*event_box, 0, 1, 0, 1);
+ table->attach (*close_button, 1, 2, 0, 1);
+ close_button->tooltips->set_tip (*event_box, a_path);
+ table->show_all ();
int page_num = m_priv->sourceviews_notebook->insert_page (a_sv,
*table,
-1);
std::string base_name =
- Glib::path_get_basename (Glib::filename_from_utf8 (a_path));
- THROW_IF_FAIL (base_name != "") ;
- m_priv->basename_2_pagenum_map[Glib::filename_to_utf8 (base_name)]=page_num;
- m_priv->path_2_pagenum_map[a_path] = page_num ;
+ Glib::path_get_basename (Glib::filename_from_utf8 (a_path));
+ THROW_IF_FAIL (base_name != "");
+ m_priv->basename_2_pagenum_map[Glib::filename_to_utf8 (base_name)] =
+ page_num;
+ m_priv->path_2_pagenum_map[a_path] = page_num;
m_priv->pagenum_2_source_editor_map[page_num] = &a_sv;
- m_priv->pagenum_2_path_map[page_num] = a_path ;
+ m_priv->pagenum_2_path_map[page_num] = a_path;
if (!do_monitor_file (a_path)) {
- LOG_ERROR ("Failed to start monitoring file: " << a_path) ;
+ LOG_ERROR ("Failed to start monitoring file: " << a_path);
}
- table.release () ;
- close_button.release () ;
- label.release () ;
- cicon.release () ;
+ table.release ();
+ close_button.release ();
+ label.release ();
+ cicon.release ();
}
SourceEditor*
DBGPerspective::get_current_source_editor ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->sourceviews_notebook) {
LOG_ERROR ("NULL m_priv->sourceviews_notebook");
@@ -3394,56 +3420,56 @@
if (m_priv->sourceviews_notebook
&& !m_priv->sourceviews_notebook->get_n_pages ()) {
LOG_ERROR ("Empty m_priv->sourceviews_notebook");
- return NULL ;
+ return NULL;
}
LOG_DD ("current pagenum: "
<< m_priv->current_page_num);
- map<int, SourceEditor*>::iterator iter, nil ;
- nil = m_priv->pagenum_2_source_editor_map.end () ;
+ map<int, SourceEditor*>::iterator iter, nil;
+ nil = m_priv->pagenum_2_source_editor_map.end ();
iter = m_priv->pagenum_2_source_editor_map.find
- (m_priv->current_page_num) ;
+ (m_priv->current_page_num);
if (iter == nil) {
LOG_ERROR ("Could not find page num: "
<< m_priv->current_page_num);
- return NULL ;
+ return NULL;
}
- return iter->second ;
+ return iter->second;
}
ISessMgr*
DBGPerspective::session_manager_ptr ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->session_manager) {
- m_priv->session_manager = ISessMgr::create (plugin_path ()) ;
- THROW_IF_FAIL (m_priv->session_manager) ;
+ m_priv->session_manager = ISessMgr::create (plugin_path ());
+ THROW_IF_FAIL (m_priv->session_manager);
}
- return m_priv->session_manager.get () ;
+ return m_priv->session_manager.get ();
}
UString
DBGPerspective::get_current_file_path ()
{
- SourceEditor *source_editor = get_current_source_editor () ;
+ SourceEditor *source_editor = get_current_source_editor ();
if (!source_editor) {return "";}
- UString path ;
- source_editor->get_path (path) ;
- return path ;
+ UString path;
+ source_editor->get_path (path);
+ return path;
}
SourceEditor*
DBGPerspective::get_source_editor_from_path (const UString &a_path,
bool a_basename_only)
{
- UString actual_file_path ;
+ UString actual_file_path;
return get_source_editor_from_path (a_path,
actual_file_path,
- a_basename_only) ;
+ a_basename_only);
}
SourceEditor*
@@ -3453,63 +3479,63 @@
{
LOG_FUNCTION_SCOPE_NORMAL_DD
- LOG_DD ("a_path: " << a_path) ;
- LOG_DD ("a_basename_only" << (int) a_basename_only) ;
+ LOG_DD ("a_path: " << a_path);
+ LOG_DD ("a_basename_only" << (int) a_basename_only);
if (a_path == "") {return 0;}
- map<UString, int>::iterator iter, nil ;
+ map<UString, int>::iterator iter, nil;
SourceEditor *result=0;
if (a_basename_only) {
std::string basename =
- Glib::path_get_basename (Glib::filename_from_utf8 (a_path)) ;
- THROW_IF_FAIL (basename != "") ;
+ Glib::path_get_basename (Glib::filename_from_utf8 (a_path));
+ THROW_IF_FAIL (basename != "");
iter = m_priv->basename_2_pagenum_map.find
- (Glib::filename_to_utf8 (basename));
- nil = m_priv->basename_2_pagenum_map.end () ;
- result = m_priv->pagenum_2_source_editor_map[iter->second] ;
+ (Glib::filename_to_utf8 (basename));
+ nil = m_priv->basename_2_pagenum_map.end ();
+ result = m_priv->pagenum_2_source_editor_map[iter->second];
} else {
- iter = m_priv->path_2_pagenum_map.find (a_path) ;
- nil = m_priv->path_2_pagenum_map.end () ;
- result = m_priv->pagenum_2_source_editor_map[iter->second] ;
+ iter = m_priv->path_2_pagenum_map.find (a_path);
+ nil = m_priv->path_2_pagenum_map.end ();
+ result = m_priv->pagenum_2_source_editor_map[iter->second];
}
if (iter == nil) {
- return 0 ;
+ return 0;
}
- THROW_IF_FAIL (result) ;
- result->get_path (a_actual_file_path) ;
- return result ;
+ THROW_IF_FAIL (result);
+ result->get_path (a_actual_file_path);
+ return result;
}
IWorkbench&
DBGPerspective::workbench () const
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->workbench) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->workbench);
- return *m_priv->workbench ;
+ return *m_priv->workbench;
}
void
DBGPerspective::bring_source_as_current (const UString &a_path)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
- LOG_DD ("file path: '" << a_path << "'") ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
+ LOG_DD ("file path: '" << a_path << "'");
- SourceEditor *source_editor = get_source_editor_from_path (a_path) ;
+ SourceEditor *source_editor = get_source_editor_from_path (a_path);
if (!source_editor) {
- open_file (a_path, -1, true) ;
+ open_file (a_path, -1, true);
}
if (!source_editor) {
- source_editor = get_source_editor_from_path (a_path, true) ;
+ source_editor = get_source_editor_from_path (a_path, true);
}
- source_editor = get_source_editor_from_path (a_path) ;
- THROW_IF_FAIL (source_editor) ;
+ source_editor = get_source_editor_from_path (a_path);
+ THROW_IF_FAIL (source_editor);
map<UString, int>::iterator iter =
- m_priv->path_2_pagenum_map.find (a_path) ;
- THROW_IF_FAIL (iter != m_priv->path_2_pagenum_map.end ()) ;
- m_priv->sourceviews_notebook->set_current_page (iter->second) ;
+ m_priv->path_2_pagenum_map.find (a_path);
+ THROW_IF_FAIL (iter != m_priv->path_2_pagenum_map.end ());
+ m_priv->sourceviews_notebook->set_current_page (iter->second);
}
void
@@ -3517,39 +3543,40 @@
int a_line,
bool a_do_scroll)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
- bring_source_as_current (a_path) ;
- SourceEditor *source_editor = get_source_editor_from_path (a_path) ;
+ bring_source_as_current (a_path);
+ SourceEditor *source_editor = get_source_editor_from_path (a_path);
if (!source_editor) {
- source_editor = get_source_editor_from_path (a_path, true) ;
+ source_editor = get_source_editor_from_path (a_path, true);
}
- THROW_IF_FAIL (source_editor) ;
- source_editor->move_where_marker_to_line (a_line, a_do_scroll) ;
+ THROW_IF_FAIL (source_editor);
+ source_editor->move_where_marker_to_line (a_line, a_do_scroll);
Gtk::TextBuffer::iterator iter =
- source_editor->source_view().get_buffer ()->get_iter_at_line (a_line-1) ;
+ source_editor->source_view ()
+ .get_buffer ()->get_iter_at_line (a_line-1);
if (!iter) {
return;
}
- source_editor->source_view().get_buffer ()->place_cursor (iter) ;
+ source_editor->source_view().get_buffer ()->place_cursor (iter);
}
void
DBGPerspective::unset_where ()
{
- map<int, SourceEditor*>::iterator iter ;
+ map<int, SourceEditor*>::iterator iter;
for (iter = m_priv->pagenum_2_source_editor_map.begin ();
iter !=m_priv->pagenum_2_source_editor_map.end ();
++iter) {
if (!(iter->second)) {continue;}
- iter->second->unset_where_marker () ;
+ iter->second->unset_where_marker ();
}
}
Gtk::Widget*
DBGPerspective::get_contextual_menu ()
{
- THROW_IF_FAIL (m_priv && m_priv->contextual_menu_merge_id) ;
+ THROW_IF_FAIL (m_priv && m_priv->contextual_menu_merge_id);
if (!m_priv->contextual_menu) {
@@ -3559,10 +3586,10 @@
"InspectVariableMenuItem",
"InspectVariableMenuItemAction",
Gtk::UI_MANAGER_AUTO,
- false) ;
+ false);
workbench ().get_ui_manager ()->add_ui_separator
- (m_priv->contextual_menu_merge_id, "/ContextualMenu") ;
+ (m_priv->contextual_menu_merge_id, "/ContextualMenu");
workbench ().get_ui_manager ()->add_ui
(m_priv->contextual_menu_merge_id,
@@ -3570,7 +3597,7 @@
"ToggleBreakPointMenuItem",
"ToggleBreakPointMenuItemAction",
Gtk::UI_MANAGER_AUTO,
- false) ;
+ false);
workbench ().get_ui_manager ()->add_ui
(m_priv->contextual_menu_merge_id,
@@ -3578,7 +3605,7 @@
"ToggleEnableBreakPointMenuItem",
"ToggleEnableBreakPointMenuItemAction",
Gtk::UI_MANAGER_AUTO,
- false) ;
+ false);
workbench ().get_ui_manager ()->add_ui
(m_priv->contextual_menu_merge_id,
@@ -3586,7 +3613,7 @@
"NextMenuItem",
"NextMenuItemAction",
Gtk::UI_MANAGER_AUTO,
- false) ;
+ false);
workbench ().get_ui_manager ()->add_ui
(m_priv->contextual_menu_merge_id,
@@ -3594,7 +3621,7 @@
"StepMenuItem",
"StepMenuItemAction",
Gtk::UI_MANAGER_AUTO,
- false) ;
+ false);
workbench ().get_ui_manager ()->add_ui
(m_priv->contextual_menu_merge_id,
@@ -3602,7 +3629,7 @@
"StepOutMenuItem",
"StepOutMenuItemAction",
Gtk::UI_MANAGER_AUTO,
- false) ;
+ false);
workbench ().get_ui_manager ()->add_ui
(m_priv->contextual_menu_merge_id,
@@ -3610,7 +3637,7 @@
"ContinueMenuItem",
"ContinueMenuItemAction",
Gtk::UI_MANAGER_AUTO,
- false) ;
+ false);
workbench ().get_ui_manager ()->add_ui
(m_priv->contextual_menu_merge_id,
@@ -3618,7 +3645,7 @@
"ContinueUntilMenuItem",
"ContinueUntilMenuItemAction",
Gtk::UI_MANAGER_AUTO,
- false) ;
+ false);
workbench ().get_ui_manager ()->add_ui
(m_priv->contextual_menu_merge_id,
@@ -3626,7 +3653,7 @@
"StopMenuItem",
"StopMenuItemAction",
Gtk::UI_MANAGER_AUTO,
- false) ;
+ false);
workbench ().get_ui_manager ()->add_ui
(m_priv->contextual_menu_merge_id,
@@ -3634,11 +3661,11 @@
"RunMenuItem",
"RunMenuItemAction",
Gtk::UI_MANAGER_AUTO,
- false) ;
+ false);
workbench ().get_ui_manager ()->add_ui_separator
(m_priv->contextual_menu_merge_id,
- "/ContextualMenu") ;
+ "/ContextualMenu");
workbench ().get_ui_manager ()->add_ui
(m_priv->contextual_menu_merge_id,
@@ -3646,7 +3673,7 @@
"FindMenutItem",
"FindMenuItemAction",
Gtk::UI_MANAGER_AUTO,
- false) ;
+ false);
workbench ().get_ui_manager ()->add_ui
(m_priv->contextual_menu_merge_id,
@@ -3654,7 +3681,7 @@
"ReloadSourceMenutItem",
"ReloadSourceMenuItemAction",
Gtk::UI_MANAGER_AUTO,
- false) ;
+ false);
workbench ().get_ui_manager ()->add_ui
(m_priv->contextual_menu_merge_id,
@@ -3662,29 +3689,29 @@
"RefreshLocalVariablesMenuItem",
"RefreshLocalVariablesMenuItemAction",
Gtk::UI_MANAGER_AUTO,
- false) ;
+ false);
- workbench ().get_ui_manager ()->ensure_update () ;
+ workbench ().get_ui_manager ()->ensure_update ();
m_priv->contextual_menu =
workbench ().get_ui_manager ()->get_widget
- ("/ContextualMenu") ;
- THROW_IF_FAIL (m_priv->contextual_menu) ;
+ ("/ContextualMenu");
+ THROW_IF_FAIL (m_priv->contextual_menu);
}
- return m_priv->contextual_menu ;
+ return m_priv->contextual_menu;
}
Gtk::Widget*
DBGPerspective::load_menu (UString a_filename, UString a_widget_name)
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
NEMIVER_TRY
- string relative_path = Glib::build_filename ("menus", a_filename) ;
- string absolute_path ;
+ string relative_path = Glib::build_filename ("menus", a_filename);
+ string absolute_path;
THROW_IF_FAIL (build_absolute_resource_path
- (Glib::filename_to_utf8 (relative_path), absolute_path)) ;
+ (Glib::filename_to_utf8 (relative_path), absolute_path));
workbench ().get_ui_manager ()->add_ui_from_file
- (Glib::filename_to_utf8 (absolute_path)) ;
+ (Glib::filename_to_utf8 (absolute_path));
NEMIVER_CATCH
return workbench ().get_ui_manager ()->get_widget (a_widget_name);
@@ -3693,76 +3720,78 @@
ThreadList&
DBGPerspective::get_thread_list ()
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (debugger ()) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (debugger ());
if (!m_priv->thread_list) {
m_priv->thread_list.reset (new ThreadList (debugger ()));
}
- THROW_IF_FAIL (m_priv->thread_list) ;
- return *m_priv->thread_list ;
+ THROW_IF_FAIL (m_priv->thread_list);
+ return *m_priv->thread_list;
}
vector<UString>&
DBGPerspective::get_source_dirs ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (m_priv->source_dirs.empty ()) {
- read_default_config () ;
+ read_default_config ();
}
- return m_priv->source_dirs ;
+ return m_priv->source_dirs;
}
bool
DBGPerspective::find_file_in_source_dirs (const UString &a_file_name,
UString &a_file_path)
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
- string file_name = Glib::filename_from_utf8 (a_file_name), path, candidate ;
+ string file_name = Glib::filename_from_utf8 (a_file_name),
+ path,
+ candidate;
// first look in the working directory
- candidate = Glib::build_filename (m_priv->prog_cwd, file_name) ;
+ candidate = Glib::build_filename (m_priv->prog_cwd, file_name);
if (Glib::file_test (candidate, Glib::FILE_TEST_IS_REGULAR)) {
- a_file_path = Glib::filename_to_utf8 (candidate) ;
- return true ;
+ a_file_path = Glib::filename_to_utf8 (candidate);
+ return true;
}
// then look in the session-specific search paths
- list<UString>::const_iterator session_iter ;
- for (session_iter = m_priv->search_paths.begin () ;
+ list<UString>::const_iterator session_iter;
+ for (session_iter = m_priv->search_paths.begin ();
session_iter != m_priv->search_paths.end ();
++session_iter) {
- path = Glib::filename_from_utf8 (*session_iter) ;
- candidate = Glib::build_filename (path, file_name) ;
+ path = Glib::filename_from_utf8 (*session_iter);
+ candidate = Glib::build_filename (path, file_name);
if (Glib::file_test (candidate, Glib::FILE_TEST_IS_REGULAR)) {
- a_file_path = Glib::filename_to_utf8 (candidate) ;
- return true ;
+ a_file_path = Glib::filename_to_utf8 (candidate);
+ return true;
}
}
// if not found, then look in the global search paths
- vector<UString>::const_iterator global_iter ;
- for (global_iter = m_priv->source_dirs.begin () ;
+ vector<UString>::const_iterator global_iter;
+ for (global_iter = m_priv->source_dirs.begin ();
global_iter != m_priv->source_dirs.end ();
++global_iter) {
- path = Glib::filename_from_utf8 (*global_iter) ;
- candidate = Glib::build_filename (path, file_name) ;
+ path = Glib::filename_from_utf8 (*global_iter);
+ candidate = Glib::build_filename (path, file_name);
if (Glib::file_test (candidate, Glib::FILE_TEST_IS_REGULAR)) {
- a_file_path = Glib::filename_to_utf8 (candidate) ;
- return true ;
+ a_file_path = Glib::filename_to_utf8 (candidate);
+ return true;
}
}
- return false ;
+ return false;
}
bool
DBGPerspective::do_monitor_file (const UString &a_path)
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
#ifdef WITH_GIO
if (m_priv->path_2_monitor_map.find (a_path) !=
m_priv->path_2_monitor_map.end ()) {
- return false ;
+ return false;
}
Glib::RefPtr<Gio::FileMonitor> monitor;
Glib::RefPtr<Gio::File> file = Gio::File::create_for_path (a_path);
@@ -3771,64 +3800,65 @@
THROW_IF_FAIL (monitor);
monitor->signal_changed (). connect (sigc::bind (sigc::ptr_fun
(gio_file_monitor_cb), this));
- m_priv->path_2_monitor_map[a_path] = monitor ;
+ m_priv->path_2_monitor_map[a_path] = monitor;
#else
if (m_priv->path_2_monitor_map.find (a_path) !=
m_priv->path_2_monitor_map.end ()) {
- return false ;
+ return false;
}
- GnomeVFSMonitorHandle *handle=0 ;
+ GnomeVFSMonitorHandle *handle=0;
GCharSafePtr uri (gnome_vfs_get_uri_from_local_path (a_path.c_str ()));
GnomeVFSResult result = gnome_vfs_monitor_add
- (&handle, uri.get (),
- GNOME_VFS_MONITOR_FILE,
- (GnomeVFSMonitorCallback)gnome_vfs_file_monitor_cb,
- (gpointer)this) ;
+ (&handle, uri.get (),
+ GNOME_VFS_MONITOR_FILE,
+ (GnomeVFSMonitorCallback)gnome_vfs_file_monitor_cb,
+ (gpointer)this);
if (result != GNOME_VFS_OK) {
- LOG_ERROR ("failed to start monitoring file '" << a_path << "'") ;
+ LOG_ERROR ("failed to start monitoring file '" << a_path << "'");
if (handle) {
- gnome_vfs_monitor_cancel (handle) ;
- handle = 0 ;
+ gnome_vfs_monitor_cancel (handle);
+ handle = 0;
}
- return false ;
+ return false;
}
- THROW_IF_FAIL (handle) ;
- m_priv->path_2_monitor_map[a_path] = handle ;
+ THROW_IF_FAIL (handle);
+ m_priv->path_2_monitor_map[a_path] = handle;
#endif // WITH_GIO
- LOG_DD ("Monitoring file '" << Glib::filename_from_utf8 (a_path)) ;
- return true ;
+ LOG_DD ("Monitoring file '" << Glib::filename_from_utf8 (a_path));
+ return true;
}
bool
DBGPerspective::do_unmonitor_file (const UString &a_path)
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
- Priv::Path2MonitorMap::iterator it = m_priv->path_2_monitor_map.find (a_path);
+ Priv::Path2MonitorMap::iterator it =
+ m_priv->path_2_monitor_map.find (a_path);
if (it == m_priv->path_2_monitor_map.end ()) {
- return false ;
+ return false;
}
if (it->second ) {
#ifdef WITH_GIO
- it->second->cancel () ;
+ it->second->cancel ();
#else
- gnome_vfs_monitor_cancel (it->second) ;
+ gnome_vfs_monitor_cancel (it->second);
#endif // WITH_GIO
}
- m_priv->path_2_monitor_map.erase (it) ;
- return true ;
+ m_priv->path_2_monitor_map.erase (it);
+ return true;
}
void
DBGPerspective::read_default_config ()
{
- THROW_IF_FAIL (m_priv->workbench) ;
- IConfMgr &conf_mgr = get_conf_mgr () ;
+ THROW_IF_FAIL (m_priv->workbench);
+ IConfMgr &conf_mgr = get_conf_mgr ();
if (m_priv->source_dirs.empty ()) {
- UString dirs ;
- conf_mgr.get_key_value (CONF_KEY_NEMIVER_SOURCE_DIRS, dirs) ;
- LOG_DD ("got source dirs '" << dirs << "' from conf mgr") ;
- m_priv->source_dirs = dirs.split (":") ;
+ UString dirs;
+ conf_mgr.get_key_value (CONF_KEY_NEMIVER_SOURCE_DIRS, dirs);
+ LOG_DD ("got source dirs '" << dirs << "' from conf mgr");
+ m_priv->source_dirs = dirs.split (":");
LOG_DD ("that makes '" <<(int)m_priv->source_dirs.size()
<< "' dir paths");
@@ -3837,12 +3867,12 @@
conf_mgr.value_changed_signal ().connect
(sigc::mem_fun (*this,
- &DBGPerspective::on_conf_key_changed_signal)) ;
+ &DBGPerspective::on_conf_key_changed_signal));
}
conf_mgr.get_key_value (CONF_KEY_HIGHLIGHT_SOURCE_CODE,
- m_priv->enable_syntax_highlight) ;
+ m_priv->enable_syntax_highlight);
conf_mgr.get_key_value (CONF_KEY_SHOW_SOURCE_LINE_NUMBERS,
- m_priv->show_line_numbers) ;
+ m_priv->show_line_numbers);
conf_mgr.get_key_value (CONF_KEY_CONFIRM_BEFORE_RELOAD_SOURCE,
m_priv->confirm_before_reload_source);
conf_mgr.get_key_value (CONF_KEY_USE_SYSTEM_FONT,
@@ -3857,96 +3887,97 @@
int
DBGPerspective::get_n_pages ()
{
- THROW_IF_FAIL (m_priv && m_priv->sourceviews_notebook) ;
+ THROW_IF_FAIL (m_priv && m_priv->sourceviews_notebook);
- return m_priv->sourceviews_notebook->get_n_pages () ;
+ return m_priv->sourceviews_notebook->get_n_pages ();
}
void
DBGPerspective::popup_source_view_contextual_menu (GdkEventButton *a_event)
{
int buffer_x=0, buffer_y=0, line_top=0;
- Gtk::TextBuffer::iterator cur_iter ;
- UString file_name ;
+ Gtk::TextBuffer::iterator cur_iter;
+ UString file_name;
- SourceEditor *editor = get_current_source_editor () ;
- THROW_IF_FAIL (editor) ;
+ SourceEditor *editor = get_current_source_editor ();
+ THROW_IF_FAIL (editor);
editor->source_view ().window_to_buffer_coords (Gtk::TEXT_WINDOW_TEXT,
(int)a_event->x,
(int)a_event->y,
- buffer_x, buffer_y) ;
- editor->source_view ().get_line_at_y (cur_iter, buffer_y, line_top) ;
+ buffer_x, buffer_y);
+ editor->source_view ().get_line_at_y (cur_iter, buffer_y, line_top);
- editor->get_path (file_name) ;
+ editor->get_path (file_name);
- Gtk::Menu *menu = dynamic_cast<Gtk::Menu*> (get_contextual_menu ()) ;
- THROW_IF_FAIL (menu) ;
+ Gtk::Menu *menu = dynamic_cast<Gtk::Menu*> (get_contextual_menu ());
+ THROW_IF_FAIL (menu);
- Gtk::TextIter start, end ;
+ Gtk::TextIter start, end;
Glib::RefPtr<gtksourceview::SourceBuffer> buffer =
- editor->source_view ().get_source_buffer () ;
- THROW_IF_FAIL (buffer) ;
- bool has_selected_text=false ;
+ editor->source_view ().get_source_buffer ();
+ THROW_IF_FAIL (buffer);
+ bool has_selected_text=false;
if (buffer->get_selection_bounds (start, end)) {
- has_selected_text = true ;
+ has_selected_text = true;
}
- editor->source_view ().get_buffer ()->place_cursor (cur_iter) ;
+ editor->source_view ().get_buffer ()->place_cursor (cur_iter);
if (has_selected_text) {
- buffer->select_range (start, end) ;
+ buffer->select_range (start, end);
}
- menu->popup (a_event->button, a_event->time) ;
+ menu->popup (a_event->button, a_event->time);
}
void
DBGPerspective::record_and_save_new_session ()
{
- THROW_IF_FAIL (m_priv) ;
- ISessMgr::Session session ;
- record_and_save_session (session) ;
+ THROW_IF_FAIL (m_priv);
+ ISessMgr::Session session;
+ record_and_save_session (session);
}
IProcMgr*
DBGPerspective::get_process_manager ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->process_manager) {
- m_priv->process_manager = IProcMgr::create () ;
- THROW_IF_FAIL (m_priv->process_manager) ;
+ m_priv->process_manager = IProcMgr::create ();
+ THROW_IF_FAIL (m_priv->process_manager);
}
- return m_priv->process_manager.get () ;
+ return m_priv->process_manager.get ();
}
void
-DBGPerspective::try_to_request_show_variable_value_at_position (int a_x, int a_y)
+DBGPerspective::try_to_request_show_variable_value_at_position (int a_x,
+ int a_y)
{
LOG_FUNCTION_SCOPE_NORMAL_DD
- SourceEditor *editor = get_current_source_editor () ;
+ SourceEditor *editor = get_current_source_editor ();
THROW_IF_FAIL (editor);
- UString var_name ;
- Gdk::Rectangle start_rect, end_rect ;
+ UString var_name;
+ Gdk::Rectangle start_rect, end_rect;
if (!get_current_source_editor ()->get_word_at_position (a_x, a_y,
var_name,
start_rect,
end_rect)) {
- return ;
+ return;
}
if (var_name == "") {return;}
Glib::RefPtr<Gdk::Window> gdk_window =
- ((Gtk::Widget&)editor->source_view ()).get_window () ;
- THROW_IF_FAIL (gdk_window) ;
- int abs_x=0, abs_y=0 ;
- gdk_window->get_origin (abs_x, abs_y) ;
- abs_x += a_x ;
- abs_y += a_y + start_rect.get_height () / 2 ;
- m_priv->in_show_var_value_at_pos_transaction = true ;
- m_priv->var_popup_tip_x = abs_x ;
- m_priv->var_popup_tip_y = abs_y ;
- m_priv->var_to_popup = var_name ;
- debugger ()->print_variable_value (var_name) ;
+ ((Gtk::Widget&)editor->source_view ()).get_window ();
+ THROW_IF_FAIL (gdk_window);
+ int abs_x=0, abs_y=0;
+ gdk_window->get_origin (abs_x, abs_y);
+ abs_x += a_x;
+ abs_y += a_y + start_rect.get_height () / 2;
+ m_priv->in_show_var_value_at_pos_transaction = true;
+ m_priv->var_popup_tip_x = abs_x;
+ m_priv->var_popup_tip_y = abs_y;
+ m_priv->var_to_popup = var_name;
+ debugger ()->print_variable_value (var_name);
}
void
@@ -3957,99 +3988,102 @@
LOG_FUNCTION_SCOPE_NORMAL_DD
LOG_DD ("showing text in popup: '"
<< Glib::locale_from_utf8 (a_text)
- << "'") ;
- get_popup_tip ().text (a_text) ;
- get_popup_tip ().show_at_position (a_x, a_y) ;
+ << "'");
+ get_popup_tip ().text (a_text);
+ get_popup_tip ().show_at_position (a_x, a_y);
}
void
DBGPerspective::restart_mouse_immobile_timer ()
{
- LOG_FUNCTION_SCOPE_NORMAL_D (DBG_PERSPECTIVE_MOUSE_MOTION_DOMAIN) ;
+ LOG_FUNCTION_SCOPE_NORMAL_D (DBG_PERSPECTIVE_MOUSE_MOTION_DOMAIN);
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->workbench) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->workbench);
- m_priv->timeout_source_connection.disconnect () ;
- m_priv->timeout_source_connection = Glib::signal_timeout ().connect_seconds
- (sigc::mem_fun (*this, &DBGPerspective::on_mouse_immobile_timer_signal),
- 1);
- get_popup_tip ().hide () ;
+ m_priv->timeout_source_connection.disconnect ();
+ m_priv->timeout_source_connection =
+ Glib::signal_timeout ().connect_seconds
+ (sigc::mem_fun
+ (*this, &DBGPerspective::on_mouse_immobile_timer_signal),
+ 1);
+ get_popup_tip ().hide ();
}
void
DBGPerspective::stop_mouse_immobile_timer ()
{
- LOG_FUNCTION_SCOPE_NORMAL_D (DBG_PERSPECTIVE_MOUSE_MOTION_DOMAIN) ;
- THROW_IF_FAIL (m_priv) ;
- m_priv->timeout_source_connection.disconnect () ;
- get_popup_tip ().hide () ;
+ LOG_FUNCTION_SCOPE_NORMAL_D (DBG_PERSPECTIVE_MOUSE_MOTION_DOMAIN);
+ THROW_IF_FAIL (m_priv);
+ m_priv->timeout_source_connection.disconnect ();
+ get_popup_tip ().hide ();
}
PopupTip&
DBGPerspective::get_popup_tip ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->popup_tip) {
- m_priv->popup_tip.reset (new PopupTip) ;
+ m_priv->popup_tip.reset (new PopupTip);
}
- THROW_IF_FAIL (m_priv->popup_tip) ;
- return *m_priv->popup_tip ;
+ THROW_IF_FAIL (m_priv->popup_tip);
+ return *m_priv->popup_tip;
}
FindTextDialog&
DBGPerspective::get_find_text_dialog ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->find_text_dialog) {
- m_priv->find_text_dialog.reset (new FindTextDialog (plugin_path ())) ;
+ m_priv->find_text_dialog.reset (new FindTextDialog (plugin_path ()));
}
- THROW_IF_FAIL (m_priv->find_text_dialog) ;
+ THROW_IF_FAIL (m_priv->find_text_dialog);
- return *m_priv->find_text_dialog ;
+ return *m_priv->find_text_dialog;
}
void
DBGPerspective::record_and_save_session (ISessMgr::Session &a_session)
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
UString session_name = Glib::path_get_basename
- (Glib::filename_from_utf8 (m_priv->prog_path)) ;
+ (Glib::filename_from_utf8 (m_priv->prog_path));
if (session_name == "") {return;}
if (a_session.session_id ()) {
- session_manager ().clear_session (a_session.session_id ()) ;
+ session_manager ().clear_session (a_session.session_id ());
LOG_DD ("cleared current session: "
- << (int) m_priv->session.session_id ()) ;
+ << (int) m_priv->session.session_id ());
}
- UString today ;
- dateutils::get_current_datetime (today) ;
- session_name += "-" + today ;
- a_session.properties ().clear () ;
- a_session.properties ()[SESSION_NAME] = session_name ;
- a_session.properties ()[PROGRAM_NAME] = m_priv->prog_path ;
- a_session.properties ()[PROGRAM_ARGS] = m_priv->prog_args ;
- a_session.properties ()[PROGRAM_CWD] = m_priv->prog_cwd ;
+ UString today;
+ dateutils::get_current_datetime (today);
+ session_name += "-" + today;
+ a_session.properties ().clear ();
+ a_session.properties ()[SESSION_NAME] = session_name;
+ a_session.properties ()[PROGRAM_NAME] = m_priv->prog_path;
+ a_session.properties ()[PROGRAM_ARGS] = m_priv->prog_args;
+ a_session.properties ()[PROGRAM_CWD] = m_priv->prog_cwd;
GTimeVal timeval;
g_get_current_time (&timeval);
UString time;
- a_session.properties ()[LAST_RUN_TIME] = time.printf ("%ld", timeval.tv_sec);
+ a_session.properties ()[LAST_RUN_TIME] =
+ time.printf ("%ld", timeval.tv_sec);
a_session.env_variables () = m_priv->env_variables;
- a_session.opened_files ().clear () ;
+ a_session.opened_files ().clear ();
map<UString, int>::const_iterator path_iter =
- m_priv->path_2_pagenum_map.begin () ;
+ m_priv->path_2_pagenum_map.begin ();
for (;
path_iter != m_priv->path_2_pagenum_map.end ();
++path_iter) {
- a_session.opened_files ().push_back (path_iter->first) ;
+ a_session.opened_files ().push_back (path_iter->first);
}
- a_session.breakpoints ().clear () ;
- map<int, IDebugger::BreakPoint>::const_iterator break_iter ;
+ a_session.breakpoints ().clear ();
+ map<int, IDebugger::BreakPoint>::const_iterator break_iter;
for (break_iter = m_priv->breakpoints.begin ();
break_iter != m_priv->breakpoints.end ();
++break_iter) {
@@ -4060,36 +4094,37 @@
break_iter->second.condition ());
a_session.breakpoints ().push_back (bp);
}
- THROW_IF_FAIL (session_manager_ptr ()) ;
+ THROW_IF_FAIL (session_manager_ptr ());
- a_session.search_paths ().clear () ;
- list<UString>::const_iterator search_path_iter ;
+ a_session.search_paths ().clear ();
+ list<UString>::const_iterator search_path_iter;
for (search_path_iter = m_priv->search_paths.begin ();
search_path_iter != m_priv->search_paths.end ();
++search_path_iter) {
a_session.search_paths ().push_back (*search_path_iter);
}
- THROW_IF_FAIL (session_manager_ptr ()) ;
+ THROW_IF_FAIL (session_manager_ptr ());
//erase all sessions but the 5 last ones, otherwise, the number
//of debugging session stored will explode with time.
- std::list<ISessMgr::Session> sessions = session_manager_ptr ()->sessions () ;
- int nb_sessions = sessions.size () ;
+ std::list<ISessMgr::Session> sessions =
+ session_manager_ptr ()->sessions ();
+ int nb_sessions = sessions.size ();
if (nb_sessions > 5) {
- int nb_sessions_to_erase = sessions.size () - 5 ;
- std::list<ISessMgr::Session>::const_iterator it ;
- for (int i=0 ; i < nb_sessions_to_erase ; ++i) {
- THROW_IF_FAIL (sessions.begin () != sessions.end ()) ;
+ int nb_sessions_to_erase = sessions.size () - 5;
+ std::list<ISessMgr::Session>::const_iterator it;
+ for (int i=0; i < nb_sessions_to_erase; ++i) {
+ THROW_IF_FAIL (sessions.begin () != sessions.end ());
session_manager_ptr ()->delete_session
- (sessions.begin ()->session_id ()) ;
- sessions.erase (sessions.begin ()) ;
+ (sessions.begin ()->session_id ());
+ sessions.erase (sessions.begin ());
}
}
//now store the current session
session_manager_ptr ()->store_session
(a_session,
- session_manager_ptr ()->default_transaction ()) ;
+ session_manager_ptr ()->default_transaction ());
}
@@ -4106,54 +4141,55 @@
void
DBGPerspective::do_init (IWorkbench *a_workbench)
{
- THROW_IF_FAIL (m_priv) ;
- m_priv->workbench = a_workbench ;
- init_icon_factory () ;
- init_actions () ;
- init_toolbar () ;
- init_body () ;
- init_signals () ;
- init_debugger_signals () ;
- read_default_config () ;
- session_manager ().load_sessions (session_manager ().default_transaction ());
+ THROW_IF_FAIL (m_priv);
+ m_priv->workbench = a_workbench;
+ init_icon_factory ();
+ init_actions ();
+ init_toolbar ();
+ init_body ();
+ init_signals ();
+ init_debugger_signals ();
+ read_default_config ();
+ session_manager ().load_sessions
+ (session_manager ().default_transaction ());
workbench ().shutting_down_signal ().connect (sigc::mem_fun
- (*this, &DBGPerspective::on_shutdown_signal)) ;
- m_priv->initialized = true ;
+ (*this, &DBGPerspective::on_shutdown_signal));
+ m_priv->initialized = true;
}
DBGPerspective::~DBGPerspective ()
{
- LOG_D ("deleted", "destructor-domain") ;
+ LOG_D ("deleted", "destructor-domain");
}
const UString&
DBGPerspective::get_perspective_identifier ()
{
- static UString s_id = "org.nemiver.DebuggerPerspective" ;
- return s_id ;
+ static UString s_id = "org.nemiver.DebuggerPerspective";
+ return s_id;
}
void
DBGPerspective::get_toolbars (list<Gtk::Widget*> &a_tbs)
{
- CHECK_P_INIT ;
- a_tbs.push_back (m_priv->toolbar.get ()) ;
+ CHECK_P_INIT;
+ a_tbs.push_back (m_priv->toolbar.get ());
}
Gtk::Widget*
DBGPerspective::get_body ()
{
- CHECK_P_INIT ;
- return m_priv->body_main_paned.get () ;
+ CHECK_P_INIT;
+ return m_priv->body_main_paned.get ();
}
void
DBGPerspective::edit_workbench_menu ()
{
- CHECK_P_INIT ;
+ CHECK_P_INIT;
- add_perspective_menu_entries () ;
- //init_perspective_menu_entries () ;
+ add_perspective_menu_entries ();
+ //init_perspective_menu_entries ();
}
bool
@@ -4166,51 +4202,52 @@
#ifdef WITH_GIO
Glib::RefPtr<Gio::File> gio_file = Gio::File::create_for_path (path);
THROW_IF_FAIL (gio_file);
- if (!gio_file->query_exists ())
+ if (!gio_file->query_exists ()) {
#else
- ifstream file (path.c_str ()) ;
- if (!file.good () && !file.eof ())
+ ifstream file (path.c_str ());
+ if (!file.good () && !file.eof ()) {
#endif
- {
- LOG_ERROR ("Could not open file " + path) ;
- ui_utils::display_error ("Could not open file: " + path) ;
- return false ;
+ LOG_ERROR ("Could not open file " + path);
+ ui_utils::display_error ("Could not open file: " + path);
+ return false;
}
UString base_name = Glib::filename_to_utf8
- (Glib::path_get_basename (path)) ;
+ (Glib::path_get_basename (path));
UString mime_type;
#ifdef WITH_GIO
Glib::RefPtr<Gio::FileInfo> info = gio_file->query_info();
mime_type = Gio::content_type_get_mime_type(info->get_content_type ());
#else
- mime_type = gnome_vfs_get_mime_type_for_name (base_name.c_str ()) ;
+ mime_type = gnome_vfs_get_mime_type_for_name (base_name.c_str ());
#endif // WITH_GIO
if (mime_type == "") {
- mime_type = "text/x-c++" ;
+ mime_type = "text/x-c++";
}
- LOG_DD ("file has mime type: " << mime_type) ;
+ LOG_DD ("file has mime type: " << mime_type);
#ifdef WITH_SOURCEVIEWMM2
Glib::RefPtr<SourceLanguageManager> lang_manager =
- SourceLanguageManager::get_default () ;
+ SourceLanguageManager::get_default ();
#else
Glib::RefPtr<SourceLanguagesManager> lang_manager =
- SourceLanguagesManager::create () ;
+ SourceLanguagesManager::create ();
#endif // WITH_SOURCEVIEWMM2
Glib::RefPtr<SourceLanguage> lang;
#ifdef WITH_SOURCEVIEWMM2
- std::list<Glib::ustring> lang_ids = lang_manager->get_language_ids () ;
+ std::list<Glib::ustring> lang_ids = lang_manager->get_language_ids ();
for (std::list<Glib::ustring>::const_iterator it = lang_ids.begin ();
- it != lang_ids.end (); ++it) {
+ it != lang_ids.end ();
+ ++it) {
Glib::RefPtr<gtksourceview::SourceLanguage> candidate =
lang_manager->get_language (*it);
std::list<Glib::ustring> mime_types = candidate->get_mime_types ();
- for (std::list<Glib::ustring>::const_iterator mime_it = mime_types.begin ();
- mime_it != mime_types.end (); ++mime_it) {
- if (*mime_it == mime_type)
- {
+ std::list<Glib::ustring>::const_iterator mime_it;
+ for (mime_it = mime_types.begin ();
+ mime_it != mime_types.end ();
+ ++mime_it) {
+ if (*mime_it == mime_type) {
// one of the mime types associated with this language matches
// the mime type of our file, so use this language
lang = candidate;
@@ -4221,46 +4258,46 @@
if (lang) break;
}
#else
- lang = lang_manager->get_language_from_mime_type (mime_type) ;
+ lang = lang_manager->get_language_from_mime_type (mime_type);
#endif // WITH_SOURCEVIEWMM2
- Glib::RefPtr<SourceBuffer> source_buffer ;
+ Glib::RefPtr<SourceBuffer> source_buffer;
if (a_source_buffer) {
- source_buffer = a_source_buffer ;
- source_buffer->set_language (lang) ;
+ source_buffer = a_source_buffer;
+ source_buffer->set_language (lang);
source_buffer->erase (source_buffer->begin (),
- source_buffer->end ()) ;
+ source_buffer->end ());
} else {
- source_buffer = SourceBuffer::create (lang) ;
+ source_buffer = SourceBuffer::create (lang);
}
- THROW_IF_FAIL (source_buffer) ;
+ THROW_IF_FAIL (source_buffer);
- gint buf_size = 10 * 1024 ;
- CharSafePtr buf (new gchar [buf_size + 1]) ;
- memset (buf.get (), 0, buf_size + 1) ;
+ gint buf_size = 10 * 1024;
+ CharSafePtr buf (new gchar [buf_size + 1]);
+ memset (buf.get (), 0, buf_size + 1);
unsigned nb_bytes=0;
std::string content;
#ifdef WITH_GIO
Glib::RefPtr<Gio::FileInputStream> gio_stream = gio_file->read ();
- THROW_IF_FAIL (gio_stream) ;
+ THROW_IF_FAIL (gio_stream);
gssize bytes_read = 0;
for (;;) {
- bytes_read = gio_stream->read (buf.get (), buf_size) ;
+ bytes_read = gio_stream->read (buf.get (), buf_size);
content.append (buf.get (), bytes_read);
nb_bytes += bytes_read;
if (bytes_read != buf_size) {break;}
}
- gio_stream->close () ;
+ gio_stream->close ();
#else
for (;;) {
- file.read (buf.get (), buf_size) ;
+ file.read (buf.get (), buf_size);
content.append (buf.get (), file.gcount ());
- THROW_IF_FAIL (file.good () || file.eof ()) ;
+ THROW_IF_FAIL (file.good () || file.eof ());
nb_bytes += file.gcount ();
if (file.gcount () != buf_size) {break;}
}
- file.close () ;
+ file.close ();
#endif // WITH_GIO
UString utf8_content;
std::string cur_charset;
@@ -4280,33 +4317,35 @@
LOG_DD ("file loaded. Read " << (int)nb_bytes << " bytes");
#ifdef WITH_SOURCEVIEWMM2
- source_buffer->set_highlight_syntax (m_priv->enable_syntax_highlight) ;
+ source_buffer->set_highlight_syntax (m_priv->enable_syntax_highlight);
#else
- source_buffer->set_highlight (m_priv->enable_syntax_highlight) ;
+ source_buffer->set_highlight (m_priv->enable_syntax_highlight);
#endif // WITH_SOURCEVIEWMM2
- a_source_buffer = source_buffer ;
- NEMIVER_CATCH_AND_RETURN (false) ;
+ a_source_buffer = source_buffer;
+ NEMIVER_CATCH_AND_RETURN (false);
- return true ;
+ return true;
}
void
DBGPerspective::open_file ()
{
- OpenFileDialog dialog (plugin_path (), debugger (), get_current_file_path ());
+ OpenFileDialog dialog (plugin_path (),
+ debugger (),
+ get_current_file_path ());
- //file_chooser.set_current_folder (m_priv->prog_cwd) ;
+ //file_chooser.set_current_folder (m_priv->prog_cwd);
- int result = dialog.run () ;
+ int result = dialog.run ();
if (result != Gtk::RESPONSE_OK) {return;}
- list<UString> paths ;
- dialog.get_filenames (paths) ;
- list<UString>::const_iterator iter ;
- for (iter = paths.begin () ; iter != paths.end () ; ++iter) {
- open_file (*iter, -1, true) ;
+ list<UString> paths;
+ dialog.get_filenames (paths);
+ list<UString>::const_iterator iter;
+ for (iter = paths.begin (); iter != paths.end (); ++iter) {
+ open_file (*iter, -1, true);
}
bring_source_as_current (*(paths.begin()));
}
@@ -4318,11 +4357,11 @@
RETURN_VAL_IF_FAIL (m_priv, false);
RETURN_VAL_IF_FAIL (!a_path.empty (), false);
- if (get_source_editor_from_path (a_path)) {return true ;}
+ if (get_source_editor_from_path (a_path)) {return true;}
NEMIVER_TRY
- Glib::RefPtr<SourceBuffer> source_buffer ;
+ Glib::RefPtr<SourceBuffer> source_buffer;
if (!load_file (a_path, source_buffer)) {
return false;
}
@@ -4341,11 +4380,11 @@
(sigc::bind (sigc::mem_fun
(*this,
&DBGPerspective::on_insertion_changed_signal),
- source_editor)) ;
+ source_editor));
Pango::FontDescription font_desc(m_priv->get_source_font_name ());
- source_editor->source_view ().modify_font (font_desc) ;
- source_editor->set_path (a_path) ;
+ source_editor->source_view ().modify_font (font_desc);
+ source_editor->set_path (a_path);
source_editor->marker_region_got_clicked_signal ().connect
(sigc::mem_fun
(*this,
@@ -4353,47 +4392,47 @@
if (a_current_line > 0) {
Gtk::TextIter cur_line_iter =
- source_buffer->get_iter_at_line (a_current_line) ;
+ source_buffer->get_iter_at_line (a_current_line);
if (cur_line_iter) {
#ifdef WITH_SOURCEVIEWMM2
Glib::RefPtr<SourceMark> where_marker =
source_buffer->create_source_mark (WHERE_MARK,
WHERE_CATEGORY,
- cur_line_iter) ;
+ cur_line_iter);
#else
Glib::RefPtr<SourceMarker> where_marker =
source_buffer->create_marker (WHERE_MARK,
- WHERE_CATEGORY,
- cur_line_iter) ;
+ WHERE_CATEGORY,
+ cur_line_iter);
#endif // WITH_SOURCEVIEWMM2
- THROW_IF_FAIL (where_marker) ;
+ THROW_IF_FAIL (where_marker);
}
}
- source_editor->show_all () ;
- append_source_editor (*source_editor, a_path) ;
+ source_editor->show_all ();
+ append_source_editor (*source_editor, a_path);
if (!source_editor->source_view ().has_no_window ()) {
- source_editor->source_view ().add_events (Gdk::BUTTON3_MOTION_MASK) ;
+ source_editor->source_view ().add_events (Gdk::BUTTON3_MOTION_MASK);
source_editor->source_view ().signal_button_press_event ().connect
(sigc::mem_fun
(*this,
- &DBGPerspective::on_button_pressed_in_source_view_signal)) ;
+ &DBGPerspective::on_button_pressed_in_source_view_signal));
source_editor->source_view ().signal_motion_notify_event ().connect
(sigc::mem_fun
(*this,
- &DBGPerspective::on_motion_notify_event_signal)) ;
+ &DBGPerspective::on_motion_notify_event_signal));
source_editor->source_view ().signal_leave_notify_event
().connect_notify (sigc::mem_fun
(*this,
- &DBGPerspective::on_leave_notify_event_signal)) ;
+ &DBGPerspective::on_leave_notify_event_signal));
}
- m_priv->opened_file_action_group->set_sensitive (true) ;
+ m_priv->opened_file_action_group->set_sensitive (true);
NEMIVER_CATCH_AND_RETURN (false)
- return true ;
+ return true;
}
bool
@@ -4401,115 +4440,115 @@
int current_line,
bool a_reload_visual_breakpoint)
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
- bool res = open_file (a_path, current_line) ;
+ bool res = open_file (a_path, current_line);
if (res && a_reload_visual_breakpoint) {
- apply_decorations_to_text (a_path) ;
+ apply_decorations_to_text (a_path);
}
- return res ;
+ return res;
}
void
DBGPerspective::close_current_file ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
if (!get_n_pages ()) {return;}
- close_file (m_priv->pagenum_2_path_map[m_priv->current_page_num]) ;
+ close_file (m_priv->pagenum_2_path_map[m_priv->current_page_num]);
}
void
DBGPerspective::find_in_current_file ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
- SourceEditor *editor = get_current_source_editor () ;
- THROW_IF_FAIL (editor) ;
+ SourceEditor *editor = get_current_source_editor ();
+ THROW_IF_FAIL (editor);
- FindTextDialog& find_text_dialog = get_find_text_dialog () ;
+ FindTextDialog& find_text_dialog = get_find_text_dialog ();
- bool clear_selection=false ;
+ bool clear_selection=false;
for (;;) {
- int result = find_text_dialog.run () ;
+ int result = find_text_dialog.run ();
if (result != Gtk::RESPONSE_OK) {
- break ;
+ break;
}
UString search_str;
- find_text_dialog.get_search_string (search_str) ;
+ find_text_dialog.get_search_string (search_str);
if (search_str == "") {break;}
- Gtk::TextIter start, end ;
+ Gtk::TextIter start, end;
if (!editor->do_search (search_str, start, end,
find_text_dialog.get_match_case (),
find_text_dialog.get_match_entire_word (),
find_text_dialog.get_search_backward (),
clear_selection)) {
- UString message ;
+ UString message;
if (find_text_dialog.get_wrap_around ()) {
- message = _("Reached end of file") ;
- clear_selection = true ;
+ message = _("Reached end of file");
+ clear_selection = true;
} else {
message.printf (_("Could not find string %s"),
- search_str.c_str ()) ;
- clear_selection = false ;
+ search_str.c_str ());
+ clear_selection = false;
}
- ui_utils::display_info (message) ;
+ ui_utils::display_info (message);
} else {
- clear_selection = false ;
+ clear_selection = false;
}
}
- find_text_dialog.hide () ;
+ find_text_dialog.hide ();
}
void
DBGPerspective::close_file (const UString &a_path)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
- LOG_DD ("removing file: " << a_path) ;
- map<UString, int>::const_iterator nil, iter ;
- nil = m_priv->path_2_pagenum_map.end () ;
- iter = m_priv->path_2_pagenum_map.find (a_path) ;
+ LOG_DD ("removing file: " << a_path);
+ map<UString, int>::const_iterator nil, iter;
+ nil = m_priv->path_2_pagenum_map.end ();
+ iter = m_priv->path_2_pagenum_map.find (a_path);
if (iter == nil) {
- LOG_DD ("could not find page " << a_path) ;
+ LOG_DD ("could not find page " << a_path);
return;
}
- int page_num = m_priv->path_2_pagenum_map[a_path] ;
+ int page_num = m_priv->path_2_pagenum_map[a_path];
LOG_DD ("removing notebook tab number "
<< (int) (page_num)
- << ", path " << a_path) ;
- m_priv->sourceviews_notebook->remove_page (page_num) ;
+ << ", path " << a_path);
+ m_priv->sourceviews_notebook->remove_page (page_num);
update_file_maps ();
if (!get_n_pages ()) {
- m_priv->opened_file_action_group->set_sensitive (false) ;
+ m_priv->opened_file_action_group->set_sensitive (false);
}
if (!do_unmonitor_file (a_path)) {
- LOG_ERROR ("failed to unmonitor file " << a_path) ;
+ LOG_ERROR ("failed to unmonitor file " << a_path);
}
}
void
DBGPerspective::close_opened_files ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
if (!get_n_pages ()) {return;}
map<UString, int>::iterator it;
//loop until all the files are closed or until
//we did 50 iterations. This prevents us against
//infinite loops
- for (int i=0 ; i < 50 ; ++i) {
- it = m_priv->path_2_pagenum_map.begin () ;
+ for (int i=0; i < 50; ++i) {
+ it = m_priv->path_2_pagenum_map.begin ();
if (it == m_priv->path_2_pagenum_map.end ()) {
- break ;
+ break;
}
- LOG_DD ("closing page " << it->first) ;
- UString path = it->first ;
- close_file (path) ;
+ LOG_DD ("closing page " << it->first);
+ UString path = it->first;
+ close_file (path);
}
}
@@ -4547,71 +4586,71 @@
bool
DBGPerspective::reload_file (const UString &a_path)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
- SourceEditor *editor = get_source_editor_from_path (a_path) ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
+ SourceEditor *editor = get_source_editor_from_path (a_path);
if (!editor)
- return open_file (a_path) ;
+ return open_file (a_path);
Glib::RefPtr<SourceBuffer> buffer =
editor->source_view ().get_source_buffer ();
- int current_line = editor->current_line () ;
- int current_column = editor->current_column () ;
+ int current_line = editor->current_line ();
+ int current_column = editor->current_column ();
if (!load_file (a_path, buffer))
- return false ;
- editor->source_view ().set_source_buffer (buffer) ;
- editor->current_line (current_line) ;
- editor->current_column (current_column) ;
- apply_decorations_to_text (a_path) ;
- return true ;
+ return false;
+ editor->source_view ().set_source_buffer (buffer);
+ editor->current_line (current_line);
+ editor->current_column (current_column);
+ apply_decorations_to_text (a_path);
+ return true;
}
bool
DBGPerspective::reload_file ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
- SourceEditor *editor = get_current_source_editor () ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
+ SourceEditor *editor = get_current_source_editor ();
if (!editor)
- return false ;
- UString path ;
- editor->get_path (path) ;
+ return false;
+ UString path;
+ editor->get_path (path);
if (path.empty ())
- return false ;
+ return false;
LOG_DD ("going to reload file path: "
- << Glib::filename_from_utf8 (path)) ;
- reload_file (path) ;
- return true ;
+ << Glib::filename_from_utf8 (path));
+ reload_file (path);
+ return true;
}
ISessMgr&
DBGPerspective::session_manager ()
{
- return *session_manager_ptr () ;
+ return *session_manager_ptr ();
}
void
DBGPerspective::execute_session (ISessMgr::Session &a_session)
{
- m_priv->session = a_session ;
+ m_priv->session = a_session;
if (a_session.properties ()[PROGRAM_CWD] != m_priv->prog_path
&& get_n_pages ()) {
- close_opened_files () ;
+ close_opened_files ();
}
- IDebugger::BreakPoint breakpoint ;
- vector<IDebugger::BreakPoint> breakpoints ;
- list<ISessMgr::BreakPoint>::const_iterator it ;
- for (it = m_priv->session.breakpoints ().begin () ;
+ IDebugger::BreakPoint breakpoint;
+ vector<IDebugger::BreakPoint> breakpoints;
+ list<ISessMgr::BreakPoint>::const_iterator it;
+ for (it = m_priv->session.breakpoints ().begin ();
it != m_priv->session.breakpoints ().end ();
++it) {
- breakpoint.clear () ;
- breakpoint.line (it->line_number ()) ;
- breakpoint.file_name (it->file_name ()) ;
- breakpoint.file_full_name (it->file_full_name ()) ;
- breakpoint.enabled (it->enabled ()) ;
+ breakpoint.clear ();
+ breakpoint.line (it->line_number ());
+ breakpoint.file_name (it->file_name ());
+ breakpoint.file_full_name (it->file_full_name ());
+ breakpoint.enabled (it->enabled ());
breakpoint.condition (it->condition ());
- breakpoints.push_back (breakpoint) ;
+ breakpoints.push_back (breakpoint);
}
// populate the list of search paths from the current session
@@ -4634,42 +4673,42 @@
a_session.properties ()[PROGRAM_ARGS],
a_session.env_variables (),
a_session.properties ()[PROGRAM_CWD],
- breakpoints) ;
- m_priv->reused_session = true ;
+ breakpoints);
+ m_priv->reused_session = true;
}
void
DBGPerspective::execute_program ()
{
- RunProgramDialog dialog (plugin_path ()) ;
+ RunProgramDialog dialog (plugin_path ());
// set defaults from session
if (debugger ()->get_target_path () != "") {
- dialog.program_name (debugger ()->get_target_path ()) ;
+ dialog.program_name (debugger ()->get_target_path ());
}
- dialog.arguments (m_priv->prog_args) ;
+ dialog.arguments (m_priv->prog_args);
if (m_priv->prog_cwd == "") {
- m_priv->prog_cwd = Glib::filename_to_utf8 (Glib::get_current_dir ()) ;
+ m_priv->prog_cwd = Glib::filename_to_utf8 (Glib::get_current_dir ());
}
- dialog.working_directory (m_priv->prog_cwd) ;
- dialog.environment_variables (m_priv->env_variables) ;
+ dialog.working_directory (m_priv->prog_cwd);
+ dialog.environment_variables (m_priv->env_variables);
- int result = dialog.run () ;
+ int result = dialog.run ();
if (result != Gtk::RESPONSE_OK) {
return;
}
- UString prog, args, cwd ;
- prog = dialog.program_name () ;
- THROW_IF_FAIL (prog != "") ;
- args = dialog.arguments () ;
- cwd = dialog.working_directory () ;
- THROW_IF_FAIL (cwd != "") ;
+ UString prog, args, cwd;
+ prog = dialog.program_name ();
+ THROW_IF_FAIL (prog != "");
+ args = dialog.arguments ();
+ cwd = dialog.working_directory ();
+ THROW_IF_FAIL (cwd != "");
map<UString, UString> env = dialog.environment_variables();
- vector<IDebugger::BreakPoint> breaks ;
- execute_program (prog, args, env, cwd, breaks, true) ;
- m_priv->reused_session = false ;
+ vector<IDebugger::BreakPoint> breaks;
+ execute_program (prog, args, env, cwd, breaks, true);
+ m_priv->reused_session = false;
}
void
@@ -4678,41 +4717,43 @@
const UString &a_cwd,
bool a_close_opened_files)
{
- UString cwd ;
+ UString cwd;
if (a_cwd == "." || a_cwd == "") {
- cwd = Glib::filename_to_utf8 (Glib::get_current_dir ()) ;
+ cwd = Glib::filename_to_utf8 (Glib::get_current_dir ());
} else {
- cwd = a_cwd ;
+ cwd = a_cwd;
}
- vector<UString> argv = a_prog_and_args.split (" ") ;
- vector<UString>::const_iterator iter = argv.begin () ;
- vector<UString>::const_iterator end_iter = argv.end () ;
- ++iter ;
+ vector<UString> argv = a_prog_and_args.split (" ");
+ vector<UString>::const_iterator iter = argv.begin ();
+ vector<UString>::const_iterator end_iter = argv.end ();
+ ++iter;
UString prog_name=argv[0], args = UString::join (iter, end_iter);
- vector<IDebugger::BreakPoint> breaks ;
+ vector<IDebugger::BreakPoint> breaks;
- execute_program (prog_name, args, a_env, cwd, breaks, a_close_opened_files) ;
- m_priv->reused_session = false ;
+ execute_program (prog_name, args, a_env, cwd,
+ breaks, a_close_opened_files);
+ m_priv->reused_session = false;
}
void
-DBGPerspective::execute_program (const UString &a_prog,
- const UString &a_args,
- const map<UString, UString> &a_env,
- const UString &a_cwd,
- const vector<IDebugger::BreakPoint> &a_breaks,
- bool a_close_opened_files)
+DBGPerspective::execute_program
+ (const UString &a_prog,
+ const UString &a_args,
+ const map<UString, UString> &a_env,
+ const UString &a_cwd,
+ const vector<IDebugger::BreakPoint> &a_breaks,
+ bool a_close_opened_files)
{
NEMIVER_TRY
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
- IDebuggerSafePtr dbg_engine = debugger () ;
- THROW_IF_FAIL (dbg_engine) ;
+ IDebuggerSafePtr dbg_engine = debugger ();
+ THROW_IF_FAIL (dbg_engine);
LOG_DD ("debugger state: '"
<< IDebugger::state_to_string (dbg_engine->get_state ())
- << "'") ;
+ << "'");
UString prog = a_prog;
// First of all, make sure the program we want to debug exists.
@@ -4737,45 +4778,47 @@
// if the engine is running, stop it.
if (dbg_engine->get_state () == IDebugger::RUNNING) {
- dbg_engine->stop_target () ;
- LOG_DD ("stopped dbg_engine") ;
+ dbg_engine->stop_target ();
+ LOG_DD ("stopped dbg_engine");
}
// close old file that might be open
- if (a_close_opened_files && prog != m_priv->prog_path && get_n_pages ()) {
- close_opened_files () ;
+ if (a_close_opened_files
+ && (prog != m_priv->prog_path)
+ && get_n_pages ()) {
+ close_opened_files ();
}
- vector<UString> args = a_args.split (" ") ;
- args.insert (args.begin (), prog) ;
- vector<UString> source_search_dirs = a_cwd.split (" ") ;
+ vector<UString> args = a_args.split (" ");
+ args.insert (args.begin (), prog);
+ vector<UString> source_search_dirs = a_cwd.split (" ");
// delete old breakpoints, if any.
- map<int, IDebugger::BreakPoint>::const_iterator bp_it ;
- for (bp_it = m_priv->breakpoints.begin () ;
+ map<int, IDebugger::BreakPoint>::const_iterator bp_it;
+ for (bp_it = m_priv->breakpoints.begin ();
bp_it != m_priv->breakpoints.end ();
++bp_it) {
- dbg_engine->delete_breakpoint (bp_it->first) ;
+ dbg_engine->delete_breakpoint (bp_it->first);
}
// clear data gathered by the old session
- clear_session_data () ;
+ clear_session_data ();
- clear_status_notebook () ;
+ clear_status_notebook ();
// now really load the inferior program (i.e: the one to be debugged)
dbg_engine->load_program (args, a_cwd, source_search_dirs,
- get_terminal ().slave_pts_name ()) ;
+ get_terminal ().slave_pts_name ());
// set environment variables of the inferior
- dbg_engine->add_env_variables (a_env) ;
+ dbg_engine->add_env_variables (a_env);
// set a breakpoint in 'main' by default.
if (a_breaks.empty ()) {
- dbg_engine->set_breakpoint ("main") ;
+ dbg_engine->set_breakpoint ("main");
} else {
- vector<IDebugger::BreakPoint>::const_iterator it ;
- for (it = a_breaks.begin () ; it != a_breaks.end () ; ++it) {
+ vector<IDebugger::BreakPoint>::const_iterator it;
+ for (it = a_breaks.begin (); it != a_breaks.end (); ++it) {
// if the breakpoint was marked as 'disabled' in the session DB, we
// have set the breakpoint and immediately disable it. We need to
// pass along some additional information in the 'cookie' to
@@ -4785,19 +4828,19 @@
dbg_engine->set_breakpoint (it->file_full_name (),
it->line (),
it->condition (),
- cookie) ;
+ cookie);
}
}
- dbg_engine->run () ;
- m_priv->debugger_has_just_run = true ;
+ dbg_engine->run ();
+ m_priv->debugger_has_just_run = true;
- attached_to_target_signal ().emit (true) ;
+ attached_to_target_signal ().emit (true);
- m_priv->prog_path = prog ;
- m_priv->prog_args = a_args ;
- m_priv->prog_cwd = a_cwd ;
- m_priv->env_variables = a_env ;
+ m_priv->prog_path = prog;
+ m_priv->prog_args = a_args;
+ m_priv->prog_cwd = a_cwd;
+ m_priv->env_variables = a_env;
NEMIVER_CATCH
}
@@ -4807,18 +4850,18 @@
{
LOG_FUNCTION_SCOPE_NORMAL_DD
- IProcMgr *process_manager = get_process_manager () ;
- THROW_IF_FAIL (process_manager) ;
+ IProcMgr *process_manager = get_process_manager ();
+ THROW_IF_FAIL (process_manager);
ProcListDialog dialog (plugin_path (),
*process_manager);
- int result = dialog.run () ;
+ int result = dialog.run ();
if (result != Gtk::RESPONSE_OK) {
return;
}
if (dialog.has_selected_process ()) {
- IProcMgr::Process process ;
+ IProcMgr::Process process;
THROW_IF_FAIL (dialog.get_selected_process (process));
- attach_to_program (process.pid ()) ;
+ attach_to_program (process.pid ());
}
}
@@ -4829,19 +4872,19 @@
LOG_FUNCTION_SCOPE_NORMAL_DD
if (a_close_opened_files && get_n_pages ()) {
- close_opened_files () ;
+ close_opened_files ();
}
- LOG_DD ("a_pid: " << (int) a_pid) ;
+ LOG_DD ("a_pid: " << (int) a_pid);
if (a_pid == (unsigned int) getpid ()) {
- ui_utils::display_warning (_("You cannot attach to Nemiver itself")) ;
- return ;
+ ui_utils::display_warning (_("You cannot attach to Nemiver itself"));
+ return;
}
if (!debugger ()->attach_to_target (a_pid,
get_terminal ().slave_pts_name ())) {
ui_utils::display_warning (_("You cannot attach to the "
- "underlying debugger engine")) ;
+ "underlying debugger engine"));
}
}
@@ -4850,27 +4893,27 @@
{
LOG_FUNCTION_SCOPE_NORMAL_DD
- RemoteTargetDialog dialog (plugin_path ()) ;
+ RemoteTargetDialog dialog (plugin_path ());
- int result = dialog.run () ;
+ int result = dialog.run ();
if (result != Gtk::RESPONSE_OK)
- return ;
+ return;
- UString path = dialog.get_executable_path () ;
- LOG_DD ("executable path: '" << path << "'") ;
- debugger ()->load_program (path , ".") ;
- path = dialog.get_solib_prefix_path () ;
- LOG_DD ("solib prefix path: '" << path << "'") ;
- debugger ()->set_solib_prefix_path (path) ;
+ UString path = dialog.get_executable_path ();
+ LOG_DD ("executable path: '" << path << "'");
+ debugger ()->load_program (path , ".");
+ path = dialog.get_solib_prefix_path ();
+ LOG_DD ("solib prefix path: '" << path << "'");
+ debugger ()->set_solib_prefix_path (path);
- if (dialog.get_connection_type () ==
- RemoteTargetDialog::TCP_CONNECTION_TYPE) {
+ if (dialog.get_connection_type ()
+ == RemoteTargetDialog::TCP_CONNECTION_TYPE) {
connect_to_remote_target (dialog.get_server_address (),
- dialog.get_server_port ()) ;
- } else if (dialog.get_connection_type () ==
- RemoteTargetDialog::SERIAL_CONNECTION_TYPE) {
- connect_to_remote_target (dialog.get_serial_port_name ()) ;
+ dialog.get_server_port ());
+ } else if (dialog.get_connection_type ()
+ == RemoteTargetDialog::SERIAL_CONNECTION_TYPE) {
+ connect_to_remote_target (dialog.get_serial_port_name ());
}
}
@@ -4879,9 +4922,9 @@
int a_server_port)
{
LOG_FUNCTION_SCOPE_NORMAL_DD
- THROW_IF_FAIL (debugger ()) ;
+ THROW_IF_FAIL (debugger ());
- debugger ()->attach_to_remote_target (a_server_address, a_server_port) ;
+ debugger ()->attach_to_remote_target (a_server_address, a_server_port);
}
@@ -4890,8 +4933,8 @@
{
LOG_FUNCTION_SCOPE_NORMAL_DD
- THROW_IF_FAIL (debugger ()) ;
- debugger ()->attach_to_remote_target (a_serial_line) ;
+ THROW_IF_FAIL (debugger ());
+ debugger ()->attach_to_remote_target (a_serial_line);
}
void
@@ -4899,26 +4942,26 @@
{
LOG_FUNCTION_SCOPE_NORMAL_DD
- THROW_IF_FAIL (debugger ()) ;
- debugger ()->detach_from_target () ;
+ THROW_IF_FAIL (debugger ());
+ debugger ()->detach_from_target ();
}
void
DBGPerspective::save_current_session ()
{
if (m_priv->reused_session) {
- record_and_save_session (m_priv->session) ;
- LOG_DD ("saved current session") ;
+ record_and_save_session (m_priv->session);
+ LOG_DD ("saved current session");
} else {
- LOG_DD ("recorded a new session") ;
- record_and_save_new_session () ;
+ LOG_DD ("recorded a new session");
+ record_and_save_new_session ();
}
}
void
DBGPerspective::choose_a_saved_session ()
{
- SavedSessionsDialog dialog (plugin_path (), session_manager_ptr ()) ;
+ SavedSessionsDialog dialog (plugin_path (), session_manager_ptr ());
int result = dialog.run ();
if (result != Gtk::RESPONSE_OK) {
return;
@@ -4930,107 +4973,107 @@
void
DBGPerspective::edit_preferences ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
PreferencesDialog dialog (workbench (), plugin_path ());
- dialog.run () ;
+ dialog.run ();
}
void
DBGPerspective::run ()
{
- THROW_IF_FAIL (m_priv) ;
- going_to_run_target_signal ().emit () ;
- debugger ()->run () ;
- m_priv->debugger_has_just_run = true ;
+ THROW_IF_FAIL (m_priv);
+ going_to_run_target_signal ().emit ();
+ debugger ()->run ();
+ m_priv->debugger_has_just_run = true;
}
void
DBGPerspective::load_core_file ()
{
- LoadCoreDialog dialog (plugin_path ()) ;
+ LoadCoreDialog dialog (plugin_path ());
- int result = dialog.run () ;
+ int result = dialog.run ();
if (result != Gtk::RESPONSE_OK) {
return;
}
- UString prog_path, core_path ;
- prog_path = dialog.program_name () ;
- THROW_IF_FAIL (prog_path != "") ;
- core_path = dialog.core_file () ;
- THROW_IF_FAIL (core_path != "") ;
+ UString prog_path, core_path;
+ prog_path = dialog.program_name ();
+ THROW_IF_FAIL (prog_path != "");
+ core_path = dialog.core_file ();
+ THROW_IF_FAIL (core_path != "");
- load_core_file (prog_path, core_path) ;
+ load_core_file (prog_path, core_path);
}
void
DBGPerspective::load_core_file (const UString &a_prog_path,
const UString &a_core_file_path)
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (a_prog_path != m_priv->prog_path && get_n_pages ()) {
- close_opened_files () ;
+ close_opened_files ();
}
- debugger ()->load_core_file (a_prog_path, a_core_file_path) ;
- debugger ()->list_frames () ;
+ debugger ()->load_core_file (a_prog_path, a_core_file_path);
+ debugger ()->list_frames ();
}
void
DBGPerspective::stop ()
{
- LOG_FUNCTION_SCOPE_NORMAL_D (NMV_DEFAULT_DOMAIN) ;
+ LOG_FUNCTION_SCOPE_NORMAL_D (NMV_DEFAULT_DOMAIN);
if (!debugger ()->stop_target ()) {
- ui_utils::display_error (_("Failed to stop the debugger")) ;
+ ui_utils::display_error (_("Failed to stop the debugger"));
}
}
void
DBGPerspective::step_over ()
{
- debugger ()->step_over () ;
+ debugger ()->step_over ();
}
void
DBGPerspective::step_into ()
{
- debugger ()->step_in () ;
+ debugger ()->step_in ();
}
void
DBGPerspective::step_out ()
{
- debugger ()->step_out () ;
+ debugger ()->step_out ();
}
void
DBGPerspective::do_continue ()
{
- debugger ()->do_continue () ;
+ debugger ()->do_continue ();
}
void
DBGPerspective::do_continue_until ()
{
- SourceEditor *editor = get_current_source_editor () ;
- THROW_IF_FAIL (editor) ;
+ SourceEditor *editor = get_current_source_editor ();
+ THROW_IF_FAIL (editor);
- UString file_path ;
- editor->get_file_name (file_path) ;
- int current_line = editor->current_line () ;
+ UString file_path;
+ editor->get_file_name (file_path);
+ int current_line = editor->current_line ();
- debugger ()->continue_to_position (file_path, current_line) ;
+ debugger ()->continue_to_position (file_path, current_line);
}
void
DBGPerspective::set_breakpoint ()
{
- SourceEditor *source_editor = get_current_source_editor () ;
- THROW_IF_FAIL (source_editor) ;
- UString path ;
- source_editor->get_path (path) ;
- THROW_IF_FAIL (path != "") ;
+ SourceEditor *source_editor = get_current_source_editor ();
+ THROW_IF_FAIL (source_editor);
+ UString path;
+ source_editor->get_path (path);
+ THROW_IF_FAIL (path != "");
//line numbers start at 0 in GtkSourceView, but at 1 in GDB <grin/>
//so in DBGPerspective, the line number are set in the GDB's reference.
@@ -5038,7 +5081,7 @@
gint current_line =
source_editor->source_view ().get_source_buffer ()->get_insert
()->get_iter ().get_line () + 1;
- set_breakpoint (path, current_line, "") ;
+ set_breakpoint (path, current_line, "");
}
void
@@ -5047,10 +5090,10 @@
const UString &a_condition)
{
LOG_DD ("set bkpoint request for " << a_file_path << ":" << a_line
- << " condition: '" << a_condition << "'") ;
+ << " condition: '" << a_condition << "'");
// only try to set the breakpoint if it's a reasonable value
if (a_line && a_line != INT_MAX && a_line != INT_MIN) {
- debugger ()->set_breakpoint (a_file_path, a_line, a_condition) ;
+ debugger ()->set_breakpoint (a_file_path, a_line, a_condition);
} else {
LOG_ERROR ("invalid line number: " << a_line);
UString msg;
@@ -5063,54 +5106,54 @@
DBGPerspective::set_breakpoint (const UString &a_func_name,
const UString &a_condition)
{
- LOG_DD ("set bkpoint request in func" << a_func_name) ;
- debugger ()->set_breakpoint (a_func_name, a_condition) ;
+ LOG_DD ("set bkpoint request in func" << a_func_name);
+ debugger ()->set_breakpoint (a_func_name, a_condition);
}
void
DBGPerspective::append_breakpoint (int a_bp_num,
const IDebugger::BreakPoint &a_breakpoint)
{
- UString file_path ;
- file_path = a_breakpoint.file_full_name () ;
+ UString file_path;
+ file_path = a_breakpoint.file_full_name ();
//if the file full path info is not present,
//1/ lookup in the files opened in the perspective already.
//2/ lookup in the list of source directories
if (file_path == "") {
- UString file_name = a_breakpoint.file_name () ;
+ UString file_name = a_breakpoint.file_name ();
LOG_DD ("no full path info present for file '"
- + file_name + "'") ;
+ + file_name + "'");
if (file_name == "") {
UString message;
message.printf
(_("There is no file name info for symbol addr: %s %s"),
a_breakpoint.function ().c_str (),
- a_breakpoint.address ().c_str ()) ;
+ a_breakpoint.address ().c_str ());
LOG_ERROR (message);
- return ;
+ return;
}
else
{
- file_path = file_name ;
+ file_path = file_name;
}
}
LOG_DD ("record breakpoint " << file_path << ":"
- << a_breakpoint.line () - 1) ;
- m_priv->breakpoints[a_bp_num] = a_breakpoint ;
- m_priv->breakpoints[a_bp_num].file_full_name (file_path) ;
+ << a_breakpoint.line () - 1);
+ m_priv->breakpoints[a_bp_num] = a_breakpoint;
+ m_priv->breakpoints[a_bp_num].file_full_name (file_path);
append_visual_breakpoint (file_path, a_breakpoint.line () - 1,
- a_breakpoint.enabled ()) ;
+ a_breakpoint.enabled ());
}
void
DBGPerspective::append_breakpoints
(const map<int, IDebugger::BreakPoint> &a_breaks)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
- map<int, IDebugger::BreakPoint>::const_iterator iter ;
- for (iter = a_breaks.begin () ; iter != a_breaks.end () ; ++iter) {
- append_breakpoint (iter->first, iter->second) ;
+ map<int, IDebugger::BreakPoint>::const_iterator iter;
+ for (iter = a_breaks.begin (); iter != a_breaks.end (); ++iter) {
+ append_breakpoint (iter->first, iter->second);
}
}
@@ -5120,75 +5163,76 @@
int &a_break_num,
bool &a_enabled)
{
- UString breakpoint = a_file_name + ":" + UString::from_int (a_line_num) ;
+ UString breakpoint = a_file_name + ":" + UString::from_int (a_line_num);
- LOG_DD ("searching for breakpoint " << breakpoint << ": ") ;
+ LOG_DD ("searching for breakpoint " << breakpoint << ": ");
- map<int, IDebugger::BreakPoint>::const_iterator iter ;
- for (iter = m_priv->breakpoints.begin () ;
- iter != m_priv->breakpoints.end () ;
+ map<int, IDebugger::BreakPoint>::const_iterator iter;
+ for (iter = m_priv->breakpoints.begin ();
+ iter != m_priv->breakpoints.end ();
++iter) {
LOG_DD ("got breakpoint " << iter->second.file_full_name ()
- << ":" << iter->second.line () << "...") ;
- // because some versions of gdb don't return the full file path info for
- // breakpoints, we have to also check to see if the basenames match
- if (((iter->second.file_full_name () == a_file_name) ||
- (Glib::path_get_basename (iter->second.file_full_name ()) ==
- Glib::path_get_basename (a_file_name))
- )
+ << ":" << iter->second.line () << "...");
+ // because some versions of gdb don't
+ // return the full file path info for
+ // breakpoints, we have to also check to see
+ // if the basenames match
+ if (((iter->second.file_full_name () == a_file_name)
+ || (Glib::path_get_basename (iter->second.file_full_name ())
+ == Glib::path_get_basename (a_file_name)))
&& (iter->second.line () == a_line_num)) {
- a_break_num = iter->second.number () ;
- a_enabled = iter->second.enabled () ;
- LOG_DD ("found breakpoint " << breakpoint << " !") ;
- return true ;
+ a_break_num = iter->second.number ();
+ a_enabled = iter->second.enabled ();
+ LOG_DD ("found breakpoint " << breakpoint << " !");
+ return true;
}
}
- LOG_DD ("did not find breakpoint " + breakpoint) ;
- return false ;
+ LOG_DD ("did not find breakpoint " + breakpoint);
+ return false;
}
bool
DBGPerspective::delete_breakpoint ()
{
- SourceEditor *source_editor = get_current_source_editor () ;
- THROW_IF_FAIL (source_editor) ;
- UString path ;
+ SourceEditor *source_editor = get_current_source_editor ();
+ THROW_IF_FAIL (source_editor);
+ UString path;
source_editor->get_path (path);
- THROW_IF_FAIL (path != "") ;
+ THROW_IF_FAIL (path != "");
gint current_line =
source_editor->source_view ().get_source_buffer ()->get_insert
()->get_iter ().get_line () + 1;
- int break_num=0 ;
- bool enabled=false ;
+ int break_num=0;
+ bool enabled=false;
if (!get_breakpoint_number (path, current_line,
break_num, enabled)) {
- return false ;
+ return false;
}
- THROW_IF_FAIL (break_num) ;
- return delete_breakpoint (break_num) ;
+ THROW_IF_FAIL (break_num);
+ return delete_breakpoint (break_num);
}
bool
DBGPerspective::delete_breakpoint (int a_breakpoint_num)
{
map<int, IDebugger::BreakPoint>::iterator iter =
- m_priv->breakpoints.find (a_breakpoint_num) ;
+ m_priv->breakpoints.find (a_breakpoint_num);
if (iter == m_priv->breakpoints.end ()) {
- LOG_ERROR ("breakpoint " << (int) a_breakpoint_num << " not found") ;
- return false ;
+ LOG_ERROR ("breakpoint " << (int) a_breakpoint_num << " not found");
+ return false;
}
- debugger ()->delete_breakpoint (a_breakpoint_num) ;
- return true ;
+ debugger ()->delete_breakpoint (a_breakpoint_num);
+ return true;
}
bool
DBGPerspective::append_visual_breakpoint (const UString &a_file_name,
int a_linenum, bool enabled)
{
- UString actual_file_path ;
+ UString actual_file_path;
return append_visual_breakpoint (a_file_name, a_linenum,
- actual_file_path, enabled) ;
+ actual_file_path, enabled);
}
bool
@@ -5198,21 +5242,21 @@
bool enabled)
{
if (a_file_name.empty()) {
- LOG_ERROR_DD ("a_file_name is empty") ;
- return false ;
+ LOG_ERROR_DD ("a_file_name is empty");
+ return false;
}
THROW_IF_FAIL(m_priv);
LOG_FUNCTION_SCOPE_NORMAL_DD
- LOG_DD ("a_file_name: " << a_file_name) ;
- LOG_DD ("a_linenum: " << (int)a_linenum) ;
+ LOG_DD ("a_file_name: " << a_file_name);
+ LOG_DD ("a_linenum: " << (int)a_linenum);
if (a_linenum < 0) {a_linenum = 0;}
- UString actual_file_name ;
+ UString actual_file_name;
SourceEditor *source_editor =
get_source_editor_from_path (a_file_name,
- actual_file_name) ;
+ actual_file_name);
//first assume that it's a full pathname and just try to open it
if (!source_editor) {
if (Glib::file_test (a_file_name, Glib::FILE_TEST_IS_REGULAR)) {
@@ -5224,9 +5268,9 @@
a_file_name.c_str ());
if (ui_utils::ask_yes_no_question (msg)
== Gtk::RESPONSE_YES) {
- LocateFileDialog dialog (plugin_path (), a_file_name) ;
+ LocateFileDialog dialog (plugin_path (), a_file_name);
dialog.file_location (m_priv->prog_cwd);
- int result = dialog.run () ;
+ int result = dialog.run ();
if (result == Gtk::RESPONSE_OK) {
UString file_path = dialog.file_location ();
THROW_IF_FAIL (Glib::file_test (file_path,
@@ -5259,7 +5303,7 @@
if (!source_editor) {
source_editor = get_source_editor_from_path (a_file_name,
actual_file_name,
- true) ;
+ true);
}
//if that still didn't work, look for a file of that name in the search
//directories and then as a last resort ask the user to locate it
@@ -5268,14 +5312,14 @@
UString file_path;
if (!find_file_in_source_dirs (a_file_name, file_path)) {
LOG_DD ("didn't find file either in opened files "
- " or in source dirs:") ;
+ " or in source dirs:");
//Pop up a dialog asking user to select the specified file
- LocateFileDialog dialog (plugin_path (), a_file_name) ;
+ LocateFileDialog dialog (plugin_path (), a_file_name);
//start looking in the working directory
dialog.file_location (m_priv->prog_cwd);
- int result = dialog.run () ;
+ int result = dialog.run ();
if (result == Gtk::RESPONSE_OK) {
- file_path = dialog.file_location () ;
+ file_path = dialog.file_location ();
THROW_IF_FAIL (Glib::file_test (file_path,
Glib::FILE_TEST_IS_REGULAR));
THROW_IF_FAIL (Glib::path_get_basename(a_file_name) ==
@@ -5300,139 +5344,142 @@
}
}
- open_file (file_path) ;
+ open_file (file_path);
source_editor = get_source_editor_from_path (file_path,
- actual_file_name) ;
+ actual_file_name);
}
//finally, if none of these things worked, display an error
if (!source_editor) {
LOG_ERROR ("Could not find source editor for file: '"
<< a_file_name
- << "'") ;
+ << "'");
UString message;
message.printf (_("Could not find file: %s\n"), a_file_name.c_str ());
ui_utils::display_error (message);
- return false ;
+ return false;
} else {
- LOG_DD ("setting actual visual bp in the source editor") ;
- source_editor->set_visual_breakpoint_at_line (a_linenum, enabled) ;
+ LOG_DD ("setting actual visual bp in the source editor");
+ source_editor->set_visual_breakpoint_at_line (a_linenum, enabled);
}
- a_actual_file_name = actual_file_name ;
- return true ;
+ a_actual_file_name = actual_file_name;
+ return true;
}
void
-DBGPerspective::delete_visual_breakpoint (const UString &a_file_name, int a_linenum)
+DBGPerspective::delete_visual_breakpoint (const UString &a_file_name,
+ int a_linenum)
{
- SourceEditor *source_editor = get_source_editor_from_path (a_file_name) ;
+ SourceEditor *source_editor = get_source_editor_from_path (a_file_name);
if (!source_editor) {
- source_editor = get_source_editor_from_path (a_file_name, true) ;
+ source_editor = get_source_editor_from_path (a_file_name, true);
}
- THROW_IF_FAIL (source_editor) ;
- source_editor->remove_visual_breakpoint_from_line (a_linenum) ;
+ THROW_IF_FAIL (source_editor);
+ source_editor->remove_visual_breakpoint_from_line (a_linenum);
}
void
DBGPerspective::delete_visual_breakpoint (int a_breakpoint_num)
{
map<int, IDebugger::BreakPoint>::iterator iter =
- m_priv->breakpoints.find (a_breakpoint_num) ;
+ m_priv->breakpoints.find (a_breakpoint_num);
if (iter == m_priv->breakpoints.end ()) {
- LOG_ERROR ("breakpoint " << (int) a_breakpoint_num << " not found") ;
- return ;
+ LOG_ERROR ("breakpoint " << (int) a_breakpoint_num << " not found");
+ return;
}
SourceEditor *source_editor =
- get_source_editor_from_path (iter->second.file_full_name ()) ;
+ get_source_editor_from_path (iter->second.file_full_name ());
if (!source_editor) {
- source_editor = get_source_editor_from_path (iter->second.file_full_name (),
- true) ;
+ source_editor =
+ get_source_editor_from_path (iter->second.file_full_name (),
+ true);
}
- THROW_IF_FAIL (source_editor) ;
- source_editor->remove_visual_breakpoint_from_line (iter->second.line ()-1) ;
+ THROW_IF_FAIL (source_editor);
+ source_editor->remove_visual_breakpoint_from_line
+ (iter->second.line ()-1);
m_priv->breakpoints.erase (iter);
- LOG_DD ("erased breakpoint number " << (int) a_breakpoint_num) ;
+ LOG_DD ("erased breakpoint number " << (int) a_breakpoint_num);
}
void
DBGPerspective::choose_function_overload
- (const vector<IDebugger::OverloadsChoiceEntry> &a_entries)
+ (const vector<IDebugger::OverloadsChoiceEntry> &a_entries)
{
if (a_entries.empty ()) {
- LOG_DD ("got an empty list of overloads choice") ;
- return ;
+ LOG_DD ("got an empty list of overloads choice");
+ return;
}
- THROW_IF_FAIL (debugger ()) ;
- ChooseOverloadsDialog dialog (plugin_path (), a_entries) ;
- int result = dialog.run () ;
+ THROW_IF_FAIL (debugger ());
+ ChooseOverloadsDialog dialog (plugin_path (), a_entries);
+ int result = dialog.run ();
if (result != Gtk::RESPONSE_OK) {
debugger ()->choose_function_overload (0)/*cancel*/;
- return ;
+ return;
}
vector<IDebugger::OverloadsChoiceEntry> overloads =
- dialog.overloaded_functions () ;
+ dialog.overloaded_functions ();
- vector<IDebugger::OverloadsChoiceEntry>::const_iterator it ;
- vector<int> nums ;
- for (it = overloads.begin () ; it != overloads.end () ; ++it) {
- nums.push_back (it->index ()) ;
+ vector<IDebugger::OverloadsChoiceEntry>::const_iterator it;
+ vector<int> nums;
+ for (it = overloads.begin (); it != overloads.end (); ++it) {
+ nums.push_back (it->index ());
}
if (!nums.empty ())
- debugger ()->choose_function_overloads (nums) ;
+ debugger ()->choose_function_overloads (nums);
}
bool
DBGPerspective::apply_decorations_to_text (const UString &a_file_path)
{
- SourceEditor *editor = get_source_editor_from_path (a_file_path) ;
- RETURN_VAL_IF_FAIL (editor, false) ;
+ SourceEditor *editor = get_source_editor_from_path (a_file_path);
+ RETURN_VAL_IF_FAIL (editor, false);
- map<int, IDebugger::BreakPoint>::const_iterator it ;
- for (it = m_priv->breakpoints.begin () ;
+ map<int, IDebugger::BreakPoint>::const_iterator it;
+ for (it = m_priv->breakpoints.begin ();
it != m_priv->breakpoints.end ();
++it) {
if (a_file_path == it->second.file_full_name ()) {
- append_visual_breakpoint (a_file_path, it->second.line () - 1) ;
+ append_visual_breakpoint (a_file_path, it->second.line () - 1);
}
}
//scroll to the line that was precedently selected
//or to the one pointed to by the current line marker
- bool scroll_to_where_marker = false ;
- int cur_line = editor->current_line () ;
+ bool scroll_to_where_marker = false;
+ int cur_line = editor->current_line ();
if (cur_line > 0) {
- LOG_DD ("scroll to cur_line: " << (int)cur_line) ;
+ LOG_DD ("scroll to cur_line: " << (int)cur_line);
Gtk::TextBuffer::iterator iter =
- editor->source_view().get_buffer ()->get_iter_at_line (cur_line) ;
+ editor->source_view().get_buffer ()->get_iter_at_line (cur_line);
if (iter)
- editor->source_view ().get_buffer ()->place_cursor (iter) ;
- editor->scroll_to_line (cur_line) ;
- scroll_to_where_marker=false ;
+ editor->source_view ().get_buffer ()->place_cursor (iter);
+ editor->scroll_to_line (cur_line);
+ scroll_to_where_marker=false;
} else {
- scroll_to_where_marker=true ;
+ scroll_to_where_marker=true;
}
if (m_priv->current_frame.file_name () == a_file_path) {
set_where (m_priv->current_frame.file_name (),
m_priv->current_frame.line (),
- scroll_to_where_marker) ;
+ scroll_to_where_marker);
}
- return true ;
+ return true;
}
bool
DBGPerspective::delete_breakpoint (const UString &a_file_name,
int a_line_num)
{
- int breakpoint_number=0 ;
- bool enabled=false ;
+ int breakpoint_number=0;
+ bool enabled=false;
if (!get_breakpoint_number (a_file_name, a_line_num,
breakpoint_number, enabled)) {
- return false ;
+ return false;
}
if (breakpoint_number < 1) {return false;}
- return delete_breakpoint (breakpoint_number) ;
+ return delete_breakpoint (breakpoint_number);
}
bool
@@ -5440,12 +5487,12 @@
int a_line_num,
bool &a_enabled)
{
- int break_num=0 ;
+ int break_num=0;
if (get_breakpoint_number (a_file_path, a_line_num,
break_num, a_enabled)) {
- return true ;
+ return true;
}
- return false ;
+ return false;
}
void
@@ -5453,32 +5500,32 @@
int a_line_num)
{
LOG_DD ("file_path:" << a_file_path
- << ", line_num: " << a_file_path) ;
+ << ", line_num: " << a_file_path);
- bool enabled=false ;
+ bool enabled=false;
if (is_breakpoint_set_at_line (a_file_path, a_line_num, enabled)) {
- LOG_DD ("breakpoint set already, delete it!") ;
- delete_breakpoint (a_file_path, a_line_num) ;
+ LOG_DD ("breakpoint set already, delete it!");
+ delete_breakpoint (a_file_path, a_line_num);
} else {
- LOG_DD ("breakpoint no set yet, set it!") ;
- set_breakpoint (a_file_path, a_line_num, "") ;
+ LOG_DD ("breakpoint no set yet, set it!");
+ set_breakpoint (a_file_path, a_line_num, "");
}
}
void
DBGPerspective::toggle_breakpoint ()
{
- SourceEditor *source_editor = get_current_source_editor () ;
- THROW_IF_FAIL (source_editor) ;
- UString path ;
- source_editor->get_path (path) ;
- THROW_IF_FAIL (path != "") ;
+ SourceEditor *source_editor = get_current_source_editor ();
+ THROW_IF_FAIL (source_editor);
+ UString path;
+ source_editor->get_path (path);
+ THROW_IF_FAIL (path != "");
int current_line =
source_editor->source_view ().get_source_buffer ()->get_insert
()->get_iter ().get_line () + 1;
if (current_line >= 0)
- toggle_breakpoint (path, current_line) ;
+ toggle_breakpoint (path, current_line);
}
void
@@ -5488,11 +5535,11 @@
case SetBreakpointDialog::MODE_SOURCE_LOCATION:
{
UString filename;
- filename = a_dialog.file_name () ;
- THROW_IF_FAIL (filename != "") ;
- int line = a_dialog.line_number () ;
+ filename = a_dialog.file_name ();
+ THROW_IF_FAIL (filename != "");
+ int line = a_dialog.line_number ();
LOG_DD ("setting breakpoint in file "
- << filename << " at line " << line) ;
+ << filename << " at line " << line);
set_breakpoint (filename, line, a_dialog.condition ());
break;
}
@@ -5500,7 +5547,7 @@
case SetBreakpointDialog::MODE_FUNCTION_NAME:
{
UString function = a_dialog.function ();
- THROW_IF_FAIL (function != "") ;
+ THROW_IF_FAIL (function != "");
set_breakpoint (function, a_dialog.condition ());
break;
}
@@ -5522,11 +5569,11 @@
void
DBGPerspective::set_breakpoint_at_current_line_using_dialog ()
{
- SourceEditor *source_editor = get_current_source_editor () ;
- THROW_IF_FAIL (source_editor) ;
- UString path ;
- source_editor->get_path (path) ;
- THROW_IF_FAIL (path != "") ;
+ SourceEditor *source_editor = get_current_source_editor ();
+ THROW_IF_FAIL (source_editor);
+ UString path;
+ source_editor->get_path (path);
+ THROW_IF_FAIL (path != "");
int current_line =
source_editor->source_view ().get_source_buffer ()->get_insert
()->get_iter ().get_line () + 1;
@@ -5538,9 +5585,9 @@
DBGPerspective::set_breakpoint_using_dialog ()
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
- SetBreakpointDialog dialog (plugin_path ()) ;
+ SetBreakpointDialog dialog (plugin_path ());
- int result = dialog.run () ;
+ int result = dialog.run ();
if (result != Gtk::RESPONSE_OK) {
return;
}
@@ -5555,11 +5602,11 @@
THROW_IF_FAIL (!a_file_name.empty ());
THROW_IF_FAIL (a_line_num > 0);
- SetBreakpointDialog dialog (plugin_path ()) ;
+ SetBreakpointDialog dialog (plugin_path ());
dialog.mode (SetBreakpointDialog::MODE_SOURCE_LOCATION);
dialog.file_name (a_file_name);
dialog.line_number (a_line_num);
- int result = dialog.run () ;
+ int result = dialog.run ();
if (result != Gtk::RESPONSE_OK) {
return;
}
@@ -5583,24 +5630,24 @@
void
DBGPerspective::refresh_locals ()
{
- get_local_vars_inspector ().show_local_variables_of_current_function () ;
+ get_local_vars_inspector ().show_local_variables_of_current_function ();
}
void
DBGPerspective::toggle_breakpoint_enabled ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
- SourceEditor *source_editor = get_current_source_editor () ;
- THROW_IF_FAIL (source_editor) ;
- UString path ;
- source_editor->get_path (path) ;
- THROW_IF_FAIL (path != "") ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
+ SourceEditor *source_editor = get_current_source_editor ();
+ THROW_IF_FAIL (source_editor);
+ UString path;
+ source_editor->get_path (path);
+ THROW_IF_FAIL (path != "");
gint current_line =
source_editor->source_view ().get_source_buffer ()->get_insert
()->get_iter ().get_line () + 1;
if (current_line >= 0)
- toggle_breakpoint_enabled (path, current_line) ;
+ toggle_breakpoint_enabled (path, current_line);
}
void
@@ -5608,50 +5655,50 @@
int a_line_num)
{
LOG_DD ("file_path:" << a_file_path
- << ", line_num: " << a_line_num) ;
+ << ", line_num: " << a_line_num);
- int break_num=-1 ;
- bool enabled=false ;
+ int break_num=-1;
+ bool enabled=false;
if (get_breakpoint_number (a_file_path, a_line_num, break_num, enabled)
&& break_num > 0) {
- LOG_DD ("breakpoint set") ;
+ LOG_DD ("breakpoint set");
if (enabled) {
- debugger ()->disable_breakpoint (break_num) ;
+ debugger ()->disable_breakpoint (break_num);
} else {
- debugger ()->enable_breakpoint (break_num) ;
+ debugger ()->enable_breakpoint (break_num);
}
} else {
- LOG_DD ("breakpoint no set") ;
+ LOG_DD ("breakpoint no set");
}
}
void
DBGPerspective::inspect_variable ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
- Gtk::TextIter start, end ;
- SourceEditor *source_editor = get_current_source_editor () ;
- THROW_IF_FAIL (source_editor) ;
+ Gtk::TextIter start, end;
+ SourceEditor *source_editor = get_current_source_editor ();
+ THROW_IF_FAIL (source_editor);
Glib::RefPtr<gtksourceview::SourceBuffer> buffer =
- source_editor->source_view ().get_source_buffer () ;
- THROW_IF_FAIL (buffer) ;
- UString variable_name ;
+ source_editor->source_view ().get_source_buffer ();
+ THROW_IF_FAIL (buffer);
+ UString variable_name;
if (buffer->get_selection_bounds (start, end)) {
- variable_name= buffer->get_slice (start, end) ;
+ variable_name= buffer->get_slice (start, end);
}
- inspect_variable (variable_name) ;
+ inspect_variable (variable_name);
}
void
DBGPerspective::inspect_variable (const UString &a_variable_name)
{
- THROW_IF_FAIL (debugger ()) ;
- VarInspectorDialog dialog (plugin_path (), debugger ()) ;
+ THROW_IF_FAIL (debugger ());
+ VarInspectorDialog dialog (plugin_path (), debugger ());
if (a_variable_name != "") {
- dialog.inspect_variable (a_variable_name) ;
+ dialog.inspect_variable (a_variable_name);
}
- dialog.run () ;
+ dialog.run ();
}
void
@@ -5671,7 +5718,7 @@
void
DBGPerspective::call_function (const UString &a_call_expr)
{
- THROW_IF_FAIL (debugger ()) ;
+ THROW_IF_FAIL (debugger ());
debugger ()->call_function (a_call_expr);
}
@@ -5682,270 +5729,272 @@
{
if (!m_priv->debugger) {
DynamicModule::Loader *loader =
- workbench ().get_dynamic_module ().get_module_loader () ;
- THROW_IF_FAIL (loader) ;
+ workbench ().get_dynamic_module ().get_module_loader ();
+ THROW_IF_FAIL (loader);
DynamicModuleManager *module_manager =
- loader->get_dynamic_module_manager () ;
- THROW_IF_FAIL (module_manager) ;
+ loader->get_dynamic_module_manager ();
+ THROW_IF_FAIL (module_manager);
- UString debugger_dynmod_name ;
+ UString debugger_dynmod_name;
get_conf_mgr ().get_key_value (CONF_KEY_DEBUGGER_ENGINE_DYNMOD_NAME,
- debugger_dynmod_name) ;
+ debugger_dynmod_name);
LOG_DD ("got debugger_dynmod_name from confmgr: '"
<< debugger_dynmod_name << "'");
if (debugger_dynmod_name == "") {
- debugger_dynmod_name = "gdbengine" ;
+ debugger_dynmod_name = "gdbengine";
}
- LOG_DD ("using debugger_dynmod_name: '" << debugger_dynmod_name << "'") ;
+ LOG_DD ("using debugger_dynmod_name: '"
+ << debugger_dynmod_name << "'");
m_priv->debugger =
module_manager->load_iface<IDebugger> (debugger_dynmod_name,
- "IDebugger") ;
- IConfMgrSafePtr conf_mgr = workbench ().get_configuration_manager () ;
- m_priv->debugger->do_init (conf_mgr) ;
+ "IDebugger");
+ IConfMgrSafePtr conf_mgr = workbench ().get_configuration_manager ();
+ m_priv->debugger->do_init (conf_mgr);
m_priv->debugger->set_event_loop_context
- (Glib::MainContext::get_default ()) ;
+ (Glib::MainContext::get_default ());
}
- THROW_IF_FAIL (m_priv->debugger) ;
- return m_priv->debugger ;
+ THROW_IF_FAIL (m_priv->debugger);
+ return m_priv->debugger;
}
IConfMgr&
DBGPerspective::get_conf_mgr ()
{
- IConfMgrSafePtr conf_mgr = workbench ().get_configuration_manager () ;
- THROW_IF_FAIL (conf_mgr) ;
- return *conf_mgr ;
+ IConfMgrSafePtr conf_mgr = workbench ().get_configuration_manager ();
+ THROW_IF_FAIL (conf_mgr);
+ return *conf_mgr;
}
Gtk::TextView&
DBGPerspective::get_command_view ()
{
- THROW_IF_FAIL (m_priv && m_priv->command_view) ;
- return *m_priv->command_view ;
+ THROW_IF_FAIL (m_priv && m_priv->command_view);
+ return *m_priv->command_view;
}
Gtk::ScrolledWindow&
DBGPerspective::get_command_view_scrolled_win ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->command_view_scrolled_win) {
- m_priv->command_view_scrolled_win.reset (new Gtk::ScrolledWindow) ;
+ m_priv->command_view_scrolled_win.reset (new Gtk::ScrolledWindow);
m_priv->command_view_scrolled_win->set_policy (Gtk::POLICY_AUTOMATIC,
- Gtk::POLICY_AUTOMATIC) ;
- THROW_IF_FAIL (m_priv->command_view_scrolled_win) ;
+ Gtk::POLICY_AUTOMATIC);
+ THROW_IF_FAIL (m_priv->command_view_scrolled_win);
}
- return *m_priv->command_view_scrolled_win ;
+ return *m_priv->command_view_scrolled_win;
}
Gtk::TextView&
DBGPerspective::get_target_output_view ()
{
- THROW_IF_FAIL (m_priv && m_priv->target_output_view) ;
- return *m_priv->target_output_view ;
+ THROW_IF_FAIL (m_priv && m_priv->target_output_view);
+ return *m_priv->target_output_view;
}
Gtk::ScrolledWindow&
DBGPerspective::get_target_output_view_scrolled_win ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->target_output_view_scrolled_win) {
- m_priv->target_output_view_scrolled_win.reset (new Gtk::ScrolledWindow) ;
+ m_priv->target_output_view_scrolled_win.reset
+ (new Gtk::ScrolledWindow);
m_priv->target_output_view_scrolled_win->set_policy
(Gtk::POLICY_AUTOMATIC,
- Gtk::POLICY_AUTOMATIC) ;
- THROW_IF_FAIL (m_priv->target_output_view_scrolled_win) ;
+ Gtk::POLICY_AUTOMATIC);
+ THROW_IF_FAIL (m_priv->target_output_view_scrolled_win);
}
- return *m_priv->target_output_view_scrolled_win ;
+ return *m_priv->target_output_view_scrolled_win;
}
Gtk::TextView&
DBGPerspective::get_log_view ()
{
- THROW_IF_FAIL (m_priv && m_priv->log_view) ;
- return *m_priv->log_view ;
+ THROW_IF_FAIL (m_priv && m_priv->log_view);
+ return *m_priv->log_view;
}
Gtk::ScrolledWindow&
DBGPerspective::get_log_view_scrolled_win ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->log_view_scrolled_win) {
- m_priv->log_view_scrolled_win.reset (new Gtk::ScrolledWindow) ;
+ m_priv->log_view_scrolled_win.reset (new Gtk::ScrolledWindow);
m_priv->log_view_scrolled_win->set_policy (Gtk::POLICY_AUTOMATIC,
- Gtk::POLICY_AUTOMATIC) ;
- THROW_IF_FAIL (m_priv->log_view_scrolled_win) ;
+ Gtk::POLICY_AUTOMATIC);
+ THROW_IF_FAIL (m_priv->log_view_scrolled_win);
}
- return *m_priv->log_view_scrolled_win ;
+ return *m_priv->log_view_scrolled_win;
}
CallStack&
DBGPerspective::get_call_stack ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->call_stack) {
- m_priv->call_stack.reset (new CallStack (debugger (), workbench (), *this)) ;
- THROW_IF_FAIL (m_priv) ;
+ m_priv->call_stack.reset (new CallStack (debugger (), workbench (), *this));
+ THROW_IF_FAIL (m_priv);
}
- return *m_priv->call_stack ;
+ return *m_priv->call_stack;
}
Gtk::HPaned&
DBGPerspective::get_call_stack_paned ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->call_stack_paned) {
- m_priv->call_stack_paned.reset (new Gtk::HPaned ()) ;
- THROW_IF_FAIL (m_priv->call_stack_paned) ;
+ m_priv->call_stack_paned.reset (new Gtk::HPaned ());
+ THROW_IF_FAIL (m_priv->call_stack_paned);
}
- return *m_priv->call_stack_paned ;
+ return *m_priv->call_stack_paned;
}
Gtk::ScrolledWindow&
DBGPerspective::get_call_stack_scrolled_win ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->call_stack_scrolled_win) {
- m_priv->call_stack_scrolled_win.reset (new Gtk::ScrolledWindow ()) ;
+ m_priv->call_stack_scrolled_win.reset (new Gtk::ScrolledWindow ());
m_priv->call_stack_scrolled_win->set_policy (Gtk::POLICY_AUTOMATIC,
- Gtk::POLICY_AUTOMATIC) ;
- THROW_IF_FAIL (m_priv->call_stack_scrolled_win) ;
+ Gtk::POLICY_AUTOMATIC);
+ THROW_IF_FAIL (m_priv->call_stack_scrolled_win);
}
- return *m_priv->call_stack_scrolled_win ;
+ return *m_priv->call_stack_scrolled_win;
}
Gtk::ScrolledWindow&
DBGPerspective::get_thread_list_scrolled_win ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->thread_list_scrolled_win) {
- m_priv->thread_list_scrolled_win.reset (new Gtk::ScrolledWindow ()) ;
+ m_priv->thread_list_scrolled_win.reset (new Gtk::ScrolledWindow ());
m_priv->thread_list_scrolled_win->set_policy (Gtk::POLICY_AUTOMATIC,
- Gtk::POLICY_AUTOMATIC) ;
- THROW_IF_FAIL (m_priv->thread_list_scrolled_win) ;
+ Gtk::POLICY_AUTOMATIC);
+ THROW_IF_FAIL (m_priv->thread_list_scrolled_win);
}
- return *m_priv->thread_list_scrolled_win ;
+ return *m_priv->thread_list_scrolled_win;
}
LocalVarsInspector&
DBGPerspective::get_local_vars_inspector ()
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->workbench) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->workbench);
if (!m_priv->variables_editor) {
m_priv->variables_editor.reset
(new LocalVarsInspector (debugger (),
*m_priv->workbench,
- *this)) ;
+ *this));
}
- THROW_IF_FAIL (m_priv->variables_editor) ;
- return *m_priv->variables_editor ;
+ THROW_IF_FAIL (m_priv->variables_editor);
+ return *m_priv->variables_editor;
}
Gtk::ScrolledWindow&
DBGPerspective::get_local_vars_inspector_scrolled_win ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->variables_editor_scrolled_win) {
- m_priv->variables_editor_scrolled_win.reset (new Gtk::ScrolledWindow) ;
- m_priv->variables_editor_scrolled_win->set_policy (Gtk::POLICY_AUTOMATIC,
- Gtk::POLICY_AUTOMATIC);
+ m_priv->variables_editor_scrolled_win.reset (new Gtk::ScrolledWindow);
+ m_priv->variables_editor_scrolled_win->set_policy
+ (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
}
- THROW_IF_FAIL (m_priv->variables_editor_scrolled_win) ;
- return *m_priv->variables_editor_scrolled_win ;
+ THROW_IF_FAIL (m_priv->variables_editor_scrolled_win);
+ return *m_priv->variables_editor_scrolled_win;
}
Terminal&
DBGPerspective::get_terminal ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->terminal) {
- m_priv->terminal.reset (new Terminal) ;
+ m_priv->terminal.reset (new Terminal);
}
- THROW_IF_FAIL (m_priv->terminal) ;
- return *m_priv->terminal ;
+ THROW_IF_FAIL (m_priv->terminal);
+ return *m_priv->terminal;
}
Gtk::Box &
DBGPerspective::get_terminal_box ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->terminal_box) {
- m_priv->terminal_box.reset (new Gtk::HBox) ;
- THROW_IF_FAIL (m_priv->terminal_box) ;
- Gtk::VScrollbar *scrollbar = Gtk::manage (new Gtk::VScrollbar) ;
- m_priv->terminal_box->pack_end (*scrollbar, false, false, 0) ;
- m_priv->terminal_box->pack_start (get_terminal ().widget ()) ;
- scrollbar->set_adjustment (get_terminal ().adjustment ()) ;
+ m_priv->terminal_box.reset (new Gtk::HBox);
+ THROW_IF_FAIL (m_priv->terminal_box);
+ Gtk::VScrollbar *scrollbar = Gtk::manage (new Gtk::VScrollbar);
+ m_priv->terminal_box->pack_end (*scrollbar, false, false, 0);
+ m_priv->terminal_box->pack_start (get_terminal ().widget ());
+ scrollbar->set_adjustment (get_terminal ().adjustment ());
}
- THROW_IF_FAIL (m_priv->terminal_box) ;
+ THROW_IF_FAIL (m_priv->terminal_box);
return *m_priv->terminal_box;
}
Gtk::ScrolledWindow&
DBGPerspective::get_breakpoints_scrolled_win ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->breakpoints_scrolled_win) {
- m_priv->breakpoints_scrolled_win.reset (new Gtk::ScrolledWindow) ;
- THROW_IF_FAIL (m_priv->breakpoints_scrolled_win) ;
+ m_priv->breakpoints_scrolled_win.reset (new Gtk::ScrolledWindow);
+ THROW_IF_FAIL (m_priv->breakpoints_scrolled_win);
m_priv->breakpoints_scrolled_win->set_policy (Gtk::POLICY_AUTOMATIC,
- Gtk::POLICY_AUTOMATIC) ;
+ Gtk::POLICY_AUTOMATIC);
}
- THROW_IF_FAIL (m_priv->breakpoints_scrolled_win) ;
- return *m_priv->breakpoints_scrolled_win ;
+ THROW_IF_FAIL (m_priv->breakpoints_scrolled_win);
+ return *m_priv->breakpoints_scrolled_win;
}
BreakpointsView&
DBGPerspective::get_breakpoints_view ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->breakpoints_view) {
m_priv->breakpoints_view.reset (new BreakpointsView (
- workbench (), *this, debugger ())) ;
+ workbench (), *this, debugger ()));
}
- THROW_IF_FAIL (m_priv->breakpoints_view) ;
- return *m_priv->breakpoints_view ;
+ THROW_IF_FAIL (m_priv->breakpoints_view);
+ return *m_priv->breakpoints_view;
}
Gtk::ScrolledWindow&
DBGPerspective::get_registers_scrolled_win ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->registers_scrolled_win) {
- m_priv->registers_scrolled_win.reset (new Gtk::ScrolledWindow) ;
- THROW_IF_FAIL (m_priv->registers_scrolled_win) ;
+ m_priv->registers_scrolled_win.reset (new Gtk::ScrolledWindow);
+ THROW_IF_FAIL (m_priv->registers_scrolled_win);
m_priv->registers_scrolled_win->set_policy (Gtk::POLICY_AUTOMATIC,
- Gtk::POLICY_AUTOMATIC) ;
+ Gtk::POLICY_AUTOMATIC);
}
- THROW_IF_FAIL (m_priv->registers_scrolled_win) ;
- return *m_priv->registers_scrolled_win ;
+ THROW_IF_FAIL (m_priv->registers_scrolled_win);
+ return *m_priv->registers_scrolled_win;
}
RegistersView&
DBGPerspective::get_registers_view ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->registers_view) {
- m_priv->registers_view.reset (new RegistersView (debugger ())) ;
+ m_priv->registers_view.reset (new RegistersView (debugger ()));
}
- THROW_IF_FAIL (m_priv->registers_view) ;
- return *m_priv->registers_view ;
+ THROW_IF_FAIL (m_priv->registers_view);
+ return *m_priv->registers_view;
}
#ifdef WITH_MEMORYVIEW
MemoryView&
DBGPerspective::get_memory_view ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->memory_view) {
- m_priv->memory_view.reset (new MemoryView (debugger ())) ;
+ m_priv->memory_view.reset (new MemoryView (debugger ()));
}
- THROW_IF_FAIL (m_priv->memory_view) ;
- return *m_priv->memory_view ;
+ THROW_IF_FAIL (m_priv->memory_view);
+ return *m_priv->memory_view;
}
#endif // WITH_MEMORYVIEW
@@ -5955,14 +6004,14 @@
if (a_show) {
if (!get_command_view_scrolled_win ().get_parent ()
&& m_priv->command_view_is_visible == false) {
- get_command_view_scrolled_win ().show_all () ;
+ get_command_view_scrolled_win ().show_all ();
int pagenum =
m_priv->statuses_notebook->insert_page
(get_command_view_scrolled_win (),
_("Commands"),
- COMMAND_VIEW_INDEX) ;
- m_priv->statuses_notebook->set_current_page (pagenum) ;
- m_priv->command_view_is_visible = true ;
+ COMMAND_VIEW_INDEX);
+ m_priv->statuses_notebook->set_current_page (pagenum);
+ m_priv->command_view_is_visible = true;
}
} else {
if (get_command_view_scrolled_win ().get_parent ()
@@ -5972,7 +6021,7 @@
m_priv->command_view_is_visible = false;
}
}
- show_command_view_signal ().emit (a_show) ;
+ show_command_view_signal ().emit (a_show);
}
void
@@ -5981,13 +6030,13 @@
if (a_show) {
if (!get_target_output_view_scrolled_win ().get_parent ()
&& m_priv->target_output_view_is_visible == false) {
- get_target_output_view_scrolled_win ().show_all () ;
+ get_target_output_view_scrolled_win ().show_all ();
int page_num =
m_priv->statuses_notebook->insert_page
(get_target_output_view_scrolled_win (),
_("Output"),
- TARGET_OUTPUT_VIEW_INDEX) ;
- m_priv->target_output_view_is_visible = true ;
+ TARGET_OUTPUT_VIEW_INDEX);
+ m_priv->target_output_view_is_visible = true;
m_priv->statuses_notebook->set_current_page (page_num);
}
} else {
@@ -5999,7 +6048,7 @@
}
m_priv->target_output_view_is_visible = false;
}
- show_target_output_view_signal ().emit (a_show) ;
+ show_target_output_view_signal ().emit (a_show);
}
void
@@ -6008,23 +6057,23 @@
if (a_show) {
if (!get_log_view_scrolled_win ().get_parent ()
&& m_priv->log_view_is_visible == false) {
- get_log_view_scrolled_win ().show_all () ;
+ get_log_view_scrolled_win ().show_all ();
int page_num =
m_priv->statuses_notebook->insert_page
- (get_log_view_scrolled_win (), _("Logs"), ERROR_VIEW_INDEX) ;
- m_priv->log_view_is_visible = true ;
+ (get_log_view_scrolled_win (), _("Logs"), ERROR_VIEW_INDEX);
+ m_priv->log_view_is_visible = true;
m_priv->statuses_notebook->set_current_page (page_num);
}
} else {
if (get_log_view_scrolled_win ().get_parent ()
&& m_priv->log_view_is_visible) {
- LOG_DD ("removing log view") ;
+ LOG_DD ("removing log view");
m_priv->statuses_notebook->remove_page
(get_log_view_scrolled_win ());
}
m_priv->log_view_is_visible = false;
}
- show_log_view_signal ().emit (a_show) ;
+ show_log_view_signal ().emit (a_show);
}
void
@@ -6033,19 +6082,19 @@
if (a_show) {
if (!get_call_stack_paned ().get_parent ()
&& m_priv->call_stack_view_is_visible == false) {
- get_call_stack_paned ().show_all () ;
+ get_call_stack_paned ().show_all ();
int page_num = m_priv->statuses_notebook->insert_page
(get_call_stack_paned (),
CALL_STACK_TITLE,
- CALL_STACK_VIEW_INDEX) ;
- m_priv->call_stack_view_is_visible = true ;
+ CALL_STACK_VIEW_INDEX);
+ m_priv->call_stack_view_is_visible = true;
m_priv->statuses_notebook->set_current_page
(page_num);
}
} else {
if (get_call_stack_paned ().get_parent ()
&& m_priv->call_stack_view_is_visible) {
- LOG_DD ("removing call stack view") ;
+ LOG_DD ("removing call stack view");
m_priv->statuses_notebook->remove_page
(get_call_stack_paned ());
m_priv->call_stack_view_is_visible = false;
@@ -6060,21 +6109,20 @@
if (a_show) {
if (!get_local_vars_inspector_scrolled_win ().get_parent ()
&& m_priv->variables_editor_view_is_visible == false) {
- get_local_vars_inspector_scrolled_win ().show_all () ;
+ get_local_vars_inspector_scrolled_win ().show_all ();
int page_num = m_priv->statuses_notebook->insert_page
- (get_local_vars_inspector_scrolled_win (),
- LOCAL_VARIABLES_TITLE,
- VARIABLES_VIEW_INDEX) ;
- m_priv->variables_editor_view_is_visible = true ;
- m_priv->statuses_notebook->set_current_page
- (page_num);
+ (get_local_vars_inspector_scrolled_win (),
+ LOCAL_VARIABLES_TITLE,
+ VARIABLES_VIEW_INDEX);
+ m_priv->variables_editor_view_is_visible = true;
+ m_priv->statuses_notebook->set_current_page (page_num);
}
} else {
if (get_local_vars_inspector_scrolled_win ().get_parent ()
&& m_priv->variables_editor_view_is_visible) {
- LOG_DD ("removing variables editor") ;
+ LOG_DD ("removing variables editor");
m_priv->statuses_notebook->remove_page
- (get_local_vars_inspector_scrolled_win ());
+ (get_local_vars_inspector_scrolled_win ());
m_priv->variables_editor_view_is_visible = false;
}
m_priv->variables_editor_view_is_visible = false;
@@ -6087,18 +6135,18 @@
if (a_show) {
if (!get_terminal_box ().get_parent ()
&& m_priv->terminal_view_is_visible == false) {
- get_terminal_box ().show_all () ;
+ get_terminal_box ().show_all ();
int page_num = m_priv->statuses_notebook->insert_page
(get_terminal_box (),
TARGET_TERMINAL_TITLE,
- TERMINAL_VIEW_INDEX) ;
- m_priv->terminal_view_is_visible = true ;
+ TERMINAL_VIEW_INDEX);
+ m_priv->terminal_view_is_visible = true;
m_priv->statuses_notebook->set_current_page (page_num);
}
} else {
if (get_terminal_box ().get_parent ()
&& m_priv->terminal_view_is_visible) {
- LOG_DD ("removing terminal view") ;
+ LOG_DD ("removing terminal view");
m_priv->statuses_notebook->remove_page
(get_terminal_box ());
m_priv->terminal_view_is_visible = false;
@@ -6113,18 +6161,18 @@
if (a_show) {
if (!get_breakpoints_scrolled_win ().get_parent ()
&& m_priv->breakpoints_view_is_visible == false) {
- get_breakpoints_scrolled_win ().show_all () ;
+ get_breakpoints_scrolled_win ().show_all ();
int page_num = m_priv->statuses_notebook->insert_page
(get_breakpoints_scrolled_win (),
BREAKPOINTS_TITLE,
- BREAKPOINTS_VIEW_INDEX) ;
- m_priv->breakpoints_view_is_visible = true ;
+ BREAKPOINTS_VIEW_INDEX);
+ m_priv->breakpoints_view_is_visible = true;
m_priv->statuses_notebook->set_current_page (page_num);
}
} else {
if (get_breakpoints_scrolled_win ().get_parent ()
&& m_priv->breakpoints_view_is_visible) {
- LOG_DD ("removing breakpoints view") ;
+ LOG_DD ("removing breakpoints view");
m_priv->statuses_notebook->remove_page
(get_breakpoints_scrolled_win ());
m_priv->breakpoints_view_is_visible = false;
@@ -6139,18 +6187,18 @@
if (a_show) {
if (!get_registers_scrolled_win ().get_parent ()
&& m_priv->registers_view_is_visible == false) {
- get_registers_scrolled_win ().show_all () ;
+ get_registers_scrolled_win ().show_all ();
int page_num = m_priv->statuses_notebook->insert_page
(get_registers_scrolled_win (),
REGISTERS_VIEW_TITLE,
- REGISTERS_VIEW_INDEX) ;
- m_priv->registers_view_is_visible = true ;
+ REGISTERS_VIEW_INDEX);
+ m_priv->registers_view_is_visible = true;
m_priv->statuses_notebook->set_current_page (page_num);
}
} else {
if (get_registers_scrolled_win ().get_parent ()
&& m_priv->registers_view_is_visible) {
- LOG_DD ("removing registers view") ;
+ LOG_DD ("removing registers view");
m_priv->statuses_notebook->remove_page
(get_registers_scrolled_win ());
m_priv->registers_view_is_visible = false;
@@ -6166,18 +6214,18 @@
if (a_show) {
if (!get_memory_view ().widget ().get_parent ()
&& m_priv->memory_view_is_visible == false) {
- get_memory_view ().widget ().show_all () ;
+ get_memory_view ().widget ().show_all ();
int page_num = m_priv->statuses_notebook->insert_page
(get_memory_view ().widget (),
MEMORY_VIEW_TITLE,
- MEMORY_VIEW_INDEX) ;
- m_priv->memory_view_is_visible = true ;
+ MEMORY_VIEW_INDEX);
+ m_priv->memory_view_is_visible = true;
m_priv->statuses_notebook->set_current_page (page_num);
}
} else {
if (get_memory_view ().widget ().get_parent ()
&& m_priv->memory_view_is_visible) {
- LOG_DD ("removing memory view") ;
+ LOG_DD ("removing memory view");
m_priv->statuses_notebook->remove_page
(get_memory_view ().widget ());
m_priv->memory_view_is_visible = false;
@@ -6189,7 +6237,7 @@
struct ScrollTextViewToEndClosure {
- Gtk::TextView* text_view ;
+ Gtk::TextView* text_view;
ScrollTextViewToEndClosure (Gtk::TextView *a_view=NULL) :
text_view (a_view)
@@ -6201,9 +6249,9 @@
if (!text_view) {return false;}
if (!text_view->get_buffer ()) {return false;}
- Gtk::TextIter end_iter = text_view->get_buffer ()->end () ;
- text_view->scroll_to (end_iter) ;
- return false ;
+ Gtk::TextIter end_iter = text_view->get_buffer ()->end ();
+ text_view->scroll_to (end_iter);
+ return false;
}
};//end struct ScrollTextViewToEndClosure
@@ -6213,96 +6261,96 @@
{
if (a_no_repeat) {
if (a_text == m_priv->last_command_text)
- return ;
+ return;
}
- THROW_IF_FAIL (m_priv && m_priv->command_view) ;
+ THROW_IF_FAIL (m_priv && m_priv->command_view);
m_priv->command_view->get_buffer ()->insert
- (get_command_view ().get_buffer ()->end (), a_text ) ;
- static ScrollTextViewToEndClosure s_scroll_to_end_closure ;
- s_scroll_to_end_closure.text_view = m_priv->command_view.get () ;
+ (get_command_view ().get_buffer ()->end (), a_text );
+ static ScrollTextViewToEndClosure s_scroll_to_end_closure;
+ s_scroll_to_end_closure.text_view = m_priv->command_view.get ();
Glib::signal_idle ().connect (sigc::mem_fun
- (s_scroll_to_end_closure, &ScrollTextViewToEndClosure::do_exec)) ;
- m_priv->last_command_text = a_text ;
+ (s_scroll_to_end_closure, &ScrollTextViewToEndClosure::do_exec));
+ m_priv->last_command_text = a_text;
}
void
DBGPerspective::add_text_to_target_output_view (const UString &a_text)
{
- THROW_IF_FAIL (m_priv && m_priv->target_output_view) ;
+ THROW_IF_FAIL (m_priv && m_priv->target_output_view);
m_priv->target_output_view->get_buffer ()->insert
(get_target_output_view ().get_buffer ()->end (),
- a_text) ;
- static ScrollTextViewToEndClosure s_scroll_to_end_closure ;
- s_scroll_to_end_closure.text_view = m_priv->target_output_view.get () ;
+ a_text);
+ static ScrollTextViewToEndClosure s_scroll_to_end_closure;
+ s_scroll_to_end_closure.text_view = m_priv->target_output_view.get ();
Glib::signal_idle ().connect (sigc::mem_fun
- (s_scroll_to_end_closure, &ScrollTextViewToEndClosure::do_exec)) ;
+ (s_scroll_to_end_closure, &ScrollTextViewToEndClosure::do_exec));
}
void
DBGPerspective::add_text_to_log_view (const UString &a_text)
{
- THROW_IF_FAIL (m_priv && m_priv->log_view) ;
+ THROW_IF_FAIL (m_priv && m_priv->log_view);
m_priv->log_view->get_buffer ()->insert
- (get_log_view ().get_buffer ()->end (), a_text) ;
- static ScrollTextViewToEndClosure s_scroll_to_end_closure ;
- s_scroll_to_end_closure.text_view = m_priv->log_view.get () ;
+ (get_log_view ().get_buffer ()->end (), a_text);
+ static ScrollTextViewToEndClosure s_scroll_to_end_closure;
+ s_scroll_to_end_closure.text_view = m_priv->log_view.get ();
Glib::signal_idle ().connect (sigc::mem_fun
- (s_scroll_to_end_closure, &ScrollTextViewToEndClosure::do_exec)) ;
+ (s_scroll_to_end_closure, &ScrollTextViewToEndClosure::do_exec));
}
sigc::signal<void, bool>&
DBGPerspective::activated_signal ()
{
- CHECK_P_INIT ;
- return m_priv->activated_signal ;
+ CHECK_P_INIT;
+ return m_priv->activated_signal;
}
sigc::signal<void, bool>&
DBGPerspective::attached_to_target_signal ()
{
- return m_priv->attached_to_target_signal ;
+ return m_priv->attached_to_target_signal;
}
sigc::signal<void, bool>&
DBGPerspective::debugger_ready_signal ()
{
- return m_priv->debugger_ready_signal ;
+ return m_priv->debugger_ready_signal;
}
sigc::signal<void>&
DBGPerspective::debugger_not_started_signal ()
{
- return m_priv->debugger_not_started_signal ;
+ return m_priv->debugger_not_started_signal;
}
sigc::signal<void>&
DBGPerspective::going_to_run_target_signal ()
{
- return m_priv->going_to_run_target_signal ;
+ return m_priv->going_to_run_target_signal;
}
sigc::signal<void>&
DBGPerspective::default_config_read_signal ()
{
- return m_priv->default_config_read_signal ;
+ return m_priv->default_config_read_signal;
}
sigc::signal<void, bool>&
DBGPerspective::show_command_view_signal ()
{
- return m_priv->show_command_view_signal ;
+ return m_priv->show_command_view_signal;
}
sigc::signal<void, bool>&
DBGPerspective::show_target_output_view_signal ()
{
- return m_priv->show_target_output_view_signal ;
+ return m_priv->show_target_output_view_signal;
}
sigc::signal<void, bool>&
DBGPerspective::show_log_view_signal ()
{
- return m_priv->show_log_view_signal ;
+ return m_priv->show_log_view_signal;
}
class DBGPerspectiveModule : DynamicModule {
@@ -6313,8 +6361,8 @@
{
static Info s_info ("Debugger perspective plugin",
"The debugger perspective of Nemiver",
- "1.0") ;
- a_info = s_info ;
+ "1.0");
+ a_info = s_info;
}
void do_init ()
@@ -6324,16 +6372,16 @@
bool lookup_interface (const std::string &a_iface_name,
DynModIfaceSafePtr &a_iface)
{
- LOG_DD ("looking up interface: " + a_iface_name) ;
+ LOG_DD ("looking up interface: " + a_iface_name);
if (a_iface_name == "IPerspective") {
- a_iface.reset (new DBGPerspective (this)) ;
+ a_iface.reset (new DBGPerspective (this));
} else if (a_iface_name == "IDBGPerspective") {
- a_iface.reset (new DBGPerspective (this)) ;
+ a_iface.reset (new DBGPerspective (this));
} else {
- return false ;
+ return false;
}
- LOG_DD ("interface " + a_iface_name + " found") ;
- return true ;
+ LOG_DD ("interface " + a_iface_name + " found");
+ return true;
}
};// end class DBGPerspective
@@ -6344,9 +6392,9 @@
bool
NEMIVER_API nemiver_common_create_dynamic_module_instance (void **a_new_instance)
{
- gtksourceview::init () ;
- *a_new_instance = new nemiver::DBGPerspectiveModule () ;
- return (*a_new_instance != 0) ;
+ gtksourceview::init ();
+ *a_new_instance = new nemiver::DBGPerspectiveModule ();
+ return (*a_new_instance != 0);
}
}//end extern C
Modified: trunk/src/persp/dbgperspective/nmv-dbg-perspective.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-dbg-perspective.h (original)
+++ trunk/src/persp/dbgperspective/nmv-dbg-perspective.h Tue Jul 29 22:45:24 2008
@@ -35,8 +35,8 @@
class NEMIVER_API IDBGPerspective : public IPerspective {
//non copyable
- IDBGPerspective (const IPerspective&) ;
- IDBGPerspective& operator= (const IPerspective&) ;
+ IDBGPerspective (const IPerspective&);
+ IDBGPerspective& operator= (const IPerspective&);
public:
@@ -60,7 +60,7 @@
virtual void open_file () = 0;
virtual bool open_file (const UString &a_uri,
- int current_line=-1)= 0 ;
+ int current_line=-1)= 0;
virtual void close_current_file () = 0;
@@ -114,12 +114,12 @@
const UString &a_condition="") = 0;
virtual void append_breakpoints
- (const map<int, IDebugger::BreakPoint> &a_breaks) = 0 ;
+ (const map<int, IDebugger::BreakPoint> &a_breaks) = 0;
virtual bool get_breakpoint_number (const UString &a_file_name,
int a_linenum,
int &a_break_num,
- bool &a_enabled) = 0 ;
+ bool &a_enabled) = 0;
virtual bool delete_breakpoint () = 0;
Modified: trunk/src/persp/dbgperspective/nmv-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-dialog.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-dialog.cc Tue Jul 29 22:45:24 2008
@@ -32,36 +32,36 @@
#include "nmv-ui-utils.h"
#include "nmv-dialog.h"
-using namespace std ;
-using namespace nemiver::common ;
+using namespace std;
+using namespace nemiver::common;
namespace nemiver {
class Dialog::Priv {
- Priv () ;
+ Priv ();
public:
- SafePtr<Gtk::Dialog> dialog ;
- Glib::RefPtr<Gnome::Glade::Xml> glade ;
+ SafePtr<Gtk::Dialog> dialog;
+ Glib::RefPtr<Gnome::Glade::Xml> glade;
Priv (const UString &a_resource_root_path,
const UString &a_glade_filename,
const UString &a_widget_name)
{
- vector<string> path_elems ;
- path_elems.push_back (Glib::locale_from_utf8 (a_resource_root_path)) ;
+ vector<string> path_elems;
+ path_elems.push_back (Glib::locale_from_utf8 (a_resource_root_path));
path_elems.push_back ("glade");
path_elems.push_back (a_glade_filename);
- string glade_path = Glib::build_filename (path_elems) ;
+ string glade_path = Glib::build_filename (path_elems);
if (!Glib::file_test (glade_path, Glib::FILE_TEST_IS_REGULAR)) {
- THROW (UString ("could not find file ") + glade_path) ;
+ THROW (UString ("could not find file ") + glade_path);
}
- glade = Gnome::Glade::Xml::create (glade_path) ;
- THROW_IF_FAIL (glade) ;
+ glade = Gnome::Glade::Xml::create (glade_path);
+ THROW_IF_FAIL (glade);
dialog.reset
(ui_utils::get_widget_from_glade<Gtk::Dialog> (glade,
- a_widget_name)) ;
- THROW_IF_FAIL (dialog) ;
- dialog->hide () ;
+ a_widget_name));
+ THROW_IF_FAIL (dialog);
+ dialog->hide ();
}
};//end struct Dialog::Priv
@@ -71,23 +71,23 @@
{
m_priv.reset (new Priv (a_resource_root_path,
a_glade_filename,
- a_widget_name)) ;
+ a_widget_name));
}
Gtk::Dialog&
Dialog::widget () const
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->dialog) ;
- return *m_priv->dialog ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->dialog);
+ return *m_priv->dialog;
}
const Glib::RefPtr<Gnome::Glade::Xml>
Dialog::glade () const
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->glade) ;
- return m_priv->glade ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->glade);
+ return m_priv->glade;
}
Dialog::~Dialog ()
@@ -97,17 +97,17 @@
int
Dialog::run ()
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->dialog) ;
- return m_priv->dialog->run () ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->dialog);
+ return m_priv->dialog->run ();
}
void
Dialog::hide ()
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->dialog) ;
- return m_priv->dialog->hide () ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->dialog);
+ return m_priv->dialog->hide ();
}
}//end namespace nemiver
Modified: trunk/src/persp/dbgperspective/nmv-dialog.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-dialog.h (original)
+++ trunk/src/persp/dbgperspective/nmv-dialog.h Tue Jul 29 22:45:24 2008
@@ -29,52 +29,52 @@
#include "common/nmv-object.h"
namespace Gtk {
- class Dialog ;
+ class Dialog;
}
namespace Gnome {
namespace Glade {
- class Xml ;
+ class Xml;
}
}
NEMIVER_BEGIN_NAMESPACE (nemiver)
namespace common {
-class UString ;
+class UString;
}
-using nemiver::common::UString ;
-using nemiver::common::SafePtr ;
+using nemiver::common::UString;
+using nemiver::common::SafePtr;
class Dialog : public common::Object {
- class Priv ;
- friend class Priv ;
- SafePtr<Priv> m_priv ;
+ class Priv;
+ friend class Priv;
+ SafePtr<Priv> m_priv;
//non copyable
- Dialog (const Dialog&) ;
- Dialog& operator= (const Dialog&) ;
+ Dialog (const Dialog&);
+ Dialog& operator= (const Dialog&);
- Dialog () ;
+ Dialog ();
protected:
//the actual underlying Gtk::Dialog widget
- Gtk::Dialog& widget () const ;
+ Gtk::Dialog& widget () const;
//the actual glade object loaded by this dialog.
- const Glib::RefPtr<Gnome::Glade::Xml> glade () const ;
+ const Glib::RefPtr<Gnome::Glade::Xml> glade () const;
public:
Dialog (const UString &a_resource_root_path,
const UString &a_glade_filename,
- const UString &a_widget_name) ;
+ const UString &a_widget_name);
- virtual ~Dialog () ;
+ virtual ~Dialog ();
- virtual gint run () ;
+ virtual gint run ();
- virtual void hide () ;
+ virtual void hide ();
};//end class nemiver
Modified: trunk/src/persp/dbgperspective/nmv-file-list.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-file-list.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-file-list.cc Tue Jul 29 22:45:24 2008
@@ -34,20 +34,19 @@
namespace nemiver {
struct FileListColumns : public Gtk::TreeModel::ColumnRecord {
- Gtk::TreeModelColumn<Glib::ustring> display_name ;
- Gtk::TreeModelColumn<Glib::ustring> path ;
- Gtk::TreeModelColumn<Gtk::StockID> stock_icon ;
+ Gtk::TreeModelColumn<Glib::ustring> display_name;
+ Gtk::TreeModelColumn<Glib::ustring> path;
+ Gtk::TreeModelColumn<Gtk::StockID> stock_icon;
FileListColumns ()
{
- add (display_name) ;
- add (path) ;
- add (stock_icon) ;
+ add (display_name);
+ add (path);
+ add (stock_icon);
}
};//end Cols
-class FileListView : public Gtk::TreeView
-{
+class FileListView : public Gtk::TreeView {
public:
FileListView ();
virtual ~FileListView ();
@@ -61,20 +60,21 @@
sigc::signal<void> files_selected_signal;
protected:
+ typedef std::pair<UString, Gtk::TreeModel::iterator> StringTreeIterPair;
struct ComparePathMap :
- public std::binary_function<const std::pair<UString,
- Gtk::TreeModel::iterator>,
- const UString,
- bool> {
+ public std::binary_function<const StringTreeIterPair,
+ const UString, bool> {
bool
- operator()(const std::pair<UString, Gtk::TreeModel::iterator>& map,
- const UString& path_component)
+ operator() (const StringTreeIterPair &a_map,
+ const UString &a_path_component)
{
- return path_component == map.first;
+ return a_path_component == a_map.first;
}
- };
+ };//end struct ComparePathMap
- Gtk::TreeModel::iterator find_filename_recursive(const Gtk::TreeModel::iterator &a_iter, const UString &a_filename);
+ Gtk::TreeModel::iterator find_filename_recursive
+ (const Gtk::TreeModel::iterator &a_iter,
+ const UString &a_filename);
virtual void on_row_activated (const Gtk::TreeModel::Path& path,
Gtk::TreeViewColumn* column);
@@ -99,16 +99,18 @@
// create the tree model:
m_tree_model = Gtk::TreeStore::create (m_columns);
set_model (m_tree_model);
-
+
set_headers_visible (false);
-
+
// create the columns of the tree view
Gtk::TreeViewColumn* view_column = new Gtk::TreeViewColumn (_("Filename"));
Gtk::CellRendererPixbuf renderer_pixbuf;
Gtk::CellRendererText renderer_text;
-
+
view_column->pack_start (renderer_pixbuf, false /* don't expand */);
- view_column->add_attribute (renderer_pixbuf, "stock-id", m_columns.stock_icon);
+ view_column->add_attribute (renderer_pixbuf,
+ "stock-id",
+ m_columns.stock_icon);
view_column->pack_start (renderer_text);
view_column->add_attribute (renderer_text, "text", m_columns.display_name);
append_column (*view_column);
@@ -117,7 +119,7 @@
get_selection ()->set_mode (Gtk::SELECTION_MULTIPLE);
get_selection ()->signal_changed ().connect (
sigc::mem_fun (*this, &FileListView::on_file_list_selection_changed));
-
+
// fill popup menu:
Gtk::Menu::MenuList& menu_list = m_menu_popup.items ();
@@ -126,12 +128,12 @@
menu_list.push_back (Gtk::Menu_Helpers::MenuElem(_("Expand _All"),
sigc::mem_fun (*this, &FileListView::on_menu_popup_expand_all_clicked)));
-
+
menu_list.push_back (Gtk::Menu_Helpers::SeparatorElem());
menu_list.push_back (Gtk::Menu_Helpers::MenuElem(_("_Collapse"),
sigc::mem_fun (*this, &FileListView::on_menu_popup_collapse_clicked)));
-
+
m_menu_popup.accelerate (*this);
}
@@ -145,7 +147,7 @@
// NOTE: This assumes a sorted file list. If the file list is not
// sorted, this function will not work as expected
- THROW_IF_FAIL (m_tree_model) ;
+ THROW_IF_FAIL (m_tree_model);
if (!(m_tree_model->children ().empty ())) {
m_tree_model->clear();
}
@@ -160,8 +162,7 @@
std::vector<UString>::const_iterator file_iter;
for (file_iter = a_files.begin ();
file_iter != a_files.end ();
- ++file_iter)
- {
+ ++file_iter) {
vector<UString> path_components;
// only add absolute paths to the treeview
if (Glib::path_is_absolute (*file_iter)) {
@@ -190,29 +191,35 @@
// add as children of the root level
tree_iter = m_tree_model->append ();
} else {
- // add as children of the last matched item in the folder map
+ // add as children of the last matched item
+ // in the folder map
tree_iter = m_tree_model->append (
folder_map.rbegin ()->second->children ());
}
// build the full path name up to this element
Glib::ustring path = "/" + // add back the root element
- Glib::build_filename (
- std::vector<UString>(path_components.begin(),
- iter + 1)); // we want to include this iter element in the array, so + 1
+ Glib::build_filename
+ (std::vector<UString> (path_components.begin(),
+ iter + 1));// we want
+ // to include
+ // this iter
+ // element in
+ // the array,
+ // so + 1
(*tree_iter)[m_columns.path] = path;
Glib::ustring display_name =
- Glib::filename_display_name (Glib::locale_to_utf8 (*iter));
+ Glib::filename_display_name
+ (Glib::locale_to_utf8 (*iter));
(*tree_iter)[m_columns.display_name] =
display_name.empty () ? "/" : display_name;
if (Glib::file_test(path, Glib::FILE_TEST_IS_REGULAR)) {
(*tree_iter)[m_columns.stock_icon] = Gtk::Stock::FILE;
+ } else if (Glib::file_test(path, Glib::FILE_TEST_IS_DIR)) {
+ (*tree_iter)[m_columns.stock_icon] =
+ Gtk::Stock::DIRECTORY;
}
- else if (Glib::file_test(path, Glib::FILE_TEST_IS_DIR)) {
- (*tree_iter)[m_columns.stock_icon] = Gtk::Stock::DIRECTORY;
- }
-
- // store the element in the folder map for use next time
- // around
+ // store the element in the folder
+ // map for use next time around
folder_map.push_back (folder_map_t(*iter, tree_iter));
}
}
@@ -227,8 +234,8 @@
list<Gtk::TreeModel::Path> paths = selection->get_selected_rows ();
for (list<Gtk::TreeModel::Path>::iterator path_iter = paths.begin ();
- path_iter != paths.end (); ++path_iter)
- {
+ path_iter != paths.end ();
+ ++path_iter) {
Gtk::TreeModel::iterator tree_iter =
(m_tree_model->get_iter(*path_iter));
a_filenames.push_back (UString((*tree_iter)[m_columns.path]));
@@ -243,11 +250,11 @@
if (!a_col) {return;}
Gtk::TreeIter it = m_tree_model->get_iter (a_path);
-
+
if (!it) {return;}
Glib::ustring path = (*it)[m_columns.path];
-
- file_activated_signal.emit (path) ;
+
+ file_activated_signal.emit (path);
NEMIVER_CATCH
}
@@ -258,10 +265,10 @@
NEMIVER_TRY
if (!get_selection ()->count_selected_rows ()) {
- return ;
+ return;
}
-
- files_selected_signal.emit () ;
+
+ files_selected_signal.emit ();
NEMIVER_CATCH
}
@@ -347,12 +354,13 @@
void
FileListView::expand_to_filename (const UString &a_filename)
{
- for (Gtk::TreeModel::iterator tree_iter = m_tree_model->children ().begin ();
- tree_iter != m_tree_model->children ().end (); ++tree_iter)
- {
- Gtk::TreeModel::iterator iter = find_filename_recursive (tree_iter, a_filename);
- if (iter)
- {
+ Gtk::TreeModel::iterator tree_iter;
+ for (tree_iter = m_tree_model->children ().begin ();
+ tree_iter != m_tree_model->children ().end ();
+ ++tree_iter) {
+ Gtk::TreeModel::iterator iter =
+ find_filename_recursive (tree_iter, a_filename);
+ if (iter) {
expand_to_path (Gtk::TreeModel::Path(iter));
break;
}
@@ -360,7 +368,8 @@
}
Gtk::TreeModel::iterator
-FileListView::find_filename_recursive(const Gtk::TreeModel::iterator &a_iter, const UString &a_filename)
+FileListView::find_filename_recursive (const Gtk::TreeModel::iterator &a_iter,
+ const UString &a_filename)
{
Gtk::TreeModel::iterator tree_iter;
// first check the iter we were passed
@@ -370,22 +379,23 @@
// then check all of its children
if (!a_iter->children ().empty ()) {
for (tree_iter = a_iter->children ().begin ();
- tree_iter != a_iter->children ().end ();
- ++tree_iter) {
- Gtk::TreeModel::iterator child_iter = find_filename_recursive (tree_iter, a_filename);
+ tree_iter != a_iter->children ().end ();
+ ++tree_iter) {
+ Gtk::TreeModel::iterator child_iter =
+ find_filename_recursive (tree_iter, a_filename);
if (child_iter) {
return child_iter;
}
// else continue on to the next child
}
}
- // if we get to this point without having found it, return an invalid iter
+ // if we get to this point without having found it, return an invalid iter
return Gtk::TreeModel::iterator();
}
struct FileList::Priv : public sigc::trackable {
public:
- SafePtr<FileListView> tree_view ;
+ SafePtr<FileListView> tree_view;
Glib::RefPtr<Gtk::ActionGroup> file_list_action_group;
IDebuggerSafePtr debugger;
@@ -395,7 +405,7 @@
debugger (a_debugger),
start_path (a_starting_path)
{
- build_tree_view () ;
+ build_tree_view ();
debugger->files_listed_signal ().connect(
sigc::mem_fun(*this, &FileList::Priv::on_files_listed_signal));
}
@@ -403,7 +413,7 @@
void build_tree_view ()
{
if (tree_view) {return;}
- tree_view.reset (new FileListView ()) ;
+ tree_view.reset (new FileListView ());
}
void on_files_listed_signal (const vector<UString> &a_files,
@@ -413,11 +423,13 @@
if (a_cookie.empty ()) {}
- THROW_IF_FAIL (tree_view) ;
+ THROW_IF_FAIL (tree_view);
- tree_view->set_files (a_files) ;
- // this signal should only be called once per dialog -- the first time
- // it loads up the list of files from the debugger. So it should be OK
+ tree_view->set_files (a_files);
+ // this signal should only be called once per dialog
+ // -- the first time
+ // it loads up the list of files from the debugger.
+ // So it should be OK
// to expand to the 'starting path' in this handler
tree_view->expand_to_filename (start_path);
@@ -426,45 +438,46 @@
};//end class FileList::Priv
-FileList::FileList (IDebuggerSafePtr &a_debugger, const UString &a_starting_path)
+FileList::FileList (IDebuggerSafePtr &a_debugger,
+ const UString &a_starting_path)
{
m_priv.reset (new Priv (a_debugger, a_starting_path));
}
FileList::~FileList ()
{
- LOG_D ("deleted", "destructor-domain") ;
+ LOG_D ("deleted", "destructor-domain");
}
Gtk::Widget&
FileList::widget () const
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->tree_view) ;
- return *m_priv->tree_view ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->tree_view);
+ return *m_priv->tree_view;
}
void
FileList::update_content ()
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->debugger) ;
- m_priv->debugger->list_files () ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->debugger);
+ m_priv->debugger->list_files ();
}
sigc::signal<void, const UString&>&
FileList::file_activated_signal () const
{
THROW_IF_FAIL(m_priv);
- THROW_IF_FAIL (m_priv->tree_view) ;
+ THROW_IF_FAIL (m_priv->tree_view);
return m_priv->tree_view->file_activated_signal;
}
sigc::signal<void>&
FileList::files_selected_signal () const
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->tree_view) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->tree_view);
return m_priv->tree_view->files_selected_signal;
}
Modified: trunk/src/persp/dbgperspective/nmv-file-list.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-file-list.h (original)
+++ trunk/src/persp/dbgperspective/nmv-file-list.h Tue Jul 29 22:45:24 2008
@@ -31,9 +31,10 @@
#include "common/nmv-safe-ptr-utils.h"
#include "nmv-i-debugger.h"
-namespace nemiver {
-using nemiver::common::SafePtr ;
-using nemiver::common::UString ;
+NEMIVER_BEGIN_NAMESPACE (nemiver)
+
+using nemiver::common::SafePtr;
+using nemiver::common::UString;
/// display the list of source files that got compiled
/// to produce the executable being currently debugged.
@@ -43,26 +44,26 @@
///file list.
class NEMIVER_API FileList : public nemiver::common::Object {
//non copyable
- FileList (const FileList&) ;
- FileList& operator= (const FileList&) ;
+ FileList (const FileList&);
+ FileList& operator= (const FileList&);
- struct Priv ;
- SafePtr<Priv> m_priv ;
+ struct Priv;
+ SafePtr<Priv> m_priv;
public:
- FileList (IDebuggerSafePtr &a_debugger, const UString &a_starting_path) ;
- virtual ~FileList () ;
- Gtk::Widget& widget () const ;
- sigc::signal<void, const UString&>& file_activated_signal () const ;
- sigc::signal<void>& files_selected_signal () const ;
+ FileList (IDebuggerSafePtr &a_debugger, const UString &a_starting_path);
+ virtual ~FileList ();
+ Gtk::Widget& widget () const;
+ sigc::signal<void, const UString&>& file_activated_signal () const;
+ sigc::signal<void>& files_selected_signal () const;
void get_filenames (list<UString> &a_filenames) const;
- void update_content () ;
+ void update_content ();
void expand_to_filename (const UString &a_filename);
};//end FileList
-}//end namespace nemiver
+NEMIVER_END_NAMESPACE (nemiver)
#endif //__NMV_FILE_LIST_H__
Modified: trunk/src/persp/dbgperspective/nmv-find-text-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-find-text-dialog.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-find-text-dialog.cc Tue Jul 29 22:45:24 2008
@@ -32,7 +32,7 @@
NEMIVER_BEGIN_NAMESPACE (nemiver)
struct SearchTermCols : public Gtk::TreeModel::ColumnRecord {
- Gtk::TreeModelColumn<Glib::ustring> term ;
+ Gtk::TreeModelColumn<Glib::ustring> term;
SearchTermCols ()
{
@@ -43,21 +43,21 @@
static SearchTermCols&
columns ()
{
- static SearchTermCols s_columns ;
+ static SearchTermCols s_columns;
return s_columns;
}
-using namespace gtksourceview ;
+using namespace gtksourceview;
class FindTextDialog::Priv {
- friend class FindTextDialog ;
- Gtk::Dialog &dialog ;
- Glib::RefPtr<Gnome::Glade::Xml> glade ;
+ friend class FindTextDialog;
+ Gtk::Dialog &dialog;
+ Glib::RefPtr<Gnome::Glade::Xml> glade;
Glib::RefPtr<Gtk::ListStore> searchterm_store;
- Gtk::TextIter match_start ;
- Gtk::TextIter match_end ;
+ Gtk::TextIter match_start;
+ Gtk::TextIter match_end;
- Priv () ;
+ Priv ();
public:
@@ -66,7 +66,7 @@
dialog (a_dialog),
glade (a_glade)
{
- a_dialog.set_default_response (Gtk::RESPONSE_OK) ;
+ a_dialog.set_default_response (Gtk::RESPONSE_OK);
connect_dialog_signals ();
searchterm_store = Gtk::ListStore::create (columns ());
get_search_text_combo ()->set_model (searchterm_store);
@@ -76,7 +76,7 @@
void on_search_entry_activated_signal ()
{
NEMIVER_TRY
- get_search_button ()->clicked () ;
+ get_search_button ()->clicked ();
NEMIVER_CATCH
}
@@ -88,8 +88,7 @@
get_search_text_combo ()->get_entry ()->grab_focus ();
UString search_text =
get_search_text_combo ()->get_entry ()->get_text ();
- if (search_text.size ())
- {
+ if (search_text.size ()) {
get_search_text_combo ()->get_entry ()->select_region
(0, search_text.size ());
}
@@ -100,68 +99,68 @@
{
Gtk::Button *button =
ui_utils::get_widget_from_glade<Gtk::Button> (glade,
- "closebutton1") ;
- return button ;
+ "closebutton1");
+ return button;
}
Gtk::Button* get_search_button ()
{
Gtk::Button *button =
ui_utils::get_widget_from_glade<Gtk::Button> (glade,
- "searchbutton") ;
- return button ;
+ "searchbutton");
+ return button;
}
Gtk::ComboBoxEntry* get_search_text_combo () const
{
Gtk::ComboBoxEntry *combo =
ui_utils::get_widget_from_glade<Gtk::ComboBoxEntry>
- (glade, "searchtextcombo") ;
- return combo ;
+ (glade, "searchtextcombo");
+ return combo;
}
Gtk::CheckButton* get_match_case_check_button () const
{
Gtk::CheckButton *button =
ui_utils::get_widget_from_glade<Gtk::CheckButton>
- (glade, "matchcasecheckbutton") ;
- return button ;
+ (glade, "matchcasecheckbutton");
+ return button;
}
Gtk::CheckButton* get_match_entire_word_check_button () const
{
Gtk::CheckButton *button =
ui_utils::get_widget_from_glade<Gtk::CheckButton>
- (glade, "matchentirewordcheckbutton") ;
- return button ;
+ (glade, "matchentirewordcheckbutton");
+ return button;
}
Gtk::CheckButton* get_wrap_around_check_button () const
{
Gtk::CheckButton *button =
ui_utils::get_widget_from_glade<Gtk::CheckButton>
- (glade, "wraparoundcheckbutton") ;
- return button ;
+ (glade, "wraparoundcheckbutton");
+ return button;
}
Gtk::CheckButton* get_search_backwards_check_button () const
{
Gtk::CheckButton *button =
ui_utils::get_widget_from_glade<Gtk::CheckButton>
- (glade, "searchbackwardscheckbutton") ;
- return button ;
+ (glade, "searchbackwardscheckbutton");
+ return button;
}
void connect_dialog_signals ()
{
- Gtk::Button *search_button = get_search_button () ;
- THROW_IF_FAIL (search_button) ;
+ Gtk::Button *search_button = get_search_button ();
+ THROW_IF_FAIL (search_button);
get_search_text_combo ()->get_entry ()->signal_activate ().connect
- (sigc::mem_fun (*this, &Priv::on_search_entry_activated_signal)) ;
+ (sigc::mem_fun (*this, &Priv::on_search_entry_activated_signal));
dialog.signal_show ().connect (sigc::mem_fun
(*this, &Priv::on_dialog_show));
search_button->signal_clicked ().connect (sigc::mem_fun
- (*this, &Priv::on_search_button_clicked)) ;
+ (*this, &Priv::on_search_button_clicked));
}
//*******************
@@ -170,12 +169,14 @@
void on_search_button_clicked ()
{
NEMIVER_TRY
- UString new_term = get_search_text_combo ()->get_entry ()->get_text ();
+ UString new_term =
+ get_search_text_combo ()->get_entry ()->get_text ();
bool found = false;
// first check if this term is already in the list
- Gtk::TreeModel::iterator tree_iter ;
+ Gtk::TreeModel::iterator tree_iter;
for (tree_iter = searchterm_store->children ().begin ();
- tree_iter != searchterm_store->children ().end (); ++tree_iter) {
+ tree_iter != searchterm_store->children ().end ();
+ ++tree_iter) {
if (new_term == (*tree_iter)[columns ().term]) {
found = true;
break;
@@ -198,97 +199,97 @@
FindTextDialog::FindTextDialog (const UString &a_root_path) :
Dialog (a_root_path, "findtextdialog.glade", "findtextdialog")
{
- m_priv.reset (new Priv (widget (), glade ())) ;
- THROW_IF_FAIL (m_priv) ;
+ m_priv.reset (new Priv (widget (), glade ()));
+ THROW_IF_FAIL (m_priv);
}
FindTextDialog::~FindTextDialog ()
{
- LOG_D ("destroyed", "destructor-domain") ;
+ LOG_D ("destroyed", "destructor-domain");
}
Gtk::TextIter&
FindTextDialog::get_search_match_start () const
{
- THROW_IF_FAIL (m_priv) ;
- return m_priv->match_start ;
+ THROW_IF_FAIL (m_priv);
+ return m_priv->match_start;
}
Gtk::TextIter&
FindTextDialog::get_search_match_end () const
{
- THROW_IF_FAIL (m_priv) ;
- return m_priv->match_end ;
+ THROW_IF_FAIL (m_priv);
+ return m_priv->match_end;
}
void
FindTextDialog::get_search_string (UString &a_search_str) const
{
- THROW_IF_FAIL (m_priv) ;
- a_search_str = m_priv->get_search_text_combo ()->get_entry ()->get_text () ;
+ THROW_IF_FAIL (m_priv);
+ a_search_str = m_priv->get_search_text_combo ()->get_entry ()->get_text ();
}
void
FindTextDialog::set_search_string (const UString &a_search_str)
{
- THROW_IF_FAIL (m_priv) ;
- m_priv->get_search_text_combo ()->get_entry ()->set_text (a_search_str) ;
+ THROW_IF_FAIL (m_priv);
+ m_priv->get_search_text_combo ()->get_entry ()->set_text (a_search_str);
}
bool
FindTextDialog::get_match_case () const
{
- THROW_IF_FAIL (m_priv) ;
- return m_priv->get_match_case_check_button ()->get_active () ;
+ THROW_IF_FAIL (m_priv);
+ return m_priv->get_match_case_check_button ()->get_active ();
}
void
FindTextDialog::set_match_case (bool a_flag)
{
- THROW_IF_FAIL (m_priv) ;
- m_priv->get_match_case_check_button ()->set_active (a_flag) ;
+ THROW_IF_FAIL (m_priv);
+ m_priv->get_match_case_check_button ()->set_active (a_flag);
}
bool
FindTextDialog::get_match_entire_word () const
{
- THROW_IF_FAIL (m_priv) ;
- return m_priv->get_match_entire_word_check_button ()->get_active () ;
+ THROW_IF_FAIL (m_priv);
+ return m_priv->get_match_entire_word_check_button ()->get_active ();
}
void
FindTextDialog::set_match_entire_word (bool a_flag)
{
- THROW_IF_FAIL (m_priv) ;
- m_priv->get_match_entire_word_check_button ()->set_active (a_flag) ;
+ THROW_IF_FAIL (m_priv);
+ m_priv->get_match_entire_word_check_button ()->set_active (a_flag);
}
bool
FindTextDialog::get_wrap_around () const
{
- THROW_IF_FAIL (m_priv) ;
- return m_priv->get_wrap_around_check_button ()->get_active () ;
+ THROW_IF_FAIL (m_priv);
+ return m_priv->get_wrap_around_check_button ()->get_active ();
}
void
FindTextDialog::set_wrap_around (bool a_flag)
{
- THROW_IF_FAIL (m_priv) ;
- m_priv->get_wrap_around_check_button ()->set_active (a_flag) ;
+ THROW_IF_FAIL (m_priv);
+ m_priv->get_wrap_around_check_button ()->set_active (a_flag);
}
bool
FindTextDialog::get_search_backward () const
{
- THROW_IF_FAIL (m_priv) ;
- return m_priv->get_search_backwards_check_button ()->get_active () ;
+ THROW_IF_FAIL (m_priv);
+ return m_priv->get_search_backwards_check_button ()->get_active ();
}
void
FindTextDialog::set_search_backward (bool a_flag)
{
- THROW_IF_FAIL (m_priv) ;
- m_priv->get_search_backwards_check_button ()->set_active (a_flag) ;
+ THROW_IF_FAIL (m_priv);
+ m_priv->get_search_backwards_check_button ()->set_active (a_flag);
}
Modified: trunk/src/persp/dbgperspective/nmv-find-text-dialog.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-find-text-dialog.h (original)
+++ trunk/src/persp/dbgperspective/nmv-find-text-dialog.h Tue Jul 29 22:45:24 2008
@@ -29,40 +29,40 @@
NEMIVER_BEGIN_NAMESPACE (nemiver)
-class SourceEditor ;
-class FindTextDialog ;
-class ObjectRef ;
-class ObjectUnref ;
-template <class A, class B, class C> class SafePtr ;
+class SourceEditor;
+class FindTextDialog;
+class ObjectRef;
+class ObjectUnref;
+template <class A, class B, class C> class SafePtr;
-typedef SafePtr<FindTextDialog, ObjectRef, ObjectUnref> FindTextDialogSafePtr ;
+typedef SafePtr<FindTextDialog, ObjectRef, ObjectUnref> FindTextDialogSafePtr;
class FindTextDialog : public Dialog {
- class Priv ;
- SafePtr<Priv> m_priv ;
+ class Priv;
+ SafePtr<Priv> m_priv;
public:
- FindTextDialog (const UString &a_resource_root_path) ;
- virtual ~FindTextDialog () ;
+ FindTextDialog (const UString &a_resource_root_path);
+ virtual ~FindTextDialog ();
- Gtk::TextIter& get_search_match_start () const ;
- Gtk::TextIter& get_search_match_end () const ;
+ Gtk::TextIter& get_search_match_start () const;
+ Gtk::TextIter& get_search_match_end () const;
- void get_search_string (UString &a_search_str) const ;
- void set_search_string (const UString &a_search_str) ;
+ void get_search_string (UString &a_search_str) const;
+ void set_search_string (const UString &a_search_str);
- bool get_match_case () const ;
- void set_match_case (bool a_flag) ;
+ bool get_match_case () const;
+ void set_match_case (bool a_flag);
- bool get_match_entire_word () const ;
- void set_match_entire_word (bool a_flag) ;
+ bool get_match_entire_word () const;
+ void set_match_entire_word (bool a_flag);
- bool get_wrap_around () const ;
- void set_wrap_around (bool a_flag) ;
+ bool get_wrap_around () const;
+ void set_wrap_around (bool a_flag);
- bool get_search_backward () const ;
- void set_search_backward (bool a_flag) ;
+ bool get_search_backward () const;
+ void set_search_backward (bool a_flag);
};//end FindTextDialog
NEMIVER_END_NAMESPACE (nemiver)
Modified: trunk/src/persp/dbgperspective/nmv-global-vars-inspector-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-global-vars-inspector-dialog.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-global-vars-inspector-dialog.cc Tue Jul 29 22:45:24 2008
@@ -35,8 +35,8 @@
#include "nmv-i-workbench.h"
#include "nmv-i-var-list-walker.h"
-using namespace nemiver::common ;
-namespace vutil=nemiver::variables_utils2 ;
+using namespace nemiver::common;
+namespace vutil=nemiver::variables_utils2;
NEMIVER_BEGIN_NAMESPACE (nemiver)
@@ -44,17 +44,17 @@
private:
Priv ();
public:
- Gtk::Dialog &dialog ;
- Glib::RefPtr<Gnome::Glade::Xml> glade ;
- IDebuggerSafePtr debugger ;
+ Gtk::Dialog &dialog;
+ Glib::RefPtr<Gnome::Glade::Xml> glade;
+ IDebuggerSafePtr debugger;
IVarListWalkerSafePtr global_variables_walker_list;
- IWorkbench &workbench ;
- VarsTreeViewSafePtr tree_view ;
- Glib::RefPtr<Gtk::TreeStore> tree_store ;
- Gtk::TreeModel::iterator cur_selected_row ;
- SafePtr<Gtk::Menu> contextual_menu ;
- UString previous_function_name ;
+ IWorkbench &workbench;
+ VarsTreeViewSafePtr tree_view;
+ Glib::RefPtr<Gtk::TreeStore> tree_store;
+ Gtk::TreeModel::iterator cur_selected_row;
+ SafePtr<Gtk::Menu> contextual_menu;
+ UString previous_function_name;
Priv (Gtk::Dialog &a_dialog,
const Glib::RefPtr<Gnome::Glade::Xml> &a_glade,
@@ -64,16 +64,16 @@
glade (a_glade),
workbench (a_workbench)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
- THROW_IF_FAIL (a_debugger) ;
- debugger = a_debugger ;
- build_tree_view () ;
- re_init_tree_view () ;
- connect_to_debugger_signals () ;
- init_graphical_signals () ;
+ THROW_IF_FAIL (a_debugger);
+ debugger = a_debugger;
+ build_tree_view ();
+ re_init_tree_view ();
+ connect_to_debugger_signals ();
+ init_graphical_signals ();
build_dialog ();
- debugger->list_global_variables () ;
+ debugger->list_global_variables ();
}
void build_dialog ()
@@ -82,19 +82,19 @@
ui_utils::get_widget_from_glade<Gtk::Box> (glade,
"inspectorwidgetbox");
THROW_IF_FAIL (box);
- Gtk::ScrolledWindow *scr = Gtk::manage (new Gtk::ScrolledWindow) ;
+ Gtk::ScrolledWindow *scr = Gtk::manage (new Gtk::ScrolledWindow);
THROW_IF_FAIL (scr);
- scr->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC) ;
+ scr->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
scr->set_shadow_type (Gtk::SHADOW_IN);
THROW_IF_FAIL (tree_view);
- scr->add (*tree_view) ;
- box->pack_start (*scr) ;
- dialog.show_all () ;
+ scr->add (*tree_view);
+ box->pack_start (*scr);
+ dialog.show_all ();
}
void build_tree_view ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
if (tree_view) {return;}
tree_view = VarsTreeView::create ();
THROW_IF_FAIL (tree_view);
@@ -106,89 +106,89 @@
{
NEMIVER_TRY
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
THROW_IF_FAIL (tree_view);
- THROW_IF_FAIL (tree_store) ;
- //tree_store->clear () ;
- previous_function_name = "" ;
+ THROW_IF_FAIL (tree_store);
+ //tree_store->clear ();
+ previous_function_name = "";
NEMIVER_CATCH
}
IVarListWalkerSafePtr get_global_variables_walker_list ()
{
if (!global_variables_walker_list) {
- global_variables_walker_list = create_variable_walker_list () ;
- THROW_IF_FAIL (global_variables_walker_list) ;
+ global_variables_walker_list = create_variable_walker_list ();
+ THROW_IF_FAIL (global_variables_walker_list);
global_variables_walker_list->variable_visited_signal ().connect
(sigc::mem_fun
(*this,
- &GlobalVarsInspectorDialog::Priv::on_global_variable_visited_signal)) ;
+ &GlobalVarsInspectorDialog::Priv::on_global_variable_visited_signal));
}
- return global_variables_walker_list ;
+ return global_variables_walker_list;
}
IVarListWalkerSafePtr create_variable_walker_list ()
{
DynamicModule::Loader *loader =
workbench.get_dynamic_module ().get_module_loader ();
- THROW_IF_FAIL (loader) ;
+ THROW_IF_FAIL (loader);
DynamicModuleManager *module_manager =
loader->get_dynamic_module_manager ();
- THROW_IF_FAIL (module_manager) ;
+ THROW_IF_FAIL (module_manager);
IVarListWalkerSafePtr result =
module_manager->load_iface<IVarListWalker> ("varlistwalker",
"IVarListWalker");
- THROW_IF_FAIL (result) ;
- result->initialize (debugger) ;
- return result ;
+ THROW_IF_FAIL (result);
+ result->initialize (debugger);
+ return result;
}
void connect_to_debugger_signals ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
- THROW_IF_FAIL (debugger) ;
+ THROW_IF_FAIL (debugger);
debugger->global_variables_listed_signal ().connect
(sigc::mem_fun (*this,
- &Priv::on_global_variables_listed_signal)) ;
+ &Priv::on_global_variables_listed_signal));
}
void init_graphical_signals ()
{
- THROW_IF_FAIL (tree_view) ;
+ THROW_IF_FAIL (tree_view);
Glib::RefPtr<Gtk::TreeSelection> selection =
- tree_view->get_selection () ;
- THROW_IF_FAIL (selection) ;
+ tree_view->get_selection ();
+ THROW_IF_FAIL (selection);
selection->signal_changed ().connect
(sigc::mem_fun (*this,
&Priv::on_tree_view_selection_changed_signal));
tree_view->signal_row_expanded ().connect
- (sigc::mem_fun (*this, &Priv::on_tree_view_row_expanded_signal)) ;
+ (sigc::mem_fun (*this, &Priv::on_tree_view_row_expanded_signal));
tree_view->signal_row_activated ().connect
(sigc::mem_fun (*this,
- &Priv::on_tree_view_row_activated_signal)) ;
+ &Priv::on_tree_view_row_activated_signal));
}
void set_global_variables
(const std::list<IDebugger::VariableSafePtr> &a_vars)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
THROW_IF_FAIL (tree_view && tree_store);
tree_store->clear ();
- std::list<IDebugger::VariableSafePtr>::const_iterator it ;
- for (it = a_vars.begin () ; it != a_vars.end () ; ++it) {
- THROW_IF_FAIL ((*it)->name () != "") ;
- append_a_global_variable (*it) ;
+ std::list<IDebugger::VariableSafePtr>::const_iterator it;
+ for (it = a_vars.begin (); it != a_vars.end (); ++it) {
+ THROW_IF_FAIL ((*it)->name () != "");
+ append_a_global_variable (*it);
}
}
void append_a_global_variable (const IDebugger::VariableSafePtr a_var)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
- THROW_IF_FAIL (tree_view && tree_store && a_var) ;
+ THROW_IF_FAIL (tree_view && tree_store && a_var);
LOG_DD ("going to append variable '"
<< a_var->name ()
@@ -200,18 +200,18 @@
static_cast<Gtk::TreeView&> (*tree_view),
TreeStoreRefPtr::cast_static (tree_store),
iter /* no parent */,
- iter /* result iter */) ;
- tree_view->expand_row (tree_store->get_path (iter), false) ;
+ iter /* result iter */);
+ tree_view->expand_row (tree_store->get_path (iter), false);
}
void update_a_global_variable (const IDebugger::VariableSafePtr a_var)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
- THROW_IF_FAIL (tree_view) ;
- Gtk::TreeModel::iterator parent_row_it ;
+ THROW_IF_FAIL (tree_view);
+ Gtk::TreeModel::iterator parent_row_it;
vutil::update_a_variable (a_var, *tree_view, parent_row_it,
- true, false) ;
+ true, false);
}
//****************************
@@ -221,19 +221,19 @@
(const list<IDebugger::VariableSafePtr> a_vars,
const UString &a_cookie)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
if (a_cookie == "") {}
NEMIVER_TRY
IVarListWalkerSafePtr walker_list =
- get_global_variables_walker_list () ;
- THROW_IF_FAIL (walker_list) ;
+ get_global_variables_walker_list ();
+ THROW_IF_FAIL (walker_list);
- walker_list->remove_variables () ;
- walker_list->append_variables (a_vars) ;
- walker_list->do_walk_variables () ;
+ walker_list->remove_variables ();
+ walker_list->append_variables (a_vars);
+ walker_list->do_walk_variables ();
NEMIVER_CATCH
}
@@ -244,13 +244,13 @@
void on_global_variable_visited_signal (const IVarWalkerSafePtr &a_walker)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- THROW_IF_FAIL (a_walker->get_variable ()) ;
+ THROW_IF_FAIL (a_walker->get_variable ());
- append_a_global_variable (a_walker->get_variable ()) ;
+ append_a_global_variable (a_walker->get_variable ());
NEMIVER_CATCH
}
@@ -273,37 +273,37 @@
{
NEMIVER_TRY
- THROW_IF_FAIL (tree_view && tree_store) ;
- Gtk::TreeModel::iterator it = tree_store->get_iter (a_path) ;
+ THROW_IF_FAIL (tree_view && tree_store);
+ Gtk::TreeModel::iterator it = tree_store->get_iter (a_path);
UString type =
(Glib::ustring) it->get_value
- (vutil::get_variable_columns ().type) ;
+ (vutil::get_variable_columns ().type);
if (type == "") {return;}
if (a_col != tree_view->get_column (2)) {return;}
- cur_selected_row = it ;
- show_variable_type_in_dialog () ;
+ cur_selected_row = it;
+ show_variable_type_in_dialog ();
NEMIVER_CATCH
}
void show_variable_type_in_dialog ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
if (!cur_selected_row) {return;}
UString type =
- (Glib::ustring) (*cur_selected_row)[vutil::get_variable_columns ().type] ;
- UString message ;
- message.printf (_("Variable type is: \n %s"), type.c_str ()) ;
+ (Glib::ustring) (*cur_selected_row)[vutil::get_variable_columns ().type];
+ UString message;
+ message.printf (_("Variable type is: \n %s"), type.c_str ());
IDebugger::VariableSafePtr variable =
- (IDebugger::VariableSafePtr)
- cur_selected_row->get_value (vutil::get_variable_columns ().variable);
- THROW_IF_FAIL (variable) ;
- //message += "\nDumped for debug: \n" ;
- //variable->to_string (message, false) ;
- ui_utils::display_info (message) ;
+ (IDebugger::VariableSafePtr)
+ cur_selected_row->get_value (vutil::get_variable_columns ().variable);
+ THROW_IF_FAIL (variable);
+ //message += "\nDumped for debug: \n";
+ //variable->to_string (message, false);
+ ui_utils::display_info (message);
}
};//end GlobalVarsInspectorDialog::Priv
@@ -320,7 +320,7 @@
GlobalVarsInspectorDialog::~GlobalVarsInspectorDialog ()
{
- LOG_D ("deleted", "destructor-domain") ;
+ LOG_D ("deleted", "destructor-domain");
}
NEMIVER_END_NAMESPACE (nemiver)
Modified: trunk/src/persp/dbgperspective/nmv-global-vars-inspector-dialog.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-global-vars-inspector-dialog.h (original)
+++ trunk/src/persp/dbgperspective/nmv-global-vars-inspector-dialog.h Tue Jul 29 22:45:24 2008
@@ -32,30 +32,30 @@
#include "nmv-i-debugger.h"
namespace Gtk {
- class Widget ;
+ class Widget;
}
NEMIVER_BEGIN_NAMESPACE (nemiver)
-class IWorkbench ;
+class IWorkbench;
class NEMIVER_API GlobalVarsInspectorDialog : public Dialog {
//non copyable
- GlobalVarsInspectorDialog (const GlobalVarsInspectorDialog&) ;
- GlobalVarsInspectorDialog& operator= (const GlobalVarsInspectorDialog&) ;
+ GlobalVarsInspectorDialog (const GlobalVarsInspectorDialog&);
+ GlobalVarsInspectorDialog& operator= (const GlobalVarsInspectorDialog&);
- struct Priv ;
- SafePtr<Priv> m_priv ;
+ struct Priv;
+ SafePtr<Priv> m_priv;
protected:
- GlobalVarsInspectorDialog () ;
+ GlobalVarsInspectorDialog ();
public:
GlobalVarsInspectorDialog (const UString &a_root_path,
IDebuggerSafePtr &a_dbg,
- IWorkbench &a_wb) ;
- virtual ~GlobalVarsInspectorDialog () ;
+ IWorkbench &a_wb);
+ virtual ~GlobalVarsInspectorDialog ();
};//end GlobalVarsInspectorDialog
NEMIVER_END_NAMESPACE (nemiver)
Modified: trunk/src/persp/dbgperspective/nmv-load-core-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-load-core-dialog.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-load-core-dialog.cc Tue Jul 29 22:45:24 2008
@@ -35,15 +35,15 @@
#include "nmv-load-core-dialog.h"
#include "nmv-ui-utils.h"
-using namespace std ;
-using namespace nemiver::common ;
+using namespace std;
+using namespace nemiver::common;
namespace nemiver {
class LoadCoreDialog::Priv {
public:
- Gtk::FileChooserButton *fcbutton_core_file ;
+ Gtk::FileChooserButton *fcbutton_core_file;
Gtk::FileChooserButton *fcbutton_executable;
- Gtk::Button *okbutton ;
+ Gtk::Button *okbutton;
public:
Priv (const Glib::RefPtr<Gnome::Glade::Xml> &a_glade) :
@@ -53,40 +53,42 @@
{
okbutton =
- ui_utils::get_widget_from_glade<Gtk::Button> (a_glade, "okbutton") ;
- THROW_IF_FAIL (okbutton) ;
- okbutton->set_sensitive (false) ;
+ ui_utils::get_widget_from_glade<Gtk::Button> (a_glade, "okbutton");
+ THROW_IF_FAIL (okbutton);
+ okbutton->set_sensitive (false);
fcbutton_executable =
ui_utils::get_widget_from_glade<Gtk::FileChooserButton>
- (a_glade, "filechooserbutton_executable") ;
- fcbutton_executable->signal_selection_changed ().connect (sigc::mem_fun
- (*this, &Priv::on_file_selection_changed_signal)) ;
+ (a_glade, "filechooserbutton_executable");
+ fcbutton_executable->signal_selection_changed ().connect
+ (sigc::mem_fun
+ (*this, &Priv::on_file_selection_changed_signal));
fcbutton_core_file =
ui_utils::get_widget_from_glade<Gtk::FileChooserButton>
- (a_glade, "filechooserbutton_corefile") ;
- fcbutton_core_file->signal_selection_changed ().connect (sigc::mem_fun
- (*this, &Priv::on_file_selection_changed_signal)) ;
+ (a_glade, "filechooserbutton_corefile");
+ fcbutton_core_file->signal_selection_changed ().connect
+ (sigc::mem_fun
+ (*this, &Priv::on_file_selection_changed_signal));
}
void on_file_selection_changed_signal ()
{
NEMIVER_TRY
- THROW_IF_FAIL (fcbutton_executable) ;
- THROW_IF_FAIL (fcbutton_core_file) ;
+ THROW_IF_FAIL (fcbutton_executable);
+ THROW_IF_FAIL (fcbutton_core_file);
if (Glib::file_test (fcbutton_executable->get_filename (),
Glib::FILE_TEST_IS_EXECUTABLE)) {
if (Glib::file_test (fcbutton_core_file->get_filename (),
Glib::FILE_TEST_IS_REGULAR)) {
- okbutton->set_sensitive (true) ;
+ okbutton->set_sensitive (true);
} else {
- okbutton->set_sensitive (false) ;
+ okbutton->set_sensitive (false);
}
} else {
- okbutton->set_sensitive (false) ;
+ okbutton->set_sensitive (false);
}
NEMIVER_CATCH
}
@@ -95,7 +97,7 @@
LoadCoreDialog::LoadCoreDialog (const UString &a_root_path) :
Dialog (a_root_path, "loadcoredialog.glade", "loadcoredialog")
{
- m_priv.reset (new Priv (glade ())) ;
+ m_priv.reset (new Priv (glade ()));
}
LoadCoreDialog::~LoadCoreDialog ()
@@ -107,11 +109,11 @@
{
NEMIVER_TRY
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->fcbutton_executable) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->fcbutton_executable);
NEMIVER_CATCH
- return m_priv->fcbutton_executable->get_filename () ;
+ return m_priv->fcbutton_executable->get_filename ();
}
void
@@ -119,9 +121,9 @@
{
NEMIVER_TRY
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->fcbutton_executable) ;
- m_priv->fcbutton_executable->set_filename (a_name) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->fcbutton_executable);
+ m_priv->fcbutton_executable->set_filename (a_name);
NEMIVER_CATCH
}
@@ -131,11 +133,11 @@
{
NEMIVER_TRY
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->fcbutton_core_file) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->fcbutton_core_file);
NEMIVER_CATCH
- return m_priv->fcbutton_core_file->get_filename () ;
+ return m_priv->fcbutton_core_file->get_filename ();
}
void
@@ -143,9 +145,9 @@
{
NEMIVER_TRY
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->fcbutton_core_file) ;
- m_priv->fcbutton_core_file->set_filename (a_dir) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->fcbutton_core_file);
+ m_priv->fcbutton_core_file->set_filename (a_dir);
NEMIVER_CATCH
}
Modified: trunk/src/persp/dbgperspective/nmv-load-core-dialog.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-load-core-dialog.h (original)
+++ trunk/src/persp/dbgperspective/nmv-load-core-dialog.h Tue Jul 29 22:45:24 2008
@@ -31,24 +31,24 @@
NEMIVER_BEGIN_NAMESPACE (nemiver)
namespace common {
-class UString ;
+class UString;
}
-using nemiver::common::UString ;
-using nemiver::common::SafePtr ;
+using nemiver::common::UString;
+using nemiver::common::SafePtr;
class LoadCoreDialog : public Dialog {
- class Priv ;
- SafePtr<Priv> m_priv ;
+ class Priv;
+ SafePtr<Priv> m_priv;
public:
- LoadCoreDialog (const UString &a_resource_root_path) ;
- virtual ~LoadCoreDialog () ;
+ LoadCoreDialog (const UString &a_resource_root_path);
+ virtual ~LoadCoreDialog ();
- UString program_name () const ;
- void program_name (const UString &a_name) ;
+ UString program_name () const;
+ void program_name (const UString &a_name);
- UString core_file () const ;
- void core_file (const UString &) ;
+ UString core_file () const;
+ void core_file (const UString &);
};//end class nemiver
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 29 22:45:24 2008
@@ -53,7 +53,7 @@
IWorkbench &workbench;
IPerspective& perspective;
- VarsTreeViewSafePtr tree_view ;
+ VarsTreeViewSafePtr tree_view;
Glib::RefPtr<Gtk::TreeStore> tree_store;
Gtk::TreeModel::iterator cur_selected_row;
SafePtr<Gtk::TreeRowReference> local_variables_row_ref;
@@ -91,7 +91,7 @@
debugger = a_debugger;
THROW_IF_FAIL (tree_view);
tree_store = tree_view->get_tree_store ();
- THROW_IF_FAIL (tree_store) ;
+ THROW_IF_FAIL (tree_store);
re_init_tree_view ();
connect_to_debugger_signals ();
init_graphical_signals ();
@@ -753,10 +753,10 @@
LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- THROW_IF_FAIL (tree_view) ;
- Glib::RefPtr<Gtk::TreeSelection> sel = tree_view->get_selection () ;
- THROW_IF_FAIL (sel) ;
- cur_selected_row = sel->get_selected () ;
+ THROW_IF_FAIL (tree_view);
+ Glib::RefPtr<Gtk::TreeSelection> sel = tree_view->get_selection ();
+ THROW_IF_FAIL (sel);
+ cur_selected_row = sel->get_selected ();
NEMIVER_CATCH
}
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 29 22:45:24 2008
@@ -32,35 +32,35 @@
#include "nmv-i-debugger.h"
namespace Gtk {
- class Widget ;
+ class Widget;
}
NEMIVER_BEGIN_NAMESPACE (nemiver)
-class IWorkbench ;
+class IWorkbench;
class NEMIVER_API LocalVarsInspector : public nemiver::common::Object {
//non copyable
- LocalVarsInspector (const LocalVarsInspector&) ;
- LocalVarsInspector& operator= (const LocalVarsInspector&) ;
+ LocalVarsInspector (const LocalVarsInspector&);
+ LocalVarsInspector& operator= (const LocalVarsInspector&);
- struct Priv ;
- SafePtr<Priv> m_priv ;
+ struct Priv;
+ SafePtr<Priv> m_priv;
protected:
- LocalVarsInspector () ;
+ LocalVarsInspector ();
public:
LocalVarsInspector (IDebuggerSafePtr &a_dbg,
IWorkbench &a_wb,
- IPerspective &a_perspective) ;
- virtual ~LocalVarsInspector () ;
- Gtk::Widget& widget () const ;
+ IPerspective &a_perspective);
+ virtual ~LocalVarsInspector ();
+ Gtk::Widget& widget () const;
void set_local_variables
- (const std::list<IDebugger::VariableSafePtr> &a_vars) ;
- void show_local_variables_of_current_function () ;
- void re_init_widget () ;
+ (const std::list<IDebugger::VariableSafePtr> &a_vars);
+ void show_local_variables_of_current_function ();
+ void re_init_widget ();
};//end LocalVarsInspector
NEMIVER_END_NAMESPACE (nemiver)
Modified: trunk/src/persp/dbgperspective/nmv-locate-file-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-locate-file-dialog.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-locate-file-dialog.cc Tue Jul 29 22:45:24 2008
@@ -35,15 +35,15 @@
#include "nmv-ui-utils.h"
#include "nmv-locate-file-dialog.h"
-using namespace std ;
-using namespace nemiver::common ;
+using namespace std;
+using namespace nemiver::common;
namespace nemiver {
class LocateFileDialog::Priv {
public:
- Gtk::FileChooserButton *fcbutton_location ;
+ Gtk::FileChooserButton *fcbutton_location;
Gtk::Label *label_filename;
- Gtk::Button *okbutton ;
+ Gtk::Button *okbutton;
Priv (const Glib::RefPtr<Gnome::Glade::Xml> &a_glade, const UString& a_filename) :
fcbutton_location (0),
label_filename(0),
@@ -51,25 +51,29 @@
{
okbutton =
- ui_utils::get_widget_from_glade<Gtk::Button> (a_glade, "okbutton") ;
- THROW_IF_FAIL (okbutton) ;
- okbutton->set_sensitive (false) ;
+ ui_utils::get_widget_from_glade<Gtk::Button> (a_glade,
+ "okbutton");
+ THROW_IF_FAIL (okbutton);
+ okbutton->set_sensitive (false);
fcbutton_location =
ui_utils::get_widget_from_glade<Gtk::FileChooserButton>
- (a_glade, "filechooserbutton_location") ;
+ (a_glade, "filechooserbutton_location");
fcbutton_location->signal_selection_changed ().connect (sigc::mem_fun
- (*this, &Priv::on_file_selection_changed_signal)) ;
+ (*this, &Priv::on_file_selection_changed_signal));
UString chooser_title;
- chooser_title.printf (_("Select Location For %s"), a_filename.c_str ());
+ chooser_title.printf (_("Select Location For %s"),
+ a_filename.c_str ());
fcbutton_location->set_title (chooser_title);
label_filename =
- ui_utils::get_widget_from_glade<Gtk::Label> (a_glade, "label_filename") ;
- THROW_IF_FAIL (label_filename) ;
+ ui_utils::get_widget_from_glade<Gtk::Label> (a_glade,
+ "label_filename");
+ THROW_IF_FAIL (label_filename);
UString instructions;
instructions.printf (
- _("Cannot find file '<b>%s</b>'.\nPlease specify the location of this file:"),
+ _("Cannot find file '<b>%s</b>'.\nPlease specify "
+ "the location of this file:"),
a_filename.c_str ());
label_filename->set_text(instructions);
label_filename->set_use_markup ();
@@ -79,22 +83,23 @@
{
NEMIVER_TRY
- THROW_IF_FAIL (fcbutton_location) ;
+ THROW_IF_FAIL (fcbutton_location);
if (Glib::file_test (fcbutton_location->get_filename (),
Glib::FILE_TEST_IS_REGULAR)) {
- okbutton->set_sensitive (true) ;
+ okbutton->set_sensitive (true);
} else {
- okbutton->set_sensitive (false) ;
+ okbutton->set_sensitive (false);
}
NEMIVER_CATCH
}
};//end class LocateFileDialog::Priv
-LocateFileDialog::LocateFileDialog (const UString &a_root_path, const UString &a_file) :
+LocateFileDialog::LocateFileDialog (const UString &a_root_path,
+ const UString &a_file) :
Dialog (a_root_path, "locatefiledialog.glade", "locatefiledialog")
{
- m_priv.reset (new Priv (glade (), a_file)) ;
+ m_priv.reset (new Priv (glade (), a_file));
}
LocateFileDialog::~LocateFileDialog ()
@@ -105,11 +110,11 @@
LocateFileDialog::file_location () const
{
NEMIVER_TRY
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->fcbutton_location) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->fcbutton_location);
NEMIVER_CATCH
- return m_priv->fcbutton_location->get_filename () ;
+ return m_priv->fcbutton_location->get_filename ();
}
void
@@ -117,8 +122,8 @@
{
NEMIVER_TRY
- THROW_IF_FAIL (m_priv->fcbutton_location) ;
- m_priv->fcbutton_location->set_filename (a_location) ;
+ THROW_IF_FAIL (m_priv->fcbutton_location);
+ m_priv->fcbutton_location->set_filename (a_location);
NEMIVER_CATCH
}
Modified: trunk/src/persp/dbgperspective/nmv-locate-file-dialog.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-locate-file-dialog.h (original)
+++ trunk/src/persp/dbgperspective/nmv-locate-file-dialog.h Tue Jul 29 22:45:24 2008
@@ -31,22 +31,22 @@
NEMIVER_BEGIN_NAMESPACE (nemiver)
namespace common {
-class UString ;
+class UString;
}
-using nemiver::common::UString ;
-using nemiver::common::SafePtr ;
+using nemiver::common::UString;
+using nemiver::common::SafePtr;
class LocateFileDialog : public Dialog {
- class Priv ;
- SafePtr<Priv> m_priv ;
+ class Priv;
+ SafePtr<Priv> m_priv;
public:
LocateFileDialog (const UString &a_resource_root_path,
- const UString &a_file) ;
- virtual ~LocateFileDialog () ;
+ const UString &a_file);
+ virtual ~LocateFileDialog ();
- UString file_location () const ;
- void file_location (const UString &a_location) ;
+ UString file_location () const;
+ void file_location (const UString &a_location);
};//end class nemiver
NEMIVER_END_NAMESPACE (nemiver)
Modified: trunk/src/persp/dbgperspective/nmv-memory-view.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-memory-view.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-memory-view.cc Tue Jul 29 22:45:24 2008
@@ -128,24 +128,24 @@
void connect_signals ()
{
THROW_IF_FAIL (m_debugger);
- m_debugger->state_changed_signal ().connect (sigc::mem_fun (this,
- &Priv::on_debugger_state_changed));
+ m_debugger->state_changed_signal ().connect
+ (sigc::mem_fun (this, &Priv::on_debugger_state_changed));
m_debugger->stopped_signal ().connect (sigc::mem_fun
(this, &Priv::on_debugger_stopped));
- m_debugger->read_memory_signal ().connect (sigc::mem_fun (this,
- &Priv::on_memory_read_response));
+ m_debugger->read_memory_signal ().connect
+ (sigc::mem_fun (this, &Priv::on_memory_read_response));
THROW_IF_FAIL (m_jump_button);
- m_jump_button->signal_clicked ().connect (sigc::mem_fun (this,
- &Priv::do_memory_read));
- m_grouping_combo.signal_changed ().connect (sigc::mem_fun (this,
- &Priv::on_group_changed));
+ m_jump_button->signal_clicked ().connect
+ (sigc::mem_fun (this, &Priv::do_memory_read));
+ m_grouping_combo.signal_changed ().connect
+ (sigc::mem_fun (this, &Priv::on_group_changed));
THROW_IF_FAIL (m_address_entry);
- m_address_entry->signal_activate ().connect (sigc::mem_fun (this,
- &Priv::do_memory_read));
+ m_address_entry->signal_activate ().connect
+ (sigc::mem_fun (this, &Priv::do_memory_read));
THROW_IF_FAIL (m_document);
signal_document_changed_connection =
- m_document->signal_document_changed ().connect (sigc::mem_fun (this,
- &Priv::on_document_changed));
+ m_document->signal_document_changed ().connect
+ (sigc::mem_fun (this, &Priv::on_document_changed));
}
void on_debugger_state_changed (IDebugger::State a_state)
@@ -201,7 +201,7 @@
if (a_reason == IDebugger::EXITED_SIGNALLED
|| a_reason == IDebugger::EXITED_NORMALLY
|| a_reason == IDebugger::EXITED) {
- return ;
+ return;
}
do_memory_read ();
@@ -269,12 +269,14 @@
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
size_t length = a_change_data->end - a_change_data->start + 1;
- guchar* new_data = m_document->get_data (a_change_data->start, length);
+ guchar* new_data =
+ m_document->get_data (a_change_data->start, length);
if (new_data) {
std::vector<uint8_t> data(new_data, new_data + length);
// set data in the debugger
- m_debugger->set_memory(static_cast<size_t>
- (get_address () + a_change_data->start), data);
+ m_debugger->set_memory
+ (static_cast<size_t> (get_address () + a_change_data->start),
+ data);
}
}
Modified: trunk/src/persp/dbgperspective/nmv-memory-view.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-memory-view.h (original)
+++ trunk/src/persp/dbgperspective/nmv-memory-view.h Tue Jul 29 22:45:24 2008
@@ -1,26 +1,27 @@
-/*******************************************************************************
- * PROJECT: Nemiver
+//Author: Jonathon Jongsma
+/*
+ *This file is part of the Nemiver project
*
- * AUTHOR: Jonathon Jongsma
- * See COPYRIGHT file copyright information.
+ *Nemiver is free software; you can redistribute
+ *it and/or modify it under the terms of
+ *the GNU General Public License as published by the
+ *Free Software Foundation; either version 2,
+ *or (at your option) any later version.
*
- * License:
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ *Nemiver is distributed in the hope that it will
+ *be useful, but WITHOUT ANY WARRANTY;
+ *without even the implied warranty of
+ *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *See the GNU General Public License for more details.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ *You should have received a copy of the
+ *GNU General Public License along with Nemiver;
+ *see the file COPYING.
+ *If not, write to the Free Software Foundation,
+ *Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- *******************************************************************************/
+ *See COPYRIGHT file copyright information.
+ */
#ifndef __NMV_MEMORY_VIEW_H__
#define __NMV_MEMORY_VIEW_H__
Modified: trunk/src/persp/dbgperspective/nmv-open-file-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-open-file-dialog.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-open-file-dialog.cc Tue Jul 29 22:45:24 2008
@@ -36,8 +36,8 @@
#include "nmv-ui-utils.h"
#include "nmv-file-list.h"
-using namespace std ;
-using namespace nemiver::common ;
+using namespace std;
+using namespace nemiver::common;
namespace nemiver {
class OpenFileDialog::Priv {
@@ -47,8 +47,8 @@
Gtk::RadioButton *radio_button_file_list, *radio_button_chooser;
Gtk::FileChooserWidget file_chooser;
FileList file_list;
- Gtk::Button *okbutton ;
- IDebugger *debugger ; //a poor man weak ref. I don't want to ref this here.
+ Gtk::Button *okbutton;
+ IDebugger *debugger; //a poor man weak ref. I don't want to ref this here.
public:
@@ -65,38 +65,43 @@
file_chooser.set_select_multiple (true);
okbutton =
- ui_utils::get_widget_from_glade<Gtk::Button> (a_glade, "okbutton") ;
- THROW_IF_FAIL (okbutton) ;
+ ui_utils::get_widget_from_glade<Gtk::Button> (a_glade,
+ "okbutton");
+ THROW_IF_FAIL (okbutton);
vbox_file_list =
ui_utils::get_widget_from_glade<Gtk::VBox> (a_glade,
- "vbox_file_list") ;
- THROW_IF_FAIL (vbox_file_list) ;
+ "vbox_file_list");
+ THROW_IF_FAIL (vbox_file_list);
radio_button_file_list =
ui_utils::get_widget_from_glade<Gtk::RadioButton>
- (a_glade, "radiobutton_target") ;
- THROW_IF_FAIL (radio_button_file_list) ;
+ (a_glade,
+ "radiobutton_target");
+ THROW_IF_FAIL (radio_button_file_list);
radio_button_file_list->signal_toggled ().connect (sigc::mem_fun
(*this, &Priv::on_radio_button_toggled));
radio_button_chooser =
ui_utils::get_widget_from_glade<Gtk::RadioButton>
- (a_glade, "radiobutton_other") ;
- THROW_IF_FAIL (radio_button_chooser) ;
- radio_button_chooser->signal_toggled ().connect (sigc::mem_fun
- (*this, &Priv::on_radio_button_toggled));
+ (a_glade,
+ "radiobutton_other");
+ THROW_IF_FAIL (radio_button_chooser);
+ radio_button_chooser->signal_toggled ().connect
+ (sigc::mem_fun (*this, &Priv::on_radio_button_toggled));
file_list.file_activated_signal ().connect
- (sigc::mem_fun (*this, &Priv::on_file_activated_signal)) ;
- file_list.files_selected_signal ().connect (sigc::mem_fun
- (*this, &Priv::on_files_selected_signal)) ;
+ (sigc::mem_fun (*this, &Priv::on_file_activated_signal));
+ file_list.files_selected_signal ().connect
+ (sigc::mem_fun (*this, &Priv::on_files_selected_signal));
+
+ file_chooser.signal_selection_changed ().connect
+ (sigc::mem_fun (*this,
+ &Priv::on_chooser_selection_changed_signal));
- file_chooser.signal_selection_changed ().connect (sigc::mem_fun
- (*this, &Priv::on_chooser_selection_changed_signal)) ;
-
- scrolled_window.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ scrolled_window.set_policy (Gtk::POLICY_AUTOMATIC,
+ Gtk::POLICY_AUTOMATIC);
scrolled_window.set_shadow_type (Gtk::SHADOW_IN);
scrolled_window.add(file_list.widget ());
- update_from_debugger_state () ;
+ update_from_debugger_state ();
}
void on_radio_button_toggled()
@@ -107,16 +112,13 @@
THROW_IF_FAIL (radio_button_file_list);
THROW_IF_FAIL (radio_button_chooser);
- if (radio_button_file_list->get_active ())
- {
+ if (radio_button_file_list->get_active ()) {
LOG_DD("Target file list is active");
// remove existing children of vbox_file_list
vbox_file_list->children ().clear();
vbox_file_list->pack_start (scrolled_window);
scrolled_window.show_all ();
- }
- else if (radio_button_chooser->get_active ())
- {
+ } else if (radio_button_chooser->get_active ()) {
LOG_DD("file chooser is active");
// remove existing children of vbox_file_list
vbox_file_list->children ().clear();
@@ -129,20 +131,20 @@
void update_from_debugger_state ()
{
if (debugger) {
- LOG_DD ("debugger state: " << (int) debugger->get_state ()) ;
+ LOG_DD ("debugger state: " << (int) debugger->get_state ());
} else {
- LOG_DD ("have null debugger") ;
+ LOG_DD ("have null debugger");
}
if (debugger && debugger->get_state () == IDebugger::READY) {
- LOG_DD ("debugger ready detected") ;
- file_list.update_content () ;
- radio_button_file_list->set_active (true) ;
- radio_button_file_list->set_sensitive (true) ;
+ LOG_DD ("debugger ready detected");
+ file_list.update_content ();
+ radio_button_file_list->set_active (true);
+ radio_button_file_list->set_sensitive (true);
} else {
- LOG_DD ("debugger not ready detected") ;
- radio_button_chooser->set_active (true) ;
- radio_button_file_list->set_sensitive (false) ;
+ LOG_DD ("debugger not ready detected");
+ radio_button_chooser->set_active (true);
+ radio_button_file_list->set_sensitive (false);
}
//it seems that the radiobutton widgets doesn't
//emit this signal when you toggle them programatically ???
@@ -156,9 +158,10 @@
}
for (list<UString>::const_iterator iter = files.begin ();
- iter != files.end (); ++iter) {
+ iter != files.end ();
+ ++iter) {
if (!validate_source_file (*iter)) {
- return false ;
+ return false;
}
}
return true;
@@ -169,7 +172,7 @@
if (!Glib::file_test (a_file, Glib::FILE_TEST_IS_REGULAR)) {
return false;
}
- return true ;
+ return true;
}
void on_file_activated_signal (const UString &a_file)
@@ -179,9 +182,9 @@
THROW_IF_FAIL(okbutton);
if (validate_source_file (a_file)) {
- okbutton->clicked () ;
+ okbutton->clicked ();
} else {
- okbutton->set_sensitive (false) ;
+ okbutton->set_sensitive (false);
}
NEMIVER_CATCH
}
@@ -192,12 +195,12 @@
THROW_IF_FAIL (okbutton);
- list<UString> filenames ;
- file_list.get_filenames (filenames) ;
+ list<UString> filenames;
+ file_list.get_filenames (filenames);
if (validate_source_files (filenames)){
- okbutton->set_sensitive (true) ;
+ okbutton->set_sensitive (true);
} else {
- okbutton->set_sensitive (false) ;
+ okbutton->set_sensitive (false);
}
NEMIVER_CATCH
@@ -210,9 +213,9 @@
THROW_IF_FAIL (okbutton);
if (validate_source_files (file_chooser.get_filenames ())) {
- okbutton->set_sensitive (true) ;
+ okbutton->set_sensitive (true);
} else {
- okbutton->set_sensitive (false) ;
+ okbutton->set_sensitive (false);
}
NEMIVER_CATCH
}
@@ -222,27 +225,25 @@
THROW_IF_FAIL(radio_button_file_list);
THROW_IF_FAIL(radio_button_chooser);
- if (radio_button_file_list->get_active ())
- {
+ if (radio_button_file_list->get_active ()) {
file_list.get_filenames (a_files);
- }
- else if (radio_button_chooser->get_active ())
- {
+ } else if (radio_button_chooser->get_active ()) {
a_files = file_chooser.get_filenames ();
}
}
};//end class OpenFileDialog::Priv
-OpenFileDialog::OpenFileDialog (const UString &a_root_path, IDebuggerSafePtr&
- a_debugger, const UString &a_working_dir) :
+OpenFileDialog::OpenFileDialog (const UString &a_root_path,
+ IDebuggerSafePtr &a_debugger,
+ const UString &a_working_dir) :
Dialog (a_root_path, "openfiledialog.glade", "dialog_open_source_file")
{
- m_priv.reset (new Priv (glade (), a_debugger, a_working_dir)) ;
+ m_priv.reset (new Priv (glade (), a_debugger, a_working_dir));
}
OpenFileDialog::~OpenFileDialog ()
{
- LOG_D ("deleted", "destructor-domain") ;
+ LOG_D ("deleted", "destructor-domain");
}
void
@@ -250,8 +251,8 @@
{
NEMIVER_TRY
- THROW_IF_FAIL (m_priv) ;
- m_priv->get_filenames (a_files) ;
+ THROW_IF_FAIL (m_priv);
+ m_priv->get_filenames (a_files);
NEMIVER_CATCH
}
Modified: trunk/src/persp/dbgperspective/nmv-open-file-dialog.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-open-file-dialog.h (original)
+++ trunk/src/persp/dbgperspective/nmv-open-file-dialog.h Tue Jul 29 22:45:24 2008
@@ -32,21 +32,23 @@
NEMIVER_BEGIN_NAMESPACE (nemiver)
namespace common {
-class UString ;
+class UString;
}
-using nemiver::common::UString ;
-using nemiver::common::SafePtr ;
+using nemiver::common::UString;
+using nemiver::common::SafePtr;
class OpenFileDialog : public Dialog {
- class Priv ;
- SafePtr<Priv> m_priv ;
+ class Priv;
+ SafePtr<Priv> m_priv;
public:
- OpenFileDialog (const UString &a_resource_root_path, IDebuggerSafePtr& a_debugger, const UString &a_working_dir) ;
- virtual ~OpenFileDialog () ;
+ OpenFileDialog (const UString &a_resource_root_path,
+ IDebuggerSafePtr& a_debugger,
+ const UString &a_working_dir);
+ virtual ~OpenFileDialog ();
- void get_filenames (list<UString> &a_filenames) const ;
+ void get_filenames (list<UString> &a_filenames) const;
};//end class nemiver
Modified: trunk/src/persp/dbgperspective/nmv-preferences-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-preferences-dialog.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-preferences-dialog.cc Tue Jul 29 22:45:24 2008
@@ -31,47 +31,47 @@
#include "nmv-i-workbench.h"
#include "nmv-conf-keys.h"
-using nemiver::common::DynamicModuleManager ;
+using nemiver::common::DynamicModuleManager;
NEMIVER_BEGIN_NAMESPACE(nemiver)
struct SourceDirsCols : public Gtk::TreeModelColumnRecord {
- Gtk::TreeModelColumn<Glib::ustring> dir ;
+ Gtk::TreeModelColumn<Glib::ustring> dir;
SourceDirsCols ()
{
- add (dir) ;
+ add (dir);
}
};// end SourceDirsColumns
static SourceDirsCols&
source_dirs_cols ()
{
- static SourceDirsCols s_cols ;
- return s_cols ;
+ static SourceDirsCols s_cols;
+ return s_cols;
}
class PreferencesDialog::Priv {
- Priv () ;
+ Priv ();
public:
- IWorkbench &workbench ;
+ IWorkbench &workbench;
//source directories property widgets
- vector<UString> source_dirs ;
- Glib::RefPtr<Gtk::ListStore> list_store ;
- Gtk::TreeView *tree_view ;
- Gtk::TreeModel::iterator cur_dir_iter ;
- Gtk::Button *remove_dir_button ;
+ vector<UString> source_dirs;
+ Glib::RefPtr<Gtk::ListStore> list_store;
+ Gtk::TreeView *tree_view;
+ Gtk::TreeModel::iterator cur_dir_iter;
+ Gtk::Button *remove_dir_button;
//source editor properties widgets
- Gtk::CheckButton *system_font_check_button ;
- Gtk::FontButton *custom_font_button ;
- Gtk::HBox *custom_font_box ;
- Gtk::CheckButton *show_lines_check_button ;
- Gtk::CheckButton *highlight_source_check_button ;
+ Gtk::CheckButton *system_font_check_button;
+ Gtk::FontButton *custom_font_button;
+ Gtk::HBox *custom_font_box;
+ Gtk::CheckButton *show_lines_check_button;
+ Gtk::CheckButton *highlight_source_check_button;
Gtk::RadioButton *always_reload_radio_button;
Gtk::RadioButton *never_reload_radio_button;
Gtk::RadioButton *confirm_reload_radio_button;
- Glib::RefPtr<Gnome::Glade::Xml> glade ;
+ Glib::RefPtr<Gnome::Glade::Xml> glade;
Priv (const Glib::RefPtr<Gnome::Glade::Xml> &a_glade,
IWorkbench &a_workbench) :
@@ -88,19 +88,19 @@
confirm_reload_radio_button (0),
glade (a_glade)
{
- init () ;
+ init ();
}
void on_tree_view_selection_changed ()
{
- THROW_IF_FAIL (tree_view) ;
- Glib::RefPtr<Gtk::TreeSelection> sel = tree_view->get_selection () ;
- THROW_IF_FAIL (sel) ;
- cur_dir_iter = sel->get_selected () ;
+ THROW_IF_FAIL (tree_view);
+ Glib::RefPtr<Gtk::TreeSelection> sel = tree_view->get_selection ();
+ THROW_IF_FAIL (sel);
+ cur_dir_iter = sel->get_selected ();
if (cur_dir_iter) {
- remove_dir_button->set_sensitive (true) ;
+ remove_dir_button->set_sensitive (true);
} else {
- remove_dir_button->set_sensitive (false) ;
+ remove_dir_button->set_sensitive (false);
}
}
@@ -109,24 +109,24 @@
NEMIVER_TRY
Gtk::FileChooserDialog file_chooser
(_("Choose directory"),
- Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER) ;
+ Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
- file_chooser.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL) ;
- file_chooser.add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK) ;
- file_chooser.set_select_multiple (false) ;
+ file_chooser.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+ file_chooser.add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK);
+ file_chooser.set_select_multiple (false);
- int result = file_chooser.run () ;
+ int result = file_chooser.run ();
- if (result != Gtk::RESPONSE_OK) {LOG_DD ("cancelled") ; return;}
+ if (result != Gtk::RESPONSE_OK) {LOG_DD ("cancelled"); return;}
- UString path = file_chooser.get_filename () ;
+ UString path = file_chooser.get_filename ();
- if (path == "") {LOG_DD ("Got null dir") ;return;}
+ if (path == "") {LOG_DD ("Got null dir");return;}
- Gtk::TreeModel::iterator iter = list_store->append () ;
- (*iter)[source_dirs_cols ().dir] = path ;
+ Gtk::TreeModel::iterator iter = list_store->append ();
+ (*iter)[source_dirs_cols ().dir] = path;
- update_source_dirs_key () ;
+ update_source_dirs_key ();
NEMIVER_CATCH
}
@@ -135,25 +135,26 @@
{
NEMIVER_TRY
if (!cur_dir_iter) {return;}
- list_store->erase (cur_dir_iter) ;
- update_source_dirs_key () ;
+ list_store->erase (cur_dir_iter);
+ update_source_dirs_key ();
NEMIVER_CATCH
}
void on_show_lines_toggled_signal ()
{
- update_show_source_line_numbers_key () ;
+ update_show_source_line_numbers_key ();
}
void on_highlight_source_toggled_signal ()
{
- update_highlight_source_keys () ;
+ update_highlight_source_keys ();
}
void on_system_font_toggled_signal ()
{
update_system_font_key ();
- custom_font_box->set_sensitive (!system_font_check_button->get_active ());
+ custom_font_box->set_sensitive
+ (!system_font_check_button->get_active ());
}
void on_custom_font_set_signal ()
@@ -169,186 +170,194 @@
void init ()
{
- list_store = Gtk::ListStore::create (source_dirs_cols ()) ;
+ list_store = Gtk::ListStore::create (source_dirs_cols ());
tree_view =
ui_utils::get_widget_from_glade<Gtk::TreeView> (glade,
- "dirstreeview") ;
+ "dirstreeview");
tree_view->append_column (_("Source directories"),
- source_dirs_cols ().dir) ;
+ source_dirs_cols ().dir);
- tree_view->set_headers_visible (false) ;
+ tree_view->set_headers_visible (false);
- tree_view->set_model (list_store) ;
+ tree_view->set_model (list_store);
- tree_view->get_selection ()->set_mode (Gtk::SELECTION_SINGLE) ;
+ tree_view->get_selection ()->set_mode (Gtk::SELECTION_SINGLE);
- tree_view->get_selection ()->signal_changed ().connect (sigc::mem_fun
- (this, &PreferencesDialog::Priv::on_tree_view_selection_changed));
+ tree_view->get_selection ()->signal_changed ().connect
+ (sigc::mem_fun
+ (this, &PreferencesDialog::Priv::on_tree_view_selection_changed));
Gtk::Button *button =
- ui_utils::get_widget_from_glade<Gtk::Button> (glade, "adddirbutton");
+ ui_utils::get_widget_from_glade<Gtk::Button> (glade,
+ "adddirbutton");
button->signal_clicked ().connect (sigc::mem_fun
- (this, &PreferencesDialog::Priv::on_add_dir_button_clicked)) ;
+ (this, &PreferencesDialog::Priv::on_add_dir_button_clicked));
remove_dir_button =
- ui_utils::get_widget_from_glade<Gtk::Button> (glade,
- "suppressdirbutton") ;
- remove_dir_button->signal_clicked ().connect (sigc::mem_fun
- (this, &PreferencesDialog::Priv::on_remove_dir_button_clicked)) ;
- remove_dir_button->set_sensitive (false) ;
+ ui_utils::get_widget_from_glade<Gtk::Button> (glade,
+ "suppressdirbutton");
+ remove_dir_button->signal_clicked ().connect
+ (sigc::mem_fun
+ (this, &PreferencesDialog::Priv::on_remove_dir_button_clicked));
+ remove_dir_button->set_sensitive (false);
show_lines_check_button =
ui_utils::get_widget_from_glade<Gtk::CheckButton>
- (glade, "showlinescheckbutton") ;
- THROW_IF_FAIL (show_lines_check_button) ;
- show_lines_check_button->signal_toggled ().connect (sigc::mem_fun
+ (glade, "showlinescheckbutton");
+ THROW_IF_FAIL (show_lines_check_button);
+ show_lines_check_button->signal_toggled ().connect
+ (sigc::mem_fun
(*this,
- &PreferencesDialog::Priv::on_show_lines_toggled_signal)) ;
+ &PreferencesDialog::Priv::on_show_lines_toggled_signal));
highlight_source_check_button =
ui_utils::get_widget_from_glade<Gtk::CheckButton>
- (glade, "highlightsourcecheckbutton") ;
- THROW_IF_FAIL (highlight_source_check_button) ;
- highlight_source_check_button->signal_toggled ().connect (sigc::mem_fun
+ (glade, "highlightsourcecheckbutton");
+ THROW_IF_FAIL (highlight_source_check_button);
+ highlight_source_check_button->signal_toggled ().connect
+ (sigc::mem_fun
(*this,
- &PreferencesDialog::Priv::on_highlight_source_toggled_signal)) ;
+ &PreferencesDialog::Priv::on_highlight_source_toggled_signal));
system_font_check_button =
ui_utils::get_widget_from_glade<Gtk::CheckButton>
- (glade, "systemfontcheckbutton") ;
- THROW_IF_FAIL (system_font_check_button) ;
- system_font_check_button->signal_toggled ().connect (sigc::mem_fun
+ (glade, "systemfontcheckbutton");
+ THROW_IF_FAIL (system_font_check_button);
+ system_font_check_button->signal_toggled ().connect
+ (sigc::mem_fun
(*this,
- &PreferencesDialog::Priv::on_system_font_toggled_signal)) ;
+ &PreferencesDialog::Priv::on_system_font_toggled_signal));
custom_font_button =
ui_utils::get_widget_from_glade<Gtk::FontButton>
- (glade, "customfontfontbutton") ;
- THROW_IF_FAIL (custom_font_button) ;
- custom_font_button->signal_font_set ().connect (sigc::mem_fun
+ (glade, "customfontfontbutton");
+ THROW_IF_FAIL (custom_font_button);
+ custom_font_button->signal_font_set ().connect
+ (sigc::mem_fun
(*this,
- &PreferencesDialog::Priv::on_custom_font_set_signal)) ;
+ &PreferencesDialog::Priv::on_custom_font_set_signal));
custom_font_box =
ui_utils::get_widget_from_glade<Gtk::HBox>
- (glade, "customfonthbox") ;
- THROW_IF_FAIL (custom_font_box) ;
+ (glade, "customfonthbox");
+ THROW_IF_FAIL (custom_font_box);
always_reload_radio_button =
ui_utils::get_widget_from_glade<Gtk::RadioButton>
- (glade, "reloadradiobutton") ;
+ (glade, "reloadradiobutton");
THROW_IF_FAIL (always_reload_radio_button);
- always_reload_radio_button->signal_toggled ().connect (sigc::mem_fun
+ always_reload_radio_button->signal_toggled ().connect
+ (sigc::mem_fun
(*this,
- &PreferencesDialog::Priv::on_reload_files_toggled_signal)) ;
+ &PreferencesDialog::Priv::on_reload_files_toggled_signal));
never_reload_radio_button =
ui_utils::get_widget_from_glade<Gtk::RadioButton>
- (glade, "neverreloadradiobutton") ;
+ (glade, "neverreloadradiobutton");
THROW_IF_FAIL (never_reload_radio_button);
never_reload_radio_button->signal_toggled ().connect (sigc::mem_fun
(*this,
- &PreferencesDialog::Priv::on_reload_files_toggled_signal)) ;
+ &PreferencesDialog::Priv::on_reload_files_toggled_signal));
confirm_reload_radio_button =
ui_utils::get_widget_from_glade<Gtk::RadioButton>
- (glade, "confirmreloadradiobutton") ;
+ (glade, "confirmreloadradiobutton");
THROW_IF_FAIL (confirm_reload_radio_button);
confirm_reload_radio_button->signal_toggled ().connect (sigc::mem_fun
(*this,
- &PreferencesDialog::Priv::on_reload_files_toggled_signal)) ;
+ &PreferencesDialog::Priv::on_reload_files_toggled_signal));
}
void collect_source_dirs ()
{
- source_dirs.clear () ;
+ source_dirs.clear ();
Gtk::TreeModel::iterator iter;
for (iter = list_store->children ().begin ();
iter != list_store->children ().end ();
++iter) {
- source_dirs.push_back (UString ((*iter)[source_dirs_cols ().dir])) ;
+ source_dirs.push_back (UString ((*iter)[source_dirs_cols ().dir]));
}
}
void set_source_dirs (const vector<UString> &a_dirs)
{
- Gtk::TreeModel::iterator row_it ;
- vector<UString>::const_iterator dir_it ;
- for (dir_it = a_dirs.begin () ; dir_it != a_dirs.end () ; ++dir_it) {
- row_it = list_store->append () ;
- (*row_it)[source_dirs_cols ().dir] = *dir_it ;
+ Gtk::TreeModel::iterator row_it;
+ vector<UString>::const_iterator dir_it;
+ for (dir_it = a_dirs.begin (); dir_it != a_dirs.end (); ++dir_it) {
+ row_it = list_store->append ();
+ (*row_it)[source_dirs_cols ().dir] = *dir_it;
}
}
IConfMgr& conf_manager () const
{
- IConfMgrSafePtr conf_mgr = workbench.get_configuration_manager () ;
- THROW_IF_FAIL (conf_mgr) ;
- return *conf_mgr ;
+ IConfMgrSafePtr conf_mgr = workbench.get_configuration_manager ();
+ THROW_IF_FAIL (conf_mgr);
+ return *conf_mgr;
}
void update_source_dirs_key ()
{
- collect_source_dirs () ;
- UString source_dirs_str ;
- for (vector<UString>::const_iterator it = source_dirs.begin () ;
- it != source_dirs.end () ;
+ collect_source_dirs ();
+ UString source_dirs_str;
+ for (vector<UString>::const_iterator it = source_dirs.begin ();
+ it != source_dirs.end ();
++it) {
if (source_dirs_str == "") {
- source_dirs_str = *it ;
+ source_dirs_str = *it;
} else {
source_dirs_str += ":" + *it;
}
}
conf_manager ().set_key_value
- (CONF_KEY_NEMIVER_SOURCE_DIRS, source_dirs_str) ;
+ (CONF_KEY_NEMIVER_SOURCE_DIRS, source_dirs_str);
}
void update_show_source_line_numbers_key ()
{
- THROW_IF_FAIL (show_lines_check_button) ;
- bool is_on = show_lines_check_button->get_active () ;
+ THROW_IF_FAIL (show_lines_check_button);
+ bool is_on = show_lines_check_button->get_active ();
conf_manager ().set_key_value
- (CONF_KEY_SHOW_SOURCE_LINE_NUMBERS, is_on) ;
+ (CONF_KEY_SHOW_SOURCE_LINE_NUMBERS, is_on);
}
void update_highlight_source_keys ()
{
- THROW_IF_FAIL (highlight_source_check_button) ;
- bool is_on = highlight_source_check_button->get_active () ;
+ THROW_IF_FAIL (highlight_source_check_button);
+ bool is_on = highlight_source_check_button->get_active ();
conf_manager ().set_key_value
(CONF_KEY_HIGHLIGHT_SOURCE_CODE,
- is_on) ;
+ is_on);
}
void update_widget_from_source_dirs_key ()
{
- UString paths_str ;
+ UString paths_str;
if (!conf_manager ().get_key_value
(CONF_KEY_NEMIVER_SOURCE_DIRS, paths_str)) {
- return ;
+ return;
}
if (paths_str == "") {return;}
- std::vector<UString> paths = paths_str.split (":") ;
- set_source_dirs (paths) ;
+ std::vector<UString> paths = paths_str.split (":");
+ set_source_dirs (paths);
}
void update_system_font_key ()
{
- THROW_IF_FAIL (system_font_check_button) ;
- bool is_on = system_font_check_button->get_active () ;
+ THROW_IF_FAIL (system_font_check_button);
+ bool is_on = system_font_check_button->get_active ();
conf_manager ().set_key_value
- (CONF_KEY_USE_SYSTEM_FONT, is_on) ;
+ (CONF_KEY_USE_SYSTEM_FONT, is_on);
}
void update_custom_font_key ()
{
- THROW_IF_FAIL (custom_font_button) ;
- UString font_name = custom_font_button->get_font_name () ;
+ THROW_IF_FAIL (custom_font_button);
+ UString font_name = custom_font_button->get_font_name ();
conf_manager ().set_key_value
- (CONF_KEY_CUSTOM_FONT_NAME, font_name) ;
+ (CONF_KEY_CUSTOM_FONT_NAME, font_name);
}
void update_reload_files_keys ()
@@ -375,40 +384,40 @@
void update_widget_from_editor_keys ()
{
- THROW_IF_FAIL (show_lines_check_button) ;
- THROW_IF_FAIL (highlight_source_check_button) ;
- THROW_IF_FAIL (system_font_check_button) ;
- THROW_IF_FAIL (custom_font_button) ;
- THROW_IF_FAIL (custom_font_box) ;
+ THROW_IF_FAIL (show_lines_check_button);
+ THROW_IF_FAIL (highlight_source_check_button);
+ THROW_IF_FAIL (system_font_check_button);
+ THROW_IF_FAIL (custom_font_button);
+ THROW_IF_FAIL (custom_font_box);
bool is_on=true;
if (!conf_manager ().get_key_value
(CONF_KEY_SHOW_SOURCE_LINE_NUMBERS, is_on)) {
- LOG_ERROR ("failed to get gconf key") ;
+ LOG_ERROR ("failed to get gconf key");
} else {
- show_lines_check_button->set_active (is_on) ;
+ show_lines_check_button->set_active (is_on);
}
- is_on=true ;
+ is_on=true;
if (!conf_manager ().get_key_value
(CONF_KEY_HIGHLIGHT_SOURCE_CODE, is_on)) {
- LOG_ERROR ("failed to get gconf key") ;
+ LOG_ERROR ("failed to get gconf key");
} else {
- highlight_source_check_button->set_active (is_on) ;
+ highlight_source_check_button->set_active (is_on);
}
is_on = true;
if (!conf_manager ().get_key_value
(CONF_KEY_USE_SYSTEM_FONT, is_on)) {
- LOG_ERROR ("failed to get gconf key") ;
+ LOG_ERROR ("failed to get gconf key");
} else {
- system_font_check_button->set_active (is_on) ;
+ system_font_check_button->set_active (is_on);
custom_font_box->set_sensitive (!is_on);
}
UString font_name;
if (!conf_manager ().get_key_value
(CONF_KEY_CUSTOM_FONT_NAME, font_name)) {
- LOG_ERROR ("failed to get gconf key") ;
+ LOG_ERROR ("failed to get gconf key");
} else {
custom_font_button->set_font_name (font_name);
}
@@ -433,8 +442,8 @@
void update_widget_from_conf ()
{
- update_widget_from_source_dirs_key () ;
- update_widget_from_editor_keys () ;
+ update_widget_from_source_dirs_key ();
+ update_widget_from_editor_keys ();
}
};//end PreferencesDialog
@@ -444,30 +453,30 @@
"preferencesdialog.glade",
"preferencesdialog")
{
- m_priv.reset (new Priv (glade (), a_workbench)) ;
- m_priv->update_widget_from_conf () ;
+ m_priv.reset (new Priv (glade (), a_workbench));
+ m_priv->update_widget_from_conf ();
}
PreferencesDialog::~PreferencesDialog ()
{
- LOG_D ("delete", "destructor-domain") ;
- THROW_IF_FAIL (m_priv) ;
+ LOG_D ("delete", "destructor-domain");
+ THROW_IF_FAIL (m_priv);
}
const std::vector<UString>&
PreferencesDialog::source_directories () const
{
- THROW_IF_FAIL (m_priv) ;
- m_priv->collect_source_dirs () ;
- return m_priv->source_dirs ;
+ THROW_IF_FAIL (m_priv);
+ m_priv->collect_source_dirs ();
+ return m_priv->source_dirs;
}
void
PreferencesDialog::source_directories (const std::vector<UString> &a_dirs)
{
- THROW_IF_FAIL (m_priv) ;
- m_priv->source_dirs = a_dirs ;
- m_priv->set_source_dirs (m_priv->source_dirs) ;
+ THROW_IF_FAIL (m_priv);
+ m_priv->source_dirs = a_dirs;
+ m_priv->set_source_dirs (m_priv->source_dirs);
}
NEMIVER_END_NAMESPACE (nemiver)
Modified: trunk/src/persp/dbgperspective/nmv-preferences-dialog.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-preferences-dialog.h (original)
+++ trunk/src/persp/dbgperspective/nmv-preferences-dialog.h Tue Jul 29 22:45:24 2008
@@ -29,27 +29,27 @@
#include "common/nmv-ustring.h"
#include "nmv-dialog.h"
-using nemiver::common::UString ;
+using nemiver::common::UString;
NEMIVER_BEGIN_NAMESPACE (nemiver)
-class IWorkbench ;
+class IWorkbench;
class PreferencesDialog : public Dialog {
- class Priv ;
- SafePtr<Priv> m_priv ;
+ class Priv;
+ SafePtr<Priv> m_priv;
- PreferencesDialog () ;
+ PreferencesDialog ();
public:
PreferencesDialog (IWorkbench &a_workbench,
- const UString &a_root_path) ;
+ const UString &a_root_path);
PreferencesDialog (IWorkbench &a_workbench,
const UString &a_root_path,
- const std::vector<UString> &a_source_dirs) ;
- virtual ~PreferencesDialog () ;
- const std::vector<UString>& source_directories () const ;
- void source_directories (const std::vector<UString> &a_dirs) ;
+ const std::vector<UString> &a_source_dirs);
+ virtual ~PreferencesDialog ();
+ const std::vector<UString>& source_directories () const;
+ void source_directories (const std::vector<UString> &a_dirs);
};//end class PreferencesDialog
NEMIVER_END_NAMESPACE (nemiver)
Modified: trunk/src/persp/dbgperspective/nmv-proc-list-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-proc-list-dialog.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-proc-list-dialog.cc Tue Jul 29 22:45:24 2008
@@ -32,16 +32,16 @@
#include "nmv-proc-list-dialog.h"
#include "nmv-ui-utils.h"
-using namespace std ;
-using namespace nemiver::common ;
+using namespace std;
+using namespace nemiver::common;
namespace nemiver {
struct ProcListCols : public Gtk::TreeModel::ColumnRecord {
- Gtk::TreeModelColumn<IProcMgr::Process> process ;
- Gtk::TreeModelColumn<unsigned int> pid ;
- Gtk::TreeModelColumn<Glib::ustring> user_name ;
- Gtk::TreeModelColumn<Glib::ustring> proc_args ;
+ Gtk::TreeModelColumn<IProcMgr::Process> process;
+ Gtk::TreeModelColumn<unsigned int> pid;
+ Gtk::TreeModelColumn<Glib::ustring> user_name;
+ Gtk::TreeModelColumn<Glib::ustring> proc_args;
enum ColsOffset {
PROCESS=0,
@@ -52,30 +52,30 @@
ProcListCols ()
{
- add (process) ;
- add (pid) ;
- add (user_name) ;
- add (proc_args) ;
+ add (process);
+ add (pid);
+ add (user_name);
+ add (proc_args);
}
};//end class Gtk::TreeModel
static ProcListCols&
columns ()
{
- static ProcListCols s_columns ;
- return s_columns ;
+ static ProcListCols s_columns;
+ return s_columns;
}
class ProcListDialog::Priv {
public:
- IProcMgr &proc_mgr ;
- Gtk::Button *okbutton ;
- Gtk::TreeView *proclist_view ;
- Gtk::Entry *entry_filter ;
- Glib::RefPtr<Gtk::ListStore> proclist_store ;
- Glib::RefPtr<Gtk::TreeModelFilter> filter_store ;
- IProcMgr::Process selected_process ;
- bool process_selected ;
+ IProcMgr &proc_mgr;
+ Gtk::Button *okbutton;
+ Gtk::TreeView *proclist_view;
+ Gtk::Entry *entry_filter;
+ Glib::RefPtr<Gtk::ListStore> proclist_store;
+ Glib::RefPtr<Gtk::TreeModelFilter> filter_store;
+ IProcMgr::Process selected_process;
+ bool process_selected;
Priv (const Glib::RefPtr<Gnome::Glade::Xml> &a_glade,
IProcMgr &a_proc_mgr) :
@@ -86,57 +86,59 @@
process_selected (false)
{
okbutton =
- ui_utils::get_widget_from_glade<Gtk::Button> (a_glade, "okbutton") ;
- THROW_IF_FAIL (okbutton) ;
- okbutton->set_sensitive (false) ;
+ ui_utils::get_widget_from_glade<Gtk::Button> (a_glade,
+ "okbutton");
+ THROW_IF_FAIL (okbutton);
+ okbutton->set_sensitive (false);
entry_filter =
ui_utils::get_widget_from_glade<Gtk::Entry> (a_glade,
"entry_filter");
- THROW_IF_FAIL (entry_filter) ;
- entry_filter->signal_changed ().connect (sigc::mem_fun(*this,
- &Priv::on_filter_entry_changed));
+ THROW_IF_FAIL (entry_filter);
+ entry_filter->signal_changed ().connect
+ (sigc::mem_fun(*this,
+ &Priv::on_filter_entry_changed));
proclist_view =
- ui_utils::get_widget_from_glade<Gtk::TreeView> (a_glade,
- "proclisttreeview");
- THROW_IF_FAIL (proclist_view) ;
- proclist_store = Gtk::ListStore::create (columns ()) ;
+ ui_utils::get_widget_from_glade<Gtk::TreeView> (a_glade,
+ "proclisttreeview");
+ THROW_IF_FAIL (proclist_view);
+ proclist_store = Gtk::ListStore::create (columns ());
filter_store = Gtk::TreeModelFilter::create (proclist_store);
filter_store->set_visible_func(sigc::mem_fun(*this,
&Priv::is_row_visible));
- proclist_view->set_model (filter_store) ;
- proclist_view->set_search_column (ProcListCols::PROC_ARGS) ;
- proclist_view->set_enable_search (true) ;
-
- proclist_view->append_column ("PID", columns ().pid) ;
- Gtk::TreeViewColumn *col = proclist_view->get_column (0) ;
- THROW_IF_FAIL (col) ;
- col->set_clickable (true) ;
- col->set_resizable (true) ;
- col->set_sort_column_id (columns ().pid) ;
-
- proclist_view->append_column (_("User Name"), columns ().user_name) ;
- col = proclist_view->get_column (1) ;
- THROW_IF_FAIL (col) ;
- col->set_clickable (true) ;
- col->set_resizable (true) ;
- col->set_sort_column_id (columns ().user_name) ;
-
- proclist_view->append_column (_("Proc Args"), columns ().proc_args) ;
- col = proclist_view->get_column (2) ;
- THROW_IF_FAIL (col) ;
- col->set_clickable (true) ;
- col->set_resizable (true) ;
- col->set_sort_column_id (columns ().proc_args) ;
+ proclist_view->set_model (filter_store);
+ proclist_view->set_search_column (ProcListCols::PROC_ARGS);
+ proclist_view->set_enable_search (true);
+
+ proclist_view->append_column ("PID", columns ().pid);
+ Gtk::TreeViewColumn *col = proclist_view->get_column (0);
+ THROW_IF_FAIL (col);
+ col->set_clickable (true);
+ col->set_resizable (true);
+ col->set_sort_column_id (columns ().pid);
+
+ proclist_view->append_column (_("User Name"), columns ().user_name);
+ col = proclist_view->get_column (1);
+ THROW_IF_FAIL (col);
+ col->set_clickable (true);
+ col->set_resizable (true);
+ col->set_sort_column_id (columns ().user_name);
+
+ proclist_view->append_column (_("Proc Args"), columns ().proc_args);
+ col = proclist_view->get_column (2);
+ THROW_IF_FAIL (col);
+ col->set_clickable (true);
+ col->set_resizable (true);
+ col->set_sort_column_id (columns ().proc_args);
- proclist_view->get_selection ()->set_mode (Gtk::SELECTION_SINGLE) ;
- col = proclist_view->get_column (ProcListCols::PID) ;
+ proclist_view->get_selection ()->set_mode (Gtk::SELECTION_SINGLE);
+ col = proclist_view->get_column (ProcListCols::PID);
proclist_view->get_selection ()->signal_changed ().connect
(sigc::mem_fun (*this,
- &Priv::on_selection_changed_signal)) ;
+ &Priv::on_selection_changed_signal));
proclist_view->signal_row_activated ().connect (sigc::mem_fun
- (*this, &Priv::on_row_activated_signal)) ;
+ (*this, &Priv::on_row_activated_signal));
}
void on_filter_entry_changed ()
@@ -173,25 +175,26 @@
void update_button_sensitivity()
{
- THROW_IF_FAIL (okbutton) ;
+ THROW_IF_FAIL (okbutton);
vector<Gtk::TreeModel::Path> paths =
- proclist_view->get_selection ()->get_selected_rows () ;
+ proclist_view->get_selection ()->get_selected_rows ();
if (!paths.empty ()) {
- Gtk::TreeModel::const_iterator row_it = filter_store->get_iter (paths[0]) ;
- if (row_it != filter_store->children ().end () && is_row_visible(row_it)) {
- selected_process = (*row_it)[columns ().process] ;
- process_selected = true ;
- okbutton->set_sensitive (true) ;
-
+ Gtk::TreeModel::const_iterator row_it =
+ filter_store->get_iter (paths[0]);
+ if (row_it != filter_store->children ().end ()
+ && is_row_visible(row_it)) {
+ selected_process = (*row_it)[columns ().process];
+ process_selected = true;
+ okbutton->set_sensitive (true);
return;
}
}
selected_process = 0;
- process_selected = false ;
- okbutton->set_sensitive (false) ;
+ process_selected = false;
+ okbutton->set_sensitive (false);
}
void on_row_activated_signal (const Gtk::TreeModel::Path &a_path,
@@ -203,42 +206,43 @@
NEMIVER_TRY
- THROW_IF_FAIL (okbutton) ;
+ THROW_IF_FAIL (okbutton);
- Gtk::TreeModel::iterator row_it = filter_store->get_iter (a_path) ;
+ Gtk::TreeModel::iterator row_it = filter_store->get_iter (a_path);
if (!row_it) {return;}
- selected_process = (*row_it)[columns ().process] ;
- process_selected = true ;
- okbutton->clicked () ;
+ selected_process = (*row_it)[columns ().process];
+ process_selected = true;
+ okbutton->clicked ();
NEMIVER_CATCH
}
void load_process_list ()
{
- process_selected = false ;
- Gtk::TreeModel::iterator store_it ;
- list<IProcMgr::Process> process_list = proc_mgr.get_all_process_list ();
+ process_selected = false;
+ Gtk::TreeModel::iterator store_it;
+ list<IProcMgr::Process> process_list =
+ proc_mgr.get_all_process_list ();
list<IProcMgr::Process>::iterator process_iter;
- list<UString> args ;
- list<UString>::iterator str_iter ;
- UString args_str ;
- proclist_store->clear () ;
- for (process_iter = process_list.begin () ;
+ list<UString> args;
+ list<UString>::iterator str_iter;
+ UString args_str;
+ proclist_store->clear ();
+ for (process_iter = process_list.begin ();
process_iter != process_list.end ();
++process_iter) {
- args = process_iter->args () ;
+ args = process_iter->args ();
if (args.empty ()) {continue;}
- store_it = proclist_store->append () ;
- (*store_it)[columns ().pid] = process_iter->pid () ;
- (*store_it)[columns ().user_name] = process_iter->user_name () ;
- args_str = "" ;
- for (str_iter = args.begin () ;
- str_iter != args.end () ;
+ store_it = proclist_store->append ();
+ (*store_it)[columns ().pid] = process_iter->pid ();
+ (*store_it)[columns ().user_name] = process_iter->user_name ();
+ args_str = "";
+ for (str_iter = args.begin ();
+ str_iter != args.end ();
++str_iter) {
- args_str += *str_iter + " " ;
+ args_str += *str_iter + " ";
}
- (*store_it)[columns ().proc_args] = args_str ;
+ (*store_it)[columns ().proc_args] = args_str;
(*store_it)[columns ().process] = *process_iter;
}
}
@@ -250,12 +254,12 @@
Dialog(a_root_path, "proclistdialog.glade", "proclistdialog")
{
m_priv.reset (new Priv (glade (), a_proc_mgr));
- widget ().hide () ;
+ widget ().hide ();
}
gint ProcListDialog::run ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
m_priv->load_process_list();
return Dialog::run();
}
@@ -267,16 +271,16 @@
bool
ProcListDialog::has_selected_process ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
return m_priv->process_selected;
}
bool
ProcListDialog::get_selected_process (IProcMgr::Process &a_proc)
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->process_selected) {return false;}
- a_proc = m_priv->selected_process ;
+ a_proc = m_priv->selected_process;
return true;
}
Modified: trunk/src/persp/dbgperspective/nmv-proc-list-dialog.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-proc-list-dialog.h (original)
+++ trunk/src/persp/dbgperspective/nmv-proc-list-dialog.h Tue Jul 29 22:45:24 2008
@@ -30,26 +30,26 @@
#include "nmv-dialog.h"
namespace common {
- class UString ;
+ class UString;
}
NEMIVER_BEGIN_NAMESPACE (nemiver)
-using nemiver::common::IProcMgr ;
+using nemiver::common::IProcMgr;
class ProcListDialog : public Dialog {
- class Priv ;
- SafePtr<Priv> m_priv ;
+ class Priv;
+ SafePtr<Priv> m_priv;
public:
ProcListDialog (const UString &a_root_path,
- IProcMgr &a_proc_mgr) ;
- virtual ~ProcListDialog () ;
- virtual gint run () ;
+ IProcMgr &a_proc_mgr);
+ virtual ~ProcListDialog ();
+ virtual gint run ();
- bool has_selected_process () ;
- bool get_selected_process (IProcMgr::Process &a_proc/*out param*/) ;
+ bool has_selected_process ();
+ bool get_selected_process (IProcMgr::Process &a_proc/*out param*/);
};//end class ProcListDialog
NEMIVER_END_NAMESPACE (nemiver)
Modified: trunk/src/persp/dbgperspective/nmv-registers-view.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-registers-view.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-registers-view.cc Tue Jul 29 22:45:24 2008
@@ -34,16 +34,16 @@
namespace nemiver {
struct RegisterColumns : public Gtk::TreeModelColumnRecord {
- Gtk::TreeModelColumn<IDebugger::register_id_t> id ;
- Gtk::TreeModelColumn<Glib::ustring> name ;
- Gtk::TreeModelColumn<Glib::ustring> value ;
+ Gtk::TreeModelColumn<IDebugger::register_id_t> id;
+ Gtk::TreeModelColumn<Glib::ustring> name;
+ Gtk::TreeModelColumn<Glib::ustring> value;
Gtk::TreeModelColumn<Gdk::Color> fg_color;
RegisterColumns ()
{
- add (id) ;
- add (name) ;
- add (value) ;
+ add (id);
+ add (name);
+ add (value);
add (fg_color);
}
};//end Cols
@@ -51,14 +51,14 @@
static RegisterColumns&
get_columns ()
{
- static RegisterColumns s_cols ;
- return s_cols ;
+ static RegisterColumns s_cols;
+ return s_cols;
}
struct RegistersView::Priv {
public:
- SafePtr<Gtk::TreeView> tree_view ;
- Glib::RefPtr<Gtk::ListStore> list_store ;
+ SafePtr<Gtk::TreeView> tree_view;
+ Glib::RefPtr<Gtk::ListStore> list_store;
IDebuggerSafePtr& debugger;
bool is_up2date;
@@ -66,40 +66,45 @@
debugger(a_debugger),
is_up2date (true)
{
- build_tree_view () ;
+ build_tree_view ();
// update breakpoint list when debugger indicates that the list of
// breakpoints has changed.
- debugger->register_names_listed_signal ().connect (sigc::mem_fun
- (*this, &Priv::on_debugger_registers_listed)) ;
- debugger->changed_registers_listed_signal ().connect (sigc::mem_fun
- (*this, &Priv::on_debugger_changed_registers_listed)) ;
- debugger->register_values_listed_signal ().connect (sigc::mem_fun
- (*this, &Priv::on_debugger_register_values_listed)) ;
- debugger->register_value_changed_signal ().connect (sigc::mem_fun
- (*this, &Priv::on_debugger_register_value_changed)) ;
-
- debugger->stopped_signal ().connect (sigc::mem_fun
- (*this, &Priv::on_debugger_stopped));
+ debugger->register_names_listed_signal ().connect
+ (sigc::mem_fun
+ (*this, &Priv::on_debugger_registers_listed));
+ debugger->changed_registers_listed_signal ().connect
+ (sigc::mem_fun
+ (*this, &Priv::on_debugger_changed_registers_listed));
+ debugger->register_values_listed_signal ().connect
+ (sigc::mem_fun
+ (*this, &Priv::on_debugger_register_values_listed));
+ debugger->register_value_changed_signal ().connect
+ (sigc::mem_fun
+ (*this, &Priv::on_debugger_register_value_changed));
+ debugger->stopped_signal ().connect
+ (sigc::mem_fun
+ (*this, &Priv::on_debugger_stopped));
}
void build_tree_view ()
{
if (tree_view) {return;}
//create a default tree store and a tree view
- list_store = Gtk::ListStore::create (get_columns ()) ;
- tree_view.reset (new Gtk::TreeView (list_store)) ;
+ list_store = Gtk::ListStore::create (get_columns ());
+ tree_view.reset (new Gtk::TreeView (list_store));
//create the columns of the tree view
- tree_view->append_column (_("ID"), get_columns ().id) ;
- tree_view->append_column (_("Name"), get_columns ().name) ;
- tree_view->append_column_editable (_("Value"), get_columns ().value) ;
- Gtk::TreeViewColumn * col = tree_view->get_column (2) ;
+ tree_view->append_column (_("ID"), get_columns ().id);
+ tree_view->append_column (_("Name"), get_columns ().name);
+ tree_view->append_column_editable (_("Value"), get_columns ().value);
+ Gtk::TreeViewColumn * col = tree_view->get_column (2);
col->add_attribute (*col->get_first_cell_renderer (),
"foreground-gdk",
- get_columns ().fg_color) ;
- Gtk::CellRendererText* renderer = dynamic_cast<Gtk::CellRendererText*>
- (col->get_first_cell_renderer ());
+ get_columns ().fg_color);
+ Gtk::CellRendererText* renderer =
+ dynamic_cast<Gtk::CellRendererText*>
+ (col->get_first_cell_renderer ());
THROW_IF_FAIL (renderer);
renderer->signal_edited ().connect (sigc::mem_fun
(*this, &Priv::on_register_value_edited));
@@ -123,8 +128,7 @@
if (first_run) {
first_run = false;
debugger->list_register_names ();
- }
- else {
+ } else {
debugger->list_changed_registers ();
}
}
@@ -140,7 +144,7 @@
if (a_reason == IDebugger::EXITED_SIGNALLED
|| a_reason == IDebugger::EXITED_NORMALLY
|| a_reason == IDebugger::EXITED) {
- return ;
+ return;
}
if (should_process_now ()) {
finish_handling_debugger_stopped_event ();
@@ -151,8 +155,8 @@
}
void on_debugger_registers_listed
- (const map<IDebugger::register_id_t, UString> &a_regs,
- const UString &a_cookie)
+ (const map<IDebugger::register_id_t, UString> &a_regs,
+ const UString &a_cookie)
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
@@ -161,7 +165,9 @@
list_store->clear ();
LOG_DD ("got num registers: " << (int)a_regs.size ());
std::map<IDebugger::register_id_t, UString>::const_iterator reg_iter;
- for (reg_iter = a_regs.begin (); reg_iter != a_regs.end (); ++reg_iter) {
+ for (reg_iter = a_regs.begin ();
+ reg_iter != a_regs.end ();
+ ++reg_iter) {
Gtk::TreeModel::iterator tree_iter = list_store->append ();
(*tree_iter)[get_columns ().id] = reg_iter->first;
(*tree_iter)[get_columns ().name] = reg_iter->second;
@@ -186,16 +192,18 @@
}
void on_debugger_register_values_listed
- (const map<IDebugger::register_id_t, UString> &a_reg_values,
- const UString &a_cookie)
+ (const map<IDebugger::register_id_t, UString> &a_reg_values,
+ const UString &a_cookie)
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- for (Gtk::TreeModel::iterator tree_iter = list_store->children ().begin ();
- tree_iter != list_store->children ().end (); ++tree_iter) {
+ Gtk::TreeModel::iterator tree_iter;
+ for (tree_iter = list_store->children ().begin ();
+ tree_iter != list_store->children ().end ();
+ ++tree_iter) {
IDebugger::register_id_t id = (*tree_iter)[get_columns ().id];
- std::map<IDebugger::register_id_t, UString>::const_iterator value_iter
- = a_reg_values.find (id);
+ std::map<IDebugger::register_id_t, UString>::const_iterator
+ value_iter = a_reg_values.find (id);
if (value_iter != a_reg_values.end ()) {
(*tree_iter)[get_columns ().value] = value_iter->second;
if (a_cookie != "first-time") {
@@ -224,17 +232,19 @@
// setting of the register has failed. We don't want to just leave the
// user-entered value in the treeview or the user will falsely assume
// that she has successfully modified the register value even on
- // failures. So until we have proper error detection and can present a
- // message to the user indicating that setting the register has failed,
+ // failures. So until we have proper error detection and can present
+ // a message to the user indicating that setting the
+ // register has failed,
// we must read back the register value immediately after setting it.
std::list<IDebugger::register_id_t> regs;
regs.push_back ((tree_iter->get_value (get_columns ().id)));
debugger->list_register_values (regs);
}
- void on_debugger_register_value_changed (const Glib::ustring &a_register_name,
- const Glib::ustring &a_new_value,
- const Glib::ustring &/*a_cookie*/)
+ void on_debugger_register_value_changed
+ (const Glib::ustring &a_register_name,
+ const Glib::ustring &a_new_value,
+ const Glib::ustring &/*a_cookie*/)
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
Gtk::TreeModel::iterator tree_iter;
@@ -285,22 +295,22 @@
RegistersView::~RegistersView ()
{
- LOG_D ("deleted", "destructor-domain") ;
+ LOG_D ("deleted", "destructor-domain");
}
Gtk::Widget&
RegistersView::widget () const
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->tree_view) ;
- THROW_IF_FAIL (m_priv->list_store) ;
- return *m_priv->tree_view ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->tree_view);
+ THROW_IF_FAIL (m_priv->list_store);
+ return *m_priv->tree_view;
}
void
RegistersView::clear ()
{
- THROW_IF_FAIL (m_priv && m_priv->list_store) ;
+ THROW_IF_FAIL (m_priv && m_priv->list_store);
m_priv->list_store->clear ();
}
Modified: trunk/src/persp/dbgperspective/nmv-registers-view.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-registers-view.h (original)
+++ trunk/src/persp/dbgperspective/nmv-registers-view.h Tue Jul 29 22:45:24 2008
@@ -31,29 +31,29 @@
#include "common/nmv-safe-ptr-utils.h"
#include "nmv-i-debugger.h"
-namespace nemiver {
+NEMIVER_BEGIN_NAMESPACE (nemiver)
class IWorkbench;
class IPerspective;
class NEMIVER_API RegistersView : public nemiver::common::Object {
//non copyable
- RegistersView (const RegistersView&) ;
- RegistersView& operator= (const RegistersView&) ;
+ RegistersView (const RegistersView&);
+ RegistersView& operator= (const RegistersView&);
- struct Priv ;
- SafePtr<Priv> m_priv ;
+ struct Priv;
+ SafePtr<Priv> m_priv;
public:
- RegistersView (IDebuggerSafePtr& a_debugger) ;
- virtual ~RegistersView () ;
- Gtk::Widget& widget () const ;
+ RegistersView (IDebuggerSafePtr& a_debugger);
+ virtual ~RegistersView ();
+ Gtk::Widget& widget () const;
void clear ();
};//end RegistersView
-}//end namespace nemiver
+NEMIVER_END_NAMESPACE (nemiver)
#endif //__NMV_REGISTERS_VIEW_H__
Modified: trunk/src/persp/dbgperspective/nmv-remote-target-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-remote-target-dialog.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-remote-target-dialog.cc Tue Jul 29 22:45:24 2008
@@ -30,27 +30,27 @@
NEMIVER_BEGIN_NAMESPACE (nemiver)
-using namespace ui_utils ;
+using namespace ui_utils;
struct RemoteTargetDialog::Priv {
- friend class RemoteTargetDialog ;
- Gtk::Dialog &dialog ;
- Glib::RefPtr<Gnome::Glade::Xml> glade ;
- mutable UString executable_path ;
- mutable UString solib_prefix_path ;
- mutable UString server_address ;
- mutable UString serial_port_name ;
- enum RemoteTargetDialog::ConnectionType connection_type ;
+ friend class RemoteTargetDialog;
+ Gtk::Dialog &dialog;
+ Glib::RefPtr<Gnome::Glade::Xml> glade;
+ mutable UString executable_path;
+ mutable UString solib_prefix_path;
+ mutable UString server_address;
+ mutable UString serial_port_name;
+ enum RemoteTargetDialog::ConnectionType connection_type;
- Priv () ;
+ Priv ();
Priv (Gtk::Dialog &a_dialog,
const Glib::RefPtr<Gnome::Glade::Xml> &a_glade) :
dialog (a_dialog),
glade (a_glade)
{
- init_members () ;
- init_from_glade () ;
+ init_members ();
+ init_from_glade ();
}
//*******************
@@ -61,21 +61,21 @@
NEMIVER_TRY
Gtk::RadioButton *radio =
- get_widget_from_glade<Gtk::RadioButton> (glade, "tcpradiobutton") ;
+ get_widget_from_glade<Gtk::RadioButton> (glade, "tcpradiobutton");
Gtk::Widget *tcp_connection_container =
get_widget_from_glade<Gtk::Widget> (glade,
- "tcpconnectioncontainer") ;
+ "tcpconnectioncontainer");
Gtk::Widget *serial_connection_container =
get_widget_from_glade<Gtk::Widget> (glade,
- "serialconnectioncontainer") ;
+ "serialconnectioncontainer");
if (radio->get_active ()) {
- connection_type = RemoteTargetDialog::TCP_CONNECTION_TYPE ;
- tcp_connection_container->set_sensitive (true) ;
- serial_connection_container->set_sensitive (false) ;
+ connection_type = RemoteTargetDialog::TCP_CONNECTION_TYPE;
+ tcp_connection_container->set_sensitive (true);
+ serial_connection_container->set_sensitive (false);
} else {
- connection_type = RemoteTargetDialog::SERIAL_CONNECTION_TYPE ;
- tcp_connection_container->set_sensitive (false) ;
- serial_connection_container->set_sensitive (true) ;
+ connection_type = RemoteTargetDialog::SERIAL_CONNECTION_TYPE;
+ tcp_connection_container->set_sensitive (false);
+ serial_connection_container->set_sensitive (true);
}
NEMIVER_CATCH
@@ -86,11 +86,11 @@
NEMIVER_TRY
Gtk::Button *button =
- get_widget_from_glade<Gtk::Button> (glade, "okbutton") ;
+ get_widget_from_glade<Gtk::Button> (glade, "okbutton");
if (can_enable_ok_button ()) {
- button->set_sensitive (true) ;
+ button->set_sensitive (true);
} else {
- button->set_sensitive (false) ;
+ button->set_sensitive (false);
}
NEMIVER_CATCH
@@ -105,68 +105,70 @@
//*****************
void init_members ()
{
- connection_type = RemoteTargetDialog::TCP_CONNECTION_TYPE ;
+ connection_type = RemoteTargetDialog::TCP_CONNECTION_TYPE;
}
void init_from_glade ()
{
Gtk::RadioButton *radio =
- get_widget_from_glade<Gtk::RadioButton> (glade, "tcpradiobutton") ;
+ get_widget_from_glade<Gtk::RadioButton> (glade, "tcpradiobutton");
radio->signal_toggled ().connect (sigc::mem_fun
- (*this, &Priv::on_radio_button_toggled_signal)) ;
- radio->set_active (true) ;
+ (*this, &Priv::on_radio_button_toggled_signal));
+ radio->set_active (true);
on_radio_button_toggled_signal ();//it does not get called otherwise
Gtk::FileChooser *chooser =
get_widget_from_glade<Gtk::FileChooser> (glade,
- "execfilechooserbutton") ;
- chooser->set_show_hidden (true) ;
+ "execfilechooserbutton");
+ chooser->set_show_hidden (true);
chooser->signal_selection_changed ().connect (sigc::mem_fun
- (*this, &Priv::on_selection_changed_signal)) ;
+ (*this, &Priv::on_selection_changed_signal));
- chooser = get_widget_from_glade<Gtk::FileChooser> (glade,
- "solibprefixchooserbutton") ;
- chooser->set_show_hidden (true) ;
- chooser->set_action (Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER) ;
+ chooser =
+ get_widget_from_glade<Gtk::FileChooser> (glade,
+ "solibprefixchooserbutton");
+ chooser->set_show_hidden (true);
+ chooser->set_action (Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
+
+ set_solib_prefix_path (common::env::get_system_lib_dir ());
+
+ Gtk::Entry* entry =
+ get_widget_from_glade<Gtk::Entry> (glade, "addressentry");
+ entry->signal_changed ().connect
+ (sigc::mem_fun (*this, &Priv::on_selection_changed_signal));
+
+ entry = get_widget_from_glade<Gtk::Entry> (glade, "portentry");
+ entry->signal_changed ().connect
+ (sigc::mem_fun (*this, &Priv::on_selection_changed_signal));
- set_solib_prefix_path (common::env::get_system_lib_dir ()) ;
-
- Gtk::Entry* entry = get_widget_from_glade<Gtk::Entry> (glade, "addressentry") ;
- entry->signal_changed ().connect (sigc::mem_fun
- (*this, &Priv::on_selection_changed_signal)) ;
-
- entry = get_widget_from_glade<Gtk::Entry> (glade, "portentry") ;
+ entry = get_widget_from_glade<Gtk::Entry> (glade, "serialentry");
entry->signal_changed ().connect (sigc::mem_fun
- (*this, &Priv::on_selection_changed_signal)) ;
-
- entry = get_widget_from_glade<Gtk::Entry> (glade, "serialentry") ;
- entry->signal_changed ().connect (sigc::mem_fun
- (*this, &Priv::on_selection_changed_signal)) ;
-
+ (*this, &Priv::on_selection_changed_signal));
Gtk::Button *button =
- get_widget_from_glade<Gtk::Button> (glade, "okbutton") ;
- button->set_sensitive (false) ;
+ get_widget_from_glade<Gtk::Button> (glade, "okbutton");
+ button->set_sensitive (false);
}
bool can_enable_ok_button () const
{
Gtk::FileChooserButton *chooser =
- get_widget_from_glade<Gtk::FileChooserButton> (glade, "execfilechooserbutton") ;
+ get_widget_from_glade<Gtk::FileChooserButton>
+ (glade, "execfilechooserbutton");
Gtk::Entry *entry = 0;
if (chooser->get_filename ().empty ())
- return false ;
+ return false;
if (connection_type == RemoteTargetDialog::TCP_CONNECTION_TYPE) {
- entry = get_widget_from_glade<Gtk::Entry> (glade, "portentry") ;
+ entry = get_widget_from_glade<Gtk::Entry> (glade, "portentry");
if (entry->get_text ().empty ())
- return false ;
+ return false;
} else if (connection_type ==
RemoteTargetDialog::SERIAL_CONNECTION_TYPE) {
- entry = get_widget_from_glade<Gtk::Entry> (glade, "serialentry") ;
+ entry = get_widget_from_glade<Gtk::Entry> (glade, "serialentry");
if (entry->get_text ().empty ())
- return false ;
+ return false;
}
- return true ;
+ return true;
}
//*****************
//</init functions>
@@ -175,47 +177,47 @@
const UString& get_executable_path () const
{
Gtk::FileChooserButton *chooser =
- get_widget_from_glade<Gtk::FileChooserButton> (glade,
- "execfilechooserbutton");
- executable_path = chooser->get_filename () ;
- return executable_path ;
+ get_widget_from_glade<Gtk::FileChooserButton>
+ (glade, "execfilechooserbutton");
+ executable_path = chooser->get_filename ();
+ return executable_path;
}
void set_executable_path (const UString &a_path)
{
Gtk::FileChooserButton *chooser =
- get_widget_from_glade<Gtk::FileChooserButton> (glade,
- "execfilechooserbutton");
- chooser->set_filename (a_path) ;
- executable_path = a_path ;
+ get_widget_from_glade<Gtk::FileChooserButton>
+ (glade, "execfilechooserbutton");
+ chooser->set_filename (a_path);
+ executable_path = a_path;
}
const UString& get_solib_prefix_path () const
{
Gtk::FileChooserButton *chooser =
- get_widget_from_glade<Gtk::FileChooserButton> (glade,
- "solibprefixchooserbutton") ;
- solib_prefix_path = chooser->get_filename () ;
- return solib_prefix_path ;
+ get_widget_from_glade<Gtk::FileChooserButton>
+ (glade, "solibprefixchooserbutton");
+ solib_prefix_path = chooser->get_filename ();
+ return solib_prefix_path;
}
void set_solib_prefix_path (const UString &a_path)
{
Gtk::FileChooserButton *chooser =
- get_widget_from_glade<Gtk::FileChooserButton> (glade,
- "solibprefixchooserbutton") ;
- chooser->set_filename (a_path) ;
- solib_prefix_path = a_path ;
+ get_widget_from_glade<Gtk::FileChooserButton>
+ (glade, "solibprefixchooserbutton");
+ chooser->set_filename (a_path);
+ solib_prefix_path = a_path;
}
void set_connection_type (RemoteTargetDialog::ConnectionType &a_type)
{
Gtk::RadioButton *radio =
- get_widget_from_glade<Gtk::RadioButton> (glade, "tcpradiobutton") ;
+ get_widget_from_glade<Gtk::RadioButton> (glade, "tcpradiobutton");
if (a_type == RemoteTargetDialog::TCP_CONNECTION_TYPE) {
- radio->set_active (true) ;
+ radio->set_active (true);
} else {
- radio->set_active (false) ;
+ radio->set_active (false);
}
}
@@ -223,44 +225,44 @@
{
Gtk::Entry *entry = get_widget_from_glade<Gtk::Entry>(glade,
"addressentry");
- server_address = entry->get_text () ;
- return server_address ;
+ server_address = entry->get_text ();
+ return server_address;
}
void set_server_address (const UString &a_address)
{
Gtk::Entry *entry = get_widget_from_glade<Gtk::Entry>(glade,
"addressentry");
- entry->set_text (a_address) ;
+ entry->set_text (a_address);
}
int get_server_port () const
{
Gtk::Entry *entry = get_widget_from_glade<Gtk::Entry> (glade,
- "portentry") ;
- return atoi (entry->get_text ().c_str ()) ;
+ "portentry");
+ return atoi (entry->get_text ().c_str ());
}
void set_server_port (int a_port)
{
Gtk::Entry *entry = get_widget_from_glade<Gtk::Entry> (glade,
- "portentry") ;
- entry->set_text (UString::from_int (a_port)) ;
+ "portentry");
+ entry->set_text (UString::from_int (a_port));
}
const UString& get_serial_port_name () const
{
Gtk::Entry *entry = get_widget_from_glade<Gtk::Entry> (glade,
- "serialentry") ;
- serial_port_name = entry->get_text () ;
- return serial_port_name ;
+ "serialentry");
+ serial_port_name = entry->get_text ();
+ return serial_port_name;
}
void set_serial_port_name (const UString &a_name)
{
Gtk::Entry *entry = get_widget_from_glade<Gtk::Entry> (glade,
- "serialentry") ;
- entry->set_text (a_name) ;
+ "serialentry");
+ entry->set_text (a_name);
}
};//end RemoteTargetDialog::Priv
@@ -270,97 +272,97 @@
"remotetargetdialog.glade",
"remotetargetdialog")
{
- m_priv.reset (new Priv (widget (), glade ())) ;
- THROW_IF_FAIL (m_priv) ;
+ m_priv.reset (new Priv (widget (), glade ()));
+ THROW_IF_FAIL (m_priv);
}
RemoteTargetDialog::~RemoteTargetDialog ()
{
- LOG_D ("destroyed", "destructor-domain") ;
+ LOG_D ("destroyed", "destructor-domain");
}
const UString&
RemoteTargetDialog::get_executable_path () const
{
- THROW_IF_FAIL (m_priv) ;
- return m_priv->get_executable_path () ;
+ THROW_IF_FAIL (m_priv);
+ return m_priv->get_executable_path ();
}
void
RemoteTargetDialog::set_executable_path (const UString &a_path)
{
- THROW_IF_FAIL (m_priv) ;
- m_priv->set_executable_path (a_path) ;
+ THROW_IF_FAIL (m_priv);
+ m_priv->set_executable_path (a_path);
}
const UString&
RemoteTargetDialog::get_solib_prefix_path () const
{
- THROW_IF_FAIL (m_priv) ;
- return m_priv->get_solib_prefix_path () ;
+ THROW_IF_FAIL (m_priv);
+ return m_priv->get_solib_prefix_path ();
}
void
RemoteTargetDialog::set_solib_prefix_path (const UString &a_path)
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
m_priv->set_solib_prefix_path (a_path);
}
RemoteTargetDialog::ConnectionType
RemoteTargetDialog::get_connection_type ()
{
- THROW_IF_FAIL (m_priv) ;
- return m_priv->connection_type ;
+ THROW_IF_FAIL (m_priv);
+ return m_priv->connection_type;
}
void
RemoteTargetDialog::set_connection_type (ConnectionType a_type)
{
- THROW_IF_FAIL (m_priv) ;
- m_priv->set_connection_type (a_type) ;
+ THROW_IF_FAIL (m_priv);
+ m_priv->set_connection_type (a_type);
}
const UString&
RemoteTargetDialog::get_server_address () const
{
- THROW_IF_FAIL (m_priv) ;
- return m_priv->get_server_address () ;
+ THROW_IF_FAIL (m_priv);
+ return m_priv->get_server_address ();
}
void
RemoteTargetDialog::set_server_address (const UString &a_address)
{
- THROW_IF_FAIL (m_priv) ;
- m_priv->set_server_address (a_address) ;
+ THROW_IF_FAIL (m_priv);
+ m_priv->set_server_address (a_address);
}
int
RemoteTargetDialog::get_server_port () const
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
return m_priv->get_server_port ();
}
void
RemoteTargetDialog::set_server_port (int a_port)
{
- THROW_IF_FAIL (m_priv) ;
- m_priv->set_server_port (a_port) ;
+ THROW_IF_FAIL (m_priv);
+ m_priv->set_server_port (a_port);
}
const UString&
RemoteTargetDialog::get_serial_port_name () const
{
- THROW_IF_FAIL (m_priv) ;
- return m_priv->get_serial_port_name () ;
+ THROW_IF_FAIL (m_priv);
+ return m_priv->get_serial_port_name ();
}
void
RemoteTargetDialog::set_serial_port_name (const UString &a_serial)
{
- THROW_IF_FAIL (m_priv) ;
- return m_priv->set_serial_port_name (a_serial) ;
+ THROW_IF_FAIL (m_priv);
+ return m_priv->set_serial_port_name (a_serial);
}
NEMIVER_END_NAMESPACE (nemiver)
Modified: trunk/src/persp/dbgperspective/nmv-remote-target-dialog.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-remote-target-dialog.h (original)
+++ trunk/src/persp/dbgperspective/nmv-remote-target-dialog.h Tue Jul 29 22:45:24 2008
@@ -27,9 +27,10 @@
#include "nmv-dialog.h"
NEMIVER_BEGIN_NAMESPACE (nemiver)
+
class RemoteTargetDialog : public Dialog {
- struct Priv ;
- SafePtr<Priv> m_priv ;
+ struct Priv;
+ SafePtr<Priv> m_priv;
public:
@@ -38,26 +39,26 @@
SERIAL_CONNECTION_TYPE
};
- RemoteTargetDialog (const UString &a_root_path) ;
- virtual ~RemoteTargetDialog () ;
+ RemoteTargetDialog (const UString &a_root_path);
+ virtual ~RemoteTargetDialog ();
- const UString& get_executable_path () const ;
- void set_executable_path (const UString &a_path) ;
+ const UString& get_executable_path () const;
+ void set_executable_path (const UString &a_path);
- const UString& get_solib_prefix_path () const ;
- void set_solib_prefix_path (const UString &a_path) ;
+ const UString& get_solib_prefix_path () const;
+ void set_solib_prefix_path (const UString &a_path);
- ConnectionType get_connection_type () ;
- void set_connection_type (ConnectionType a_type) ;
+ ConnectionType get_connection_type ();
+ void set_connection_type (ConnectionType a_type);
- const UString& get_server_address () const ;
- void set_server_address (const UString &a_address) ;
+ const UString& get_server_address () const;
+ void set_server_address (const UString &a_address);
- int get_server_port () const ;
- void set_server_port (int a_port) ;
+ int get_server_port () const;
+ void set_server_port (int a_port);
- const UString& get_serial_port_name () const ;
- void set_serial_port_name (const UString &a_serial) ;
+ const UString& get_serial_port_name () const;
+ void set_serial_port_name (const UString &a_serial);
};//end RemoteTargetDialog
NEMIVER_END_NAMESPACE (nemiver)
Modified: trunk/src/persp/dbgperspective/nmv-run-program-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-run-program-dialog.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-run-program-dialog.cc Tue Jul 29 22:45:24 2008
@@ -39,8 +39,8 @@
#include "nmv-run-program-dialog.h"
#include "nmv-ui-utils.h"
-using namespace std ;
-using namespace nemiver::common ;
+using namespace std;
+using namespace nemiver::common;
namespace nemiver {
@@ -52,24 +52,24 @@
EnvVarModelColumns() { add (varname); add (value); }
};
-struct RunProgramDialog::Priv
-{
+struct RunProgramDialog::Priv {
private:
- Priv () ;
+ Priv ();
public:
- Gtk::FileChooserButton *fcbutton ;
- Gtk::Button *okbutton ;
+ Gtk::FileChooserButton *fcbutton;
+ Gtk::Button *okbutton;
Gtk::TreeView* treeview_environment;
Gtk::Button* remove_button;
Gtk::Button* add_button;
EnvVarModelColumns env_columns;
Glib::RefPtr<Gtk::ListStore> model;
- Gtk::Dialog &dialog ;
- Glib::RefPtr<Gnome::Glade::Xml> glade ;
+ Gtk::Dialog &dialog;
+ Glib::RefPtr<Gnome::Glade::Xml> glade;
- Priv (Gtk::Dialog &a_dialog, const Glib::RefPtr<Gnome::Glade::Xml> &a_glade) :
+ Priv (Gtk::Dialog &a_dialog,
+ const Glib::RefPtr<Gnome::Glade::Xml> &a_glade) :
fcbutton (0),
okbutton (0),
treeview_environment (0),
@@ -79,20 +79,20 @@
dialog (a_dialog),
glade (a_glade)
{
- init () ;
+ init ();
}
void init ()
{
okbutton =
ui_utils::get_widget_from_glade<Gtk::Button>
- (glade, "executebutton") ;
- THROW_IF_FAIL (okbutton) ;
- okbutton->set_sensitive (false) ;
+ (glade, "executebutton");
+ THROW_IF_FAIL (okbutton);
+ okbutton->set_sensitive (false);
treeview_environment =
ui_utils::get_widget_from_glade<Gtk::TreeView>
- (glade, "treeview_environment");
+ (glade, "treeview_environment");
treeview_environment->set_model (model);
@@ -105,19 +105,20 @@
add_button =
ui_utils::get_widget_from_glade<Gtk::Button>
(glade, "button_add_var");
- THROW_IF_FAIL (add_button) ;
+ THROW_IF_FAIL (add_button);
add_button->signal_clicked().connect(sigc::mem_fun(*this,
&RunProgramDialog::Priv::on_add_new_variable));
remove_button = ui_utils::get_widget_from_glade<Gtk::Button>
- (glade, "button_remove_var");
- THROW_IF_FAIL (remove_button) ;
+ (glade, "button_remove_var");
+ THROW_IF_FAIL (remove_button);
remove_button->signal_clicked().connect(sigc::mem_fun(*this,
&RunProgramDialog::Priv::on_remove_variable));
- // we need to disable / enable sensitivity of the "Remove variable" button
- // based on whether a variable is selected in the treeview.
+ // we need to disable / enable sensitivity of the
+ // "Remove variable" button based on whether a
+ // variable is selected in the treeview.
treeview_environment->get_selection ()->signal_changed ().connect
(sigc::mem_fun
(*this,
@@ -125,16 +126,16 @@
fcbutton =
ui_utils::get_widget_from_glade<Gtk::FileChooserButton>
- (glade, "filechooserbutton") ;
- THROW_IF_FAIL (fcbutton) ;
- fcbutton->set_show_hidden (true) ;
+ (glade, "filechooserbutton");
+ THROW_IF_FAIL (fcbutton);
+ fcbutton->set_show_hidden (true);
fcbutton->signal_selection_changed ().connect (sigc::mem_fun
- (*this, &Priv::on_file_selection_changed)) ;
+ (*this, &Priv::on_file_selection_changed));
// activate the default action (execute) when pressing enter in the
// arguments text box
ui_utils::get_widget_from_glade<Gtk::Entry>
- (glade, "argumentsentry")->set_activates_default () ;
+ (glade, "argumentsentry")->set_activates_default ();
}
void on_add_new_variable ()
@@ -143,7 +144,8 @@
THROW_IF_FAIL(treeview_environment);
Gtk::TreeModel::iterator treeiter = model->append ();
Gtk::TreeModel::Path path = model->get_path (treeiter);
- // activate the first cell of the newly added row so that the user can start
+ // activate the first cell of the newly
+ // added row so that the user can start
// typing in the name and value of the variable
treeview_environment->set_cursor (path,
*treeview_environment->get_column (0), true);
@@ -162,13 +164,10 @@
void on_variable_selection_changed ()
{
- THROW_IF_FAIL (remove_button) ;
- if (treeview_environment->get_selection ()->count_selected_rows ())
- {
+ THROW_IF_FAIL (remove_button);
+ if (treeview_environment->get_selection ()->count_selected_rows ()) {
remove_button->set_sensitive();
- }
- else
- {
+ } else {
remove_button->set_sensitive(false);
}
}
@@ -184,11 +183,11 @@
if (Glib::file_test
(Glib::locale_from_utf8 (fcbutton->get_filename ()),
Glib::FILE_TEST_IS_EXECUTABLE)) {
- okbutton->set_sensitive (true) ;
+ okbutton->set_sensitive (true);
}
}
}
-};
+};//end struct RunProgramDialog::Priv
RunProgramDialog::RunProgramDialog (const UString &a_root_path) :
Dialog (a_root_path, "runprogramdialog.glade", "runprogramdialog")
@@ -196,12 +195,12 @@
m_priv.reset (new Priv (widget (), glade ()));
THROW_IF_FAIL (m_priv);
- working_directory (Glib::filename_to_utf8 (Glib::get_current_dir ())) ;
+ working_directory (Glib::filename_to_utf8 (Glib::get_current_dir ()));
}
RunProgramDialog::~RunProgramDialog ()
{
- LOG_D ("destroyed", "destructor-domain") ;
+ LOG_D ("destroyed", "destructor-domain");
}
UString
@@ -209,38 +208,40 @@
{
Gtk::FileChooserButton *chooser =
ui_utils::get_widget_from_glade<Gtk::FileChooserButton>
- (glade (), "filechooserbutton") ;
- return chooser->get_filename () ;
+ (glade (), "filechooserbutton");
+ return chooser->get_filename ();
}
void
RunProgramDialog::program_name (const UString &a_name)
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
Gtk::FileChooserButton *chooser =
ui_utils::get_widget_from_glade<Gtk::FileChooserButton>
- (glade (), "filechooserbutton") ;
- THROW_IF_FAIL (chooser) ;
- chooser->set_filename (a_name) ;
+ (glade (), "filechooserbutton");
+ THROW_IF_FAIL (chooser);
+ chooser->set_filename (a_name);
}
UString
RunProgramDialog::arguments () const
{
Gtk::Entry *entry =
- ui_utils::get_widget_from_glade<Gtk::Entry> (glade (), "argumentsentry");
- THROW_IF_FAIL (entry) ;
- return entry->get_text () ;
+ ui_utils::get_widget_from_glade<Gtk::Entry> (glade (),
+ "argumentsentry");
+ THROW_IF_FAIL (entry);
+ return entry->get_text ();
}
void
RunProgramDialog::arguments (const UString &a_args)
{
Gtk::Entry *entry =
- ui_utils::get_widget_from_glade<Gtk::Entry> (glade (), "argumentsentry");
- THROW_IF_FAIL (entry) ;
- entry->set_text (a_args) ;
+ ui_utils::get_widget_from_glade<Gtk::Entry> (glade (),
+ "argumentsentry");
+ THROW_IF_FAIL (entry);
+ entry->set_text (a_args);
}
UString
@@ -248,8 +249,8 @@
{
Gtk::FileChooserButton *chooser =
ui_utils::get_widget_from_glade<Gtk::FileChooserButton>
- (glade (), "filechooserbutton_workingdir");
- return chooser->get_filename () ;
+ (glade (), "filechooserbutton_workingdir");
+ return chooser->get_filename ();
}
void
@@ -259,9 +260,10 @@
ui_utils::get_widget_from_glade<Gtk::FileChooserButton>
(glade (), "filechooserbutton_workingdir");
if (a_dir == "" || a_dir == ".") {
- chooser->set_filename (Glib::locale_to_utf8 (Glib::get_current_dir ()));
+ chooser->set_filename
+ (Glib::locale_to_utf8 (Glib::get_current_dir ()));
} else {
- chooser->set_filename (a_dir) ;
+ chooser->set_filename (a_dir);
}
}
@@ -269,10 +271,11 @@
RunProgramDialog::environment_variables () const
{
THROW_IF_FAIL (m_priv);
- THROW_IF_FAIL (m_priv->model) ;
+ THROW_IF_FAIL (m_priv->model);
map<UString, UString> env_vars;
for (Gtk::TreeModel::iterator iter = m_priv->model->children().begin ();
- iter != m_priv->model->children().end(); ++iter) {
+ iter != m_priv->model->children().end();
+ ++iter) {
// for some reason I have to explicitly convert from Glib::ustring to
// UString here or it won't compile
env_vars[UString((*iter)[m_priv->env_columns.varname])] =
@@ -284,8 +287,8 @@
void
RunProgramDialog::environment_variables (const map<UString, UString> &vars)
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->model) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->model);
// clear out the old data so we can set the new data
m_priv->model->clear();
for (map<UString, UString>::const_iterator iter = vars.begin();
Modified: trunk/src/persp/dbgperspective/nmv-run-program-dialog.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-run-program-dialog.h (original)
+++ trunk/src/persp/dbgperspective/nmv-run-program-dialog.h Tue Jul 29 22:45:24 2008
@@ -32,11 +32,11 @@
NEMIVER_BEGIN_NAMESPACE (nemiver)
namespace common {
-class UString ;
+class UString;
}
-using nemiver::common::UString ;
-using nemiver::common::SafePtr ;
+using nemiver::common::UString;
+using nemiver::common::SafePtr;
class RunProgramDialog : public Dialog {
@@ -45,18 +45,18 @@
public:
- RunProgramDialog (const UString &a_resource_root_path) ;
+ RunProgramDialog (const UString &a_resource_root_path);
- virtual ~RunProgramDialog () ;
+ virtual ~RunProgramDialog ();
- UString program_name () const ;
- void program_name (const UString &a_name) ;
+ UString program_name () const;
+ void program_name (const UString &a_name);
- UString arguments () const ;
- void arguments (const UString &a_args) ;
+ UString arguments () const;
+ void arguments (const UString &a_args);
- UString working_directory () const ;
- void working_directory (const UString &) ;
+ UString working_directory () const;
+ void working_directory (const UString &);
std::map<UString, UString> environment_variables () const;
void environment_variables (const std::map<UString, UString> &);
Modified: trunk/src/persp/dbgperspective/nmv-saved-sessions-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-saved-sessions-dialog.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-saved-sessions-dialog.cc Tue Jul 29 22:45:24 2008
@@ -35,8 +35,8 @@
#include "nmv-saved-sessions-dialog.h"
#include "nmv-ui-utils.h"
-using namespace std ;
-using namespace nemiver::common ;
+using namespace std;
+using namespace nemiver::common;
namespace nemiver {
@@ -49,21 +49,21 @@
SessionModelColumns() { add (name); add (id); add (session); }
};
-class SavedSessionsDialog::Priv
-{
+class SavedSessionsDialog::Priv {
public:
SafePtr<Gtk::TreeView> treeview_sessions;
Gtk::Button *okbutton;
SessionModelColumns session_columns;
Glib::RefPtr<Gtk::ListStore> model;
Gtk::Dialog &dialog;
- Glib::RefPtr<Gnome::Glade::Xml> glade ;
+ Glib::RefPtr<Gnome::Glade::Xml> glade;
private:
- Priv () ;
+ Priv ();
public:
- Priv (Gtk::Dialog &a_dialog, const Glib::RefPtr<Gnome::Glade::Xml> &a_glade) :
+ Priv (Gtk::Dialog &a_dialog,
+ const Glib::RefPtr<Gnome::Glade::Xml> &a_glade) :
okbutton (0),
model(Gtk::ListStore::create (session_columns)),
dialog (a_dialog),
@@ -74,9 +74,10 @@
void init (ISessMgr *a_session_manager)
{
okbutton =
- ui_utils::get_widget_from_glade<Gtk::Button> (glade, "okbutton1") ;
- treeview_sessions.reset (ui_utils::get_widget_from_glade<Gtk::TreeView>
- (glade, "treeview_sessions")) ;
+ ui_utils::get_widget_from_glade<Gtk::Button> (glade, "okbutton1");
+ treeview_sessions.reset
+ (ui_utils::get_widget_from_glade<Gtk::TreeView>
+ (glade, "treeview_sessions"));
okbutton->set_sensitive (false);
THROW_IF_FAIL (a_session_manager);
list<ISessMgr::Session> sessions = a_session_manager->sessions ();
@@ -86,7 +87,8 @@
{
Gtk::TreeModel::iterator treeiter = model->append ();
(*treeiter)[session_columns.id] = iter->session_id ();
- (*treeiter)[session_columns.name] = iter->properties ()["sessionname"];
+ (*treeiter)[session_columns.name] =
+ iter->properties ()["sessionname"];
(*treeiter)[session_columns.session] = *iter;
}
@@ -95,12 +97,15 @@
treeview_sessions->append_column (_("ID"), session_columns.id);
treeview_sessions->append_column (_("Session"), session_columns.name);
- // update the sensitivity of the OK button when the selection is changed
+ // update the sensitivity of the OK
+ // button when the selection is changed
treeview_sessions->get_selection ()->signal_changed ().connect
- (sigc::mem_fun(*this, &SavedSessionsDialog::Priv::on_selection_changed));
+ (sigc::mem_fun(*this,
+ &SavedSessionsDialog::Priv::on_selection_changed));
- treeview_sessions->signal_row_activated ().connect (
- sigc::mem_fun(*this, &SavedSessionsDialog::Priv::on_row_activated));
+ treeview_sessions->signal_row_activated ().connect
+ (sigc::mem_fun(*this,
+ &SavedSessionsDialog::Priv::on_row_activated));
}
void on_selection_changed ()
@@ -116,14 +121,14 @@
if (a_path.get_depth () || a_col) {}
dialog.activate_default();
}
-};
+}; //end struct SavedSessionsDialog::Priv
SavedSessionsDialog::SavedSessionsDialog (const UString &a_root_path,
ISessMgr *a_session_manager) :
Dialog(a_root_path, "savedsessionsdialog.glade", "savedsessionsdialog")
{
m_priv.reset (new Priv (widget (), glade ()));
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
m_priv->init (a_session_manager);
}
Modified: trunk/src/persp/dbgperspective/nmv-saved-sessions-dialog.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-saved-sessions-dialog.h (original)
+++ trunk/src/persp/dbgperspective/nmv-saved-sessions-dialog.h Tue Jul 29 22:45:24 2008
@@ -34,11 +34,11 @@
NEMIVER_BEGIN_NAMESPACE (nemiver)
namespace common {
-class UString ;
+class UString;
}
-using nemiver::common::UString ;
-using nemiver::common::SafePtr ;
+using nemiver::common::UString;
+using nemiver::common::SafePtr;
class SavedSessionsDialog : public Dialog {
class Priv;
@@ -46,8 +46,9 @@
SafePtr<SavedSessionsDialog::Priv> m_priv;
public:
- SavedSessionsDialog (const UString &a_root_path, ISessMgr *a_sesssion_manager) ;
- virtual ~SavedSessionsDialog () ;
+ SavedSessionsDialog (const UString &a_root_path,
+ ISessMgr *a_sesssion_manager);
+ virtual ~SavedSessionsDialog ();
ISessMgr::Session session () const;
void session (const ISessMgr::Session &a_session) const;
Modified: trunk/src/persp/dbgperspective/nmv-sess-mgr.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-sess-mgr.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-sess-mgr.cc Tue Jul 29 22:45:24 2008
@@ -31,55 +31,55 @@
#include "nmv-ui-utils.h"
#include "nmv-sess-mgr.h"
-using namespace std ;
-using namespace nemiver::common ;
-using nemiver::common::Connection ;
-using nemiver::common::ConnectionSafePtr ;
-using nemiver::common::ConnectionManager ;
-using nemiver::common::Transaction ;
-using nemiver::common::SQLStatement ;
+using namespace std;
+using namespace nemiver::common;
+using nemiver::common::Connection;
+using nemiver::common::ConnectionSafePtr;
+using nemiver::common::ConnectionManager;
+using nemiver::common::Transaction;
+using nemiver::common::SQLStatement;
-static const char *REQUIRED_DB_SCHEMA_VERSION = "1.3" ;
+static const char *REQUIRED_DB_SCHEMA_VERSION = "1.3";
NEMIVER_BEGIN_NAMESPACE (nemiver)
class SessMgr : public ISessMgr {
//non copyable
- SessMgr (const SessMgr&) ;
- SessMgr& operator= (const SessMgr&) ;
- struct Priv ;
- SafePtr<Priv> m_priv ;
+ SessMgr (const SessMgr&);
+ SessMgr& operator= (const SessMgr&);
+ struct Priv;
+ SafePtr<Priv> m_priv;
protected:
- SessMgr () ;
+ SessMgr ();
public:
- SessMgr (const UString &root_dir) ;
- virtual ~SessMgr () ;
- Transaction& default_transaction () ;
- list<Session>& sessions () ;
- const list<Session>& sessions () const ;
+ SessMgr (const UString &root_dir);
+ virtual ~SessMgr ();
+ Transaction& default_transaction ();
+ list<Session>& sessions ();
+ const list<Session>& sessions () const;
void store_session (Session &a_session,
- Transaction &a_trans) ;
- void store_sessions (Transaction &a_trans) ;
+ Transaction &a_trans);
+ void store_sessions (Transaction &a_trans);
void load_session (Session &a_session,
- Transaction &a_trans) ;
+ Transaction &a_trans);
void load_sessions (Transaction &a_trans);
void load_sessions ();
void delete_session (gint64 a_id,
- Transaction &a_trans) ;
- void delete_session (gint64 a_id) ;
- void delete_sessions (Transaction &a_trans) ;
- void delete_sessions () ;
- void clear_session (gint64 a_id, Transaction &a_trans) ;
- void clear_session (gint64 a_id) ;
+ Transaction &a_trans);
+ void delete_session (gint64 a_id);
+ void delete_sessions (Transaction &a_trans);
+ void delete_sessions ();
+ void clear_session (gint64 a_id, Transaction &a_trans);
+ void clear_session (gint64 a_id);
};//end class SessMgr
struct SessMgr::Priv {
- UString root_dir ;
- list<Session> sessions ;
- ConnectionSafePtr conn ;
- TransactionSafePtr default_transaction ;
+ UString root_dir;
+ list<Session> sessions;
+ ConnectionSafePtr conn;
+ TransactionSafePtr default_transaction;
Priv () {}
Priv (const UString &a_root_dir) :
@@ -89,177 +89,180 @@
ConnectionSafePtr connection ()
{
if (!conn) {
- conn= ConnectionManager::create_db_connection () ;
+ conn= ConnectionManager::create_db_connection ();
}
- THROW_IF_FAIL (conn) ;
+ THROW_IF_FAIL (conn);
return conn;
}
UString path_to_create_tables_script ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
string path = Glib::build_filename
(Glib::locale_from_utf8 (root_dir),
- "sqlscripts/create-tables.sql") ;
- return Glib::locale_to_utf8 (path) ;
+ "sqlscripts/create-tables.sql");
+ return Glib::locale_to_utf8 (path);
}
UString path_to_drop_tables_script ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
string path = Glib::build_filename
(Glib::locale_from_utf8 (root_dir),
- "sqlscripts/drop-tables.sql") ;
- return Glib::locale_to_utf8 (path) ;
+ "sqlscripts/drop-tables.sql");
+ return Glib::locale_to_utf8 (path);
}
bool create_db ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
- UString path_to_script = path_to_create_tables_script () ;
- Transaction transaction (*conn) ;
+ UString path_to_script = path_to_create_tables_script ();
+ Transaction transaction (*conn);
return tools::execute_sql_command_file
(path_to_script,
transaction,
- cerr) ;
+ cerr);
}
bool drop_db ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
- UString path_to_script = path_to_drop_tables_script () ;
- Transaction transaction (*conn) ;
+ UString path_to_script = path_to_drop_tables_script ();
+ Transaction transaction (*conn);
return tools::execute_sql_command_file
(path_to_script,
transaction,
- cerr) ;
+ cerr);
}
bool check_db_version ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- SQLStatement query ("select version from schemainfo") ;
+ SQLStatement query ("select version from schemainfo");
- RETURN_VAL_IF_FAIL (connection ()->execute_statement (query), false) ;
- RETURN_VAL_IF_FAIL (connection ()->read_next_row (), false) ;
- UString version ;
+ RETURN_VAL_IF_FAIL (connection ()->execute_statement (query), false);
+ RETURN_VAL_IF_FAIL (connection ()->read_next_row (), false);
+ UString version;
RETURN_VAL_IF_FAIL (connection ()->get_column_content (0, version),
- false) ;
- LOG_DD ("version: " << version) ;
+ false);
+ LOG_DD ("version: " << version);
if (version != REQUIRED_DB_SCHEMA_VERSION) {
- return false ;
+ return false;
}
NEMIVER_CATCH_AND_RETURN (false)
- return true ;
+ return true;
}
void init_db ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
//if the db version is not what we expect, create
//a new db with the schema we expect.
if (!check_db_version ()) {
- drop_db () ;
- THROW_IF_FAIL (create_db ()) ;
+ drop_db ();
+ THROW_IF_FAIL (create_db ());
}
NEMIVER_CATCH
}
void init ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- init_db () ;
+ init_db ();
NEMIVER_CATCH
}
};//end struct SessMgr::Priv
SessMgr::SessMgr ()
{
- m_priv.reset (new SessMgr::Priv) ;
- m_priv->init () ;
+ m_priv.reset (new SessMgr::Priv);
+ m_priv->init ();
}
SessMgr::SessMgr (const UString &a_root_dir)
{
- m_priv.reset (new SessMgr::Priv (a_root_dir)) ;
- m_priv->init () ;
+ m_priv.reset (new SessMgr::Priv (a_root_dir));
+ m_priv->init ();
}
SessMgr::~SessMgr ()
{
- LOG_D ("delete", "destructor-domain") ;
+ LOG_D ("delete", "destructor-domain");
}
Transaction&
SessMgr::default_transaction ()
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
if (!m_priv->default_transaction) {
m_priv->default_transaction =
- TransactionSafePtr (new Transaction (*m_priv->connection ())) ;
- THROW_IF_FAIL (m_priv->default_transaction) ;
+ TransactionSafePtr (new Transaction (*m_priv->connection ()));
+ THROW_IF_FAIL (m_priv->default_transaction);
}
- return *m_priv->default_transaction ;
+ return *m_priv->default_transaction;
}
list<SessMgr::Session>&
SessMgr::sessions ()
{
- return m_priv->sessions ;
+ return m_priv->sessions;
}
const list<SessMgr::Session>&
SessMgr::sessions () const
{
- return m_priv->sessions ;
+ return m_priv->sessions;
}
void
SessMgr::store_session (Session &a_session,
Transaction &a_trans)
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
//The next line starts a transaction.
//If we get off from this function without reaching
//the trans.end() call, every db request we made gets rolled back.
- TransactionAutoHelper trans (a_trans) ;
+ TransactionAutoHelper trans (a_trans);
- UString query ;
+ UString query;
if (!a_session.session_id ()) {
//insert the session id in the sessions table, and get the session id
//we just inerted
query = "insert into sessions values(NULL)";
- THROW_IF_FAIL2 (trans.get ().get_connection ().execute_statement (query),
- "failed to execute query: '" + query + "'") ;
- query = "select max(id) from sessions" ;
- THROW_IF_FAIL2 (trans.get ().get_connection ().execute_statement (query),
- "failed to execute query: '" + query + "'") ;
+ THROW_IF_FAIL2
+ (trans.get ().get_connection ().execute_statement (query),
+ "failed to execute query: '" + query + "'");
+ query = "select max(id) from sessions";
+ THROW_IF_FAIL2
+ (trans.get ().get_connection ().execute_statement (query),
+ "failed to execute query: '" + query + "'");
LOG_DD ("query: " << query);
- THROW_IF_FAIL (trans.get ().get_connection ().read_next_row ()) ;
- gint64 session_id=0 ;
+ THROW_IF_FAIL (trans.get ().get_connection ().read_next_row ());
+ gint64 session_id = 0;
THROW_IF_FAIL
- (trans.get ().get_connection ().get_column_content (0, session_id)) ;
- THROW_IF_FAIL (session_id) ;
- a_session.session_id (session_id) ;
+ (trans.get ().get_connection ().get_column_content
+ (0, session_id));
+ THROW_IF_FAIL (session_id);
+ a_session.session_id (session_id);
}
//store the properties
query = "delete from attributes where sessionid = "
- + UString::from_int (a_session.session_id ()) ;
+ + UString::from_int (a_session.session_id ());
THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query));
- map<UString, UString>::const_iterator prop_iter ;
+ map<UString, UString>::const_iterator prop_iter;
for (prop_iter = a_session.properties ().begin ();
prop_iter != a_session.properties ().end ();
++prop_iter) {
@@ -269,15 +272,16 @@
+ prop_iter->second
+ "')";
LOG_DD ("query: " << query);
- THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query));
+ THROW_IF_FAIL
+ (trans.get ().get_connection ().execute_statement (query));
}
//store the environment variables
query = "delete from env_variables where sessionid = "
- + UString::from_int (a_session.session_id ()) ;
+ + UString::from_int (a_session.session_id ());
THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query));
- map<UString, UString>::const_iterator var_iter ;
+ map<UString, UString>::const_iterator var_iter;
for (var_iter = a_session.env_variables ().begin ();
var_iter != a_session.env_variables ().end ();
++var_iter) {
@@ -287,15 +291,17 @@
+ var_iter->second
+ "')";
LOG_DD ("query: " << query);
- THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query));
+ THROW_IF_FAIL
+ (trans.get ().get_connection ().execute_statement (query));
}
//store the breakpoints
query = "delete from breakpoints where sessionid = "
- + UString::from_int (a_session.session_id ()) ;
- THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query));
+ + UString::from_int (a_session.session_id ());
+ THROW_IF_FAIL
+ (trans.get ().get_connection ().execute_statement (query));
- list<SessMgr::BreakPoint>::const_iterator break_iter ;
+ list<SessMgr::BreakPoint>::const_iterator break_iter;
for (break_iter = a_session.breakpoints ().begin ();
break_iter != a_session.breakpoints ().end ();
++break_iter) {
@@ -309,53 +315,56 @@
+ UString::from_int (break_iter->enabled ()) + ", "
+ "'" + condition + "')";
LOG_DD ("query: " << query);
- THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query)) ;
+ THROW_IF_FAIL
+ (trans.get ().get_connection ().execute_statement (query));
}
//store the opened files
query = "delete from openedfiles where sessionid = "
- + UString::from_int (a_session.session_id ()) ;
+ + UString::from_int (a_session.session_id ());
THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query));
- list<UString>::const_iterator ofile_iter ;
+ list<UString>::const_iterator ofile_iter;
for (ofile_iter = a_session.opened_files ().begin ();
ofile_iter != a_session.opened_files ().end ();
++ofile_iter) {
query = "insert into openedfiles values(NULL, "
+ UString::from_int (a_session.session_id ()) + ", '"
+ *ofile_iter
- + "')" ;
+ + "')";
LOG_DD ("query: " << query);
- THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query)) ;
+ THROW_IF_FAIL
+ (trans.get ().get_connection ().execute_statement (query));
}
//store the search paths
query = "delete from searchpaths where sessionid = "
- + UString::from_int (a_session.session_id ()) ;
+ + UString::from_int (a_session.session_id ());
THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query));
- list<UString>::const_iterator path_iter ;
+ list<UString>::const_iterator path_iter;
for (path_iter = a_session.search_paths ().begin ();
path_iter != a_session.search_paths ().end ();
++path_iter) {
query = "insert into searchpaths values(NULL, "
+ UString::from_int (a_session.session_id ()) + ", '"
+ *path_iter
- + "')" ;
+ + "')";
LOG_DD ("query: " << query);
- THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query)) ;
+ THROW_IF_FAIL
+ (trans.get ().get_connection ().execute_statement (query));
}
- trans.end () ;
+ trans.end ();
}
void
SessMgr::store_sessions (Transaction &a_trans)
{
- list<Session>::iterator session_iter ;
+ list<Session>::iterator session_iter;
for (session_iter = sessions ().begin ();
session_iter != sessions ().end ();
++session_iter) {
- store_session (*session_iter, a_trans) ;
+ store_session (*session_iter, a_trans);
}
}
@@ -364,45 +373,45 @@
Transaction &a_trans)
{
if (!a_session.session_id ()) {
- THROW ("Session has null ID. Can't load if from database") ;
+ THROW ("Session has null ID. Can't load if from database");
}
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
- Session session ;
- session.session_id (a_session.session_id ()) ;
+ Session session;
+ session.session_id (a_session.session_id ());
//The next line starts a transaction.
//If we get off from this function without reaching
//the trans.end() call, every db request we made gets rolled back.
- TransactionAutoHelper trans (a_trans) ;
+ TransactionAutoHelper trans (a_trans);
//load the attributes
UString query="select attributes.name, attributes.value "
"from attributes where attributes.sessionid = "
+ UString::from_int (a_session.session_id ());
- THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query)) ;
+ THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query));
while (trans.get ().get_connection ().read_next_row ()) {
- UString name, value ;
+ UString name, value;
THROW_IF_FAIL
- (trans.get ().get_connection ().get_column_content (0, name)) ;
+ (trans.get ().get_connection ().get_column_content (0, name));
THROW_IF_FAIL
- (trans.get ().get_connection ().get_column_content (1, value)) ;
- session.properties ()[name] = value ;
+ (trans.get ().get_connection ().get_column_content (1, value));
+ session.properties ()[name] = value;
}
//load the environment variables
query = "select env_variables.name, env_variables.value "
"from env_variables where env_variables.sessionid = "
+ UString::from_int (a_session.session_id ());
- THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query)) ;
+ THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query));
while (trans.get ().get_connection ().read_next_row ()) {
- UString name, value ;
+ UString name, value;
THROW_IF_FAIL
- (trans.get ().get_connection ().get_column_content (0, name)) ;
+ (trans.get ().get_connection ().get_column_content (0, name));
THROW_IF_FAIL
- (trans.get ().get_connection ().get_column_content (1, value)) ;
- session.env_variables ()[name] = value ;
+ (trans.get ().get_connection ().get_column_content (1, value));
+ session.env_variables ()[name] = value;
}
//load the breakpoints
@@ -410,166 +419,164 @@
"breakpoints.linenumber, breakpoints.enabled, "
"breakpoints.condition from "
"breakpoints where breakpoints.sessionid = "
- + UString::from_int (session.session_id ())
- ;
- THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query)) ;
+ + UString::from_int (session.session_id ());
+ THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query));
while (trans.get ().get_connection ().read_next_row ()) {
UString filename, filefullname, linenumber, enabled, condition;
THROW_IF_FAIL (trans.get ().get_connection ().get_column_content
- (0, filename));
+ (0, filename));
THROW_IF_FAIL (trans.get ().get_connection ().get_column_content
- (1, filefullname));
+ (1, filefullname));
THROW_IF_FAIL (trans.get ().get_connection ().get_column_content
- (2, linenumber));
+ (2, linenumber));
THROW_IF_FAIL (trans.get ().get_connection ().get_column_content
- (3, enabled));
+ (3, enabled));
THROW_IF_FAIL (trans.get ().get_connection ().get_column_content
- (4, condition));
+ (4, condition));
condition.chomp ();
session.breakpoints ().push_back (SessMgr::BreakPoint (filename,
filefullname,
linenumber,
enabled,
- condition)) ;
+ condition));
}
//load the search paths
query = "select searchpaths.path from "
"searchpaths where searchpaths.sessionid = "
- + UString::from_int (session.session_id ())
- ;
- THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query)) ;
+ + UString::from_int (session.session_id ());
+ THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query));
while (trans.get ().get_connection ().read_next_row ()) {
UString path;
THROW_IF_FAIL (trans.get ().get_connection ().get_column_content
(0, path));
- session.search_paths ().push_back (path) ;
+ session.search_paths ().push_back (path);
}
//load the opened files
query = "select openedfiles.filename from openedfiles where "
"openedfiles.sessionid = "
- + UString::from_int (session.session_id ()) ;
- THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query)) ;
+ + UString::from_int (session.session_id ());
+ THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query));
while (trans.get ().get_connection ().read_next_row ()) {
- UString filename ;
+ UString filename;
THROW_IF_FAIL (trans.get ().get_connection ().get_column_content
(0, filename));
- session.opened_files ().push_back (filename) ;
+ session.opened_files ().push_back (filename);
}
- trans.end () ;
- a_session = session ;
+ trans.end ();
+ a_session = session;
}
void
SessMgr::load_sessions (Transaction &a_trans)
{
- THROW_IF_FAIL (m_priv) ;
- UString query = "select sessions.id from sessions" ;
+ THROW_IF_FAIL (m_priv);
+ UString query = "select sessions.id from sessions";
- TransactionAutoHelper trans (a_trans) ;
+ TransactionAutoHelper trans (a_trans);
- list<Session> sessions ;
- THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query)) ;
+ list<Session> sessions;
+ THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query));
while (trans.get ().get_connection ().read_next_row ()) {
- gint64 session_id=0 ;
- trans.get ().get_connection ().get_column_content (0, session_id) ;
- THROW_IF_FAIL (session_id) ;
- sessions.push_back (Session (session_id)) ;
+ gint64 session_id=0;
+ trans.get ().get_connection ().get_column_content (0, session_id);
+ THROW_IF_FAIL (session_id);
+ sessions.push_back (Session (session_id));
}
- list<Session>::iterator session_iter ;
+ list<Session>::iterator session_iter;
for (session_iter = sessions.begin ();
session_iter != sessions.end ();
++session_iter) {
- load_session (*session_iter, default_transaction ()) ;
+ load_session (*session_iter, default_transaction ());
}
- m_priv->sessions = sessions ;
- trans.end () ;
+ m_priv->sessions = sessions;
+ trans.end ();
}
void
SessMgr::load_sessions ()
{
- load_sessions (default_transaction ()) ;
+ load_sessions (default_transaction ());
}
void
SessMgr::delete_session (gint64 a_id,
Transaction &a_trans)
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
- TransactionAutoHelper trans (a_trans) ;
+ TransactionAutoHelper trans (a_trans);
- clear_session (a_id, a_trans) ;
+ clear_session (a_id, a_trans);
UString query = "delete from sessions where "
- "id = " + UString::from_int (a_id) ;
- THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query)) ;
+ "id = " + UString::from_int (a_id);
+ THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query));
- trans.end () ;
+ trans.end ();
}
void
SessMgr::delete_session (gint64 a_id)
{
- delete_session (a_id, default_transaction ()) ;
+ delete_session (a_id, default_transaction ());
}
void
SessMgr::delete_sessions (Transaction &a_trans)
{
- list<Session>::const_iterator iter ;
+ list<Session>::const_iterator iter;
for (iter = sessions ().begin ();
iter != sessions ().end ();
++iter) {
delete_session (iter->session_id (),
- a_trans) ;
+ a_trans);
}
}
void
SessMgr::delete_sessions ()
{
- delete_sessions (default_transaction ()) ;
+ delete_sessions (default_transaction ());
}
void
SessMgr::clear_session (gint64 a_id, Transaction &a_trans)
{
- THROW_IF_FAIL (m_priv) ;
- TransactionAutoHelper trans (a_trans) ;
+ THROW_IF_FAIL (m_priv);
+ TransactionAutoHelper trans (a_trans);
UString query = "delete from attributes where "
"sessionid = " + UString::from_int (a_id);
- THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query)) ;
+ THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query));
query = "delete from breakpoints where "
- "sessionid = " + UString::from_int (a_id) ;
- THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query)) ;
+ "sessionid = " + UString::from_int (a_id);
+ THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query));
query = "delete from openedfiles where "
- "sessionid = " + UString::from_int (a_id) ;
- THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query)) ;
+ "sessionid = " + UString::from_int (a_id);
+ THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query));
query = "delete from searchpaths where "
- "sessionid = " + UString::from_int (a_id) ;
- THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query)) ;
+ "sessionid = " + UString::from_int (a_id);
+ THROW_IF_FAIL (trans.get ().get_connection ().execute_statement (query));
- trans.end () ;
+ trans.end ();
}
void
SessMgr::clear_session (gint64 a_id)
{
- clear_session (a_id, default_transaction ()) ;
+ clear_session (a_id, default_transaction ());
}
ISessMgrSafePtr
ISessMgr::create (const UString &a_root_path)
{
- return ISessMgrSafePtr (new SessMgr (a_root_path)) ;
+ return ISessMgrSafePtr (new SessMgr (a_root_path));
}
NEMIVER_END_NAMESPACE (nemiver)
Modified: trunk/src/persp/dbgperspective/nmv-sess-mgr.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-sess-mgr.h (original)
+++ trunk/src/persp/dbgperspective/nmv-sess-mgr.h Tue Jul 29 22:45:24 2008
@@ -44,7 +44,7 @@
NEMIVER_BEGIN_NAMESPACE (nemiver)
class ISessMgr;
-typedef SafePtr<ISessMgr, ObjectRef, ObjectUnref> ISessMgrSafePtr ;
+typedef SafePtr<ISessMgr, ObjectRef, ObjectUnref> ISessMgrSafePtr;
class NEMIVER_API ISessMgr : public Object {
//non copyable
Modified: trunk/src/persp/dbgperspective/nmv-set-breakpoint-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-set-breakpoint-dialog.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-set-breakpoint-dialog.cc Tue Jul 29 22:45:24 2008
@@ -35,8 +35,8 @@
#include "nmv-set-breakpoint-dialog.h"
#include "nmv-ui-utils.h"
-using namespace std ;
-using namespace nemiver::common ;
+using namespace std;
+using namespace nemiver::common;
namespace nemiver {
@@ -55,17 +55,17 @@
class SetBreakpointDialog::Priv {
public:
- Gtk::ComboBox *combo_event ;
+ Gtk::ComboBox *combo_event;
EventComboModelColumns combo_event_col_model;
Glib::RefPtr<Gtk::TreeStore> combo_event_model;
- Gtk::Entry *entry_filename ;
+ Gtk::Entry *entry_filename;
Gtk::Entry *entry_line;
Gtk::Entry *entry_function;
Gtk::Entry *entry_condition;
Gtk::RadioButton *radio_source_location;
Gtk::RadioButton *radio_function_name;
Gtk::RadioButton *radio_event;
- Gtk::Button *okbutton ;
+ Gtk::Button *okbutton;
public:
Priv (Gtk::Dialog &a_dialog,
@@ -82,13 +82,13 @@
a_dialog.set_default_response (Gtk::RESPONSE_OK);
okbutton =
- ui_utils::get_widget_from_glade<Gtk::Button> (a_glade, "okbutton") ;
- THROW_IF_FAIL (okbutton) ;
- okbutton->set_sensitive (false) ;
+ ui_utils::get_widget_from_glade<Gtk::Button> (a_glade, "okbutton");
+ THROW_IF_FAIL (okbutton);
+ okbutton->set_sensitive (false);
combo_event =
ui_utils::get_widget_from_glade<Gtk::ComboBox>
- (a_glade, "combo_event") ;
+ (a_glade, "combo_event");
combo_event_model = Gtk::TreeStore::create(combo_event_col_model);
combo_event->set_model(combo_event_model);
Gtk::TreeModel::Row row;
@@ -104,23 +104,23 @@
entry_filename =
ui_utils::get_widget_from_glade<Gtk::Entry>
- (a_glade, "filenameentry") ;
+ (a_glade, "filenameentry");
entry_filename->signal_changed ().connect (sigc::mem_fun
- (*this, &Priv::on_text_changed_signal)) ;
+ (*this, &Priv::on_text_changed_signal));
entry_line =
ui_utils::get_widget_from_glade<Gtk::Entry>
- (a_glade, "lineentry") ;
+ (a_glade, "lineentry");
entry_line->signal_changed ().connect (sigc::mem_fun
- (*this, &Priv::on_text_changed_signal)) ;
- entry_line->set_activates_default () ;
+ (*this, &Priv::on_text_changed_signal));
+ entry_line->set_activates_default ();
entry_function =
ui_utils::get_widget_from_glade<Gtk::Entry>
- (a_glade, "functionentry") ;
+ (a_glade, "functionentry");
entry_function->signal_changed ().connect (sigc::mem_fun
- (*this, &Priv::on_text_changed_signal)) ;
- entry_function->set_activates_default () ;
+ (*this, &Priv::on_text_changed_signal));
+ entry_function->set_activates_default ();
entry_condition = ui_utils::get_widget_from_glade<Gtk::Entry>
(a_glade, "conditionentry");
@@ -130,35 +130,36 @@
radio_source_location =
ui_utils::get_widget_from_glade<Gtk::RadioButton>
- (a_glade, "sourcelocationradio") ;
+ (a_glade, "sourcelocationradio");
radio_source_location->signal_clicked ().connect (sigc::mem_fun
- (*this, &Priv::on_radiobutton_changed)) ;
+ (*this, &Priv::on_radiobutton_changed));
radio_function_name =
ui_utils::get_widget_from_glade<Gtk::RadioButton>
- (a_glade, "functionnameradio") ;
+ (a_glade, "functionnameradio");
radio_function_name->signal_clicked ().connect (sigc::mem_fun
- (*this, &Priv::on_radiobutton_changed)) ;
+ (*this, &Priv::on_radiobutton_changed));
radio_event =
ui_utils::get_widget_from_glade<Gtk::RadioButton>
- (a_glade, "eventradio") ;
+ (a_glade, "eventradio");
radio_event->signal_clicked ().connect (sigc::mem_fun
- (*this, &Priv::on_radiobutton_changed)) ;
+ (*this, &Priv::on_radiobutton_changed));
// set the 'function name' mode active by default
mode (MODE_FUNCTION_NAME);
- // hack to ensure that the correct text entry fields get insensitive at
- // startup since if the glade file initializes MODE_FUNCTION_NAME to
- // active, the 'changed' signal won't be emitted here (is there a better
- // way to do this?)
+ // hack to ensure that the correct text entry fields
+ // get insensitive at startup since if the glade file
+ // initializes MODE_FUNCTION_NAME to
+ // active, the 'changed' signal won't be emitted here
+ // (is there a better way to do this?)
on_radiobutton_changed ();
}
void update_ok_button_sensitivity ()
{
- THROW_IF_FAIL (entry_filename) ;
- THROW_IF_FAIL (entry_line) ;
+ THROW_IF_FAIL (entry_filename);
+ THROW_IF_FAIL (entry_line);
SetBreakpointDialog::Mode a_mode = mode ();
@@ -169,20 +170,20 @@
!entry_line->get_text ().empty () &&
// make sure the line number field is a valid number
atoi(entry_line->get_text ().c_str ())) {
- okbutton->set_sensitive (true) ;
+ okbutton->set_sensitive (true);
} else {
- okbutton->set_sensitive (false) ;
+ okbutton->set_sensitive (false);
}
break;
case MODE_FUNCTION_NAME:
if (!entry_function->get_text ().empty ()) {
- okbutton->set_sensitive (true) ;
+ okbutton->set_sensitive (true);
} else {
- okbutton->set_sensitive (false) ;
+ okbutton->set_sensitive (false);
}
break;
default:
- okbutton->set_sensitive (true) ;
+ okbutton->set_sensitive (true);
break;
}
}
@@ -196,12 +197,12 @@
void on_radiobutton_changed ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- THROW_IF_FAIL (entry_filename) ;
- THROW_IF_FAIL (entry_line) ;
- THROW_IF_FAIL (entry_function) ;
+ THROW_IF_FAIL (entry_filename);
+ THROW_IF_FAIL (entry_line);
+ THROW_IF_FAIL (entry_function);
SetBreakpointDialog::Mode a_mode = mode ();
@@ -228,39 +229,38 @@
void mode (SetBreakpointDialog::Mode a_mode)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
- THROW_IF_FAIL (radio_source_location) ;
- THROW_IF_FAIL (radio_function_name) ;
- THROW_IF_FAIL (entry_line) ;
- THROW_IF_FAIL (entry_filename) ;
- THROW_IF_FAIL (entry_function) ;
+ THROW_IF_FAIL (radio_source_location);
+ THROW_IF_FAIL (radio_function_name);
+ THROW_IF_FAIL (entry_line);
+ THROW_IF_FAIL (entry_filename);
+ THROW_IF_FAIL (entry_function);
- switch (a_mode)
- {
- case MODE_SOURCE_LOCATION:
- LOG_DD ("Changing Mode to SOURCE_LOCATION");
- radio_source_location->set_active ();
- entry_filename->grab_focus () ;
- break;
- case MODE_FUNCTION_NAME:
- LOG_DD ("Changing Mode to FUNCTION_NAME");
- radio_function_name->set_active ();
- entry_function->grab_focus () ;
- break;
- case MODE_EVENT:
- LOG_DD ("Changing Mode to EVENT");
- radio_event->set_active ();
- combo_event->grab_focus ();
- break;
- default:
- THROW ("Should not be reached") ;
+ switch (a_mode) {
+ case MODE_SOURCE_LOCATION:
+ LOG_DD ("Changing Mode to SOURCE_LOCATION");
+ radio_source_location->set_active ();
+ entry_filename->grab_focus ();
+ break;
+ case MODE_FUNCTION_NAME:
+ LOG_DD ("Changing Mode to FUNCTION_NAME");
+ radio_function_name->set_active ();
+ entry_function->grab_focus ();
+ break;
+ case MODE_EVENT:
+ LOG_DD ("Changing Mode to EVENT");
+ radio_event->set_active ();
+ combo_event->grab_focus ();
+ break;
+ default:
+ THROW ("Should not be reached");
}
}
UString get_active_event () const
{
- Gtk::TreeModel::iterator iter = combo_event->get_active () ;
+ Gtk::TreeModel::iterator iter = combo_event->get_active ();
return (*iter)[combo_event_col_model.m_command];
}
@@ -271,16 +271,15 @@
SetBreakpointDialog::Mode mode () const
{
- THROW_IF_FAIL (radio_source_location) ;
- THROW_IF_FAIL (radio_function_name) ;
+ THROW_IF_FAIL (radio_source_location);
+ THROW_IF_FAIL (radio_function_name);
if (radio_source_location->get_active ()) {
return MODE_SOURCE_LOCATION;
} else if (radio_event->get_active ()) {
return MODE_EVENT;
- }
- else {
+ } else {
return MODE_FUNCTION_NAME;
}
}
@@ -299,65 +298,65 @@
UString
SetBreakpointDialog::file_name () const
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->entry_filename) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->entry_filename);
- return m_priv->entry_filename->get_text () ;
+ return m_priv->entry_filename->get_text ();
}
void
SetBreakpointDialog::file_name (const UString &a_name)
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->entry_filename) ;
- m_priv->entry_filename->set_text (a_name) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->entry_filename);
+ m_priv->entry_filename->set_text (a_name);
}
int
SetBreakpointDialog::line_number () const
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->entry_line) ;
- return atoi (m_priv->entry_line->get_text ().c_str ()) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->entry_line);
+ return atoi (m_priv->entry_line->get_text ().c_str ());
}
void
SetBreakpointDialog::line_number (int a_line)
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->entry_line) ;
- m_priv->entry_line->set_text (UString::from_int(a_line)) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->entry_line);
+ m_priv->entry_line->set_text (UString::from_int(a_line));
}
UString
SetBreakpointDialog::function () const
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->entry_function) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->entry_function);
- return m_priv->entry_function->get_text () ;
+ return m_priv->entry_function->get_text ();
}
void
SetBreakpointDialog::function (const UString &a_name)
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->entry_function) ;
- m_priv->entry_function->set_text (a_name) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->entry_function);
+ m_priv->entry_function->set_text (a_name);
}
UString
SetBreakpointDialog::event () const
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->combo_event) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->combo_event);
return m_priv->get_active_event();
}
void SetBreakpointDialog::event (const UString &a_event)
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->combo_event) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->combo_event);
m_priv->set_active_event (a_event);
}
@@ -382,7 +381,7 @@
SetBreakpointDialog::Mode
SetBreakpointDialog::mode () const
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
return m_priv->mode ();
}
@@ -390,7 +389,7 @@
void
SetBreakpointDialog::mode (Mode a_mode)
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
m_priv->mode (a_mode);
}
Modified: trunk/src/persp/dbgperspective/nmv-set-breakpoint-dialog.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-set-breakpoint-dialog.h (original)
+++ trunk/src/persp/dbgperspective/nmv-set-breakpoint-dialog.h Tue Jul 29 22:45:24 2008
@@ -32,15 +32,15 @@
NEMIVER_BEGIN_NAMESPACE (nemiver)
namespace common {
-class UString ;
+class UString;
}
-using nemiver::common::UString ;
-using nemiver::common::SafePtr ;
+using nemiver::common::UString;
+using nemiver::common::SafePtr;
class SetBreakpointDialog : public Dialog {
- class Priv ;
- SafePtr<Priv> m_priv ;
+ class Priv;
+ SafePtr<Priv> m_priv;
public:
typedef enum
{
@@ -49,20 +49,20 @@
MODE_EVENT
} Mode;
- SetBreakpointDialog (const UString &a_resource_root_path) ;
- virtual ~SetBreakpointDialog () ;
+ SetBreakpointDialog (const UString &a_resource_root_path);
+ virtual ~SetBreakpointDialog ();
- UString file_name () const ;
- void file_name (const UString &a_name) ;
+ UString file_name () const;
+ void file_name (const UString &a_name);
- int line_number () const ;
- void line_number (int) ;
+ int line_number () const;
+ void line_number (int);
- UString function () const ;
- void function (const UString &a_name) ;
+ UString function () const;
+ void function (const UString &a_name);
- UString event () const ;
- void event (const UString &a_event) ;
+ UString event () const;
+ void event (const UString &a_event);
UString condition () const;
void condition (const UString &a_cond);
Modified: trunk/src/persp/dbgperspective/nmv-thread-list.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-thread-list.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-thread-list.cc Tue Jul 29 22:45:24 2008
@@ -165,7 +165,8 @@
tree_view->get_selection ()->get_selected ();
if (!it) {return;}
- int thread_id = (int) it->get_value (thread_list_columns ().thread_id);
+ int thread_id =
+ (int) it->get_value (thread_list_columns ().thread_id);
if (thread_id <= 0) {return;}
THROW_IF_FAIL (debugger);
@@ -208,10 +209,11 @@
THROW_IF_FAIL (debugger);
THROW_IF_FAIL (tree_view && tree_view->get_selection ());
tree_view_selection_changed_connection =
- tree_view->get_selection ()->signal_changed ().connect (sigc::mem_fun
- (*this, &Priv::on_tree_view_selection_changed_signal));
- tree_view->signal_expose_event ().connect_notify (sigc::mem_fun
- (*this, &Priv::on_expose_event_signal));
+ tree_view->get_selection ()->signal_changed ().connect
+ (sigc::mem_fun
+ (*this, &Priv::on_tree_view_selection_changed_signal));
+ tree_view->signal_expose_event ().connect_notify
+ (sigc::mem_fun (*this, &Priv::on_expose_event_signal));
}
void set_a_thread_id (int a_id)
@@ -239,12 +241,13 @@
{
THROW_IF_FAIL (list_store);
- Gtk::TreeModel::iterator it ;
+ Gtk::TreeModel::iterator it;
for (it = list_store->children ().begin ();
it != list_store->children ().end ();
++it) {
LOG_DD ("testing list row");
- if ((int)(*it)->get_value (thread_list_columns ().thread_id) == a_tid) {
+ if ((int)(*it)->get_value
+ (thread_list_columns ().thread_id) == a_tid) {
if (!a_emit_signal) {
tree_view_selection_changed_connection.block (true);
}
Modified: trunk/src/persp/dbgperspective/nmv-thread-list.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-thread-list.h (original)
+++ trunk/src/persp/dbgperspective/nmv-thread-list.h Tue Jul 29 22:45:24 2008
@@ -31,32 +31,32 @@
#include "common/nmv-safe-ptr-utils.h"
#include "nmv-i-debugger.h"
-using nemiver::common::Object ;
-using nemiver::common::SafePtr ;
-using nemiver::IDebuggerSafePtr ;
+using nemiver::common::Object;
+using nemiver::common::SafePtr;
+using nemiver::IDebuggerSafePtr;
NEMIVER_BEGIN_NAMESPACE (nemiver)
class NEMIVER_API ThreadList : public Object {
//non copyable
- ThreadList (const ThreadList &) ;
- ThreadList& operator= (const ThreadList &) ;
+ ThreadList (const ThreadList &);
+ ThreadList& operator= (const ThreadList &);
- struct Priv ;
- SafePtr<Priv> m_priv ;
+ struct Priv;
+ SafePtr<Priv> m_priv;
protected:
- ThreadList () ;
+ ThreadList ();
public:
- ThreadList (IDebuggerSafePtr &) ;
- virtual ~ThreadList () ;
- const std::list<int>& thread_ids () const ;
- int current_thread_id () const ;
- Gtk::Widget& widget () const ;
- void clear () ;
- sigc::signal<void, int>& thread_selected_signal () const ;
+ ThreadList (IDebuggerSafePtr &);
+ virtual ~ThreadList ();
+ const std::list<int>& thread_ids () const;
+ int current_thread_id () const;
+ Gtk::Widget& widget () const;
+ void clear ();
+ sigc::signal<void, int>& thread_selected_signal () const;
};//end class ThreadList
NEMIVER_END_NAMESPACE (nemiver)
Modified: trunk/src/persp/dbgperspective/nmv-var-inspector-dialog.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-var-inspector-dialog.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-var-inspector-dialog.cc Tue Jul 29 22:45:24 2008
@@ -32,15 +32,15 @@
NEMIVER_BEGIN_NAMESPACE (nemiver)
class VarInspectorDialog::Priv {
- friend class VarInspectorDialog ;
- Gtk::Entry *var_name_entry ;
- Gtk::Button *inspect_button ;
- SafePtr<VarInspector2> var_inspector ;
- Gtk::Dialog &dialog ;
- Glib::RefPtr<Gnome::Glade::Xml> glade ;
- IDebuggerSafePtr debugger ;
+ friend class VarInspectorDialog;
+ Gtk::Entry *var_name_entry;
+ Gtk::Button *inspect_button;
+ SafePtr<VarInspector2> var_inspector;
+ Gtk::Dialog &dialog;
+ Glib::RefPtr<Gnome::Glade::Xml> glade;
+ IDebuggerSafePtr debugger;
- Priv () ;
+ Priv ();
public:
Priv (Gtk::Dialog &a_dialog,
@@ -52,45 +52,45 @@
glade (a_glade),
debugger (a_debugger)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
- build_dialog () ;
- connect_to_widget_signals () ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
+ build_dialog ();
+ connect_to_widget_signals ();
}
void build_dialog ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
var_name_entry =
ui_utils::get_widget_from_glade<Gtk::Entry> (glade,
- "variablenameentry") ;
+ "variablenameentry");
inspect_button =
ui_utils::get_widget_from_glade<Gtk::Button> (glade,
- "inspectbutton") ;
- inspect_button->set_sensitive (false) ;
+ "inspectbutton");
+ inspect_button->set_sensitive (false);
Gtk::Box *box =
ui_utils::get_widget_from_glade<Gtk::Box> (glade,
- "inspectorwidgetbox") ;
- var_inspector.reset (new VarInspector2 (debugger)) ;
- THROW_IF_FAIL (var_inspector) ;
- Gtk::ScrolledWindow *scr = Gtk::manage (new Gtk::ScrolledWindow) ;
- scr->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC) ;
+ "inspectorwidgetbox");
+ var_inspector.reset (new VarInspector2 (debugger));
+ THROW_IF_FAIL (var_inspector);
+ 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 ()) ;
- box->pack_start (*scr) ;
- dialog.show_all () ;
+ scr->add (var_inspector->widget ());
+ box->pack_start (*scr);
+ dialog.show_all ();
}
void connect_to_widget_signals ()
{
- THROW_IF_FAIL (inspect_button) ;
+ THROW_IF_FAIL (inspect_button);
inspect_button->signal_clicked ().connect (sigc::mem_fun
- (*this, &Priv::on_inspect_button_clicked_signal)) ;
+ (*this, &Priv::on_inspect_button_clicked_signal));
var_name_entry->signal_changed ().connect (sigc::mem_fun
- (*this, &Priv::on_var_name_changed_signal)) ;
+ (*this, &Priv::on_var_name_changed_signal));
var_name_entry->signal_activate ().connect (sigc::mem_fun
- (*this, &Priv::on_var_name_activated_signal)) ;
+ (*this, &Priv::on_var_name_activated_signal));
}
//************************
@@ -100,44 +100,44 @@
{
NEMIVER_TRY
- THROW_IF_FAIL (var_name_entry) ;
- THROW_IF_FAIL (var_inspector) ;
+ THROW_IF_FAIL (var_name_entry);
+ THROW_IF_FAIL (var_inspector);
- UString var_name = var_name_entry->get_text () ;
+ UString var_name = var_name_entry->get_text ();
if (var_name == "") {return;}
- var_inspector->inspect_variable (var_name) ;
+ var_inspector->inspect_variable (var_name);
NEMIVER_CATCH
}
void on_inspect_button_clicked_signal ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- THROW_IF_FAIL (var_name_entry) ;
- THROW_IF_FAIL (var_inspector) ;
+ THROW_IF_FAIL (var_name_entry);
+ THROW_IF_FAIL (var_inspector);
- UString variable_name = var_name_entry->get_text () ;
+ UString variable_name = var_name_entry->get_text ();
if (variable_name == "") {return;}
- var_inspector->inspect_variable (variable_name) ;
+ var_inspector->inspect_variable (variable_name);
NEMIVER_CATCH
}
void on_var_name_changed_signal ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- THROW_IF_FAIL (var_name_entry) ;
- THROW_IF_FAIL (inspect_button) ;
+ THROW_IF_FAIL (var_name_entry);
+ THROW_IF_FAIL (inspect_button);
- UString var_name = var_name_entry->get_text () ;
+ UString var_name = var_name_entry->get_text ();
if (var_name == "") {
- inspect_button->set_sensitive (false) ;
+ inspect_button->set_sensitive (false);
} else {
- inspect_button->set_sensitive (true) ;
+ inspect_button->set_sensitive (true);
}
NEMIVER_CATCH
@@ -154,43 +154,43 @@
"varinspectordialog.glade",
"varinspectordialog")
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
m_priv.reset
- (new VarInspectorDialog::Priv (widget (), glade (), a_debugger)) ;
- THROW_IF_FAIL (m_priv) ;
+ (new VarInspectorDialog::Priv (widget (), glade (), a_debugger));
+ THROW_IF_FAIL (m_priv);
}
VarInspectorDialog::~VarInspectorDialog ()
{
- LOG_D ("delete", "destructor-domain") ;
+ LOG_D ("delete", "destructor-domain");
}
UString
VarInspectorDialog::variable_name () const
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->var_name_entry) ;
- return m_priv->var_name_entry->get_text () ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->var_name_entry);
+ return m_priv->var_name_entry->get_text ();
}
void
VarInspectorDialog::inspect_variable (const UString &a_var_name)
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->var_name_entry) ;
- THROW_IF_FAIL (m_priv->var_inspector) ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->var_name_entry);
+ THROW_IF_FAIL (m_priv->var_inspector);
if (a_var_name != "") {
- m_priv->var_name_entry->set_text (a_var_name) ;
- m_priv->var_inspector->inspect_variable (a_var_name) ;
+ m_priv->var_name_entry->set_text (a_var_name);
+ m_priv->var_inspector->inspect_variable (a_var_name);
}
}
const IDebugger::VariableSafePtr
VarInspectorDialog::variable () const
{
- THROW_IF_FAIL (m_priv) ;
- return m_priv->var_inspector->get_variable () ;
+ THROW_IF_FAIL (m_priv);
+ return m_priv->var_inspector->get_variable ();
}
NEMIVER_END_NAMESPACE (nemiver)
Modified: trunk/src/persp/dbgperspective/nmv-var-inspector-dialog.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-var-inspector-dialog.h (original)
+++ trunk/src/persp/dbgperspective/nmv-var-inspector-dialog.h Tue Jul 29 22:45:24 2008
@@ -29,27 +29,27 @@
#include "nmv-i-debugger.h"
NEMIVER_BEGIN_NAMESPACE (nemiver)
-class IDebugger ;
+class IDebugger;
class VarInspectorDialog : public Dialog {
//non copyable
- VarInspectorDialog (const VarInspectorDialog &) ;
- VarInspectorDialog& operator= (const VarInspectorDialog &) ;
+ VarInspectorDialog (const VarInspectorDialog &);
+ VarInspectorDialog& operator= (const VarInspectorDialog &);
//tell me why you would want to extend this.
- VarInspectorDialog () ;
+ VarInspectorDialog ();
class Priv;
SafePtr<Priv> m_priv;
public:
VarInspectorDialog (const UString &a_resource_root_path,
- IDebuggerSafePtr &a_debugger) ;
- virtual ~VarInspectorDialog () ;
+ IDebuggerSafePtr &a_debugger);
+ virtual ~VarInspectorDialog ();
- UString variable_name () const ;
- void inspect_variable (const UString &a_variable_name) ;
- const IDebugger::VariableSafePtr variable () const ;
+ UString variable_name () const;
+ void inspect_variable (const UString &a_variable_name);
+ const IDebugger::VariableSafePtr variable () const;
};//end class VarInspectorDialog
NEMIVER_END_NAMESPACE (nemiver)
Modified: trunk/src/persp/dbgperspective/nmv-var-inspector.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-var-inspector.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-var-inspector.cc Tue Jul 29 22:45:24 2008
@@ -33,29 +33,29 @@
#include "nmv-ui-utils.h"
#include "nmv-vars-treeview.h"
-namespace uutil = nemiver::ui_utils ;
-namespace vutil = nemiver::variables_utils2 ;
-namespace cmn = nemiver::common ;
+namespace uutil = nemiver::ui_utils;
+namespace vutil = nemiver::variables_utils2;
+namespace cmn = nemiver::common;
NEMIVER_BEGIN_NAMESPACE (nemiver)
class VarInspector2::Priv : public sigc::trackable {
- friend class VarInspector2 ;
- Priv () ;
+ friend class VarInspector2;
+ Priv ();
- bool requested_variable ;
- bool requested_type ;
- IDebuggerSafePtr debugger ;
- IDebugger::VariableSafePtr variable ;
- VarsTreeViewSafePtr tree_view ;
- Glib::RefPtr<Gtk::TreeStore> tree_store ;
- Gtk::TreeModel::iterator var_row_it ;
+ bool requested_variable;
+ bool requested_type;
+ IDebuggerSafePtr debugger;
+ IDebugger::VariableSafePtr variable;
+ VarsTreeViewSafePtr tree_view;
+ Glib::RefPtr<Gtk::TreeStore> tree_store;
+ Gtk::TreeModel::iterator var_row_it;
Gtk::TreeModel::iterator cur_selected_row;
- IVarWalkerSafePtr var_walker ;
+ IVarWalkerSafePtr var_walker;
void build_widget ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
tree_view = VarsTreeView::create ();
THROW_IF_FAIL (tree_view);
tree_store = tree_view->get_tree_store ();
@@ -64,99 +64,91 @@
void connect_to_signals ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
- Glib::RefPtr<Gtk::TreeSelection> selection = tree_view->get_selection () ;
- THROW_IF_FAIL (selection) ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
+ Glib::RefPtr<Gtk::TreeSelection> selection =
+ tree_view->get_selection ();
+ THROW_IF_FAIL (selection);
selection->signal_changed ().connect
(sigc::mem_fun (*this,
&Priv::on_tree_view_selection_changed_signal));
tree_view->signal_row_activated ().connect
- (sigc::mem_fun (*this, &Priv::on_tree_view_row_activated_signal)) ;
-
- /*
- debugger.variable_value_signal ().connect
- (sigc::mem_fun (*this,
- &Priv::on_debugger_variable_value_signal)) ;
- debugger.variable_type_signal ().connect
- (sigc::mem_fun (*this,
- &Priv::on_variable_type_signal)) ;
- debugger.pointed_variable_value_signal ().connect
- (sigc::mem_fun (*this,
- &Priv::on_pointed_variable_value_signal)) ;
-
- tree_view->signal_row_expanded ().connect (sigc::mem_fun
- (*this, &Priv::on_tree_view_row_expanded_signal)) ;
- */
+ (sigc::mem_fun (*this, &Priv::on_tree_view_row_activated_signal));
}
void re_init_tree_view ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
- THROW_IF_FAIL (tree_store) ;
- tree_store->clear () ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
+ THROW_IF_FAIL (tree_store);
+ tree_store->clear ();
}
void set_variable (const IDebugger::VariableSafePtr &a_variable)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
- THROW_IF_FAIL (tree_view && tree_store) ;
- re_init_tree_view () ;
+ THROW_IF_FAIL (tree_view && tree_store);
+ re_init_tree_view ();
- Gtk::TreeModel::iterator parent_iter = tree_store->children ().begin ();
- Gtk::TreeModel::iterator var_row ;
+ Gtk::TreeModel::iterator parent_iter =
+ tree_store->children ().begin ();
+ Gtk::TreeModel::iterator var_row;
vutil::append_a_variable (a_variable,
*tree_view,
tree_store,
parent_iter,
- var_row) ;
- LOG_DD ("set variable" << a_variable->name ()) ;
+ var_row);
+ LOG_DD ("set variable" << a_variable->name ());
if (var_row) {
- tree_view->expand_row (tree_store->get_path (var_row), false) ;
+ tree_view->expand_row (tree_store->get_path (var_row), false);
}
}
void show_variable_type_in_dialog ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
if (!cur_selected_row) {return;}
UString type =
- (Glib::ustring) (*cur_selected_row)[vutil::get_variable_columns ().type] ;
- UString message ;
- message.printf (_("Variable type is: \n %s"), type.c_str ()) ;
+ (Glib::ustring)
+ (*cur_selected_row)[vutil::get_variable_columns ().type];
+ UString message;
+ message.printf (_("Variable type is: \n %s"), type.c_str ());
IDebugger::VariableSafePtr variable =
(IDebugger::VariableSafePtr)
- cur_selected_row->get_value (vutil::get_variable_columns ().variable);
- THROW_IF_FAIL (variable) ;
- //message += "\nDumped for debug: \n" ;
- //variable->to_string (message, false) ;
- ui_utils::display_info (message) ;
+ cur_selected_row->get_value
+ (vutil::get_variable_columns ().variable);
+ THROW_IF_FAIL (variable);
+ // message += "\nDumped for debug: \n";
+ // variable->to_string (message, false);
+ ui_utils::display_info (message);
}
IVarWalkerSafePtr create_var_walker ()
{
cmn::DynamicModule::Loader *loader =
debugger->get_dynamic_module ().get_module_loader ();
- THROW_IF_FAIL (loader) ;
- cmn::DynamicModuleManager *module_manager = loader->get_dynamic_module_manager ();
- THROW_IF_FAIL (module_manager) ;
+ THROW_IF_FAIL (loader);
+ cmn::DynamicModuleManager *module_manager =
+ loader->get_dynamic_module_manager ();
+ THROW_IF_FAIL (module_manager);
IVarWalkerSafePtr result =
- module_manager->load_iface<IVarWalker> ("varwalker", "IVarWalker");
- THROW_IF_FAIL (result) ;
- return result ;
+ module_manager->load_iface<IVarWalker> ("varwalker",
+ "IVarWalker");
+ THROW_IF_FAIL (result);
+ return result;
}
IVarWalkerSafePtr get_var_walker ()
{
if (!var_walker) {
- var_walker = create_var_walker () ;
- THROW_IF_FAIL (var_walker) ;
+ var_walker = create_var_walker ();
+ THROW_IF_FAIL (var_walker);
var_walker->visited_variable_signal ().connect
- (sigc::mem_fun (this, &VarInspector2::Priv::on_visited_variable_signal)) ;
+ (sigc::mem_fun
+ (this, &VarInspector2::Priv::on_visited_variable_signal));
}
- return var_walker ;
+ return var_walker;
}
// ******************
@@ -166,21 +158,21 @@
void on_tree_view_selection_changed_signal ()
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- THROW_IF_FAIL (tree_view) ;
- Glib::RefPtr<Gtk::TreeSelection> sel = tree_view->get_selection () ;
- THROW_IF_FAIL (sel) ;
- cur_selected_row = sel->get_selected () ;
+ THROW_IF_FAIL (tree_view);
+ Glib::RefPtr<Gtk::TreeSelection> sel = tree_view->get_selection ();
+ THROW_IF_FAIL (sel);
+ cur_selected_row = sel->get_selected ();
if (!cur_selected_row) {return;}
IDebugger::VariableSafePtr variable =
(IDebugger::VariableSafePtr)cur_selected_row->get_value
- (vutil::get_variable_columns ().variable) ;
+ (vutil::get_variable_columns ().variable);
if (!variable) {return;}
- UString qname ;
- variable->build_qname (qname) ;
- LOG_DD ("row of variable '" << qname << "'") ;
+ UString qname;
+ variable->build_qname (qname);
+ LOG_DD ("row of variable '" << qname << "'");
NEMIVER_CATCH
}
@@ -189,26 +181,26 @@
Gtk::TreeViewColumn *a_col)
{
NEMIVER_TRY
- THROW_IF_FAIL (tree_store) ;
- Gtk::TreeModel::iterator it = tree_store->get_iter (a_path) ;
+ THROW_IF_FAIL (tree_store);
+ Gtk::TreeModel::iterator it = tree_store->get_iter (a_path);
UString type =
(Glib::ustring) it->get_value
- (vutil::get_variable_columns ().type) ;
+ (vutil::get_variable_columns ().type);
if (type == "") {return;}
if (a_col != tree_view->get_column (2)) {return;}
- cur_selected_row = it ;
- show_variable_type_in_dialog () ;
+ cur_selected_row = it;
+ show_variable_type_in_dialog ();
NEMIVER_CATCH
}
void on_visited_variable_signal (const IDebugger::VariableSafePtr &a_var)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
NEMIVER_TRY
- set_variable (a_var) ;
+ set_variable (a_var);
NEMIVER_CATCH
}
@@ -224,63 +216,63 @@
requested_type (false),
debugger (a_debugger)
{
- build_widget () ;
- re_init_tree_view () ;
- connect_to_signals () ;
+ build_widget ();
+ re_init_tree_view ();
+ connect_to_signals ();
}
};//end class VarInspector2::Priv
VarInspector2::VarInspector2 (IDebuggerSafePtr &a_debugger)
{
- m_priv.reset (new Priv (a_debugger)) ;
+ m_priv.reset (new Priv (a_debugger));
}
VarInspector2::~VarInspector2 ()
{
- LOG_D ("deleted", "destructor-domain") ;
+ LOG_D ("deleted", "destructor-domain");
}
Gtk::Widget&
VarInspector2::widget () const
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->tree_view) ;
- return *m_priv->tree_view ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->tree_view);
+ return *m_priv->tree_view;
}
void
VarInspector2::set_variable (IDebugger::VariableSafePtr &a_variable)
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
- m_priv->set_variable (a_variable) ;
+ m_priv->set_variable (a_variable);
}
void
VarInspector2::inspect_variable (const UString &a_variable_name)
{
if (a_variable_name == "") {return;}
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
m_priv->requested_variable = true;
- IVarWalkerSafePtr var_walker = m_priv->get_var_walker () ;
- THROW_IF_FAIL (var_walker) ;
- var_walker->connect (m_priv->debugger, a_variable_name) ;
- var_walker->do_walk_variable () ;
+ IVarWalkerSafePtr var_walker = m_priv->get_var_walker ();
+ THROW_IF_FAIL (var_walker);
+ var_walker->connect (m_priv->debugger, a_variable_name);
+ var_walker->do_walk_variable ();
}
IDebugger::VariableSafePtr
VarInspector2::get_variable () const
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
- return m_priv->variable ;
+ return m_priv->variable;
}
void
VarInspector2::clear ()
{
- THROW_IF_FAIL (m_priv) ;
- m_priv->re_init_tree_view () ;
+ THROW_IF_FAIL (m_priv);
+ m_priv->re_init_tree_view ();
}
NEMIVER_END_NAMESPACE (nemiver)
Modified: trunk/src/persp/dbgperspective/nmv-var-inspector.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-var-inspector.h (original)
+++ trunk/src/persp/dbgperspective/nmv-var-inspector.h Tue Jul 29 22:45:24 2008
@@ -30,30 +30,30 @@
#include "nmv-i-debugger.h"
namespace Gtk {
- class Widget ;
+ class Widget;
}
NEMIVER_BEGIN_NAMESPACE (nemiver)
namespace common {
- class UString ;
+ class UString;
}
class VarInspector2 : public nemiver::common::Object {
- VarInspector2 (const VarInspector2 &) ;
- VarInspector2& operator= (const VarInspector2 &) ;
- VarInspector2 () ;
- class Priv ;
- SafePtr<Priv> m_priv ;
+ VarInspector2 (const VarInspector2 &);
+ VarInspector2& operator= (const VarInspector2 &);
+ VarInspector2 ();
+ class Priv;
+ SafePtr<Priv> m_priv;
public:
- VarInspector2 (IDebuggerSafePtr &a_debugger) ;
- virtual ~VarInspector2 () ;
- Gtk::Widget& widget () const ;
- void set_variable (IDebugger::VariableSafePtr &a_variable) ;
- void inspect_variable (const UString &a_variable_name) ;
- IDebugger::VariableSafePtr get_variable () const ;
- void clear () ;
+ VarInspector2 (IDebuggerSafePtr &a_debugger);
+ virtual ~VarInspector2 ();
+ Gtk::Widget& widget () const;
+ void set_variable (IDebugger::VariableSafePtr &a_variable);
+ void inspect_variable (const UString &a_variable_name);
+ IDebugger::VariableSafePtr get_variable () const;
+ void clear ();
};//end class VarInspector2
NEMIVER_END_NAMESPACE (nemiver)
Modified: trunk/src/persp/dbgperspective/nmv-variables-utils.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-variables-utils.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-variables-utils.cc Tue Jul 29 22:45:24 2008
@@ -131,7 +131,7 @@
if (prev_var_name.raw () == "") {
(*a_iter)[get_variable_columns ().name] = var_name;
}
- (*a_iter)[get_variable_columns ().is_highlighted]=false;
+ (*a_iter) [get_variable_columns ().is_highlighted] = false;
bool do_highlight = false;
if (a_handle_highlight && !a_is_new_frame) {
UString prev_value =
@@ -261,7 +261,9 @@
}
update_a_variable_node (a_var, a_tree_view, row_it, true, true);
list<IDebugger::VariableSafePtr>::const_iterator it;
- for (it = a_var->members ().begin (); it != a_var->members ().end (); ++it) {
+ for (it = a_var->members ().begin ();
+ it != a_var->members ().end ();
+ ++it) {
append_a_variable (*it, a_tree_view, a_tree_store, row_it);
}
a_result = row_it;
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 29 22:45:24 2008
@@ -47,38 +47,38 @@
FG_COLOR_OFFSET
};
- Gtk::TreeModelColumn<Glib::ustring> name ;
- Gtk::TreeModelColumn<Glib::ustring> value ;
- Gtk::TreeModelColumn<Glib::ustring> type ;
- Gtk::TreeModelColumn<Glib::ustring> type_caption ;
- Gtk::TreeModelColumn<IDebugger::VariableSafePtr> variable ;
+ Gtk::TreeModelColumn<Glib::ustring> name;
+ Gtk::TreeModelColumn<Glib::ustring> value;
+ Gtk::TreeModelColumn<Glib::ustring> type;
+ Gtk::TreeModelColumn<Glib::ustring> type_caption;
+ Gtk::TreeModelColumn<IDebugger::VariableSafePtr> variable;
Gtk::TreeModelColumn<bool> is_highlighted;
Gtk::TreeModelColumn<Gdk::Color> fg_color;
VariableColumns ()
{
- add (name) ;
- add (value) ;
- add (type) ;
- add (type_caption) ;
- add (variable) ;
- add (is_highlighted) ;
- add (fg_color) ;
+ add (name);
+ add (value);
+ add (type);
+ add (type_caption);
+ add (variable);
+ add (is_highlighted);
+ add (fg_color);
}
};//end VariableColumns
-VariableColumns& get_variable_columns () ;
+VariableColumns& get_variable_columns ();
-bool is_type_a_pointer (const UString &a_type) ;
+bool is_type_a_pointer (const UString &a_type);
void set_a_variable_node_type (Gtk::TreeModel::iterator &a_var_it,
- const UString &a_type) ;
+ const UString &a_type);
void update_a_variable_node (const IDebugger::VariableSafePtr a_var,
const Gtk::TreeView &a_tree_view,
Gtk::TreeModel::iterator &a_iter,
bool a_handle_highlight,
- bool a_is_new_frame) ;
+ bool a_is_new_frame);
bool find_a_variable (const IDebugger::VariableSafePtr a_var,
const Gtk::TreeModel::iterator &a_parent_row_it,
@@ -88,12 +88,12 @@
const Gtk::TreeView &a_tree_view,
Gtk::TreeModel::iterator &a_parent_row_it,
bool a_handle_highlight,
- bool a_is_new_frame) ;
+ bool a_is_new_frame);
void 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) ;
+ Gtk::TreeModel::iterator &a_parent_row_it);
void append_a_variable (const IDebugger::VariableSafePtr a_var,
const Gtk::TreeView &a_tree_view,
Modified: trunk/src/persp/dbgperspective/nmv-vars-treeview.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-vars-treeview.cc (original)
+++ trunk/src/persp/dbgperspective/nmv-vars-treeview.cc Tue Jul 29 22:45:24 2008
@@ -27,7 +27,7 @@
#include "nmv-vars-treeview.h"
#include "nmv-variables-utils.h"
-namespace vutil=nemiver::variables_utils2 ;
+namespace vutil=nemiver::variables_utils2;
NEMIVER_BEGIN_NAMESPACE (nemiver)
@@ -44,31 +44,31 @@
Gtk::TreeView (model),
m_tree_store (model)
{
- set_headers_clickable (true) ;
- get_selection ()->set_mode (Gtk::SELECTION_SINGLE) ;
+ set_headers_clickable (true);
+ get_selection ()->set_mode (Gtk::SELECTION_SINGLE);
//create the columns of the tree view
append_column (_("Variable"),
- vutil::get_variable_columns ().name) ;
- Gtk::TreeViewColumn * col = get_column (0) ;
- THROW_IF_FAIL (col) ;
- col->set_resizable (true) ;
+ vutil::get_variable_columns ().name);
+ Gtk::TreeViewColumn * col = get_column (0);
+ THROW_IF_FAIL (col);
+ col->set_resizable (true);
col->add_attribute (*col->get_first_cell_renderer (),
"foreground-gdk",
- vutil::VariableColumns::FG_COLOR_OFFSET) ;
+ vutil::VariableColumns::FG_COLOR_OFFSET);
- append_column (_("Value"), vutil::get_variable_columns ().value) ;
- col = get_column (1) ;
- THROW_IF_FAIL (col) ;
- col->set_resizable (true) ;
+ append_column (_("Value"), vutil::get_variable_columns ().value);
+ col = get_column (1);
+ THROW_IF_FAIL (col);
+ col->set_resizable (true);
col->add_attribute (*col->get_first_cell_renderer (),
"foreground-gdk",
- vutil::VariableColumns::FG_COLOR_OFFSET) ;
+ vutil::VariableColumns::FG_COLOR_OFFSET);
append_column (_("Type"),
vutil::get_variable_columns ().type_caption);
- col = get_column (2) ;
- THROW_IF_FAIL (col) ;
- col->set_resizable (true) ;
+ col = get_column (2);
+ THROW_IF_FAIL (col);
+ col->set_resizable (true);
}
Glib::RefPtr<Gtk::TreeStore>&
Modified: trunk/src/persp/dbgperspective/nmv-vars-treeview.h
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-vars-treeview.h (original)
+++ trunk/src/persp/dbgperspective/nmv-vars-treeview.h Tue Jul 29 22:45:24 2008
@@ -37,12 +37,12 @@
typedef SafePtr<VarsTreeView,
nemiver::ui_utils::WidgetRef,
- nemiver::ui_utils::WidgetUnref> VarsTreeViewSafePtr ;
+ nemiver::ui_utils::WidgetUnref> VarsTreeViewSafePtr;
class NEMIVER_API VarsTreeView : public Gtk::TreeView
{
public:
- static VarsTreeViewSafePtr create () ;
+ static VarsTreeViewSafePtr create ();
Glib::RefPtr<Gtk::TreeStore>& get_tree_store ();
protected:
Modified: trunk/src/uicommon/nmv-hex-document.cc
==============================================================================
--- trunk/src/uicommon/nmv-hex-document.cc (original)
+++ trunk/src/uicommon/nmv-hex-document.cc Tue Jul 29 22:45:24 2008
@@ -28,13 +28,14 @@
NEMIVER_BEGIN_NAMESPACE (nemiver)
NEMIVER_BEGIN_NAMESPACE (Hex)
+
struct HexDocRef {
void operator () (::HexDocument *o)
{
if (o && G_IS_OBJECT (o)) {
- g_object_ref (G_OBJECT (o)) ;
+ g_object_ref (G_OBJECT (o));
} else {
- LOG_ERROR ("bad HexDocument") ;
+ LOG_ERROR ("bad HexDocument");
}
}
};
@@ -43,20 +44,22 @@
void operator () (::HexDocument *o)
{
if (o && G_IS_OBJECT (o)) {
- g_object_unref (G_OBJECT (o)) ;
+ g_object_unref (G_OBJECT (o));
} else {
- LOG_ERROR ("bad HexDocument") ;
+ LOG_ERROR ("bad HexDocument");
}
}
};
struct Document::Priv {
- SafePtr< ::HexDocument, HexDocRef, HexDocUnref> document ;
+ SafePtr<::HexDocument, HexDocRef, HexDocUnref> document;
mutable sigc::signal<void, HexChangeData*> m_signal_document_changed;
Priv (const std::string& filename) :
- document (HEX_DOCUMENT (hex_document_new_from_file (filename.c_str ())), true)
+ document (HEX_DOCUMENT
+ (hex_document_new_from_file (filename.c_str ())),
+ true)
{
connect_signals ();
}
@@ -69,8 +72,10 @@
void connect_signals ()
{
- g_signal_connect (G_OBJECT (document.get ()), "document_changed",
- G_CALLBACK (on_document_changed_proxy), this);
+ g_signal_connect (G_OBJECT (document.get ()),
+ "document_changed",
+ G_CALLBACK (on_document_changed_proxy),
+ this);
}
~Priv ()
@@ -81,7 +86,7 @@
gboolean /*a_push_undo*/,
Priv* priv)
{
- LOG_FUNCTION_SCOPE_NORMAL_DD ;
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
priv->m_signal_document_changed.emit (a_change_data);
}
@@ -93,12 +98,12 @@
Document::Document ()
{
- m_priv.reset (new Priv ()) ;
+ m_priv.reset (new Priv ());
}
Document::Document (const std::string& filename)
{
- m_priv.reset (new Priv (filename)) ;
+ m_priv.reset (new Priv (filename));
}
::HexDocument* Document::cobj()
@@ -147,23 +152,23 @@
DocumentSafePtr
Document::create ()
{
- DocumentSafePtr result (new Document ()) ;
- THROW_IF_FAIL (result) ;
- return result ;
+ DocumentSafePtr result (new Document ());
+ THROW_IF_FAIL (result);
+ return result;
}
DocumentSafePtr
Document::create (const std::string& filename)
{
- DocumentSafePtr result (new Document (filename)) ;
- THROW_IF_FAIL (result) ;
- return result ;
+ DocumentSafePtr result (new Document (filename));
+ THROW_IF_FAIL (result);
+ return result;
}
sigc::signal<void, HexChangeData*>&
Document::signal_document_changed () const
{
- THROW_IF_FAIL (m_priv) ;
+ THROW_IF_FAIL (m_priv);
return m_priv->m_signal_document_changed;
}
Modified: trunk/src/uicommon/nmv-hex-document.h
==============================================================================
--- trunk/src/uicommon/nmv-hex-document.h (original)
+++ trunk/src/uicommon/nmv-hex-document.h Tue Jul 29 22:45:24 2008
@@ -34,29 +34,30 @@
namespace Gtk {
class Widget;
}
-using nemiver::common::Object ;
-using nemiver::common::SafePtr ;
-using nemiver::common::ObjectRef ;
-using nemiver::common::ObjectUnref ;
-using nemiver::common::UString ;
+using nemiver::common::Object;
+using nemiver::common::SafePtr;
+using nemiver::common::ObjectRef;
+using nemiver::common::ObjectUnref;
+using nemiver::common::UString;
NEMIVER_BEGIN_NAMESPACE (nemiver)
NEMIVER_BEGIN_NAMESPACE (Hex)
-class Document ;
-typedef SafePtr<Document, ObjectRef, ObjectUnref> DocumentSafePtr ;
+
+class Document;
+typedef SafePtr<Document, ObjectRef, ObjectUnref> DocumentSafePtr;
class Document : public Object {
- class Priv ;
- SafePtr<Priv> m_priv ;
+ class Priv;
+ SafePtr<Priv> m_priv;
protected:
- Document () ;
- Document (const std::string& filename) ;
+ Document ();
+ Document (const std::string& filename);
public:
- virtual ~Document () ;
- static DocumentSafePtr create () ;
- static DocumentSafePtr create (const std::string& filename) ;
+ virtual ~Document () ;
+ static DocumentSafePtr create ();
+ static DocumentSafePtr create (const std::string& filename);
::HexDocument* cobj();
void set_data (guint offset,
guint len,
Modified: trunk/src/uicommon/nmv-hex-editor.cc
==============================================================================
--- trunk/src/uicommon/nmv-hex-editor.cc (original)
+++ trunk/src/uicommon/nmv-hex-editor.cc Tue Jul 29 22:45:24 2008
@@ -35,9 +35,9 @@
void operator () (GtkHex *o)
{
if (o && G_IS_OBJECT (o)) {
- g_object_ref (G_OBJECT (o)) ;
+ g_object_ref (G_OBJECT (o));
} else {
- LOG_ERROR ("bad GtkHex") ;
+ LOG_ERROR ("bad GtkHex");
}
}
};
@@ -46,30 +46,30 @@
void operator () (GtkHex *o)
{
if (o && G_IS_OBJECT (o)) {
- g_object_unref (G_OBJECT (o)) ;
+ g_object_unref (G_OBJECT (o));
} else {
- LOG_ERROR ("bad GtkHex") ;
+ LOG_ERROR ("bad GtkHex");
}
}
};
struct Editor::Priv {
- SafePtr<GtkHex, GtkHexRef, GtkHexUnref> hex ;
- Gtk::Container *widget ;
+ SafePtr<GtkHex, GtkHexRef, GtkHexUnref> hex;
+ Gtk::Container *widget;
Priv (const DocumentSafePtr& a_doc) :
hex (GTK_HEX (gtk_hex_new (a_doc->cobj())), true),
widget (0)
{
- THROW_IF_FAIL (GTK_IS_WIDGET (hex.get ())) ;
- widget = Glib::wrap (GTK_CONTAINER (hex.get ())) ;
- THROW_IF_FAIL (widget) ;
+ THROW_IF_FAIL (GTK_IS_WIDGET (hex.get ()));
+ widget = Glib::wrap (GTK_CONTAINER (hex.get ()));
+ THROW_IF_FAIL (widget);
}
~Priv ()
{
- widget = 0 ;
+ widget = 0;
}
};//end struct Editor::Priv
@@ -79,7 +79,7 @@
Editor::Editor (const DocumentSafePtr &a_document)
{
- m_priv.reset (new Priv (a_document)) ;
+ m_priv.reset (new Priv (a_document));
}
EditorSafePtr
@@ -147,9 +147,9 @@
Gtk::Container&
Editor::get_widget () const
{
- THROW_IF_FAIL (m_priv) ;
- THROW_IF_FAIL (m_priv->widget) ;
- return *m_priv->widget ;
+ THROW_IF_FAIL (m_priv);
+ THROW_IF_FAIL (m_priv->widget);
+ return *m_priv->widget;
}
NEMIVER_END_NAMESPACE (Hex)
Modified: trunk/src/uicommon/nmv-hex-editor.h
==============================================================================
--- trunk/src/uicommon/nmv-hex-editor.h (original)
+++ trunk/src/uicommon/nmv-hex-editor.h Tue Jul 29 22:45:24 2008
@@ -34,27 +34,28 @@
namespace Gtk {
class Widget;
}
-using nemiver::common::Object ;
-using nemiver::common::SafePtr ;
-using nemiver::common::ObjectRef ;
-using nemiver::common::ObjectUnref ;
-using nemiver::common::UString ;
+using nemiver::common::Object;
+using nemiver::common::SafePtr;
+using nemiver::common::ObjectRef;
+using nemiver::common::ObjectUnref;
+using nemiver::common::UString;
NEMIVER_BEGIN_NAMESPACE (nemiver)
NEMIVER_BEGIN_NAMESPACE (Hex)
-class Editor ;
-typedef SafePtr<Editor, ObjectRef, ObjectUnref> EditorSafePtr ;
+
+class Editor;
+typedef SafePtr<Editor, ObjectRef, ObjectUnref> EditorSafePtr;
class Editor : public Object {
- class Priv ;
- SafePtr<Priv> m_priv ;
+ class Priv;
+ SafePtr<Priv> m_priv;
protected:
- Editor (const DocumentSafePtr &a_document) ;
+ Editor (const DocumentSafePtr &a_document);
public:
- virtual ~Editor () ;
- static EditorSafePtr create (const DocumentSafePtr &a_document) ;
+ virtual ~Editor ();
+ static EditorSafePtr create (const DocumentSafePtr &a_document);
void set_cursor (int);
void set_cursor_xy (int, int);
void set_nibble (int);
@@ -73,8 +74,6 @@
void set_geometry (int cpl, int vis_lines);
void get_geometry (int& cpl, int& vis_lines) const;
- //Pango::FontMetrics load_font (const UString& font_name);
-
void copy_to_clipboard ();
void cut_to_clipboard ();
void paste_from_clipboard ();
@@ -84,10 +83,7 @@
void clear_selection ();
void delete_selection ();
- //GtkHex_AutoHighlight *insert_autohighlight (const gchar *search, int len,
- //const gchar *colour);
- //void delete_autohighlight (GtkHex_AutoHighlight *ahl);
- virtual Gtk::Container& get_widget () const ;
+ virtual Gtk::Container& get_widget () const;
};//end class Editor
NEMIVER_END_NAMESPACE (Hex)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
