From 0b168c9813e2fbe8ea9d41ef2a8139acad6139c7 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Fri, 19 Mar 2010 06:48:08 +0000 Subject: [PATCH] First part of the renaming 'quartz' -> 'cocoa' Quartz is the name of the graphic library Cocoa is the Objective C API to build applications I can't test this so maybe I have forgotten some modifications to do. Please report any problem in that thread SVN revision: 47339 --- legacy/ecore/Makefile.am | 4 ++-- legacy/ecore/configure.ac | 2 +- .../{ecore-quartz.pc.in => ecore-cocoa.pc.in} | 0 legacy/ecore/src/lib/ecore_evas/Makefile.am | 4 ++-- .../{ecore_evas_quartz.c => ecore_evas_cocoa.c} | 2 +- .../ecore_quartz/{Ecore_Quartz.h => Ecore_Cocoa.h} | 0 .../{Ecore_Quartz_Keys.h => Ecore_Cocoa_Keys.h} | 0 legacy/ecore/src/lib/ecore_quartz/Makefile.am | 14 +++++++------- .../ecore_quartz/{ecore_quartz.m => ecore_cocoa.m} | 4 ++-- .../src/lib/ecore_quartz/ecore_cocoa_window.m | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) rename legacy/ecore/{ecore-quartz.pc.in => ecore-cocoa.pc.in} (100%) rename legacy/ecore/src/lib/ecore_evas/{ecore_evas_quartz.c => ecore_evas_cocoa.c} (99%) rename legacy/ecore/src/lib/ecore_quartz/{Ecore_Quartz.h => Ecore_Cocoa.h} (100%) rename legacy/ecore/src/lib/ecore_quartz/{Ecore_Quartz_Keys.h => Ecore_Cocoa_Keys.h} (100%) rename legacy/ecore/src/lib/ecore_quartz/{ecore_quartz.m => ecore_cocoa.m} (99%) diff --git a/legacy/ecore/Makefile.am b/legacy/ecore/Makefile.am index df75193356..ab2aec0096 100644 --- a/legacy/ecore/Makefile.am +++ b/legacy/ecore/Makefile.am @@ -75,7 +75,7 @@ EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN \ ecore-x.pc.in \ ecore-win32.pc.in \ ecore-sdl.pc.in \ - ecore-quartz.pc.in \ + ecore-cocoa.pc.in \ ecore-input.pc.in \ ecore-wince.pc.in \ ecore.spec.in ecore.spec @@ -144,7 +144,7 @@ pkgconfig_DATA += ecore-sdl.pc endif if BUILD_ECORE_QUARTZ -pkgconfig_DATA += ecore-quartz.pc +pkgconfig_DATA += ecore-cocoa.pc endif .PHONY: doc diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac index 1ee7fa3369..fa0fce0eb0 100644 --- a/legacy/ecore/configure.ac +++ b/legacy/ecore/configure.ac @@ -1318,7 +1318,7 @@ ecore-directfb.pc ecore-evas.pc ecore-fb.pc ecore-file.pc -ecore-quartz.pc +ecore-cocoa.pc ecore-imf.pc ecore-imf-evas.pc ecore-ipc.pc diff --git a/legacy/ecore/ecore-quartz.pc.in b/legacy/ecore/ecore-cocoa.pc.in similarity index 100% rename from legacy/ecore/ecore-quartz.pc.in rename to legacy/ecore/ecore-cocoa.pc.in diff --git a/legacy/ecore/src/lib/ecore_evas/Makefile.am b/legacy/ecore/src/lib/ecore_evas/Makefile.am index e9fbef9909..99f0c830de 100644 --- a/legacy/ecore/src/lib/ecore_evas/Makefile.am +++ b/legacy/ecore/src/lib/ecore_evas/Makefile.am @@ -44,7 +44,7 @@ endif if BUILD_ECORE_QUARTZ ECORE_QUARTZ_INC = -I$(top_srcdir)/src/lib/ecore_quartz -xobjective-c -ECORE_QUARTZ_LIB = $(top_builddir)/src/lib/ecore_quartz/libecore_quartz.la +ECORE_QUARTZ_LIB = $(top_builddir)/src/lib/ecore_quartz/libecore_cocoa.la else ECORE_QUARTZ_INC = ECORE_QUARTZ_LIB = @@ -97,7 +97,7 @@ ecore_evas_buffer.c \ ecore_evas_directfb.c \ ecore_evas_win32.c \ ecore_evas_sdl.c \ -ecore_evas_quartz.c \ +ecore_evas_cocoa.c \ ecore_evas_wince.c libecore_evas_la_LIBADD = \ diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_quartz.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_cocoa.c similarity index 99% rename from legacy/ecore/src/lib/ecore_evas/ecore_evas_quartz.c rename to legacy/ecore/src/lib/ecore_evas/ecore_evas_cocoa.c index 791b2bf5c3..5128627bd3 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_quartz.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_cocoa.c @@ -19,7 +19,7 @@ #include "Ecore_Evas.h" #ifdef BUILD_ECORE_EVAS_QUARTZ -#include "Ecore_Quartz.h" +#include "Ecore_Cocoa.h" #include "Evas_Engine_Quartz.h" // FIXME: this engine has lots of problems. only 1 window at a time, drawRect looks wrong, doesnt handle resizes and more diff --git a/legacy/ecore/src/lib/ecore_quartz/Ecore_Quartz.h b/legacy/ecore/src/lib/ecore_quartz/Ecore_Cocoa.h similarity index 100% rename from legacy/ecore/src/lib/ecore_quartz/Ecore_Quartz.h rename to legacy/ecore/src/lib/ecore_quartz/Ecore_Cocoa.h diff --git a/legacy/ecore/src/lib/ecore_quartz/Ecore_Quartz_Keys.h b/legacy/ecore/src/lib/ecore_quartz/Ecore_Cocoa_Keys.h similarity index 100% rename from legacy/ecore/src/lib/ecore_quartz/Ecore_Quartz_Keys.h rename to legacy/ecore/src/lib/ecore_quartz/Ecore_Cocoa_Keys.h diff --git a/legacy/ecore/src/lib/ecore_quartz/Makefile.am b/legacy/ecore/src/lib/ecore_quartz/Makefile.am index f0621982c3..697787b837 100644 --- a/legacy/ecore/src/lib/ecore_quartz/Makefile.am +++ b/legacy/ecore/src/lib/ecore_quartz/Makefile.am @@ -10,22 +10,22 @@ AM_CPPFLAGS = \ if BUILD_ECORE_QUARTZ -lib_LTLIBRARIES = libecore_quartz.la +lib_LTLIBRARIES = libecore_cocoa.la include_HEADERS = \ -Ecore_Quartz.h \ -Ecore_Quartz_Keys.h +Ecore_Cocoa.h \ +Ecore_Cocoa_Keys.h -libecore_quartz_la_SOURCES = \ -ecore_quartz.m \ +libecore_cocoa_la_SOURCES = \ +ecore_cocoa.m \ ecore_cocoa_window.m -libecore_quartz_la_LIBADD = \ +libecore_cocoa_la_LIBADD = \ $(top_builddir)/src/lib/ecore/libecore.la \ $(top_builddir)/src/lib/ecore_input/libecore_input.la \ @EVAS_LIBS@ \ @EINA_LIBS@ -libecore_quartz_la_LDFLAGS = @quartz_ldflags@ -version-info @version_info@ @ecore_quartz_release_info@ +libecore_cocoa_la_LDFLAGS = @quartz_ldflags@ -version-info @version_info@ @ecore_quartz_release_info@ endif diff --git a/legacy/ecore/src/lib/ecore_quartz/ecore_quartz.m b/legacy/ecore/src/lib/ecore_quartz/ecore_cocoa.m similarity index 99% rename from legacy/ecore/src/lib/ecore_quartz/ecore_quartz.m rename to legacy/ecore/src/lib/ecore_quartz/ecore_cocoa.m index 50a142a611..21cb837d85 100644 --- a/legacy/ecore/src/lib/ecore_quartz/ecore_quartz.m +++ b/legacy/ecore/src/lib/ecore_quartz/ecore_cocoa.m @@ -10,8 +10,8 @@ #include #include -#include "Ecore_Quartz.h" -#include "Ecore_Quartz_Keys.h" +#include "Ecore_Cocoa.h" +#include "Ecore_Cocoa_Keys.h" EAPI int ECORE_QUARTZ_EVENT_GOT_FOCUS = 0; EAPI int ECORE_QUARTZ_EVENT_LOST_FOCUS = 0; diff --git a/legacy/ecore/src/lib/ecore_quartz/ecore_cocoa_window.m b/legacy/ecore/src/lib/ecore_quartz/ecore_cocoa_window.m index 8a8ec0717c..751bde4fc3 100644 --- a/legacy/ecore/src/lib/ecore_quartz/ecore_cocoa_window.m +++ b/legacy/ecore/src/lib/ecore_quartz/ecore_cocoa_window.m @@ -4,7 +4,7 @@ #include -#include "Ecore_Quartz.h" +#include "Ecore_Cocoa.h" Ecore_Cocoa_Window * ecore_cocoa_window_new(int x,