[niepce] Remove deprecated g_type_class_add_private()
- From: Hubert Figuière <hub src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [niepce] Remove deprecated g_type_class_add_private()
- Date: Sat, 13 Apr 2019 23:24:38 +0000 (UTC)
commit 702380619647f22803df1f546390abc200b30edc
Author: Hubert Figuière <hub figuiere net>
Date: Sun Feb 24 14:11:04 2019 -0500
Remove deprecated g_type_class_add_private()
src/niepce/ui/thumb_view/eog-thumb-nav.cpp | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/src/niepce/ui/thumb_view/eog-thumb-nav.cpp b/src/niepce/ui/thumb_view/eog-thumb-nav.cpp
index c0cc6d8..1d84cc5 100644
--- a/src/niepce/ui/thumb_view/eog-thumb-nav.cpp
+++ b/src/niepce/ui/thumb_view/eog-thumb-nav.cpp
@@ -34,11 +34,6 @@
#include "eog-thumb-nav.hpp"
#include "thumbstripview.hpp"
-#define EOG_THUMB_NAV_GET_PRIVATE(object) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOG_TYPE_THUMB_NAV, EogThumbNavPrivate))
-
-G_DEFINE_TYPE (EogThumbNav, eog_thumb_nav, GTK_TYPE_BOX)
-
#define EOG_THUMB_NAV_SCROLL_INC 1
#define EOG_THUMB_NAV_SCROLL_MOVE 20
#define EOG_THUMB_NAV_SCROLL_TIMEOUT 20
@@ -62,6 +57,8 @@ struct _EogThumbNavPrivate {
ui::ThumbStripView *thumbview;
};
+G_DEFINE_TYPE_WITH_PRIVATE (EogThumbNav, eog_thumb_nav, GTK_TYPE_BOX)
+
static void
eog_thumb_nav_adj_changed (GtkAdjustment *adj, gpointer user_data)
{
@@ -70,7 +67,7 @@ eog_thumb_nav_adj_changed (GtkAdjustment *adj, gpointer user_data)
gdouble upper, page_size;
nav = EOG_THUMB_NAV (user_data);
- priv = EOG_THUMB_NAV_GET_PRIVATE (nav);
+ priv = (EogThumbNavPrivate *)eog_thumb_nav_get_instance_private (nav);
g_object_get (G_OBJECT (adj),
"upper", &upper,
@@ -88,7 +85,7 @@ eog_thumb_nav_adj_value_changed (GtkAdjustment *adj, gpointer user_data)
gdouble upper, page_size, value;
nav = EOG_THUMB_NAV (user_data);
- priv = EOG_THUMB_NAV_GET_PRIVATE (nav);
+ priv = (EogThumbNavPrivate *)eog_thumb_nav_get_instance_private (nav);
g_object_get (G_OBJECT (adj),
"upper", &upper,
@@ -289,8 +286,6 @@ eog_thumb_nav_class_init (EogThumbNavClass *klass)
static_cast<gint>(EogThumbNavMode::MULTIPLE_ROWS),
static_cast<gint>(EogThumbNavMode::ONE_ROW),
(GParamFlags)(G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
- g_type_class_add_private (g_object_class, sizeof (EogThumbNavPrivate));
}
static void
@@ -300,7 +295,7 @@ eog_thumb_nav_init (EogThumbNav *nav)
GtkAdjustment *adj;
GtkWidget *arrow;
- nav->priv = EOG_THUMB_NAV_GET_PRIVATE (nav);
+ nav->priv = (EogThumbNavPrivate *)eog_thumb_nav_get_instance_private (nav);
priv = nav->priv;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]