Rename src/gui/jwidget.cpp|h to src/gui/widget.cpp|h.

2025-03-18 07:21:09 +00:00 · 2010-10-02 11:19:09 -03:00 · 2010-10-02 11:19:09 -03:00 · 36d532df21
commit 36d532df21
parent 8f6ae77a2e
49 changed files with 50 additions and 50 deletions
--- a/src/commands/cmd_remove_layer.cpp
+++ b/src/commands/cmd_remove_layer.cpp
@ -18,7 +18,7 @@

 #include "config.h"

-#include "gui/jwidget.h"
+#include "gui/widget.h"

 #include "app.h"
 #include "commands/command.h"
--- a/src/commands/fx/cmd_convolution_matrix.cpp
+++ b/src/commands/fx/cmd_convolution_matrix.cpp
@ -29,7 +29,7 @@
 #include "gui/jlistbox.h"
 #include "gui/jslider.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/frame.h"

 #include "app/color.h"
--- a/src/commands/fx/cmd_despeckle.cpp
+++ b/src/commands/fx/cmd_despeckle.cpp
@ -25,7 +25,7 @@
 #include "gui/button.h"
 #include "gui/jentry.h"
 #include "gui/jhook.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/frame.h"

 #include "commands/command.h"
--- a/src/commands/fx/cmd_invert_color.cpp
+++ b/src/commands/fx/cmd_invert_color.cpp
@ -24,7 +24,7 @@
 #include "gui/jhook.h"
 #include "gui/label.h"
 #include "gui/jslider.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/frame.h"

 #include "app/color.h"
--- a/src/dialogs/maskcol.cpp
+++ b/src/dialogs/maskcol.cpp
@ -24,7 +24,7 @@
 #include "gui/jhook.h"
 #include "gui/label.h"
 #include "gui/jslider.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/frame.h"

 #include "app.h"
--- a/src/effect/effect.cpp
+++ b/src/effect/effect.cpp
@ -25,7 +25,7 @@
 #include "gui/jrect.h"
 #include "gui/jregion.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"

 #include "console.h"
 #include "core/cfg.h"
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@ -42,8 +42,8 @@ add_library(gui-lib
  jthread.cpp
  jtooltips.cpp
  jview.cpp
-  jwidget.cpp
  label.cpp
  preferred_size_event.cpp
  property.cpp
-  themes/jstandard_theme.cpp)
+  themes/jstandard_theme.cpp
+  widget.cpp)
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@ -18,7 +18,7 @@
 #include "gui/jmessage.h"
 #include "gui/jrect.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/frame.h"
 #include "gui/preferred_size_event.h"

--- a/src/gui/button.h
+++ b/src/gui/button.h
@ -8,7 +8,7 @@
 #define GUI_BUTTON_H_INCLUDED

 #include "base/signal.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include <vector>

 struct BITMAP;
