From a90862929b35a64cc02fd068025bbae01eb226c2 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Tue, 22 Feb 2011 20:08:16 +0000 Subject: [PATCH] rename winsys files to be more consistent This tries to make the naming style of files under cogl/winsys/ consistent with other cogl source files. In particular private header files didn't have a '-private' infix. --- clutter/cogl/cogl/Makefile.am | 22 +++++++++---------- .../cogl/winsys/cogl-texture-pixmap-x11.c | 2 +- .../winsys/{cogl-egl.c => cogl-winsys-egl.c} | 0 .../{cogl-fruity.c => cogl-winsys-fruity.c} | 0 .../winsys/{cogl-glx.c => cogl-winsys-glx.c} | 0 .../winsys/{cogl-osx.c => cogl-winsys-osx.c} | 0 .../{cogl-winsys.h => cogl-winsys-private.h} | 6 ++--- .../winsys/{cogl-sdl.c => cogl-winsys-sdl.c} | 0 .../{cogl-win32.c => cogl-winsys-win32.c} | 0 .../{cogl-xlib.c => cogl-winsys-xlib.c} | 0 .../{cogl-xlib.h => cogl-winsys-xlib.h} | 0 11 files changed, 15 insertions(+), 15 deletions(-) rename clutter/cogl/cogl/winsys/{cogl-egl.c => cogl-winsys-egl.c} (100%) rename clutter/cogl/cogl/winsys/{cogl-fruity.c => cogl-winsys-fruity.c} (100%) rename clutter/cogl/cogl/winsys/{cogl-glx.c => cogl-winsys-glx.c} (100%) rename clutter/cogl/cogl/winsys/{cogl-osx.c => cogl-winsys-osx.c} (100%) rename clutter/cogl/cogl/winsys/{cogl-winsys.h => cogl-winsys-private.h} (89%) rename clutter/cogl/cogl/winsys/{cogl-sdl.c => cogl-winsys-sdl.c} (100%) rename clutter/cogl/cogl/winsys/{cogl-win32.c => cogl-winsys-win32.c} (100%) rename clutter/cogl/cogl/winsys/{cogl-xlib.c => cogl-winsys-xlib.c} (100%) rename clutter/cogl/cogl/winsys/{cogl-xlib.h => cogl-winsys-xlib.h} (100%) diff --git a/clutter/cogl/cogl/Makefile.am b/clutter/cogl/cogl/Makefile.am index a4d67cfe1..cdb342f5d 100644 --- a/clutter/cogl/cogl/Makefile.am +++ b/clutter/cogl/cogl/Makefile.am @@ -110,7 +110,7 @@ endif # COGL_DRIVER_GLES # winsys sources, common to all backends cogl_winsys_common_sources = \ - $(srcdir)/winsys/cogl-winsys.h \ + $(srcdir)/winsys/cogl-winsys-private.h \ $(srcdir)/winsys/cogl-context-winsys.h \ $(srcdir)/winsys/cogl-context-winsys.c \ $(srcdir)/winsys/cogl-winsys-feature-functions.h \ @@ -282,42 +282,42 @@ cogl_experimental_h += \ $(srcdir)/winsys/cogl-texture-pixmap-x11.h cogl_sources_c += \ - $(srcdir)/winsys/cogl-xlib.h \ - $(srcdir)/winsys/cogl-xlib.c \ + $(srcdir)/winsys/cogl-winsys-xlib.h \ + $(srcdir)/winsys/cogl-winsys-xlib.c \ $(srcdir)/winsys/cogl-texture-pixmap-x11.c \ $(srcdir)/winsys/cogl-texture-pixmap-x11-private.h endif if SUPPORT_GLX cogl_sources_c += \ - $(srcdir)/winsys/cogl-glx.c + $(srcdir)/winsys/cogl-winsys-glx.c endif if SUPPORT_EGL_PLATFORM_POWERVR_X11 cogl_sources_c += \ - $(srcdir)/winsys/cogl-egl.c + $(srcdir)/winsys/cogl-winsys-egl.c endif if SUPPORT_EGL_PLATFORM_POWERVR_NULL cogl_sources_c += \ - $(srcdir)/winsys/cogl-egl.c + $(srcdir)/winsys/cogl-winsys-egl.c endif if SUPPORT_EGL_PLATFORM_POWERVR_GDL cogl_sources_c += \ - $(srcdir)/winsys/cogl-egl.c + $(srcdir)/winsys/cogl-winsys-egl.c endif if SUPPORT_EGL_PLATFORM_FRUITY cogl_sources_c += \ - $(srcdir)/winsys/cogl-fruity.c + $(srcdir)/winsys/cogl-winsys-fruity.c endif if SUPPORT_EGL_PLATFORM_DRM_SURFACELESS cogl_sources_c += \ - $(srcdir)/winsys/cogl-egl.c + $(srcdir)/winsys/cogl-winsys-egl.c endif if SUPPORT_WIN32 cogl_sources_c += \ - $(srcdir)/winsys/cogl-win32.c + $(srcdir)/winsys/cogl-winsys-win32.c endif if SUPPORT_OSX cogl_sources_c += \ - $(srcdir)/winsys/cogl-osx.c + $(srcdir)/winsys/cogl-winsys-osx.c endif EXTRA_DIST += stb_image.c diff --git a/clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c b/clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c index fa94e0946..98ecf3149 100644 --- a/clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c +++ b/clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c @@ -42,7 +42,7 @@ #include "cogl-texture-rectangle-private.h" #include "cogl-context-private.h" #include "cogl-handle.h" -#include "cogl-xlib.h" +#include "cogl-winsys-xlib.h" #include "cogl-pipeline-opengl-private.h" #include diff --git a/clutter/cogl/cogl/winsys/cogl-egl.c b/clutter/cogl/cogl/winsys/cogl-winsys-egl.c similarity index 100% rename from clutter/cogl/cogl/winsys/cogl-egl.c rename to clutter/cogl/cogl/winsys/cogl-winsys-egl.c diff --git a/clutter/cogl/cogl/winsys/cogl-fruity.c b/clutter/cogl/cogl/winsys/cogl-winsys-fruity.c similarity index 100% rename from clutter/cogl/cogl/winsys/cogl-fruity.c rename to clutter/cogl/cogl/winsys/cogl-winsys-fruity.c diff --git a/clutter/cogl/cogl/winsys/cogl-glx.c b/clutter/cogl/cogl/winsys/cogl-winsys-glx.c similarity index 100% rename from clutter/cogl/cogl/winsys/cogl-glx.c rename to clutter/cogl/cogl/winsys/cogl-winsys-glx.c diff --git a/clutter/cogl/cogl/winsys/cogl-osx.c b/clutter/cogl/cogl/winsys/cogl-winsys-osx.c similarity index 100% rename from clutter/cogl/cogl/winsys/cogl-osx.c rename to clutter/cogl/cogl/winsys/cogl-winsys-osx.c diff --git a/clutter/cogl/cogl/winsys/cogl-winsys.h b/clutter/cogl/cogl/winsys/cogl-winsys-private.h similarity index 89% rename from clutter/cogl/cogl/winsys/cogl-winsys.h rename to clutter/cogl/cogl/winsys/cogl-winsys-private.h index 04c9dcf40..4cf326e3b 100644 --- a/clutter/cogl/cogl/winsys/cogl-winsys.h +++ b/clutter/cogl/cogl/winsys/cogl-winsys-private.h @@ -21,10 +21,10 @@ * */ -#ifndef __COGL_WINSYS_H -#define __COGL_WINSYS_H +#ifndef __COGL_WINSYS_PRIVATE_H +#define __COGL_WINSYS_PRIVATE_H CoglFuncPtr _cogl_winsys_get_proc_address (const char *name); -#endif /* __COGL_WINSYS_H */ +#endif /* __COGL_WINSYS_PRIVATE_H */ diff --git a/clutter/cogl/cogl/winsys/cogl-sdl.c b/clutter/cogl/cogl/winsys/cogl-winsys-sdl.c similarity index 100% rename from clutter/cogl/cogl/winsys/cogl-sdl.c rename to clutter/cogl/cogl/winsys/cogl-winsys-sdl.c diff --git a/clutter/cogl/cogl/winsys/cogl-win32.c b/clutter/cogl/cogl/winsys/cogl-winsys-win32.c similarity index 100% rename from clutter/cogl/cogl/winsys/cogl-win32.c rename to clutter/cogl/cogl/winsys/cogl-winsys-win32.c diff --git a/clutter/cogl/cogl/winsys/cogl-xlib.c b/clutter/cogl/cogl/winsys/cogl-winsys-xlib.c similarity index 100% rename from clutter/cogl/cogl/winsys/cogl-xlib.c rename to clutter/cogl/cogl/winsys/cogl-winsys-xlib.c diff --git a/clutter/cogl/cogl/winsys/cogl-xlib.h b/clutter/cogl/cogl/winsys/cogl-winsys-xlib.h similarity index 100% rename from clutter/cogl/cogl/winsys/cogl-xlib.h rename to clutter/cogl/cogl/winsys/cogl-winsys-xlib.h