[nemiver/breakpoint-signal-revamp: 1/2] Style cleanup

[Dodji Seketeli <dodji src gnome org>]

commit e152661be0e326a19d20669aac361cef2c9a79bb
Author: Dodji Seketeli <dodji gnome org>
Date:   Wed Apr 20 22:56:09 2011 +0200

    Style cleanup
    
    	* src/dbgengine/nmv-gdb-engine.cc (GDBEngine::set_catch): Add Space
    	before parenthesis.
    	* src/persp/dbgperspective/nmv-breakpoints-view.cc
    	(build_tree_view): Properly align function name, indent some
    	statements.
    	(should_process_now, set_breakpoints, add_breakpoints)
    	(breakpoint_list_has_id, find_breakpoint_in_model)
    	(update_breakpoint, append_breakpoint)
    	(finish_handling_debugger_stopped_event, load_menu)
    	(get_breakpoints_menu, popup_breakpoints_view_menu, init_actions)
    	(erase_breakpoint, on_debugger_breakpoints_list_signal)
    	(on_debugger_stopped_signal)
    	(on_debugger_breakpoint_deleted_signal)
    	(on_treeview_selection_changed, on_breakpoint_go_to_source_action)
    	(on_expose_event, on_key_press_event)
    	(on_breakpoint_enable_toggled, on_countpoint_toggled)
    	(on_breakpoint_ignore_count_edited)
    	(on_breakpoint_condition_edited): Properly indent function name.

 src/dbgengine/nmv-gdb-engine.cc                  |    2 +-
 src/persp/dbgperspective/nmv-breakpoints-view.cc |  126 +++++++++++++---------
 src/persp/dbgperspective/nmv-dbg-perspective.cc  |    7 +-
 3 files changed, 82 insertions(+), 53 deletions(-)
---
diff --git a/src/dbgengine/nmv-gdb-engine.cc b/src/dbgengine/nmv-gdb-engine.cc
index 3f7b184..5df2cfd 100644
--- a/src/dbgengine/nmv-gdb-engine.cc
+++ b/src/dbgengine/nmv-gdb-engine.cc
@@ -4122,7 +4122,7 @@ GDBEngine::set_catch (const UString &a_event,
                             a_cookie));
     // explicitly request the breakpoints to be listed otherwise the newly added
     // catchpoint won't show up in the breakpoint list
-    list_breakpoints(a_cookie);
+    list_breakpoints (a_cookie);
 }
 
 
diff --git a/src/persp/dbgperspective/nmv-breakpoints-view.cc b/src/persp/dbgperspective/nmv-breakpoints-view.cc
index 641f1ac..144dfdf 100644
--- a/src/persp/dbgperspective/nmv-breakpoints-view.cc
+++ b/src/persp/dbgperspective/nmv-breakpoints-view.cc
@@ -132,7 +132,8 @@ public:
                 "/BreakpointsPopup");
     }
 
-    void build_tree_view ()
+    void
+    build_tree_view ()
     {
         if (tree_view) {return;}
         //create a default tree store and a tree view
@@ -156,8 +157,9 @@ public:
         tree_view->append_column (_("Hits"), get_bp_cols ().hits);
         tree_view->append_column (_("Expression"),
                                   get_bp_cols ().expression);
-        nb_columns = tree_view->append_column_editable (_("Ignore count"),
-							get_bp_cols ().ignore_count);
+        nb_columns =
+            tree_view->append_column_editable (_("Ignore count"),
+                                               get_bp_cols ().ignore_count);
 	
 	for (int i = 0; i < nb_columns; ++i) {
             Gtk::TreeViewColumn *col = tree_view->get_column (i);
@@ -210,13 +212,16 @@ public:
 	  (sigc::mem_fun
 	   (*this, &Priv::on_treeview_selection_changed));
 
-        tree_view->signal_key_press_event ().connect (sigc::mem_fun
-                                                      (*this, &Priv::on_key_press_event));
-        tree_view->signal_expose_event ().connect_notify (sigc::mem_fun
-                                                          (*this, &Priv::on_expose_event));
+        tree_view->signal_key_press_event ().connect
+            (sigc::mem_fun
+             (*this, &Priv::on_key_press_event));
+        tree_view->signal_expose_event ().connect_notify
+            (sigc::mem_fun
+             (*this, &Priv::on_expose_event));
     }
 
-    bool should_process_now ()
+    bool 
+    should_process_now ()
     {
         LOG_FUNCTION_SCOPE_NORMAL_DD;
         THROW_IF_FAIL (tree_view);
@@ -225,8 +230,8 @@ public:
         return is_visible;
     }
 
-    void set_breakpoints
-        (const std::map<int, IDebugger::Breakpoint> &a_breakpoints)
+    void
+    set_breakpoints (const std::map<int, IDebugger::Breakpoint> &a_breakpoints)
     {
         if (a_breakpoints.empty ()) {
             return;
@@ -249,16 +254,19 @@ public:
                             << breakmap_iter->second.number ());
                     update_breakpoint (tree_iter, breakmap_iter->second);
                 } else {
-                    LOG_DD ("Adding breakpoint "
-                            << breakmap_iter->second.number ());
-                    append_breakpoint (breakmap_iter->second);
+                    // We shouldn't reach this place, as we should
+                    // have been notified about any new breakpoint by
+                    // mean of IDebugger::breakpoint_set_signal, and
+                    // on_debugger_breakpoint_set_signal should have
+                    // added the breakpoint to the model.                    
+                    THROW ("Should not be reached");
                 }
             }
         }
     }
 
