Mercurial > octave-nkf
diff libgui/qterminal/libqterminal/win32/QWinTerminalImpl.h @ 16639:ba808cd9d86c
simplify QTerminal inheritance scheme
* Qterminal.h, Qterminal.cc: Merge QTerminalInterface class into
QTerminal.
(QTerminal::create): New function.
(QTerminal::Qterminal): Now protected.
* QUnixTerminal.h, QUnixTerminal.cpp, QWinTerminal.h,
QWinTerminal.cpp: Derive from QTerminal, not QTerminalInterface.
* QTerminalInterface.h: Delete.
* libgui/qterminal-module.mk: Update file lists.
* terminal-dock-widget.cc
(terminal_dock_widget::terminal_dock_widget): Use QTerminal::create to
create terminal object.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 12 May 2013 15:23:14 -0400 |
| parents | 818eef7b2618 |
| children | 1d1f02e0f6b4 |
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.h Sat May 11 18:20:31 2013 +0200 +++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.h Sun May 12 15:23:14 2013 -0400 @@ -23,7 +23,7 @@ #define __QConsole_h__ 1 #include <QWidget> -#include "QTerminalInterface.h" +#include "QTerminal.h" class QFocusEvent; class QKeyEvent; class QPainter; @@ -38,7 +38,7 @@ ////////////////////////////////////////////////////////////////////////////// -class QWinTerminalImpl : public QTerminalInterface +class QWinTerminalImpl : public QTerminal { Q_OBJECT friend class QConsolePrivate;