GNOME.org
 

[gtk+] Remove gdkprivate.h

commit fc0f7dc2170c9f9a4e213c82ae8eab5841da44d2
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Nov 17 00:34:04 2017 -0500

    Remove gdkprivate.h
    
    This is one-too-many private headers. Move the few
    declarations here to gdkinternals.h.

 gdk/broadway/gdkprivate-broadway.h   |    1 -
 gdk/broadway/gdkproperty-broadway.c  |    1 -
 gdk/broadway/gdkselection-broadway.c |    1 -
 gdk/gdkcursor.c                      |    1 +
 gdk/gdkinternals.h                   |   11 +++++++-
 gdk/gdkprivate.h                     |   44 ----------------------------------
 gdk/gdkproperty.c                    |    2 +-
 gdk/gdktexture.c                     |    1 +
 gdk/meson.build                      |    2 -
 gdk/quartz/gdkglobals-quartz.c       |    1 -
 gdk/quartz/gdkprivate-quartz.h       |    1 -
 gdk/quartz/gdkquartz.h               |    1 -
 gdk/wayland/gdkprivate-wayland.h     |    1 -
 gdk/wayland/gdkselection-wayland.c   |    1 -
 gdk/win32/gdkprivate-win32.h         |    1 -
 gdk/x11/gdkprivate-x11.h             |    1 -
 gdk/x11/gdkproperty-x11.c            |    1 -
 gdk/x11/gdkselection-x11.c           |    1 -
 18 files changed, 13 insertions(+), 60 deletions(-)
---
diff --git a/gdk/broadway/gdkprivate-broadway.h b/gdk/broadway/gdkprivate-broadway.h
index 8a82d47..30adbfe 100644
--- a/gdk/broadway/gdkprivate-broadway.h
+++ b/gdk/broadway/gdkprivate-broadway.h
@@ -30,7 +30,6 @@
 #define __GDK_PRIVATE_BROADWAY_H__
 
 #include <gdk/gdkcursor.h>
-#include <gdk/gdkprivate.h>
 #include <gdk/gdkinternals.h>
 #include "gdkwindow-broadway.h"
 #include "gdkdisplay-broadway.h"
diff --git a/gdk/broadway/gdkproperty-broadway.c b/gdk/broadway/gdkproperty-broadway.c
index 1ed2777..b60488b 100644
--- a/gdk/broadway/gdkproperty-broadway.c
+++ b/gdk/broadway/gdkproperty-broadway.c
@@ -26,7 +26,6 @@
 
 #include "gdkproperty.h"
 
-#include "gdkprivate.h"
 #include "gdkinternals.h"
 #include "gdkdisplay-broadway.h"
 #include "gdkprivate-broadway.h"
diff --git a/gdk/broadway/gdkselection-broadway.c b/gdk/broadway/gdkselection-broadway.c
index b7a37bc..49548c8 100644
--- a/gdk/broadway/gdkselection-broadway.c
+++ b/gdk/broadway/gdkselection-broadway.c
@@ -27,7 +27,6 @@
 #include "gdkselection.h"
 
 #include "gdkproperty.h"
-#include "gdkprivate.h"
 #include "gdkprivate-broadway.h"
 #include "gdkdisplay-broadway.h"
 
diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index 63faa0e..6b50345 100644
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -29,6 +29,7 @@
 
 #include "gdkcursor.h"
 #include "gdkcursorprivate.h"
+#include "gdktexture.h"
 #include "gdkintl.h"
 #include "gdkinternals.h"
 
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 315bae8..3a8f145 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -28,10 +28,11 @@
 #define __GDK_INTERNALS_H__
 
 #include <gio/gio.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include "gdkwindowimpl.h"
 #include "gdkdisplay.h"
-#include "gdkprivate.h"
 #include "gdkeventsprivate.h"
+#include "gdkenumtypes.h"
 
 G_BEGIN_DECLS
 
