# HG changeset patch # User John W. Eaton # Date 1393000536 18000 # Node ID fb96b7f5524295c2e538106f6fe57746a8e12aba # Parent b75adad91fc62e6356294b4e4b281d6ad3643fe4 rename file to avoid clash on case-insenstive filesystems (bug #41658) * libgui/graphics/QtHandlesUtils.cc: Rename from Utils.cc. * libgui/graphics/QtHandlesUtils.h: Rename from Utils.h. Change all uses. * libgui/graphics/module.mk: Update lists. diff --git a/libgui/graphics/BaseControl.cc b/libgui/graphics/BaseControl.cc --- a/libgui/graphics/BaseControl.cc +++ b/libgui/graphics/BaseControl.cc @@ -31,7 +31,7 @@ #include "BaseControl.h" #include "ContextMenu.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/ButtonControl.cc b/libgui/graphics/ButtonControl.cc --- a/libgui/graphics/ButtonControl.cc +++ b/libgui/graphics/ButtonControl.cc @@ -28,7 +28,7 @@ #include "ButtonControl.h" #include "Container.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/Canvas.cc b/libgui/graphics/Canvas.cc --- a/libgui/graphics/Canvas.cc +++ b/libgui/graphics/Canvas.cc @@ -33,7 +33,7 @@ #include "Canvas.h" #include "ContextMenu.h" #include "GLCanvas.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/Container.cc b/libgui/graphics/Container.cc --- a/libgui/graphics/Container.cc +++ b/libgui/graphics/Container.cc @@ -31,7 +31,7 @@ #include "Canvas.h" #include "Container.h" #include "Object.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/ContextMenu.cc b/libgui/graphics/ContextMenu.cc --- a/libgui/graphics/ContextMenu.cc +++ b/libgui/graphics/ContextMenu.cc @@ -28,7 +28,7 @@ #include "Backend.h" #include "ContextMenu.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/EditControl.cc b/libgui/graphics/EditControl.cc --- a/libgui/graphics/EditControl.cc +++ b/libgui/graphics/EditControl.cc @@ -29,7 +29,7 @@ #include "Container.h" #include "EditControl.h" #include "TextEdit.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/Figure.cc b/libgui/graphics/Figure.cc --- a/libgui/graphics/Figure.cc +++ b/libgui/graphics/Figure.cc @@ -43,7 +43,7 @@ #include "Figure.h" #include "FigureWindow.h" #include "MouseModeActionGroup.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/ListBoxControl.cc b/libgui/graphics/ListBoxControl.cc --- a/libgui/graphics/ListBoxControl.cc +++ b/libgui/graphics/ListBoxControl.cc @@ -28,7 +28,7 @@ #include "Container.h" #include "ListBoxControl.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/Menu.cc b/libgui/graphics/Menu.cc --- a/libgui/graphics/Menu.cc +++ b/libgui/graphics/Menu.cc @@ -31,7 +31,7 @@ #include "Figure.h" #include "Menu.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/Object.cc b/libgui/graphics/Object.cc --- a/libgui/graphics/Object.cc +++ b/libgui/graphics/Object.cc @@ -28,7 +28,7 @@ #include "Backend.h" #include "Object.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/ObjectFactory.cc b/libgui/graphics/ObjectFactory.cc --- a/libgui/graphics/ObjectFactory.cc +++ b/libgui/graphics/ObjectFactory.cc @@ -49,7 +49,7 @@ #include "ToggleButtonControl.h" #include "ToggleTool.h" #include "ToolBar.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/Panel.cc b/libgui/graphics/Panel.cc --- a/libgui/graphics/Panel.cc +++ b/libgui/graphics/Panel.cc @@ -34,7 +34,7 @@ #include "Container.h" #include "ContextMenu.h" #include "Panel.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/PopupMenuControl.cc b/libgui/graphics/PopupMenuControl.cc --- a/libgui/graphics/PopupMenuControl.cc +++ b/libgui/graphics/PopupMenuControl.cc @@ -28,7 +28,7 @@ #include "Container.h" #include "PopupMenuControl.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/PushButtonControl.cc b/libgui/graphics/PushButtonControl.cc --- a/libgui/graphics/PushButtonControl.cc +++ b/libgui/graphics/PushButtonControl.cc @@ -29,7 +29,7 @@ #include "PushButtonControl.h" #include "Container.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/Utils.cc b/libgui/graphics/QtHandlesUtils.cc rename from libgui/graphics/Utils.cc rename to libgui/graphics/QtHandlesUtils.cc --- a/libgui/graphics/Utils.cc +++ b/libgui/graphics/QtHandlesUtils.cc @@ -37,7 +37,7 @@ #include "Container.h" #include "KeyMap.h" #include "Object.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/Utils.h b/libgui/graphics/QtHandlesUtils.h rename from libgui/graphics/Utils.h rename to libgui/graphics/QtHandlesUtils.h diff --git a/libgui/graphics/RadioButtonControl.cc b/libgui/graphics/RadioButtonControl.cc --- a/libgui/graphics/RadioButtonControl.cc +++ b/libgui/graphics/RadioButtonControl.cc @@ -28,7 +28,7 @@ #include "RadioButtonControl.h" #include "Container.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/SliderControl.cc b/libgui/graphics/SliderControl.cc --- a/libgui/graphics/SliderControl.cc +++ b/libgui/graphics/SliderControl.cc @@ -28,7 +28,7 @@ #include "Container.h" #include "SliderControl.h" -#include "Utils.h" +#include "QtHandlesUtils.h" #define RANGE_INT_MAX 1000000 diff --git a/libgui/graphics/TextControl.cc b/libgui/graphics/TextControl.cc --- a/libgui/graphics/TextControl.cc +++ b/libgui/graphics/TextControl.cc @@ -28,7 +28,7 @@ #include "Container.h" #include "TextControl.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/ToggleButtonControl.cc b/libgui/graphics/ToggleButtonControl.cc --- a/libgui/graphics/ToggleButtonControl.cc +++ b/libgui/graphics/ToggleButtonControl.cc @@ -28,7 +28,7 @@ #include "ToggleButtonControl.h" #include "Container.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/ToolBar.cc b/libgui/graphics/ToolBar.cc --- a/libgui/graphics/ToolBar.cc +++ b/libgui/graphics/ToolBar.cc @@ -36,7 +36,7 @@ #include "Figure.h" #include "ToolBar.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/ToolBarButton.cc b/libgui/graphics/ToolBarButton.cc --- a/libgui/graphics/ToolBarButton.cc +++ b/libgui/graphics/ToolBarButton.cc @@ -28,7 +28,7 @@ #include #include "ToolBarButton.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/__init_qt__.cc b/libgui/graphics/__init_qt__.cc --- a/libgui/graphics/__init_qt__.cc +++ b/libgui/graphics/__init_qt__.cc @@ -36,7 +36,7 @@ #include "defun.h" #include "Backend.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff --git a/libgui/graphics/module.mk b/libgui/graphics/module.mk --- a/libgui/graphics/module.mk +++ b/libgui/graphics/module.mk @@ -56,6 +56,7 @@ graphics/PopupMenuControl.h \ graphics/PushButtonControl.h \ graphics/PushTool.h \ + graphics/QtHandlesUtils.h \ graphics/RadioButtonControl.h \ graphics/SliderControl.h \ graphics/TextControl.h \ @@ -64,7 +65,6 @@ graphics/ToggleTool.h \ graphics/ToolBar.h \ graphics/ToolBarButton.h \ - graphics/Utils.h \ graphics/gl-select.h graphics_libgui_graphics_la_SOURCES = \ @@ -92,6 +92,7 @@ graphics/PopupMenuControl.cc \ graphics/PushButtonControl.cc \ graphics/PushTool.cc \ + graphics/QtHandlesUtils.cc \ graphics/RadioButtonControl.cc \ graphics/SliderControl.cc \ graphics/TextControl.cc \ @@ -100,7 +101,6 @@ graphics/ToggleTool.cc \ graphics/ToolBar.cc \ graphics/ToolBarButton.cc \ - graphics/Utils.cc \ graphics/gl-select.cc nodist_graphics_libgui_graphics_la_SOURCES = $(octave_gui_graphics_MOC) $(octave_gui_graphics_RC)