Mercurial > octave-nkf
view libgui/qterminal-module.mk @ 16413:28136851099a
remove _terminal pointer from main_window, it is contained by other Qt object
* main-window.cc, main-window.h (main_window::_terminal):
Delete member variable.
(main_window::get_terminal_view, main_window::get_history_dock_widget,
main_window::get_files_dock_widget, main_window::is_closing):
Delete unused functions.
(main_window::notice_settings): New argument settings.
(main_window::handle_command_double_clicked): Don't sent terminal a
command here.
(main_window::process_settings_dialog_request): New argument, settings.
(main_window::read_settings): New argument, settings.
Produce debug message if settings is nul.
(main_window::write_settings): Produce debug message if settings is nul.
(main_window::construct): Make _terminal a local variable and rename
to terminal. Change all uses.
* QTerminal.cc: New file.
(QTerminal::relay_command): New slot.
* QTerminal.h (QTerminal::notice_settings,
QTerminal::notice_settings): New slots.
* QTerminal: Delete.
* files_dockwidget.cc, files_dockwidget.h
(files_dock_widget::notice_settings): New argument, settings.
* file_editor_tab.cc, file_editor_tab.h (file_editor_tab::notice_settings):
Changed the slot to accept QSettings pointer rather than retrieve from
resource_manager. (file_editor_tabl::file_editor_tab,
file_editor_tab::update_lexer): Check that settings is not null
before using.
* file_editor.cc, file_editor.h (file_editor::notice_settings,
file_editor::fetab_settings_changed): New argument, settings.
(file_editor::update_lexer, file_editor::file_editor_tab): Check that
settings is not null before using.
* qterminal-module.mk (qterminal_libqterminal_la_SOURCES): Add
QTerminal.cc to the list.
| author | Daniel J Sebald <daniel.sebald@ieee.org> |
|---|---|
| date | Wed, 03 Apr 2013 00:10:56 -0400 |
| parents | 5f031158c693 |
| children | ba808cd9d86c |
line wrap: on
line source
EXTRA_DIST += \ qterminal-module.mk noinst_HEADERS += \ qterminal/libqterminal/QTerminal.h \ qterminal/libqterminal/QTerminalInterface.h \ qterminal/libqterminal/win32/QTerminalColors.h \ qterminal/libqterminal/win32/QWinTerminalImpl.h \ qterminal/libqterminal/unix/BlockArray.h \ qterminal/libqterminal/unix/Character.h \ qterminal/libqterminal/unix/CharacterColor.h \ qterminal/libqterminal/unix/Emulation.h \ qterminal/libqterminal/unix/ExtendedDefaultTranslator.h \ qterminal/libqterminal/unix/Filter.h \ qterminal/libqterminal/unix/History.h \ qterminal/libqterminal/unix/KeyboardTranslator.h \ qterminal/libqterminal/unix/konsole_wcwidth.h \ qterminal/libqterminal/unix/kpty.h \ qterminal/libqterminal/unix/kpty_p.h \ qterminal/libqterminal/unix/LineFont.h \ qterminal/libqterminal/unix/QUnixTerminalImpl.h \ qterminal/libqterminal/unix/Screen.h \ qterminal/libqterminal/unix/ScreenWindow.h \ qterminal/libqterminal/unix/TerminalCharacterDecoder.h \ qterminal/libqterminal/unix/Vt102Emulation.h \ qterminal/libqterminal/unix/SelfListener.h \ qterminal/libqterminal/unix/TerminalModel.h \ qterminal/libqterminal/unix/TerminalView.h qterminal_libqterminal_la_MOC = \ qterminal/libqterminal/moc-QTerminal.cc \ qterminal/libqterminal/moc-QTerminalInterface.cc nodist_qterminal_libqterminal_la_SOURCES = $(qterminal_libqterminal_la_MOC) qterminal_libqterminal_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ @QT_CPPFLAGS@ \ -I$(srcdir)/qterminal/libqterminal qterminal_libqterminal_la_CFLAGS = $(AM_CFLAGS) qterminal_libqterminal_la_CXXFLAGS = $(AM_CXXFLAGS) if WIN32_TERMINAL qterminal_libqterminal_la_SOURCES = \ qterminal/libqterminal/win32/QTerminalColors.cpp \ qterminal/libqterminal/win32/QWinTerminalImpl.cpp \ qterminal/libqterminal/QTerminal.cc qterminal_libqterminal_la_MOC += \ qterminal/libqterminal/win32/moc-QWinTerminalImpl.cc qterminal_libqterminal_la_CPPFLAGS += -DUNICODE # This flag is required to let MOC know about Q_OS_WIN32. MOC_CPPFLAGS += -DQ_OS_WIN32 else qterminal_libqterminal_la_SOURCES = \ qterminal/libqterminal/unix/BlockArray.cpp \ qterminal/libqterminal/unix/Emulation.cpp \ qterminal/libqterminal/unix/Filter.cpp \ qterminal/libqterminal/unix/History.cpp \ qterminal/libqterminal/unix/KeyboardTranslator.cpp \ qterminal/libqterminal/unix/konsole_wcwidth.cpp \ qterminal/libqterminal/unix/kpty.cpp \ qterminal/libqterminal/unix/QUnixTerminalImpl.cpp \ qterminal/libqterminal/unix/Screen.cpp \ qterminal/libqterminal/unix/ScreenWindow.cpp \ qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp \ qterminal/libqterminal/unix/Vt102Emulation.cpp \ qterminal/libqterminal/unix/SelfListener.cpp \ qterminal/libqterminal/unix/TerminalModel.cpp \ qterminal/libqterminal/unix/TerminalView.cpp \ qterminal/libqterminal/QTerminal.cc qterminal_libqterminal_la_MOC += \ qterminal/libqterminal/unix/moc-Emulation.cc \ qterminal/libqterminal/unix/moc-Filter.cc \ qterminal/libqterminal/unix/moc-QUnixTerminalImpl.cc \ qterminal/libqterminal/unix/moc-ScreenWindow.cc \ qterminal/libqterminal/unix/moc-SelfListener.cc \ qterminal/libqterminal/unix/moc-TerminalModel.cc \ qterminal/libqterminal/unix/moc-TerminalView.cc \ qterminal/libqterminal/unix/moc-Vt102Emulation.cc endif noinst_LTLIBRARIES += qterminal/libqterminal.la CLEANFILES += $(qterminal_libqterminal_la_MOC)