From b8e96c7141514074e4b4ff3b1521f8c57eb1d040 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sun, 3 Feb 2013 13:26:32 +0100 Subject: [PATCH] app: rename gimpdisplay-transport.[ch] to gimpdisplayxfer.[ch] so it matches the name of the stuff it implements. --- app/display/Makefile.am | 4 ++-- app/display/gimpdisplayshell-callbacks.c | 2 +- app/display/gimpdisplayshell-draw.c | 2 +- app/display/gimpdisplayshell-render.c | 2 +- app/display/{gimpdisplay-transport.c => gimpdisplayxfer.c} | 6 +++--- app/display/{gimpdisplay-transport.h => gimpdisplayxfer.h} | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) rename app/display/{gimpdisplay-transport.c => gimpdisplayxfer.c} (97%) rename app/display/{gimpdisplay-transport.h => gimpdisplayxfer.h} (92%) diff --git a/app/display/Makefile.am b/app/display/Makefile.am index 3756b5b4e3..24540dcddb 100644 --- a/app/display/Makefile.am +++ b/app/display/Makefile.am @@ -75,8 +75,6 @@ libappdisplay_a_sources = \ gimpdisplay-foreach.h \ gimpdisplay-handlers.c \ gimpdisplay-handlers.h \ - gimpdisplay-transport.c \ - gimpdisplay-transport.h \ gimpdisplayshell.c \ gimpdisplayshell.h \ gimpdisplayshell-appearance.c \ @@ -129,6 +127,8 @@ libappdisplay_a_sources = \ gimpdisplayshell-tool-events.h \ gimpdisplayshell-transform.c \ gimpdisplayshell-transform.h \ + gimpdisplayxfer.c \ + gimpdisplayxfer.h \ gimpimagewindow.c \ gimpimagewindow.h \ gimpmotionbuffer.c \ diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c index 30858def74..b1de990148 100644 --- a/app/display/gimpdisplayshell-callbacks.c +++ b/app/display/gimpdisplayshell-callbacks.c @@ -34,7 +34,6 @@ #include "gimpcanvasitem.h" #include "gimpdisplay.h" -#include "gimpdisplay-transport.h" #include "gimpdisplayshell.h" #include "gimpdisplayshell-appearance.h" #include "gimpdisplayshell-callbacks.h" @@ -42,6 +41,7 @@ #include "gimpdisplayshell-scroll.h" #include "gimpdisplayshell-selection.h" #include "gimpdisplayshell-title.h" +#include "gimpdisplayxfer.h" #include "gimpimagewindow.h" #include "gimpnavigationeditor.h" diff --git a/app/display/gimpdisplayshell-draw.c b/app/display/gimpdisplayshell-draw.c index 7f5f1e3bea..358f424d15 100644 --- a/app/display/gimpdisplayshell-draw.c +++ b/app/display/gimpdisplayshell-draw.c @@ -36,7 +36,6 @@ #include "gimpcanvas.h" #include "gimpcanvaspath.h" #include "gimpdisplay.h" -#include "gimpdisplay-transport.h" #include "gimpdisplayshell.h" #include "gimpdisplayshell-draw.h" #include "gimpdisplayshell-render.h" @@ -44,6 +43,7 @@ #include "gimpdisplayshell-scroll.h" #include "gimpdisplayshell-style.h" #include "gimpdisplayshell-transform.h" +#include "gimpdisplayxfer.h" /* public functions */ diff --git a/app/display/gimpdisplayshell-render.c b/app/display/gimpdisplayshell-render.c index b2abec9d31..13529f1ab0 100644 --- a/app/display/gimpdisplayshell-render.c +++ b/app/display/gimpdisplayshell-render.c @@ -36,12 +36,12 @@ #include "core/gimpprojection.h" #include "gimpdisplay.h" -#include "gimpdisplay-transport.h" #include "gimpdisplayshell.h" #include "gimpdisplayshell-transform.h" #include "gimpdisplayshell-filter.h" #include "gimpdisplayshell-render.h" #include "gimpdisplayshell-scroll.h" +#include "gimpdisplayxfer.h" void diff --git a/app/display/gimpdisplay-transport.c b/app/display/gimpdisplayxfer.c similarity index 97% rename from app/display/gimpdisplay-transport.c rename to app/display/gimpdisplayxfer.c index 2e54f01bb9..cb2f4a9877 100644 --- a/app/display/gimpdisplay-transport.c +++ b/app/display/gimpdisplayxfer.c @@ -22,7 +22,7 @@ #include "display-types.h" -#include "gimpdisplay-transport.h" +#include "gimpdisplayxfer.h" #define NUM_PAGES 2 @@ -205,7 +205,7 @@ gimp_display_xfer_realize (GtkWidget *widget) GimpDisplayXfer *xfer; screen = gtk_widget_get_screen (widget); - xfer = g_object_get_data (G_OBJECT (screen), "gimpdisplay-transport"); + xfer = g_object_get_data (G_OBJECT (screen), "gimp-display-xfer"); if (xfer == NULL) { @@ -229,7 +229,7 @@ gimp_display_xfer_realize (GtkWidget *widget) xfer->page = 0; g_object_set_data_full (G_OBJECT (screen), - "gimpdisplay-transport", + "gimp-display-xfer", xfer, xfer_destroy); } diff --git a/app/display/gimpdisplay-transport.h b/app/display/gimpdisplayxfer.h similarity index 92% rename from app/display/gimpdisplay-transport.h rename to app/display/gimpdisplayxfer.h index c4062e2845..beb0b91b63 100644 --- a/app/display/gimpdisplay-transport.h +++ b/app/display/gimpdisplayxfer.h @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DISPLAY_TRANSPORT_H__ -#define __GIMP_DISPLAY_TRANSPORT_H__ +#ifndef __GIMP_DISPLAY_XFER_H__ +#define __GIMP_DISPLAY_XFER_H__ /* #define GIMP_DISPLAY_RENDER_ENABLE_SCALING 1 */ @@ -40,4 +40,4 @@ cairo_surface_t * gimp_display_xfer_get_surface (GimpDisplayXfer *xfer, gint *src_y); -#endif /* __GIMP_DISPLAY_TRANSPORT_H__ */ +#endif /* __GIMP_DISPLAY_XFER_H__ */