Mercurial > octave-nkf

comparison libgui/qterminal-module.mk @ 16639:ba808cd9d86c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 28136851099a
children 4c3c3cf9ef58
comparison
equal deleted inserted replaced
16638:3c2e457eeb72 16639:ba808cd9d86c
1 EXTRA_DIST += \ 1 EXTRA_DIST += \
2 qterminal-module.mk 2 qterminal-module.mk
3 3
4 noinst_HEADERS += \ 4 noinst_HEADERS += \
5 qterminal/libqterminal/QTerminal.h \ 5 qterminal/libqterminal/QTerminal.h \
6 qterminal/libqterminal/QTerminalInterface.h \
7 qterminal/libqterminal/win32/QTerminalColors.h \ 6 qterminal/libqterminal/win32/QTerminalColors.h \
8 qterminal/libqterminal/win32/QWinTerminalImpl.h \ 7 qterminal/libqterminal/win32/QWinTerminalImpl.h \
9 qterminal/libqterminal/unix/BlockArray.h \ 8 qterminal/libqterminal/unix/BlockArray.h \
10 qterminal/libqterminal/unix/Character.h \ 9 qterminal/libqterminal/unix/Character.h \
11 qterminal/libqterminal/unix/CharacterColor.h \ 10 qterminal/libqterminal/unix/CharacterColor.h \
26 qterminal/libqterminal/unix/SelfListener.h \ 25 qterminal/libqterminal/unix/SelfListener.h \
27 qterminal/libqterminal/unix/TerminalModel.h \ 26 qterminal/libqterminal/unix/TerminalModel.h \
28 qterminal/libqterminal/unix/TerminalView.h 27 qterminal/libqterminal/unix/TerminalView.h
29 28
30 qterminal_libqterminal_la_MOC = \ 29 qterminal_libqterminal_la_MOC = \
31 qterminal/libqterminal/moc-QTerminal.cc \ 30 qterminal/libqterminal/moc-QTerminal.cc
32 qterminal/libqterminal/moc-QTerminalInterface.cc
33 31
34 nodist_qterminal_libqterminal_la_SOURCES = $(qterminal_libqterminal_la_MOC) 32 nodist_qterminal_libqterminal_la_SOURCES = $(qterminal_libqterminal_la_MOC)
35 33
36 qterminal_libqterminal_la_CPPFLAGS = \ 34 qterminal_libqterminal_la_CPPFLAGS = \
37 $(AM_CPPFLAGS) \ 35 $(AM_CPPFLAGS) \