Mercurial > octave-nkf
comparison libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp @ 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 | cbaf19edc4ee |
children | d446e99f89f7 |
comparison
equal
deleted
inserted
replaced
16638:3c2e457eeb72 | 16639:ba808cd9d86c |
---|---|
1155 } | 1155 } |
1156 | 1156 |
1157 ////////////////////////////////////////////////////////////////////////////// | 1157 ////////////////////////////////////////////////////////////////////////////// |
1158 | 1158 |
1159 QWinTerminalImpl::QWinTerminalImpl (QWidget* parent) | 1159 QWinTerminalImpl::QWinTerminalImpl (QWidget* parent) |
1160 : QTerminalInterface (parent), d (new QConsolePrivate (this)) | 1160 : QTerminal (parent), d (new QConsolePrivate (this)) |
1161 { | 1161 { |
1162 } | 1162 } |
1163 | 1163 |
1164 ////////////////////////////////////////////////////////////////////////////// | 1164 ////////////////////////////////////////////////////////////////////////////// |
1165 | 1165 |
1166 QWinTerminalImpl::QWinTerminalImpl (const QString& cmd, QWidget* parent) | 1166 QWinTerminalImpl::QWinTerminalImpl (const QString& cmd, QWidget* parent) |
1167 : QTerminalInterface (parent), d (new QConsolePrivate (this, cmd)) | 1167 : QTerminal (parent), d (new QConsolePrivate (this, cmd)) |
1168 { | 1168 { |
1169 } | 1169 } |
1170 | 1170 |
1171 ////////////////////////////////////////////////////////////////////////////// | 1171 ////////////////////////////////////////////////////////////////////////////// |
1172 | 1172 |