Mercurial > octave
changeset 21203:710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rename guard #ifdef names to use octave_ namespace prefix and file name.
Indent #ifdef blocks.
* Backend.cc, Backend.h, BaseControl.cc, BaseControl.h, ButtonControl.cc,
ButtonControl.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, MouseModeActionGroup.cc, MouseModeActionGroup.h, Object.cc,
Object.h, ObjectFactory.cc, ObjectFactory.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, TextControl.cc,
TextControl.h, TextEdit.cc, TextEdit.h, ToggleButtonControl.cc,
ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h,
ToolBarButton.cc, ToolBarButton.h, __init_qt__.cc, __init_qt__.h,
annotation-dialog.cc, annotation-dialog.h, gl-select.cc, gl-select.h,
color-picker.cc, color-picker.h, dialog.cc, documentation-dock-widget.cc,
documentation-dock-widget.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, history-dock-widget.cc, history-dock-widget.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, octave-qscintilla.cc,
octave-txt-lexer.cc, main-window.cc, octave-cmd.cc, octave-dock-widget.cc,
octave-gui.cc, octave-interpreter.cc, octave-interpreter.h, octave-qt-link.cc,
octave-qt-link.h, parser.cc, webinfo.cc, resource-manager.cc,
resource-manager.h, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc,
shortcut-manager.h, terminal-dock-widget.cc, terminal-dock-widget.h,
thread-manager.cc, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc,
workspace-view.cc:
Clean up naming and indentation of #ifdef blocks in libgui.
line wrap: on
line diff
--- a/libgui/graphics/Backend.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/Backend.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QApplication>
--- a/libgui/graphics/Backend.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/Backend.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_Backend__ -#define __QtHandles_Backend__ 1 +#if ! defined (octave_Backend_h) +#define octave_Backend_h 1 #include <QObject>
--- a/libgui/graphics/BaseControl.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/BaseControl.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QEvent>
--- a/libgui/graphics/BaseControl.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/BaseControl.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_BaseControl__ -#define __QtHandles_BaseControl__ 1 +#if ! defined (octave_BaseControl_h) +#define octave_BaseControl_h 1 #include "Object.h"
--- a/libgui/graphics/ButtonControl.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/ButtonControl.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QAbstractButton>
--- a/libgui/graphics/ButtonControl.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/ButtonControl.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_ButtonControl__ -#define __QtHandles_ButtonControl__ 1 +#if ! defined (octave_ButtonControl_h) +#define octave_ButtonControl_h 1 #include "BaseControl.h"
--- a/libgui/graphics/Canvas.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/Canvas.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QApplication>
--- a/libgui/graphics/Canvas.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/Canvas.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_Canvas__ -#define __QtHandles_Canvas__ 1 +#if ! defined (octave_Canvas_h) +#define octave_Canvas_h 1 #include <QPoint>
--- a/libgui/graphics/CheckBoxControl.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/CheckBoxControl.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QCheckBox>
--- a/libgui/graphics/CheckBoxControl.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/CheckBoxControl.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_CheckBoxControl__ -#define __QtHandles_CheckBoxControl__ 1 +#if ! defined (octave_CheckBoxControl_h) +#define octave_CheckBoxControl_h 1 #include "ButtonControl.h"
--- a/libgui/graphics/Container.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/Container.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QChildEvent>
--- a/libgui/graphics/Container.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/Container.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_Container__ -#define __QtHandles_Container__ 1 +#if ! defined (octave_Container_h) +#define octave_Container_h 1 #include <QWidget>
--- a/libgui/graphics/ContextMenu.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/ContextMenu.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QMenu>
--- a/libgui/graphics/ContextMenu.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/ContextMenu.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_ContextMenu__ -#define __QtHandles_ContextMenu__ 1 +#if ! defined (octave_ContextMenu_h) +#define octave_ContextMenu_h 1 #include <QPoint>
--- a/libgui/graphics/EditControl.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/EditControl.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QLineEdit>
--- a/libgui/graphics/EditControl.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/EditControl.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_EditControl__ -#define __QtHandles_EditControl__ 1 +#ifndef octave_EditControl_h +#define octave_EditControl_h 1 #include "BaseControl.h"
--- a/libgui/graphics/Figure.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/Figure.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QAction>
--- a/libgui/graphics/Figure.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/Figure.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_Figure__ -#define __QtHandles_Figure__ 1 +#if ! defined (octave_Figure_h) +#define octave_Figure_h 1 #include <QRect> #include <QStatusBar>
--- a/libgui/graphics/FigureWindow.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/FigureWindow.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QMenu>
--- a/libgui/graphics/FigureWindow.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/FigureWindow.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_FigureWindow__ -#define __QtHandles_FigureWindow__ 1 +#if ! defined (octave_FigureWindow_h) +#define octave_FigureWindow_h 1 #include <QMainWindow>
--- a/libgui/graphics/GLCanvas.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/GLCanvas.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,11 +21,11 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include "gl-render.h"
--- a/libgui/graphics/GLCanvas.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/GLCanvas.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_GLCanvas__ -#define __QtHandles_GLCanvas__ 1 +#if ! defined (octave_GLCanvas_h) +#define octave_GLCanvas_h 1 #include <QGLWidget>
--- a/libgui/graphics/GenericEventNotify.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/GenericEventNotify.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __GenericEventNotify_h__ -#define __GenericEventNotify_h__ 1 +#if ! defined (octave_GenericEventNotify_h) +#define octave_GenericEventNotify_h 1 #include <QSet>
--- a/libgui/graphics/KeyMap.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/KeyMap.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QMap>
--- a/libgui/graphics/KeyMap.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/KeyMap.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles__KeyMap__ -#define __QtHandles__KeyMap__ 1 +#if ! defined (octave_KeyMap_h) +#define octave_KeyMap_h 1 #include <string>
--- a/libgui/graphics/ListBoxControl.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/ListBoxControl.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QListWidget>
--- a/libgui/graphics/ListBoxControl.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/ListBoxControl.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_ListBoxControl__ -#define __QtHandles_ListBoxControl__ 1 +#if ! defined (octave_ListBoxControl_h) +#define octave_ListBoxControl_h 1 #include "BaseControl.h"
--- a/libgui/graphics/Logger.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/Logger.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QMutex>
--- a/libgui/graphics/Logger.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/Logger.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_Logger__ -#define __QtHandles_Logger__ 1 +#if ! defined (octave_Logger_h) +#define octave_Logger_h 1 #include <cstdarg>
--- a/libgui/graphics/Menu.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/Menu.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QAction>
--- a/libgui/graphics/Menu.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/Menu.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_Menu__ -#define __QtHandles_Menu__ 1 +#if ! defined (octave_Menu_h) +#define octave_Menu_h 1 #include "MenuContainer.h" #include "Object.h"
--- a/libgui/graphics/MenuContainer.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/MenuContainer.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_MenuContainer__ -#define __QtHandles_MenuContainer__ 1 +#if ! defined (octave_MenuContainer_h) +#define octave_MenuContainer_h 1 class QWidget;
--- a/libgui/graphics/MouseModeActionGroup.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/MouseModeActionGroup.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QAction>
--- a/libgui/graphics/MouseModeActionGroup.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/MouseModeActionGroup.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_MouseModeActionGroup__ -#define __QtHandles_MouseModeActionGroup__ 1 +#if ! defined (octave_MouseModeActionGroup_h) +#define octave_MouseModeActionGroup_h 1 #include <QList> #include <QObject>
--- a/libgui/graphics/Object.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/Object.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QString>
--- a/libgui/graphics/Object.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/Object.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_Object__ -#define __QtHandles_Object__ 1 +#if ! defined (octave_Object_h) +#define octave_Object_h 1 #include <QObject>
--- a/libgui/graphics/ObjectFactory.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/ObjectFactory.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QApplication>
--- a/libgui/graphics/ObjectFactory.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/ObjectFactory.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_ObjectFactory__ -#define __QtHandles_ObjectFactory__ 1 +#if ! defined (octave_ObjectFactory_h) +#define octave_ObjectFactory_h 1 #include <QObject>
--- a/libgui/graphics/ObjectProxy.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/ObjectProxy.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QString>
--- a/libgui/graphics/ObjectProxy.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/ObjectProxy.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_ObjectProxy__ -#define __QtHandles_ObjectProxy__ 1 +#if ! defined (octave_ObjectProxy_h) +#define octave_ObjectProxy_h 1 #include <QObject>
--- a/libgui/graphics/Panel.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/Panel.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QEvent>
--- a/libgui/graphics/Panel.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/Panel.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_Panel__ -#define __QtHandles_Panel__ 1 +#if ! defined (octave_Panel_h) +#define octave_Panel_h 1 #include "Object.h"
--- a/libgui/graphics/PopupMenuControl.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/PopupMenuControl.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QComboBox>
--- a/libgui/graphics/PopupMenuControl.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/PopupMenuControl.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_PopupMenuControl__ -#define __QtHandles_PopupMenuControl__ 1 +#if ! defined (octave_PopupMenuControl_h) +#define octave_PopupMenuControl_h 1 #include "BaseControl.h"
--- a/libgui/graphics/PushButtonControl.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/PushButtonControl.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QPushButton>
--- a/libgui/graphics/PushButtonControl.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/PushButtonControl.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_PushButtonControl__ -#define __QtHandles_PushButtonControl__ 1 +#if ! defined (octave_PushButtonControl_h) +#define octave_PushButtonControl_h 1 #include "ButtonControl.h"
--- a/libgui/graphics/PushTool.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/PushTool.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include "PushTool.h"
--- a/libgui/graphics/PushTool.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/PushTool.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_PushTool__ -#define __QtHandles_PushTool__ 1 +#if ! defined (octave_PushTool_h) +#define octave_PushTool_h 1 #include "ToolBarButton.h"
--- a/libgui/graphics/QtHandlesUtils.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/QtHandlesUtils.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QApplication>
--- a/libgui/graphics/QtHandlesUtils.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/QtHandlesUtils.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_Utils__ -#define __QtHandles_Utils__ 1 +#if ! defined (octave_QtHandlesUtils_h) +#define octave_QtHandlesUtils_h 1 #include <QColor> #include <QFont>
--- a/libgui/graphics/RadioButtonControl.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/RadioButtonControl.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QRadioButton>
--- a/libgui/graphics/RadioButtonControl.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/RadioButtonControl.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_RadioButton__ -#define __QtHandles_RadioButton__ 1 +#if ! defined (octave_RadioButton_h) +#define octave_RadioButton_h 1 #include "ButtonControl.h"
--- a/libgui/graphics/SliderControl.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/SliderControl.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QScrollBar>
--- a/libgui/graphics/SliderControl.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/SliderControl.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_SliderControl__ -#define __QtHandles_SliderControl__ 1 +#if ! defined (octave_SliderControl_h) +#define octave_SliderControl_h 1 #include "BaseControl.h"
--- a/libgui/graphics/TextControl.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/TextControl.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QLabel>
--- a/libgui/graphics/TextControl.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/TextControl.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_TextControl__ -#define __QtHandles_TextControl__ 1 +#if ! defined (octave_TextControl_h) +#define octave_TextControl_h 1 #include "BaseControl.h"
--- a/libgui/graphics/TextEdit.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/TextEdit.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QKeyEvent>
--- a/libgui/graphics/TextEdit.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/TextEdit.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_TextEdit__ -#define __QtHandles_TextEdit__ 1 +#if ! defined (octave_TextEdit_h) +#define octave_TextEdit_h 1 #include <QTextEdit>
--- a/libgui/graphics/ToggleButtonControl.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/ToggleButtonControl.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QPushButton>
--- a/libgui/graphics/ToggleButtonControl.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/ToggleButtonControl.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_ToggleButtonControl__ -#define __QtHandles_ToggleButtonControl__ 1 +#if ! defined (octave_ToggleButtonControl_h) +#define octave_ToggleButtonControl_h 1 #include "ButtonControl.h"
--- a/libgui/graphics/ToggleTool.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/ToggleTool.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include "ToggleTool.h"
--- a/libgui/graphics/ToggleTool.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/ToggleTool.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_ToggleTool__ -#define __QtHandles_ToggleTool__ 1 +#if ! defined (octave_ToggleTool_h) +#define octave_ToggleTool_h 1 #include "ToolBarButton.h"
--- a/libgui/graphics/ToolBar.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/ToolBar.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QAction>
--- a/libgui/graphics/ToolBar.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/ToolBar.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_ToolBar__ -#define __QtHandles_ToolBar__ 1 +#if ! defined (octave_ToolBar_h) +#define octave_ToolBar_h 1 #include "Object.h"
--- a/libgui/graphics/ToolBarButton.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/ToolBarButton.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QAction>
--- a/libgui/graphics/ToolBarButton.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/ToolBarButton.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_ToolBarButton__ -#define __QtHandles_ToolBarButton__ 1 +#if ! defined (octave_ToolBarButton_h) +#define octave_ToolBarButton_h 1 #include "Object.h"
--- a/libgui/graphics/__init_qt__.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/__init_qt__.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QApplication>
--- a/libgui/graphics/__init_qt__.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/__init_qt__.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_init_qt__ -#define __QtHandles_init_qt__ 1 +#if ! defined (octave__init_qt___h) +#define octave__init_qt___h 1 namespace QtHandles {
--- a/libgui/graphics/annotation-dialog.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/annotation-dialog.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include "annotation-dialog.h"
--- a/libgui/graphics/annotation-dialog.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/annotation-dialog.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef ANNOTATIONDIALOG_H -#define ANNOTATIONDIALOG_H +#if ! defined (octave_annotation_dialog_h) +#define octave_annotation_dialog_h 1 #include <QDialog> #include <QLineEdit>
--- a/libgui/graphics/gl-select.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/gl-select.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <iostream>
--- a/libgui/graphics/gl-select.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/graphics/gl-select.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef __QtHandles_gl_selector__ -#define __QtHandles_gl_selector__ 1 +#if ! defined (octave_gl_select_h) +#define octave_gl_select_h 1 #include <map>
--- a/libgui/src/color-picker.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/color-picker.cc Sat Feb 06 07:32:37 2016 -0800 @@ -25,7 +25,7 @@ // Author: Torsten <ttl@justmail.de> #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include "color-picker.h"
--- a/libgui/src/color-picker.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/color-picker.h Sat Feb 06 07:32:37 2016 -0800 @@ -24,8 +24,8 @@ // Author: Torsten <ttl@justmail.de> -#ifndef COLORPICKER_H -#define COLORPICKER_H +#if ! defined (octave_color_picker_h) +#define octave_color_picker_h 1 #include <QPushButton> #include <QColorDialog>
--- a/libgui/src/dialog.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/dialog.cc Sat Feb 06 07:32:37 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include "dialog.h"
--- a/libgui/src/documentation-dock-widget.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/documentation-dock-widget.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include "documentation-dock-widget.h"
--- a/libgui/src/documentation-dock-widget.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/documentation-dock-widget.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef DOCUMENTATIONDOCKWIDGET_H -#define DOCUMENTATIONDOCKWIDGET_H +#if ! defined (octave_documentation_dock_widget_h) +#define octave_documentation_dock_widget_h 1 #include "octave-dock-widget.h"
--- a/libgui/src/files-dock-widget.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/files-dock-widget.cc Sat Feb 06 07:32:37 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include "resource-manager.h"
--- a/libgui/src/files-dock-widget.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/files-dock-widget.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef FILESDOCKWIDGET_H -#define FILESDOCKWIDGET_H +#if ! defined (octave_files_dock_widget_h) +#define octave_files_dock_widget_h 1 #include <QListView> #include <QDate>
--- a/libgui/src/find-files-dialog.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/find-files-dialog.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QPushButton>
--- a/libgui/src/find-files-dialog.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/find-files-dialog.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,7 +20,7 @@ */ #if ! defined (octave_find_files_dialog_h) -#define octave_find_files_dialog_h +#define octave_find_files_dialog_h 1 #include <QDialog> #include <QModelIndex>
--- a/libgui/src/find-files-model.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/find-files-model.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QFileIconProvider>
--- a/libgui/src/find-files-model.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/find-files-model.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,7 +20,7 @@ */ #if ! defined (octave_find_files_model_h) -#define octave_find_files_model_h +#define octave_find_files_model_h 1 #include <QAbstractListModel> #include <QStringList>
--- a/libgui/src/history-dock-widget.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/history-dock-widget.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QApplication>
--- a/libgui/src/history-dock-widget.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/history-dock-widget.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef HISTORYDOCKWIDGET_H -#define HISTORYDOCKWIDGET_H +#if ! defined (octave_history_dock_widget_h) +#define octave_history_dock_widget_h 1 #include <QLineEdit> #include <QListView>
--- a/libgui/src/m-editor/file-editor-interface.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/m-editor/file-editor-interface.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef FILEEDITORINTERFACE_H -#define FILEEDITORINTERFACE_H +#if ! defined (octave_file_editor_interface_h) +#define octave_file_editor_interface_h 1 #include <QMenu> #include <QToolBar>
--- a/libgui/src/m-editor/file-editor-tab.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/m-editor/file-editor-tab.cc Sat Feb 06 07:32:37 2016 -0800 @@ -27,17 +27,17 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #ifdef HAVE_QSCINTILLA #if defined (HAVE_QSCI_QSCILEXEROCTAVE_H) -#define HAVE_LEXER_OCTAVE -#include <Qsci/qscilexeroctave.h> +# define HAVE_LEXER_OCTAVE +# include <Qsci/qscilexeroctave.h> #elif defined (HAVE_QSCI_QSCILEXERMATLAB_H) -#define HAVE_LEXER_MATLAB -#include <Qsci/qscilexermatlab.h> +# define HAVE_LEXER_MATLAB +# include <Qsci/qscilexermatlab.h> #endif #include <Qsci/qscilexercpp.h> #include <Qsci/qscilexerbash.h>
--- a/libgui/src/m-editor/file-editor-tab.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/m-editor/file-editor-tab.h Sat Feb 06 07:32:37 2016 -0800 @@ -36,8 +36,8 @@ // FIXME: We should not be including config.h in header files. // Only needed for octave_value_list type. #ifdef HAVE_CONFIG_H -#include <config.h> -#include "ovl.h" +# include <config.h> +# include "ovl.h" #endif #include "find-dialog.h"
--- a/libgui/src/m-editor/file-editor.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/m-editor/file-editor.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #ifdef HAVE_QSCINTILLA
--- a/libgui/src/m-editor/file-editor.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/m-editor/file-editor.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef FILEEDITORMDISUBWINDOW_H -#define FILEEDITORMDISUBWINDOW_H +#if ! defined (octave_file_editor_h) +#define octave_file_editor_h 1 #include <QToolBar> #include <QAction>
--- a/libgui/src/m-editor/find-dialog.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/m-editor/find-dialog.cc Sat Feb 06 07:32:37 2016 -0800 @@ -60,7 +60,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #ifdef HAVE_QSCINTILLA
--- a/libgui/src/m-editor/find-dialog.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/m-editor/find-dialog.h Sat Feb 06 07:32:37 2016 -0800 @@ -59,8 +59,8 @@ */ -#ifndef FIND_DIALOG_H -#define FIND_DIALOG_H +#if ! defined (octave_find_dialog_h) +#define octave_find_dialog_h 1 #include <QDialog> #include <Qsci/qsciscintilla.h>
--- a/libgui/src/m-editor/octave-qscintilla.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/m-editor/octave-qscintilla.cc Sat Feb 06 07:32:37 2016 -0800 @@ -23,7 +23,7 @@ // Author: Torsten <ttl@justmail.de> #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #ifdef HAVE_QSCINTILLA
--- a/libgui/src/m-editor/octave-txt-lexer.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/m-editor/octave-txt-lexer.cc Sat Feb 06 07:32:37 2016 -0800 @@ -23,7 +23,7 @@ // Author: Torsten <ttl@justmail.de> #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #ifdef HAVE_QSCINTILLA
--- a/libgui/src/main-window.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/main-window.cc Sat Feb 06 07:32:37 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QKeySequence> @@ -47,7 +47,7 @@ #include <utility> #ifdef HAVE_QSCINTILLA -#include "file-editor.h" +# include "file-editor.h" #endif #include "main-window.h" #include "settings-dialog.h"
--- a/libgui/src/octave-cmd.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/octave-cmd.cc Sat Feb 06 07:32:37 2016 -0800 @@ -23,7 +23,7 @@ // Author: Torsten <ttl@justmail.de> #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include "octave-cmd.h"
--- a/libgui/src/octave-dock-widget.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/octave-dock-widget.cc Sat Feb 06 07:32:37 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QApplication>
--- a/libgui/src/octave-gui.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/octave-gui.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QApplication> @@ -35,7 +35,7 @@ #include <fcntl.h> #if defined (HAVE_SYS_IOCTL_H) -#include <sys/ioctl.h> +# include <sys/ioctl.h> #endif #include "lo-utils.h"
--- a/libgui/src/octave-interpreter.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/octave-interpreter.cc Sat Feb 06 07:32:37 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <string>
--- a/libgui/src/octave-interpreter.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/octave-interpreter.h Sat Feb 06 07:32:37 2016 -0800 @@ -21,8 +21,8 @@ */ -#ifndef octave_interpreter_h -#define octave_interpreter_h 1 +#if ! defined (octave_octave_interpreter_h) +#define octave_octave_interpreter_h 1 #include <QObject>
--- a/libgui/src/octave-qt-link.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/octave-qt-link.cc Sat Feb 06 07:32:37 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QStringList>
--- a/libgui/src/octave-qt-link.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/octave-qt-link.h Sat Feb 06 07:32:37 2016 -0800 @@ -22,8 +22,8 @@ */ -#ifndef OCTAVE_QT_LINK_H -#define OCTAVE_QT_LINK_H +#if ! defined (octave_octave_qt_link_h) +#define octave_octave_qt_link_h 1 #include <list> #include <string>
--- a/libgui/src/qtinfo/parser.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/qtinfo/parser.cc Sat Feb 06 07:32:37 2016 -0800 @@ -25,7 +25,7 @@ // Author: Jacob Dawid <jacob.dawid@cybercatalyst.com> #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include "parser.h"
--- a/libgui/src/qtinfo/webinfo.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/qtinfo/webinfo.cc Sat Feb 06 07:32:37 2016 -0800 @@ -25,7 +25,7 @@ // Author: Jacob Dawid <jacob.dawid@cybercatalyst.com> #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include "webinfo.h"
--- a/libgui/src/resource-manager.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/resource-manager.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <string>
--- a/libgui/src/resource-manager.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/resource-manager.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef RESOURCEMANAGER_H -#define RESOURCEMANAGER_H +#if ! defined (octave_resource_manager_h) +#define octave_resource_manager_h 1 #include <QDesktopServices> #include <QIcon>
--- a/libgui/src/settings-dialog.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/settings-dialog.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include "resource-manager.h" @@ -37,23 +37,23 @@ #include <QTextCodec> #ifdef HAVE_QSCINTILLA -#include "octave-qscintilla.h" -#include "octave-txt-lexer.h" -#include <QScrollArea> +# include "octave-qscintilla.h" +# include "octave-txt-lexer.h" +# include <QScrollArea> -#if defined (HAVE_QSCI_QSCILEXEROCTAVE_H) -#define HAVE_LEXER_OCTAVE -#include <Qsci/qscilexeroctave.h> -#elif defined (HAVE_QSCI_QSCILEXERMATLAB_H) -#define HAVE_LEXER_MATLAB -#include <Qsci/qscilexermatlab.h> -#endif +# if defined (HAVE_QSCI_QSCILEXEROCTAVE_H) +# define HAVE_LEXER_OCTAVE +# include <Qsci/qscilexeroctave.h> +# elif defined (HAVE_QSCI_QSCILEXERMATLAB_H) +# define HAVE_LEXER_MATLAB +# include <Qsci/qscilexermatlab.h> +# endif -#include <Qsci/qscilexercpp.h> -#include <Qsci/qscilexerbash.h> -#include <Qsci/qscilexerperl.h> -#include <Qsci/qscilexerbatch.h> -#include <Qsci/qscilexerdiff.h> +# include <Qsci/qscilexercpp.h> +# include <Qsci/qscilexerbash.h> +# include <Qsci/qscilexerperl.h> +# include <Qsci/qscilexerbatch.h> +# include <Qsci/qscilexerdiff.h> #endif #ifdef HAVE_QSCINTILLA @@ -430,7 +430,7 @@ settings->value ("editor/show_hscroll_bar",true).toBool ()); #ifdef HAVE_QSCINTILLA -#if defined (Q_OS_WIN32) +# if defined (Q_OS_WIN32) int eol_mode = QsciScintilla::EolWindows; #elif defined (Q_OS_MAC) int eol_mode = QsciScintilla::EolMac;
--- a/libgui/src/settings-dialog.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/settings-dialog.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef SETTINGSDIALOG_H -#define SETTINGSDIALOG_H +#if ! defined (octave_settings_dialog_h) +#define octave_settings_dialog_h 1 #include <QDialog> #include <QSettings>
--- a/libgui/src/shortcut-manager.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/shortcut-manager.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QtCore>
--- a/libgui/src/shortcut-manager.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/shortcut-manager.h Sat Feb 06 07:32:37 2016 -0800 @@ -20,8 +20,8 @@ */ -#ifndef SHORTCUT_MANAGER_H -#define SHORTCUT_MANAGER_H +#if ! defined (octave_shortcut_manager_h) +#define octave_shortcut_manager_h 1 #include <QWidget> #include <QTreeWidget>
--- a/libgui/src/terminal-dock-widget.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/terminal-dock-widget.cc Sat Feb 06 07:32:37 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include "terminal-dock-widget.h"
--- a/libgui/src/terminal-dock-widget.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/terminal-dock-widget.h Sat Feb 06 07:32:37 2016 -0800 @@ -21,8 +21,8 @@ */ -#ifndef TERMINALDOCKWIDGET_H -#define TERMINALDOCKWIDGET_H +#if ! defined (octave_terminal_dock_widget_h) +#define octave_terminal_dock_widget_h 1 #include <QString>
--- a/libgui/src/thread-manager.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/thread-manager.cc Sat Feb 06 07:32:37 2016 -0800 @@ -21,13 +21,13 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #if defined (__WIN32__) && ! defined (__CYGWIN__) -#include <windows.h> +# include <windows.h> #else -#include <pthread.h> +# include <pthread.h> #endif #include <sys/types.h> @@ -90,13 +90,13 @@ // The following is a workaround for an apparent bug in GCC 4.1.2 and // possibly earlier versions. See Octave bug report #30685 for details. #if defined (__GNUC__) -# if ! (__GNUC__ > 4 \ - || (__GNUC__ == 4 && (__GNUC_MINOR__ > 1 \ - || (__GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ > 2)))) -# undef GNULIB_NAMESPACE -# define GNULIB_NAMESPACE -# warning "disabling GNULIB_NAMESPACE for signal functions -- consider upgrading to a current version of GCC" -# endif +# if ! (__GNUC__ > 4 \ + || (__GNUC__ == 4 && (__GNUC_MINOR__ > 1 \ + || (__GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ > 2)))) +# undef GNULIB_NAMESPACE +# define GNULIB_NAMESPACE +# warning "disabling GNULIB_NAMESPACE for signal functions -- consider upgrading to a current version of GCC" +# endif #endif static void
--- a/libgui/src/welcome-wizard.cc Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/welcome-wizard.cc Sat Feb 06 07:32:37 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <QApplication>
--- a/libgui/src/welcome-wizard.h Sat Feb 06 06:40:13 2016 -0800 +++ b/libgui/src/welcome-wizard.h Sat Feb 06 07:32:37 2016 -0800 @@ -21,8 +21,8 @@ */ -#ifndef WELCOMEWIZARD_H -#define WELCOMEWIZARD_H +#if ! defined (octave_welcome_wizard_h) +#define octave_welcome_wizard_h 1 #include <QDialog> #include <QCheckBox>