GNOME.org
 

[gtkmm] Remove gdk/src/types.[hg,ccg]

commit 0ceb38384add4c05ef7f582a6181062c214ea5ae
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Mon Nov 2 14:39:45 2020 +0100

    Remove gdk/src/types.[hg,ccg]
    
    After Gdk::Point was removed, they contain only enum ModifierType.
    Move that enum to gdk/src/enums.hg.

 .gitignore                      |  2 --
 gdk/gdkmm.h                     |  1 -
 gdk/gdkmm/meson.build           |  1 -
 gdk/src/device.hg               |  1 -
 gdk/src/display.hg              |  1 -
 gdk/src/enums.hg                |  1 +
 gdk/src/event.hg                |  1 -
 gdk/src/filelist.am             |  3 +--
 gdk/src/pixbuf.hg               |  1 -
 gdk/src/surface.ccg             |  1 -
 gdk/src/surface.hg              |  1 -
 gdk/src/texture.ccg             |  1 +
 gdk/src/types.ccg               | 16 ----------------
 gdk/src/types.hg                | 39 ---------------------------------------
 gtk/gtkmm/accelerator.h         |  2 +-
 gtk/gtkmm/accelkey.h            |  3 +--
 gtk/src/eventcontroller.hg      |  2 +-
 gtk/src/eventcontrollerfocus.hg |  1 -
 gtk/src/eventcontrollerkey.hg   |  1 -
 gtk/src/shortcutcontroller.hg   |  2 +-
 gtk/src/shortcuttrigger.hg      |  2 +-
 gtk/src/widget.hg               |  1 -
 22 files changed, 8 insertions(+), 76 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9ed4a33e..f27d9f0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,8 +131,6 @@ gdk/gdkmm/toplevellayout.cc
 gdk/gdkmm/toplevellayout.h
 gdk/gdkmm/toplevelsize.cc
 gdk/gdkmm/toplevelsize.h
-gdk/gdkmm/types.cc
-gdk/gdkmm/types.h
 gdk/gdkmm/wrap_init.cc
 gdk/gdkmmconfig.h
 gdk/stamp-h2
diff --git a/gdk/gdkmm.h b/gdk/gdkmm.h
index 01ce3a4b..382c67dc 100644
--- a/gdk/gdkmm.h
+++ b/gdk/gdkmm.h
@@ -54,6 +54,5 @@
 #include <gdkmm/texture.h>
 #include <gdkmm/toplevel.h>
 #include <gdkmm/toplevelsurfaceimpl.h>
-#include <gdkmm/types.h>
 
 #endif /* _GDKMM_GDKMM_H_ */
diff --git a/gdk/gdkmm/meson.build b/gdk/gdkmm/meson.build
index ec4950ee..95776c16 100644
--- a/gdk/gdkmm/meson.build
+++ b/gdk/gdkmm/meson.build
@@ -70,7 +70,6 @@ gdkmm_any_hg_ccg_basenames = [
   'toplevel',
   'toplevellayout',
   'toplevelsize',
-  'types',
 ]
 
 gdkmm_deprecated_hg_ccg_basenames = []
diff --git a/gdk/src/device.hg b/gdk/src/device.hg
index 65f136b5..c5b812ed 100644
--- a/gdk/src/device.hg
+++ b/gdk/src/device.hg
@@ -19,7 +19,6 @@
 #include <gdkmm/cursor.h>
 #include <gdkmm/enums.h>
 #include <gdkmm/timecoord.h>
-#include <gdkmm/types.h>
 #include <gdk/gdk.h>
 
 _DEFS(gdkmm,gdk)
diff --git a/gdk/src/display.hg b/gdk/src/display.hg
index 1ef5b178..a8920bec 100644
--- a/gdk/src/display.hg
+++ b/gdk/src/display.hg
@@ -19,7 +19,6 @@
 #include <vector>
 
 #include <gdkmm/applaunchcontext.h>
-#include <gdkmm/types.h> //For ModifierType
 #include <gdkmm/event.h>
 
 _DEFS(gdkmm,gdk)
