GNOME.org
 

[glibmm/export-more-symbols: 4/5] glib/src/*.hg: Mark all _WRAP_ENUM() with decl_prefix

commit b2713109348711e1ddb87be33c08d55b7dc8aada
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Sat Apr 4 12:31:41 2020 +0800

    glib/src/*.hg: Mark all _WRAP_ENUM() with decl_prefix
    
    As per Kjell's suggestions, make things more future-proof by marking all
    _WRAP_ENUM()'s with 'decl_prefix GLIBMM_API'.

 glib/src/checksum.hg    | 2 +-
 glib/src/date.hg        | 6 +++---
 glib/src/enums.hg       | 2 +-
 glib/src/fileutils.hg   | 2 +-
 glib/src/iochannel.hg   | 9 +++++----
 glib/src/keyfile.hg     | 2 +-
 glib/src/markup.hg      | 2 +-
 glib/src/miscutils.hg   | 4 ++--
 glib/src/module.hg      | 2 +-
 glib/src/nodetree.hg    | 2 +-
 glib/src/optionentry.hg | 2 +-
 glib/src/regex.hg       | 4 ++--
 glib/src/spawn.hg       | 2 +-
 glib/src/timezone.hg    | 2 +-
 glib/src/unicode.hg     | 8 ++++----
 15 files changed, 26 insertions(+), 25 deletions(-)
---
diff --git a/glib/src/checksum.hg b/glib/src/checksum.hg
index f07ec967..f4e90e4a 100644
--- a/glib/src/checksum.hg
+++ b/glib/src/checksum.hg
@@ -43,7 +43,7 @@ class GLIBMM_API Checksum
   _IGNORE(g_checksum_copy, g_checksum_free)
 
 public:
-  _WRAP_ENUM(Type, GChecksumType, NO_GTYPE)
+  _WRAP_ENUM(Type, GChecksumType, NO_GTYPE, decl_prefix GLIBMM_API)
 
 #m4 _CONVERSION(`Type', `GChecksumType', `(static_cast<$2>($3))')
 
diff --git a/glib/src/date.hg b/glib/src/date.hg
index 53356898..62f0b567 100644
--- a/glib/src/date.hg
+++ b/glib/src/date.hg
@@ -36,9 +36,9 @@ public:
   using Day = guint8 ;
   using Year = guint16;
 
-  _WRAP_ENUM(Month, GDateMonth, NO_GTYPE)
-  _WRAP_ENUM(Weekday, GDateWeekday, NO_GTYPE)
-  _WRAP_ENUM(DMY, GDateDMY, NO_GTYPE)
+  _WRAP_ENUM(Month, GDateMonth, NO_GTYPE, decl_prefix GLIBMM_API)
+  _WRAP_ENUM(Weekday, GDateWeekday, NO_GTYPE, decl_prefix GLIBMM_API)
+  _WRAP_ENUM(DMY, GDateDMY, NO_GTYPE, decl_prefix GLIBMM_API)
 
   static const Day     BAD_DAY    = 0;
   static const Year    BAD_YEAR   = 0;
diff --git a/glib/src/enums.hg b/glib/src/enums.hg
index 656f2851..49cfb125 100644
--- a/glib/src/enums.hg
+++ b/glib/src/enums.hg
@@ -20,6 +20,6 @@ _DEFS(glibmm,glib)
 
 namespace Glib
 {
-_WRAP_ENUM(ParamFlags, GParamFlags, NO_GTYPE)
+_WRAP_ENUM(ParamFlags, GParamFlags, NO_GTYPE, decl_prefix GLIBMM_API)
 } //namespace Glib
 
diff --git a/glib/src/fileutils.hg b/glib/src/fileutils.hg
index ecbd77b5..85d10a30 100644
--- a/glib/src/fileutils.hg
+++ b/glib/src/fileutils.hg
@@ -27,7 +27,7 @@ extern "C" { typedef struct _GDir GDir; }
 namespace Glib
 {
 
-_WRAP_ENUM(FileTest, GFileTest, NO_GTYPE)
+_WRAP_ENUM(FileTest, GFileTest, NO_GTYPE, decl_prefix GLIBMM_API)
 
 /** @defgroup FileUtils File Utilities
  * Various file-related classes and functions.
diff --git a/glib/src/iochannel.hg b/glib/src/iochannel.hg
index 15cdf232..1a0036ad 100644
--- a/glib/src/iochannel.hg
+++ b/glib/src/iochannel.hg
@@ -34,9 +34,9 @@ namespace Glib
 class Source;
 class IOSource;
 
-_WRAP_ENUM(SeekType, GSeekType, NO_GTYPE)
-_WRAP_ENUM(IOStatus, GIOStatus, NO_GTYPE, s#^EOF$#ENDOFFILE#)
-_WRAP_ENUM(IOFlags, GIOFlags, NO_GTYPE)
+_WRAP_ENUM(SeekType, GSeekType, NO_GTYPE, decl_prefix GLIBMM_API)
+_WRAP_ENUM(IOStatus, GIOStatus, NO_GTYPE, s#^EOF$#ENDOFFILE#, decl_prefix GLIBMM_API)
+_WRAP_ENUM(IOFlags, GIOFlags, NO_GTYPE, decl_prefix GLIBMM_API)
 
 
 // Glib::IOCondition::IN and Glib::IOCondition::OUT would be problematic.
@@ -59,7 +59,8 @@ _WRAP_ENUM(IOCondition, GIOCondition, NO_GTYPE,
   s#^PRI$#IO_PRI#,
   s#^ERR$#IO_ERR#,
   s#^HUP$#IO_HUP#,
-  s#^NVAL$#IO_NVAL#)
+  s#^NVAL$#IO_NVAL#,
+  decl_prefix GLIBMM_API)
 
 /** Exception class for IOChannel errors.
  */
