cleanup: Make meta includes consistent

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3491>
This commit is contained in:
Bilal Elmoussaoui 2024-01-05 10:15:20 +01:00
parent 6b8c1c430e
commit 5273422aef
32 changed files with 65 additions and 59 deletions

View File

@ -17,7 +17,7 @@
#pragma once
#include <meta/types.h>
#include "meta/types.h"
MetaLaters * meta_laters_new (MetaCompositor *compositor);

View File

@ -4,7 +4,7 @@
#include <glib-object.h>
#include <meta/display.h>
#include "meta/display.h"
G_BEGIN_DECLS

View File

@ -22,7 +22,8 @@
#pragma once
#include <glib-object.h>
#include <meta/common.h>
#include "meta/common.h"
/**
* MetaStrut:

View File

@ -21,10 +21,10 @@
#include <glib.h>
#include <meta/types.h>
#include <meta/boxes.h>
#include <meta/window.h>
#include <meta/workspace.h>
#include "meta/types.h"
#include "meta/boxes.h"
#include "meta/window.h"
#include "meta/workspace.h"
#define META_TYPE_COMPOSITOR (meta_compositor_get_type ())
META_EXPORT

View File

@ -22,12 +22,12 @@
#include <glib-object.h>
#include <X11/Xlib.h>
#include <meta/types.h>
#include <meta/prefs.h>
#include <meta/common.h>
#include <meta/workspace.h>
#include <meta/meta-sound-player.h>
#include <meta/meta-startup-notification.h>
#include "meta/types.h"
#include "meta/prefs.h"
#include "meta/common.h"
#include "meta/workspace.h"
#include "meta/meta-sound-player.h"
#include "meta/meta-startup-notification.h"
/**
* MetaTabList:

View File

@ -24,8 +24,8 @@
#include <X11/Xlib.h>
#include <glib.h>
#include <meta/common.h>
#include <meta/types.h>
#include "meta/common.h"
#include "meta/types.h"
/* note, can return NULL */
META_EXPORT

View File

@ -17,8 +17,8 @@
#pragma once
#include <meta/display.h>
#include <meta/common.h>
#include "meta/display.h"
#include "meta/common.h"
#define META_TYPE_KEY_BINDING (meta_key_binding_get_type ())

View File

