[gnome-control-center] search-provider: Use G_DECLARE_FINAL_CLASS
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] search-provider: Use G_DECLARE_FINAL_CLASS
- Date: Tue, 30 Jan 2018 14:11:00 +0000 (UTC)
commit e227bb8aff228db27062773b5c58ecfa4c9c7f8f
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Tue Jan 30 12:08:53 2018 -0200
search-provider: Use G_DECLARE_FINAL_CLASS
search-provider/cc-search-provider.c | 5 -----
search-provider/cc-search-provider.h | 32 +++-----------------------------
2 files changed, 3 insertions(+), 34 deletions(-)
---
diff --git a/search-provider/cc-search-provider.c b/search-provider/cc-search-provider.c
index 685fcf4..e6a1ef8 100644
--- a/search-provider/cc-search-provider.c
+++ b/search-provider/cc-search-provider.c
@@ -43,11 +43,6 @@ struct _CcSearchProvider
GHashTable *iter_table; /* COL_ID -> GtkTreeIter */
};
-struct _CcSearchProviderClass
-{
- GObjectClass parent_class;
-};
-
typedef enum {
MATCH_NONE,
MATCH_PREFIX,
diff --git a/search-provider/cc-search-provider.h b/search-provider/cc-search-provider.h
index f3084ac..0eb05b9 100644
--- a/search-provider/cc-search-provider.h
+++ b/search-provider/cc-search-provider.h
@@ -17,8 +17,7 @@
*
*/
-#ifndef _CC_SEARCH_PROVIDER_H
-#define _CC_SEARCH_PROVIDER_H
+#pragma once
#include <glib-object.h>
#include <gio/gio.h>
@@ -27,32 +26,9 @@
G_BEGIN_DECLS
-#define CC_TYPE_SEARCH_PROVIDER cc_search_provider_get_type()
+#define CC_TYPE_SEARCH_PROVIDER (cc_search_provider_get_type())
-#define CC_SEARCH_PROVIDER(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- CC_TYPE_SEARCH_PROVIDER, CcSearchProvider))
-
-#define CC_SEARCH_PROVIDER_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST ((klass), \
- CC_TYPE_SEARCH_PROVIDER, CcSearchProviderClass))
-
-#define CC_IS_SEARCH_PROVIDER(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
- CC_TYPE_SEARCH_PROVIDER))
-
-#define CC_IS_SEARCH_PROVIDER_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE ((klass), \
- CC_TYPE_SEARCH_PROVIDER))
-
-#define CC_SEARCH_PROVIDER_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), \
- CC_TYPE_SEARCH_PROVIDER, CcSearchProviderClass))
-
-typedef struct _CcSearchProvider CcSearchProvider;
-typedef struct _CcSearchProviderClass CcSearchProviderClass;
-
-GType cc_search_provider_get_type (void) G_GNUC_CONST;
+G_DECLARE_FINAL_TYPE (CcSearchProvider, cc_search_provider, CC, SEARCH_PROVIDER, GObject)
CcSearchProvider *cc_search_provider_new (void);
@@ -65,5 +41,3 @@ void cc_search_provider_dbus_unregister (CcSearchProvider *provider,
const char *object_path);
G_END_DECLS
-
-#endif /* _CC_SEARCH_PROVIDER_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]