[nemiver/count-point: 2/2] Reindent and style cleanup.
- From: Dodji Seketeli <dodji src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nemiver/count-point: 2/2] Reindent and style cleanup.
- Date: Mon, 27 Sep 2010 11:51:44 +0000 (UTC)
commit b6613b09c2ac4b3317acd5245379581385bd3845
Author: Dodji Seketeli <dodji seketeli org>
Date: Mon Sep 27 13:43:28 2010 +0200
Reindent and style cleanup.
* src/persp/dbgperspective/Makefile.am
* src/persp/dbgperspective/nmv-breakpoints-view.cc
* src/persp/dbgperspective/nmv-dbg-perspective.cc
* src/persp/dbgperspective/nmv-set-breakpoint-dialog.cc
* src/persp/dbgperspective/nmv-set-breakpoint-dialog.h
* src/uicommon/nmv-source-editor.cc: Little re-indent and style cleanup.
src/persp/dbgperspective/Makefile.am | 4 +-
src/persp/dbgperspective/nmv-breakpoints-view.cc | 10 +++--
src/persp/dbgperspective/nmv-dbg-perspective.cc | 34 ++++++++++---------
.../dbgperspective/nmv-set-breakpoint-dialog.cc | 8 ++--
.../dbgperspective/nmv-set-breakpoint-dialog.h | 1 +
src/uicommon/nmv-source-editor.cc | 1 +
6 files changed, 32 insertions(+), 26 deletions(-)
---
diff --git a/src/persp/dbgperspective/Makefile.am b/src/persp/dbgperspective/Makefile.am
index b7f6271..c6c88db 100644
--- a/src/persp/dbgperspective/Makefile.am
+++ b/src/persp/dbgperspective/Makefile.am
@@ -78,8 +78,8 @@ nmv-call-function-dialog.cc
if BUILD_MEMORYVIEW
memoryview_sources = \
- nmv-memory-view.cc \
- nmv-memory-view.h
+nmv-memory-view.cc \
+nmv-memory-view.h
else
memoryview_sources =
endif
diff --git a/src/persp/dbgperspective/nmv-breakpoints-view.cc b/src/persp/dbgperspective/nmv-breakpoints-view.cc
index 879b40e..0f1651d 100644
--- a/src/persp/dbgperspective/nmv-breakpoints-view.cc
+++ b/src/persp/dbgperspective/nmv-breakpoints-view.cc
@@ -166,8 +166,9 @@ public:
r = dynamic_cast<Gtk::CellRendererText*>
(tree_view->get_column_cell_renderer (6));
- r->signal_edited ().connect (sigc::mem_fun
- (*this, &BreakpointsView::Priv::on_breakpoint_condition_edited));
+ r->signal_edited ().connect
+ (sigc::mem_fun
+ (*this, &BreakpointsView::Priv::on_breakpoint_condition_edited));
// we must handle the button press event before the default button
// handler since there are cases when we need to prevent the default
@@ -176,8 +177,9 @@ public:
(sigc::mem_fun
(*this, &Priv::on_breakpoints_view_button_press_signal),
false /*connect before*/);
- tree_view->get_selection ()->signal_changed ().connect (sigc::mem_fun
- (*this, &Priv::on_treeview_selection_changed));
+ tree_view->get_selection ()->signal_changed ().connect
+ (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));
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
index 384bde1..78b2273 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
+++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
@@ -105,7 +105,6 @@ using namespace nemiver::common;
using namespace nemiver::ui_utils;
using namespace gtksourceview;
-
NEMIVER_BEGIN_NAMESPACE (nemiver)
const char *SET_BREAKPOINT = "nmv-set-breakpoint";
@@ -672,6 +671,7 @@ public:
bool ask_user_to_select_file (const UString &a_file_name,
UString& a_selected_file_path);
+
bool append_visual_breakpoint (SourceEditor *editor,
int linenum,
bool is_countpoint,
@@ -806,7 +806,7 @@ public:
bool do_unmonitor_file (const UString &a_path);
void activate_status_view(Gtk::Widget& page);
-
+
bool agree_to_shutdown ();
sigc::signal<void, bool>& show_command_view_signal ();
@@ -2156,7 +2156,7 @@ DBGPerspective::on_shutdown_signal ()
NEMIVER_TRY
conf_mgr.set_key_value (CONF_KEY_STATUS_PANE_LOCATION, pane_location);
- conf_mgr.set_key_value (CONF_KEY_CONTEXT_PANE_LOCATION,
+ conf_mgr.set_key_value (CONF_KEY_CONTEXT_PANE_LOCATION,
context_pane_location);
NEMIVER_CATCH_NOX
@@ -2715,7 +2715,7 @@ DBGPerspective::on_debugger_asm_signal2
switch_to_asm (a_info, a_instrs, a_editor,
/*a_approximate_where=*/ true);
-
+
NEMIVER_CATCH;
}
@@ -2956,7 +2956,7 @@ DBGPerspective::on_activate_context_view ()
NEMIVER_CATCH
}
-void
+void
DBGPerspective::on_activate_output_view ()
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
@@ -2969,7 +2969,7 @@ DBGPerspective::on_activate_output_view ()
NEMIVER_CATCH
}
-void
+void
DBGPerspective::on_activate_target_terminal_view ()
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
@@ -2981,7 +2981,7 @@ DBGPerspective::on_activate_target_terminal_view ()
NEMIVER_CATCH
}
-void
+void
DBGPerspective::on_activate_breakpoints_view ()
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
@@ -2993,7 +2993,7 @@ DBGPerspective::on_activate_breakpoints_view ()
NEMIVER_CATCH
}
-void
+void
DBGPerspective::on_activate_logs_view ()
{
LOG_FUNCTION_SCOPE_NORMAL_DD;
@@ -3878,8 +3878,8 @@ DBGPerspective::init_body ()
int context_pane_location = -1;
NEMIVER_TRY
- conf_mgr.get_key_value (CONF_KEY_CONTEXT_PANE_LOCATION,
- context_pane_location);
+ conf_mgr.get_key_value (CONF_KEY_CONTEXT_PANE_LOCATION,
+ context_pane_location);
NEMIVER_CATCH_NOX
if (context_pane_location > 0) {
@@ -5210,7 +5210,7 @@ DBGPerspective::record_and_save_session (ISessMgr::Session &a_session)
//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 ();
+ session_manager_ptr ()->sessions ();
int nb_sessions = sessions.size ();
if (nb_sessions > 5) {
int nb_sessions_to_erase = sessions.size () - 5;
@@ -5225,8 +5225,8 @@ DBGPerspective::record_and_save_session (ISessMgr::Session &a_session)
//now store the current session
session_manager_ptr ()->store_session
- (a_session,
- session_manager_ptr ()->default_transaction ());
+ (a_session,
+ session_manager_ptr ()->default_transaction ());
}
@@ -5557,7 +5557,7 @@ DBGPerspective::open_asm (const common::DisassembleInfo &a_info,
source_buffer = source_editor->source_view ().get_source_buffer ();
source_buffer->erase (source_buffer->begin (), source_buffer->end ());
}
-
+
if (!load_asm (a_info, a_asm, source_buffer))
return 0;
@@ -5785,7 +5785,7 @@ DBGPerspective::reload_file (const UString &a_path)
editor->source_view ().get_source_buffer ();
int current_line = editor->current_line ();
int current_column = editor->current_column ();
-
+
if (!m_priv->load_file (a_path, buffer))
return false;
editor->register_non_assembly_source_buffer (buffer);
@@ -5821,6 +5821,8 @@ DBGPerspective::session_manager ()
void
DBGPerspective::execute_session (ISessMgr::Session &a_session)
{
+ LOG_FUNCTION_SCOPE_NORMAL_DD;
+
save_current_session ();
m_priv->session = a_session;
@@ -7821,7 +7823,7 @@ DBGPerspective::set_show_context_view (bool a_show)
m_priv->context_paned_view_is_visible = false;
}
m_priv->context_paned_view_is_visible = false;
- }
+ }
}
void
diff --git a/src/persp/dbgperspective/nmv-set-breakpoint-dialog.cc b/src/persp/dbgperspective/nmv-set-breakpoint-dialog.cc
index e8017d6..ee448f4 100644
--- a/src/persp/dbgperspective/nmv-set-breakpoint-dialog.cc
+++ b/src/persp/dbgperspective/nmv-set-breakpoint-dialog.cc
@@ -1,6 +1,7 @@
// -*- c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; -*-'
-//Author: Jonathon Jongsma
-// Hubert Figuiere
+//Authors: Jonathon Jongsma
+// Hubert Figuiere
+// Dodji Seketeli
/*
*This file is part of the Nemiver project
*
@@ -88,7 +89,7 @@ public:
okbutton =
ui_utils::get_widget_from_gtkbuilder<Gtk::Button> (a_gtkbuilder,
- "okbutton");
+ "okbutton");
THROW_IF_FAIL (okbutton);
okbutton->set_sensitive (false);
@@ -510,7 +511,6 @@ SetBreakpointDialog::mode () const
return m_priv->mode ();
}
-
void
SetBreakpointDialog::mode (Mode a_mode)
{
diff --git a/src/persp/dbgperspective/nmv-set-breakpoint-dialog.h b/src/persp/dbgperspective/nmv-set-breakpoint-dialog.h
index ddc641f..f8d1118 100644
--- a/src/persp/dbgperspective/nmv-set-breakpoint-dialog.h
+++ b/src/persp/dbgperspective/nmv-set-breakpoint-dialog.h
@@ -1,5 +1,6 @@
// -*- c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; -*-'
//Author: Jonathon Jongsma
+// Dodji Seketeli
/*
*This file is part of the Nemiver project
*
diff --git a/src/uicommon/nmv-source-editor.cc b/src/uicommon/nmv-source-editor.cc
index 347f0d3..708e1e9 100644
--- a/src/uicommon/nmv-source-editor.cc
+++ b/src/uicommon/nmv-source-editor.cc
@@ -689,6 +689,7 @@ struct SourceEditor::Priv {
Gtk::PACK_SHRINK, 6 /* padding */);
init_signals ();
source_view->set_editable (false);
+
register_breakpoint_marker_type (BREAKPOINT_ENABLED_CATEGORY,
"icons/breakpoint-marker.png");
register_breakpoint_marker_type
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]