[pangomm] Remove deprecated API

[Kjell Ahlstedt <kjellahl src gnome org>]

commit 1dee6e7fe369902126d225c52373ea911bb55050
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Mon Jul 22 15:33:32 2019 +0200

    Remove deprecated API
    
    * pango/src/attrlist.[ccg|hg]: Remove non-const operator bool().
    * pango/src/cairofontmap.[ccg|hg]: Remove create_context().
    * pango/src/color.[ccg|hg]: Remove non-const operator bool().
    * pango/src/layout.[ccg|hg]: Remove get_iter(LayoutIter& iter).
    * pango/src/layoutiter.[ccg|hg]: Remove assign_gobj().

 pango/src/attrlist.ccg     | 11 -----------
 pango/src/attrlist.hg      |  7 -------
 pango/src/cairofontmap.ccg | 11 -----------
 pango/src/cairofontmap.hg  | 11 ++---------
 pango/src/color.ccg        |  7 -------
 pango/src/color.hg         |  5 -----
 pango/src/layout.ccg       | 12 ------------
 pango/src/layout.hg        | 15 ++-------------
 pango/src/layoutiter.ccg   | 11 -----------
 pango/src/layoutiter.hg    | 10 ----------
 10 files changed, 4 insertions(+), 96 deletions(-)
---
diff --git a/pango/src/attrlist.ccg b/pango/src/attrlist.ccg
index 83e93ad..4859167 100644
--- a/pango/src/attrlist.ccg
+++ b/pango/src/attrlist.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: attrlist.ccg,v 1.3 2005/11/22 15:00:17 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-1999 The Gtk-- Development Team
  * Copyright 2001      Free Software Foundation
  *
@@ -32,13 +28,6 @@ AttrList::AttrList(const Glib::ustring& markup_text, gunichar accel_marker)
     gobject_ = nullptr;
 }
 
-_DEPRECATE_IFDEF_START
-AttrList::operator bool()
-{
-  return gobj() != nullptr;
-}
-_DEPRECATE_IFDEF_END
-
 AttrList::operator bool() const
 {
   return gobj() != nullptr;
diff --git a/pango/src/attrlist.hg b/pango/src/attrlist.hg
index 768737d..79314fb 100644
--- a/pango/src/attrlist.hg
+++ b/pango/src/attrlist.hg
@@ -1,5 +1,3 @@
-/* $Id: attrlist.hg,v 1.4 2005/11/22 15:00:17 murrayc Exp $ */
-
 /* attrlist.h
  *
  * Copyright (C) 1998-1999 The gtkmm Development Team
@@ -70,11 +68,6 @@ public:
    */
   AttrList(const Glib::ustring& markup_text, gunichar accel_marker, Glib::ustring& text, gunichar& 
accel_char);
 
-  _DEPRECATE_IFDEF_START
-  ///@deprecated Use the const version
-  explicit operator bool();
-  _DEPRECATE_IFDEF_END
-
   ///Tests whether the AttrList is valid.
   explicit operator bool() const;
 
diff --git a/pango/src/cairofontmap.ccg b/pango/src/cairofontmap.ccg
index ba5bdf8..da4b125 100644
--- a/pango/src/cairofontmap.ccg
+++ b/pango/src/cairofontmap.ccg
@@ -16,15 +16,4 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <pangomm/context.h>
 #include <pango/pangocairo.h>
-
-namespace Pango
-{
-
-Glib::RefPtr<Context> CairoFontMap::create_context()
-{
-  return Glib::wrap(pango_font_map_create_context(PANGO_FONT_MAP(gobj())), false);
-}
-
-} // namespace Pango
diff --git a/pango/src/cairofontmap.hg b/pango/src/cairofontmap.hg
index d56fced..00a1950 100644
--- a/pango/src/cairofontmap.hg
+++ b/pango/src/cairofontmap.hg
@@ -1,5 +1,3 @@
-/* $Id: cairofontmap.hg,v 1.1 2006/05/30 17:14:21 murrayc Exp $ */
-
 /* fontmap.h
  *
  * Copyright 2001      The gtkmm Development Team
@@ -20,7 +18,7 @@
  */
 
 #include <glibmm/interface.h>
-#include <pangomm/context.h>
+#include <cairomm/enums.h>
 #include <pango/pangocairo.h>
 
 _DEFS(pangomm,pango)
@@ -33,8 +31,6 @@ typedef struct _PangoCairoFontMapIface PangoCairoFontMapIface;
 namespace Pango
 {
 
-class Context;
-
 /** A Pango::CairoFontMap represents the set of fonts available for a particular rendering system.
  */
 class CairoFontMap : public Glib::Interface
@@ -50,10 +46,7 @@ public:
 
   _WRAP_METHOD(void set_resolution(double dpi), pango_cairo_font_map_set_resolution)
   _WRAP_METHOD(double get_resolution() const, pango_cairo_font_map_get_resolution)
-
-  // TODO: Remove this when we can break ABI.
-  _WRAP_METHOD_DOCS_ONLY(pango_cairo_font_map_create_context)
-  Glib::RefPtr<Context> create_context();
+  _IGNORE(pango_cairo_font_map_create_context)dnl// deprecated
 };
 
 } // namespace Pango