@ -23,8 +23,8 @@
#include <glib.h>
#include <meta/common.h>
#include <meta/meta-context.h>
#include "meta/common.h"
#include "meta/meta-context.h"
META_EXPORT
void meta_restart (const char *message,

View File

@ -4,7 +4,7 @@
#include "clutter/clutter.h"
#include <meta/common.h>
#include "meta/common.h"
#define META_TYPE_BACKGROUND_GROUP (meta_background_group_get_type ())

View File

@ -22,7 +22,8 @@
#pragma once
#include <glib-object.h>
#include <meta/window.h>
#include "meta/window.h"
#define META_TYPE_CLOSE_DIALOG (meta_close_dialog_get_type ())

View File

@ -22,8 +22,8 @@
#include <glib-object.h>
#include <string.h>
#include <meta/common.h>
#include <meta/types.h>
#include "meta/common.h"
#include "meta/types.h"
#define META_TYPE_DND (meta_dnd_get_type ())

View File

@ -1,5 +1,5 @@
/*** BEGIN file-header ***/
#include <meta/meta-enum-types.h>
#include "meta/meta-enum-types.h"
/*** END file-header ***/
/*** BEGIN file-production ***/

View File

@ -2,7 +2,8 @@
#pragma once
#include <glib-object.h>
#include <meta/common.h>
#include "meta/common.h"
G_BEGIN_DECLS

View File

@ -20,7 +20,8 @@
#pragma once
#include <glib-object.h>
#include <meta/types.h>
#include "meta/types.h"
#define META_TYPE_IDLE_MONITOR (meta_idle_monitor_get_type ())
META_EXPORT

View File

@ -19,7 +19,8 @@
#pragma once
#include <glib-object.h>
#include <meta/window.h>
#include "meta/window.h"
#define META_TYPE_INHIBIT_SHORTCUTS_DIALOG (meta_inhibit_shortcuts_dialog_get_type ())

View File

@ -19,7 +19,7 @@
#pragma once
#include <meta/types.h>
#include "meta/types.h"
/**
* MetaLaterType:

View File

@ -19,7 +19,7 @@
#pragma once
#include <meta/workspace.h>
#include "meta/workspace.h"
META_EXPORT
G_DECLARE_FINAL_TYPE (MetaLaunchContext, meta_launch_context, META, LAUNCH_CONTEXT, GAppLaunchContext)

View File

@ -20,7 +20,7 @@
#include <glib-object.h>
#include <meta/common.h>
#include "meta/common.h"
#define META_TYPE_REMOTE_ACCESS_HANDLE meta_remote_access_handle_get_type ()

View File

@ -21,7 +21,7 @@
#include <gio/gio.h>
#include <meta/common.h>
#include "meta/common.h"
typedef enum
{

View File

@ -21,9 +21,9 @@
#include <gio/gio.h>
#include <meta/common.h>
#include <meta/display.h>
#include <meta/meta-selection-source.h>
#include "meta/common.h"
#include "meta/display.h"
#include "meta/meta-selection-source.h"
#define META_TYPE_SELECTION (meta_selection_get_type ())

View File

@ -19,8 +19,8 @@
#pragma once
#include <meta/common.h>
#include <meta/types.h>
#include "meta/common.h"
#include "meta/types.h"
META_EXPORT
int meta_settings_get_ui_scaling_factor (MetaSettings *settings);

View File

@ -26,8 +26,8 @@
#include <X11/Xlib.h>
#include "clutter/clutter.h"
#include <meta/common.h>
#include <meta/meta-multi-texture.h>
#include "meta/common.h"
#include "meta/meta-multi-texture.h"
G_BEGIN_DECLS

View File

@ -21,7 +21,7 @@
#include <gio/gio.h>
#include <meta/common.h>
#include "meta/common.h"
#define META_TYPE_SOUND_PLAYER (meta_sound_player_get_type ())

View File

@ -18,7 +18,7 @@
#pragma once
#include <meta/meta-launch-context.h>
#include "meta/meta-launch-context.h"
#define META_TYPE_STARTUP_SEQUENCE (meta_startup_sequence_get_type ())
#define META_TYPE_STARTUP_NOTIFICATION (meta_startup_notification_get_type ())

View File

@ -24,7 +24,7 @@
#include <glib-object.h>
#include <meta/common.h>
#include "meta/common.h"
META_EXPORT
GType meta_window_shape_get_type (void) G_GNUC_CONST;

View File

@ -24,10 +24,10 @@
#include <glib-object.h>
#include <meta/common.h>
#include <meta/display.h>
#include <meta/prefs.h>
#include <meta/types.h>
#include "meta/common.h"
#include "meta/display.h"
#include "meta/prefs.h"
#include "meta/types.h"
#define META_TYPE_WORKSPACE_MANAGER (meta_workspace_manager_get_type ())

View File

@ -22,9 +22,9 @@
#include <glib-object.h>
#include <X11/Xlib.h>
#include <meta/common.h>
#include <meta/prefs.h>
#include <meta/types.h>
#include "meta/common.h"
#include "meta/prefs.h"
#include "meta/types.h"
typedef void (* MetaX11DisplayEventFunc) (MetaX11Display *x11_display,
XEvent *xev,

View File

@ -23,8 +23,8 @@
#include <X11/Xlib.h>
#include <meta/util.h>
#include <meta/meta-x11-display.h>
#include "meta/util.h"
#include "meta/meta-x11-display.h"
META_EXPORT
void meta_x11_error_trap_push (MetaX11Display *x11_display);

View File

@ -22,13 +22,14 @@
#pragma once
/* This header is a "common" one between the UI and core side */
#include <meta/common.h>
#include <meta/types.h>
#include <pango/pango-font.h>
#include <gdesktop-enums.h>
#include <gio/gio.h>
/* This header is a "common" one between the UI and core side */
#include "meta/common.h"
#include "meta/types.h"
/**
* MetaPreference:
* @META_PREF_MOUSE_BUTTON_MODS: mouse button modifiers

View File

@ -25,8 +25,8 @@
#include <glib.h>
#include <glib-object.h>
#include <meta/common.h>
#include <meta/meta-later.h>
#include "meta/common.h"
#include "meta/meta-later.h"
META_EXPORT
gboolean meta_is_verbose (void);

View File

@ -22,8 +22,8 @@
#include <glib-object.h>
#include <X11/Xlib.h>
#include <meta/boxes.h>
#include <meta/types.h>
#include "meta/boxes.h"
#include "meta/types.h"
/**
* MetaWindowType:

View File

@ -20,8 +20,8 @@
#pragma once
#include <meta/types.h>
#include <meta/boxes.h>
#include "meta/types.h"
#include "meta/boxes.h"
#define META_TYPE_WORKSPACE (meta_workspace_get_type ())
#define META_WORKSPACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_WORKSPACE, MetaWorkspace))