Mercurial > octave
changeset 32239:10db16bf2440
fix obsolete signals of QComboBox in Qt6
* files-dock-widget.cc (files_dock_widget): use textActivated
instead of activated when in Qt6
* main-window.cc (construct_tool_bar): dito
| author | Torsten Lilge <ttl-octave@mailbox.org> |
|---|---|
| date | Sat, 05 Aug 2023 19:29:38 +0200 |
| parents | 6d20f476936e |
| children | d1bbd7a0982c |
| files | libgui/src/files-dock-widget.cc libgui/src/main-window.cc |
| diffstat | 2 files changed, 10 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/files-dock-widget.cc Sat Aug 05 16:12:14 2023 +0200 +++ b/libgui/src/files-dock-widget.cc Sat Aug 05 19:29:38 2023 +0200 @@ -395,23 +395,13 @@ connect (m_current_directory->lineEdit (), &QLineEdit::returnPressed, this, &files_dock_widget::accept_directory_line_edit); - // FIXME: We could use - // - // connect (m_current_directory, - // QOverload<const QString&>::of (&QComboBox::activated), - // this, &files_dock_widget::set_current_directory); - // - // but referring to QComboBox::activated will generate deprecated - // function warnings from GCC. We could also use - // - // connect (m_current_directory, &QComboBox::textActivated, - // this, &files_dock_widget::set_current_directory); - // - // but the function textActivated was not introduced until Qt 5.14 - // so we'll need a feature test. - +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + connect (m_current_directory, &QComboBox::textActivated, + this, &files_dock_widget::set_current_directory); +#else connect (m_current_directory, SIGNAL (activated (const QString&)), this, SLOT (set_current_directory (const QString&))); +#endif QCompleter *completer = new QCompleter (m_file_system_model, this); m_current_directory->setCompleter (completer);
--- a/libgui/src/main-window.cc Sat Aug 05 16:12:14 2023 +0200 +++ b/libgui/src/main-window.cc Sat Aug 05 19:29:38 2023 +0200 @@ -2624,8 +2624,13 @@ = m_main_tool_bar->addAction (settings.icon ("folder"), tr ("Browse directories")); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + connect (m_current_directory_combo_box, &QComboBox::textActivated, + this, &main_window::set_current_working_directory); +#else connect (m_current_directory_combo_box, SIGNAL (activated (const QString&)), this, SLOT (set_current_working_directory (const QString&))); +#endif connect (m_current_directory_combo_box->lineEdit (), &QLineEdit::returnPressed,