Mercurial > hg > octave-nkf
view test/line-continue.tst @ 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 | 6fe6ac8bbfdb |
children | 57fad64de019 |
line wrap: on
line source
## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## ## Octave is free software; you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or (at ## your option) any later version. ## ## Octave is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ## General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. %!shared x, a, b %! x = [1,2]; %! a = 1; %! b = 2; %!test %! y = [a... # comments here ok %! b]; %! assert (y, x); %!test %! x = [1;2]; %! y = [a... # comments here ok %! ;\ %! %! b]; %! assert (y, x); %!assert (1 + ... %! 2 - \# comments here ok %! 3 / ... # comments here ok %! -1,6); %!function y = f (a,... %! b, ... %! c, ... % comments ok %! x, # continuation characters not required in parens %! y, \# but they should work too. %! z) %! %! y = 1; %!endfunction %! %!assert (f (), 1) %!test %!assert (1 == 1 %! && 2 == 2 %! || 3 == 5); %!test %! x = [1, ... %! %! ... %! %! 2]; %! y = [1;2]; %! assert (y, x); %!test %! x = [1 ,... %! 2]; %! y = [1,2]; %! assert (y, x); %% test/oc tave.test/contin/contin-16.m %!test %! x = [ 1 , ... %! 2]; %! y = [1,2]; %! assert (y, x);