diff --git a/glib/src/keyfile.hg b/glib/src/keyfile.hg
index fcf20583..96b346f5 100644
--- a/glib/src/keyfile.hg
+++ b/glib/src/keyfile.hg
@@ -97,7 +97,7 @@ class GLIBMM_API KeyFile final
 
 public:
 
-  _WRAP_ENUM(Flags, GKeyFileFlags, NO_GTYPE)
+  _WRAP_ENUM(Flags, GKeyFileFlags, NO_GTYPE, decl_prefix GLIBMM_API)
 
   //TODO: Maybe replace all the get_*/set_* methods with some generic get/set
   //methods when it is possible.
diff --git a/glib/src/markup.hg b/glib/src/markup.hg
index fa34f390..1d1f3eef 100644
--- a/glib/src/markup.hg
+++ b/glib/src/markup.hg
@@ -110,7 +110,7 @@ using Error = Glib::MarkupError;
 GLIBMM_API
 Glib::ustring escape_text(const Glib::ustring& text);
 
-_WRAP_ENUM(ParseFlags, GMarkupParseFlags, NO_GTYPE)
+_WRAP_ENUM(ParseFlags, GMarkupParseFlags, NO_GTYPE, decl_prefix GLIBMM_API)
 
 /** Binary predicate used by Markup::Parser::AttributeMap.
  * @ingroup Markup
diff --git a/glib/src/miscutils.hg b/glib/src/miscutils.hg
index 5e5e69ca..c31b3e6a 100644
--- a/glib/src/miscutils.hg
+++ b/glib/src/miscutils.hg
@@ -22,8 +22,8 @@ _DEFS(glibmm,glib)
 
 namespace Glib
 {
-_WRAP_ENUM(UserDirectory, GUserDirectory, NO_GTYPE, s#^DIRECTORY_##)
-_WRAP_ENUM(FormatSizeFlags, GFormatSizeFlags, NO_GTYPE)
+_WRAP_ENUM(UserDirectory, GUserDirectory, NO_GTYPE, s#^DIRECTORY_##, decl_prefix GLIBMM_API)
+_WRAP_ENUM(FormatSizeFlags, GFormatSizeFlags, NO_GTYPE, decl_prefix GLIBMM_API)
 
 /** @defgroup MiscUtils Miscellaneous Utility Functions
  * Miscellaneous Utility Functions -- a selection of portable utility functions.
diff --git a/glib/src/module.hg b/glib/src/module.hg
index 03b471f8..ea926882 100644
--- a/glib/src/module.hg
+++ b/glib/src/module.hg
@@ -43,7 +43,7 @@ class GLIBMM_API Module
 
 public:
 
-  _WRAP_ENUM(Flags, GModuleFlags, NO_GTYPE)
+  _WRAP_ENUM(Flags, GModuleFlags, NO_GTYPE, decl_prefix GLIBMM_API)
 
   /** Opens a module.
    *
diff --git a/glib/src/nodetree.hg b/glib/src/nodetree.hg
index 1db7f1ac..300b7f31 100644
--- a/glib/src/nodetree.hg
+++ b/glib/src/nodetree.hg
@@ -54,7 +54,7 @@ class NodeTree
 {
   _CLASS_GENERIC(NodeTree, GNode)
 public:
-  _WRAP_ENUM(TraverseType, GTraverseType, NO_GTYPE)
+  _WRAP_ENUM(TraverseType, GTraverseType, NO_GTYPE, decl_prefix GLIBMM_API)
 
   using TraverseFunc = sigc::slot<bool(NodeTree<T>&)>;
   using ForeachFunc = sigc::slot<void(NodeTree<T>&)>;
diff --git a/glib/src/optionentry.hg b/glib/src/optionentry.hg
index 9e9a4133..6cd9a942 100644
--- a/glib/src/optionentry.hg
+++ b/glib/src/optionentry.hg
@@ -43,7 +43,7 @@ class GLIBMM_API OptionEntry
   _CLASS_GENERIC(OptionEntry, GOptionEntry)
 public:
 
-  _WRAP_ENUM(Flags, GOptionFlags, NO_GTYPE)
+  _WRAP_ENUM(Flags, GOptionFlags, NO_GTYPE, decl_prefix GLIBMM_API)
 
   OptionEntry();
   OptionEntry(const OptionEntry& src);
diff --git a/glib/src/regex.hg b/glib/src/regex.hg
index 7cd4a326..ab900486 100644
--- a/glib/src/regex.hg
+++ b/glib/src/regex.hg
@@ -96,8 +96,8 @@ class GLIBMM_API Regex final
   _IGNORE(g_regex_ref, g_regex_unref)
 public:
 
-  _WRAP_ENUM(CompileFlags, GRegexCompileFlags, NO_GTYPE)
-  _WRAP_ENUM(MatchFlags, GRegexMatchFlags, NO_GTYPE)
+  _WRAP_ENUM(CompileFlags, GRegexCompileFlags, NO_GTYPE, decl_prefix GLIBMM_API)
+  _WRAP_ENUM(MatchFlags, GRegexMatchFlags, NO_GTYPE, decl_prefix GLIBMM_API)
 
   /// @throws Glib::RegexError
   static Glib::RefPtr<Glib::Regex> create(Glib::UStringView pattern, CompileFlags compile_options = 
static_cast<CompileFlags>(0), MatchFlags match_options = static_cast<MatchFlags>(0));
diff --git a/glib/src/spawn.hg b/glib/src/spawn.hg
index 40443c0f..c13ab808 100644
--- a/glib/src/spawn.hg
+++ b/glib/src/spawn.hg
@@ -27,7 +27,7 @@ namespace Glib
 
 using Pid = GPid;
 
-_WRAP_ENUM(SpawnFlags, GSpawnFlags, NO_GTYPE)
+_WRAP_ENUM(SpawnFlags, GSpawnFlags, NO_GTYPE, decl_prefix GLIBMM_API)
 
 /** @defgroup Spawn Spawning Processes
  * Process launching with fork()/exec().
diff --git a/glib/src/timezone.hg b/glib/src/timezone.hg
index ba7101f7..6ba871ec 100644
--- a/glib/src/timezone.hg
+++ b/glib/src/timezone.hg
@@ -28,7 +28,7 @@ typedef struct _GTimeZone GTimeZone;
 namespace Glib
 {
 
-_WRAP_ENUM(TimeType, GTimeType, NO_GTYPE)
+_WRAP_ENUM(TimeType, GTimeType, NO_GTYPE, decl_prefix GLIBMM_API)
 
 /** TimeZone - A structure representing a time zone.
  * TimeZone is a structure that represents a time zone, at no particular point
diff --git a/glib/src/unicode.hg b/glib/src/unicode.hg
index b3d65f55..f771743d 100644
--- a/glib/src/unicode.hg
+++ b/glib/src/unicode.hg
@@ -67,10 +67,10 @@ _POP()
 namespace Glib
 {
 
-_WRAP_ENUM(UnicodeType, GUnicodeType, NO_GTYPE)
-_WRAP_ENUM(UnicodeBreakType, GUnicodeBreakType, NO_GTYPE)
-_WRAP_ENUM(AsciiType, GAsciiType, NO_GTYPE)
-_WRAP_ENUM(NormalizeMode, GNormalizeMode, NO_GTYPE)
+_WRAP_ENUM(UnicodeType, GUnicodeType, NO_GTYPE, decl_prefix GLIBMM_API)
+_WRAP_ENUM(UnicodeBreakType, GUnicodeBreakType, NO_GTYPE, decl_prefix GLIBMM_API)
+_WRAP_ENUM(AsciiType, GAsciiType, NO_GTYPE, decl_prefix GLIBMM_API)
+_WRAP_ENUM(NormalizeMode, GNormalizeMode, NO_GTYPE, decl_prefix GLIBMM_API)
 
 /** @defgroup Unicode Unicode Manipulation
  * Functions operating on Unicode characters and UTF-8 strings.
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]