Mercurial > octave
changeset 31646:c6d54dd31a7e stable
maint: Use macros to begin/end C++ namespaces.
* BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h,
ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h,
CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h,
ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h,
Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc,
GLCanvas.h, GenericEventNotify.h, KeyMap.cc, KeyMap.h,
ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc,
Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc,
ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc,
PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h,
PushTool.cc, PushTool.h, QtHandlesUtils.cc, QtHandlesUtils.h,
RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc,
SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h,
TextEdit.cc, TextEdit.h, ToggleButtonControl.cc,
ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc,
ToolBar.h, ToolBarButton.cc, ToolBarButton.h, annotation-dialog.cc,
annotation-dialog.h, gl-select.cc, gl-select.h, qopengl-functions.h,
qt-graphics-toolkit.cc, qt-graphics-toolkit.h, QTerminal.h,
color-picker.cc, color-picker.h, command-widget.cc, command-widget.h,
community-news.cc, community-news.h, dialog.cc, dialog.h,
documentation-bookmarks.cc, documentation-bookmarks.h,
documentation-dock-widget.cc, documentation-dock-widget.h,
documentation.cc, documentation.h, dw-main-window.cc,
dw-main-window.h, external-editor-interface.cc,
external-editor-interface.h, files-dock-widget.cc,
files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h,
find-files-model.cc, find-files-model.h, graphics-init.cc,
graphics-init.h, gui-settings.cc, gui-settings.h, gui-utils.cc,
gui-utils.h, history-dock-widget.cc, history-dock-widget.h,
interpreter-qobject.cc, interpreter-qobject.h, led-indicator.cc,
led-indicator.h, file-editor-interface.h, file-editor-tab.cc,
file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc,
find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc,
octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h,
main-window.cc, main-window.h, news-reader.cc, news-reader.h,
octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc,
octave-qobject.h, qt-application.cc, qt-application.h,
qt-interpreter-events.cc, qt-interpreter-events.h, qt-utils.h,
release-notes.cc, release-notes.h, resource-manager.cc,
resource-manager.h, set-path-dialog.cc, set-path-dialog.h,
set-path-model.cc, set-path-model.h, settings-dialog.cc,
settings-dialog.h, shortcut-manager.cc, shortcut-manager.h,
tab-bar.cc, tab-bar.h, terminal-dock-widget.cc,
terminal-dock-widget.h, variable-editor-model.cc,
variable-editor-model.h, variable-editor.cc, variable-editor.h,
welcome-wizard.cc, welcome-wizard.h, workspace-model.cc,
workspace-model.h, workspace-view.cc, workspace-view.h:
Use new macros to begin/end C++ namespaces.
line wrap: on
line diff
--- a/libgui/graphics/BaseControl.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/BaseControl.cc Tue Dec 06 14:37:51 2022 -0500 @@ -39,8 +39,7 @@ #include "graphics.h" #include "interpreter.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) static void updatePalette (const uicontrol::properties& props, QWidget *w) @@ -340,4 +339,4 @@ return Object::eventFilter (watched, xevent); } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/BaseControl.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/BaseControl.h Tue Dec 06 14:37:51 2022 -0500 @@ -31,8 +31,8 @@ class QEvent; class QObject; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -57,6 +57,6 @@ bool m_keyPressHandlerDefined; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/ButtonControl.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/ButtonControl.cc Tue Dec 06 14:37:51 2022 -0500 @@ -37,8 +37,7 @@ #include "graphics.h" #include "interpreter.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) ButtonControl::ButtonControl (octave::base_qobject& oct_qobj, octave::interpreter& interp, @@ -153,4 +152,4 @@ emit gh_callback_event (m_handle, "callback"); } -}; +OCTAVE_END_NAMESPACE(octave);
--- a/libgui/graphics/ButtonControl.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/ButtonControl.h Tue Dec 06 14:37:51 2022 -0500 @@ -30,8 +30,8 @@ class QAbstractButton; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -55,6 +55,6 @@ bool m_blockCallback; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/ButtonGroup.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/ButtonGroup.cc Tue Dec 06 14:37:51 2022 -0500 @@ -51,8 +51,7 @@ #include "interpreter.h" #include "oct-map.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) static int frameStyleFromProperties (const uibuttongroup::properties& pp) @@ -463,7 +462,6 @@ m_hiddenbutton->setChecked (true); } - void ButtonGroup::addButton (QAbstractButton *btn) { @@ -530,4 +528,4 @@ } } -}; +OCTAVE_END_NAMESPACE(octave);
--- a/libgui/graphics/ButtonGroup.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/ButtonGroup.h Tue Dec 06 14:37:51 2022 -0500 @@ -34,8 +34,8 @@ class QLabel; class QRadioButton; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -82,6 +82,6 @@ bool m_blockUpdates; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/Canvas.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/Canvas.cc Tue Dec 06 14:37:51 2022 -0500 @@ -51,8 +51,7 @@ #include "interpreter.h" #include "oct-opengl.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) void Canvas::redraw (bool sync) @@ -1094,4 +1093,4 @@ return new GLCanvas (oct_qobj, interp, handle, parent); } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/Canvas.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/Canvas.h Tue Dec 06 14:37:51 2022 -0500 @@ -41,8 +41,8 @@ class octave_value_list; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -167,6 +167,6 @@ bool m_rectMode; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/CheckBoxControl.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/CheckBoxControl.cc Tue Dec 06 14:37:51 2022 -0500 @@ -34,8 +34,7 @@ #include "octave-qobject.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) CheckBoxControl * CheckBoxControl::create (octave::base_qobject& oct_qobj, @@ -94,4 +93,5 @@ break; } } -}; + +OCTAVE_END_NAMESPACE(octave);
--- a/libgui/graphics/CheckBoxControl.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/CheckBoxControl.h Tue Dec 06 14:37:51 2022 -0500 @@ -30,8 +30,8 @@ class QCheckBox; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -51,6 +51,6 @@ void update (int pId); }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/Container.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/Container.cc Tue Dec 06 14:37:51 2022 -0500 @@ -38,8 +38,7 @@ #include "graphics.h" #include "interpreter.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) Container::Container (QWidget *xparent, octave::base_qobject& oct_qobj, octave::interpreter& interp) @@ -185,4 +184,5 @@ } } } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/Container.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/Container.h Tue Dec 06 14:37:51 2022 -0500 @@ -33,13 +33,12 @@ #include "event-manager.h" #include "graphics.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; } -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) DECLARE_GENERICEVENTNOTIFY_SENDER(ContainerBase, QWidget); @@ -86,6 +85,6 @@ Canvas *m_canvas; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/ContextMenu.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/ContextMenu.cc Tue Dec 06 14:37:51 2022 -0500 @@ -37,8 +37,7 @@ #include "interpreter.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) ContextMenu * ContextMenu::create (octave::base_qobject& oct_qobj, @@ -148,4 +147,4 @@ } } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/ContextMenu.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/ContextMenu.h Tue Dec 06 14:37:51 2022 -0500 @@ -33,8 +33,8 @@ class QMenu; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -66,6 +66,6 @@ void aboutToHide (void); }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/EditControl.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/EditControl.cc Tue Dec 06 14:37:51 2022 -0500 @@ -36,8 +36,7 @@ #include "octave-qobject.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) EditControl * EditControl::create (octave::base_qobject& oct_qobj, @@ -311,4 +310,4 @@ } } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/EditControl.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/EditControl.h Tue Dec 06 14:37:51 2022 -0500 @@ -31,8 +31,8 @@ class QLineEdit; class QWidget; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -75,6 +75,6 @@ bool m_textChanged; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/Figure.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/Figure.cc Tue Dec 06 14:37:51 2022 -0500 @@ -65,8 +65,7 @@ #include "builtin-defun-decls.h" #include "interpreter.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) DECLARE_GENERICEVENTNOTIFY_SENDER(MenuBar, QMenuBar); @@ -145,7 +144,6 @@ m_menuBar->addReceiver (this); m_menuBar->setStyleSheet (m_menuBar->styleSheet () + global_menubar_style); - // Status bar m_statusBar = win->statusBar (); m_statusBar->setVisible (false); @@ -905,4 +903,4 @@ w->setMouseTracking (true); } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/Figure.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/Figure.h Tue Dec 06 14:37:51 2022 -0500 @@ -37,8 +37,8 @@ class QToolBar; class QScreen; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -142,6 +142,6 @@ bool m_resizable; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/FigureWindow.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/FigureWindow.cc Tue Dec 06 14:37:51 2022 -0500 @@ -32,8 +32,7 @@ #include "FigureWindow.h" #include "gui-preferences-global.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) FigureWindow::FigureWindow (QWidget *xparent) : FigureWindowBase (xparent) @@ -58,4 +57,4 @@ emit figureWindowShown(); } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/FigureWindow.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/FigureWindow.h Tue Dec 06 14:37:51 2022 -0500 @@ -30,8 +30,7 @@ #include "GenericEventNotify.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) DECLARE_GENERICEVENTNOTIFY_SENDER(FigureWindowBase, QMainWindow); @@ -53,6 +52,6 @@ }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/GLCanvas.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/GLCanvas.cc Tue Dec 06 14:37:51 2022 -0500 @@ -35,8 +35,8 @@ #include "graphics.h" #include "interpreter.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + #if defined (HAVE_QOPENGLWIDGET) # define OCTAVE_QT_OPENGL_WIDGET_FORMAT_ARGS #else @@ -320,4 +320,5 @@ { doneCurrent (); } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/GLCanvas.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/GLCanvas.h Tue Dec 06 14:37:51 2022 -0500 @@ -49,13 +49,13 @@ #include "gl-render.h" #include "qopengl-functions.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; } -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class GLCanvas : public OCTAVE_QT_OPENGL_WIDGET, public Canvas { public: @@ -100,6 +100,6 @@ # endif }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/GenericEventNotify.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/GenericEventNotify.h Tue Dec 06 14:37:51 2022 -0500 @@ -32,8 +32,7 @@ class QObject; class QWidget; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) class GenericEventNotifyReceiver; @@ -86,6 +85,8 @@ r->eventNotifyAfter (obj, evt); } +OCTAVE_END_NAMESPACE(octave) + #define DECLARE_GENERICEVENTNOTIFY_SENDER(T,B) \ class T : public B, public GenericEventNotifySender \ { \ @@ -103,6 +104,4 @@ } \ } -}; - #endif
--- a/libgui/graphics/KeyMap.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/KeyMap.cc Tue Dec 06 14:37:51 2022 -0500 @@ -32,8 +32,8 @@ #include "KeyMap.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + namespace KeyMap { QMap<int, std::string> makeKeyMapper (void) @@ -257,4 +257,5 @@ return keyMapper.value (key, "<unknown key>"); } } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/KeyMap.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/KeyMap.h Tue Dec 06 14:37:51 2022 -0500 @@ -28,14 +28,13 @@ #include <string> -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) namespace KeyMap { std::string qKeyToKeyString (int key); } -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/ListBoxControl.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/ListBoxControl.cc Tue Dec 06 14:37:51 2022 -0500 @@ -37,8 +37,7 @@ #include "octave-qobject.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) static void updateSelection (QListWidget *list, const Matrix& value) @@ -287,4 +286,5 @@ return BaseControl::eventFilter (watched, e) || override_return; } } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/ListBoxControl.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/ListBoxControl.h Tue Dec 06 14:37:51 2022 -0500 @@ -32,8 +32,8 @@ class QListWidgetItem; class QModelIndex; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -66,6 +66,6 @@ bool m_selectionChanged; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/Logger.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/Logger.cc Tue Dec 06 14:37:51 2022 -0500 @@ -35,8 +35,7 @@ #include "Logger.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) Logger *Logger::s_instance = nullptr; QMutex *Logger::s_mutex = nullptr; @@ -87,4 +86,4 @@ } } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/Logger.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/Logger.h Tue Dec 06 14:37:51 2022 -0500 @@ -30,8 +30,7 @@ class QMutex; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) class Logger { @@ -53,6 +52,6 @@ void debugV (const char *fmt, va_list arg); }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/Menu.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/Menu.cc Tue Dec 06 14:37:51 2022 -0500 @@ -38,8 +38,7 @@ #include "octave-qobject.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) static QKeySequence accelSequence (const uimenu::properties& up) @@ -337,4 +336,4 @@ } } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/Menu.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/Menu.h Tue Dec 06 14:37:51 2022 -0500 @@ -33,8 +33,8 @@ class QMenu; class QWidget; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -70,6 +70,6 @@ QAction *m_separator; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/MenuContainer.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/MenuContainer.h Tue Dec 06 14:37:51 2022 -0500 @@ -28,8 +28,7 @@ class QWidget; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) class MenuContainer { @@ -37,6 +36,6 @@ virtual QWidget * menu (void) = 0; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/Object.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/Object.cc Tue Dec 06 14:37:51 2022 -0500 @@ -38,8 +38,7 @@ #include "graphics.h" #include "interpreter.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) Object::Object (octave::base_qobject& oct_qobj, octave::interpreter& interp, const graphics_object& go, QObject *obj) @@ -283,4 +282,4 @@ bool, bool))); } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/Object.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/Object.h Tue Dec 06 14:37:51 2022 -0500 @@ -35,8 +35,8 @@ class QString; class QWidget; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -155,6 +155,6 @@ QObject *m_qobject; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/ObjectProxy.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/ObjectProxy.cc Tue Dec 06 14:37:51 2022 -0500 @@ -37,8 +37,7 @@ #include "oct-mutex.h" #include "utils.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) ObjectProxy::ObjectProxy (Object *obj) : QObject (), m_object (nullptr) @@ -159,4 +158,4 @@ return retval; } -}; +OCTAVE_END_NAMESPACE(octave);
--- a/libgui/graphics/ObjectProxy.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/ObjectProxy.h Tue Dec 06 14:37:51 2022 -0500 @@ -32,8 +32,7 @@ class QString; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) class Object; @@ -66,6 +65,6 @@ Object *m_object; }; -}; +OCTAVE_END_NAMESPACE(octave); #endif
--- a/libgui/graphics/Panel.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/Panel.cc Tue Dec 06 14:37:51 2022 -0500 @@ -44,8 +44,7 @@ #include "graphics.h" #include "interpreter.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) static int frameStyleFromProperties (const uipanel::properties& pp) @@ -427,4 +426,4 @@ Object::do_connections (receiver, m_container->canvas (m_handle)); } -}; +OCTAVE_END_NAMESPACE(octave);
--- a/libgui/graphics/Panel.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/Panel.h Tue Dec 06 14:37:51 2022 -0500 @@ -31,8 +31,8 @@ class QFrame; class QLabel; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -70,6 +70,6 @@ Matrix m_previous_bbox; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/PopupMenuControl.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/PopupMenuControl.cc Tue Dec 06 14:37:51 2022 -0500 @@ -36,8 +36,7 @@ #include "octave-qobject.h" #include "octave-qtutils.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) PopupMenuControl * PopupMenuControl::create (octave::base_qobject& oct_qobj, @@ -151,4 +150,4 @@ } } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/PopupMenuControl.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/PopupMenuControl.h Tue Dec 06 14:37:51 2022 -0500 @@ -30,8 +30,8 @@ class QComboBox; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -59,6 +59,6 @@ bool m_blockUpdate; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/PushButtonControl.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/PushButtonControl.cc Tue Dec 06 14:37:51 2022 -0500 @@ -36,8 +36,7 @@ #include "octave-qobject.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) PushButtonControl * PushButtonControl::create (octave::base_qobject& oct_qobj, @@ -102,4 +101,4 @@ } } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/PushButtonControl.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/PushButtonControl.h Tue Dec 06 14:37:51 2022 -0500 @@ -30,8 +30,8 @@ class QPushButton; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -51,6 +51,6 @@ void update (int pId); }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/PushTool.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/PushTool.cc Tue Dec 06 14:37:51 2022 -0500 @@ -33,8 +33,7 @@ #include "octave-qobject.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) PushTool * PushTool::create (octave::base_qobject& oct_qobj, @@ -82,4 +81,4 @@ emit gh_callback_event (m_handle, "clickedcallback"); } -}; +OCTAVE_END_NAMESPACE(octave);
--- a/libgui/graphics/PushTool.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/PushTool.h Tue Dec 06 14:37:51 2022 -0500 @@ -28,8 +28,8 @@ #include "ToolBarButton.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -53,6 +53,6 @@ void clicked (void); }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/QtHandlesUtils.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/QtHandlesUtils.cc Tue Dec 06 14:37:51 2022 -0500 @@ -44,8 +44,7 @@ #include "graphics.h" #include "ov.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) namespace Utils { @@ -419,4 +418,4 @@ } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/QtHandlesUtils.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/QtHandlesUtils.h Tue Dec 06 14:37:51 2022 -0500 @@ -40,8 +40,7 @@ class QMouseEvent; class QWheelEvent; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) namespace Utils { @@ -80,6 +79,6 @@ octave_scalar_map makeScrollEventStruct (QWheelEvent *event); } -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/RadioButtonControl.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/RadioButtonControl.cc Tue Dec 06 14:37:51 2022 -0500 @@ -36,8 +36,7 @@ #include "octave-qobject.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) RadioButtonControl * RadioButtonControl::create (octave::base_qobject& oct_qobj, @@ -104,4 +103,4 @@ } } -}; +OCTAVE_END_NAMESPACE(octave);
--- a/libgui/graphics/RadioButtonControl.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/RadioButtonControl.h Tue Dec 06 14:37:51 2022 -0500 @@ -30,8 +30,8 @@ class QRadioButton; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -51,6 +51,6 @@ void update (int pId); }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/SliderControl.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/SliderControl.cc Tue Dec 06 14:37:51 2022 -0500 @@ -40,8 +40,7 @@ #define RANGE_INT_MAX 1000000 -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) SliderControl * SliderControl::create (octave::base_qobject& oct_qobj, @@ -171,4 +170,4 @@ } } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/SliderControl.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/SliderControl.h Tue Dec 06 14:37:51 2022 -0500 @@ -30,8 +30,8 @@ class QAbstractSlider; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -58,6 +58,6 @@ bool m_blockUpdates; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/Table.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/Table.cc Tue Dec 06 14:37:51 2022 -0500 @@ -57,8 +57,7 @@ #include "oct-string.h" #include "oct-strstrm.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) static const int AUTO_WIDTH = 75; @@ -483,7 +482,6 @@ updateExtent (); m_tableWidget->installEventFilter (this); - connect (m_tableWidget, &QTableWidget::itemChanged, this, &Table::itemChanged); connect (m_tableWidget, &QTableWidget::cellClicked, @@ -802,7 +800,6 @@ m_blockUpdates = false; } - void Table::itemChanged (QTableWidgetItem *item) { @@ -1731,4 +1728,5 @@ } #undef AUTO_HEIGHT -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/Table.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/Table.h Tue Dec 06 14:37:51 2022 -0500 @@ -32,8 +32,8 @@ class QTableWidget; class QTableWidgetItem; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -94,6 +94,6 @@ }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/TextControl.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/TextControl.cc Tue Dec 06 14:37:51 2022 -0500 @@ -35,8 +35,7 @@ #include "octave-qobject.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) TextControl * TextControl::create (octave::base_qobject& oct_qobj, @@ -97,4 +96,4 @@ } } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/TextControl.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/TextControl.h Tue Dec 06 14:37:51 2022 -0500 @@ -30,8 +30,8 @@ class QLabel; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -50,6 +50,6 @@ void update (int pId); }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/TextEdit.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/TextEdit.cc Tue Dec 06 14:37:51 2022 -0500 @@ -31,8 +31,7 @@ #include "TextEdit.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) void TextEdit::focusOutEvent (QFocusEvent *xevent) @@ -53,4 +52,4 @@ emit returnPressed (); } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/TextEdit.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/TextEdit.h Tue Dec 06 14:37:51 2022 -0500 @@ -28,8 +28,7 @@ #include <QTextEdit> -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) class TextEdit : public QTextEdit { @@ -48,6 +47,6 @@ void keyPressEvent (QKeyEvent *event); }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/ToggleButtonControl.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/ToggleButtonControl.cc Tue Dec 06 14:37:51 2022 -0500 @@ -36,8 +36,7 @@ #include "octave-qobject.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) ToggleButtonControl * ToggleButtonControl::create (octave::base_qobject& oct_qobj, @@ -108,4 +107,4 @@ } } -}; +OCTAVE_END_NAMESPACE(octave);
--- a/libgui/graphics/ToggleButtonControl.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/ToggleButtonControl.h Tue Dec 06 14:37:51 2022 -0500 @@ -30,8 +30,8 @@ class QPushButton; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -51,6 +51,6 @@ void update (int pId); }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/ToggleTool.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/ToggleTool.cc Tue Dec 06 14:37:51 2022 -0500 @@ -33,8 +33,7 @@ #include "octave-qobject.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) ToggleTool * ToggleTool::create (octave::base_qobject& oct_qobj, @@ -96,4 +95,4 @@ emit gh_callback_event (m_handle, "clickedcallback"); } -}; +OCTAVE_END_NAMESPACE(octave);
--- a/libgui/graphics/ToggleTool.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/ToggleTool.h Tue Dec 06 14:37:51 2022 -0500 @@ -28,8 +28,8 @@ #include "ToolBarButton.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -54,6 +54,6 @@ void triggered (bool checked); }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/ToolBar.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/ToolBar.cc Tue Dec 06 14:37:51 2022 -0500 @@ -44,8 +44,8 @@ #include "gui-preferences-global.h" #include "octave-qobject.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + static QIcon makeEmptyIcon (void) { QPixmap pix (16, 16); @@ -97,7 +97,6 @@ bar->setVisible (tp.is_visible ()); bar->setStyleSheet (bar->styleSheet () + global_toolbar_style); - m_empty = addEmptyAction (bar); m_figure = @@ -187,4 +186,4 @@ } } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/ToolBar.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/ToolBar.h Tue Dec 06 14:37:51 2022 -0500 @@ -31,8 +31,8 @@ class QAction; class QToolBar; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -67,6 +67,6 @@ Figure *m_figure; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/ToolBarButton.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/ToolBarButton.cc Tue Dec 06 14:37:51 2022 -0500 @@ -37,8 +37,8 @@ #include "octave-qobject.h" #include "gui-preferences-global.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + template <typename T> ToolBarButton<T>::ToolBarButton (octave::base_qobject& oct_qobj, octave::interpreter& interp, @@ -160,4 +160,4 @@ return QIcon (global_icon_paths.at (ICON_THEME_OCTAVE) + QString::fromStdString (name) + ".png"); } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/ToolBarButton.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/ToolBarButton.h Tue Dec 06 14:37:51 2022 -0500 @@ -31,8 +31,8 @@ class QAction; class QIcon; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class interpreter; @@ -57,6 +57,6 @@ QIcon get_icon (const std::string& name); }; -}; +OCTAVE_END_NAMESPACE(octave); #endif
--- a/libgui/graphics/annotation-dialog.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/annotation-dialog.h Tue Dec 06 14:37:51 2022 -0500 @@ -32,8 +32,8 @@ #include "ovl.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; }
--- a/libgui/graphics/gl-select.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/gl-select.cc Tue Dec 06 14:37:51 2022 -0500 @@ -29,8 +29,7 @@ #include "gl-select.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) void opengl_selector::apply_pick_matrix (void) @@ -249,4 +248,4 @@ m_glfcns.glEnd (); } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/graphics/gl-select.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/gl-select.h Tue Dec 06 14:37:51 2022 -0500 @@ -32,8 +32,7 @@ #include "gl-render.h" #include "oct-opengl.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) enum select_flags { @@ -85,6 +84,6 @@ std::map<GLuint, graphics_object> object_map; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/qopengl-functions.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/qopengl-functions.h Tue Dec 06 14:37:51 2022 -0500 @@ -32,8 +32,8 @@ # include <QOpenGLFunctions_1_1> #endif -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // If we don't have QOPENGLFUNCTIONS_1_1, then we will default to // calling OpenGL functions directly through the base // opengl_functions class. @@ -452,6 +452,7 @@ #endif }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/graphics/qt-graphics-toolkit.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/qt-graphics-toolkit.cc Tue Dec 06 14:37:51 2022 -0500 @@ -73,8 +73,7 @@ # define OCTAVE_PTR_SCALAR uint64_scalar_value //#endif -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) static std::string toolkitObjectProperty (const graphics_object& go) @@ -510,4 +509,5 @@ gh_mgr.post_set (h, nm, value, notify_toolkit, redraw_figure); } -}; + +OCTAVE_END_NAMESPACE(octave);
--- a/libgui/graphics/qt-graphics-toolkit.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/graphics/qt-graphics-toolkit.h Tue Dec 06 14:37:51 2022 -0500 @@ -31,8 +31,8 @@ #include "event-manager.h" #include "graphics.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class interpreter; class base_qobject; @@ -122,6 +122,7 @@ octave::base_qobject& m_octave_qobj; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/color-picker.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/color-picker.cc Tue Dec 06 14:37:51 2022 -0500 @@ -32,8 +32,8 @@ #include "color-picker.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Constructor with initial color as parameter color_picker::color_picker (QColor old_color, QWidget *p) : QPushButton (p) @@ -80,4 +80,5 @@ repaint (); } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/color-picker.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/color-picker.h Tue Dec 06 14:37:51 2022 -0500 @@ -32,8 +32,8 @@ #include <QColorDialog> #include <QPushButton> -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class color_picker : public QPushButton { Q_OBJECT @@ -56,6 +56,7 @@ QColor m_color; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/command-widget.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/command-widget.cc Tue Dec 06 14:37:51 2022 -0500 @@ -48,8 +48,8 @@ #include "input.h" #include "interpreter.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + command_widget::command_widget (base_qobject& oct_qobj, QWidget *p) : QWidget (p), m_incomplete_parse (false), m_prompt (QString ()), @@ -166,7 +166,6 @@ .arg (fgc.name ()).arg (bgc.name ())); } - // The console itself using QScintilla. // This implementation is partly based on the basic concept of // "qpconsole" as proposed by user "DerManu" in the Qt-forum thread @@ -301,6 +300,6 @@ } } -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/command-widget.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/command-widget.h Tue Dec 06 14:37:51 2022 -0500 @@ -35,8 +35,8 @@ class QsciScintilla; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class command_widget; @@ -121,6 +121,7 @@ QString m_prompt; console *m_console; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/community-news.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/community-news.cc Tue Dec 06 14:37:51 2022 -0500 @@ -38,8 +38,8 @@ #include "news-reader.h" #include "octave-qobject.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + community_news::community_news (base_qobject& oct_qobj, int serial) : QWidget (nullptr), m_browser (nullptr) { @@ -136,4 +136,4 @@ activateWindow (); } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/community-news.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/community-news.h Tue Dec 06 14:37:51 2022 -0500 @@ -31,8 +31,8 @@ class QTextBrowser; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class community_news : public QWidget @@ -63,6 +63,7 @@ QTextBrowser *m_browser; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/dialog.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/dialog.cc Tue Dec 06 14:37:51 2022 -0500 @@ -45,8 +45,8 @@ #include "octave-qobject.h" #include "gui-preferences-global.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + QUIWidgetCreator::QUIWidgetCreator (base_qobject& oct_qobj) : QObject (), m_octave_qobj (oct_qobj), m_dialog_result (-1), m_dialog_button (), m_string_list (), m_list_index (), m_path_name () @@ -707,4 +707,5 @@ // Send the selected info. emit finish_input (string_result, path, idx); } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/dialog.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/dialog.h Tue Dec 06 14:37:51 2022 -0500 @@ -42,8 +42,8 @@ // Defined for purposes of sending QList<float> as part of signal. typedef QList<float> QFloatList; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class QUIWidgetCreator : public QObject @@ -277,6 +277,7 @@ void rejectSelection (void); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/documentation-bookmarks.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/documentation-bookmarks.cc Tue Dec 06 14:37:51 2022 -0500 @@ -47,8 +47,8 @@ #include "file-ops.h" #include "oct-env.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + documentation_bookmarks::documentation_bookmarks ( documentation *doc, documentation_browser *browser, base_qobject& oct_qobj, QWidget *p) @@ -542,4 +542,4 @@ } } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/documentation-bookmarks.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/documentation-bookmarks.h Tue Dec 06 14:37:51 2022 -0500 @@ -34,9 +34,8 @@ #include "documentation.h" #include "octave-qobject.h" +OCTAVE_BEGIN_NAMESPACE(octave) -namespace octave -{ class base_qobject; class documentation; @@ -120,6 +119,6 @@ QFile m_xbel_file; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/documentation-dock-widget.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/documentation-dock-widget.cc Tue Dec 06 14:37:51 2022 -0500 @@ -31,8 +31,8 @@ #include "help.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + documentation_dock_widget::documentation_dock_widget (QWidget *p, base_qobject& oct_qobj) : octave_dock_widget ("DocumentationDockWidget", p, oct_qobj), @@ -93,4 +93,5 @@ { m_docs->unregisterDoc (name); } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/documentation-dock-widget.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/documentation-dock-widget.h Tue Dec 06 14:37:51 2022 -0500 @@ -29,8 +29,8 @@ #include "documentation.h" #include "octave-dock-widget.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class documentation_dock_widget : public octave_dock_widget @@ -60,6 +60,7 @@ documentation *m_docs; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/documentation.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/documentation.cc Tue Dec 06 14:37:51 2022 -0500 @@ -63,8 +63,8 @@ #include "file-ops.h" #include "oct-env.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // The documentation splitter, which is the main widget // of the doc dock widget documentation::documentation (QWidget *p, base_qobject& oct_qobj) @@ -1107,4 +1107,4 @@ QTextEdit::wheelEvent (we); } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/documentation.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/documentation.h Tue Dec 06 14:37:51 2022 -0500 @@ -39,8 +39,8 @@ #include "gui-settings.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class documentation; class documentation_bookmarks; @@ -93,7 +93,6 @@ }; }; - //! The documentation main class derived from QSplitter class documentation : public QSplitter @@ -204,6 +203,6 @@ QAction *m_action_zoom_original; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/dw-main-window.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/dw-main-window.cc Tue Dec 06 14:37:51 2022 -0500 @@ -40,8 +40,7 @@ #include "shortcut-manager.h" #include "gui-preferences-sc.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) dw_main_window::dw_main_window (base_qobject& oct_qobj, QWidget *p) : QMainWindow (p), m_octave_qobj (oct_qobj) @@ -79,7 +78,6 @@ notice_settings (rmgr.get_settings ()); } - // Re-implementing the popup menu of the main window QMenu *dw_main_window::createPopupMenu () { @@ -102,7 +100,6 @@ return menu; } - // Adding an action to the main window QAction * dw_main_window::add_action (QMenu *menu, const QIcon& icon, const QString& text, const char *member, @@ -142,7 +139,6 @@ scmgr.set_shortcut (m_switch_right_action, sc_edit_tabs_switch_right_tab); } - // Slots for handling actions // Close current widget @@ -218,7 +214,6 @@ m_dw_list.at (next)->setFocus (); } - // Reimplemented Event bool dw_main_window::event (QEvent *ev) { @@ -250,5 +245,5 @@ return QMainWindow::event (ev); } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/dw-main-window.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/dw-main-window.h Tue Dec 06 14:37:51 2022 -0500 @@ -30,8 +30,8 @@ #include "gui-settings.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class dw_main_window : public QMainWindow @@ -90,6 +90,6 @@ QList<QAction *> m_actions_list; }; -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/external-editor-interface.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/external-editor-interface.cc Tue Dec 06 14:37:51 2022 -0500 @@ -35,8 +35,8 @@ #include "gui-preferences-global.h" #include "octave-qobject.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + external_editor_interface::external_editor_interface (QWidget *p, base_qobject& oct_qobj) : QWidget (p), m_octave_qobj (oct_qobj) @@ -79,7 +79,6 @@ return started_ok; } - // Slots for the several signals for invoking the editor void external_editor_interface::request_new_file (const QString&) @@ -128,4 +127,5 @@ return editor; } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/external-editor-interface.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/external-editor-interface.h Tue Dec 06 14:37:51 2022 -0500 @@ -29,8 +29,8 @@ #include <QString> #include <QWidget> -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class external_editor_interface : public QWidget @@ -67,6 +67,7 @@ base_qobject& m_octave_qobj; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/files-dock-widget.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/files-dock-widget.cc Tue Dec 06 14:37:51 2022 -0500 @@ -55,8 +55,8 @@ #include "oct-env.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class FileTreeViewer : public QTreeView { public: @@ -107,7 +107,6 @@ files_dock_widget *fdw = static_cast<files_dock_widget*>(parent()); - fdw->file_remove_signal(parent_dir.filePath(old_name), parent_dir.filePath(new_name)); if (!parent_dir.rename (old_name, new_name)) @@ -1176,4 +1175,5 @@ } } } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/files-dock-widget.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/files-dock-widget.h Tue Dec 06 14:37:51 2022 -0500 @@ -44,8 +44,8 @@ #include "octave-dock-widget.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; //! Dock widget to display files in the current directory. @@ -234,6 +234,7 @@ QList <QVariant> m_columns_shown_defs; QSignalMapper *m_sig_mapper; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/find-files-dialog.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/find-files-dialog.cc Tue Dec 06 14:37:51 2022 -0500 @@ -51,8 +51,8 @@ #include "gui-preferences-ff.h" #include "octave-qobject.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + find_files_dialog::find_files_dialog (QWidget *p, base_qobject& oct_qobj) : QDialog (p), m_octave_qobj (oct_qobj) { @@ -411,4 +411,5 @@ return match; } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/find-files-dialog.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/find-files-dialog.h Tue Dec 06 14:37:51 2022 -0500 @@ -37,8 +37,8 @@ class QTableView; class QTimer; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class find_files_dialog : public QDialog @@ -94,6 +94,7 @@ QDirIterator *m_dir_iterator; QStatusBar *m_status_bar; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/find-files-model.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/find-files-model.cc Tue Dec 06 14:37:51 2022 -0500 @@ -34,8 +34,8 @@ #include "find-files-model.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class find_file_less_than { public: @@ -212,4 +212,5 @@ return p.isValid () ? icon_provider.icon (m_files[p.row ()]) : QIcon (); } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/find-files-model.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/find-files-model.h Tue Dec 06 14:37:51 2022 -0500 @@ -31,8 +31,8 @@ #include <QList> #include <QStringList> -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class find_files_model : public QAbstractListModel { Q_OBJECT @@ -68,6 +68,7 @@ QStringList m_columnNames; int m_sortorder; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/graphics-init.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/graphics-init.cc Tue Dec 06 14:37:51 2022 -0500 @@ -40,8 +40,8 @@ #include "gtk-manager.h" #include "interpreter.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void graphics_init (interpreter& interp, base_qobject& oct_qobj) { #if defined (HAVE_QT_GRAPHICS) @@ -75,4 +75,5 @@ #endif } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/graphics-init.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/graphics-init.h Tue Dec 06 14:37:51 2022 -0500 @@ -30,8 +30,8 @@ #include "qt-interpreter-events.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class interpreter; class base_qobject;
--- a/libgui/src/gui-settings.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/gui-settings.cc Tue Dec 06 14:37:51 2022 -0500 @@ -32,8 +32,7 @@ #include "gui-settings.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) QColor gui_settings::get_color_value (const QVariant& def, int mode) const {
--- a/libgui/src/gui-settings.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/gui-settings.h Tue Dec 06 14:37:51 2022 -0500 @@ -26,12 +26,14 @@ #if ! defined (octave_gui_settings_h) #define octave_gui_settings_h 1 +#include "octave-config.h" + #include <QSettings> #include "gui-preferences.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class gui_settings : public QSettings { Q_OBJECT @@ -121,7 +123,7 @@ }; -} +OCTAVE_END_NAMESPACE(octave) // Some constants used in the preferences of several widgets and therefore // defined globally here
--- a/libgui/src/gui-utils.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/gui-utils.cc Tue Dec 06 14:37:51 2022 -0500 @@ -33,8 +33,8 @@ #include "gui-utils.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + OCTGUI_API QColor interpolate_color (const QColor& col1, const QColor& col2, double fs, double fv) @@ -56,7 +56,6 @@ height = geom.height (); } - OCTGUI_API void adjust_to_screen (QRect& actual_geometry, const QRect& default_geometry) { @@ -122,4 +121,4 @@ QRect (QPoint (isx1,isy1), QPoint (isx2,isy2))); } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/gui-utils.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/gui-utils.h Tue Dec 06 14:37:51 2022 -0500 @@ -31,8 +31,7 @@ #include <QColor> #include <QRect> -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) /*! Deterimine an alternative color to @p col1 with less contrast @@ -56,7 +55,6 @@ interpolate_color (const QColor& col1, const QColor& col2, double fs, double fv); - /*! Get the screen geometry of the actual screen. @@ -67,7 +65,6 @@ extern OCTGUI_API void get_screen_geometry (int& width, int& height); - /*! Adjust geometry to be completely on a screen @@ -78,6 +75,7 @@ */ extern OCTGUI_API void adjust_to_screen (QRect& actual_geometry, const QRect& default_geometry); -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/history-dock-widget.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/history-dock-widget.cc Tue Dec 06 14:37:51 2022 -0500 @@ -45,8 +45,8 @@ #include "error.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + history_dock_widget::history_dock_widget (QWidget *p, base_qobject& oct_qobj) : octave_dock_widget ("HistoryDockWidget", p, oct_qobj) { @@ -372,4 +372,4 @@ m_history_list_view->setFont (font); } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/history-dock-widget.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/history-dock-widget.h Tue Dec 06 14:37:51 2022 -0500 @@ -35,8 +35,8 @@ #include "octave-dock-widget.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class history_dock_widget : public octave_dock_widget @@ -106,6 +106,7 @@ enum { MaxFilterHistory = 10 }; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/interpreter-qobject.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/interpreter-qobject.cc Tue Dec 06 14:37:51 2022 -0500 @@ -36,8 +36,8 @@ #include "input.h" #include "interpreter.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + interpreter_qobject::interpreter_qobject (base_qobject& oct_qobj) : QObject (), m_octave_qobj (oct_qobj), m_interpreter (nullptr) { } @@ -199,4 +199,5 @@ { return m_octave_qobj.qt_link (); } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/interpreter-qobject.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/interpreter-qobject.h Tue Dec 06 14:37:51 2022 -0500 @@ -30,8 +30,8 @@ #include "qt-interpreter-events.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class interpreter; class base_qobject; @@ -96,6 +96,7 @@ interpreter *m_interpreter; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/led-indicator.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/led-indicator.cc Tue Dec 06 14:37:51 2022 -0500 @@ -32,8 +32,7 @@ #include "gui-utils.h" #include "led-indicator.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) led_indicator::led_indicator (led_state initial_state, QWidget *p) : QLabel (p) @@ -77,4 +76,4 @@ return style; } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/led-indicator.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/led-indicator.h Tue Dec 06 14:37:51 2022 -0500 @@ -28,8 +28,7 @@ #include <QLabel> -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) class led_indicator: public QLabel { @@ -56,6 +55,7 @@ QString style_sheet (const QColor& col); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/m-editor/file-editor-interface.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/m-editor/file-editor-interface.h Tue Dec 06 14:37:51 2022 -0500 @@ -33,8 +33,8 @@ #include "gui-settings.h" #include "octave-dock-widget.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class file_editor_interface : public octave_dock_widget @@ -101,6 +101,7 @@ int index = -1, const QString& bookmarks = QString ()) = 0; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/m-editor/file-editor-tab.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/m-editor/file-editor-tab.cc Tue Dec 06 14:37:51 2022 -0500 @@ -95,8 +95,8 @@ #include "utils.h" #include "version.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + //! A file_editor_tab object consists of a text area and three left margins. //! The first holds breakpoints, bookmarks, and the debug program counter. //! The second holds line numbers. The third holds "fold" marks, to hide @@ -597,7 +597,6 @@ } } - void file_editor_tab::update_lexer (void) { // Create a new lexer @@ -703,7 +702,6 @@ } } - // Update settings, which are lexer related and have to be updated // when // a) the lexer changes, @@ -842,7 +840,6 @@ api_entries.append (QString::fromStdString (bfl[i])); } - if (octave_functions) { load_path& lp = interp.get_load_path (); @@ -1140,7 +1137,6 @@ m_edit_area->setCursorPosition (prevline, 0); } - QString file_editor_tab::get_all_bookmarks () { QString bmlist; @@ -2861,7 +2857,6 @@ } - void file_editor_tab::auto_margin_width (void) { m_edit_area->setMarginWidth (2, "1" + QString::number (m_edit_area->lines ())); @@ -3298,6 +3293,7 @@ return QString (); } -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/m-editor/file-editor-tab.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/m-editor/file-editor-tab.h Tue Dec 06 14:37:51 2022 -0500 @@ -43,8 +43,8 @@ class octave_value_list; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class file_editor; @@ -346,6 +346,7 @@ breakpoint_info m_breakpoint_info; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/m-editor/file-editor.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/m-editor/file-editor.cc Tue Dec 06 14:37:51 2022 -0500 @@ -63,8 +63,8 @@ #include "pt-eval.h" #include "utils.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Functions of the the reimplemented tab widget file_editor_tab_widget::file_editor_tab_widget (QWidget *p, file_editor *fe) @@ -96,7 +96,6 @@ return retval; } - // File editor file_editor::file_editor (QWidget *p, base_qobject& oct_qobj) @@ -2866,6 +2865,7 @@ return menu; } -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/m-editor/file-editor.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/m-editor/file-editor.h Tue Dec 06 14:37:51 2022 -0500 @@ -44,8 +44,8 @@ #include "find-dialog.h" #include "tab-bar.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class file_editor; @@ -497,6 +497,7 @@ // List of data on temporarily closed files for later reloading. QList<removed_file_data> m_tmp_closed_files; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/m-editor/find-dialog.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/m-editor/find-dialog.cc Tue Dec 06 14:37:51 2022 -0500 @@ -86,8 +86,8 @@ #include "resource-manager.h" #include "octave-qobject.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + find_dialog::find_dialog (base_qobject& oct_qobj, octave_dock_widget *ed, QWidget *p) : QDialog (p), m_octave_qobj (oct_qobj), m_editor (ed), @@ -668,5 +668,5 @@ } } -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/m-editor/find-dialog.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/m-editor/find-dialog.h Tue Dec 06 14:37:51 2022 -0500 @@ -77,8 +77,8 @@ class QLineEdit; class QPushButton; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class file_editor; @@ -175,6 +175,7 @@ const int m_mru_length = 10; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/m-editor/marker.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/m-editor/marker.cc Tue Dec 06 14:37:51 2022 -0500 @@ -31,8 +31,8 @@ #include "marker.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + marker::marker (QsciScintilla *area, int original_linenr, editor_markers type, int editor_linenr, const QString& condition) @@ -164,5 +164,6 @@ } } } -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/m-editor/marker.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/m-editor/marker.h Tue Dec 06 14:37:51 2022 -0500 @@ -39,8 +39,8 @@ // out of alignment. The marker handle can be used to retrieve the editor // line. -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class marker : public QObject { Q_OBJECT @@ -106,6 +106,7 @@ int m_mhandle; QString m_condition; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/m-editor/octave-qscintilla.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/m-editor/octave-qscintilla.cc Tue Dec 06 14:37:51 2022 -0500 @@ -71,8 +71,8 @@ // Used for testing the last word of an "if" etc. line, // or the first word of the following line. -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + static bool is_end (const QString& candidate, const QString& opening) { @@ -481,7 +481,6 @@ return QStringList ("%"); // should never happen } - // provide the style at a specific position int octave_qscintilla::get_style (int pos) { @@ -747,7 +746,6 @@ setIndentation (line, indent_column); - int bpos = begin_block_regexp.indexIn (line_text); if (bpos > -1) { @@ -1049,7 +1047,6 @@ }); } - // wrappers for dbstop related context menu items // FIXME: Why can't the data be sent as the argument to the function??? @@ -1365,6 +1362,6 @@ m_debug_mode = false; } -} +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/m-editor/octave-qscintilla.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/m-editor/octave-qscintilla.h Tue Dec 06 14:37:51 2022 -0500 @@ -36,8 +36,8 @@ #include "gui-settings.h" #include "qt-interpreter-events.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class octave_qscintilla : public QsciScintilla @@ -155,6 +155,7 @@ int m_selection_col; int m_indicator_id; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/m-editor/octave-txt-lexer.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/m-editor/octave-txt-lexer.cc Tue Dec 06 14:37:51 2022 -0500 @@ -33,8 +33,8 @@ #include "octave-txt-lexer.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + QString octave_txt_lexer::description (int style) const { if (style == 0) @@ -52,6 +52,7 @@ { return "text"; } -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/m-editor/octave-txt-lexer.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/m-editor/octave-txt-lexer.h Tue Dec 06 14:37:51 2022 -0500 @@ -29,8 +29,8 @@ #include <Qsci/qsciscintilla.h> #include <Qsci/qscilexer.h> -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class octave_txt_lexer : public QsciLexer { Q_OBJECT @@ -43,6 +43,7 @@ virtual QString description (int style) const; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/main-window.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/main-window.cc Tue Dec 06 14:37:51 2022 -0500 @@ -90,8 +90,8 @@ #include "syminfo.h" #include "version.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + main_window::main_window (base_qobject& oct_qobj) : QMainWindow (), m_octave_qobj (oct_qobj), m_status_bar (nullptr), @@ -2912,4 +2912,5 @@ focus_command_window (); } } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/main-window.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/main-window.h Tue Dec 06 14:37:51 2022 -0500 @@ -61,8 +61,8 @@ class octave_value; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class interpreter; class settings_dialog; @@ -440,6 +440,7 @@ QString m_file_encoding; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/news-reader.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/news-reader.cc Tue Dec 06 14:37:51 2022 -0500 @@ -39,8 +39,8 @@ #include "url-transfer.h" #include "version.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void news_reader::process (void) { QString html_text; @@ -151,4 +151,5 @@ emit finished (); } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/news-reader.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/news-reader.h Tue Dec 06 14:37:51 2022 -0500 @@ -29,8 +29,8 @@ #include <QObject> #include <QString> -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class news_reader : public QObject @@ -65,6 +65,7 @@ int m_serial; bool m_connect_to_web; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/octave-dock-widget.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/octave-dock-widget.cc Tue Dec 06 14:37:51 2022 -0500 @@ -47,8 +47,8 @@ #include "octave-dock-widget.h" #include "octave-qobject.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + label_dock_widget::label_dock_widget (QWidget *p, base_qobject& oct_qobj) : QDockWidget (p), m_octave_qobj (oct_qobj), m_default_float_button (nullptr), m_default_close_button (nullptr) @@ -136,7 +136,6 @@ setWindowTitle (title); } - static QString qdockwidget_css (const QString& close_icon, const QString& close_tooltip, const QString& float_icon, const QString& float_tooltip, @@ -517,7 +516,6 @@ else m_icon_color_active = ""; - int x, y, w, h; QGuiApplication::primaryScreen ()->availableGeometry ().getRect (&x, &y, &w, &h); QRect default_floating_size = QRect (x+16, y+32, w/3, h/2); @@ -856,4 +854,5 @@ rmgr.update_settings_key ("Dockwidgets/title_fg_color_active", dw_title_fg_color_active.key); } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/octave-dock-widget.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/octave-dock-widget.h Tue Dec 06 14:37:51 2022 -0500 @@ -34,8 +34,8 @@ #include "gui-settings.h" #include "qt-interpreter-events.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class main_window; @@ -183,6 +183,7 @@ QRect m_recent_dock_geom; bool m_waiting_for_mouse_button_release; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/octave-qobject.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/octave-qobject.cc Tue Dec 06 14:37:51 2022 -0500 @@ -72,7 +72,6 @@ #include "ovl.h" - // Bug #55940 (Disable App Nap on Mac) #if defined (Q_OS_MAC) static void disable_app_nap (void) @@ -130,8 +129,8 @@ } #endif -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Disable all Qt messages by default. static void @@ -337,7 +336,6 @@ // configuration not saved correctly if the main window is deleted // after the dock widgets? - // Calling close will cause settings to be saved. // If m_main_window exists, the widgets are closed by the main window @@ -1039,4 +1037,5 @@ if (remove_file) QFile::remove (file); } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/octave-qobject.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/octave-qobject.h Tue Dec 06 14:37:51 2022 -0500 @@ -38,8 +38,8 @@ #include "resource-manager.h" #include "shortcut-manager.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class community_news; class main_window; class qt_application; @@ -314,6 +314,7 @@ main_window *m_main_window; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/qt-application.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/qt-application.cc Tue Dec 06 14:37:51 2022 -0500 @@ -40,8 +40,8 @@ #include "octave.h" #include "sysdep.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + qt_application::qt_application (int argc, char **argv) : application (argc, argv) { @@ -72,4 +72,5 @@ return qt_interface.exec (); } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/qt-application.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/qt-application.h Tue Dec 06 14:37:51 2022 -0500 @@ -28,8 +28,8 @@ #include "octave.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Programming Note: This file must not include any Qt headers. Any // Qt header files required by the qt_application::execute function // must be included only in the corresponding .cc file. @@ -68,6 +68,7 @@ // If TRUE, the GUI should be started. bool m_gui_running = false; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/qt-interpreter-events.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/qt-interpreter-events.cc Tue Dec 06 14:37:51 2022 -0500 @@ -62,8 +62,8 @@ Q_DECLARE_METATYPE (octave::fcn_callback) Q_DECLARE_METATYPE (octave::meth_callback) -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + static QStringList make_qstring_list (const std::list<std::string>& lst) { @@ -749,4 +749,5 @@ return adjusted_value; } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/qt-interpreter-events.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/qt-interpreter-events.h Tue Dec 06 14:37:51 2022 -0500 @@ -45,8 +45,8 @@ class octave_value; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; // The functions in this class are not normally called directly, but @@ -325,6 +325,7 @@ QWaitCondition m_waitcondition; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/qt-utils.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/qt-utils.h Tue Dec 06 14:37:51 2022 -0500 @@ -31,8 +31,8 @@ #include <QFontMetrics> #include <QList> -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + template <typename T> inline QList<T> std_list_to_qt_list (const std::list<T>& lst) @@ -64,6 +64,7 @@ return fm.width (text, len); #endif } -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/release-notes.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/release-notes.cc Tue Dec 06 14:37:51 2022 -0500 @@ -45,8 +45,8 @@ #include "defaults.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + release_notes::release_notes (base_qobject& oct_qobj) : QWidget (nullptr), m_browser (nullptr) { @@ -88,7 +88,6 @@ news = (tr ("The release notes file '%1' cannot be read.") . arg (QString::fromStdString (news_file))); - m_browser = new QTextBrowser (this); m_browser->setText (news); @@ -120,4 +119,4 @@ activateWindow (); } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/release-notes.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/release-notes.h Tue Dec 06 14:37:51 2022 -0500 @@ -31,8 +31,8 @@ class QTextBrowser; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class release_notes : public QWidget @@ -54,6 +54,7 @@ QTextBrowser *m_browser; QString m_release_notes_icon; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/resource-manager.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/resource-manager.cc Tue Dec 06 14:37:51 2022 -0500 @@ -61,8 +61,8 @@ #include "error.h" #include "help.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + resource_manager::resource_manager (void) : m_settings_directory (), m_settings_file (), m_settings (nullptr), m_default_settings (nullptr), m_temporary_files (), m_icon_fallbacks () @@ -753,7 +753,6 @@ combo->setMaxVisibleItems (12); } - QPointer<QTemporaryFile> resource_manager::create_tmp_file (const QString& extension, const QString& contents) @@ -791,4 +790,5 @@ m_temporary_files.removeAll (tmp_file); } } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/resource-manager.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/resource-manager.h Tue Dec 06 14:37:51 2022 -0500 @@ -37,8 +37,8 @@ #include "gui-settings.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class resource_manager : public QObject { Q_OBJECT @@ -127,6 +127,7 @@ QStringList m_icon_fallbacks; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/set-path-dialog.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/set-path-dialog.cc Tue Dec 06 14:37:51 2022 -0500 @@ -57,8 +57,8 @@ #include "ovl.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + set_path_dialog::set_path_dialog (QWidget *parent, base_qobject& oct_qobj) : QDialog (parent), m_octave_qobj (oct_qobj) { @@ -311,4 +311,4 @@ QWidget::closeEvent (e); } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/set-path-dialog.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/set-path-dialog.h Tue Dec 06 14:37:51 2022 -0500 @@ -39,8 +39,8 @@ class QVBoxLayout; class QHBoxLayout; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class set_path_dialog : public QDialog @@ -114,6 +114,7 @@ QPushButton *m_move_down_button; QPushButton *m_remove_button; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/set-path-model.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/set-path-model.cc Tue Dec 06 14:37:51 2022 -0500 @@ -42,8 +42,8 @@ #include "interpreter.h" #include "load-path.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + set_path_model::set_path_model (QObject *p) : QAbstractListModel (p) { @@ -322,4 +322,5 @@ emit dataChanged (QAbstractListModel::index (0, 0), QAbstractListModel::index (numel-1, 0)); } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/set-path-model.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/set-path-model.h Tue Dec 06 14:37:51 2022 -0500 @@ -34,8 +34,8 @@ #include "qt-interpreter-events.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class set_path_model : public QAbstractListModel { Q_OBJECT @@ -101,6 +101,7 @@ bool m_revertible; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/settings-dialog.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/settings-dialog.cc Tue Dec 06 14:37:51 2022 -0500 @@ -70,8 +70,7 @@ #include "variable-editor.h" #include "workspace-model.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) settings_dialog::settings_dialog (QWidget *p, base_qobject& oct_qobj, const QString& desired_tab) @@ -319,7 +318,6 @@ layout_uncomment_strings->addWidget (m_rb_uncomment_strings[i]); } - combo_eol_mode->setCurrentIndex (settings->value (ed_default_eol_mode).toInt ()); editor_auto_ind_checkbox->setChecked (settings->value (ed_auto_indent).toBool ()); editor_tab_ind_checkbox->setChecked (settings->value (ed_tab_indents_line).toBool ()); @@ -1616,4 +1614,5 @@ settings->sync (); } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/settings-dialog.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/settings-dialog.h Tue Dec 06 14:37:51 2022 -0500 @@ -38,8 +38,8 @@ class QsciLexer; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; // Ui::settings_dialog is a generated class. @@ -113,6 +113,7 @@ QCheckBox *m_ws_enable_colors; QCheckBox *m_ws_hide_tool_tips; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/shortcut-manager.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/shortcut-manager.cc Tue Dec 06 14:37:51 2022 -0500 @@ -48,8 +48,8 @@ #include "gui-preferences-sc.h" #include "error.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // enter_shortcut: // class derived from QLineEdit for directly entering key sequences which @@ -108,7 +108,6 @@ m_shift_modifier = false; // the shortcut has to be written as text } - shortcut_manager::shortcut_manager (base_qobject& oct_qobj) : m_octave_qobj (oct_qobj) { @@ -300,7 +299,6 @@ init (tr ("Help on Keyword"), sc_edit_help_help_keyword); init (tr ("Document on Keyword"), sc_edit_help_doc_keyword); - // Documentation browser init (tr ("Go to Homepage"), sc_doc_go_home); init (tr ("Go Back one Page"), sc_doc_go_back); @@ -796,4 +794,5 @@ return false; // abort the import } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/shortcut-manager.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/shortcut-manager.h Tue Dec 06 14:37:51 2022 -0500 @@ -35,8 +35,8 @@ #include "gui-settings.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class enter_shortcut : public QLineEdit { Q_OBJECT @@ -169,6 +169,7 @@ QLabel *m_label_default; int m_handled_index; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/tab-bar.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/tab-bar.cc Tue Dec 06 14:37:51 2022 -0500 @@ -32,8 +32,8 @@ #include "tab-bar.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // // Reimplemented QTabbar // @@ -283,4 +283,4 @@ setCurrentIndex (i); } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/tab-bar.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/tab-bar.h Tue Dec 06 14:37:51 2022 -0500 @@ -36,8 +36,8 @@ #include <QStylePainter> #include <QTabBar> -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Subclassed QTabBar for usable tab-bar, rotated tabs and // reimplemented mouse event @@ -84,6 +84,7 @@ QList <QAction *> m_ctx_actions; int m_rotated; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/terminal-dock-widget.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/terminal-dock-widget.cc Tue Dec 06 14:37:51 2022 -0500 @@ -43,8 +43,8 @@ #include "octave-qobject.h" #include "terminal-dock-widget.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + terminal_dock_widget::terminal_dock_widget (QWidget *p, base_qobject& oct_qobj) : octave_dock_widget ("TerminalDockWidget", p, oct_qobj), @@ -167,4 +167,5 @@ #endif } } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/terminal-dock-widget.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/terminal-dock-widget.h Tue Dec 06 14:37:51 2022 -0500 @@ -32,8 +32,8 @@ class QTerminal; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class command_widget; class base_qobject; @@ -89,6 +89,7 @@ // FIXME!!! Maybe my_term should just be derived from QTerminal? QWidget *m_terminal; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/variable-editor-model.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/variable-editor-model.cc Tue Dec 06 14:37:51 2022 -0500 @@ -48,8 +48,8 @@ #include "utils.h" #include "variables.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + static bool cell_is_editable (const octave_value& val) { @@ -1396,4 +1396,5 @@ value_at (idx)); } } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/variable-editor-model.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/variable-editor-model.h Tue Dec 06 14:37:51 2022 -0500 @@ -35,8 +35,8 @@ #include "ov.h" #include "pr-flt-fmt.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class interpreter; class base_ve_model @@ -344,6 +344,7 @@ void evaluation_error (const std::string& expr) const; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/variable-editor.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/variable-editor.cc Tue Dec 06 14:37:51 2022 -0500 @@ -63,8 +63,8 @@ #include "variable-editor-model.h" #include "variable-editor.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Code reuse functions static QSignalMapper * @@ -476,7 +476,6 @@ }); } - // Perform saving the variable after desired format is determined void variable_editor_stack::do_save (const QString& format, const QString& save_opts) @@ -525,7 +524,6 @@ }); } - // Custom editable variable table view variable_editor_view::variable_editor_view (QWidget *p, @@ -1034,7 +1032,6 @@ } } - // Gadgets for focus restoration HoverToolButton::HoverToolButton (QWidget *parent) @@ -1785,4 +1782,4 @@ m_tool_bar->setEnabled (false); } -} +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/variable-editor.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/variable-editor.h Tue Dec 06 14:37:51 2022 -0500 @@ -43,8 +43,8 @@ class QTextEdit; class QToolBar; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class variable_editor_model; @@ -169,7 +169,6 @@ QTextEdit *m_disp_view; }; - class variable_editor_view : public QTableView { Q_OBJECT @@ -415,6 +414,7 @@ variable_dock_widget *m_focus_widget_vdw; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/welcome-wizard.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/welcome-wizard.cc Tue Dec 06 14:37:51 2022 -0500 @@ -42,8 +42,8 @@ #include "octave-qobject.h" #include "welcome-wizard.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + static QLabel * make_octave_logo (QWidget *p = nullptr, int height = 100) { @@ -386,4 +386,5 @@ connect (m_finish, &QPushButton::clicked, wizard, &welcome_wizard::accept); connect (m_cancel, &QPushButton::clicked, wizard, &welcome_wizard::reject); } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/welcome-wizard.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/welcome-wizard.h Tue Dec 06 14:37:51 2022 -0500 @@ -30,8 +30,8 @@ #include <QDialog> #include <QLabel> -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class welcome_wizard : public QDialog @@ -70,7 +70,6 @@ void accept (void); }; - class initial_page : public QWidget { Q_OBJECT @@ -96,7 +95,6 @@ QPushButton *m_cancel; }; - class setup_community_news : public QWidget { Q_OBJECT @@ -125,7 +123,6 @@ QPushButton *m_cancel; }; - class final_page : public QWidget { Q_OBJECT @@ -152,6 +149,7 @@ QPushButton *m_finish; QPushButton *m_cancel; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/workspace-model.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/workspace-model.cc Tue Dec 06 14:37:51 2022 -0500 @@ -39,8 +39,8 @@ #include "syminfo.h" #include "utils.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + workspace_model::workspace_model (QObject *p) : QAbstractTableModel (p) { @@ -271,4 +271,5 @@ emit model_changed (); } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/workspace-model.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/workspace-model.h Tue Dec 06 14:37:51 2022 -0500 @@ -41,8 +41,8 @@ // Defined for purposes of sending QList<int> as part of signal. typedef QList<int> QIntList; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class workspace_model : public QAbstractTableModel { Q_OBJECT @@ -110,6 +110,7 @@ bool m_enable_colors; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif
--- a/libgui/src/workspace-view.cc Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/workspace-view.cc Tue Dec 06 14:37:51 2022 -0500 @@ -46,8 +46,8 @@ #include "octave-qtutils.h" #include "workspace-view.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + workspace_view::workspace_view (QWidget *p, base_qobject& oct_qobj) : octave_dock_widget ("WorkspaceView", p, oct_qobj), m_view (new QTableView (this)), @@ -552,4 +552,5 @@ return item_data[0].toString (); } -} + +OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/workspace-view.h Tue Dec 06 14:23:21 2022 -0500 +++ b/libgui/src/workspace-view.h Tue Dec 06 14:37:51 2022 -0500 @@ -37,8 +37,8 @@ #include "octave-dock-widget.h" #include "workspace-model.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_qobject; class workspace_view : public octave_dock_widget @@ -128,6 +128,7 @@ QWidget *m_filter_widget; bool m_filter_shown; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif