diff options
author | Matthias Clasen <mclasen@redhat.com> | 2022-01-10 13:03:15 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2022-02-17 14:01:09 -0600 |
commit | 0c5df1c8e6eb06af417e37df6e0c225038365031 (patch) | |
tree | 7df1341953814e8d73bc47cf985f83ccd92be6af | |
parent | 5d605a632d092d1dcfb548af5b1120d1e3189389 (diff) | |
download | pango-0c5df1c8e6eb06af417e37df6e0c225038365031.tar.gz |
Drop deprecated PangoScript api
-rw-r--r-- | pango/pango-script.c | 27 | ||||
-rw-r--r-- | pango/pango-script.h | 14 |
2 files changed, 5 insertions, 36 deletions
diff --git a/pango/pango-script.c b/pango/pango-script.c index 71c519fd..05c8c4be 100644 --- a/pango/pango-script.c +++ b/pango/pango-script.c @@ -60,33 +60,6 @@ #include "pango-script.h" #include "pango-script-private.h" -/** - * pango_script_for_unichar: - * @ch: a Unicode character - * - * Looks up the script for a particular character. - * - * The script of a character is defined by - * [Unicode Standard Annex 24: Script names](http://www.unicode.org/reports/tr24/). - * - * No check is made for @ch being a valid Unicode character; if you pass - * in invalid character, the result is undefined. - * - * Note that while the return type of this function is declared - * as `PangoScript`, as of Pango 1.18, this function simply returns - * the return value of [func@GLib.unichar_get_script]. Callers must be - * prepared to handle unknown values. - * - * Return value: the `PangoScript` for the character. - * - * Since: 1.4 - * Deprecated: 1.44. Use g_unichar_get_script() - **/ -PangoScript -pango_script_for_unichar (gunichar ch) -{ - return (PangoScript)g_unichar_get_script (ch); -} /**********************************************************************/ diff --git a/pango/pango-script.h b/pango/pango-script.h index e453301d..3877989c 100644 --- a/pango/pango-script.h +++ b/pango/pango-script.h @@ -10,7 +10,7 @@ * * 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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public @@ -24,6 +24,9 @@ #include <glib-object.h> +#include <pango/pango-version-macros.h> +#include <pango/pango-language.h> + G_BEGIN_DECLS /** @@ -304,17 +307,12 @@ typedef enum { /* ISO 15924 code */ PANGO_SCRIPT_SIGNWRITING /* Sgnw */ } PangoScript; -#include <pango/pango-version-macros.h> - -PANGO_DEPRECATED_IN_1_44_FOR(g_unichar_get_script) -PangoScript pango_script_for_unichar (gunichar ch) G_GNUC_CONST; - PANGO_AVAILABLE_IN_1_44 GType pango_script_iter_get_type (void) G_GNUC_CONST; PANGO_AVAILABLE_IN_1_4 PangoScriptIter *pango_script_iter_new (const char *text, - int length); + int length); PANGO_AVAILABLE_IN_1_4 void pango_script_iter_get_range (PangoScriptIter *iter, const char **start, @@ -325,8 +323,6 @@ gboolean pango_script_iter_next (PangoScriptIter *iter); PANGO_AVAILABLE_IN_1_4 void pango_script_iter_free (PangoScriptIter *iter); -#include <pango/pango-language.h> - PANGO_AVAILABLE_IN_1_4 PangoLanguage *pango_script_get_sample_language (PangoScript script) G_GNUC_PURE; |