Rerun format_code (after merging clang-tidy PR)

18 files changed, 23 insertions, 24 deletions

diff --git a/libtests/aes.cc b/libtests/aes.cc
index a981fc22..7368b44e 100644
--- a/libtests/aes.cc
+++ b/libtests/aes.cc
@@ -3,10 +3,10 @@
 #include <qpdf/QIntC.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static void
 usage()
diff --git a/libtests/ascii85.cc b/libtests/ascii85.cc
index 8d926898..dad0c30b 100644
--- a/libtests/ascii85.cc
+++ b/libtests/ascii85.cc
@@ -1,8 +1,8 @@
 #include <qpdf/Pl_ASCII85Decoder.hh>
 
 #include <qpdf/Pl_StdioFile.hh>
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 int
 main()
diff --git a/libtests/bits.cc b/libtests/bits.cc
index af715da8..e8c8a5c1 100644
--- a/libtests/bits.cc
+++ b/libtests/bits.cc
@@ -3,8 +3,8 @@
 #include <qpdf/Pl_Buffer.hh>
 #include <qpdf/QIntC.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 // See comments in bits_functions.hh
 #define BITS_TESTING 1
diff --git a/libtests/buffer.cc b/libtests/buffer.cc
index 66eaa71c..86a52899 100644
--- a/libtests/buffer.cc
+++ b/libtests/buffer.cc
@@ -4,10 +4,10 @@
 #include <qpdf/Pl_Count.hh>
 #include <qpdf/Pl_Discard.hh>
 #include <qpdf/QUtil.hh>
+#include <cstdlib>
 #include <cstring>
 #include <iostream>
 #include <stdexcept>
-#include <cstdlib>
 
 static unsigned char*
 uc(char const* s)
diff --git a/libtests/closed_file_input_source.cc b/libtests/closed_file_input_source.cc
index 183658a9..88253350 100644
--- a/libtests/closed_file_input_source.cc
+++ b/libtests/closed_file_input_source.cc
@@ -1,8 +1,8 @@
 #include <qpdf/ClosedFileInputSource.hh>
 #include <qpdf/FileInputSource.hh>
 
-#include <iostream>
 #include <cstdio>
+#include <iostream>
 
 void
 check(std::string const& what, bool result)
diff --git a/libtests/dct_compress.cc b/libtests/dct_compress.cc
index 1f969982..3f7c86a1 100644
--- a/libtests/dct_compress.cc
+++ b/libtests/dct_compress.cc
@@ -2,10 +2,10 @@
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static void
 usage()
diff --git a/libtests/dct_uncompress.cc b/libtests/dct_uncompress.cc
index 6606e4a5..c4255b57 100644
--- a/libtests/dct_uncompress.cc
+++ b/libtests/dct_uncompress.cc
@@ -2,9 +2,9 @@
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
+#include <iostream>
 
 int
 main(int argc, char* argv[])
diff --git a/libtests/flate.cc b/libtests/flate.cc
index 9b64ca67..a14612c7 100644
--- a/libtests/flate.cc
+++ b/libtests/flate.cc
@@ -4,8 +4,8 @@
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 void
 run(char const* filename)
diff --git a/libtests/hex.cc b/libtests/hex.cc
index d239d202..5f11f87f 100644
--- a/libtests/hex.cc
+++ b/libtests/hex.cc
@@ -1,8 +1,8 @@
 #include <qpdf/Pl_ASCIIHexDecoder.hh>
 
 #include <qpdf/Pl_StdioFile.hh>
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 int
 main()
diff --git a/libtests/json_parse.cc b/libtests/json_parse.cc
index 31381ebf..bd2d49d1 100644
--- a/libtests/json_parse.cc
+++ b/libtests/json_parse.cc
@@ -15,8 +15,7 @@ namespace
         void arrayStart() override;
         void containerEnd(JSON const& value) override;
         void topLevelScalar() override;
