From 7f96084c888de224bb339d0cbcc8653869790a8b Mon Sep 17 00:00:00 2001 From: David Capello Date: Sat, 2 Oct 2010 10:47:58 -0300 Subject: [PATCH] Rename src/gui/jwindow.cpp|h to src/gui/frame.cpp|h. --- src/commands/cmd_grid.cpp | 2 +- src/commands/fx/cmd_convolution_matrix.cpp | 2 +- src/commands/fx/cmd_despeckle.cpp | 2 +- src/commands/fx/cmd_invert_color.cpp | 2 +- src/core/drop_files.cpp | 2 +- src/dialogs/maskcol.cpp | 2 +- src/gfxmode.cpp | 2 +- src/gui/CMakeLists.txt | 2 +- src/gui/{jwindow.cpp => frame.cpp} | 0 src/gui/{jwindow.h => frame.h} | 4 ++-- src/gui/jbutton.cpp | 2 +- src/gui/jinete.h | 2 +- src/gui/jintern.cpp | 2 +- src/gui/jpopup_window.h | 2 +- src/gui/jtooltips.h | 2 +- src/job.cpp | 2 +- src/widgets/curvedit.cpp | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) rename src/gui/{jwindow.cpp => frame.cpp} (100%) rename src/gui/{jwindow.h => frame.h} (95%) diff --git a/src/commands/cmd_grid.cpp b/src/commands/cmd_grid.cpp index d85e80389..c492a5b9a 100644 --- a/src/commands/cmd_grid.cpp +++ b/src/commands/cmd_grid.cpp @@ -20,7 +20,7 @@ #include -#include "gui/jwindow.h" +#include "gui/frame.h" #include "commands/command.h" #include "context.h" diff --git a/src/commands/fx/cmd_convolution_matrix.cpp b/src/commands/fx/cmd_convolution_matrix.cpp index 95377e568..787784d23 100644 --- a/src/commands/fx/cmd_convolution_matrix.cpp +++ b/src/commands/fx/cmd_convolution_matrix.cpp @@ -30,7 +30,7 @@ #include "gui/jslider.h" #include "gui/jview.h" #include "gui/jwidget.h" -#include "gui/jwindow.h" +#include "gui/frame.h" #include "app/color.h" #include "commands/command.h" diff --git a/src/commands/fx/cmd_despeckle.cpp b/src/commands/fx/cmd_despeckle.cpp index edfb9131a..9b8827f7d 100644 --- a/src/commands/fx/cmd_despeckle.cpp +++ b/src/commands/fx/cmd_despeckle.cpp @@ -26,7 +26,7 @@ #include "gui/jentry.h" #include "gui/jhook.h" #include "gui/jwidget.h" -#include "gui/jwindow.h" +#include "gui/frame.h" #include "commands/command.h" #include "commands/fx/effectbg.h" diff --git a/src/commands/fx/cmd_invert_color.cpp b/src/commands/fx/cmd_invert_color.cpp index 146d09997..6dcb0fe35 100644 --- a/src/commands/fx/cmd_invert_color.cpp +++ b/src/commands/fx/cmd_invert_color.cpp @@ -25,7 +25,7 @@ #include "gui/jlabel.h" #include "gui/jslider.h" #include "gui/jwidget.h" -#include "gui/jwindow.h" +#include "gui/frame.h" #include "app/color.h" #include "commands/command.h" diff --git a/src/core/drop_files.cpp b/src/core/drop_files.cpp index 855e169a7..285531661 100644 --- a/src/core/drop_files.cpp +++ b/src/core/drop_files.cpp @@ -21,7 +21,7 @@ #include #include -#include "gui/jwindow.h" +#include "gui/frame.h" #include "app.h" #include "base/mutex.h" diff --git a/src/dialogs/maskcol.cpp b/src/dialogs/maskcol.cpp index c2248563b..2e9ab3b68 100644 --- a/src/dialogs/maskcol.cpp +++ b/src/dialogs/maskcol.cpp @@ -25,7 +25,7 @@ #include "gui/jlabel.h" #include "gui/jslider.h" #include "gui/jwidget.h" -#include "gui/jwindow.h" +#include "gui/frame.h" #include "app.h" #include "app/color.h" diff --git a/src/gfxmode.cpp b/src/gfxmode.cpp index f14e5c0d3..b26210e5a 100644 --- a/src/gfxmode.cpp +++ b/src/gfxmode.cpp @@ -21,7 +21,7 @@ #include #include "gui/jmanager.h" -#include "gui/jwindow.h" +#include "gui/frame.h" #include "app.h" #include "gfxmode.h" diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index efb8a0f30..9e66e7cd8 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -4,6 +4,7 @@ add_library(gui-lib component.cpp event.cpp + frame.cpp jaccel.cpp jalert.cpp jbox.cpp @@ -43,7 +44,6 @@ add_library(gui-lib jtooltips.cpp jview.cpp jwidget.cpp - jwindow.cpp preferred_size_event.cpp property.cpp themes/jstandard_theme.cpp) diff --git a/src/gui/jwindow.cpp b/src/gui/frame.cpp similarity index 100% rename from src/gui/jwindow.cpp rename to src/gui/frame.cpp diff --git a/src/gui/jwindow.h b/src/gui/frame.h similarity index 95% rename from src/gui/jwindow.h rename to src/gui/frame.h index da81ff5ce..a5c3c3a91 100644 --- a/src/gui/jwindow.h +++ b/src/gui/frame.h @@ -4,8 +4,8 @@ // This source file is ditributed under a BSD-like license, please // read LICENSE.txt for more information. -#ifndef GUI_JWINDOW_H_INCLUDED -#define GUI_JWINDOW_H_INCLUDED +#ifndef GUI_FRAME_H_INCLUDED +#define GUI_FRAME_H_INCLUDED #include "base/signal.h" #include "gui/jwidget.h" diff --git a/src/gui/jbutton.cpp b/src/gui/jbutton.cpp index 3c0db027f..d43afa9b5 100644 --- a/src/gui/jbutton.cpp +++ b/src/gui/jbutton.cpp @@ -19,7 +19,7 @@ #include "gui/jrect.h" #include "gui/jtheme.h" #include "gui/jwidget.h" -#include "gui/jwindow.h" +#include "gui/frame.h" #include "gui/preferred_size_event.h" ButtonBase::ButtonBase(const char* text, int type, int behaviorType, int drawType) diff --git a/src/gui/jinete.h b/src/gui/jinete.h index 50736a980..f4a3db507 100644 --- a/src/gui/jinete.h +++ b/src/gui/jinete.h @@ -43,6 +43,6 @@ #include "gui/jtooltips.h" #include "gui/jview.h" #include "gui/jwidget.h" -#include "gui/jwindow.h" +#include "gui/frame.h" #endif diff --git a/src/gui/jintern.cpp b/src/gui/jintern.cpp index 8ed33d48e..9fd861a2a 100644 --- a/src/gui/jintern.cpp +++ b/src/gui/jintern.cpp @@ -11,7 +11,7 @@ #include "gui/jmanager.h" #include "gui/jtheme.h" #include "gui/jwidget.h" -#include "gui/jwindow.h" +#include "gui/frame.h" static std::vector* widgets; diff --git a/src/gui/jpopup_window.h b/src/gui/jpopup_window.h index 5f65de005..9c5aeec46 100644 --- a/src/gui/jpopup_window.h +++ b/src/gui/jpopup_window.h @@ -7,7 +7,7 @@ #ifndef GUI_JPOPUP_WINDOW_H_INCLUDED #define GUI_JPOPUP_WINDOW_H_INCLUDED -#include "gui/jwindow.h" +#include "gui/frame.h" class PopupWindow : public Frame { diff --git a/src/gui/jtooltips.h b/src/gui/jtooltips.h index 3c0027223..6c267aa61 100644 --- a/src/gui/jtooltips.h +++ b/src/gui/jtooltips.h @@ -8,7 +8,7 @@ #define GUI_JTOOLTIPS_H_INCLUDED #include "gui/jbase.h" -#include "gui/jwindow.h" +#include "gui/frame.h" class TipWindow : public Frame { diff --git a/src/job.cpp b/src/job.cpp index 59fb11d12..0e68ca549 100644 --- a/src/job.cpp +++ b/src/job.cpp @@ -21,7 +21,7 @@ #include "gui/jalert.h" #include "gui/jthread.h" #include "gui/jwidget.h" -#include "gui/jwindow.h" +#include "gui/frame.h" #include "app.h" #include "base/mutex.h" diff --git a/src/widgets/curvedit.cpp b/src/widgets/curvedit.cpp index d89512f42..bd4c36f65 100644 --- a/src/widgets/curvedit.cpp +++ b/src/widgets/curvedit.cpp @@ -33,7 +33,7 @@ #include "gui/jsystem.h" #include "gui/jview.h" #include "gui/jwidget.h" -#include "gui/jwindow.h" +#include "gui/frame.h" #include "modules/gui.h" #include "widgets/curvedit.h"