Rename src/gui/jview to src/gui/view.

src/commands/fx/cmd_convolution_matrix.cpp

@@ -21,16 +21,16 @@
 #include <string.h>
 
 #include "base/bind.h"
-#include "gui/jbox.h"
 #include "gui/button.h"
+#include "gui/frame.h"
+#include "gui/jbox.h"
 #include "gui/jhook.h"
-#include "gui/label.h"
 #include "gui/jlist.h"
 #include "gui/jlistbox.h"
-#include "gui/jview.h"
+#include "gui/label.h"
 #include "gui/slider.h"
+#include "gui/view.h"
 #include "gui/widget.h"
-#include "gui/frame.h"
 
 #include "app/color.h"
 #include "commands/command.h"

src/effect/effect.cpp

@@ -24,7 +24,7 @@
 #include "gui/jmanager.h"
 #include "gui/jrect.h"
 #include "gui/jregion.h"
-#include "gui/jview.h"
+#include "gui/view.h"
 #include "gui/widget.h"
 
 #include "console.h"

src/gui/CMakeLists.txt

@@ -36,11 +36,11 @@ add_library(gui-lib
   jsystem.cpp
   jtextbox.cpp
   jtooltips.cpp
-  jview.cpp
   label.cpp
   popup_frame.cpp
   preferred_size_event.cpp
   property.cpp
   slider.cpp
   theme.cpp
+  view.cpp
   widget.cpp)

src/gui/jinete.h

@@ -37,12 +37,12 @@
 #include "gui/jsystem.h"
 #include "gui/jtextbox.h"
 #include "gui/jtooltips.h"
-#include "gui/jview.h"
 #include "gui/label.h"
 #include "gui/popup_frame.h"
 #include "gui/property.h"
 #include "gui/slider.h"
 #include "gui/theme.h"
+#include "gui/view.h"
 #include "gui/widget.h"
 
 #endif

src/gui/jlistbox.cpp

@@ -14,8 +14,8 @@
 #include "gui/jmessage.h"
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
-#include "gui/jview.h"
 #include "gui/theme.h"
+#include "gui/view.h"
 #include "gui/widget.h"
 
 using namespace gfx;

src/gui/jtextbox.cpp

@@ -15,8 +15,8 @@
 #include "gui/jmessage.h"
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
-#include "gui/jview.h"
 #include "gui/theme.h"
+#include "gui/view.h"
 #include "gui/widget.h"
 
 static bool textbox_msg_proc(JWidget widget, JMessage msg);

src/gui/theme.cpp

@@ -14,8 +14,8 @@
 #include "gui/jmanager.h"
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
-#include "gui/jview.h"
 #include "gui/theme.h"
+#include "gui/view.h"
 #include "gui/widget.h"
 
 static Theme* current_theme = NULL;

src/gui/view.cpp

@@ -13,8 +13,8 @@
 #include "gui/jrect.h"
 #include "gui/jregion.h"
 #include "gui/jsystem.h"
-#include "gui/jview.h"
 #include "gui/theme.h"
+#include "gui/view.h"
 #include "gui/widget.h"
 
 #define BAR_SIZE widget->getTheme()->scrollbar_size

src/gui/view.h

@@ -4,8 +4,8 @@
 // This source file is ditributed under a BSD-like license, please
 // read LICENSE.txt for more information.
 
-#ifndef GUI_JVIEW_H_INCLUDED
+#ifndef GUI_VIEW_H_INCLUDED
-#define GUI_JVIEW_H_INCLUDED
+#define GUI_VIEW_H_INCLUDED
 
 #include "gui/jbase.h"
 

src/widgets/curvedit.cpp

@@ -33,7 +33,7 @@
 #include "gui/jmessage.h"
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
-#include "gui/jview.h"
+#include "gui/view.h"
 #include "gui/widget.h"
 #include "modules/gui.h"
 #include "widgets/curvedit.h"

src/widgets/editor/click.cpp

@@ -24,7 +24,7 @@
 #include "gui/jmanager.h"
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
-#include "gui/jview.h"
+#include "gui/view.h"
 #include "gui/widget.h"
 #include "modules/gui.h"
 #include "widgets/editor.h"

src/widgets/editor/keys.cpp

@@ -24,7 +24,7 @@
 #include "app/color.h"
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
-#include "gui/jview.h"
+#include "gui/view.h"
 #include "gui/widget.h"
 #include "modules/editors.h"
 #include "modules/gui.h"

src/widgets/paledit.cpp

@@ -27,8 +27,8 @@
 #include "gui/jmessage.h"
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
-#include "gui/jview.h"
 #include "gui/theme.h"
+#include "gui/view.h"
 #include "gui/widget.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"