Mercurial > hg > octave-nkf

comparison libgui/src/m-editor/file-editor.cc @ 16443:7a2ee6ea7800

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename dbstop -> breakpoint in GUI interface functions * file-editor-interface.h (file_editor_interface::handle_update_breakpoint_marker_request): Rename from file_editor_interface::handle_update_dbstop_marker_request. * file-editor-tab.h, file-editor-tab.cc (file_editor_tab::do_breakpoint_marker): Rename from file_editor_tab::do_dbstop_marker. Change all uses. * file-editor.h, file-editor.cc (file_editor::handle_update_breakpoint_marker_request): Rename from file_editor::handle_update_dbstop_marker_request. Change all uses. diff --git a/libgui/src/octave-qt-link.cc b/libgui/src/octave-qt-link.cc * octave-qt-link.h (octave_qt_link::update_breakpoint_marker_signal): Rename from octave_qt_link::update_dbstop_marker_signal. Change all uses.
author John W. Eaton <jwe@octave.org>
date Sat, 06 Apr 2013 13:06:40 -0400
parents aaf024ac8015
children 744ff2fe11ce
comparison
equal deleted inserted replaced
16442:302157614308 16443:7a2ee6ea7800
148 } 148 }
149 149
150 void 150 void
151 file_editor::request_open_file (const QString& openFileName, int line, 151 file_editor::request_open_file (const QString& openFileName, int line,
152 bool debug_pointer, 152 bool debug_pointer,
153 bool dbstop_marker, bool insert) 153 bool breakpoint_marker, bool insert)
154 { 154 {
155 // Check if the user wants to use a custom file editor. 155 // Check if the user wants to use a custom file editor.
156 QSettings *settings = resource_manager::get_settings (); 156 QSettings *settings = resource_manager::get_settings ();
157 if (settings->value ("useCustomFileEditor").toBool ()) 157 if (settings->value ("useCustomFileEditor").toBool ())
158 { 158 {
187 emit fetab_goto_line (p->second, line); 187 emit fetab_goto_line (p->second, line);
188 188
189 if (debug_pointer) 189 if (debug_pointer)
190 emit fetab_insert_debugger_pointer (p->second, line-1); 190 emit fetab_insert_debugger_pointer (p->second, line-1);
191 191
192 if (dbstop_marker) 192 if (breakpoint_marker)
193 emit fetab_do_dbstop_marker (insert, p->second, line-1); 193 emit fetab_do_breakpoint_marker (insert, p->second, line-1);
194 } 194 }
195 195
196 emit fetab_set_focus (p->second); 196 emit fetab_set_focus (p->second);
197 } 197 }
198 else 198 else
214 { 214 {
215 emit fetab_goto_line (fileEditorTab, line); 215 emit fetab_goto_line (fileEditorTab, line);
216 216
217 if (debug_pointer) 217 if (debug_pointer)
218 emit fetab_insert_debugger_pointer (fileEditorTab, line-1); 218 emit fetab_insert_debugger_pointer (fileEditorTab, line-1);
219 if (dbstop_marker) 219 if (breakpoint_marker)
220 emit fetab_do_dbstop_marker 220 emit fetab_do_breakpoint_marker
221 (insert, fileEditorTab, line-1); 221 (insert, fileEditorTab, line-1);
222 } 222 }
223 } 223 }
224 else 224 else
225 { 225 {
340 } 340 }
341 } 341 }
342 } 342 }
343 343
344 void 344 void
345 file_editor::handle_update_dbstop_marker_request (bool insert, 345 file_editor::handle_update_breakpoint_marker_request (bool insert,
346 const QString& file, int line) 346 const QString& file, int line)
347 { 347 {
348 request_open_file (file, line, false, true, insert); 348 request_open_file (file, line, false, true, insert);
349 } 349 }
350 350
953 f, SLOT (set_focus (const QWidget*))); 953 f, SLOT (set_focus (const QWidget*)));
954 connect (this, SIGNAL (fetab_insert_debugger_pointer (const QWidget *, int)), 954 connect (this, SIGNAL (fetab_insert_debugger_pointer (const QWidget *, int)),
955 f, SLOT (insert_debugger_pointer (const QWidget *, int))); 955 f, SLOT (insert_debugger_pointer (const QWidget *, int)));
956 connect (this, SIGNAL (fetab_delete_debugger_pointer (const QWidget *, int)), 956 connect (this, SIGNAL (fetab_delete_debugger_pointer (const QWidget *, int)),
957 f, SLOT (delete_debugger_pointer (const QWidget *, int))); 957 f, SLOT (delete_debugger_pointer (const QWidget *, int)));
958 connect (this, SIGNAL (fetab_do_dbstop_marker (bool, const QWidget *, int)), 958 connect (this, SIGNAL (fetab_do_breakpoint_marker (bool, const QWidget *, int)),
959 f, SLOT (do_dbstop_marker (bool, const QWidget *, int))); 959 f, SLOT (do_breakpoint_marker (bool, const QWidget *, int)));
960 960
961 _tab_widget->setCurrentWidget (f); 961 _tab_widget->setCurrentWidget (f);
962 } 962 }
963 963
964 #endif 964 #endif