[poppler] glib/poppler-media.cc glib/poppler-movie.cc glib/poppler-structure-element.cc goo/glibc.h poppler/StructElement.cc utils/JSInfo.cc

[Albert Astals Cid]

 glib/poppler-media.cc             |    2 +-
 glib/poppler-movie.cc             |    2 +-
 glib/poppler-structure-element.cc |    2 +-
 goo/glibc.h                       |    2 +-
 poppler/StructElement.cc          |   14 +++++++-------
 utils/JSInfo.cc                   |    2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit d51cc34d7d51b6ddb7bfba318ed12bcbe763be6a
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Sep 16 17:35:15 2017 +0200

    -pedantic fixes

diff --git a/glib/poppler-media.cc b/glib/poppler-media.cc
index 8634af43..e254f53b 100644
--- a/glib/poppler-media.cc
+++ b/glib/poppler-media.cc
@@ -48,7 +48,7 @@ struct _PopplerMediaClass
   GObjectClass parent_class;
 };
 
-G_DEFINE_TYPE (PopplerMedia, poppler_media, G_TYPE_OBJECT);
+G_DEFINE_TYPE (PopplerMedia, poppler_media, G_TYPE_OBJECT)
 
 static void
 poppler_media_finalize (GObject *object)
diff --git a/glib/poppler-movie.cc b/glib/poppler-movie.cc
index 1e82af70..f066cf1c 100644
--- a/glib/poppler-movie.cc
+++ b/glib/poppler-movie.cc
@@ -45,7 +45,7 @@ struct _PopplerMovieClass
   GObjectClass parent_class;
 };
 
-G_DEFINE_TYPE (PopplerMovie, poppler_movie, G_TYPE_OBJECT);
+G_DEFINE_TYPE (PopplerMovie, poppler_movie, G_TYPE_OBJECT)
 
 static void
 poppler_movie_finalize (GObject *object)
diff --git a/glib/poppler-structure-element.cc b/glib/poppler-structure-element.cc
index 70dfd507..e26f4c47 100644
--- a/glib/poppler-structure-element.cc
+++ b/glib/poppler-structure-element.cc
@@ -49,7 +49,7 @@ typedef struct _PopplerStructureElementClass
   GObjectClass parent_class;
 } PopplerStructureElementClass;
 
-G_DEFINE_TYPE (PopplerStructureElement, poppler_structure_element, G_TYPE_OBJECT);
+G_DEFINE_TYPE (PopplerStructureElement, poppler_structure_element, G_TYPE_OBJECT)
 
 static PopplerStructureElement *
 _poppler_structure_element_new (PopplerDocument *document, StructElement *element)
diff --git a/goo/glibc.h b/goo/glibc.h
index 49479e9d..45aff9df 100644
--- a/goo/glibc.h
+++ b/goo/glibc.h
@@ -31,7 +31,7 @@ struct tm *localtime_r(const time_t *timep, struct tm *result);
 time_t timegm(struct tm *tm);
 #endif
 
-};
+}
 
 #endif // GLIBC_H
 
diff --git a/poppler/StructElement.cc b/poppler/StructElement.cc
index 451213f8..62925474 100644
--- a/poppler/StructElement.cc
+++ b/poppler/StructElement.cc
@@ -226,13 +226,13 @@ static GBool isTextString(Object *value)
       return okay;                                                      \
     }
 
-ARRAY_CHECKER(isRGBColorOrOptionalArray4, isRGBColor,        4, gTrue,  gTrue );
-ARRAY_CHECKER(isPositiveOrOptionalArray4, isPositive,        4, gTrue,  gTrue );
-ARRAY_CHECKER(isPositiveOrArray4,         isPositive,        4, gTrue,  gFalse);
-ARRAY_CHECKER(isBorderStyle,              isBorderStyleName, 4, gTrue,  gTrue );
-ARRAY_CHECKER(isNumberArray4,             isNumber,          4, gFalse, gFalse);
-ARRAY_CHECKER(isNumberOrArrayN,           isNumber,          0, gTrue,  gFalse);
-ARRAY_CHECKER(isTableHeaders,             isTextString,      0, gFalse, gFalse);
+ARRAY_CHECKER(isRGBColorOrOptionalArray4, isRGBColor,        4, gTrue,  gTrue )
+ARRAY_CHECKER(isPositiveOrOptionalArray4, isPositive,        4, gTrue,  gTrue )
+ARRAY_CHECKER(isPositiveOrArray4,         isPositive,        4, gTrue,  gFalse)
+ARRAY_CHECKER(isBorderStyle,              isBorderStyleName, 4, gTrue,  gTrue )
+ARRAY_CHECKER(isNumberArray4,             isNumber,          4, gFalse, gFalse)
+ARRAY_CHECKER(isNumberOrArrayN,           isNumber,          0, gTrue,  gFalse)
+ARRAY_CHECKER(isTableHeaders,             isTextString,      0, gFalse, gFalse)
 
 
 // Type of functions used to do type-checking on attribute values
diff --git a/utils/JSInfo.cc b/utils/JSInfo.cc
index 17b10329..f132bb5b 100644
--- a/utils/JSInfo.cc
+++ b/utils/JSInfo.cc
@@ -236,4 +236,4 @@ void JSInfo::scan(int nPages) {
 
 GBool JSInfo::containsJS() {
   return hasJS;
-};
+}