From 914787294f2e3e1050a83860ad6773c1b0a9622d Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Tue, 20 Aug 2024 16:49:36 +0200 Subject: [PATCH] clutter/stage-manager: Mark as private type Nothing is supposed to interact with it externally Part-of: --- clutter/clutter/clutter-context.h | 2 +- clutter/clutter/clutter-main.c | 1 - clutter/clutter/clutter-private.h | 1 - .../clutter-stage-manager-accessible.c | 2 +- .../clutter/clutter-stage-manager-private.h | 24 +++++++--- clutter/clutter/clutter-stage-manager.h | 48 ------------------- clutter/clutter/clutter.h | 1 - clutter/clutter/meson.build | 1 - 8 files changed, 20 insertions(+), 60 deletions(-) delete mode 100644 clutter/clutter/clutter-stage-manager.h diff --git a/clutter/clutter/clutter-context.h b/clutter/clutter/clutter-context.h index 7aaf71a61..45df51d5e 100644 --- a/clutter/clutter/clutter-context.h +++ b/clutter/clutter/clutter-context.h @@ -20,7 +20,7 @@ #pragma once #include "clutter-backend.h" -#include "clutter-stage-manager.h" +#include "clutter-stage-manager-private.h" #include "clutter-settings.h" #include "cogl-pango/cogl-pango.h" diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c index dc7c499c8..1619d83c7 100644 --- a/clutter/clutter/clutter-main.c +++ b/clutter/clutter/clutter-main.c @@ -38,7 +38,6 @@ #include "clutter/clutter-private.h" #include "clutter/clutter-settings-private.h" #include "clutter/clutter-stage.h" -#include "clutter/clutter-stage-manager.h" #include "clutter/clutter-stage-private.h" #include "clutter/clutter-backend-private.h" diff --git a/clutter/clutter/clutter-private.h b/clutter/clutter/clutter-private.h index de31541dc..24f5a3ac5 100644 --- a/clutter/clutter/clutter-private.h +++ b/clutter/clutter/clutter-private.h @@ -38,7 +38,6 @@ #include "clutter/clutter-layout-manager.h" #include "clutter/clutter-pipeline-cache.h" #include "clutter/clutter-settings.h" -#include "clutter/clutter-stage-manager.h" #include "clutter/clutter-stage.h" G_BEGIN_DECLS diff --git a/clutter/clutter/clutter-stage-manager-accessible.c b/clutter/clutter/clutter-stage-manager-accessible.c index 4c674c2fd..5e2e375d5 100644 --- a/clutter/clutter/clutter-stage-manager-accessible.c +++ b/clutter/clutter/clutter-stage-manager-accessible.c @@ -38,7 +38,7 @@ #include "clutter/clutter-actor.h" #include "clutter/clutter-stage-private.h" -#include "clutter/clutter-stage-manager.h" +#include "clutter/clutter-stage-manager-private.h" struct _ClutterStageManagerAccessible { AtkGObjectAccessible parent; diff --git a/clutter/clutter/clutter-stage-manager-private.h b/clutter/clutter/clutter-stage-manager-private.h index 9748c96d1..96e49b3a0 100644 --- a/clutter/clutter/clutter-stage-manager-private.h +++ b/clutter/clutter/clutter-stage-manager-private.h @@ -24,14 +24,26 @@ #pragma once -#include "clutter/clutter-stage-manager.h" +#include "clutter/clutter-types.h" G_BEGIN_DECLS -/* stage manager */ -void _clutter_stage_manager_add_stage (ClutterStageManager *stage_manager, - ClutterStage *stage); -void _clutter_stage_manager_remove_stage (ClutterStageManager *stage_manager, - ClutterStage *stage); +#define CLUTTER_TYPE_STAGE_MANAGER (clutter_stage_manager_get_type ()) + +G_DECLARE_FINAL_TYPE (ClutterStageManager, + clutter_stage_manager, + CLUTTER, + STAGE_MANAGER, + GObject) + +ClutterStageManager * clutter_stage_manager_get_default (void); + +const GSList * clutter_stage_manager_peek_stages (ClutterStageManager *stage_manager); + +void _clutter_stage_manager_add_stage (ClutterStageManager *stage_manager, + ClutterStage *stage); + +void _clutter_stage_manager_remove_stage (ClutterStageManager *stage_manager, + ClutterStage *stage); G_END_DECLS diff --git a/clutter/clutter/clutter-stage-manager.h b/clutter/clutter/clutter-stage-manager.h deleted file mode 100644 index 3f9d38f50..000000000 --- a/clutter/clutter/clutter-stage-manager.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Clutter. - * - * An OpenGL based 'interactive canvas' library. - * - * Copyright (C) 2008 OpenedHand - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - * - * Author: Emmanuele Bassi - */ - -#pragma once - -#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) -#error "Only can be included directly." -#endif - -#include "clutter/clutter-types.h" - -G_BEGIN_DECLS - -#define CLUTTER_TYPE_STAGE_MANAGER (clutter_stage_manager_get_type ()) - -CLUTTER_EXPORT -G_DECLARE_FINAL_TYPE (ClutterStageManager, - clutter_stage_manager, - CLUTTER, - STAGE_MANAGER, - GObject) - -CLUTTER_EXPORT -ClutterStageManager *clutter_stage_manager_get_default (void); -CLUTTER_EXPORT -const GSList * clutter_stage_manager_peek_stages (ClutterStageManager *stage_manager); - -G_END_DECLS diff --git a/clutter/clutter/clutter.h b/clutter/clutter/clutter.h index 6bf289003..7d6c2fc67 100644 --- a/clutter/clutter/clutter.h +++ b/clutter/clutter/clutter.h @@ -92,7 +92,6 @@ #include "clutter/clutter-swipe-action.h" #include "clutter/clutter-snap-constraint.h" #include "clutter/clutter-stage.h" -#include "clutter/clutter-stage-manager.h" #include "clutter/clutter-stage-view.h" #include "clutter/clutter-tap-action.h" #include "clutter/clutter-text.h" diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build index 430c827f8..9a5a8aa1e 100644 --- a/clutter/clutter/meson.build +++ b/clutter/clutter/meson.build @@ -70,7 +70,6 @@ clutter_headers = [ 'clutter-swipe-action.h', 'clutter-snap-constraint.h', 'clutter-stage.h', - 'clutter-stage-manager.h', 'clutter-stage-view.h', 'clutter-tap-action.h', 'clutter-text.h',