Cosmetics: Split off pango-color.h

4 files changed, 78 insertions, 46 deletions

diff --git a/pango/meson.build b/pango/meson.build
index 04d19b2b..9e1d8d93 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -34,6 +34,7 @@ pango_headers = [
   'pango-attributes.h',
   'pango-bidi-type.h',
   'pango-break.h',
+  'pango-color.h',
   'pango-context.h',
   'pango-coverage.h',
   'pango-direction.h',
diff --git a/pango/pango-attributes.h b/pango/pango-attributes.h
index 9cdacf7f..abdc0ecb 100644
--- a/pango/pango-attributes.h
+++ b/pango/pango-attributes.h
@@ -23,60 +23,15 @@
 #define __PANGO_ATTRIBUTES_H__
 
 #include <pango/pango-font.h>
+#include <pango/pango-color.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS
 
-/* PangoColor */
-
-typedef struct _PangoColor PangoColor;
-
-/**
- * PangoColor:
- * @red: value of red component
- * @green: value of green component
- * @blue: value of blue component
- *
- * The `PangoColor` structure is used to
- * represent a color in an uncalibrated RGB color-space.
- */
-struct _PangoColor
-{
-  guint16 red;
-  guint16 green;
-  guint16 blue;
-};
-
-/**
- * PANGO_TYPE_COLOR:
- *
- * The `GObject` type for `PangoColor`.
- */
-#define PANGO_TYPE_COLOR pango_color_get_type ()
-PANGO_AVAILABLE_IN_ALL
-GType       pango_color_get_type (void) G_GNUC_CONST;
 
 PANGO_AVAILABLE_IN_ALL
 GType       pango_attribute_get_type    (void) G_GNUC_CONST;
 
-PANGO_AVAILABLE_IN_ALL
-PangoColor *pango_color_copy     (const PangoColor *src);
-PANGO_AVAILABLE_IN_ALL
-void        pango_color_free     (PangoColor       *color);
-PANGO_AVAILABLE_IN_ALL
-gboolean    pango_color_parse    (PangoColor       *color,
-                                  const char       *spec);
-PANGO_AVAILABLE_IN_1_46
-gboolean    pango_color_parse_with_alpha
-                                 (PangoColor       *color,
-                                  guint16          *alpha,
-                                  const char       *spec);
-PANGO_AVAILABLE_IN_1_16
-gchar      *pango_color_to_string(const PangoColor *color);
-
-
-/* Attributes */
-
 typedef struct _PangoAttribute    PangoAttribute;
 typedef struct _PangoAttrClass    PangoAttrClass;
 
diff --git a/pango/pango-color.h b/pango/pango-color.h
new file mode 100644
index 00000000..675d8e82
--- /dev/null
+++ b/pango/pango-color.h
@@ -0,0 +1,75 @@
+/* Pango
+ * pango-color.h: A color struct
+ *
+ * Copyright (C) 2000 Red Hat Software
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __PANGO_COLOR_H__
+#define __PANGO_COLOR_H__
+
+#include <pango/pango-types.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+
+typedef struct _PangoColor PangoColor;
+
+/**
+ * PangoColor:
+ * @red: value of red component
+ * @green: value of green component
+ * @blue: value of blue component
+ *
+ * The `PangoColor` structure is used to
+ * represent a color in an uncalibrated RGB color-space.
+ */
+struct _PangoColor
+{
+  guint16 red;
+  guint16 green;
+  guint16 blue;
+};
+
+#define PANGO_TYPE_COLOR (pango_color_get_type ())
+
+PANGO_AVAILABLE_IN_ALL
+GType       pango_color_get_type         (void) G_GNUC_CONST;
+
+PANGO_AVAILABLE_IN_ALL
+PangoColor *pango_color_copy             (const PangoColor *src);
+
+PANGO_AVAILABLE_IN_ALL
+void        pango_color_free             (PangoColor       *color);
+
+PANGO_AVAILABLE_IN_ALL
+gboolean    pango_color_parse            (PangoColor       *color,
+                                          const char       *spec);
+
+PANGO_AVAILABLE_IN_1_46
+gboolean    pango_color_parse_with_alpha (PangoColor       *color,
+                                          guint16          *alpha,
+                                          const char       *spec);
+
+PANGO_AVAILABLE_IN_1_16
+char       *pango_color_to_string        (const PangoColor *color);
+
+
+G_END_DECLS
+
+#endif /* __PANGO_COLOR_H__ */
diff --git a/pango/pango.h b/pango/pango.h
index 16c7443a..b969bf47 100644
--- a/pango/pango.h
+++ b/pango/pango.h
@@ -25,6 +25,7 @@
 #include <pango/pango-attributes.h>
 #include <pango/pango-bidi-type.h>
 #include <pango/pango-break.h>
+#include <pango/pango-color.h>
 #include <pango/pango-context.h>
 #include <pango/pango-coverage.h>
 #include <pango/pango-direction.h>