diff --git a/gdk/src/enums.hg b/gdk/src/enums.hg
index 8d86b0a3..c3136321 100644
--- a/gdk/src/enums.hg
+++ b/gdk/src/enums.hg
@@ -28,6 +28,7 @@ _WRAP_ENUM(AxisUse, GdkAxisUse, decl_prefix GDKMM_API)
 _WRAP_ENUM(CrossingMode, GdkCrossingMode, decl_prefix GDKMM_API)
 _WRAP_ENUM(DragAction, GdkDragAction, decl_prefix GDKMM_API)
 _WRAP_ENUM(Gravity, GdkGravity, decl_prefix GDKMM_API)
+_WRAP_ENUM(ModifierType, GdkModifierType, decl_prefix GDKMM_API)
 _WRAP_ENUM(NotifyType, GdkNotifyType, decl_prefix GDKMM_API)
 _WRAP_ENUM(ScrollDirection, GdkScrollDirection, decl_prefix GDKMM_API)
 _WRAP_ENUM(TouchpadGesturePhase, GdkTouchpadGesturePhase, decl_prefix GDKMM_API)
diff --git a/gdk/src/event.hg b/gdk/src/event.hg
index 980576fa..295b94fd 100644
--- a/gdk/src/event.hg
+++ b/gdk/src/event.hg
@@ -21,7 +21,6 @@ _DEFS(gdkmm,gdk)
 #include <glibmm/value.h>
 #include <gdkmm/enums.h>
 #include <gdkmm/timecoord.h>