-        bool
-        dictionaryItem(std::string const& key, JSON const& value) override;
+        bool dictionaryItem(std::string const& key, JSON const& value) override;
         bool arrayItem(JSON const& value) override;
 
       private:
diff --git a/libtests/lzw.cc b/libtests/lzw.cc
index 412ce4c5..3a7d003c 100644
--- a/libtests/lzw.cc
+++ b/libtests/lzw.cc
@@ -2,9 +2,9 @@
 
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 int
 main(int argc, char* argv[])
diff --git a/libtests/md5.cc b/libtests/md5.cc
index 27aaad51..9aed832d 100644
--- a/libtests/md5.cc
+++ b/libtests/md5.cc
@@ -2,8 +2,8 @@
 #include <qpdf/Pl_Discard.hh>
 #include <qpdf/Pl_MD5.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdio>
+#include <iostream>
 
 static void
 test_string(char const* str)
diff --git a/libtests/predictors.cc b/libtests/predictors.cc
index d7825bc6..f41cf5c1 100644
--- a/libtests/predictors.cc
+++ b/libtests/predictors.cc
@@ -6,9 +6,9 @@
 #include <qpdf/QIntC.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 void
 run(char const* filename,
diff --git a/libtests/qintc.cc b/libtests/qintc.cc
index 5b985644..52a1e91e 100644
--- a/libtests/qintc.cc
+++ b/libtests/qintc.cc
@@ -69,11 +69,11 @@ try_range_check_subtract_real(
 int
 main()
 {
-    uint32_t u1 = 3141592653U;      // Too big for signed type
-    int32_t i1 = -1153374643;       // Same bit pattern as u1
-    uint64_t ul1 = 1099511627776LL; // Too big for 32-bit
-    uint64_t ul2 = 12345;           // Fits into 32-bit
-    int32_t i2 = 81;                // Fits in char and uchar
+    uint32_t u1 = 3141592653U;                  // Too big for signed type
+    int32_t i1 = -1153374643;                   // Same bit pattern as u1
+    uint64_t ul1 = 1099511627776LL;             // Too big for 32-bit
+    uint64_t ul2 = 12345;                       // Fits into 32-bit
+    int32_t i2 = 81;                            // Fits in char and uchar
     auto c1 = static_cast<signed char>('\xf7'); // Signed value when char
     char c2 = 'W'; // char; may be signed or unsigned
 
diff --git a/libtests/qutil.cc b/libtests/qutil.cc
index be5b6b1b..a1bbb905 100644
--- a/libtests/qutil.cc
+++ b/libtests/qutil.cc
@@ -3,11 +3,11 @@
 #include <qpdf/Pl_Buffer.hh>
 #include <qpdf/QPDFSystemError.hh>
 #include <qpdf/QUtil.hh>
-#include <fstream>
-#include <iostream>
 #include <climits>
 #include <cstdio>
 #include <cstring>
+#include <fstream>
+#include <iostream>
 
 #ifdef _WIN32
 # include <io.h>
diff --git a/libtests/rc4.cc b/libtests/rc4.cc
index 300c6201..306d0882 100644
--- a/libtests/rc4.cc
+++ b/libtests/rc4.cc
@@ -5,10 +5,10 @@
 #include <qpdf/QIntC.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static void
 other_tests()
diff --git a/libtests/runlength.cc b/libtests/runlength.cc
index 260ce5cb..e034deda 100644
--- a/libtests/runlength.cc
+++ b/libtests/runlength.cc
@@ -2,10 +2,10 @@
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 int
 main(int argc, char* argv[])
diff --git a/libtests/sha2.cc b/libtests/sha2.cc
index 4be8956a..22303da2 100644
--- a/libtests/sha2.cc
+++ b/libtests/sha2.cc
@@ -1,7 +1,7 @@
 #include <qpdf/Pl_SHA2.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstring>
+#include <iostream>
 
 static void
 test(