Mercurial > hg > octave-lyh
view libgui/src/symbol-information.h @ 16457:10edb6f1ae98
improve encapsulation of file editor window object
* file-editor-interface.h
(file_editor_interface::connect_visibility_changed): New function.
* file-editor.h, file-editor.cc (file_editor::handle_visibility,
file_editor::focus, file_editor::connect_visibility_changed):
New functions.
(file_editor::construct): Connect main_window::new_file_signal to
file_editor::new_file.
* main-window.cc (main_window::editor_window): Rename from
_file_editor. Change all uses.
(create_default_editor): New static function.
(main_window::main_window): Use it to initialize editor_window.
(main_window::new_file_signal, main_window::open_file_signal):
New signals.
(main_window::new_file, main_window::open_file): Emit signals instead
of calling file_editor functions directly.
(main_window::focus_editor, main_window::handle_editor_visible):
Delete.
(main_window::connect_visibility_changed): Call
editor_window->connect_visibility_changed.
(main_window::construct): Don't create _file_editor.
(main_window::construct_file_menu): Connect _open_action::triggered to
editor_window::request_open_file instead of main_window::open_file.
Connect _new_script_action::triggered to
editor_window::request_new_file instead of main_window::new_file.
(main_window::construct_new_menu): Connect editor_action::triggered to
editor_window::focus instead of main_window::focus_editor.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 07 Apr 2013 05:45:23 -0400 |
parents | 80e99730e5d4 |
children |
line wrap: on
line source
/* Copyright (C) 2011-2012 Jacob Dawid 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/>. */ #ifndef SYMBOLINFORMATION_H #define SYMBOLINFORMATION_H // FIXME -- we should not be including config.h in header files. #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <QString> #include <QHash> #include "symtab.h" /** * \struct symbol_information * \brief Meta-information over a symbol-table entry. * \author Jacob Dawid * This struct is used to store meta information over a symbol entry. * It reduces memory consumption, since it only stores relevant data * about a symbol-table entry that will be used in the model for the * graphical user interface. */ class symbol_information { public: enum Scope { unknown = 0, local = 1, global = 2, persistent = 3 }; symbol_information (const symbol_table::symbol_record& symbol_record); symbol_information (const symbol_information& x) : _scope (x._scope), _symbol (x._symbol), _class_name (x._class_name), _value (x._value), _dimension (x._dimension), _hash (x._hash) { } symbol_information operator = (const symbol_information& x) { if (this != &x) { _scope = x._scope; _symbol = x._symbol; _class_name = x._class_name; _value = x._value; _dimension = x._dimension; _hash = x._hash; } return *this; } ~symbol_information (void) { } QString symbol (void) const { return _symbol; } QString class_name (void) const { return _class_name; } QString value (void) const { return QString::fromUtf8 (_value.toStdString ().data (), _value.toStdString ().size ()); } QString dimension (void) const { return _dimension; } Scope scope (void) const { return _scope; } friend bool operator == (const symbol_information& a, const symbol_information& b) { return (a.hash () == b.hash () && a.scope () == b.scope () && a.symbol () == b.symbol () && a.class_name () == b.class_name () && a.value () == b.value () && a.dimension () == b.dimension ()); } private: // FIXME -- this is not really the scope of the symbol. Scope _scope; QString _symbol; QString _class_name; QString _value; QString _dimension; int _hash; int hash (void) const { return _hash; } }; #endif // SYMBOLINFORMATION_H