Mercurial > octave
changeset 27417:f844b1f03dcc
update some header file lists in libgui sources
* Canvas.cc, Figure.cc, GLCanvas.cc, Logger.cc, ObjectProxy.cc,
QtHandlesUtils.cc, Table.cc, __init_qt__.cc, and
annotation-dialog.cc: Alphabetize and organize header files.
* variable-editor-model.cc: Also include Cell.h and oct-map.h.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 16 Sep 2019 23:35:19 -0400 |
| parents | 602298e76e91 |
| children | c40be2cf044d |
| files | libgui/graphics/Canvas.cc libgui/graphics/Figure.cc libgui/graphics/GLCanvas.cc libgui/graphics/Logger.cc libgui/graphics/ObjectProxy.cc libgui/graphics/QtHandlesUtils.cc libgui/graphics/Table.cc libgui/graphics/__init_qt__.cc libgui/graphics/annotation-dialog.cc libgui/src/variable-editor-model.cc |
| diffstat | 10 files changed, 36 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/Canvas.cc Mon Sep 16 13:29:02 2019 -0700 +++ b/libgui/graphics/Canvas.cc Mon Sep 16 23:35:19 2019 -0400 @@ -40,15 +40,14 @@ #include "qt-graphics-toolkit.h" #include "annotation-dialog.h" +#include "qt-interpreter-events.h" +#include "resource-manager.h" +#include "builtin-defun-decls.h" #include "graphics.h" #include "interpreter-private.h" #include "interpreter.h" #include "oct-opengl.h" -#include "qt-interpreter-events.h" -#include "resource-manager.h" - -#include "builtin-defun-decls.h" namespace QtHandles {
--- a/libgui/graphics/Figure.cc Mon Sep 16 13:29:02 2019 -0700 +++ b/libgui/graphics/Figure.cc Mon Sep 16 23:35:19 2019 -0400 @@ -51,17 +51,16 @@ #include "FigureWindow.h" #include "QtHandlesUtils.h" +#include "qt-interpreter-events.h" + #include "file-ops.h" #include "unwind-prot.h" #include "utils.h" #include "version.h" +#include "builtin-defun-decls.h" #include "interpreter-private.h" -#include "qt-interpreter-events.h" - -#include "builtin-defun-decls.h" - namespace QtHandles {
--- a/libgui/graphics/GLCanvas.cc Mon Sep 16 13:29:02 2019 -0700 +++ b/libgui/graphics/GLCanvas.cc Mon Sep 16 23:35:19 2019 -0400 @@ -24,15 +24,14 @@ # include "config.h" #endif -#include "event-manager.h" +#include "GLCanvas.h" +#include "gl-select.h" + #include "gl-render.h" #include "gl2ps-print.h" #include "graphics.h" #include "interpreter-private.h" -#include "GLCanvas.h" -#include "gl-select.h" - namespace QtHandles { #if defined (HAVE_QOPENGLWIDGET)
--- a/libgui/graphics/Logger.cc Mon Sep 16 13:29:02 2019 -0700 +++ b/libgui/graphics/Logger.cc Mon Sep 16 23:35:19 2019 -0400 @@ -24,12 +24,12 @@ # include "config.h" #endif +#include <cstdio> + #include <QMutex> #include <QMutexLocker> #include <QProcessEnvironment> -#include <cstdio> - #include "Logger.h" namespace QtHandles
--- a/libgui/graphics/ObjectProxy.cc Mon Sep 16 13:29:02 2019 -0700 +++ b/libgui/graphics/ObjectProxy.cc Mon Sep 16 23:35:19 2019 -0400 @@ -28,12 +28,12 @@ #include <QString> #include <QThread> +#include "Object.h" +#include "ObjectProxy.h" + #include "oct-mutex.h" #include "utils.h" -#include "Object.h" -#include "ObjectProxy.h" - namespace QtHandles {
--- a/libgui/graphics/QtHandlesUtils.cc Mon Sep 16 13:29:02 2019 -0700 +++ b/libgui/graphics/QtHandlesUtils.cc Mon Sep 16 23:35:19 2019 -0400 @@ -24,15 +24,12 @@ # include "config.h" #endif +#include <list> + #include <QApplication> #include <QKeyEvent> #include <QMouseEvent> -#include <list> - -#include "ov.h" -#include "graphics.h" - #include "Container.h" #include "KeyMap.h" #include "Object.h" @@ -41,6 +38,9 @@ #include "oct-string.h" +#include "graphics.h" +#include "ov.h" + namespace QtHandles {
--- a/libgui/graphics/Table.cc Mon Sep 16 13:29:02 2019 -0700 +++ b/libgui/graphics/Table.cc Mon Sep 16 23:35:19 2019 -0400 @@ -24,22 +24,21 @@ # include "config.h" #endif +#include <QCheckBox> +#include <QComboBox> #include <QEvent> #include <QFrame> +#include <QHBoxLayout> +#include <QHeaderView> #include <QLabel> -#include <QMouseEvent> -#include <QTimer> - -#include <QCheckBox> -#include <QComboBox> -#include <QHeaderView> #include <QLineEdit> #include <QModelIndexList> +#include <QMouseEvent> #include <QString> #include <QStringList> #include <QTableWidget> #include <QTableWidgetItem> -#include <QHBoxLayout> +#include <QTimer> #include "Container.h" #include "ContextMenu.h"
--- a/libgui/graphics/__init_qt__.cc Mon Sep 16 13:29:02 2019 -0700 +++ b/libgui/graphics/__init_qt__.cc Mon Sep 16 23:35:19 2019 -0400 @@ -32,16 +32,16 @@ #include <QRegExp> #include <QThread> +#include "qt-graphics-toolkit.h" +#include "QtHandlesUtils.h" +#include "__init_qt__.h" + #include "defun-dld.h" #include "graphics.h" #include "gtk-manager.h" #include "interpreter.h" #include "symtab.h" -#include "qt-graphics-toolkit.h" -#include "QtHandlesUtils.h" -#include "__init_qt__.h" - // PKG_ADD: if (__have_feature__ ("QT") && __have_feature__ ("OPENGL") && have_window_system () && __event_manager_enabled__ ()) register_graphics_toolkit ("qt"); endif namespace QtHandles
--- a/libgui/graphics/annotation-dialog.cc Mon Sep 16 13:29:02 2019 -0700 +++ b/libgui/graphics/annotation-dialog.cc Mon Sep 16 23:35:19 2019 -0400 @@ -24,17 +24,15 @@ # include "config.h" #endif -#include "annotation-dialog.h" -#include "ui-annotation-dialog.h" - -#include "QtHandlesUtils.h" - -#include "resource-manager.h" - #include <QColorDialog> #include <QPushButton> #include <QPalette> +#include "QtHandlesUtils.h" +#include "annotation-dialog.h" +#include "resource-manager.h" +#include "ui-annotation-dialog.h" + using namespace QtHandles; annotation_dialog::annotation_dialog (QWidget *p, const octave_value_list& pr):
--- a/libgui/src/variable-editor-model.cc Mon Sep 16 13:29:02 2019 -0700 +++ b/libgui/src/variable-editor-model.cc Mon Sep 16 23:35:19 2019 -0400 @@ -38,7 +38,9 @@ #include "qt-interpreter-events.h" #include "variable-editor-model.h" +#include "Cell.h" #include "interpreter.h" +#include "oct-map.h" #include "ov.h" #include "parse.h" #include "pr-flt-fmt.h"