From 66921e1ab7e4dd7256e91c7897bb87a9f7dc20db Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sim=C3=B3n=20Pena?= Date: Sun, 16 May 2010 21:27:03 +0200 Subject: [PATCH] Project: TMDB renaming Renaming references to mvs-movie-info to mvs-tmdb-movie, as that will be the first implementation to be used. --- src/mvs-tmdb-movie.c | 78 ++++++++++++++++++++-------------------- src/mvs-tmdb-movie.h | 60 +++++++++++++++---------------- test/Makefile.am | 6 ++-- test/mvs-minfo-provider-test.c | 6 ++-- 4 files changed, 75 insertions(+), 75 deletions(-) diff --git a/src/mvs-tmdb-movie.c b/src/mvs-tmdb-movie.c index 26d25fb..a558310 100644 --- a/src/mvs-tmdb-movie.c +++ b/src/mvs-tmdb-movie.c @@ -1,5 +1,5 @@ /* - * mvs-movie-info.c + * mvs-tmdb-movie.c * * This file is part of maevies * Copyright (C) 2010 Simón Pena @@ -16,9 +16,9 @@ * */ -#include "mvs-movie-info.h" +#include "mvs-tmdb-movie.h" -G_DEFINE_TYPE (MvsMovieInfo, mvs_movie_info, G_TYPE_OBJECT) +G_DEFINE_TYPE (MvsTmdbMovie, mvs_tmdb_movie, G_TYPE_OBJECT) enum { PROP_0, @@ -34,9 +34,9 @@ enum { }; #define GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), MVS_TYPE_MOVIE_INFO, MvsMovieInfoPrivate)) + (G_TYPE_INSTANCE_GET_PRIVATE ((o), MVS_TYPE_TMDB_MOVIE, MvsTmdbMoviePrivate)) -struct _MvsMovieInfoPrivate { +struct _MvsTmdbMoviePrivate { gboolean has_stingers; gchar *title; gchar *director; @@ -49,10 +49,10 @@ struct _MvsMovieInfoPrivate { }; static void -mvs_movie_info_get_property (GObject *object, guint property_id, +mvs_tmdb_movie_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { - MvsMovieInfo *self = MVS_MOVIE_INFO (object); + MvsTmdbMovie *self = MVS_TMDB_MOVIE (object); switch (property_id) { case PROP_HAS_STINGERS: @@ -88,39 +88,39 @@ mvs_movie_info_get_property (GObject *object, guint property_id, } static void -mvs_movie_info_set_property (GObject *object, guint property_id, +mvs_tmdb_movie_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { - MvsMovieInfo *self = MVS_MOVIE_INFO (object); + MvsTmdbMovie *self = MVS_TMDB_MOVIE (object); GDate *date = NULL; switch (property_id) { case PROP_HAS_STINGERS: - mvs_movie_info_set_stingers (self, g_value_get_boolean (value)); + mvs_tmdb_movie_set_stingers (self, g_value_get_boolean (value)); break; case PROP_TITLE: - mvs_movie_info_set_title (self, g_value_get_string (value)); + mvs_tmdb_movie_set_title (self, g_value_get_string (value)); break; case PROP_DIRECTOR: - mvs_movie_info_set_director (self, g_value_get_string (value)); + mvs_tmdb_movie_set_director (self, g_value_get_string (value)); break; case PROP_CAST: - mvs_movie_info_set_cast (self, g_value_get_string (value)); + mvs_tmdb_movie_set_cast (self, g_value_get_string (value)); break; case PROP_RANKING: - mvs_movie_info_set_ranking (self, g_value_get_float (value)); + mvs_tmdb_movie_set_ranking (self, g_value_get_float (value)); break; case PROP_RELEASE_DATE: - mvs_movie_info_set_release_date (self, g_value_get_string (value)); + mvs_tmdb_movie_set_release_date (self, g_value_get_string (value)); break; case PROP_OVERVIEW: - mvs_movie_info_set_overview (self, g_value_get_string (value)); + mvs_tmdb_movie_set_overview (self, g_value_get_string (value)); break; case PROP_URL: - mvs_movie_info_set_url (self, g_value_get_string (value)); + mvs_tmdb_movie_set_url (self, g_value_get_string (value)); break; case PROP_SCHEDULE: - mvs_movie_info_set_schedule (self, g_value_get_string (value)); + mvs_tmdb_movie_set_schedule (self, g_value_get_string (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -128,9 +128,9 @@ mvs_movie_info_set_property (GObject *object, guint property_id, } static void -mvs_movie_info_finalize (GObject *object) +mvs_tmdb_movie_finalize (GObject *object) { - MvsMovieInfo *self = MVS_MOVIE_INFO (object); + MvsTmdbMovie *self = MVS_TMDB_MOVIE (object); g_free (self->priv->cast); g_free (self->priv->director); @@ -140,19 +140,19 @@ mvs_movie_info_finalize (GObject *object) g_free (self->priv->title); g_free (self->priv->url); - G_OBJECT_CLASS (mvs_movie_info_parent_class)->finalize (object); + G_OBJECT_CLASS (mvs_tmdb_movie_parent_class)->finalize (object); } static void -mvs_movie_info_class_init (MvsMovieInfoClass *klass) +mvs_tmdb_movie_class_init (MvsTmdbMovieClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (MvsMovieInfoPrivate)); + g_type_class_add_private (klass, sizeof (MvsTmdbMoviePrivate)); - object_class->get_property = mvs_movie_info_get_property; - object_class->set_property = mvs_movie_info_set_property; - object_class->finalize = mvs_movie_info_finalize; + object_class->get_property = mvs_tmdb_movie_get_property; + object_class->set_property = mvs_tmdb_movie_set_property; + object_class->finalize = mvs_tmdb_movie_finalize; g_object_class_install_property @@ -213,7 +213,7 @@ mvs_movie_info_class_init (MvsMovieInfoClass *klass) } static void -mvs_movie_info_init (MvsMovieInfo *self) +mvs_tmdb_movie_init (MvsTmdbMovie *self) { self->priv = GET_PRIVATE (self); self->priv->cast = NULL; @@ -227,14 +227,14 @@ mvs_movie_info_init (MvsMovieInfo *self) self->priv->url = NULL; } -MvsMovieInfo* -mvs_movie_info_new (void) +MvsTmdbMovie* +mvs_tmdb_movie_new (void) { - return g_object_new (MVS_TYPE_MOVIE_INFO, NULL); + return g_object_new (MVS_TYPE_TMDB_MOVIE, NULL); } gboolean -mvs_movie_info_set_stingers (MvsMovieInfo *self, gboolean has_stingers) +mvs_tmdb_movie_set_stingers (MvsTmdbMovie *self, gboolean has_stingers) { g_return_val_if_fail (self, FALSE); @@ -244,7 +244,7 @@ mvs_movie_info_set_stingers (MvsMovieInfo *self, gboolean has_stingers) } gboolean -mvs_movie_info_set_title (MvsMovieInfo *self, const gchar *title) +mvs_tmdb_movie_set_title (MvsTmdbMovie *self, const gchar *title) { g_return_val_if_fail (self, FALSE); @@ -256,7 +256,7 @@ mvs_movie_info_set_title (MvsMovieInfo *self, const gchar *title) } gboolean -mvs_movie_info_set_director (MvsMovieInfo *self, const gchar *director) +mvs_tmdb_movie_set_director (MvsTmdbMovie *self, const gchar *director) { g_return_val_if_fail (self, FALSE); @@ -268,7 +268,7 @@ mvs_movie_info_set_director (MvsMovieInfo *self, const gchar *director) } gboolean -mvs_movie_info_set_cast (MvsMovieInfo *self, const gchar *cast) +mvs_tmdb_movie_set_cast (MvsTmdbMovie *self, const gchar *cast) { g_return_val_if_fail (self, FALSE); @@ -280,7 +280,7 @@ mvs_movie_info_set_cast (MvsMovieInfo *self, const gchar *cast) } gboolean -mvs_movie_info_set_ranking (MvsMovieInfo *self, gfloat ranking) +mvs_tmdb_movie_set_ranking (MvsTmdbMovie *self, gfloat ranking) { g_return_val_if_fail (self, FALSE); g_return_val_if_fail (ranking < 10 && ranking > 0, FALSE); @@ -291,7 +291,7 @@ mvs_movie_info_set_ranking (MvsMovieInfo *self, gfloat ranking) } gboolean -mvs_movie_info_set_release_date (MvsMovieInfo *self, +mvs_tmdb_movie_set_release_date (MvsTmdbMovie *self, const gchar *released) { g_return_val_if_fail (self, FALSE); @@ -303,7 +303,7 @@ mvs_movie_info_set_release_date (MvsMovieInfo *self, return TRUE; } gboolean -mvs_movie_info_set_overview (MvsMovieInfo *self, +mvs_tmdb_movie_set_overview (MvsTmdbMovie *self, const gchar *overview) { g_return_val_if_fail (self, FALSE); @@ -316,7 +316,7 @@ mvs_movie_info_set_overview (MvsMovieInfo *self, } gboolean -mvs_movie_info_set_url (MvsMovieInfo *self, const gchar *url) +mvs_tmdb_movie_set_url (MvsTmdbMovie *self, const gchar *url) { g_return_val_if_fail (self, FALSE); @@ -328,7 +328,7 @@ mvs_movie_info_set_url (MvsMovieInfo *self, const gchar *url) } gboolean -mvs_movie_info_set_schedule (MvsMovieInfo *self, +mvs_tmdb_movie_set_schedule (MvsTmdbMovie *self, const gchar *schedule) { g_return_val_if_fail (self, FALSE); diff --git a/src/mvs-tmdb-movie.h b/src/mvs-tmdb-movie.h index c6b002b..4b5666c 100644 --- a/src/mvs-tmdb-movie.h +++ b/src/mvs-tmdb-movie.h @@ -1,5 +1,5 @@ /* - * mvs-movie-info.h + * mvs-tmdb-movie.h * * This file is part of maevies * Copyright (C) 2010 Simón Pena @@ -16,56 +16,56 @@ * */ -#ifndef _MVS_MOVIE_INFO -#define _MVS_MOVIE_INFO +#ifndef _MVS_TMDB_MOVIE +#define _MVS_TMDB_MOVIE #include G_BEGIN_DECLS -#define MVS_TYPE_MOVIE_INFO mvs_movie_info_get_type() -#define MVS_MOVIE_INFO(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), MVS_TYPE_MOVIE_INFO, MvsMovieInfo)) -#define MVS_MOVIE_INFO_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), MVS_TYPE_MOVIE_INFO, MvsMovieInfoClass)) -#define IS_MVS_MOVIE_INFO(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MVS_TYPE_MOVIE_INFO)) -#define IS_MVS_MOVIE_INFO_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), MVS_TYPE_MOVIE_INFO)) -#define MVS_MOVIE_INFO_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), MVS_TYPE_MOVIE_INFO, MvsMovieInfoClass)) +#define MVS_TYPE_TMDB_MOVIE mvs_tmdb_movie_get_type() +#define MVS_TMDB_MOVIE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MVS_TYPE_TMDB_MOVIE, MvsTmdbMovie)) +#define MVS_TMDB_MOVIE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MVS_TYPE_TMDB_MOVIE, MvsTmdbMovieClass)) +#define IS_MVS_TMDB_MOVIE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MVS_TYPE_TMDB_MOVIE)) +#define IS_MVS_TMDB_MOVIE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MVS_TYPE_TMDB_MOVIE)) +#define MVS_TMDB_MOVIE_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MVS_TYPE_TMDB_MOVIE, MvsTmdbMovieClass)) -typedef struct _MvsMovieInfoPrivate MvsMovieInfoPrivate; +typedef struct _MvsTmdbMoviePrivate MvsTmdbMoviePrivate; typedef struct { GObject parent; /* */ - MvsMovieInfoPrivate *priv; -} MvsMovieInfo; + MvsTmdbMoviePrivate *priv; +} MvsTmdbMovie; typedef struct { GObjectClass parent_class; -} MvsMovieInfoClass; +} MvsTmdbMovieClass; -GType mvs_movie_info_get_type (void); -MvsMovieInfo* mvs_movie_info_new (void); +GType mvs_tmdb_movie_get_type (void); +MvsTmdbMovie* mvs_tmdb_movie_new (void); -gboolean mvs_movie_info_set_stingers (MvsMovieInfo *self, +gboolean mvs_tmdb_movie_set_stingers (MvsTmdbMovie *self, gboolean has_stingers); -gboolean mvs_movie_info_set_title (MvsMovieInfo *self, const gchar *title); -gboolean mvs_movie_info_set_director (MvsMovieInfo *self, +gboolean mvs_tmdb_movie_set_title (MvsTmdbMovie *self, const gchar *title); +gboolean mvs_tmdb_movie_set_director (MvsTmdbMovie *self, const gchar *director); -gboolean mvs_movie_info_set_cast (MvsMovieInfo *self, const gchar *cast); -gboolean mvs_movie_info_set_ranking (MvsMovieInfo *self, gfloat ranking); -gboolean mvs_movie_info_set_release_date (MvsMovieInfo *self, +gboolean mvs_tmdb_movie_set_cast (MvsTmdbMovie *self, const gchar *cast); +gboolean mvs_tmdb_movie_set_ranking (MvsTmdbMovie *self, gfloat ranking); +gboolean mvs_tmdb_movie_set_release_date (MvsTmdbMovie *self, const gchar *released); -gboolean mvs_movie_info_set_overview (MvsMovieInfo *self, +gboolean mvs_tmdb_movie_set_overview (MvsTmdbMovie *self, const gchar *overview); -gboolean mvs_movie_info_set_url (MvsMovieInfo *self, const gchar *url); -gboolean mvs_movie_info_set_schedule (MvsMovieInfo *self, +gboolean mvs_tmdb_movie_set_url (MvsTmdbMovie *self, const gchar *url); +gboolean mvs_tmdb_movie_set_schedule (MvsTmdbMovie *self, const gchar *schedule); G_END_DECLS -#endif /* _MVS_MOVIE_INFO */ +#endif /* _MVS_TMDB_MOVIE */ diff --git a/test/Makefile.am b/test/Makefile.am index 0abf607..e92ffef 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,11 +1,11 @@ bin_PROGRAMS = mvs-minfo-provider-test mvs_minfo_provider_test_SOURCES = \ - mvs-info-provider-test.c \ + mvs-minfo-provider-test.c \ $(top_srcdir)/src/mvs-minfo-provider.c \ $(top_srcdir)/src/mvs-minfo-provider.h \ - $(top_srcdir)/src/mvs-movie-info.c \ - $(top_srcdir)/src/mvs-movie-info.h + $(top_srcdir)/src/mvs-tmdb-movie.c \ + $(top_srcdir)/src/mvs-tmdb-movie.h mvs_minfo_provider_test_CFLAGS = \ -I $(top_srcdir)/src/ \ diff --git a/test/mvs-minfo-provider-test.c b/test/mvs-minfo-provider-test.c index 10a63f7..f4d3bf6 100644 --- a/test/mvs-minfo-provider-test.c +++ b/test/mvs-minfo-provider-test.c @@ -20,7 +20,7 @@ #include #include "mvs-minfo-provider.h" -#include "mvs-movie-info.h" +#include "mvs-tmdb-movie.h" static GMainLoop *loop = NULL; @@ -35,7 +35,7 @@ int main (int argc, char **argv) { MvsMInfoProvider *minfo_provider = NULL; - MvsMovieInfo *movie_info = NULL; + MvsTmdbMovie *movie_info = NULL; g_type_init (); @@ -45,7 +45,7 @@ main (int argc, char **argv) g_signal_connect (minfo_provider, "response-received", G_CALLBACK (response_received_callback), NULL); - movie_info = mvs_movie_info_new (); + movie_info = mvs_tmdb_movie_new (); loop = g_main_loop_new (NULL, FALSE); mvs_minfo_provider_query (minfo_provider, "Zombieland"); -- 1.7.9.5