-#include <gdkmm/types.h>
 
 /* Shadow DELETE macro (from winnt.h).
  * It interferes with Gdk::Event::Type::DELETE.
diff --git a/gdk/src/filelist.am b/gdk/src/filelist.am
index c82708bc..3dcb85f7 100644
--- a/gdk/src/filelist.am
+++ b/gdk/src/filelist.am
@@ -54,7 +54,6 @@ gdkmm_files_any_hg =          \
        timecoord.hg            \
        toplevel.hg \
        toplevellayout.hg \
-       toplevelsize.hg \
-       types.hg
+       toplevelsize.hg
 
 gdkmm_files_deprecated_hg =
diff --git a/gdk/src/pixbuf.hg b/gdk/src/pixbuf.hg
index eac2f497..9d8aaf17 100644
--- a/gdk/src/pixbuf.hg
+++ b/gdk/src/pixbuf.hg
@@ -22,7 +22,6 @@ _CONFIGINCLUDE(gdkmmconfig.h)
 #include <vector>
 
 #include <gdkmm/pixbufformat.h>
-#include <gdkmm/types.h>
 #include <giomm/inputstream.h>
 #include <giomm/icon.h>
 #include <giomm/loadableicon.h>
diff --git a/gdk/src/surface.ccg b/gdk/src/surface.ccg
index 30e1ea29..825a21ac 100644
--- a/gdk/src/surface.ccg
+++ b/gdk/src/surface.ccg
@@ -20,7 +20,6 @@
 #include <gdkmm/contentprovider.h>
 #include <gdkmm/cursor.h>
 #include <gdkmm/device.h>
-#include <gdkmm/types.h>
 #include <gdkmm/cairocontext.h>
 #include <gdkmm/glcontext.h>
 #include <gdkmm/frameclock.h>
diff --git a/gdk/src/surface.hg b/gdk/src/surface.hg
index 6a0388bc..47f7ffda 100644
--- a/gdk/src/surface.hg
+++ b/gdk/src/surface.hg
@@ -19,7 +19,6 @@ _CONFIGINCLUDE(gdkmmconfig.h)
 
 #include <glibmm/object.h>
 #include <gdkmm/drag.h>
-#include <gdkmm/types.h>
 #include <cairomm/region.h>
 #include <gdkmm/device.h>
 #include <gdkmm/enums.h>
diff --git a/gdk/src/texture.ccg b/gdk/src/texture.ccg
index 96109a83..386ac007 100644
--- a/gdk/src/texture.ccg
+++ b/gdk/src/texture.ccg
@@ -16,3 +16,4 @@
 
 #include <giomm/file.h>
 #include <gdkmm/pixbuf.h>
+#include <gdk/gdk.h>
diff --git a/gtk/gtkmm/accelerator.h b/gtk/gtkmm/accelerator.h
index bea2d96b..281e92e0 100644
--- a/gtk/gtkmm/accelerator.h
+++ b/gtk/gtkmm/accelerator.h
@@ -20,7 +20,7 @@
 #include <gtkmmconfig.h>
 
 #include <glibmm/ustring.h>
-#include <gdkmm/types.h>
+#include <gdkmm/enums.h>
 
 // The corresponding gtk functions are declared in gtkaccelgroup.h.
 
diff --git a/gtk/gtkmm/accelkey.h b/gtk/gtkmm/accelkey.h
index f3b8e51e..e43db678 100644
--- a/gtk/gtkmm/accelkey.h
+++ b/gtk/gtkmm/accelkey.h
@@ -21,8 +21,7 @@
 #include <gtkmmconfig.h>
 
 #include <gdk/gdkkeysyms.h>
-#include <gdkmm/types.h>
-
+#include <gdkmm/enums.h>
 
 namespace Gtk
 {
diff --git a/gtk/src/eventcontroller.hg b/gtk/src/eventcontroller.hg
index 816647ff..7c0260b6 100644
--- a/gtk/src/eventcontroller.hg
+++ b/gtk/src/eventcontroller.hg
@@ -18,7 +18,7 @@
 #include <gtkmm/widget.h>
 #include <gdkmm/device.h>
 #include <gdkmm/event.h>
-#include <gdkmm/types.h> // Gdk::ModifierType
+#include <gdkmm/enums.h>
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/object_p.h)
diff --git a/gtk/src/eventcontrollerfocus.hg b/gtk/src/eventcontrollerfocus.hg
index 5e7eb337..3784f3c0 100644
--- a/gtk/src/eventcontrollerfocus.hg
+++ b/gtk/src/eventcontrollerfocus.hg
@@ -16,7 +16,6 @@
 
 #include <gtkmm/eventcontroller.h>
 #include <gdkmm/enums.h>
-#include <gdkmm/types.h>
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/eventcontroller_p.h)
diff --git a/gtk/src/eventcontrollerkey.hg b/gtk/src/eventcontrollerkey.hg
index d5745bf8..38cc720f 100644
--- a/gtk/src/eventcontrollerkey.hg
+++ b/gtk/src/eventcontrollerkey.hg
@@ -16,7 +16,6 @@
 
 #include <gtkmm/eventcontroller.h>
 #include <gdkmm/enums.h>
-#include <gdkmm/types.h>
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/eventcontroller_p.h)
diff --git a/gtk/src/shortcutcontroller.hg b/gtk/src/shortcutcontroller.hg
index 8c26a4c4..67cc864c 100644
--- a/gtk/src/shortcutcontroller.hg
+++ b/gtk/src/shortcutcontroller.hg
@@ -17,7 +17,7 @@
 #include <gtkmm/eventcontroller.h>
 #include <gtkmm/buildable.h>
 #include <giomm/listmodel.h>
-#include <gdkmm/types.h>
+#include <gdkmm/enums.h>
 #include <gtkmm/enums.h>
 #include <gtkmm/shortcut.h>
 
diff --git a/gtk/src/shortcuttrigger.hg b/gtk/src/shortcuttrigger.hg
index fda0e90c..f43cb109 100644
--- a/gtk/src/shortcuttrigger.hg
+++ b/gtk/src/shortcuttrigger.hg
@@ -19,7 +19,7 @@ _CONFIGINCLUDE(gtkmmconfig.h)
 #include <glibmm/object.h>
 #include <gdkmm/display.h>
 #include <gdkmm/event.h>
-#include <gdkmm/types.h>
+#include <gdkmm/enums.h>
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/object_p.h)
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index 36a9c75f..b90c680a 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -26,7 +26,6 @@ _CONFIGINCLUDE(gtkmmconfig.h)
 #include <gtkmm/accessible.h>
 #include <gtkmm/buildable.h>
 #include <gtkmm/constrainttarget.h>
-#include <gdkmm/types.h>
 #include <gtkmm/enums.h>
 #include <gdkmm/display.h>
 #include <gdkmm/clipboard.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]