-    void add_breakpoints
-                (const std::map<int, IDebugger::Breakpoint> &a_breakpoints)
+    void
+    add_breakpoints (const std::map<int, IDebugger::Breakpoint> &a_breakpoints)
     {
         THROW_IF_FAIL (list_store);
 
@@ -270,7 +278,8 @@ public:
         }
     }
 
-    bool breakpoint_list_has_id
+    bool
+    breakpoint_list_has_id
         (const std::map<int, IDebugger::Breakpoint> &a_breakpoints,
          int a_id)
     {
@@ -284,8 +293,8 @@ public:
         return false;
     }
 
-    Gtk::TreeModel::iterator find_breakpoint_in_model
-                                (const IDebugger::Breakpoint &a_breakpoint)
+    Gtk::TreeModel::iterator
+    find_breakpoint_in_model (const IDebugger::Breakpoint &a_breakpoint)
     {
         THROW_IF_FAIL (list_store);
 
@@ -301,8 +310,9 @@ public:
         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_cols ().breakpoint] = a_breakpoint;
         (*a_iter)[get_bp_cols ().enabled] = a_breakpoint.enabled ();
@@ -339,8 +349,8 @@ public:
         (*a_iter)[get_bp_cols ().hits] = a_breakpoint.nb_times_hit ();
     }
 
-    Gtk::TreeModel::iterator append_breakpoint
-                                    (const IDebugger::Breakpoint &a_breakpoint)
+    Gtk::TreeModel::iterator 
+    append_breakpoint (const IDebugger::Breakpoint &a_breakpoint)
     {
         Gtk::TreeModel::iterator tree_iter = list_store->append ();
         update_breakpoint (tree_iter, a_breakpoint);
@@ -348,13 +358,15 @@ public:
         return tree_iter;
     }
 
-    void finish_handling_debugger_stopped_event ()
+    void
+    finish_handling_debugger_stopped_event ()
     {
         LOG_FUNCTION_SCOPE_NORMAL_DD;
         debugger->list_breakpoints ();
     }
 
-    Gtk::Widget* load_menu (UString a_filename, UString a_widget_name)
+    Gtk::Widget*
+    load_menu (UString a_filename, UString a_widget_name)
     {
         NEMIVER_TRY
         string relative_path = Glib::build_filename ("menus", a_filename);
@@ -368,13 +380,15 @@ public:
         return workbench.get_ui_manager ()->get_widget (a_widget_name);
     }
 
-    Gtk::Widget* get_breakpoints_menu ()
+    Gtk::Widget*
+    get_breakpoints_menu ()
     {
         THROW_IF_FAIL (breakpoints_menu);
         return breakpoints_menu;
     }
 
-    void popup_breakpoints_view_menu (GdkEventButton *a_event)
+    void
+    popup_breakpoints_view_menu (GdkEventButton *a_event)
     {
         THROW_IF_FAIL (a_event);
         THROW_IF_FAIL (tree_view);
@@ -383,7 +397,8 @@ public:
         menu->popup (a_event->button, a_event->time);
     }
 
