From 593bf2bc6d63c1c03d7332850755a5030a34936a Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu, 20 Oct 2022 12:35:31 +0100
Subject: [PATCH] Mark GtkTreeView-related types as deprecated

Add the Deprecated annotation to the type docblock.
---
 gtk/deprecated/gtkliststore.c       |   2 +
 gtk/deprecated/gtktreednd.c         |  54 +++++-----
 gtk/deprecated/gtktreemodel.c       |   4 +-
 gtk/deprecated/gtktreemodelfilter.c |  14 +--
 gtk/deprecated/gtktreemodelsort.c   |  52 ++++-----
 gtk/deprecated/gtktreeselection.c   |  38 +++----
 gtk/deprecated/gtktreesortable.c    |  43 ++++----
 gtk/deprecated/gtktreestore.c       |   2 +
 gtk/deprecated/gtktreeviewcolumn.c  | 161 ++++++++++++++--------------
 9 files changed, 197 insertions(+), 173 deletions(-)

diff --git a/gtk/deprecated/gtkliststore.c b/gtk/deprecated/gtkliststore.c
index 24c6a02c95..3804aff03d 100644
--- a/gtk/deprecated/gtkliststore.c
+++ b/gtk/deprecated/gtkliststore.c
@@ -175,6 +175,8 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  *   </data>
  * </object>
  * ```
+ *
+ * Deprecated: 4.10: Use [class@Gio.ListStore] instead
  */
 
 
diff --git a/gtk/deprecated/gtktreednd.c b/gtk/deprecated/gtktreednd.c
index d7dc232fab..2e99323d21 100644
--- a/gtk/deprecated/gtktreednd.c
+++ b/gtk/deprecated/gtktreednd.c
@@ -49,12 +49,18 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  * GtkTreeDragDest:
  *
  * Interface for Drag-and-Drop destinations in `GtkTreeView`.
+ *
+ * Deprecated: 4.10: List views use widgets to display their contents.
+ *   You can use [class@Gtk.DropTarget] to implement a drop destination
  */
 
 /**
  * GtkTreeDragSource:
  *
  * Interface for Drag-and-Drop destinations in `GtkTreeView`.
+ *
+ * Deprecated: 4.10: List views use widgets to display their contents.
+ *   You can use [class@Gtk.DragSource] to implement a drag source
  */
 
 GType
@@ -77,11 +83,11 @@ gtk_tree_drag_source_get_type (void)
 	NULL
       };
 
-      our_type = g_type_register_static (G_TYPE_INTERFACE, 
+      our_type = g_type_register_static (G_TYPE_INTERFACE,
 					 I_("GtkTreeDragSource"),
 					 &our_info, 0);
     }
-  
+
   return our_type;
 }
 
@@ -108,7 +114,7 @@ gtk_tree_drag_dest_get_type (void)
 
       our_type = g_type_register_static (G_TYPE_INTERFACE, I_("GtkTreeDragDest"), &our_info, 0);
     }
-  
+
   return our_type;
 }
 
@@ -116,7 +122,7 @@ gtk_tree_drag_dest_get_type (void)
  * gtk_tree_drag_source_row_draggable:
  * @drag_source: a `GtkTreeDragSource`
  * @path: row on which user is initiating a drag
- * 
+ *
  * Asks the `GtkTreeDragSource` whether a particular row can be used as
  * the source of a DND operation. If the source doesn’t implement
  * this interface, the row is assumed draggable.
@@ -147,13 +153,13 @@ gtk_tree_drag_source_row_draggable (GtkTreeDragSource *drag_source,
  * gtk_tree_drag_source_drag_data_delete:
  * @drag_source: a `GtkTreeDragSource`
  * @path: row that was being dragged
- * 
+ *
  * Asks the `GtkTreeDragSource` to delete the row at @path, because
  * it was moved somewhere else via drag-and-drop. Returns %FALSE
  * if the deletion fails because @path no longer exists, or for
  * some model-specific reason. Should robustly handle a @path no
  * longer found in the model!
- * 
+ *
  * Returns: %TRUE if the row was successfully deleted
  *
  * Deprecated: 4.10: Use list models instead
@@ -174,11 +180,11 @@ gtk_tree_drag_source_drag_data_delete (GtkTreeDragSource *drag_source,
  * gtk_tree_drag_source_drag_data_get:
  * @drag_source: a `GtkTreeDragSource`
  * @path: row that was dragged
- * 
+ *
  * Asks the `GtkTreeDragSource` to return a `GdkContentProvider` representing
  * the row at @path. Should robustly handle a @path no
  * longer found in the model!
- * 
+ *
  * Returns: (nullable) (transfer full): a `GdkContentProvider` for the
  *    given @path
  *
@@ -201,14 +207,14 @@ gtk_tree_drag_source_drag_data_get (GtkTreeDragSource *drag_source,
  * @drag_dest: a `GtkTreeDragDest`
  * @dest: row to drop in front of
  * @value: data to drop
- * 
+ *
  * Asks the `GtkTreeDragDest` to insert a row before the path @dest,
  * deriving the contents of the row from @value. If @dest is
  * outside the tree so that inserting before it is impossible, %FALSE
  * will be returned. Also, %FALSE may be returned if the new row is
  * not created for some model-specific reason.  Should robustly handle
  * a @dest no longer found in the model!
- * 
+ *
  * Returns: whether a new row was created before position @dest
  *
  * Deprecated: 4.10: Use list models instead
@@ -233,13 +239,13 @@ gtk_tree_drag_dest_drag_data_received (GtkTreeDragDest  *drag_dest,
  * @drag_dest: a `GtkTreeDragDest`
  * @dest_path: destination row
  * @value: the data being dropped
- * 
+ *
  * Determines whether a drop is possible before the given @dest_path,
  * at the same depth as @dest_path. i.e., can we drop the data in
  * @value at that location. @dest_path does not have to
  * exist; the return value will almost certainly be %FALSE if the
  * parent of @dest_path doesn’t exist, though.
- * 
+ *
  * Returns: %TRUE if a drop is possible before @dest_path
  *
  * Deprecated: 4.10: Use list models instead
@@ -281,9 +287,9 @@ G_DEFINE_BOXED_TYPE (GtkTreeRowData, gtk_tree_row_data,
  * gtk_tree_create_row_drag_content:
  * @tree_model: a `GtkTreeModel`
  * @path: a row in @tree_model
- * 
+ *
  * Creates a content provider for dragging @path from @tree_model.
- * 
+ *
  * Returns: (transfer full): a new `GdkContentProvider`
  *
  * Deprecated: 4.10: Use list models instead
@@ -297,7 +303,7 @@ gtk_tree_create_row_drag_content (GtkTreeModel *tree_model,
   char *path_str;
   int len;
   int struct_size;
-  
+
   g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), FALSE);
   g_return_val_if_fail (path != NULL, FALSE);
 
@@ -309,18 +315,18 @@ gtk_tree_create_row_drag_content (GtkTreeModel *tree_model,
   struct_size = sizeof (GtkTreeRowData) + len + 1 -
     (sizeof (GtkTreeRowData) - G_STRUCT_OFFSET (GtkTreeRowData, path));
 
-  trd = g_malloc (struct_size); 
+  trd = g_malloc (struct_size);
 
   strcpy (trd->path, path_str);
 
   g_free (path_str);
-  
+
   trd->model = tree_model;
-  
+
   content = gdk_content_provider_new_typed (GTK_TYPE_TREE_ROW_DATA, trd);
 
   g_free (trd);
-  
+
   return content;
 }
 
@@ -329,12 +335,12 @@ gtk_tree_create_row_drag_content (GtkTreeModel *tree_model,
  * @value: a `GValue`
  * @tree_model: (nullable) (optional) (transfer none) (out): a `GtkTreeModel`
  * @path: (nullable) (optional) (out): row in @tree_model
- * 
+ *
  * Obtains a @tree_model and @path from value of target type
  * %GTK_TYPE_TREE_ROW_DATA.
  *
  * The returned path must be freed with gtk_tree_path_free().
- * 
+ *
  * Returns: %TRUE if @selection_data had target type %GTK_TYPE_TREE_ROW_DATA
  *  is otherwise valid
  *
@@ -346,8 +352,8 @@ gtk_tree_get_row_drag_data (const GValue  *value,
 			    GtkTreePath  **path)
 {
   GtkTreeRowData *trd;
-  
-  g_return_val_if_fail (value != NULL, FALSE);  
+
+  g_return_val_if_fail (value != NULL, FALSE);
 
   if (tree_model)
     *tree_model = NULL;
@@ -367,6 +373,6 @@ gtk_tree_get_row_drag_data (const GValue  *value,
 
   if (path)
     *path = gtk_tree_path_new_from_string (trd->path);
-  
+
   return TRUE;
 }
diff --git a/gtk/deprecated/gtktreemodel.c b/gtk/deprecated/gtktreemodel.c
index 148d0178b8..7c3a390bcd 100644
--- a/gtk/deprecated/gtktreemodel.c
+++ b/gtk/deprecated/gtktreemodel.c
@@ -228,6 +228,8 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  *   required for levels in which nodes are referenced. For the root level
  *   however, signals must be emitted at all times (however the root level
  *   is always referenced when any view is attached).
+ *
+ * Deprecated: 4.10: Use [iface@Gio.ListModel] instead
  */
 
 #define INITIALIZE_TREE_ITER(Iter) \
@@ -362,7 +364,7 @@ gtk_tree_model_base_init (gpointer g_class)
       tree_model_signals[ROW_CHANGED] =
         g_signal_new (I_("row-changed"),
                       GTK_TYPE_TREE_MODEL,
-                      G_SIGNAL_RUN_LAST, 
+                      G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (GtkTreeModelIface, row_changed),
                       NULL, NULL,
                       _gtk_marshal_VOID__BOXED_BOXED,
diff --git a/gtk/deprecated/gtktreemodelfilter.c b/gtk/deprecated/gtktreemodelfilter.c
index 0121c13b48..d7e7df5c14 100644
--- a/gtk/deprecated/gtktreemodelfilter.c
+++ b/gtk/deprecated/gtktreemodelfilter.c
@@ -31,13 +31,13 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  *
  * A `GtkTreeModelFilter` is a tree model which wraps another tree model,
  * and can do the following things:
- * 
+ *
  * - Filter specific rows, based on data from a “visible column”, a column
  *   storing booleans indicating whether the row should be filtered or not,
  *   or based on the return value of a “visible function”, which gets a
  *   model, iter and user_data and returns a boolean indicating whether the
  *   row should be filtered or not.
- * 
+ *
  * - Modify the “appearance” of the model, using a modify function.
  *   This is extremely powerful and allows for just changing some
  *   values and also for creating a completely different model based
@@ -94,6 +94,8 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  * because it does not implement reference counting, or for models that
  * do implement reference counting, obtain references on these child levels
  * yourself.
+ *
+ * Deprecated: 4.10: Use [class@Gtk.FilterListModel] instead.
  */
 
 /* Notes on this implementation of GtkTreeModelFilter
@@ -588,7 +590,7 @@ gtk_tree_model_filter_finalize (GObject *object)
     gtk_tree_model_filter_free_level (filter, filter->priv->root, TRUE, TRUE, FALSE);
 
   g_free (filter->priv->modify_types);
-  
+
   if (filter->priv->modify_destroy)
     filter->priv->modify_destroy (filter->priv->modify_data);
 
@@ -3801,7 +3803,7 @@ gtk_tree_model_filter_get_model (GtkTreeModelFilter *filter)
  * %FALSE otherwise.
  *
  * If the condition calculated by the function changes over time (e.g.
- * because it depends on some global parameters), you must call 
+ * because it depends on some global parameters), you must call
  * gtk_tree_model_filter_refilter() to keep the visibility information
  * of the model up-to-date.
  *
@@ -3864,8 +3866,8 @@ gtk_tree_model_filter_set_visible_func (GtkTreeModelFilter            *filter,
  * types for this model (which will be exposed to the parent model/view).
  * The @func, @data and @destroy parameters are for specifying the modify
  * function. The modify function will get called for each
- * data access, the goal of the modify function is to return the data which 
- * should be displayed at the location specified using the parameters of the 
+ * data access, the goal of the modify function is to return the data which
+ * should be displayed at the location specified using the parameters of the
  * modify function.
  *
  * Note that gtk_tree_model_filter_set_modify_func()
diff --git a/gtk/deprecated/gtktreemodelsort.c b/gtk/deprecated/gtktreemodelsort.c
index f6da951bed..a45257a61f 100644
--- a/gtk/deprecated/gtktreemodelsort.c
+++ b/gtk/deprecated/gtktreemodelsort.c
@@ -127,6 +127,8 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  *   g_free (modified_data);
  * }
  * ]|
+ *
+ * Deprecated: 4.10: Use [class@Gtk.SortListModel] instead
  */
 
 
@@ -659,13 +661,13 @@ fill_sort_data (SortData         *data,
   if (priv->sort_column_id != GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
     {
       GtkTreeDataSortHeader *header;
-      
+
       header = _gtk_tree_data_list_get_header (priv->sort_list,
 					       priv->sort_column_id);
-      
+
       g_return_if_fail (header != NULL);
       g_return_if_fail (header->func != NULL);
-      
+
       data->sort_func = header->func;
       data->sort_data = header->data;
     }
@@ -1421,7 +1423,7 @@ gtk_tree_model_sort_iter_children (GtkTreeModel *tree_model,
 
   iter->stamp = 0;
   g_return_val_if_fail (priv->child_model != NULL, FALSE);
-  if (parent) 
+  if (parent)
     g_return_val_if_fail (VALID_ITER (parent, tree_model_sort), FALSE);
 
   if (parent == NULL)
@@ -1482,7 +1484,7 @@ gtk_tree_model_sort_iter_n_children (GtkTreeModel *tree_model,
   GtkTreeIter child_iter;
 
   g_return_val_if_fail (priv->child_model != NULL, 0);
-  if (iter) 
+  if (iter)
     g_return_val_if_fail (VALID_ITER (iter, tree_model_sort), 0);
 
   if (iter == NULL)
@@ -1504,7 +1506,7 @@ gtk_tree_model_sort_iter_nth_child (GtkTreeModel *tree_model,
   /* We have this for the iter == parent case */
   GtkTreeIter children;
 
-  if (parent) 
+  if (parent)
     g_return_val_if_fail (VALID_ITER (parent, tree_model_sort), FALSE);
 
   /* Use this instead of has_child to force us to build the level, if needed */
@@ -1532,7 +1534,7 @@ static gboolean
 gtk_tree_model_sort_iter_parent (GtkTreeModel *tree_model,
 				 GtkTreeIter  *iter,
 				 GtkTreeIter  *child)
-{ 
+{
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
   SortLevel *level;
@@ -1670,7 +1672,7 @@ gtk_tree_model_sort_get_sort_column_id (GtkTreeSortable *sortable,
   if (priv->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID ||
       priv->sort_column_id == GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID)
     return FALSE;
-  
+
   return TRUE;
 }
 
@@ -2111,9 +2113,9 @@ gtk_tree_model_sort_elt_get_path (SortLevel *level,
  * @tree_model_sort: The `GtkTreeModelSort`.
  * @child_model: (nullable): A `GtkTreeModel`
  *
- * Sets the model of @tree_model_sort to be @model.  If @model is %NULL, 
- * then the old model is unset.  The sort function is unset as a result 
- * of this call. The model will be in an unsorted state until a sort 
+ * Sets the model of @tree_model_sort to be @model.  If @model is %NULL,
+ * then the old model is unset.  The sort function is unset as a result
+ * of this call. The model will be in an unsorted state until a sort
  * function is set.
  *
  * Deprecated: 4.10
@@ -2274,12 +2276,12 @@ gtk_real_tree_model_sort_convert_child_path_to_path (GtkTreeModelSort *tree_mode
  * gtk_tree_model_sort_convert_child_path_to_path:
  * @tree_model_sort: A `GtkTreeModelSort`
  * @child_path: A `GtkTreePath` to convert
- * 
+ *
  * Converts @child_path to a path relative to @tree_model_sort.  That is,
  * @child_path points to a path in the child model.  The returned path will
- * point to the same row in the sorted model.  If @child_path isn’t a valid 
+ * point to the same row in the sorted model.  If @child_path isn’t a valid
  * path on the child model, then %NULL is returned.
- * 
+ *
  * Returns: (nullable) (transfer full): A newly allocated `GtkTreePath`
  *
  * Deprecated: 4.10
@@ -2300,7 +2302,7 @@ gtk_tree_model_sort_convert_child_path_to_path (GtkTreeModelSort *tree_model_sor
  * @tree_model_sort: A `GtkTreeModelSort`
  * @sort_iter: (out): An uninitialized `GtkTreeIter`
  * @child_iter: A valid `GtkTreeIter` pointing to a row on the child model
- * 
+ *
  * Sets @sort_iter to point to the row in @tree_model_sort that corresponds to
  * the row pointed at by @child_iter.  If @sort_iter was not set, %FALSE
  * is returned.  Note: a boolean is only returned since 2.14.
@@ -2350,13 +2352,13 @@ gtk_tree_model_sort_convert_child_iter_to_iter (GtkTreeModelSort *tree_model_sor
  * gtk_tree_model_sort_convert_path_to_child_path:
  * @tree_model_sort: A `GtkTreeModelSort`
  * @sorted_path: A `GtkTreePath` to convert
- * 
- * Converts @sorted_path to a path on the child model of @tree_model_sort.  
- * That is, @sorted_path points to a location in @tree_model_sort.  The 
- * returned path will point to the same location in the model not being 
- * sorted.  If @sorted_path does not point to a location in the child model, 
+ *
+ * Converts @sorted_path to a path on the child model of @tree_model_sort.
+ * That is, @sorted_path points to a location in @tree_model_sort.  The
+ * returned path will point to the same location in the model not being
+ * sorted.  If @sorted_path does not point to a location in the child model,
  * %NULL is returned.
- * 
+ *
  * Returns: (nullable) (transfer full): A newly allocated `GtkTreePath`
  *
  * Deprecated: 4.10
@@ -2414,7 +2416,7 @@ gtk_tree_model_sort_convert_path_to_child_path (GtkTreeModelSort *tree_model_sor
       gtk_tree_path_append_index (retval, elt->offset);
       level = elt->children;
     }
- 
+
   return retval;
 }
 
@@ -2423,7 +2425,7 @@ gtk_tree_model_sort_convert_path_to_child_path (GtkTreeModelSort *tree_model_sor
  * @tree_model_sort: A `GtkTreeModelSort`
  * @child_iter: (out): An uninitialized `GtkTreeIter`
  * @sorted_iter: A valid `GtkTreeIter` pointing to a row on @tree_model_sort.
- * 
+ *
  * Sets @child_iter to point to the row pointed to by @sorted_iter.
  *
  * Deprecated: 4.10
@@ -2689,7 +2691,7 @@ gtk_tree_model_sort_clear_cache_helper (GtkTreeModelSort *tree_model_sort,
 /**
  * gtk_tree_model_sort_reset_default_sort_func:
  * @tree_model_sort: A `GtkTreeModelSort`
- * 
+ *
  * This resets the default sort function to be in the “unsorted” state.  That
  * is, it is in the same order as the child model. It will re-sort the model
  * to be in the same order as the child model only if the `GtkTreeModelSort`
@@ -2724,7 +2726,7 @@ gtk_tree_model_sort_reset_default_sort_func (GtkTreeModelSort *tree_model_sort)
 /**
  * gtk_tree_model_sort_clear_cache:
  * @tree_model_sort: A `GtkTreeModelSort`
- * 
+ *
  * This function should almost never be called.  It clears the @tree_model_sort
  * of any cached iterators that haven’t been reffed with
  * gtk_tree_model_ref_node().  This might be useful if the child model being
diff --git a/gtk/deprecated/gtktreeselection.c b/gtk/deprecated/gtktreeselection.c
index 7043ceba9c..7d553426c8 100644
--- a/gtk/deprecated/gtktreeselection.c
+++ b/gtk/deprecated/gtktreeselection.c
@@ -55,6 +55,8 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  * Additionally, it may on occasion emit a `GtkTreeSelection`::changed signal
  * when nothing has happened (mostly as a result of programmers calling
  * select_row on an already selected row).
+ *
+ * Deprecated: 4.10: Use [iface@Gtk.SelectionModel] instead
  */
 
 typedef struct _GtkTreeSelectionClass   GtkTreeSelectionClass;
@@ -124,7 +126,7 @@ gtk_tree_selection_class_init (GtkTreeSelectionClass *class)
   class->changed = NULL;
 
   /* Properties */
-  
+
   /**
    * GtkTreeSelection:mode:
    *
@@ -138,9 +140,9 @@ gtk_tree_selection_class_init (GtkTreeSelectionClass *class)
 
   /* Install all properties */
   g_object_class_install_properties (object_class, N_PROPERTIES, properties);
-  
+
   /* Signals */
-  
+
   /**
    * GtkTreeSelection::changed:
    * @treeselection: the object which received the signal.
@@ -331,7 +333,7 @@ gtk_tree_selection_set_mode (GtkTreeSelection *selection,
 				    anchor_path,
 				    &tree,
 				    &node);
-	  
+
 	  if (node && GTK_TREE_RBNODE_FLAG_SET (node, GTK_TREE_RBNODE_IS_SELECTED))
 	    selected = TRUE;
 	}
@@ -355,7 +357,7 @@ gtk_tree_selection_set_mode (GtkTreeSelection *selection,
     }
 
   selection->type = type;
-  
+
   g_object_notify_by_pspec (G_OBJECT (selection), properties[PROP_MODE]);
 }
 
@@ -450,9 +452,9 @@ gtk_tree_selection_get_user_data (GtkTreeSelection *selection)
 /**
  * gtk_tree_selection_get_tree_view:
  * @selection: A `GtkTreeSelection`
- * 
+ *
  * Returns the tree view associated with @selection.
- * 
+ *
  * Returns: (transfer none): A `GtkTreeView`
  *
  * Deprecated: 4.10: Use GtkListView or GtkColumnView
@@ -629,7 +631,7 @@ gtk_tree_selection_get_selected_rows (GtkTreeSelection   *selection,
 		    {
 		      gtk_tree_path_free (path);
 
-		      goto done; 
+		      goto done;
 		    }
 
 		  gtk_tree_path_up (path);
@@ -778,7 +780,7 @@ gtk_tree_selection_selected_foreach (GtkTreeSelection            *selection,
 					   G_CALLBACK (model_changed),
 				           &stop);
   changed_id = g_signal_connect_swapped (selection->tree_view, "notify::model",
-					 G_CALLBACK (model_changed), 
+					 G_CALLBACK (model_changed),
 					 &stop);
 
   /* find the node internally */
@@ -1001,10 +1003,10 @@ gtk_tree_selection_unselect_iter (GtkTreeSelection *selection,
  * gtk_tree_selection_path_is_selected:
  * @selection: A `GtkTreeSelection`.
  * @path: A `GtkTreePath` to check selection on.
- * 
+ *
  * Returns %TRUE if the row pointed to by @path is currently selected.  If @path
  * does not point to a valid location, %FALSE is returned
- * 
+ *
  * Returns: %TRUE if @path is selected.
  *
  * Deprecated: 4.10: Use GtkListView or GtkColumnView
@@ -1040,9 +1042,9 @@ gtk_tree_selection_path_is_selected (GtkTreeSelection *selection,
  * gtk_tree_selection_iter_is_selected:
  * @selection: A `GtkTreeSelection`
  * @iter: A valid `GtkTreeIter`
- * 
+ *
  * Returns %TRUE if the row at @iter is currently selected.
- * 
+ *
  * Returns: %TRUE, if @iter is selected
  *
  * Deprecated: 4.10: Use GtkListView or GtkColumnView
@@ -1255,7 +1257,7 @@ gtk_tree_selection_unselect_all (GtkTreeSelection *selection)
   if (_gtk_tree_view_get_rbtree (selection->tree_view) == NULL ||
       gtk_tree_view_get_model (selection->tree_view) == NULL)
     return;
-  
+
   if (gtk_tree_selection_real_unselect_all (selection))
     g_signal_emit (selection, tree_selection_signals[CHANGED], 0);
 }
@@ -1357,7 +1359,7 @@ gtk_tree_selection_real_modify_range (GtkTreeSelection *selection,
  * @end_path: The final node of the range.
  *
  * Selects a range of nodes, determined by @start_path and @end_path inclusive.
- * @selection must be set to %GTK_SELECTION_MULTIPLE mode. 
+ * @selection must be set to %GTK_SELECTION_MULTIPLE mode.
  *
  * Deprecated: 4.10: Use GtkListView or GtkColumnView
  **/
@@ -1562,14 +1564,14 @@ _gtk_tree_selection_internal_select_node (GtkTreeSelection *selection,
     gtk_tree_path_free (anchor_path);
 
   if (dirty)
-    g_signal_emit (selection, tree_selection_signals[CHANGED], 0);  
+    g_signal_emit (selection, tree_selection_signals[CHANGED], 0);
 }
 
 
-void 
+void
 _gtk_tree_selection_emit_changed (GtkTreeSelection *selection)
 {
-  g_signal_emit (selection, tree_selection_signals[CHANGED], 0);  
+  g_signal_emit (selection, tree_selection_signals[CHANGED], 0);
 }
 
 /* NOTE: Any {un,}selection ever done _MUST_ be done through this function!
diff --git a/gtk/deprecated/gtktreesortable.c b/gtk/deprecated/gtktreesortable.c
index aa7d9c35ee..77909650cf 100644
--- a/gtk/deprecated/gtktreesortable.c
+++ b/gtk/deprecated/gtktreesortable.c
@@ -32,6 +32,9 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  * `GtkTreeSortable` is an interface to be implemented by tree models which
  * support sorting. The `GtkTreeView` uses the methods provided by this interface
  * to sort the model.
+ *
+ * Deprecated: 4.10: There is no replacement for this interface. You should
+ *   use [class@Gtk.SortListModel] to wrap your list model instead
  */
 
 
@@ -96,7 +99,7 @@ gtk_tree_sortable_base_init (gpointer g_class)
 /**
  * gtk_tree_sortable_sort_column_changed:
  * @sortable: A `GtkTreeSortable`
- * 
+ *
  * Emits a `GtkTreeSortable::sort-column-changed` signal on @sortable.
  *
  * Deprecated: 4.10
@@ -114,12 +117,12 @@ gtk_tree_sortable_sort_column_changed (GtkTreeSortable *sortable)
  * @sortable: A `GtkTreeSortable`
  * @sort_column_id: (out): The sort column id to be filled in
  * @order: (out): The `GtkSortType` to be filled in
- * 
+ *
  * Fills in @sort_column_id and @order with the current sort column and the
- * order. It returns %TRUE unless the @sort_column_id is 
- * %GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID or 
+ * order. It returns %TRUE unless the @sort_column_id is
+ * %GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID or
  * %GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID.
- * 
+ *
  * Returns: %TRUE if the sort column is not one of the special sort
  *   column ids.
  *
@@ -147,15 +150,15 @@ gtk_tree_sortable_get_sort_column_id (GtkTreeSortable  *sortable,
  * @sortable: A `GtkTreeSortable`
  * @sort_column_id: the sort column id to set
  * @order: The sort order of the column
- * 
+ *
  * Sets the current sort column to be @sort_column_id. The @sortable will
  * resort itself to reflect this change, after emitting a
  * `GtkTreeSortable::sort-column-changed` signal. @sort_column_id may either be
  * a regular column id, or one of the following special values:
- * 
+ *
  * - %GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID: the default sort function
  *   will be used, if it is set
- * 
+ *
  * - %GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID: no sorting will occur
  *
  * Deprecated: 4.10
@@ -173,7 +176,7 @@ gtk_tree_sortable_set_sort_column_id (GtkTreeSortable  *sortable,
 
   g_return_if_fail (iface != NULL);
   g_return_if_fail (iface->set_sort_column_id != NULL);
-  
+
   (* iface->set_sort_column_id) (sortable, sort_column_id, order);
 }
 
@@ -184,9 +187,9 @@ gtk_tree_sortable_set_sort_column_id (GtkTreeSortable  *sortable,
  * @sort_func: The comparison function
  * @user_data: (closure): User data to pass to @sort_func
  * @destroy: (nullable): Destroy notifier of @user_data
- * 
+ *
  * Sets the comparison function used when sorting to be @sort_func. If the
- * current sort column id of @sortable is the same as @sort_column_id, then 
+ * current sort column id of @sortable is the same as @sort_column_id, then
  * the model will sort using this function.
  *
  * Deprecated: 4.10
@@ -218,15 +221,15 @@ gtk_tree_sortable_set_sort_func (GtkTreeSortable        *sortable,
  * @sort_func: The comparison function
  * @user_data: (closure): User data to pass to @sort_func
  * @destroy: (nullable): Destroy notifier of @user_data
- * 
- * Sets the default comparison function used when sorting to be @sort_func.  
+ *
+ * Sets the default comparison function used when sorting to be @sort_func.
  * If the current sort column id of @sortable is
- * %GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, then the model will sort using 
+ * %GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, then the model will sort using
  * this function.
  *
  * If @sort_func is %NULL, then there will be no default comparison function.
  * This means that once the model  has been sorted, it can’t go back to the
- * default state. In this case, when the current sort column id of @sortable 
+ * default state. In this case, when the current sort column id of @sortable
  * is %GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, the model will be unsorted.
  *
  * Deprecated: 4.10
@@ -245,18 +248,18 @@ gtk_tree_sortable_set_default_sort_func (GtkTreeSortable        *sortable,
 
   g_return_if_fail (iface != NULL);
   g_return_if_fail (iface->set_default_sort_func != NULL);
-  
+
   (* iface->set_default_sort_func) (sortable, sort_func, user_data, destroy);
 }
 
 /**
  * gtk_tree_sortable_has_default_sort_func:
  * @sortable: A `GtkTreeSortable`
- * 
+ *
  * Returns %TRUE if the model has a default sort function. This is used
- * primarily by GtkTreeViewColumns in order to determine if a model can 
+ * primarily by GtkTreeViewColumns in order to determine if a model can
  * go back to the default state, or not.
- * 
+ *
  * Returns: %TRUE, if the model has a default sort function
  *
  * Deprecated: 4.10
@@ -272,6 +275,6 @@ gtk_tree_sortable_has_default_sort_func (GtkTreeSortable *sortable)
 
   g_return_val_if_fail (iface != NULL, FALSE);
   g_return_val_if_fail (iface->has_default_sort_func != NULL, FALSE);
-  
+
   return (* iface->has_default_sort_func) (sortable);
 }
diff --git a/gtk/deprecated/gtktreestore.c b/gtk/deprecated/gtktreestore.c
index b9d84b47b4..d4bda677f8 100644
--- a/gtk/deprecated/gtktreestore.c
+++ b/gtk/deprecated/gtktreestore.c
@@ -62,6 +62,8 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  *   </columns>
  * </object>
  * ```
