Programmatically apply new formatting to code

Run this:

for i in  **/*.cc **/*.c **/*.h **/*.hh; do
  clang-format < $i >| $i.new && mv $i.new $i
done

1 files changed, 50 insertions, 72 deletions

diff --git a/libqpdf/QPDFPageDocumentHelper.cc b/libqpdf/QPDFPageDocumentHelper.cc
index e76c874f..ecfd3713 100644
--- a/libqpdf/QPDFPageDocumentHelper.cc
+++ b/libqpdf/QPDFPageDocumentHelper.cc
@@ -1,8 +1,8 @@
 #include <qpdf/QPDFPageDocumentHelper.hh>
 
 #include <qpdf/QPDFAcroFormDocumentHelper.hh>
-#include <qpdf/QUtil.hh>
 #include <qpdf/QTC.hh>
+#include <qpdf/QUtil.hh>
 
 QPDFPageDocumentHelper::Members::~Members()
 {
@@ -23,8 +23,8 @@ QPDFPageDocumentHelper::getAllPages()
     std::vector<QPDFObjectHandle> const& pages_v = this->qpdf.getAllPages();
     std::vector<QPDFPageObjectHelper> pages;
     for (std::vector<QPDFObjectHandle>::const_iterator iter = pages_v.begin();
-         iter != pages_v.end(); ++iter)
-    {
+         iter != pages_v.end();
+         ++iter) {
         pages.push_back(QPDFPageObjectHelper(*iter));
     }
     return pages;
@@ -41,8 +41,8 @@ QPDFPageDocumentHelper::removeUnreferencedResources()
 {
     std::vector<QPDFPageObjectHelper> pages = getAllPages();
     for (std::vector<QPDFPageObjectHelper>::iterator iter = pages.begin();
-         iter != pages.end(); ++iter)
-    {
+         iter != pages.end();
+         ++iter) {
         (*iter).removeUnreferencedResources();
     }
 }
@@ -54,11 +54,11 @@ QPDFPageDocumentHelper::addPage(QPDFPageObjectHelper newpage, bool first)
 }
 
 void
-QPDFPageDocumentHelper::addPageAt(QPDFPageObjectHelper newpage, bool before,
-                                  QPDFPageObjectHelper refpage)
+QPDFPageDocumentHelper::addPageAt(
+    QPDFPageObjectHelper newpage, bool before, QPDFPageObjectHelper refpage)
 {
-    this->qpdf.addPageAt(newpage.getObjectHandle(), before,
-                         refpage.getObjectHandle());
+    this->qpdf.addPageAt(
+        newpage.getObjectHandle(), before, refpage.getObjectHandle());
 }
 
 void
@@ -67,36 +67,32 @@ QPDFPageDocumentHelper::removePage(QPDFPageObjectHelper page)
     this->qpdf.removePage(page.getObjectHandle());
 }
 
