From e32d8dc633d60b4f5d45d2be0303a5400c3dc28e Mon Sep 17 00:00:00 2001 From: David Capello Date: Mon, 24 Jan 2011 18:09:54 -0300 Subject: [PATCH] Rename src/gui/jview to src/gui/view. --- src/commands/fx/cmd_convolution_matrix.cpp | 8 ++++---- src/effect/effect.cpp | 2 +- src/gui/CMakeLists.txt | 2 +- src/gui/jinete.h | 2 +- src/gui/jlistbox.cpp | 2 +- src/gui/jtextbox.cpp | 2 +- src/gui/theme.cpp | 2 +- src/gui/{jview.cpp => view.cpp} | 2 +- src/gui/{jview.h => view.h} | 4 ++-- src/widgets/curvedit.cpp | 2 +- src/widgets/editor/click.cpp | 2 +- src/widgets/editor/keys.cpp | 2 +- src/widgets/paledit.cpp | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) rename src/gui/{jview.cpp => view.cpp} (99%) rename src/gui/{jview.h => view.h} (93%) diff --git a/src/commands/fx/cmd_convolution_matrix.cpp b/src/commands/fx/cmd_convolution_matrix.cpp index 261942333..914f0a77c 100644 --- a/src/commands/fx/cmd_convolution_matrix.cpp +++ b/src/commands/fx/cmd_convolution_matrix.cpp @@ -21,16 +21,16 @@ #include #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" diff --git a/src/effect/effect.cpp b/src/effect/effect.cpp index 3b7bbf45b..72ff031ac 100644 --- a/src/effect/effect.cpp +++ b/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" diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 06151611c..cec39da97 100644 --- a/src/gui/CMakeLists.txt +++ b/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) diff --git a/src/gui/jinete.h b/src/gui/jinete.h index 4f5bb2524..7695d9067 100644 --- a/src/gui/jinete.h +++ b/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 diff --git a/src/gui/jlistbox.cpp b/src/gui/jlistbox.cpp index 7b154e689..83cef105a 100644 --- a/src/gui/jlistbox.cpp +++ b/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; diff --git a/src/gui/jtextbox.cpp b/src/gui/jtextbox.cpp index 4aced1e82..b6fc745a7 100644 --- a/src/gui/jtextbox.cpp +++ b/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); diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index e7c758209..8c4577527 100644 --- a/src/gui/theme.cpp +++ b/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; diff --git a/src/gui/jview.cpp b/src/gui/view.cpp similarity index 99% rename from src/gui/jview.cpp rename to src/gui/view.cpp index 2cde20d15..6659c22d5 100644 --- a/src/gui/jview.cpp +++ b/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 diff --git a/src/gui/jview.h b/src/gui/view.h similarity index 93% rename from src/gui/jview.h rename to src/gui/view.h index b9f772b9e..f053131c6 100644 --- a/src/gui/jview.h +++ b/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 -#define GUI_JVIEW_H_INCLUDED +#ifndef GUI_VIEW_H_INCLUDED +#define GUI_VIEW_H_INCLUDED #include "gui/jbase.h" diff --git a/src/widgets/curvedit.cpp b/src/widgets/curvedit.cpp index 4dadd7f3d..d691efa71 100644 --- a/src/widgets/curvedit.cpp +++ b/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" diff --git a/src/widgets/editor/click.cpp b/src/widgets/editor/click.cpp index b9ed55b15..4a21ea2cc 100644 --- a/src/widgets/editor/click.cpp +++ b/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" diff --git a/src/widgets/editor/keys.cpp b/src/widgets/editor/keys.cpp index f28c57a71..f81dd13f8 100644 --- a/src/widgets/editor/keys.cpp +++ b/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" diff --git a/src/widgets/paledit.cpp b/src/widgets/paledit.cpp index 5e3f3a9fa..cf83b8d94 100644 --- a/src/widgets/paledit.cpp +++ b/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"