Rename gdkdebug.h to gdkdebugprivate.h

This is the naming convention for private headers.

diff --git a/gdk/gdk.c b/gdk/gdk.c
index babb4298ac2104309d664b53cbbdb4a3cce58663..276d271fb4c7b46460df72951c45b92f3426b293 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -29,7 +29,7 @@
 #include "gdkresources.h"
 
 #include "gdkconstructor.h"
-#include "gdkdebug.h"
+#include "gdkdebugprivate.h"
 #include "gdkdisplay.h"
 #include "gdkglcontextprivate.h"
 #include "gdkintl.h"

diff --git a/gdk/gdkdebug.h b/gdk/gdkdebug.h
deleted file mode 100644 (file)
index 94cc26a..0000000
--- a/gdk/gdkdebug.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2020 Red Hat, Inc.
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GDK_DEBUG_H__
-#define __GDK_DEBUG_H__
-
-#include <glib.h>
-
-#include "gdktypes.h"
-#include <glib/gstdio.h>
-
-G_BEGIN_DECLS
-
-typedef enum {
-  GDK_DEBUG_MISC            = 1 <<  0,
-  GDK_DEBUG_EVENTS          = 1 <<  1,
-  GDK_DEBUG_DND             = 1 <<  2,
-  GDK_DEBUG_INPUT           = 1 <<  3,
-  GDK_DEBUG_EVENTLOOP       = 1 <<  4,
-  GDK_DEBUG_FRAMES          = 1 <<  5,
-  GDK_DEBUG_SETTINGS        = 1 <<  6,
-  GDK_DEBUG_OPENGL          = 1 <<  7,
-  GDK_DEBUG_VULKAN          = 1 <<  8,
-  GDK_DEBUG_SELECTION       = 1 <<  9,
-  GDK_DEBUG_CLIPBOARD       = 1 << 10,
-  /* flags below are influencing behavior */
-  GDK_DEBUG_NOGRABS         = 1 << 11,
-  GDK_DEBUG_PORTALS         = 1 << 12,
-  GDK_DEBUG_GL_DISABLE      = 1 << 13,
-  GDK_DEBUG_GL_LEGACY       = 1 << 16,
-  GDK_DEBUG_GL_GLES         = 1 << 17,
-  GDK_DEBUG_GL_DEBUG        = 1 << 18,
-  GDK_DEBUG_GL_EGL          = 1 << 19,
-  GDK_DEBUG_GL_GLX          = 1 << 20,
-  GDK_DEBUG_GL_WGL          = 1 << 21,
-  GDK_DEBUG_VULKAN_DISABLE  = 1 << 22,
-  GDK_DEBUG_VULKAN_VALIDATE = 1 << 23,
-  GDK_DEBUG_DEFAULT_SETTINGS= 1 << 24,
-  GDK_DEBUG_HIGH_DEPTH      = 1 << 25,
-} GdkDebugFlags;
-
-extern guint _gdk_debug_flags;
-
-GdkDebugFlags    gdk_display_get_debug_flags    (GdkDisplay       *display);
-void             gdk_display_set_debug_flags    (GdkDisplay       *display,
-                                                 GdkDebugFlags     flags);
-
-#define gdk_debug_message(format, ...) g_fprintf (stderr, format "\n", ##__VA_ARGS__)
-
-#ifdef G_ENABLE_DEBUG
-
-#define GDK_DISPLAY_DEBUG_CHECK(display,type) \
-    G_UNLIKELY (gdk_display_get_debug_flags (display) & GDK_DEBUG_##type)
-
-#define GDK_DISPLAY_DEBUG(display,type,...)                               \
-    G_STMT_START {                                                        \
-    if (GDK_DISPLAY_DEBUG_CHECK (display,type))                           \
-      gdk_debug_message (__VA_ARGS__);                                    \
-    } G_STMT_END
-
-#else /* !G_ENABLE_DEBUG */
-
-#define GDK_DISPLAY_DEBUG_CHECK(display,type) 0
-#define GDK_DISPLAY_DEBUG(display,type,...)
-
-#endif /* G_ENABLE_DEBUG */
-
-#define GDK_DEBUG_CHECK(type) GDK_DISPLAY_DEBUG_CHECK (NULL,type)
-#define GDK_DEBUG(type,...) GDK_DISPLAY_DEBUG (NULL,type,__VA_ARGS__)
-
-#endif

diff --git a/gdk/gdkdebugprivate.h b/gdk/gdkdebugprivate.h
new file mode 100644 (file)
index 0000000..94cc26a
--- /dev/null
+++ b/gdk/gdkdebugprivate.h
@@ -0,0 +1,85 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 2020 Red Hat, Inc.
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GDK_DEBUG_H__
+#define __GDK_DEBUG_H__
+
+#include <glib.h>
+
+#include "gdktypes.h"
+#include <glib/gstdio.h>
+
+G_BEGIN_DECLS
+
+typedef enum {
+  GDK_DEBUG_MISC            = 1 <<  0,
+  GDK_DEBUG_EVENTS          = 1 <<  1,
+  GDK_DEBUG_DND             = 1 <<  2,
+  GDK_DEBUG_INPUT           = 1 <<  3,
+  GDK_DEBUG_EVENTLOOP       = 1 <<  4,
+  GDK_DEBUG_FRAMES          = 1 <<  5,
+  GDK_DEBUG_SETTINGS        = 1 <<  6,
+  GDK_DEBUG_OPENGL          = 1 <<  7,
+  GDK_DEBUG_VULKAN          = 1 <<  8,
+  GDK_DEBUG_SELECTION       = 1 <<  9,
+  GDK_DEBUG_CLIPBOARD       = 1 << 10,
+  /* flags below are influencing behavior */
+  GDK_DEBUG_NOGRABS         = 1 << 11,
+  GDK_DEBUG_PORTALS         = 1 << 12,
+  GDK_DEBUG_GL_DISABLE      = 1 << 13,
+  GDK_DEBUG_GL_LEGACY       = 1 << 16,
+  GDK_DEBUG_GL_GLES         = 1 << 17,
+  GDK_DEBUG_GL_DEBUG        = 1 << 18,
+  GDK_DEBUG_GL_EGL          = 1 << 19,
+  GDK_DEBUG_GL_GLX          = 1 << 20,
+  GDK_DEBUG_GL_WGL          = 1 << 21,
+  GDK_DEBUG_VULKAN_DISABLE  = 1 << 22,
+  GDK_DEBUG_VULKAN_VALIDATE = 1 << 23,
+  GDK_DEBUG_DEFAULT_SETTINGS= 1 << 24,
+  GDK_DEBUG_HIGH_DEPTH      = 1 << 25,
+} GdkDebugFlags;
+
+extern guint _gdk_debug_flags;
+
+GdkDebugFlags    gdk_display_get_debug_flags    (GdkDisplay       *display);
+void             gdk_display_set_debug_flags    (GdkDisplay       *display,
+                                                 GdkDebugFlags     flags);
+
+#define gdk_debug_message(format, ...) g_fprintf (stderr, format "\n", ##__VA_ARGS__)
+
+#ifdef G_ENABLE_DEBUG
+
+#define GDK_DISPLAY_DEBUG_CHECK(display,type) \
+    G_UNLIKELY (gdk_display_get_debug_flags (display) & GDK_DEBUG_##type)
+
+#define GDK_DISPLAY_DEBUG(display,type,...)                               \
+    G_STMT_START {                                                        \
+    if (GDK_DISPLAY_DEBUG_CHECK (display,type))                           \
+      gdk_debug_message (__VA_ARGS__);                                    \
+    } G_STMT_END
+
+#else /* !G_ENABLE_DEBUG */
+
+#define GDK_DISPLAY_DEBUG_CHECK(display,type) 0
+#define GDK_DISPLAY_DEBUG(display,type,...)
+
+#endif /* G_ENABLE_DEBUG */
+
+#define GDK_DEBUG_CHECK(type) GDK_DISPLAY_DEBUG_CHECK (NULL,type)
+#define GDK_DEBUG(type,...) GDK_DISPLAY_DEBUG (NULL,type,__VA_ARGS__)
+
+#endif

diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index 62061cc564621f374890e279d457a87fa503481a..7329120d765ef6c51f3045d3653e0bd20c2d6e91 100644 (file)
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -22,7 +22,7 @@
 #include "gdksurface.h"
 #include "gdkcursor.h"
 #include "gdkmonitor.h"
-#include "gdkdebug.h"
+#include "gdkdebugprivate.h"
 #include "gdksurfaceprivate.h"
 #include "gdkkeysprivate.h"
 #include "gdkdeviceprivate.h"

diff --git a/gdk/gdkdrawcontext.c b/gdk/gdkdrawcontext.c
index 8c27e938c051b69f13511c092ce33afca5e5bf10..6751407e0da0f13d0dfb7cd6d2e336af2977cd64 100644 (file)
--- a/gdk/gdkdrawcontext.c
+++ b/gdk/gdkdrawcontext.c
@@ -22,7 +22,7 @@
 
 #include "gdkdrawcontextprivate.h"
 
-#include "gdkdebug.h"
+#include "gdkdebugprivate.h"
 #include "gdkintl.h"
 #include "gdkprofilerprivate.h"
 #include "gdksurfaceprivate.h"

diff --git a/gdk/gdkframeclockidle.c b/gdk/gdkframeclockidle.c
index 9c0c7263ddcd81a85b72c8755eba05e677f14d7b..d0412f97eab389508323bae306eea3ad6e03e067 100644 (file)
--- a/gdk/gdkframeclockidle.c
+++ b/gdk/gdkframeclockidle.c
@@ -26,7 +26,7 @@
 
 #include "gdkframeclockidleprivate.h"
 
-#include "gdkdebug.h"
+#include "gdkdebugprivate.h"
 #include "gdkframeclockprivate.h"
 #include "gdk-private.h"
 #include "gdkprofilerprivate.h"

diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
index e587a67b2ec6daa93f1762a8d51e004c11c0dfc3..dd2ca5fa38a4d0e2237546a4b2cb843e6d00603f 100644 (file)
--- a/gdk/gdkglcontext.c
+++ b/gdk/gdkglcontext.c
@@ -76,7 +76,7 @@
 
 #include "gdkglcontextprivate.h"
 
-#include "gdkdebug.h"
+#include "gdkdebugprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdkintl.h"
 #include "gdkmemoryformatprivate.h"

diff --git a/gdk/gdkvulkancontextprivate.h b/gdk/gdkvulkancontextprivate.h
index f18acf84f687a432f86ec4f9ef40e1853241c750..2088edc27ef8bbc62eab12a4ec94dcafa4c33922 100644 (file)
--- a/gdk/gdkvulkancontextprivate.h
+++ b/gdk/gdkvulkancontextprivate.h
@@ -23,7 +23,7 @@
 
 #include "gdkvulkancontext.h"
 
-#include "gdkdebug.h"
+#include "gdkdebugprivate.h"
 #include "gdkdrawcontextprivate.h"
 #include "gdkenums.h"
 

diff --git a/gdk/macos/GdkMacosBaseView.c b/gdk/macos/GdkMacosBaseView.c
index 676138bb4d5630a95d33cb14fd373a2e1634cb68..fdbffe80468f81bb57fe577a101080b95c368302 100644 (file)
--- a/gdk/macos/GdkMacosBaseView.c
+++ b/gdk/macos/GdkMacosBaseView.c
@@ -28,7 +28,7 @@
 #include "gdkmacosdisplay-private.h"
 #include "gdkmacossurface-private.h"
 
-#include "gdkdebug.h"
+#include "gdkdebugprivate.h"
 
 @implementation GdkMacosBaseView
 

diff --git a/gdk/macos/gdkdisplaylinksource.c b/gdk/macos/gdkdisplaylinksource.c
index 5241f1290e3b7f0bfba917582e2203d3de71214d..f3aefc14fbd21988138251b0d5f936c54e7a697e 100644 (file)
--- a/gdk/macos/gdkdisplaylinksource.c
+++ b/gdk/macos/gdkdisplaylinksource.c
@@ -26,7 +26,7 @@
 
 #include "gdkdisplaylinksource.h"
 
-#include "gdkdebug.h"
+#include "gdkdebugprivate.h"
 #include "gdkmacoseventsource-private.h"
 #include "gdkmacosmonitor-private.h"
 #include "gdk-private.h"

diff --git a/gdk/macos/gdkmacossurface.c b/gdk/macos/gdkmacossurface.c
index 969f79d17232c405cdc5092c590040351dd06e6d..46074a5d9d1435f44459d8ecc450749d05cc188c 100644 (file)
--- a/gdk/macos/gdkmacossurface.c
+++ b/gdk/macos/gdkmacossurface.c
@@ -27,7 +27,7 @@
 
 #include "gdkmacossurface-private.h"
 
-#include "gdkdebug.h"
+#include "gdkdebugprivate.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdisplay.h"
 #include "gdkeventsprivate.h"

diff --git a/gdk/win32/gdkclipboard-win32.c b/gdk/win32/gdkclipboard-win32.c
index ce80019e566d78a4b6236b598bed679ad19c3794..4419f36d7483b6c59c455f0b833e4ce0a336e605 100644 (file)
--- a/gdk/win32/gdkclipboard-win32.c
+++ b/gdk/win32/gdkclipboard-win32.c
@@ -20,7 +20,7 @@
 #include "gdkclipboardprivate.h"
 #include "gdkclipboard-win32.h"
 
-#include "gdkdebug.h"
+#include "gdkdebugprivate.h"
 #include "gdkintl.h"
 #include "gdkprivate-win32.h"
 #include "gdkhdataoutputstream-win32.h"

diff --git a/gdk/win32/gdkclipdrop-win32.c b/gdk/win32/gdkclipdrop-win32.c
index ec15f0fabdfac02815e36a1daad986237f848b63..c2370c05095a5c3b50aae5b1311822b85d84ba5a 100644 (file)
--- a/gdk/win32/gdkclipdrop-win32.c
+++ b/gdk/win32/gdkclipdrop-win32.c
@@ -273,7 +273,7 @@ Otherwise it's similar to how the clipboard works. Only the DnD server
 /* for CIDA */
 #include <shlobj.h>
 
-#include "gdkdebug.h"
+#include "gdkdebugprivate.h"
 #include "gdkdisplay.h"
 #include "gdkprivate-win32.h"
 #include "gdkclipboardprivate.h"
@@ -284,7 +284,7 @@ Otherwise it's similar to how the clipboard works. Only the DnD server
 #include "gdkwin32dnd-private.h"
 #include "gdkwin32.h"
 
-#include "gdk/gdkdebug.h"
+#include "gdk/gdkdebugprivate.h"
 #include "gdk/gdkdragprivate.h"
 #include "gdk/gdkintl.h"
 #include "gdk/gdk-private.h"

diff --git a/gdk/win32/gdkkeys-win32.c b/gdk/win32/gdkkeys-win32.c
index eed0d8fd23c3cb0291af3abce48457a16f6d1753..f795f042f0eb0db7428f878fed5626822b20e77e 100644 (file)
--- a/gdk/win32/gdkkeys-win32.c
+++ b/gdk/win32/gdkkeys-win32.c
@@ -28,7 +28,7 @@
 #include "gdk.h"
 
 #include "gdkprivate-win32.h"
-#include "gdkdebug.h"
+#include "gdkdebugprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdkkeysyms.h"
 #include "gdkkeysprivate.h"

diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index d6f8dc82edb25c57bbd583b5d675f440b0ce05c8..1854873fbc0447efc5be3004b5d092d8fee32f59 100644 (file)
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -32,7 +32,7 @@
 #include <io.h>
 
 #include "gdk.h"
-#include "gdkdebug.h"
+#include "gdkdebugprivate.h"
 #include "gdkkeysyms.h"
 #include "gdkintl.h"
 #include "gdkprivate-win32.h"

diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 3979970f59145f9b4d61f65ef9a43e8553ddc76e..f900a2e6f8c197b51f61a84f061f06239c1ab19f 100644 (file)
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -26,7 +26,7 @@
 #define __GDK_PRIVATE_WIN32_H__
 
 #include <gdk/gdkcursorprivate.h>
-#include <gdk/gdkdebug.h>
+#include <gdk/gdkdebugprivate.h>
 #include <gdk/win32/gdksurface-win32.h>
 #include <gdk/win32/gdkwin32display.h>
 #include <gdk/win32/gdkwin32screen.h>

diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c
index 2e745627ffdd06b356a7fa83cf26e82558480784..08eea4c5c30eeeccd3e4bd7d66b3b1170f645d13 100644 (file)
--- a/gdk/x11/gdkxftdefaults.c
+++ b/gdk/x11/gdkxftdefaults.c
@@ -54,7 +54,7 @@
 #include <gdkscreen-x11.h>
 #include <gdkprivate-x11.h>
 
-#include "gdkdebug.h"
+#include "gdkdebugprivate.h"
 
 static int
 parse_boolean (char *v)

diff --git a/gsk/gskdebugprivate.h b/gsk/gskdebugprivate.h
index f02130190c527c25bc5570f9e4660f2f2a3eb646..36ea6de72e9e9ece979a0ebb3153b9c26f72de35 100644 (file)
--- a/gsk/gskdebugprivate.h
+++ b/gsk/gskdebugprivate.h
@@ -2,7 +2,7 @@
 #define __GSK_DEBUG_PRIVATE_H__
 
 #include <glib.h>
-#include "gdk/gdkdebug.h"
+#include "gdk/gdkdebugprivate.h"
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h
index f7574dea72cbab55bb1e856708878b4487bc8c18..dcf2b69f5294024ab9b7806467bd2a1f90575d9b 100644 (file)
--- a/gtk/gtkprivate.h
+++ b/gtk/gtkprivate.h
@@ -28,7 +28,7 @@
 #include <glib-object.h>
 #include <gdk/gdk.h>
 #include <gdk/gdk-private.h>
-#include <gdk/gdkdebug.h>
+#include <gdk/gdkdebugprivate.h>
 
 #include "gtkcsstypesprivate.h"
 #include "gtktexthandleprivate.h"

diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
index 951ce98d1e0220c6aaa8d92f96137a0cc00e571b..16182597087ac8ac745b9e8845579bdf3ab2c8ba 100644 (file)
--- a/gtk/inspector/general.c
+++ b/gtk/inspector/general.c
@@ -35,7 +35,7 @@
 #include "gtkmediafileprivate.h"
 #include "gtkimmoduleprivate.h"
 
-#include "gdk/gdkdebug.h"
+#include "gdk/gdkdebugprivate.h"
 
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"

diff --git a/gtk/inspector/logs.c b/gtk/inspector/logs.c
index 97b5cf17c29e1347523d03b7afbb39a9b8c35278..7872838145b5d4ee0508f845c48686b7277749fc 100644 (file)
--- a/gtk/inspector/logs.c
+++ b/gtk/inspector/logs.c
@@ -41,7 +41,7 @@
 #include "gskrendererprivate.h"
 #include "gtkboxlayout.h"
 
-#include "gdk/gdkdebug.h"
+#include "gdk/gdkdebugprivate.h"
 
 struct _GtkInspectorLogs
 {

diff --git a/gtk/inspector/visual.c b/gtk/inspector/visual.c
index 4d1cc9c7cc143341edac432efdae70c44b42a297..f0ac13411308327434be861f0b400c3323b97c03 100644 (file)
--- a/gtk/inspector/visual.c
+++ b/gtk/inspector/visual.c
@@ -60,7 +60,7 @@
 #include "broadway/gdkbroadway.h"
 #endif
 
-#include "gdk/gdkdebug.h"
+#include "gdk/gdkdebugprivate.h"
 
 #define EPSILON               1e-10
 

diff --git a/gtk/inspector/window.c b/gtk/inspector/window.c
index 2bc45d82674b190ef186f15bd7bd21b81a1462d4..9603a573d3f7fe016c5309906a213dc982d478cb 100644 (file)
--- a/gtk/inspector/window.c
+++ b/gtk/inspector/window.c
@@ -49,7 +49,7 @@
 #include "general.h"
 #include "logs.h"
 
-#include "gdkdebug.h"
+#include "gdkdebugprivate.h"
 #include "gdkmarshalers.h"
 #include "gskrendererprivate.h"
 #include "gtkbutton.h"