-    void init_actions()
+    void
+    init_actions()
     {
         static ui_utils::ActionEntry s_breakpoints_action_entries [] = {
             {
@@ -431,7 +446,8 @@ public:
         debugger->list_breakpoints ();
     }
 
-    void erase_breakpoint (int a_bp_num)
+    void
+    erase_breakpoint (int a_bp_num)
     {
 
         LOG_DD ("asked to erase bp num:" << (int) a_bp_num);
@@ -451,7 +467,8 @@ public:
         }
     }
 
-    void on_debugger_breakpoints_set_signal
+    void 
+    on_debugger_breakpoints_list_signal
                             (const map<int, IDebugger::Breakpoint> &a_breaks,
                              const UString &a_cookie)
     {
@@ -461,12 +478,13 @@ public:
         NEMIVER_CATCH
     }
 
-    void on_debugger_stopped_signal (IDebugger::StopReason a_reason,
-                                     bool /*a_has_frame*/,
-                                     const IDebugger::Frame &/*a_frame*/,
-                                     int /*a_thread_id*/,
-                                     int a_bkpt_num,
-                                     const UString &/*a_cookie*/)
+    void
+    on_debugger_stopped_signal (IDebugger::StopReason a_reason,
+                                bool /*a_has_frame*/,
+                                const IDebugger::Frame &/*a_frame*/,
+                                int /*a_thread_id*/,
+                                int a_bkpt_num,
+                                const UString &/*a_cookie*/)
     {
         LOG_FUNCTION_SCOPE_NORMAL_DD;
 
@@ -491,9 +509,10 @@ public:
         NEMIVER_CATCH
     }
 
-    void on_debugger_breakpoint_deleted_signal
-            (const IDebugger::Breakpoint &a_break, int a_break_number,
-             const UString &a_cookie)
+    void
+    on_debugger_breakpoint_deleted_signal (const IDebugger::Breakpoint &a_break,
+                                           int a_break_number,
+                                           const UString &a_cookie)
     {
         if (a_break.number () || a_cookie.empty()) {}
         NEMIVER_TRY
@@ -562,7 +581,8 @@ public:
         return handled;
     }
 
-    void on_treeview_selection_changed ()
+    void
+    on_treeview_selection_changed ()
     {
         NEMIVER_TRY
         THROW_IF_FAIL(tree_view)
@@ -584,7 +604,8 @@ public:
         NEMIVER_CATCH
     }
 
-    void on_breakpoint_go_to_source_action ()
+    void
+    on_breakpoint_go_to_source_action ()
     {
         THROW_IF_FAIL(tree_view)
         Glib::RefPtr<Gtk::TreeSelection> selection =
@@ -599,7 +620,8 @@ public:
         }
     }
 
-    void on_breakpoint_delete_action ()
+    void
+    on_breakpoint_delete_action ()
     {
         THROW_IF_FAIL (tree_view)
         THROW_IF_FAIL (list_store);
@@ -618,7 +640,8 @@ public:
         }
     }
 
-    void on_expose_event (GdkEventExpose *)
+    void
+    on_expose_event (GdkEventExpose *)
     {
         LOG_FUNCTION_SCOPE_NORMAL_DD;
         NEMIVER_TRY
@@ -629,7 +652,8 @@ public:
         NEMIVER_CATCH
     }
 
-    bool on_key_press_event (GdkEventKey* event)
+    bool 
+    on_key_press_event (GdkEventKey* event)
     {
         if (event && event->keyval == GDK_Delete)
         {
@@ -638,7 +662,8 @@ public:
         return false;
     }
 
-    void on_breakpoint_enable_toggled (const Glib::ustring& path)
+    void
+    on_breakpoint_enable_toggled (const Glib::ustring& path)
     {
         NEMIVER_TRY
 
@@ -658,7 +683,8 @@ public:
         NEMIVER_CATCH
     }
 
-    void on_countpoint_toggled (const Glib::ustring& path)
+    void
+    on_countpoint_toggled (const Glib::ustring& path)
     {
         NEMIVER_TRY;
 
@@ -678,8 +704,9 @@ public:
         NEMIVER_CATCH;
     }
 
-    void on_breakpoint_ignore_count_edited (const Glib::ustring &a_path,
-                                            const Glib::ustring &a_text)
+    void 
+    on_breakpoint_ignore_count_edited (const Glib::ustring &a_path,
+                                       const Glib::ustring &a_text)
     {
         NEMIVER_TRY
 
@@ -706,8 +733,9 @@ public:
         NEMIVER_CATCH
     }
 
-    void on_breakpoint_condition_edited (const Glib::ustring &a_path,
-                                         const Glib::ustring &a_text)
+    void
+    on_breakpoint_condition_edited (const Glib::ustring &a_path,
+                                    const Glib::ustring &a_text)
     {
         NEMIVER_TRY
 
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
index 88ef7d0..288d86d 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
+++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
@@ -2510,12 +2510,14 @@ DBGPerspective::on_debugger_command_done_signal (const UString &a_command,
     LOG_DD ("a_command: " << a_command);
     LOG_DD ("a_cookie: " << a_cookie);
 
-    NEMIVER_TRY
+    NEMIVER_TRY;
+
     if (a_command == "attach-to-program") {
         debugger ()->step_over_asm ();
         debugger ()->get_target_info ();
     }
-    NEMIVER_CATCH
+
+    NEMIVER_CATCH;
 }
 
 void
@@ -2524,7 +2526,6 @@ DBGPerspective::on_debugger_breakpoints_set_signal
                              const UString &a_cookie)
 {
     LOG_FUNCTION_SCOPE_NORMAL_DD;
-    if (a_cookie.empty ()) {}
 
     NEMIVER_TRY
     // if a breakpoint was stored in the session db as disabled,