Rename C prefix/namespace to TpYts/tp_yts/TP_YTS

7 files changed, 41 insertions, 41 deletions

diff --git a/TelepathyYtstenutQt4/Makefile.am b/TelepathyYtstenutQt4/Makefile.am
index 99cb9e5..014df04 100644
--- a/TelepathyYtstenutQt4/Makefile.am
+++ b/TelepathyYtstenutQt4/Makefile.am
@@ -73,15 +73,15 @@ _gen/all.xml: $(top_srcdir)/spec/all.xml $(wildcard $(top_srcdir)/spec/*.xml)
 _gen/constants.h: _gen/all.xml \
 		$(tools_dir)/qt4-constants-gen.py
 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/qt4-constants-gen.py \
-		--namespace='TpYtstenut' \
-		--str-constant-prefix='TP_YTSTENUT_' \
+		--namespace='TpYts' \
+		--str-constant-prefix='TP_YTS_' \
 		--specxml=$< \
 		> $@.tmp && mv $@.tmp $@
 
 _gen/types.h _gen/types-body.hpp: _gen/all.xml \
 		$(tools_dir)/qt4-types-gen.py
 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/qt4-types-gen.py \
-		--namespace='TpYtstenut' \
+		--namespace='TpYts' \
 		--declfile='_gen/types.h' \
 		--implfile='_gen/types-body.hpp' \
 		--realinclude='types.h' \
@@ -98,8 +98,8 @@ _gen/connection.xml: connection.xml $(wildcard $(top_srcdir)/spec/*.xml)
 _gen/cli-connection-body.hpp _gen/cli-connection.h: _gen/connection.xml \
 	_gen/all.xml $(tools_dir)/qt4-client-gen.py
 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/qt4-client-gen.py \
-		--namespace='TpYtstenut::Client' \
-		--typesnamespace='TpYtstenut' \
+		--namespace='TpYts::Client' \
+		--typesnamespace='TpYts' \
 		--headerfile=_gen/cli-connection.h \
 		--implfile=_gen/cli-connection-body.hpp \
 		--realinclude=$(top_srcdir)/TelepathyYtstenutQt4/cli-connection.h \
diff --git a/TelepathyYtstenutQt4/cli-connection.h b/TelepathyYtstenutQt4/cli-connection.h
index ec4e0eb..26f4a29 100644
--- a/TelepathyYtstenutQt4/cli-connection.h
+++ b/TelepathyYtstenutQt4/cli-connection.h
@@ -1,5 +1,5 @@
-#ifndef _TpYtstenut_Client_Connection_HEADER_GUARD_
-#define _TpYtstenut_Client_Connection_HEADER_GUARD_
+#ifndef _TpYts_Client_Connection_HEADER_GUARD_
+#define _TpYts_Client_Connection_HEADER_GUARD_
 
 #include "_gen/cli-connection.h"
 
diff --git a/TelepathyYtstenutQt4/constants.h b/TelepathyYtstenutQt4/constants.h
index ecaaee8..ce2a07f 100644
--- a/TelepathyYtstenutQt4/constants.h
+++ b/TelepathyYtstenutQt4/constants.h
@@ -1,5 +1,5 @@
-#ifndef _TpYtstenut_Constants_HEADER_GUARD_
-#define _TpYtstenut_Constants_HEADER_GUARD_
+#ifndef _TpYts_Constants_HEADER_GUARD_
+#define _TpYts_Constants_HEADER_GUARD_
 
 #include "_gen/constants.h"
 
diff --git a/TelepathyYtstenutQt4/types.h b/TelepathyYtstenutQt4/types.h
index 360c8d1..57dbd43 100644
--- a/TelepathyYtstenutQt4/types.h
+++ b/TelepathyYtstenutQt4/types.h
@@ -1,5 +1,5 @@
-#ifndef _TpYtstenut_Types_HEADER_GUARD_
-#define _TpYtstenut_Types_HEADER_GUARD_
+#ifndef _TpYts_Types_HEADER_GUARD_
+#define _TpYts_Types_HEADER_GUARD_
 
 #include "_gen/types.h"
 
diff --git a/telepathy-ytstenut-glib/Makefile.am b/telepathy-ytstenut-glib/Makefile.am
index 47b5809..798e9d6 100644
--- a/telepathy-ytstenut-glib/Makefile.am
+++ b/telepathy-ytstenut-glib/Makefile.am
@@ -62,12 +62,12 @@ _gen/all.xml: all.xml $(wildcard $(top_srcdir)/spec/*.xml)
 _gen/svc.c _gen/svc.h: _gen/all.xml $(tools_dir)/glib-ginterface-gen.py \
 	Makefile.am
 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
-		--filename=_gen/svc --signal-marshal-prefix=_ytstenut \
+		--filename=_gen/svc --signal-marshal-prefix=_tp_yts \
 		--include='<telepathy-glib/dbus.h>' \
 		--include='"_gen/signals-marshal.h"' \
 		--allow-unstable \
 		--not-implemented-func='tp_dbus_g_method_return_not_implemented' \
-		$< Ytstenut_Svc_
+		$< Tp_Yts_Svc_
 
 _gen/signals-marshal.list: _gen/all.xml \
 	$(tools_dir)/glib-signals-marshal-gen.py \
@@ -75,24 +75,24 @@ _gen/signals-marshal.list: _gen/all.xml \
 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@
 
 _gen/signals-marshal.h: _gen/signals-marshal.list Makefile.am
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_ytstenut_marshal $< > $@
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_tp_yts_marshal $< > $@
 
 _gen/signals-marshal.c: _gen/signals-marshal.list Makefile.am
 	$(AM_V_GEN){ echo '#include "_gen/signals-marshal.h"' && \
-	$(GLIB_GENMARSHAL) --body --prefix=_ytstenut_marshal $< ; } > $@
+	$(GLIB_GENMARSHAL) --body --prefix=_tp_yts_marshal $< ; } > $@
 
 _gen/enums.h: _gen/all.xml $(tools_dir)/c-constants-gen.py \
 	Makefile.am
-	$(AM_V_GEN)$(PYTHON) $(tools_dir)/c-constants-gen.py Ytstenut $< > $@
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/c-constants-gen.py Tp_Yts $< > $@
 
 _gen/interfaces.h _gen/interfaces-body.h: _gen/all.xml \
 	$(tools_dir)/glib-interfaces-gen.py \
 	Makefile.am
 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \
-		Ytstenut _gen/interfaces-body.h _gen/interfaces.h $<
+		Tp_Yts _gen/interfaces-body.h _gen/interfaces.h $<
 
 _gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \
 	$(tools_dir)/glib-gtypes-generator.py Makefile.am
 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-gtypes-generator.py \
-		$< _gen/gtypes Ytstenut
+		$< _gen/gtypes Tp_Yts
 
diff --git a/telepathy-ytstenut-glib/errors.c b/telepathy-ytstenut-glib/errors.c
index 85fbbbd..b1a52d3 100644
--- a/telepathy-ytstenut-glib/errors.c
+++ b/telepathy-ytstenut-glib/errors.c
@@ -3,16 +3,16 @@
 #include <dbus/dbus-glib.h>
 
 GQuark
-tp_ytstenut_errors_quark (void)
+tp_yts_errors_quark (void)
 {
   static gsize quark = 0;
 
   if (g_once_init_enter (&quark))
     {
-      GQuark domain = g_quark_from_static_string ("tp_ytstenut_errors");
+      GQuark domain = g_quark_from_static_string ("tp_yts_errors");
 
-      dbus_g_error_domain_register (domain, TP_YTSTENUT_ERROR_PREFIX,
-          TP_YTSTENUT_TYPE_ERROR);
+      dbus_g_error_domain_register (domain, TP_YTS_ERROR_PREFIX,
+          TP_YTS_TYPE_ERROR);
       g_once_init_leave (&quark, domain);
     }
 
@@ -20,30 +20,30 @@ tp_ytstenut_errors_quark (void)
 }
 
 GType
-tp_ytstenut_error_get_type (void)
+tp_yts_error_get_type (void)
 {
   static GType etype = 0;
 
   if (g_once_init_enter (&etype))
     {
       static const GEnumValue values[] = {
-        { TP_YTSTENUT_ERROR_PLACEHOLDER, "TP_YTSTENUT_ERROR_PLACEHOLDER", "Placeholder" },
+        { TP_YTS_ERROR_PLACEHOLDER, "TP_YTS_ERROR_PLACEHOLDER", "Placeholder" },
         { 0 }
       };
 
-      g_once_init_leave (&etype, g_enum_register_static ("TpYtstenutError", values));
+      g_once_init_leave (&etype, g_enum_register_static ("TpYtsError", values));
     }
 
   return etype;
 }
 
 const gchar *
-tp_ytstenut_error_get_dbus_name (TpYtstenutError error)
+tp_yts_error_get_dbus_name (TpYtsError error)
 {
   switch (error)
     {
-    case TP_YTSTENUT_ERROR_PLACEHOLDER:
-      return TP_YTSTENUT_ERROR_STR_PLACEHOLDER;
+    case TP_YTS_ERROR_PLACEHOLDER:
+      return TP_YTS_ERROR_STR_PLACEHOLDER;
     default:
       g_return_val_if_reached (NULL);
     }
diff --git a/telepathy-ytstenut-glib/errors.h b/telepathy-ytstenut-glib/errors.h
index fd2de8c..89257bc 100644
--- a/telepathy-ytstenut-glib/errors.h
+++ b/telepathy-ytstenut-glib/errors.h
@@ -1,27 +1,27 @@
-#ifndef TP_YTSTENUT_GLIB_ERRORS_H
-#define TP_YTSTENUT_GLIB_ERRORS_H
+#ifndef TP_YTS_GLIB_ERRORS_H
+#define TP_YTS_GLIB_ERRORS_H
 
 #include <glib-object.h>
 
 G_BEGIN_DECLS
 
-#define TP_YTSTENUT_TYPE_ERROR (tp_ytstenut_error_get_type ())
-GType tp_ytstenut_error_get_type (void);
+#define TP_YTS_TYPE_ERROR (tp_yts_error_get_type ())
+GType tp_yts_error_get_type (void);
 
-#define TP_YTSTENUT_ERRORS (tp_ytstenut_errors_quark ())
-GQuark tp_ytstenut_errors_quark (void);
+#define TP_YTS_ERRORS (tp_yts_errors_quark ())
+GQuark tp_yts_errors_quark (void);
 
 typedef enum {
-   TP_YTSTENUT_ERROR_PLACEHOLDER
-} TpYtstenutError;
+   TP_YTS_ERROR_PLACEHOLDER
+} TpYtsError;
 
-const gchar *tp_ytstenut_error_get_dbus_name (TpYtstenutError error);
+const gchar *tp_yts_error_get_dbus_name (TpYtsError error);
 
-#define TP_YTSTENUT_ERROR_PREFIX "com.example.Ytstenut.Error"
+#define TP_YTS_ERROR_PREFIX "com.example.Ytstenut.Error"
 
-#define TP_YTSTENUT_ERROR_STR_PLACEHOLDER \
-    TP_YTSTENUT_ERROR_PREFIX "PlaceholdersNotReplacedByRealErrors"
+#define TP_YTS_ERROR_STR_PLACEHOLDER \
+    TP_YTS_ERROR_PREFIX "PlaceholdersNotReplacedByRealErrors"
 
 G_END_DECLS
 
-#endif // TP_YTSTENUT_GLIB_ERRORS_H
+#endif // TP_YTS_GLIB_ERRORS_H