From 93f15847179707e3033b88575e109e96250a99d4 Mon Sep 17 00:00:00 2001 From: David Capello Date: Sat, 4 Dec 2010 11:21:32 -0300 Subject: [PATCH] Rename src/gui/jslider.h to src/gui/slider.h. --- src/commands/fx/cmd_convolution_matrix.cpp | 2 +- src/commands/fx/cmd_invert_color.cpp | 2 +- src/dialogs/maskcol.cpp | 2 +- src/gui/CMakeLists.txt | 2 +- src/gui/jinete.h | 8 ++++---- src/gui/{jslider.cpp => slider.cpp} | 0 src/gui/{jslider.h => slider.h} | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) rename src/gui/{jslider.cpp => slider.cpp} (100%) rename src/gui/{jslider.h => slider.h} (88%) diff --git a/src/commands/fx/cmd_convolution_matrix.cpp b/src/commands/fx/cmd_convolution_matrix.cpp index 2b0240aad..9a177ec37 100644 --- a/src/commands/fx/cmd_convolution_matrix.cpp +++ b/src/commands/fx/cmd_convolution_matrix.cpp @@ -27,8 +27,8 @@ #include "gui/label.h" #include "gui/jlist.h" #include "gui/jlistbox.h" -#include "gui/jslider.h" #include "gui/jview.h" +#include "gui/slider.h" #include "gui/widget.h" #include "gui/frame.h" diff --git a/src/commands/fx/cmd_invert_color.cpp b/src/commands/fx/cmd_invert_color.cpp index 3ad56058f..cf7ee0f85 100644 --- a/src/commands/fx/cmd_invert_color.cpp +++ b/src/commands/fx/cmd_invert_color.cpp @@ -23,7 +23,7 @@ #include "gui/button.h" #include "gui/jhook.h" #include "gui/label.h" -#include "gui/jslider.h" +#include "gui/slider.h" #include "gui/widget.h" #include "gui/frame.h" diff --git a/src/dialogs/maskcol.cpp b/src/dialogs/maskcol.cpp index cda2317ee..2faddce18 100644 --- a/src/dialogs/maskcol.cpp +++ b/src/dialogs/maskcol.cpp @@ -23,7 +23,7 @@ #include "gui/button.h" #include "gui/jhook.h" #include "gui/label.h" -#include "gui/jslider.h" +#include "gui/slider.h" #include "gui/widget.h" #include "gui/frame.h" diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index ac0555743..b6f8ce2ad 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -34,7 +34,6 @@ add_library(gui-lib jrect.cpp jregion.cpp jsep.cpp - jslider.cpp jstream.cpp jsystem.cpp jtextbox.cpp @@ -44,5 +43,6 @@ add_library(gui-lib label.cpp preferred_size_event.cpp property.cpp + slider.cpp themes/jstandard_theme.cpp widget.cpp) diff --git a/src/gui/jinete.h b/src/gui/jinete.h index a46ce7d05..c884f2827 100644 --- a/src/gui/jinete.h +++ b/src/gui/jinete.h @@ -7,11 +7,12 @@ #ifndef GUI_JINETE_H_INCLUDED #define GUI_JINETE_H_INCLUDED +#include "gui/button.h" +#include "gui/frame.h" #include "gui/jaccel.h" #include "gui/jalert.h" #include "gui/jbase.h" #include "gui/jbox.h" -#include "gui/button.h" #include "gui/jclipboard.h" #include "gui/jcombobox.h" #include "gui/jcustom_label.h" @@ -21,7 +22,6 @@ #include "gui/jgrid.h" #include "gui/jhook.h" #include "gui/jimage.h" -#include "gui/label.h" #include "gui/jlink_label.h" #include "gui/jlist.h" #include "gui/jlistbox.h" @@ -34,14 +34,14 @@ #include "gui/jrect.h" #include "gui/jregion.h" #include "gui/jsep.h" -#include "gui/jslider.h" #include "gui/jstream.h" #include "gui/jsystem.h" #include "gui/jtextbox.h" #include "gui/jtheme.h" #include "gui/jtooltips.h" #include "gui/jview.h" +#include "gui/label.h" +#include "gui/slider.h" #include "gui/widget.h" -#include "gui/frame.h" #endif diff --git a/src/gui/jslider.cpp b/src/gui/slider.cpp similarity index 100% rename from src/gui/jslider.cpp rename to src/gui/slider.cpp diff --git a/src/gui/jslider.h b/src/gui/slider.h similarity index 88% rename from src/gui/jslider.h rename to src/gui/slider.h index ebcc6c165..99c67c7f0 100644 --- a/src/gui/jslider.h +++ b/src/gui/slider.h @@ -4,8 +4,8 @@ // This source file is ditributed under a BSD-like license, please // read LICENSE.txt for more information. -#ifndef GUI_JSLIDER_H_INCLUDED -#define GUI_JSLIDER_H_INCLUDED +#ifndef GUI_SLIDER_H_INCLUDED +#define GUI_SLIDER_H_INCLUDED #include "gui/jbase.h"