@@ -445,6 +446,14 @@ void _gdk_display_set_window_under_pointer (GdkDisplay *display,
 gboolean    _gdk_window_has_impl (GdkWindow *window);
 GdkWindow * _gdk_window_get_impl_window (GdkWindow *window);
 
+void gdk_window_destroy_notify       (GdkWindow *window);
+
+void gdk_synthesize_window_state (GdkWindow     *window,
+                                  GdkWindowState unset_flags,
+                                  GdkWindowState set_flags);
+
+const char * _gdk_atom_name_const (GdkAtom atom);
+
 G_END_DECLS
 
 #endif /* __GDK_INTERNALS_H__ */
diff --git a/gdk/gdkproperty.c b/gdk/gdkproperty.c
index fa8df1a..8405828 100644
--- a/gdk/gdkproperty.c
+++ b/gdk/gdkproperty.c
@@ -20,7 +20,7 @@
 
 #include "gdkproperty.h"
 
-#include "gdkprivate.h"
+#include "gdkinternals.h"
 
 /**
  * SECTION:properties
diff --git a/gdk/gdktexture.c b/gdk/gdktexture.c
index e4fa9bb..a7250d1 100644
--- a/gdk/gdktexture.c
+++ b/gdk/gdktexture.c
@@ -37,6 +37,7 @@
 #include "gdktextureprivate.h"
 
 #include "gdkinternals.h"
+#include "gdkcairo.h"
 
 /**
  * GdkTexture:
diff --git a/gdk/meson.build b/gdk/meson.build
index 5acc582..a0d3aa1 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -61,7 +61,6 @@ gdk_public_headers = files([
   'gdkmonitor.h',
   'gdkpango.h',
   'gdkpixbuf.h',
-  'gdkprivate.h',
   'gdkproperty.h',
   'gdkrectangle.h',
   'gdkrgba.h',
@@ -82,7 +81,6 @@ gdk_private_h_sources = files([
   'gdkdevicetoolprivate.h',
   'gdkdrawingcontextprivate.h',
   'gdkmonitorprivate.h',
-  'gdkprivate.h',
   'gdkseatdefaultprivate.h',
 ])
 
diff --git a/gdk/quartz/gdkglobals-quartz.c b/gdk/quartz/gdkglobals-quartz.c
index efcf73c..a2b5fbd 100644
--- a/gdk/quartz/gdkglobals-quartz.c
+++ b/gdk/quartz/gdkglobals-quartz.c
@@ -18,7 +18,6 @@
 
 #include "config.h"
 #include "gdktypes.h"
-#include "gdkprivate.h"
 #include "gdkquartz.h"
 
 GdkDisplay *_gdk_display = NULL;
diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h
index b6a6999..6f60698 100644
--- a/gdk/quartz/gdkprivate-quartz.h
+++ b/gdk/quartz/gdkprivate-quartz.h
@@ -22,7 +22,6 @@
 #define GDK_QUARTZ_ALLOC_POOL NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]
 #define GDK_QUARTZ_RELEASE_POOL [pool release]
 
-#include <gdk/gdkprivate.h>
 #include <gdk/quartz/gdkquartz.h>
 #include <gdk/quartz/gdkdevicemanager-core-quartz.h>
 #include <gdk/quartz/gdkdnd-quartz.h>
diff --git a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h
index 2b2daa9..49bb076 100644
--- a/gdk/quartz/gdkquartz.h
+++ b/gdk/quartz/gdkquartz.h
@@ -23,7 +23,6 @@
 #include <AppKit/AppKit.h>
 
 #include <gdk/gdk.h>
-#include <gdk/gdkprivate.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdk/wayland/gdkprivate-wayland.h b/gdk/wayland/gdkprivate-wayland.h
index 055597e..48282fd 100644
--- a/gdk/wayland/gdkprivate-wayland.h
+++ b/gdk/wayland/gdkprivate-wayland.h
@@ -30,7 +30,6 @@
 #define __GDK_PRIVATE_WAYLAND_H__
 
 #include <gdk/gdkcursor.h>
-#include <gdk/gdkprivate.h>
 #include <gdk/wayland/gdkwayland.h>
 #include <gdk/wayland/gdkdisplay-wayland.h>
 
diff --git a/gdk/wayland/gdkselection-wayland.c b/gdk/wayland/gdkselection-wayland.c
index 9bb980f..2d402fc 100644
--- a/gdk/wayland/gdkselection-wayland.c
+++ b/gdk/wayland/gdkselection-wayland.c
@@ -30,7 +30,6 @@
 #include "gdkdndprivate.h"
 #include "gdkselection.h"
 #include "gdkproperty.h"
-#include "gdkprivate.h"
 
 #include <string.h>
 
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index fd9b67e..e8af1ed 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -34,7 +34,6 @@
 #define _WIN32_WINNT WINVER
 #endif
 
-#include <gdk/gdkprivate.h>
 #include <gdk/gdkcursorprivate.h>
 #include <gdk/win32/gdkwindow-win32.h>
 #include <gdk/win32/gdkwin32display.h>
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index 0cc8d36..8daad76 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -30,7 +30,6 @@
 #define __GDK_PRIVATE_X11_H__
 
 #include "gdkcursor.h"
-#include "gdkprivate.h"
 #include "gdkinternals.h"
 #include "gdkx.h"
 #include "gdkwindow-x11.h"
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index c0d53e7..5528ada 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include "gdkproperty.h"
-#include "gdkprivate.h"
 #include "gdkinternals.h"
 #include "gdkselection.h"
 #include "gdkprivate-x11.h"
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index ef4602b..7772881 100644
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -26,7 +26,6 @@
 
 #include "gdkselection.h"
 #include "gdkproperty.h"
-#include "gdkprivate.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]