-
 void
 QPDFPageDocumentHelper::flattenAnnotations(
-    int required_flags,
-    int forbidden_flags)
+    int required_flags, int forbidden_flags)
 {
     QPDFAcroFormDocumentHelper afdh(this->qpdf);
-    if (afdh.getNeedAppearances())
-    {
-        this->qpdf.getRoot().getKey("/AcroForm").warnIfPossible(
-            "document does not have updated appearance streams,"
-            " so form fields will not be flattened");
+    if (afdh.getNeedAppearances()) {
+        this->qpdf.getRoot()
+            .getKey("/AcroForm")
+            .warnIfPossible("document does not have updated appearance streams,"
+                            " so form fields will not be flattened");
     }
     std::vector<QPDFPageObjectHelper> pages = getAllPages();
     for (std::vector<QPDFPageObjectHelper>::iterator iter = pages.begin();
-         iter != pages.end(); ++iter)
-    {
+         iter != pages.end();
+         ++iter) {
         QPDFPageObjectHelper ph(*iter);
         QPDFObjectHandle resources = ph.getAttribute("/Resources", true);
-        if (! resources.isDictionary())
-        {
+        if (!resources.isDictionary()) {
             // This should never happen and is not exercised in the
             // test suite
             resources = QPDFObjectHandle::newDictionary();
         }
-        flattenAnnotationsForPage(ph, resources, afdh,
-                                  required_flags, forbidden_flags);
+        flattenAnnotationsForPage(
+            ph, resources, afdh, required_flags, forbidden_flags);
     }
-    if (! afdh.getNeedAppearances())
-    {
+    if (!afdh.getNeedAppearances()) {
         this->qpdf.getRoot().removeKey("/AcroForm");
     }
 }
@@ -114,100 +110,82 @@ QPDFPageDocumentHelper::flattenAnnotationsForPage(
     std::vector<QPDFObjectHandle> new_annots;
     std::string new_content;
     int rotate = 0;
-    QPDFObjectHandle rotate_obj =
-        page.getObjectHandle().getKey("/Rotate");
-    if (rotate_obj.isInteger() && rotate_obj.getIntValue())
-    {
+    QPDFObjectHandle rotate_obj = page.getObjectHandle().getKey("/Rotate");
+    if (rotate_obj.isInteger() && rotate_obj.getIntValue()) {
         rotate = rotate_obj.getIntValueAsInt();
     }
     int next_fx = 1;
     for (std::vector<QPDFAnnotationObjectHelper>::iterator iter =
              annots.begin();
-         iter != annots.end(); ++iter)
-    {
+         iter != annots.end();
+         ++iter) {
         QPDFAnnotationObjectHelper& aoh(*iter);
         QPDFObjectHandle as = aoh.getAppearanceStream("/N");
         bool is_widget = (aoh.getSubtype() == "/Widget");
         bool process = true;
-        if (need_appearances && is_widget)
-        {
-            QTC::TC("qpdf", "QPDFPageDocumentHelper skip widget need appearances");
+        if (need_appearances && is_widget) {
+            QTC::TC(
+                "qpdf", "QPDFPageDocumentHelper skip widget need appearances");
             process = false;
         }
-        if (process && as.isStream())
-        {
-            if (is_widget)
-            {
+        if (process && as.isStream()) {
+            if (is_widget) {
                 QTC::TC("qpdf", "QPDFPageDocumentHelper merge DR");
                 QPDFFormFieldObjectHelper ff = afdh.getFieldForAnnotation(aoh);
                 QPDFObjectHandle as_resources =
                     as.getDict().getKey("/Resources");
-                if (as_resources.isIndirect())
-                {
-                    QTC::TC("qpdf", "QPDFPageDocumentHelper indirect as resources");
+                if (as_resources.isIndirect()) {
+                    QTC::TC(
+                        "qpdf", "QPDFPageDocumentHelper indirect as resources");
                     as.getDict().replaceKey(
                         "/Resources", as_resources.shallowCopy());
                     as_resources = as.getDict().getKey("/Resources");
                 }
                 as_resources.mergeResources(ff.getDefaultResources());
-            }
-            else
-            {
+            } else {
                 QTC::TC("qpdf", "QPDFPageDocumentHelper non-widget annotation");
             }
-            std::string name = resources.getUniqueResourceName(
-                "/Fxo", next_fx);
+            std::string name = resources.getUniqueResourceName("/Fxo", next_fx);
             std::string content = aoh.getPageContentForAppearance(
                 name, rotate, required_flags, forbidden_flags);
-            if (! content.empty())
-            {
+            if (!content.empty()) {
                 resources.mergeResources("<< /XObject << >> >>"_qpdf);
                 resources.getKey("/XObject").replaceKey(name, as);
                 ++next_fx;
             }
             new_content += content;
-        }
-        else if (process)
-        {
+        } else if (process) {
             // If an annotation has no appearance stream, just drop
             // the annotation when flattening. This can happen for
             // unchecked checkboxes and radio buttons, popup windows
             // associated with comments that aren't visible, and other
             // types of annotations that aren't visible.
-            QTC::TC("qpdf", "QPDFPageDocumentHelper ignore annotation with no appearance");
-        }
-        else
-        {
+            QTC::TC(
+                "qpdf",
+                "QPDFPageDocumentHelper ignore annotation with no appearance");
+        } else {
             new_annots.push_back(aoh.getObjectHandle());
         }
     }
-    if (new_annots.size() != annots.size())
-    {
+    if (new_annots.size() != annots.size()) {
         QPDFObjectHandle page_oh = page.getObjectHandle();
-        if (new_annots.empty())
-        {
+        if (new_annots.empty()) {
             QTC::TC("qpdf", "QPDFPageDocumentHelper remove annots");
             page_oh.removeKey("/Annots");
-        }
-        else
-        {
+        } else {
             QPDFObjectHandle old_annots = page_oh.getKey("/Annots");
             QPDFObjectHandle new_annots_oh =
                 QPDFObjectHandle::newArray(new_annots);
-            if (old_annots.isIndirect())
-            {
-                QTC::TC("qpdf", "QPDFPageDocumentHelper replace indirect annots");
-                this->qpdf.replaceObject(
-                    old_annots.getObjGen(), new_annots_oh);
-            }
-            else
-            {
+            if (old_annots.isIndirect()) {
+                QTC::TC(
+                    "qpdf", "QPDFPageDocumentHelper replace indirect annots");
+                this->qpdf.replaceObject(old_annots.getObjGen(), new_annots_oh);
+            } else {
                 QTC::TC("qpdf", "QPDFPageDocumentHelper replace direct annots");
                 page_oh.replaceKey("/Annots", new_annots_oh);
             }
         }
-        page.addPageContents(
-            QPDFObjectHandle::newStream(&qpdf, "q\n"), true);
+        page.addPageContents(QPDFObjectHandle::newStream(&qpdf, "q\n"), true);
         page.addPageContents(
             QPDFObjectHandle::newStream(&qpdf, "\nQ\n" + new_content), false);
     }