Rename colbar.h to color_bar.h.

makefile.lst

@@ -215,7 +215,7 @@ COMMON_SOURCES =					\
 	src/util/recscr.cpp				\
 	src/util/render.cpp				\
 	src/util/thmbnail.cpp				\
-	src/widgets/colbar.cpp				\
+	src/widgets/color_bar.cpp			\
 	src/widgets/colbut.cpp				\
 	src/widgets/colsel.cpp				\
 	src/widgets/colview.cpp				\

src/CMakeLists.txt

@@ -237,7 +237,7 @@ add_executable(aseprite WIN32
   util/recscr.cpp
   util/render.cpp
   util/thmbnail.cpp
-  widgets/colbar.cpp
+  widgets/color_bar.cpp
   widgets/colbut.cpp
   widgets/colsel.cpp
   widgets/colview.cpp

src/app.cpp

@@ -60,7 +60,7 @@
 #include "util/boundary.h"
 #include "util/recscr.h"
 #include "util/render.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/editor.h"
 #include "widgets/menuitem.h"
 #include "widgets/statebar.h"

src/commands/cmd_advanced_mode.cpp

@@ -24,7 +24,7 @@
 #include "app.h"
 #include "core/cfg.h"
 #include "modules/gui.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/statebar.h"
 #include "widgets/tabs.h"
 

src/commands/cmd_background_from_layer.cpp

@@ -24,7 +24,7 @@
 #include "raster/sprite.h"
 #include "sprite_wrappers.h"
 #include "undoable.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 
 class BackgroundFromLayerCommand : public Command
 {

src/commands/cmd_canvas_size.cpp

@@ -29,7 +29,7 @@
 #include "raster/sprite.h"
 #include "sprite_wrappers.h"
 #include "undoable.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 
 class CanvasSizeCommand : public Command
 {

src/commands/cmd_change_color.cpp

@@ -23,7 +23,7 @@
 #include "commands/command.h"
 #include "commands/params.h"
 #include "app.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 
 class ChangeColorCommand : public Command
 {

src/commands/cmd_clear.cpp

@@ -27,7 +27,7 @@
 #include "raster/undo.h"
 #include "sprite_wrappers.h"
 #include "undoable.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 
 //////////////////////////////////////////////////////////////////////
 // ClearCommand

src/commands/cmd_crop.cpp

@@ -26,7 +26,7 @@
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "undoable.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "util/autocrop.h"
 #include "util/misc.h"
 #include "sprite_wrappers.h"

src/commands/cmd_eyedropper.cpp

@@ -28,7 +28,7 @@
 #include "modules/editors.h"
 #include "raster/sprite.h"
 #include "raster/image.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/editor.h"
 
 //////////////////////////////////////////////////////////////////////

src/commands/cmd_flatten_layers.cpp

@@ -23,7 +23,7 @@
 #include "modules/gui.h"
 #include "raster/sprite.h"
 #include "undoable.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "sprite_wrappers.h"
 
 //////////////////////////////////////////////////////////////////////

src/commands/cmd_new_file.cpp

@@ -36,7 +36,7 @@
 #include "raster/sprite.h"
 #include "raster/undo.h"
 #include "util/misc.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 
 //////////////////////////////////////////////////////////////////////
 // new_file

src/commands/cmd_palette_editor.cpp

@@ -42,7 +42,7 @@
 #include "raster/stock.h"
 #include "raster/undo.h"
 #include "util/quantize.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/colview.h"
 #include "widgets/editor.h"
 #include "widgets/paledit.h"

src/commands/cmd_rotate_canvas.cpp

@@ -33,7 +33,7 @@
 #include "raster/sprite.h"
 #include "raster/stock.h"
 #include "undoable.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "sprite_wrappers.h"
 
 //////////////////////////////////////////////////////////////////////

src/commands/cmd_switch_colors.cpp

@@ -24,7 +24,7 @@
 
 #include "commands/command.h"
 #include "app.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 
 class SwitchColorsCommand : public Command
 {

src/commands/fx/cmd_replace_color.cpp

@@ -37,7 +37,7 @@
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "util/misc.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/colbut.h"
 #include "widgets/preview.h"
 #include "widgets/target.h"

src/core/color.cpp

@@ -32,7 +32,7 @@
 #include "raster/layer.h"
 #include "raster/palette.h"
 #include "raster/sprite.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 
 /* #define GET_COLOR_TYPE(color)	((ase_uint32)((color).coltype)) */
 /* #define GET_COLOR_DATA(color)	((ase_uint32)((color).imgcolor)) */

src/dialogs/drawtext.cpp

@@ -36,7 +36,7 @@
 #include "resource_finder.h"
 #include "util/clipboard.h"
 #include "util/misc.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/colbut.h"
 
 static JWidget font_button;

src/dialogs/maskcol.cpp

@@ -38,7 +38,7 @@
 #include "raster/sprite.h"
 #include "raster/undo.h"
 #include "util/misc.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/colbut.h"
 
 static ColorButton* button_color;

src/settings/ui_settings_impl.cpp

@@ -27,7 +27,7 @@
 #include "ui_context.h"
 #include "tools/tool.h"
 #include "tools/toolbox.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 
 //////////////////////////////////////////////////////////////////////
 // UISettingsImpl

src/util/clipboard.cpp

@@ -45,7 +45,7 @@
 #include "undoable.h"
 #include "util/clipboard.h"
 #include "util/misc.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/statebar.h"
 
 #if defined ALLEGRO_WINDOWS

src/widgets/colbut.cpp

@@ -27,7 +27,7 @@
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "raster/sprite.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/colbut.h"
 #include "widgets/colsel.h"
 #include "widgets/editor.h"

src/widgets/color_bar.cpp

@@ -39,7 +39,7 @@
 #include "raster/palette.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/colsel.h"
 #include "widgets/paledit.h"
 #include "widgets/statebar.h"

src/widgets/color_bar.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef WIDGETS_COLBAR_H_INCLUDED
-#define WIDGETS_COLBAR_H_INCLUDED
+#ifndef WIDGETS_COLOR_BAR_H_INCLUDED
+#define WIDGETS_COLOR_BAR_H_INCLUDED
 
 #include "Vaca/Signal.h"
 #include "jinete/jwidget.h"

src/widgets/editor/editor.cpp

@@ -43,7 +43,7 @@
 #include "util/misc.h"
 #include "util/recscr.h"
 #include "util/render.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/editor.h"
 #include "widgets/editor/pixels_movement.h"
 #include "widgets/statebar.h"

src/widgets/editor/keys.cpp

@@ -33,7 +33,7 @@
 #include "raster/sprite.h"
 #include "settings/settings.h"
 #include "ui_context.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/editor.h"
 
 bool Editor::editor_keys_toset_zoom(int scancode)