Mercurial > octave
changeset 29707:81be7e4ddb0f
revert connection of qscintilla signals back to old syntax (bug #60469)
* file-editor-tab.cc (file_editor_tab): use classic signal/slot
connection syntax for native qscintilla signals;
(notice_settings): dito
* file-editor.cc (make_file_editor_tab): dito
* find-dialog.cc (update_edit_area): dito
* octave-qscintilla.cc (octave_qscintilla): dito
| author | Torsten Lilge <ttl-octave@mailbox.org> |
|---|---|
| date | Wed, 26 May 2021 12:23:24 +0200 |
| parents | 1077d7c87fcc |
| children | fbcc3a680826 |
| files | libgui/src/m-editor/file-editor-tab.cc libgui/src/m-editor/file-editor.cc libgui/src/m-editor/find-dialog.cc libgui/src/m-editor/octave-qscintilla.cc |
| diffstat | 4 files changed, 35 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor-tab.cc Tue May 25 17:01:18 2021 -0400 +++ b/libgui/src/m-editor/file-editor-tab.cc Wed May 26 12:23:24 2021 +0200 @@ -131,17 +131,17 @@ // Initialize last modification date to now m_last_modified = QDateTime::currentDateTimeUtc(); - connect (m_edit_area, &octave_qscintilla::cursorPositionChanged, - this, &file_editor_tab::handle_cursor_moved); - - connect (m_edit_area, &octave_qscintilla::SCN_CHARADDED, - this, &file_editor_tab::handle_char_added); - - connect (m_edit_area, &octave_qscintilla::SCN_DOUBLECLICK, - this, &file_editor_tab::handle_double_click); - - connect (m_edit_area, &octave_qscintilla::linesChanged, - this, &file_editor_tab::handle_lines_changed); + connect (m_edit_area, SIGNAL (cursorPositionChanged (int, int)), + this, SLOT (handle_cursor_moved (int,int))); + + connect (m_edit_area, SIGNAL (SCN_CHARADDED (int)), + this, SLOT (handle_char_added (int))); + + connect (m_edit_area, SIGNAL (SCN_DOUBLECLICK (int, int, int)), + this, SLOT (handle_double_click (int, int, int))); + + connect (m_edit_area, SIGNAL (linesChanged ()), + this, SLOT (handle_lines_changed ())); connect (m_edit_area, &octave_qscintilla::context_menu_edit_signal, this, &file_editor_tab::handle_context_menu_edit); @@ -194,8 +194,10 @@ m_edit_area->setMarkerBackgroundColor (QColor (192,192,192), marker::unsure_debugger_position); - connect (m_edit_area, &octave_qscintilla::marginClicked, - this, &file_editor_tab::handle_margin_clicked); + connect (m_edit_area, SIGNAL (marginClicked (int, int, + Qt::KeyboardModifiers)), + this, SLOT (handle_margin_clicked (int, int, + Qt::KeyboardModifiers))); connect (m_edit_area, &octave_qscintilla::context_menu_break_condition_signal, this, &file_editor_tab::handle_context_menu_break_condition); @@ -233,11 +235,11 @@ this, QOverload<const meth_callback&>::of (&file_editor_tab::interpreter_event)); // connect modified signal - connect (m_edit_area, &octave_qscintilla::modificationChanged, - this, &file_editor_tab::update_window_title); - - connect (m_edit_area, &octave_qscintilla::copyAvailable, - this, &file_editor_tab::handle_copy_available); + connect (m_edit_area, SIGNAL (modificationChanged (bool)), + this, SLOT (update_window_title (bool))); + + connect (m_edit_area, SIGNAL (copyAvailable (bool)), + this, SLOT (handle_copy_available (bool))); connect (&m_file_system_watcher, &QFileSystemWatcher::fileChanged, this, [=] (const QString& path) { file_has_changed (path); }); @@ -2698,14 +2700,13 @@ { m_edit_area->setMarginLineNumbers (2, true); auto_margin_width (); - connect (m_edit_area, &octave_qscintilla::linesChanged, - this, &file_editor_tab::auto_margin_width); + connect (m_edit_area, SIGNAL (linesChanged ()), + this, SLOT (auto_margin_width ())); } else { m_edit_area->setMarginLineNumbers (2, false); - disconnect (m_edit_area, &octave_qscintilla::linesChanged, - nullptr, nullptr); + disconnect (m_edit_area, SIGNAL (linesChanged ()), nullptr, nullptr); } m_smart_indent = settings->value (ed_auto_indent).toBool ();
--- a/libgui/src/m-editor/file-editor.cc Tue May 25 17:01:18 2021 -0400 +++ b/libgui/src/m-editor/file-editor.cc Wed May 26 12:23:24 2021 +0200 @@ -2411,11 +2411,12 @@ connect (f->qsci_edit_area (), &octave_qscintilla::create_context_menu_signal, this, &file_editor::create_context_menu); - connect (f->qsci_edit_area (), &octave_qscintilla::SCN_AUTOCCOMPLETED, - this, &file_editor::reset_focus); - - connect (f->qsci_edit_area (), &octave_qscintilla::SCN_AUTOCCANCELLED, - this, &file_editor::handle_autoc_cancelled); + connect (f->qsci_edit_area (), + SIGNAL (SCN_AUTOCCOMPLETED (const char*, int, int, int)), + this, SLOT (reset_focus (void))); + + connect (f->qsci_edit_area (), SIGNAL (SCN_AUTOCCANCELLED (void)), + this, SLOT (handle_autoc_cancelled (void))); // signals from the qscintilla edit area connect (this, &file_editor::enter_debug_mode_signal,
--- a/libgui/src/m-editor/find-dialog.cc Tue May 25 17:01:18 2021 -0400 +++ b/libgui/src/m-editor/find-dialog.cc Wed May 26 12:23:24 2021 +0200 @@ -212,8 +212,8 @@ _edit_area = edit_area; _search_selection_check_box->setEnabled (edit_area->hasSelectedText ()); - connect (_edit_area, &octave_qscintilla::copyAvailable, - this, &find_dialog::handle_selection_changed, + connect (_edit_area, SIGNAL (copyAvailable (bool)), + this, SLOT (handle_selection_changed (bool)), Qt::UniqueConnection); }
--- a/libgui/src/m-editor/octave-qscintilla.cc Tue May 25 17:01:18 2021 -0400 +++ b/libgui/src/m-editor/octave-qscintilla.cc Wed May 26 12:23:24 2021 +0200 @@ -116,11 +116,11 @@ m_selection_line (-1), m_selection_col (-1), m_indicator_id (1), m_tooltip_font (QToolTip::font ()) { - connect (this, &octave_qscintilla::textChanged, - this, &octave_qscintilla::text_changed); + connect (this, SIGNAL (textChanged (void)), + this, SLOT (text_changed (void))); - connect (this, &octave_qscintilla::cursorPositionChanged, - this, &octave_qscintilla::cursor_position_changed); + connect (this, SIGNAL (cursorPositionChanged (int, int)), + this, SLOT (cursor_position_changed (int, int))); connect (this, &octave_qscintilla::ctx_menu_run_finished_signal, this, &octave_qscintilla::ctx_menu_run_finished,