--- a/src/gui/frame.h
+++ b/src/gui/frame.h
@ -8,7 +8,7 @@
 #define GUI_FRAME_H_INCLUDED

 #include "base/signal.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"

 namespace Vaca {
  class CloseEvent { };		// TODO
--- a/src/gui/jbox.cpp
+++ b/src/gui/jbox.cpp
@ -11,7 +11,7 @@
 #include "gui/jlist.h"
 #include "gui/jmessage.h"
 #include "gui/jrect.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/jtheme.h"
 #include "gfx/size.h"

--- a/src/gui/jcombobox.h
+++ b/src/gui/jcombobox.h
@ -7,7 +7,7 @@
 #ifndef GUI_JCOMBOBOX_H_INCLUDED
 #define GUI_JCOMBOBOX_H_INCLUDED

-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include <vector>
 #include <string>

--- a/src/gui/jdraw.cpp
+++ b/src/gui/jdraw.cpp
@ -16,7 +16,7 @@
 #include "gui/jrect.h"
 #include "gui/jregion.h"
 #include "gui/jsystem.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"

 using namespace gfx;

--- a/src/gui/jentry.cpp
+++ b/src/gui/jentry.cpp
@ -18,7 +18,7 @@
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"

 #define CHARACTER_LENGTH(f, c) ((f)->vtable->char_length((f), (c)))

--- a/src/gui/jgrid.cpp
+++ b/src/gui/jgrid.cpp
@ -13,7 +13,7 @@
 #include "gui/jlist.h"
 #include "gui/jmessage.h"
 #include "gui/jrect.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/jtheme.h"
 #include "gfx/size.h"

--- a/src/gui/jimage.cpp
+++ b/src/gui/jimage.cpp
@ -14,7 +14,7 @@
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"

 static bool image_msg_proc(JWidget widget, JMessage msg);

--- a/src/gui/jinete.h
+++ b/src/gui/jinete.h
@ -42,7 +42,7 @@
 #include "gui/jthread.h"
 #include "gui/jtooltips.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/frame.h"

 #endif
--- a/src/gui/jintern.cpp
+++ b/src/gui/jintern.cpp
@ -10,7 +10,7 @@

 #include "gui/jmanager.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/frame.h"

 static std::vector<JWidget>* widgets;
--- a/src/gui/jlistbox.cpp
+++ b/src/gui/jlistbox.cpp
@ -15,7 +15,7 @@
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gfx/size.h"

 using namespace gfx;
--- a/src/gui/jmessage.cpp
+++ b/src/gui/jmessage.cpp
@ -13,7 +13,7 @@
 #include "gui/jmanager.h"
 #include "gui/jmessage.h"
 #include "gui/jrect.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"

 static int registered_messages = JM_REGISTERED_MESSAGES;

--- a/src/gui/jpanel.cpp
+++ b/src/gui/jpanel.cpp
@ -11,7 +11,7 @@
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gfx/size.h"

 typedef struct Panel
--- a/src/gui/jquickmenu.cpp
+++ b/src/gui/jquickmenu.cpp
@ -12,7 +12,7 @@
 #include "gui/jmessage.h"
 #include "gui/jquickmenu.h"
 #include "gui/jsep.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"

 typedef struct QuickData
 {
--- a/src/gui/jsep.cpp
+++ b/src/gui/jsep.cpp
@ -10,7 +10,7 @@
 #include "gui/jmessage.h"
 #include "gui/jrect.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gfx/size.h"

 using namespace gfx;
--- a/src/gui/jslider.cpp
+++ b/src/gui/jslider.cpp
@ -14,7 +14,7 @@
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"

 typedef struct Slider
 {
--- a/src/gui/jsystem.cpp
+++ b/src/gui/jsystem.cpp
@ -17,7 +17,7 @@
 #include "gui/jregion.h"
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"

 /* Global output bitmap.  */

--- a/src/gui/jtextbox.cpp
+++ b/src/gui/jtextbox.cpp
@ -17,7 +17,7 @@
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"

 static bool textbox_msg_proc(JWidget widget, JMessage msg);
 static void textbox_request_size(JWidget widget, int *w, int *h);
--- a/src/gui/jtheme.cpp
+++ b/src/gui/jtheme.cpp
@ -16,7 +16,7 @@
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"

 static JTheme ji_current_theme = NULL;
 static JTheme ji_standard_theme = NULL;
--- a/src/gui/jview.cpp
+++ b/src/gui/jview.cpp
@ -14,7 +14,7 @@
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gfx/size.h"

 #define BAR_SIZE widget->theme->scrollbar_size
--- a/src/gui/label.h
+++ b/src/gui/label.h
@ -7,7 +7,7 @@
 #ifndef GUI_LABEL_H_INCLUDED
 #define GUI_LABEL_H_INCLUDED

-#include "gui/jwidget.h"
+#include "gui/widget.h"

 class Label : public Widget
 {
--- a/src/gui/preferred_size_event.cpp
+++ b/src/gui/preferred_size_event.cpp
@ -5,7 +5,7 @@
 // read LICENSE.txt for more information.

 #include "gui/preferred_size_event.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"

 using namespace gfx;

--- a/src/gui/jwidget.cpp
+++ b/src/gui/jwidget.cpp
--- a/src/gui/jwidget.h
+++ b/src/gui/jwidget.h
@ -4,8 +4,8 @@
 // This source file is ditributed under a BSD-like license, please
 // read LICENSE.txt for more information.

-#ifndef GUI_JWIDGET_H_INCLUDED
-#define GUI_JWIDGET_H_INCLUDED
+#ifndef GUI_WIDGET_H_INCLUDED
+#define GUI_WIDGET_H_INCLUDED

 #include <string>

--- a/src/job.cpp
+++ b/src/job.cpp
@ -20,7 +20,7 @@

 #include "gui/jalert.h"
 #include "gui/jthread.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/frame.h"

 #include "app.h"
--- a/src/util/misc.cpp
+++ b/src/util/misc.cpp
@ -27,7 +27,7 @@
 #include "gui/jlist.h"
 #include "gui/jmanager.h"
 #include "gui/jsystem.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
--- a/src/widgets/color_bar.h
+++ b/src/widgets/color_bar.h
@ -21,7 +21,7 @@

 #include "app/color.h"
 #include "base/signal.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"

 class ColorBar : public Widget
 {
--- a/src/widgets/colview.cpp
+++ b/src/widgets/colview.cpp
@ -27,7 +27,7 @@
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "widgets/colview.h"
--- a/src/widgets/curvedit.cpp
+++ b/src/widgets/curvedit.cpp
@ -32,7 +32,7 @@
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/frame.h"
 #include "modules/gui.h"
 #include "widgets/curvedit.h"
--- a/src/widgets/editor.h
+++ b/src/widgets/editor.h
@ -22,7 +22,7 @@
 #include "app/color.h"
 #include "base/signal.h"
 #include "gui/jbase.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"

 #define MIN_ZOOM 0
 #define MAX_ZOOM 5
--- a/src/widgets/editor/click.cpp
+++ b/src/widgets/editor/click.cpp
@ -25,7 +25,7 @@
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "modules/gui.h"
 #include "widgets/editor.h"

--- a/src/widgets/editor/cursor.cpp
+++ b/src/widgets/editor/cursor.cpp
@ -30,7 +30,7 @@
 #include "gui/jrect.h"
 #include "gui/jregion.h"
 #include "gui/jsystem.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "modules/editors.h"
 #include "raster/image.h"
 #include "raster/layer.h"
--- a/src/widgets/editor/keys.cpp
+++ b/src/widgets/editor/keys.cpp
@ -25,7 +25,7 @@
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "raster/image.h"
--- a/src/widgets/groupbut.cpp
+++ b/src/widgets/groupbut.cpp
@ -28,7 +28,7 @@
 #include "gui/jlist.h"
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "modules/gui.h"
 #include "widgets/groupbut.h"

--- a/src/widgets/menuitem.cpp
+++ b/src/widgets/menuitem.cpp
@ -27,7 +27,7 @@
 #include "gui/jhook.h"
 #include "gui/jmenu.h"
 #include "gui/jmessage.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "modules/gui.h"
 #include "ui_context.h"

--- a/src/widgets/paledit.cpp
+++ b/src/widgets/paledit.cpp
@ -29,7 +29,7 @@
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
 #include "raster/blend.h"
--- a/src/widgets/paledit.h
+++ b/src/widgets/paledit.h
@ -21,7 +21,7 @@

 #include <allegro/color.h>

-#include "gui/jwidget.h"
+#include "gui/widget.h"

 // TODO use some JI_SIGNAL_USER
 #define SIGNAL_PALETTE_EDITOR_CHANGE   0x10005
--- a/src/widgets/preview.cpp
+++ b/src/widgets/preview.cpp
@ -21,7 +21,7 @@
 #include "effect/effect.h"
 #include "gui/jmanager.h"
 #include "gui/jmessage.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "raster/sprite.h"
 #include "util/render.h"
 #include "widgets/preview.h"
--- a/src/widgets/statebar.h
+++ b/src/widgets/statebar.h
@ -21,7 +21,7 @@

 #include "app/color.h"
 #include "gui/jbase.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"

 class Frame;
 class StatusBar;
--- a/src/widgets/tabs.h
+++ b/src/widgets/tabs.h
@ -19,7 +19,7 @@
 #ifndef WIDGETS_TABS_H_INCLUDED
 #define WIDGETS_TABS_H_INCLUDED

-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include <vector>

 class Tabs;
--- a/src/widgets/target.cpp
+++ b/src/widgets/target.cpp
@ -28,7 +28,7 @@
 #include "gui/button.h"
 #include "gui/jhook.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "raster/image.h"