Mercurial > octave

comparison libgui/src/octave-qobject.h @ 31690:1a1f47f17ed4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate resource_manager class * gui-settings.cc, gui-settings.h (gui_settings::get_gui_translation_dir, gui_settings::config_translators, gui_settings::get_valid_lexer_styles, gui_settings::read_lexer_settings, gui_settings::update_settings_key, gui_settings::update_network_settings, gui_settings::get_codecs, gui_settings::combo_encoding): Move here from resource_manager class. * file-editor-tab.cc, find-dialog.cc, main-window.cc, octave-qobject.h, octave-qobject.cc, qt-interpreter-events.cc, settings-dialog.cc: Change all uses of resource_manager class to use gui_settings instead. * octave-qscintilla.h, octave-qscintilla.cc (octave_qscintilla::create_tmp_file): Move here from resource_manager class. (octave_qscintilla::ctx_menu_run_finished_signal, octave_qscintilla::ctx_menu_run_finished): Use QPointer<QTemporaryFile> instead of bare pointer in signal/slot functions. * octave-qobject.h, octave-qobject.cc (octave_base_qobject::m_resource_manager): Delete data member. (octave_base_qobject::get_resource_manager): Delete. * resource-manager.h, resource-manager.cc: Delete. * libgui/src/module.mk: Update.
author John W. Eaton <jwe@octave.org>
date Tue, 27 Dec 2022 14:55:03 -0500
parents 29d734430e5f
children 8fed04d0607c
comparison
equal deleted inserted replaced
31689:a8a7207a7341 31690:1a1f47f17ed4
29 #include <memory> 29 #include <memory>
30 30
31 #include <QApplication> 31 #include <QApplication>
32 #include <QList> 32 #include <QList>
33 #include <QObject> 33 #include <QObject>
34 #include <QPointer>
34 #include <QString> 35 #include <QString>
35 #include <QStringList> 36 #include <QStringList>
36 37
37 #include "interpreter-qobject.h" 38 #include "interpreter-qobject.h"
38 #include "resource-manager.h"
39 #include "shortcut-manager.h" 39 #include "shortcut-manager.h"
40 40
41 OCTAVE_BEGIN_NAMESPACE(octave) 41 OCTAVE_BEGIN_NAMESPACE(octave)
42 42
43 class community_news; 43 class community_news;
134 main_window * get_main_window (void) 134 main_window * get_main_window (void)
135 { 135 {
136 return m_main_window; 136 return m_main_window;
137 } 137 }
138 138
139 resource_manager& get_resource_manager (void)
140 {
141 return m_resource_manager;
142 }
143
144 shortcut_manager& get_shortcut_manager (void) 139 shortcut_manager& get_shortcut_manager (void)
145 { 140 {
146 return m_shortcut_manager; 141 return m_shortcut_manager;
147 } 142 }
148 143
266 int m_argc; 261 int m_argc;
267 char **m_argv; 262 char **m_argv;
268 263
269 octave_qapplication *m_qapplication; 264 octave_qapplication *m_qapplication;
270 265
271 resource_manager m_resource_manager;
272
273 shortcut_manager m_shortcut_manager; 266 shortcut_manager m_shortcut_manager;
274 267
275 QTranslator *m_qt_tr; 268 QTranslator *m_qt_tr;
276 QTranslator *m_gui_tr; 269 QTranslator *m_gui_tr;
277 QTranslator *m_qsci_tr; 270 QTranslator *m_qsci_tr;