Mercurial > octave
changeset 31698:276a992d0c08
remove more uses of base_qobject and octave-qobject.h
* QTerminal.cc, QTerminal.h, QUnixTerminalImpl.cpp,
QUnixTerminalImpl.h, QWinTerminalImpl.cpp, QWinTerminalImpl.h,
command-widget.cc, command-widget.h, files-dock-widget.cc,
history-dock-widget.cc, file-editor-tab.cc, file-editor-tab.h,
file-editor.cc, octave-qscintilla.cc, terminal-dock-widget.cc,
variable-editor.cc, workspace-view.cc:
Eliminate unnecessary uses of base_qobject.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 30 Dec 2022 23:18:49 -0500 |
| parents | dd904ce6f53f |
| children | ca3e6e324d54 |
| files | libgui/qterminal/libqterminal/QTerminal.cc libgui/qterminal/libqterminal/QTerminal.h libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.cpp libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.h libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp libgui/qterminal/libqterminal/win32/QWinTerminalImpl.h libgui/src/command-widget.cc libgui/src/command-widget.h libgui/src/files-dock-widget.cc libgui/src/history-dock-widget.cc libgui/src/m-editor/file-editor-tab.cc libgui/src/m-editor/file-editor-tab.h libgui/src/m-editor/file-editor.cc libgui/src/m-editor/octave-qscintilla.cc libgui/src/terminal-dock-widget.cc libgui/src/variable-editor.cc libgui/src/workspace-view.cc |
| diffstat | 17 files changed, 28 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/QTerminal.cc Fri Dec 30 23:13:00 2022 -0500 +++ b/libgui/qterminal/libqterminal/QTerminal.cc Fri Dec 30 23:18:49 2022 -0500 @@ -39,7 +39,6 @@ #include "gui-preferences-cs.h" #include "gui-preferences-sc.h" #include "gui-settings.h" -#include "octave-qobject.h" #include "builtin-defun-decls.h" #include "interpreter.h" @@ -52,21 +51,18 @@ #endif QTerminal * -QTerminal::create (octave::base_qobject& oct_qobj, QWidget *p) +QTerminal::create (QWidget *p) { #if defined (Q_OS_WIN32) - QTerminal *terminal = new QWinTerminalImpl (oct_qobj, p); + QTerminal *terminal = new QWinTerminalImpl (p); #else - QTerminal *terminal = new QUnixTerminalImpl (oct_qobj, p); + QTerminal *terminal = new QUnixTerminalImpl (p); #endif // FIXME: this function should probably be called from or part of the - // QTerminal constructor, but I think that would mean some major - // surgery because then the constructor for QTerminal and the derived - // Unix- and Windows-specific versions would need access to the - // base_qobject object, or the design would have to change significantly. + // QTerminal constructor? - terminal->construct (oct_qobj); + terminal->construct (); return terminal; } @@ -283,7 +279,7 @@ } void -QTerminal::construct (octave::base_qobject& oct_qobj) +QTerminal::construct (void) { octave::gui_settings settings;
--- a/libgui/qterminal/libqterminal/QTerminal.h Fri Dec 30 23:13:00 2022 -0500 +++ b/libgui/qterminal/libqterminal/QTerminal.h Fri Dec 30 23:18:49 2022 -0500 @@ -34,11 +34,6 @@ #include "qt-interpreter-events.h" -namespace octave -{ - class base_qobject; -} - class QMenu; class QAction; @@ -48,8 +43,7 @@ public: - static QTerminal * - create (octave::base_qobject& oct_qobj, QWidget *xparent); + static QTerminal * create (QWidget *xparent); virtual ~QTerminal (void) = default; @@ -146,15 +140,14 @@ protected: - QTerminal (octave::base_qobject& oct_qobj, QWidget *xparent = nullptr) - : QWidget (xparent), m_octave_qobj (oct_qobj) { } + QTerminal (QWidget *xparent = nullptr) + : QWidget (xparent) + { } - void construct (octave::base_qobject& oct_qobj); + void construct (); private: - octave::base_qobject& m_octave_qobj; - QMenu *_contextMenu; QAction * _copy_action; QAction * _paste_action;
--- a/libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.cpp Fri Dec 30 23:13:00 2022 -0500 +++ b/libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.cpp Fri Dec 30 23:18:49 2022 -0500 @@ -24,9 +24,8 @@ #include <termios.h> -QUnixTerminalImpl::QUnixTerminalImpl(octave::base_qobject& oct_qobj, - QWidget *p) - : QTerminal(oct_qobj, p) +QUnixTerminalImpl::QUnixTerminalImpl(QWidget *p) + : QTerminal(p) { initialize(); }
--- a/libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.h Fri Dec 30 23:13:00 2022 -0500 +++ b/libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.h Fri Dec 30 23:18:49 2022 -0500 @@ -36,7 +36,7 @@ int fdstderr; public: - QUnixTerminalImpl(octave::base_qobject&, QWidget *parent); + QUnixTerminalImpl(QWidget *parent); virtual ~QUnixTerminalImpl(); void setTerminalFont(const QFont &font);
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Fri Dec 30 23:13:00 2022 -0500 +++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Fri Dec 30 23:18:49 2022 -0500 @@ -1437,9 +1437,8 @@ ////////////////////////////////////////////////////////////////////////////// -QWinTerminalImpl::QWinTerminalImpl (octave::base_qobject& oct_qobj, - QWidget* parent) - : QTerminal (oct_qobj, parent), d (new QConsolePrivate (this)), +QWinTerminalImpl::QWinTerminalImpl (QWidget* parent) + : QTerminal (parent), d (new QConsolePrivate (this)), allowTripleClick (false) { installEventFilter (this);
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.h Fri Dec 30 23:13:00 2022 -0500 +++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.h Fri Dec 30 23:18:49 2022 -0500 @@ -49,7 +49,7 @@ friend class QConsoleView; public: - QWinTerminalImpl (octave::base_qobject&, QWidget* parent); + QWinTerminalImpl (QWidget* parent); ~QWinTerminalImpl (void); void setTerminalFont (const QFont& font);
--- a/libgui/src/command-widget.cc Fri Dec 30 23:13:00 2022 -0500 +++ b/libgui/src/command-widget.cc Fri Dec 30 23:18:49 2022 -0500 @@ -51,10 +51,10 @@ OCTAVE_BEGIN_NAMESPACE(octave) - command_widget::command_widget (base_qobject& oct_qobj, QWidget *p) + command_widget::command_widget (QWidget *p) : QWidget (p), m_incomplete_parse (false), m_prompt (QString ()), - m_console (new console (this, oct_qobj)) + m_console (new console (this)) { QPushButton *pause_button = new QPushButton (tr("Pause"), this); QPushButton *stop_button = new QPushButton (tr("Stop"), this); @@ -180,7 +180,7 @@ // "qpconsole" as proposed by user "DerManu" in the Qt-forum thread // https://forum.qt.io/topic/28765/command-terminal-using-qtextedit - console::console (command_widget *p, base_qobject&) + console::console (command_widget *p) : QsciScintilla (p), m_command_position (-1), m_cursor_position (0),
--- a/libgui/src/command-widget.h Fri Dec 30 23:13:00 2022 -0500 +++ b/libgui/src/command-widget.h Fri Dec 30 23:18:49 2022 -0500 @@ -40,7 +40,6 @@ OCTAVE_BEGIN_NAMESPACE(octave) - class base_qobject; class command_widget; class console : public QsciScintilla @@ -49,7 +48,7 @@ public: - console (command_widget *p, base_qobject& oct_qobj); + console (command_widget *p); signals: @@ -92,7 +91,7 @@ public: - command_widget (base_qobject& oct_qobj, QWidget *p); + command_widget (QWidget *p); console * get_console ( ) { return m_console; };
--- a/libgui/src/files-dock-widget.cc Fri Dec 30 23:13:00 2022 -0500 +++ b/libgui/src/files-dock-widget.cc Fri Dec 30 23:18:49 2022 -0500 @@ -50,7 +50,6 @@ #include "gui-preferences-fb.h" #include "gui-preferences-global.h" #include "gui-settings.h" -#include "octave-qobject.h" #include "octave-qtutils.h" #include "qt-interpreter-events.h"
--- a/libgui/src/history-dock-widget.cc Fri Dec 30 23:13:00 2022 -0500 +++ b/libgui/src/history-dock-widget.cc Fri Dec 30 23:18:49 2022 -0500 @@ -40,7 +40,6 @@ #include "gui-preferences-hw.h" #include "gui-settings.h" #include "history-dock-widget.h" -#include "octave-qobject.h" #include "cmd-hist.h"
--- a/libgui/src/m-editor/file-editor-tab.cc Fri Dec 30 23:13:00 2022 -0500 +++ b/libgui/src/m-editor/file-editor-tab.cc Fri Dec 30 23:18:49 2022 -0500 @@ -74,7 +74,6 @@ #include "gui-settings.h" #include "gui-utils.h" #include "marker.h" -#include "octave-qobject.h" #include "octave-qtutils.h" #include "octave-txt-lexer.h" @@ -107,7 +106,6 @@ // messages don't affect grandparents. file_editor_tab::file_editor_tab (base_qobject& oct_qobj, const QString& directory_arg) - : m_octave_qobj (oct_qobj) { m_lexer_apis = nullptr; m_is_octave_file = true; @@ -119,7 +117,7 @@ m_file_name = ""; m_file_system_watcher.setObjectName ("_qt_autotest_force_engine_poller"); - m_edit_area = new octave_qscintilla (this, m_octave_qobj); + m_edit_area = new octave_qscintilla (this, oct_qobj); m_line = 0; m_col = 0;
--- a/libgui/src/m-editor/file-editor-tab.h Fri Dec 30 23:13:00 2022 -0500 +++ b/libgui/src/m-editor/file-editor-tab.h Fri Dec 30 23:18:49 2022 -0500 @@ -259,8 +259,6 @@ private: - base_qobject& m_octave_qobj; - void add_breakpoint_event (int line, const QString& cond); bool valid_file_name (const QString& file = QString ());
--- a/libgui/src/m-editor/file-editor.cc Fri Dec 30 23:13:00 2022 -0500 +++ b/libgui/src/m-editor/file-editor.cc Fri Dec 30 23:18:49 2022 -0500 @@ -52,7 +52,6 @@ #include "gui-preferences-global.h" #include "gui-settings.h" #include "main-window.h" -#include "octave-qobject.h" #include "octave-qtutils.h" #include "oct-env.h"
--- a/libgui/src/m-editor/octave-qscintilla.cc Fri Dec 30 23:13:00 2022 -0500 +++ b/libgui/src/m-editor/octave-qscintilla.cc Fri Dec 30 23:18:49 2022 -0500 @@ -1184,6 +1184,9 @@ { if (m_debug_mode && e->type() == QEvent::ToolTip) { + // FIXME: can we handle display of a tooltip using an + // interpreter event or a custom signal/slot connection? + QHelpEvent *help_e = static_cast<QHelpEvent *>(e); QString variable = wordAtPoint (help_e->pos()); QStringList symbol_names
--- a/libgui/src/terminal-dock-widget.cc Fri Dec 30 23:13:00 2022 -0500 +++ b/libgui/src/terminal-dock-widget.cc Fri Dec 30 23:18:49 2022 -0500 @@ -59,7 +59,7 @@ if (m_experimental_terminal_widget) { #if defined (HAVE_QSCINTILLA) - command_widget *widget = new command_widget (oct_qobj, this); + command_widget *widget = new command_widget (this); console *con = widget->get_console (); connect (this, &terminal_dock_widget::settings_changed, @@ -82,7 +82,7 @@ } else { - QTerminal *widget = QTerminal::create (oct_qobj, this); + QTerminal *widget = QTerminal::create (this); connect (this, &terminal_dock_widget::settings_changed, widget, &QTerminal::notice_settings);
--- a/libgui/src/variable-editor.cc Fri Dec 30 23:13:00 2022 -0500 +++ b/libgui/src/variable-editor.cc Fri Dec 30 23:18:49 2022 -0500 @@ -56,7 +56,6 @@ #include "gui-preferences-sc.h" #include "gui-preferences-ve.h" #include "gui-settings.h" -#include "octave-qobject.h" #include "octave-qtutils.h" #include "ovl.h" #include "qt-utils.h"