Remove method GooList::getLength

Use method 'size' (from std::vector) instead.

3 files changed, 15 insertions, 18 deletions

diff --git a/glib/poppler-action.cc b/glib/poppler-action.cc
index 1aa56a79..fffe588f 100644
--- a/glib/poppler-action.cc
+++ b/glib/poppler-action.cc
@@ -582,7 +582,6 @@ build_ocg_state (PopplerDocument *document,
 {
 	const GooList *st_list = ocg_state->getStateList();
 	bool    preserve_rb = ocg_state->getPreserveRB();
-	gint     i, j;
 	GList   *layer_state = nullptr;
 
 	if (!document->layers) {
@@ -590,7 +589,7 @@ build_ocg_state (PopplerDocument *document,
 			return;
 	}
 
-	for (i = 0; i < st_list->getLength(); ++i) {
+	for (std::size_t i = 0; i < st_list->size(); ++i) {
 		LinkOCGState::StateList *list = (LinkOCGState::StateList *)st_list->get(i);
 		PopplerActionLayer *action_layer = g_slice_new0 (PopplerActionLayer);
 
@@ -606,7 +605,7 @@ build_ocg_state (PopplerDocument *document,
 			break;
 		}
 
-		for (j = 0; j < list->list->getLength(); ++j) {
+		for (std::size_t j = 0; j < list->list->size(); ++j) {
 			Ref *ref = (Ref *)list->list->get(j);
 			PopplerLayer *layer = get_layer_for_ref (document, document->layers, ref, preserve_rb);
 
diff --git a/glib/poppler-document.cc b/glib/poppler-document.cc
index 38699e2f..5e0cc08c 100644
--- a/glib/poppler-document.cc
+++ b/glib/poppler-document.cc
@@ -2377,7 +2377,7 @@ poppler_index_iter_next (PopplerIndexIter *iter)
 	g_return_val_if_fail (iter != nullptr, FALSE);
 
 	iter->index++;
-	if (iter->index >= iter->items->getLength())
+	if (iter->index >= (int)iter->items->size())
 		return FALSE;
 
 	return TRUE;
@@ -2609,7 +2609,7 @@ poppler_fonts_iter_next (PopplerFontsIter *iter)
 	g_return_val_if_fail (iter != nullptr, FALSE);
 
 	iter->index++;
-	if (iter->index >= iter->items->getLength())
+	if (iter->index >= (int)iter->items->size())
 		return FALSE;
 
 	return TRUE;
@@ -2633,7 +2633,7 @@ poppler_fonts_iter_copy (PopplerFontsIter *iter)
 	new_iter = g_slice_dup (PopplerFontsIter, iter);
 
 	new_iter->items = new GooList ();
-	for (int i = 0; i < iter->items->getLength(); i++) {
+	for (std::size_t i = 0; i < iter->items->size(); i++) {
 		FontInfo *info = (FontInfo *)iter->items->get(i);
 		new_iter->items->push_back (new FontInfo (*info));
 	}
@@ -2771,7 +2771,7 @@ poppler_font_info_scan (PopplerFontInfo   *font_info,
 
 	if (items == nullptr) {
 		*iter = nullptr;
-	} else if (items->getLength() == 0) {
+	} else if (items->empty()) {
 		*iter = nullptr;
 		delete items;
 	} else {
diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
index a635f398..a36d3bc9 100644
--- a/glib/poppler-page.cc
+++ b/glib/poppler-page.cc
@@ -638,7 +638,6 @@ poppler_page_get_selection_region (PopplerPage           *page,
   SelectionStyle selection_style = selectionStyleGlyph;
   GooList *list;
   GList *region = nullptr;
-  int i;
 
   poppler_selection.x1 = selection->x1;
   poppler_selection.y1 = selection->y1;
@@ -662,7 +661,7 @@ poppler_page_get_selection_region (PopplerPage           *page,
   list = text->getSelectionRegion(&poppler_selection,
 				  selection_style, scale);
 
-  for (i = 0; i < list->getLength(); i++) {
+  for (std::size_t i = 0; i < list->size(); i++) {
     PDFRectangle *selection_rect = (PDFRectangle *) list->get(i);
     PopplerRectangle *rect;
 
@@ -728,7 +727,6 @@ poppler_page_get_selected_region (PopplerPage           *page,
   SelectionStyle selection_style = selectionStyleGlyph;
   GooList *list;
   cairo_region_t *region;
-  int i;
 
   poppler_selection.x1 = selection->x1;
   poppler_selection.y1 = selection->y1;
@@ -754,7 +752,7 @@ poppler_page_get_selected_region (PopplerPage           *page,
 
   region = cairo_region_create ();
 
-  for (i = 0; i < list->getLength(); i++) {
+  for (std::size_t i = 0; i < list->size(); i++) {
     PDFRectangle *selection_rect = (PDFRectangle *) list->get(i);
     cairo_rectangle_int_t rect;
 
@@ -2193,8 +2191,8 @@ poppler_page_get_text_layout_for_area (PopplerPage       *page,
   for (i = 0; i < n_lines; i++)
     {
       GooList *line_words = word_list[i];
-      n_rects += line_words->getLength() - 1;
-      for (j = 0; j < line_words->getLength(); j++)
+      n_rects += line_words->size() - 1;
+      for (std::size_t j = 0; j < line_words->size(); j++)
         {
           TextWordSelection *word_sel = (TextWordSelection *)line_words->get(j);
           n_rects += word_sel->getEnd() - word_sel->getBegin();
@@ -2207,7 +2205,7 @@ poppler_page_get_text_layout_for_area (PopplerPage       *page,
   for (i = 0; i < n_lines; i++)
     {
       GooList *line_words = word_list[i];
-      for (j = 0; j < line_words->getLength(); j++)
+      for (std::size_t j = 0; j < line_words->size(); j++)
         {
           TextWordSelection *word_sel = (TextWordSelection *)line_words->get(j);
           TextWord *word = word_sel->getWord();
@@ -2227,7 +2225,7 @@ poppler_page_get_text_layout_for_area (PopplerPage       *page,
           rect = *rectangles + offset;
           word->getBBox (&x1, &y1, &x2, &y2);
 
-          if (j < line_words->getLength() - 1)
+          if (j < line_words->size() - 1)
             {
               TextWordSelection *word_sel = (TextWordSelection *)line_words->get(j + 1);
 
@@ -2357,7 +2355,7 @@ poppler_page_get_text_attributes_for_area (PopplerPage      *page,
   PopplerTextAttributes *attrs = nullptr;
   TextWord *word, *prev_word = nullptr;
   gint word_i, prev_word_i;
-  gint i, j;
+  gint i;
   gint offset = 0;
   GList *attributes = nullptr;
 
@@ -2377,7 +2375,7 @@ poppler_page_get_text_attributes_for_area (PopplerPage      *page,
   for (i = 0; i < n_lines; i++)
     {
       GooList *line_words = word_list[i];
-      for (j = 0; j < line_words->getLength(); j++)
+      for (std::size_t j = 0; j < line_words->size(); j++)
         {
           TextWordSelection *word_sel = (TextWordSelection *)line_words->get(j);
           int end = word_sel->getEnd();
@@ -2398,7 +2396,7 @@ poppler_page_get_text_attributes_for_area (PopplerPage      *page,
               prev_word_i = word_i;
             }
 
-          if (j < line_words->getLength() - 1)
+          if (j < line_words->size() - 1)
             {
               attrs->end_index = offset;
               offset++;