+ *
+ * Deprecated: 4.10: Use [class@Gtk.TreeListModel] instead
  */
 
 struct _GtkTreeStorePrivate
diff --git a/gtk/deprecated/gtktreeviewcolumn.c b/gtk/deprecated/gtktreeviewcolumn.c
index fc45a65bdb..090cf33eb7 100644
--- a/gtk/deprecated/gtktreeviewcolumn.c
+++ b/gtk/deprecated/gtktreeviewcolumn.c
@@ -56,6 +56,9 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  * for an overview of all the objects and data types related to the tree widget and
  * how they work together, and to the [class@Gtk.TreeView] documentation for specifics
  * about the CSS node structure for treeviews and their headers.
+ *
+ * Deprecated: 4.10: Use [class@Gtk.ColumnView] and [class@Gtk.ColumnViewColumn]
+ *   instead of [class@Gtk.TreeView] to show a tabular list
  */
 
 
@@ -149,7 +152,7 @@ struct _GtkTreeViewColumnClass
 };
 
 
-struct _GtkTreeViewColumnPrivate 
+struct _GtkTreeViewColumnPrivate
 {
   GtkWidget *tree_view;
   GtkWidget *button;
@@ -381,7 +384,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
    *
    * The `GtkCellArea` used to layout cell renderers for this column.
    *
-   * If no area is specified when creating the tree view column with gtk_tree_view_column_new_with_area() 
+   * If no area is specified when creating the tree view column with gtk_tree_view_column_new_with_area()
    * a horizontally oriented `GtkCellAreaBox` will be used.
    */
   tree_column_props[PROP_CELL_AREA] =
@@ -467,14 +470,14 @@ gtk_tree_view_column_dispose (GObject *object)
   GtkTreeViewColumn        *tree_column = (GtkTreeViewColumn *) object;
   GtkTreeViewColumnPrivate *priv        = tree_column->priv;
 
-  /* Remove this column from its treeview, 
+  /* Remove this column from its treeview,
    * in case this column is destroyed before its treeview.
-   */ 
+   */
   if (priv->tree_view)
     gtk_tree_view_remove_column (GTK_TREE_VIEW (priv->tree_view), tree_column);
-    
+
   if (priv->cell_area_context)
-    { 
+    {
       g_signal_handler_disconnect (priv->cell_area_context,
 				   priv->context_changed_signal);
 
@@ -606,7 +609,7 @@ gtk_tree_view_column_set_property (GObject         *object,
       gtk_tree_view_column_set_sort_order (tree_column,
                                            g_value_get_enum (value));
       break;
-      
+
     case PROP_SORT_COLUMN_ID:
       gtk_tree_view_column_set_sort_column_id (tree_column,
                                                g_value_get_int (value));
@@ -731,7 +734,7 @@ gtk_tree_view_column_get_property (GObject         *object,
       g_value_set_enum (value,
                         gtk_tree_view_column_get_sort_order (tree_column));
       break;
-      
+
     case PROP_SORT_COLUMN_ID:
       g_value_set_int (value,
                        gtk_tree_view_column_get_sort_column_id (tree_column));
@@ -740,7 +743,7 @@ gtk_tree_view_column_get_property (GObject         *object,
     case PROP_CELL_AREA:
       g_value_set_object (value, tree_column->priv->cell_area);
       break;
-      
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -979,7 +982,7 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
 	  gtk_widget_hide (priv->button);
 	}
     }
-  
+
   if (priv->reorderable || priv->clickable)
     {
       gtk_widget_set_focusable (priv->button, TRUE);
@@ -1177,7 +1180,7 @@ gtk_tree_view_column_setup_sort_column_id_callback (GtkTreeViewColumn *tree_colu
 	  gtk_tree_view_column_set_sort_indicator (tree_column, TRUE);
 	  gtk_tree_view_column_set_sort_order (tree_column, real_order);
  	}
-      else 
+      else
 	{
 	  gtk_tree_view_column_set_sort_indicator (tree_column, FALSE);
 	}
@@ -1192,7 +1195,7 @@ gtk_tree_view_column_context_changed  (GtkCellAreaContext      *context,
   /* Here we want the column re-requested if the underlying context was
    * actually reset for any reason, this can happen if the underlying
    * area/cell configuration changes (i.e. cell packing properties
-   * or cell spacing and the like) 
+   * or cell spacing and the like)
    *
    * Note that we block this handler while requesting for sizes
    * so there is no need to check for the new context size being -1,
@@ -1221,13 +1224,13 @@ gtk_tree_view_column_add_editable_callback (GtkCellArea       *area,
   if (priv->tree_view)
     {
       path = gtk_tree_path_new_from_string (path_string);
-      
+
       _gtk_tree_view_add_editable (GTK_TREE_VIEW (priv->tree_view),
 				   column,
 				   path,
 				   edit_widget,
 				   cell_area);
-      
+
       gtk_tree_path_free (path);
     }
 }
@@ -1449,9 +1452,9 @@ _gtk_tree_view_column_is_blank_at_pos (GtkTreeViewColumn *column,
 
 /**
  * gtk_tree_view_column_new:
- * 
+ *
  * Creates a new `GtkTreeViewColumn`.
- * 
+ *
  * Returns: A newly created `GtkTreeViewColumn`.
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -1469,9 +1472,9 @@ gtk_tree_view_column_new (void)
 /**
  * gtk_tree_view_column_new_with_area:
  * @area: the `GtkCellArea` that the newly created column should use to layout cells.
- * 
+ *
  * Creates a new `GtkTreeViewColumn` using @area to render its cells.
- * 
+ *
  * Returns: A newly created `GtkTreeViewColumn`.
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -1505,7 +1508,7 @@ gtk_tree_view_column_new_with_area (GtkCellArea *area)
  *  {
  *    GtkTreeViewColumn *column;
  *    GtkCellRenderer   *renderer = gtk_cell_renderer_text_new ();
- *  
+ *
  *    column = gtk_tree_view_column_new_with_attributes ("Title",
  *                                                       renderer,
  *                                                       "text", TEXT_COLUMN,
@@ -1513,7 +1516,7 @@ gtk_tree_view_column_new_with_area (GtkCellArea *area)
  *                                                       NULL);
  *  }
  * ]|
- * 
+ *
  * Returns: A newly created `GtkTreeViewColumn`.
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -1581,7 +1584,7 @@ gtk_tree_view_column_pack_end (GtkTreeViewColumn  *tree_column,
 /**
  * gtk_tree_view_column_clear:
  * @tree_column: A `GtkTreeViewColumn`
- * 
+ *
  * Unsets all the mappings on all renderers on the @tree_column.
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -1598,7 +1601,7 @@ gtk_tree_view_column_clear (GtkTreeViewColumn *tree_column)
  * @cell_renderer: the `GtkCellRenderer` to set attributes on
  * @attribute: An attribute on the renderer
  * @column: The column position on the model to get the attribute from.
- * 
+ *
  * Adds an attribute mapping to the list in @tree_column.
  *
  * The @column is the
@@ -1633,7 +1636,7 @@ gtk_tree_view_column_set_attributesv (GtkTreeViewColumn *tree_column,
 
   gtk_cell_layout_clear_attributes (GTK_CELL_LAYOUT (priv->cell_area),
                                     cell_renderer);
-  
+
   while (attribute != NULL)
     {
       column = va_arg (args, int);
@@ -1677,10 +1680,10 @@ gtk_tree_view_column_set_attributes (GtkTreeViewColumn *tree_column,
  * gtk_tree_view_column_set_cell_data_func:
  * @tree_column: A `GtkTreeViewColumn`
  * @cell_renderer: A `GtkCellRenderer`
- * @func: (nullable): The `GtkTreeCellDataFunc` to use. 
+ * @func: (nullable): The `GtkTreeCellDataFunc` to use.
  * @func_data: (closure): The user data for @func.
  * @destroy: The destroy notification for @func_data
- * 
+ *
  * Sets the `GtkTreeCellDataFunc` to use for the column.
  *
  * This
@@ -1727,7 +1730,7 @@ gtk_tree_view_column_clear_attributes (GtkTreeViewColumn *tree_column,
  * gtk_tree_view_column_set_spacing:
  * @tree_column: A `GtkTreeViewColumn`.
  * @spacing: distance between cell renderers in pixels.
- * 
+ *
  * Sets the spacing field of @tree_column, which is the number of pixels to
  * place between cell renderers packed into it.
  *
@@ -1756,9 +1759,9 @@ gtk_tree_view_column_set_spacing (GtkTreeViewColumn *tree_column,
 /**
  * gtk_tree_view_column_get_spacing:
  * @tree_column: A `GtkTreeViewColumn`.
- * 
+ *
  * Returns the spacing of @tree_column.
- * 
+ *
  * Returns: the spacing of @tree_column.
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -1781,7 +1784,7 @@ gtk_tree_view_column_get_spacing (GtkTreeViewColumn *tree_column)
  * gtk_tree_view_column_set_visible:
  * @tree_column: A `GtkTreeViewColumn`.
  * @visible: %TRUE if the @tree_column is visible.
- * 
+ *
  * Sets the visibility of @tree_column.
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -1814,9 +1817,9 @@ gtk_tree_view_column_set_visible (GtkTreeViewColumn *tree_column,
 /**
  * gtk_tree_view_column_get_visible:
  * @tree_column: A `GtkTreeViewColumn`.
- * 
+ *
  * Returns %TRUE if @tree_column is visible.
- * 
+ *
  * Returns: whether the column is visible or not.  If it is visible, then
  * the tree will show the column.
  *
@@ -1834,7 +1837,7 @@ gtk_tree_view_column_get_visible (GtkTreeViewColumn *tree_column)
  * gtk_tree_view_column_set_resizable:
  * @tree_column: A `GtkTreeViewColumn`
  * @resizable: %TRUE, if the column can be resized
- * 
+ *
  * If @resizable is %TRUE, then the user can explicitly resize the column by
  * grabbing the outer edge of the column button.
  *
@@ -1871,9 +1874,9 @@ gtk_tree_view_column_set_resizable (GtkTreeViewColumn *tree_column,
 /**
  * gtk_tree_view_column_get_resizable:
  * @tree_column: A `GtkTreeViewColumn`
- * 
+ *
  * Returns %TRUE if the @tree_column can be resized by the end user.
- * 
+ *
  * Returns: %TRUE, if the @tree_column can be resized.
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -1891,7 +1894,7 @@ gtk_tree_view_column_get_resizable (GtkTreeViewColumn *tree_column)
  * gtk_tree_view_column_set_sizing:
  * @tree_column: A `GtkTreeViewColumn`.
  * @type: The `GtkTreeViewColumn`Sizing.
- * 
+ *
  * Sets the growth behavior of @tree_column to @type.
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -1922,9 +1925,9 @@ gtk_tree_view_column_set_sizing (GtkTreeViewColumn       *tree_column,
 /**
  * gtk_tree_view_column_get_sizing:
  * @tree_column: A `GtkTreeViewColumn`.
- * 
+ *
  * Returns the current type of @tree_column.
- * 
+ *
  * Returns: The type of @tree_column.
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -1940,9 +1943,9 @@ gtk_tree_view_column_get_sizing (GtkTreeViewColumn *tree_column)
 /**
  * gtk_tree_view_column_get_width:
  * @tree_column: A `GtkTreeViewColumn`.
- * 
+ *
  * Returns the current size of @tree_column in pixels.
- * 
+ *
  * Returns: The current width of @tree_column.
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -1958,9 +1961,9 @@ gtk_tree_view_column_get_width (GtkTreeViewColumn *tree_column)
 /**
  * gtk_tree_view_column_get_x_offset:
  * @tree_column: A `GtkTreeViewColumn`.
- * 
+ *
  * Returns the current X offset of @tree_column in pixels.
- * 
+ *
  * Returns: The current X offset of @tree_column.
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -2121,7 +2124,7 @@ gtk_tree_view_column_get_fixed_width (GtkTreeViewColumn *tree_column)
  * gtk_tree_view_column_set_min_width:
  * @tree_column: A `GtkTreeViewColumn`.
  * @min_width: The minimum width of the column in pixels, or -1.
- * 
+ *
  * Sets the minimum width of the @tree_column.  If @min_width is -1, then the
  * minimum width is unset.
  *
@@ -2167,10 +2170,10 @@ gtk_tree_view_column_set_min_width (GtkTreeViewColumn *tree_column,
 /**
  * gtk_tree_view_column_get_min_width:
  * @tree_column: A `GtkTreeViewColumn`.
- * 
+ *
  * Returns the minimum width in pixels of the @tree_column, or -1 if no minimum
  * width is set.
- * 
+ *
  * Returns: The minimum width of the @tree_column.
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -2187,7 +2190,7 @@ gtk_tree_view_column_get_min_width (GtkTreeViewColumn *tree_column)
  * gtk_tree_view_column_set_max_width:
  * @tree_column: A `GtkTreeViewColumn`.
  * @max_width: The maximum width of the column in pixels, or -1.
- * 
+ *
  * Sets the maximum width of the @tree_column.  If @max_width is -1, then the
  * maximum width is unset.  Note, the column can actually be wider than max
  * width if it’s the last column in a view.  In this case, the column expands to
@@ -2235,10 +2238,10 @@ gtk_tree_view_column_set_max_width (GtkTreeViewColumn *tree_column,
 /**
  * gtk_tree_view_column_get_max_width:
  * @tree_column: A `GtkTreeViewColumn`.
- * 
+ *
  * Returns the maximum width in pixels of the @tree_column, or -1 if no maximum
  * width is set.
- * 
+ *
  * Returns: The maximum width of the @tree_column.
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -2254,7 +2257,7 @@ gtk_tree_view_column_get_max_width (GtkTreeViewColumn *tree_column)
 /**
  * gtk_tree_view_column_clicked:
  * @tree_column: a `GtkTreeViewColumn`
- * 
+ *
  * Emits the “clicked” signal on the column.  This function will only work if
  * @tree_column is clickable.
  *
@@ -2277,7 +2280,7 @@ gtk_tree_view_column_clicked (GtkTreeViewColumn *tree_column)
  * gtk_tree_view_column_set_title:
  * @tree_column: A `GtkTreeViewColumn`.
  * @title: The title of the @tree_column.
- * 
+ *
  * Sets the title of the @tree_column.  If a custom widget has been set, then
  * this value is ignored.
  *
@@ -2305,9 +2308,9 @@ gtk_tree_view_column_set_title (GtkTreeViewColumn *tree_column,
 /**
  * gtk_tree_view_column_get_title:
  * @tree_column: A `GtkTreeViewColumn`.
- * 
+ *
  * Returns the title of the widget.
- * 
+ *
  * Returns: the title of the column. This string should not be
  * modified or freed.
  *
@@ -2383,7 +2386,7 @@ gtk_tree_view_column_get_expand (GtkTreeViewColumn *tree_column)
  * gtk_tree_view_column_set_clickable:
  * @tree_column: A `GtkTreeViewColumn`.
  * @clickable: %TRUE if the header is active.
- * 
+ *
  * Sets the header to be active if @clickable is %TRUE.  When the header is
  * active, then it can take keyboard focus, and can be clicked.
  *
@@ -2411,9 +2414,9 @@ gtk_tree_view_column_set_clickable (GtkTreeViewColumn *tree_column,
 /**
  * gtk_tree_view_column_get_clickable:
  * @tree_column: a `GtkTreeViewColumn`
- * 
+ *
  * Returns %TRUE if the user can click on the header for the column.
- * 
+ *
  * Returns: %TRUE if user can click the column header.
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -2482,7 +2485,7 @@ gtk_tree_view_column_get_widget (GtkTreeViewColumn *tree_column)
  * gtk_tree_view_column_set_alignment:
  * @tree_column: A `GtkTreeViewColumn`.
  * @xalign: The alignment, which is between [0.0 and 1.0] inclusive.
- * 
+ *
  * Sets the alignment of the title or custom widget inside the column header.
  * The alignment determines its location inside the button -- 0.0 for left, 0.5
  * for center, 1.0 for right.
@@ -2512,10 +2515,10 @@ gtk_tree_view_column_set_alignment (GtkTreeViewColumn *tree_column,
 /**
  * gtk_tree_view_column_get_alignment:
  * @tree_column: A `GtkTreeViewColumn`.
- * 
+ *
  * Returns the current x alignment of @tree_column.  This value can range
  * between 0.0 and 1.0.
- * 
+ *
  * Returns: The current alignent of @tree_column.
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -2532,7 +2535,7 @@ gtk_tree_view_column_get_alignment (GtkTreeViewColumn *tree_column)
  * gtk_tree_view_column_set_reorderable:
  * @tree_column: A `GtkTreeViewColumn`
  * @reorderable: %TRUE, if the column can be reordered.
- * 
+ *
  * If @reorderable is %TRUE, then the column can be reordered by the end user
  * dragging the header.
  *
@@ -2562,9 +2565,9 @@ gtk_tree_view_column_set_reorderable (GtkTreeViewColumn *tree_column,
 /**
  * gtk_tree_view_column_get_reorderable:
  * @tree_column: A `GtkTreeViewColumn`
- * 
+ *
  * Returns %TRUE if the @tree_column can be reordered by the user.
- * 
+ *
  * Returns: %TRUE if the @tree_column can be reordered by the user.
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -2583,7 +2586,7 @@ gtk_tree_view_column_get_reorderable (GtkTreeViewColumn *tree_column)
  * @tree_column: a `GtkTreeViewColumn`
  * @sort_column_id: The @sort_column_id of the model to sort on.
  *
- * Sets the logical @sort_column_id that this column sorts on when this column 
+ * Sets the logical @sort_column_id that this column sorts on when this column
  * is selected for sorting.  Doing so makes the column header clickable.
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -2693,9 +2696,9 @@ gtk_tree_view_column_set_sort_indicator (GtkTreeViewColumn     *tree_column,
 /**
  * gtk_tree_view_column_get_sort_indicator:
  * @tree_column: a `GtkTreeViewColumn`
- * 
+ *
  * Gets the value set by gtk_tree_view_column_set_sort_indicator().
- * 
+ *
  * Returns: whether the sort indicator arrow is displayed
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -2713,16 +2716,16 @@ gtk_tree_view_column_get_sort_indicator  (GtkTreeViewColumn     *tree_column)
  * @tree_column: a `GtkTreeViewColumn`
  * @order: sort order that the sort indicator should indicate
  *
- * Changes the appearance of the sort indicator. 
- * 
+ * Changes the appearance of the sort indicator.
+ *
  * This does not actually sort the model.  Use
  * gtk_tree_view_column_set_sort_column_id() if you want automatic sorting
  * support.  This function is primarily for custom sorting behavior, and should
  * be used in conjunction with gtk_tree_sortable_set_sort_column_id() to do
- * that. For custom models, the mechanism will vary. 
- * 
+ * that. For custom models, the mechanism will vary.
+ *
  * The sort indicator changes direction to indicate normal sort or reverse sort.
- * Note that you must have the sort indicator enabled to see anything when 
+ * Note that you must have the sort indicator enabled to see anything when
  * calling this function; see gtk_tree_view_column_set_sort_indicator().
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -2744,9 +2747,9 @@ gtk_tree_view_column_set_sort_order      (GtkTreeViewColumn     *tree_column,
 /**
  * gtk_tree_view_column_get_sort_order:
  * @tree_column: a `GtkTreeViewColumn`
- * 
+ *
  * Gets the value set by gtk_tree_view_column_set_sort_order().
- * 
+ *
  * Returns: the sort order the sort indicator is indicating
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -2766,7 +2769,7 @@ gtk_tree_view_column_get_sort_order      (GtkTreeViewColumn     *tree_column)
  * @iter: The `GtkTreeIter` to get the cell renderer’s attributes from.
  * @is_expander: %TRUE, if the row has children
  * @is_expanded: %TRUE, if the row has visible children
- * 
+ *
  * Sets the cell renderer based on the @tree_model and @iter.  That is, for
  * every attribute mapping in @tree_column, it will get a value from the set
  * column on the @iter, and use that value to set the attribute on the cell
@@ -2797,7 +2800,7 @@ gtk_tree_view_column_cell_set_cell_data (GtkTreeViewColumn *tree_column,
  * @y_offset: (out) (optional): location to return y offset of a cell relative to @cell_area
  * @width: (out) (optional): location to return width needed to render a cell
  * @height: (out) (optional): location to return height needed to render a cell
- * 
+ *
  * Obtains the width and height needed to render the column.  This is used
  * primarily by the `GtkTreeView`.
  *
@@ -2817,7 +2820,7 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn  *tree_column,
 
   priv = tree_column->priv;
 
-  g_signal_handler_block (priv->cell_area_context, 
+  g_signal_handler_block (priv->cell_area_context,
 			  priv->context_changed_signal);
 
   gtk_cell_area_get_preferred_width (priv->cell_area,
@@ -2834,7 +2837,7 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn  *tree_column,
                                                 &min_height,
                                                 NULL);
 
-  g_signal_handler_unblock (priv->cell_area_context, 
+  g_signal_handler_unblock (priv->cell_area_context,
 			    priv->context_changed_signal);
 
 
@@ -2852,7 +2855,7 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn  *tree_column,
  * @background_area: entire cell area (including tree expanders and maybe padding on the sides)
  * @cell_area: area normally rendered by a cell renderer
  * @flags: flags that affect rendering
- * 
+ *
  * Renders the cell contained by #tree_column. This is used primarily by the
  * `GtkTreeView`.
  *
@@ -2904,11 +2907,11 @@ _gtk_tree_view_column_cell_event (GtkTreeViewColumn  *tree_column,
 /**
  * gtk_tree_view_column_cell_is_visible:
  * @tree_column: A `GtkTreeViewColumn`
- * 
+ *
  * Returns %TRUE if any of the cells packed into the @tree_column are visible.
  * For this to be meaningful, you must first initialize the cells with
  * gtk_tree_view_column_cell_set_cell_data()
- * 
+ *
  * Returns: %TRUE, if any of the cells packed into the @tree_column are currently visible
  *
  * Deprecated: 4.10: Use GtkColumnView instead
@@ -2972,10 +2975,10 @@ _gtk_tree_view_column_cell_set_dirty (GtkTreeViewColumn *tree_column,
   /* Issue a manual reset on the context to have all
    * sizes re-requested for the context.
    */
-  g_signal_handler_block (priv->cell_area_context, 
+  g_signal_handler_block (priv->cell_area_context,
 			  priv->context_changed_signal);
   gtk_cell_area_context_reset (priv->cell_area_context);
-  g_signal_handler_unblock (priv->cell_area_context, 
+  g_signal_handler_unblock (priv->cell_area_context,
 			    priv->context_changed_signal);
 
   if (priv->tree_view &&
-- 
2.30.2