Mercurial > octave
comparison libgui/src/variable-editor.h @ 28300:0c6dcf803529
Remove support for Qt4 in Octave 7.
* configure.ac: Change QT_VERSIONS variable to just "5".
* m4/acinclude.m4 (OCTAVE_CHECK_FUNC_QABSTRACTITEMMODEL_BEGINRESETMODEL,
OCTAVE_CHECK_FUNC_QCOMBOBOX_SETCURRENTTEXT,
OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONRESIZEMODE,
OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONSCLICKABLE,
OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONSMOVABLE,
OCTAVE_CHECK_FUNC_QINSTALLMESSAGEHANDLER,
OCTAVE_CHECK_FUNC_QLINEEDIT_SETPLACEHOLDERTEXT,
OCTAVE_CHECK_FUNC_QMOUSEEVENT_LOCALPOS,
OCTAVE_CHECK_FUNC_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS,
OCTAVE_CHECK_FUNC_QTABWIDGET_SETMOVABLE,
OCTAVE_CHECK_FUNC_QWHEELEVENT_ANGLEDELTA,
OCTAVE_CHECK_FUNC_QTMESSAGEHANDLER_ACCEPTS_QMESSAGELOGCONTEXT,
OCTAVE_CHECK_MEMBER_QFONT_FORCE_INTEGER_METRICS,
OCTAVE_CHECK_MEMBER_QFONT_MONOSPACE,
OCTAVE_HAVE_QGUIAPPLICATION): Remove obsolete macros
* m4/acinclude.m4 (HAVE_QT_SCINTILLA): Remove option '4' in
case statement for Qt version.
* m4/acinclude.m4 (OCTAVE_HAVE_QT): Remove test for Qt4 and AC_DEFINE for
HAVE_QT.
* m4/acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Remove option '4' in case
statement for $qt_version. Remove test for $qt_version = 4 calling
pkg_config. Delete calls to macros that were removed.
* Canvas.cc (select_object): Remove HAVE_QMOUSEEVENT_LOCALPOS conditionals.
* QtHandlesUtils.cc (makeScrollEventStruct): Remove HAVE_QWHEELEVENT_ANGLEDELTA
conditional.
* Table.cc (updateEnable, updateRearrangeableColumns): Remove HAVE_QT4
conditional.
* files-dock-widget.cc (files_dock_widget): Remove
HAVE_QHEADERVIEW_SETSECTIONSCLICKABLE conditional.
* find-files-dialog.cc (find_files_dialog): Remove
HAVE_QHEADERVIEW_SETSECTIONSCLICKABLE conditional.
* file-editor.cc (file_editor_tab_widget): Remove HAVE_QTABWIDGET_SETMOVABLE
conditional.
* find-dialog.cc (init_search_text): Remove HAVE_QCOMBOBOX_SETCURRENTTEXT
conditional.
* main-window.cc (display_community_news): Remove
QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS conditional.
* octave-qobject.cc (message_handler): Remove
QTMESSAGEHANDLER_ACCEPTS_QMESSAGELOGCONTEXT conditional.
* octave-qobject.cc (base_qobject): Remove HAVE_QINSTALLMESSAGEHANDLER,
HAVE_QT4 conditionals.
* resource-manager.cc (get_default_font_family): Remove HAVE_QFONT_MONOSPACE
conditional.
* shortcut-manager.cc (enter_shortcut::keyPressEvent): Remove
HAVE_QGUIAPPLICATION conditional.
* shortcut-manager.cc (shortcut_manager::fill_treewidget): Remove
HAVE_QHEADERVIEW_SETSECTIONRESIZEMODE conditional.
* tab-bar.cc (move_tab_left, move_tab_right, switch_tab): Remove
HAVE_QTABWIDGET_SETMOVABLE conditional.
* variable-editor.cc (variable_dock_widget, change_floating,
change_fullscreen): Remove HAVE_QGUIAPPLICATION conditional.
* variable-editor.cc (variable_editor_view, setModel): Remove
HAVE_QHEADERVIEW_SETSECTIONRESIZEMODE conditional.
* variable-editor.cc (construct_tool_bar): Remove
QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS conditional.
* variable-editor.h (class variable_dock_widget): Remove HAVE_QGUIAPPLICATION
conditional.
* workspace-view.cc (workspace_view): Remove
HAVE_QHEADERVIEW_SETSECTIONSCLICKABLE conditionals.
author | Rik <rik@octave.org> |
---|---|
date | Sat, 16 May 2020 13:32:24 -0700 |
parents | bd51beb6205e |
children | 37c5532e558c |
comparison
equal
deleted
inserted
replaced
28299:a8f6a7083428 | 28300:0c6dcf803529 |
---|---|
84 | 84 |
85 protected: | 85 protected: |
86 | 86 |
87 QFrame *m_frame; | 87 QFrame *m_frame; |
88 | 88 |
89 #if defined (HAVE_QGUIAPPLICATION) | |
90 | |
91 QAction *m_fullscreen_action; | 89 QAction *m_fullscreen_action; |
92 | 90 |
93 bool m_full_screen; | 91 bool m_full_screen; |
94 | 92 |
95 bool m_prev_floating; | 93 bool m_prev_floating; |
96 | 94 |
97 QRect m_prev_geom; | 95 QRect m_prev_geom; |
98 | |
99 #endif | |
100 | 96 |
101 // See Octave bug #53807 and https://bugreports.qt.io/browse/QTBUG-44813 | 97 // See Octave bug #53807 and https://bugreports.qt.io/browse/QTBUG-44813 |
102 #define QTBUG_44813_FIX_VERSION 0x999999 | 98 #define QTBUG_44813_FIX_VERSION 0x999999 |
103 signals: | 99 signals: |
104 | 100 |