Mercurial > octave

comparison libgui/src/main-window.cc @ 29853:b918ef934b71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow building without QScintilla to work again (bug #60879) * main-window.cc (main_window::adopt_editor_widget): Get pointer to qt_interpreter_events outside of HAVE_QSCINTILLA conditional since it is always needed.
author John W. Eaton <jwe@octave.org>
date Mon, 05 Jul 2021 09:02:55 -0400
parents 56465c0739fa
children 744bb06fea2a
comparison
equal deleted inserted replaced
29852:b2455f0a8297 29853:b918ef934b71
335 this, &main_window::execute_command_in_terminal); 335 this, &main_window::execute_command_in_terminal);
336 } 336 }
337 337
338 void main_window::adopt_editor_widget (void) 338 void main_window::adopt_editor_widget (void)
339 { 339 {
340 interpreter_qobject *interp_qobj = m_octave_qobj.interpreter_qobj ();
341
342 qt_interpreter_events *qt_link = interp_qobj->qt_link ();
343
340 #if defined (HAVE_QSCINTILLA) 344 #if defined (HAVE_QSCINTILLA)
341 file_editor *editor = new file_editor (this, m_octave_qobj); 345 file_editor *editor = new file_editor (this, m_octave_qobj);
342 346
343 make_dock_widget_connections (editor); 347 make_dock_widget_connections (editor);
344 348
399 connect (m_file_browser_window, &files_dock_widget::file_remove_signal, 403 connect (m_file_browser_window, &files_dock_widget::file_remove_signal,
400 editor, &file_editor::handle_file_remove); 404 editor, &file_editor::handle_file_remove);
401 405
402 connect (m_file_browser_window, &files_dock_widget::file_renamed_signal, 406 connect (m_file_browser_window, &files_dock_widget::file_renamed_signal,
403 editor, &file_editor::handle_file_renamed); 407 editor, &file_editor::handle_file_renamed);
404
405 interpreter_qobject *interp_qobj = m_octave_qobj.interpreter_qobj ();
406
407 qt_interpreter_events *qt_link = interp_qobj->qt_link ();
408 408
409 // Signals for removing/renaming files/dirs in the terminal window 409 // Signals for removing/renaming files/dirs in the terminal window
410 connect (qt_link, &qt_interpreter_events::file_renamed_signal, 410 connect (qt_link, &qt_interpreter_events::file_renamed_signal,
411 editor, &file_editor::handle_file_renamed); 411 editor, &file_editor::handle_file_renamed);
412 412