4 files changed, 5 insertions, 5 deletions
diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c
index d9cf548..efad007 100644
--- a/gdb/python/py-objfile.c
+++ b/gdb/python/py-objfile.c
@@ -501,7 +501,7 @@ objfpy_build_id_matches (const struct bfd_build_id *build_id,
 static struct objfile *
 objfpy_lookup_objfile_by_name (const char *name)
 {
-  for (objfile *objfile : all_objfiles (current_program_space))
+  for (objfile *objfile : current_program_space->objfiles ())
     {
       const char *filename;
 
@@ -527,7 +527,7 @@ objfpy_lookup_objfile_by_name (const char *name)
 static struct objfile *
 objfpy_lookup_objfile_by_build_id (const char *build_id)
 {
-  for (objfile *objfile : all_objfiles (current_program_space))
+  for (objfile *objfile : current_program_space->objfiles ())
     {
       const struct bfd_build_id *obfd_build_id;
 
diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c
index 4092fdb..ae3001e 100644
--- a/gdb/python/py-prettyprint.c
+++ b/gdb/python/py-prettyprint.c
@@ -93,7 +93,7 @@ search_pp_list (PyObject *list, PyObject *value)
 static PyObject *
 find_pretty_printer_from_objfiles (PyObject *value)
 {
-  for (objfile *obj : all_objfiles (current_program_space))
+  for (objfile *obj : current_program_space->objfiles ())
     {
       gdbpy_ref<> objf = objfile_to_objfile_object (obj);
       if (objf == NULL)
diff --git a/gdb/python/py-progspace.c b/gdb/python/py-progspace.c
index a17ef69..b80b2c2 100644
--- a/gdb/python/py-progspace.c
+++ b/gdb/python/py-progspace.c
@@ -333,7 +333,7 @@ pspy_get_objfiles (PyObject *self_, PyObject *args)
 
   if (self->pspace != NULL)
     {
-      for (objfile *objf : all_objfiles (self->pspace))
+      for (objfile *objf : self->pspace->objfiles ())
 	{
 	  gdbpy_ref<> item = objfile_to_objfile_object (objf);
 
diff --git a/gdb/python/py-xmethods.c b/gdb/python/py-xmethods.c
index acf521d..2e0b2bb 100644
--- a/gdb/python/py-xmethods.c
+++ b/gdb/python/py-xmethods.c
@@ -143,7 +143,7 @@ gdbpy_get_matching_xmethod_workers
   /* Gather debug method matchers registered with the object files.
      This could be done differently by iterating over each objfile's matcher
      list individually, but there's no data yet to show it's needed.  */
-  for (objfile *objfile : all_objfiles (current_program_space))
+  for (objfile *objfile : current_program_space->objfiles ())
     {
       gdbpy_ref<> py_objfile = objfile_to_objfile_object (objfile);