[glibmm] Deprecate Regex now that we have std::regex.



commit a1f0b1a06095d81b6a5b8255b818b1c35c92df29
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Sep 1 09:05:55 2015 +0200

    Deprecate Regex now that we have std::regex.

 examples/Makefile.am   |    1 -
 examples/regex/main.cc |   45 ---------------------------------------------
 glib/glibmm.h          |    1 -
 glib/src/filelist.am   |    2 +-
 glib/src/regex.hg      |    7 +++++++
 5 files changed, 8 insertions(+), 48 deletions(-)
---
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 0de871a..bc98505 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -31,7 +31,6 @@ check_PROGRAMS =                      \
        network/socket-server           \
        options/example                 \
        properties/example              \
-       regex/example                   \
        settings/settings               \
        thread/dispatcher               \
        thread/dispatcher2              \
diff --git a/glib/glibmm.h b/glib/glibmm.h
index fb409f8..3f076d2 100644
--- a/glib/glibmm.h
+++ b/glib/glibmm.h
@@ -36,7 +36,6 @@
  * - Glib::ustring: A UTF-8 string class that can be used interchangably with std::string. Plus @ref 
StringUtils
  * - Glib::RefPtr: A reference-counting smartpointer, for use with Glib::ObjectBase or similar
  * - @ref CharsetConv
- * - Glib::Regex: Regular expression string matching.
  * - Glib::KeyFile: Parsing and writing of key files (similar to .ini files)
  * - Glib::Checksum
  * - Glib::Date, Glib::Timer, Glib::TimeVal
diff --git a/glib/src/filelist.am b/glib/src/filelist.am
index 9434132..8851af5 100644
--- a/glib/src/filelist.am
+++ b/glib/src/filelist.am
@@ -32,7 +32,6 @@ glibmm_files_any_hg =         \
        optioncontext.hg        \
        optionentry.hg          \
        optiongroup.hg          \
-       regex.hg                \
        shell.hg                \
        spawn.hg                \
        threads.hg              \
@@ -45,6 +44,7 @@ glibmm_files_any_hg =         \
        varianttype.hg
 
 glibmm_files_deprecated_hg = \
+  regex.hg \
        thread.hg               \
        valuearray.hg
 
diff --git a/glib/src/regex.hg b/glib/src/regex.hg
index 0044b12..66bfe34 100644
--- a/glib/src/regex.hg
+++ b/glib/src/regex.hg
@@ -17,6 +17,8 @@
 
 _DEFS(glibmm,glib)
 
+_IS_DEPRECATED // This whole file is deprecated.
+
 #include <glibmmconfig.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
@@ -35,6 +37,7 @@ _WRAP_ENUM(RegexCompileFlags, GRegexCompileFlags, NO_GTYPE)
 _WRAP_ENUM(RegexMatchFlags, GRegexMatchFlags, NO_GTYPE)
 
 /** Exception class for Regex
+ * @deprecated Glib::Regex is deprecated in favor of std::regex.
  */
 _WRAP_GERROR(RegexError, GRegexError, G_REGEX_ERROR, NO_GTYPE)
 
@@ -91,6 +94,8 @@ class MatchInfo;
  * The regular expressions low level functionalities are obtained through the
  * excellent PCRE library written by Philip Hazel.
  *
+ * @deprecated Glib::Regex is deprecated in favor of std::regex.
+ *
  * @newin{2,14}
  */
 class Regex final
@@ -210,6 +215,8 @@ public:
 /** MatchInfo - MatchInfo is used to retrieve information about the regular
  * expression match which created it.
  * @newin{2,28}
+ *
+ * @deprecated Glib::Regex is deprecated in favor of std::regex.
  */
 class MatchInfo
 {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]