diff --git a/pango/src/color.ccg b/pango/src/color.ccg
index c382311..a43853d 100644
--- a/pango/src/color.ccg
+++ b/pango/src/color.ccg
@@ -25,13 +25,6 @@ PangoColor* _pango_color_new()
   return g_new(PangoColor, 1);
 }
 
- _DEPRECATE_IFDEF_START
-Color::operator bool()
-{
-  return gobj() != nullptr;
-}
- _DEPRECATE_IFDEF_END
-
 Color::operator bool() const
 {
   return gobj() != nullptr;
diff --git a/pango/src/color.hg b/pango/src/color.hg
index f39a6c7..e3bfe8e 100644
--- a/pango/src/color.hg
+++ b/pango/src/color.hg
@@ -33,11 +33,6 @@ class Color
 
 public:
 
-  _DEPRECATE_IFDEF_START
-  /// @deprecated Use the const version.
-  explicit operator bool();
-  _DEPRECATE_IFDEF_END
-
   /// Tests whether the Color is valid.
   explicit operator bool() const;
   
diff --git a/pango/src/layout.ccg b/pango/src/layout.ccg
index d07f157..3aa20eb 100644
--- a/pango/src/layout.ccg
+++ b/pango/src/layout.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: layout.ccg,v 1.3 2006/05/30 17:14:21 murrayc Exp $ */
-
 /* 
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -133,19 +129,11 @@ Rectangle Layout::get_pixel_logical_extents() const
   return logical_extents;
 }
 
-void Layout::get_iter(LayoutIter& iter)
-{
-  auto* cobject = pango_layout_get_iter(gobj());
-  iter = Glib::wrap(cobject, false /* don't take_copy */);
-}
-
-_DEPRECATE_IFDEF_START
 LayoutIter Layout::get_iter()
 {
   auto* cobject = pango_layout_get_iter(gobj());
   return Glib::wrap(cobject, false /* don't take_copy */);
 }
-_DEPRECATE_IFDEF_END
 
 void Layout::unset_font_description()
 {
diff --git a/pango/src/layout.hg b/pango/src/layout.hg
index 03542fb..99584d0 100644
--- a/pango/src/layout.hg
+++ b/pango/src/layout.hg
@@ -68,7 +68,7 @@ public:
   * application that is laying out large amounts of text.
   * 
   * @param context A Cairo context.
-  * @result The newly created Pango Layout.
+  * @return The newly created Pango Layout.
   */
   static Glib::RefPtr<Layout> create(const Cairo::RefPtr<Cairo::Context>& context);
 
@@ -236,24 +236,13 @@ public:
   _WRAP_METHOD(std::vector<Glib::RefPtr<LayoutLine>> get_lines(), pango_layout_get_lines)
   _WRAP_METHOD(std::vector<Glib::RefPtr<const LayoutLine>> get_lines() const, 
pango_layout_get_lines_readonly)
 
-_DEPRECATE_IFDEF_START
   /** Gets an iterator to iterate over the visual extents of the layout.
-   * @param iter Location to store the iterator.
-   *
-   * @deprecated Use the get_iter() that returns the LayoutIter instead of 
-   * using an output parameter.
-   */
-  void get_iter(LayoutIter& iter);
-_DEPRECATE_IFDEF_END
-  
-  /** Gets an iterator to iterate over the visual extents of the layout.
-   * @result The iterator.
+   * @return The iterator.
    *
    * @newin{2,28}
    */
   LayoutIter get_iter();
 
-
   /** Adds the text in this LayoutLine to the current path in the
    * specified Cairo @a context. The origin of the glyphs (the left edge
    * of the line) will be at the current point of the cairo context.
diff --git a/pango/src/layoutiter.ccg b/pango/src/layoutiter.ccg
index 82dafd2..3165a1f 100644
--- a/pango/src/layoutiter.ccg
+++ b/pango/src/layoutiter.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: layoutiter.ccg,v 1.1 2003/01/21 13:41:06 murrayc Exp $ */
-
 /*
- *
  * Copyright 2001-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -25,12 +21,6 @@
 namespace Pango
 {
 
-void LayoutIter::assign_gobj(PangoLayoutIter* /* src */)
-{
-  //We don't actually use this anymore, and it was only ever for internal use.
-  //We just have not removed it completely to avoid appearing to break the ABI.
-}
-
 Rectangle LayoutIter::get_char_extents() const
 {
   Rectangle logical_rect;
@@ -95,4 +85,3 @@ Rectangle LayoutIter::get_layout_logical_extents() const
 }
 
 } // namespace Pango
-
diff --git a/pango/src/layoutiter.hg b/pango/src/layoutiter.hg
index 1099b8e..ee8f144 100644
--- a/pango/src/layoutiter.hg
+++ b/pango/src/layoutiter.hg
@@ -1,5 +1,3 @@
-/* $Id: layoutiter.hg,v 1.2 2003/12/14 11:54:05 murrayc Exp $ */
-
 /* layoutiter.h
  *
  * Copyright 2001-2002 The gtkmm Development Team
@@ -113,14 +111,6 @@ public:
   Rectangle get_layout_logical_extents() const;
 
   _WRAP_METHOD(int get_baseline() const, pango_layout_iter_get_baseline)
-
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-  /** @deprecated Use the copy constructor instead.
-   * This was only ever for internal use anyway.
-   */
-  void assign_gobj(PangoLayoutIter* src);
-#endif
 };
 
 } //namespace Pango
-