diff options
| author | Benjamin Otte <otte@redhat.com> | 2015-01-17 18:00:03 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2015-01-20 06:30:18 +0100 |
| commit | 717877dff2c53804e26b688275a1ca284bbf7306 (patch) | |
| tree | 72a9f4e7097345b383cdb90a0e6d2d6be42b7808 | |
| parent | cb0ca9a804554d8bf90c88e80802210edbcd6245 (diff) | |
| download | gtk+-717877dff2c53804e26b688275a1ca284bbf7306.tar.gz | |
render: Rename gtkborderimage.[ch]
I want the gtkrender prefix for all filenames about rendering.
| -rw-r--r-- | gtk/Makefile.am | 4 | ||||
| -rw-r--r-- | gtk/deprecated/gtkstyleproperties.c | 1 | ||||
| -rw-r--r-- | gtk/gtkrender.c | 2 | ||||
| -rw-r--r-- | gtk/gtkrenderborder.c (renamed from gtk/gtkborderimage.c) | 5 | ||||
| -rw-r--r-- | gtk/gtkrenderborderprivate.h (renamed from gtk/gtkborderimageprivate.h) | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 4c9f2443ba..0deed771ce 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -353,7 +353,6 @@ gtk_private_h_sources = \ gtkbitmaskprivate.h \ gtkbitmaskprivateimpl.h \ gtkbookmarksmanager.h \ - gtkborderimageprivate.h \ gtkboxprivate.h \ gtkbuilderprivate.h \ gtkbuttonprivate.h \ @@ -478,6 +477,7 @@ gtk_private_h_sources = \ gtkrecentchooserprivate.h \ gtkrecentchooserutils.h \ gtkrenderbackgroundprivate.h \ + gtkrenderborderprivate.h \ gtkrenderprivate.h \ gtkresources.h \ gtkroundedboxprivate.h \ @@ -554,7 +554,6 @@ gtk_base_c_sources = \ gtkbindings.c \ gtkbookmarksmanager.c \ gtkborder.c \ - gtkborderimage.c \ gtkbox.c \ gtkbuildable.c \ gtkbuilder.c \ @@ -762,6 +761,7 @@ gtk_base_c_sources = \ gtkrecentmanager.c \ gtkrender.c \ gtkrenderbackground.c \ + gtkrenderborder.c \ gtkresources.c \ gtkrevealer.c \ gtkroundedbox.c \ diff --git a/gtk/deprecated/gtkstyleproperties.c b/gtk/deprecated/gtkstyleproperties.c index 9cf29754ee..291260d91c 100644 --- a/gtk/deprecated/gtkstyleproperties.c +++ b/gtk/deprecated/gtkstyleproperties.c @@ -27,7 +27,6 @@ #include "gtkcssshorthandpropertyprivate.h" #include "gtkcsstypedvalueprivate.h" #include "gtkcsstypesprivate.h" -#include "gtkborderimageprivate.h" #include "gtkprivatetypebuiltins.h" #include "gtkstylepropertyprivate.h" diff --git a/gtk/gtkrender.c b/gtk/gtkrender.c index 4a95a9cef2..0c87401190 100644 --- a/gtk/gtkrender.c +++ b/gtk/gtkrender.c @@ -22,7 +22,6 @@ #include <math.h> -#include "gtkborderimageprivate.h" #include "gtkcsscornervalueprivate.h" #include "gtkcssenginevalueprivate.h" #include "gtkcssenumvalueprivate.h" @@ -34,6 +33,7 @@ #include "gtkcsstransformvalueprivate.h" #include "gtkhslaprivate.h" #include "gtkrenderbackgroundprivate.h" +#include "gtkrenderborderprivate.h" #include "gtkstylecontextprivate.h" #include "fallback-c89.c" diff --git a/gtk/gtkborderimage.c b/gtk/gtkrenderborder.c index 58a43f802e..5a967184fe 100644 --- a/gtk/gtkborderimage.c +++ b/gtk/gtkrenderborder.c @@ -20,11 +20,12 @@ */ #include <config.h> -#include <cairo-gobject.h> +#include "gtkrenderborderprivate.h" + +#include <cairo-gobject.h> #include <math.h> -#include "gtkborderimageprivate.h" #include "gtkcssbordervalueprivate.h" #include "gtkcssimagevalueprivate.h" #include "gtkcssnumbervalueprivate.h" diff --git a/gtk/gtkborderimageprivate.h b/gtk/gtkrenderborderprivate.h index 90a8326804..ab0bc74135 100644 --- a/gtk/gtkborderimageprivate.h +++ b/gtk/gtkrenderborderprivate.h @@ -19,8 +19,8 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __GTK_BORDER_IMAGE_H__ -#define __GTK_BORDER_IMAGE_H__ +#ifndef __GTK_RENDER_BORDER_H__ +#define __GTK_RENDER_BORDER_H__ #include "gtkborder.h" #include "gtkcssimageprivate.h" @@ -51,4 +51,4 @@ void _gtk_border_image_render (GtkBorderImage *imag G_END_DECLS -#endif /* __GTK_BORDER_IMAGE_H__ */ +#endif /* __GTK_RENDER_BORDER_H__ */ |