octave-nkf: libgui/qterminal/libqterminal/QTerminal.h annotate

annotate libgui/qterminal/libqterminal/QTerminal.h @ 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	9cd14e53e906
children	c89699ca005a

rev	line source
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	1 /*
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	2
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	3 Copyright (C) 2012 Michael Goffioul.
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	4 Copyright (C) 2012 Jacob Dawid.
15647 a044a259c423 Renamed SessionModel in TerminalModel. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15646 diff changeset	5
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	6 This file is part of QTerminal.
15631 9712f29c97de Compiles again. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	7
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	8 Foobar is free software: you can redistribute it and/or modify
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	9 it under the terms of the GNU General Public License as published by
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	10 the Free Software Foundation, either version 3 of the License, or
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	11 (at your option) any later version.
15631 9712f29c97de Compiles again. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	12
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	13 QTerminal is distributed in the hope that it will be useful,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	14 but WITHOUT ANY WARRANTY; without even the implied warranty of
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	16 GNU General Public License for more details.
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	17
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	18 You should have received a copy of the GNU General Public License
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	19 along with Foobar. If not, see <http://www.gnu.org/licenses/>.
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	20
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	21 */
15631 9712f29c97de Compiles again. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	22
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	23 #ifndef QTERMINAL_H
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	24 #define QTERMINAL_H
15649 c22fa57226b2 Fixed bug with ECHOCTL. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15648 diff changeset	25
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15658 diff changeset	26 #include <QtGlobal>
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15658 diff changeset	27
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15658 diff changeset	28 #ifdef Q_OS_WIN32
15652 2d6724358c12 Corrected INCLUDEPATH. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15651 diff changeset	29 #include "win32/QWinTerminalImpl.h"
15658 eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15652 diff changeset	30 class QTerminal : public QWinTerminalImpl
eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15652 diff changeset	31 {
eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15652 diff changeset	32 Q_OBJECT
eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15652 diff changeset	33 public:
15894 9cd14e53e906 eliminate some compiler warnings for GUI code John W. Eaton <jwe@octave.org> parents: 15681 diff changeset	34 QTerminal(QWidget *xparent = 0)
9cd14e53e906 eliminate some compiler warnings for GUI code John W. Eaton <jwe@octave.org> parents: 15681 diff changeset	35 : QWinTerminalImpl(xparent) { }
15658 eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15652 diff changeset	36 ~QTerminal() { }
16413 28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 15894 diff changeset	37
28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 15894 diff changeset	38 public slots:
28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 15894 diff changeset	39 void notice_settings (const QSettings *settings);
28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 15894 diff changeset	40 void relay_command (const QString& text);
15658 eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15652 diff changeset	41 };
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	42 #else
15652 2d6724358c12 Corrected INCLUDEPATH. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15651 diff changeset	43 #include "unix/QUnixTerminalImpl.h"
15658 eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15652 diff changeset	44 class QTerminal : public QUnixTerminalImpl
eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15652 diff changeset	45 {
eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15652 diff changeset	46 Q_OBJECT
eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15652 diff changeset	47 public:
15894 9cd14e53e906 eliminate some compiler warnings for GUI code John W. Eaton <jwe@octave.org> parents: 15681 diff changeset	48 QTerminal(QWidget *xparent = 0)
9cd14e53e906 eliminate some compiler warnings for GUI code John W. Eaton <jwe@octave.org> parents: 15681 diff changeset	49 : QUnixTerminalImpl(xparent) { }
15658 eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15652 diff changeset	50 ~QTerminal() { }
16413 28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 15894 diff changeset	51
28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 15894 diff changeset	52 public slots:
28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 15894 diff changeset	53 void notice_settings (const QSettings *settings);
28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 15894 diff changeset	54 void relay_command (const QString& command);
15658 eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15652 diff changeset	55 };
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	56 #endif
15631 9712f29c97de Compiles again. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	57
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15650 diff changeset	58 #endif // QTERMINAL_H

Mercurial > octave-nkf

annotate libgui/qterminal/libqterminal/QTerminal.h @ 16413:28136851099a