clang-tidy: remove unused headers

Signed-off-by: Rosen Penev <[email protected]>

app/actions.cpp

@@ -14,7 +14,6 @@
 #include "iptc.hpp"
 #include "preview.hpp"
 #include "safe_op.hpp"
-#include "types.hpp"
 #include "xmp_exiv2.hpp"
 
 #include <filesystem>

src/asfvideo.cpp

@@ -2,18 +2,16 @@
 // included header files
 #include "asfvideo.hpp"
 
-#include <cstring>
-#include <iostream>
-#include <sstream>
-
 #include "basicio.hpp"
 #include "config.h"
 #include "enforce.hpp"
 #include "error.hpp"
 #include "futils.hpp"
 #include "helper_functions.hpp"
 #include "image_int.hpp"
-#include "utils.hpp"
+
+#include <cstring>
+
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {

src/bmffimage.cpp

@@ -11,7 +11,6 @@
 #include "image.hpp"
 #include "image_int.hpp"
 #include "safe_op.hpp"
-#include "tiffimage.hpp"
 #include "tiffimage_int.hpp"
 #include "types.hpp"
 #include "utils.hpp"
@@ -21,7 +20,6 @@
 #endif
 
 // + standard includes
-#include <cinttypes>
 #include <cstdio>
 #include <cstring>
 #include <iostream>

src/bmpimage.cpp

@@ -13,9 +13,12 @@
 
 // + standard includes
 #include <cstring>
-#include <iostream>
 #include <string>
 
+#ifdef EXIV2_DEBUG_MESSAGES
+#include <iostream>
+#endif
+
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {

src/crwimage.cpp

@@ -13,7 +13,9 @@
 #include "futils.hpp"
 #include "tags.hpp"
 
+#ifdef EXIV2_DEBUG_MESSAGES
 #include <iostream>
+#endif
 
 // *****************************************************************************
 // class member definitions

src/datasets.cpp

@@ -13,7 +13,6 @@
 
 #include "image_int.hpp"
 
-#include <array>
 #include <iomanip>
 #include <sstream>
 

src/error.cpp

@@ -3,7 +3,6 @@
 // included header files
 #include "error.hpp"
 #include "i18n.h"  // NLS support.
-#include "types.hpp"
 
 // + standard includes
 #include <array>

src/futils.cpp

@@ -5,7 +5,6 @@
 
 #include "config.h"
 #include "enforce.hpp"
-#include "error.hpp"
 #include "utils.hpp"
 
 // + standard includes

src/gifimage.cpp

@@ -7,7 +7,9 @@
 #include "error.hpp"
 #include "futils.hpp"
 
+#ifdef EXIV2_DEBUG_MESSAGES
 #include <iostream>
+#endif
 
 // *****************************************************************************
 // class member definitions

src/http.cpp

@@ -8,7 +8,6 @@
 #include <array>
 #include <cerrno>
 #include <chrono>
-#include <cinttypes>
 #include <thread>
 
 ////////////////////////////////////////

src/image.cpp

@@ -49,7 +49,6 @@
 #include <bit>
 #include <cstdio>
 #include <cstring>
-#include <limits>
 #include <set>
 
 #ifdef _WIN32

src/jp2image.cpp

@@ -18,9 +18,12 @@
 
 #include <algorithm>
 #include <array>
-#include <fstream>
 #include <iostream>
 
+#ifdef EXIV2_DEBUG_MESSAGES
+#include <fstream>
+#endif
+
 namespace Exiv2 {
 namespace {
 // JPEG-2000 box types

src/jp2image_int.cpp

@@ -2,7 +2,6 @@
 
 #include "jp2image_int.hpp"
 
-#include "error.hpp"
 #include "types.hpp"
 
 #include <cassert>

src/matroskavideo.cpp

@@ -27,15 +27,11 @@
 #include "futils.hpp"
 #include "helper_functions.hpp"
 #include "matroskavideo.hpp"
-#include "tags.hpp"
-#include "tags_int.hpp"
 
 // + standard includes
-#include <array>
 #include <cmath>
 #include <cstdlib>
 #include <iostream>
-#include <limits>
 // *****************************************************************************
 // class member definitions
 namespace Exiv2::Internal {

src/minoltamn_int.cpp

@@ -9,10 +9,8 @@
 #include "tags_int.hpp"
 #include "value.hpp"
 
-#include <array>
-#include <sstream>
-
 #include <cstdio>  // popen to call exiftool
+#include <sstream>
 
 // *****************************************************************************
 // class member definitions

src/mrwimage.cpp

@@ -11,7 +11,9 @@
 #include "image.hpp"
 #include "tiffimage.hpp"
 
+#ifdef EXIV2_DEBUG_MESSAGES
 #include <iostream>
+#endif
 
 namespace Exiv2 {
 MrwImage::MrwImage(BasicIo::UniquePtr io, bool /*create*/) :

src/orfimage.cpp

@@ -13,7 +13,6 @@
 #include "tiffimage.hpp"
 #include "tiffimage_int.hpp"
 
-#include <array>
 #include <iostream>
 
 // *****************************************************************************

src/pentaxmn_int.cpp

@@ -11,8 +11,6 @@
 #include "utils.hpp"
 #include "value.hpp"
 
-#include <array>
-
 // *****************************************************************************
 // class member definitions
 namespace Exiv2::Internal {

src/photoshop.cpp

@@ -4,7 +4,9 @@
 #include "image.hpp"
 #include "safe_op.hpp"
 
+#ifdef EXIV2_DEBUG_MESSAGES
 #include <iostream>
+#endif
 
 namespace Exiv2 {
 

src/pngchunk_int.cpp

@@ -12,7 +12,6 @@
 #include "helper_functions.hpp"
 #include "image.hpp"
 #include "iptc.hpp"
-#include "jpgimage.hpp"
 #include "photoshop.hpp"
 #include "pngchunk_int.hpp"
 #include "safe_op.hpp"

src/pngimage.cpp

@@ -12,7 +12,6 @@
 #include "futils.hpp"
 #include "image.hpp"
 #include "image_int.hpp"
-#include "jpgimage.hpp"
 #include "photoshop.hpp"
 #include "pngchunk_int.hpp"
 #include "pngimage.hpp"

src/preview.cpp

@@ -7,7 +7,6 @@
 #include "enforce.hpp"
 #include "futils.hpp"
 #include "image.hpp"
-#include "jpgimage.hpp"
 #include "photoshop.hpp"
 #include "safe_op.hpp"
 #include "tiffimage.hpp"

src/psdimage.cpp

@@ -9,10 +9,11 @@
 #include "error.hpp"
 #include "futils.hpp"
 #include "image.hpp"
-#include "jpgimage.hpp"
 #include "photoshop.hpp"
 
+#ifdef EXIV2_DEBUG_MESSAGES
 #include <iostream>
+#endif
 
 // Todo: Consolidate with existing code in struct Photoshop (jpgimage.hpp):
 //       Extend this helper to a proper class with all required functionality,

src/quicktimevideo.cpp

@@ -33,7 +33,6 @@
 // + standard includes
 #include <array>
 #include <cmath>
-#include <iostream>
 #include <string>
 // *****************************************************************************
 // class member definitions

src/rafimage.cpp

@@ -14,7 +14,6 @@
 #include "safe_op.hpp"
 #include "tiffimage.hpp"
 
-#include <cinttypes>
 #include <iostream>
 
 // *****************************************************************************

src/sigmamn_int.cpp

@@ -8,7 +8,6 @@
 #include "value.hpp"
 
 // + standard includes
-#include <sstream>
 #include <string>
 
 // *****************************************************************************

src/tags.cpp

@@ -3,9 +3,6 @@
 // included header files
 #include "tags.hpp"
 
-#include "canonmn_int.hpp"
-#include "casiomn_int.hpp"
-#include "convert.hpp"
 #include "error.hpp"
 #include "i18n.h"  // NLS support.
 #include "tags_int.hpp"

src/tgaimage.cpp

@@ -9,7 +9,9 @@
 #include "futils.hpp"
 #include "image.hpp"
 
+#ifdef EXIV2_DEBUG_MESSAGES
 #include <iostream>
+#endif
 
 // *****************************************************************************
 // class member definitions

src/tiffcomposite_int.cpp

@@ -2,12 +2,13 @@
 // included header files
 #include "config.h"
 
+#include "tiffcomposite_int.hpp"
+
 #include "enforce.hpp"
 #include "error.hpp"
 #include "makernote_int.hpp"
 #include "safe_op.hpp"
 #include "sonymn_int.hpp"
-#include "tiffcomposite_int.hpp"
 #include "tiffimage_int.hpp"
 #include "tiffvisitor_int.hpp"
 #include "utils.hpp"

src/tiffimage_int.cpp

@@ -5,7 +5,6 @@
 #include "i18n.h"  // NLS support.
 #include "makernote_int.hpp"
 #include "sonymn_int.hpp"
-#include "tags_int.hpp"
 #include "tiffvisitor_int.hpp"
 
 #include <array>

src/tiffvisitor_int.cpp

@@ -1,19 +1,16 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 // included header files
-#include "config.h"
+#include "tiffvisitor_int.hpp"  // see bug #487
 
+#include "config.h"
 #include "enforce.hpp"
 #include "exif.hpp"
 #include "iptc.hpp"
-#include "jpgimage.hpp"
 #include "makernote_int.hpp"
 #include "photoshop.hpp"
 #include "safe_op.hpp"
 #include "sonymn_int.hpp"
-#include "tiffcomposite_int.hpp"  // Do not change the order of these 2 includes,
-#include "tiffimage_int.hpp"
-#include "tiffvisitor_int.hpp"  // see bug #487
 #include "value.hpp"
 
 #include <functional>

src/tiffvisitor_int.hpp

@@ -6,7 +6,9 @@
 // *****************************************************************************
 // included header files
 #include "exif.hpp"
+#include "tiffcomposite_int.hpp"  // Do not change the order of these 2 includes,
 #include "tifffwd_int.hpp"
+#include "tiffimage_int.hpp"
 #include "types.hpp"
 
 #include <array>

src/types.cpp

@@ -6,19 +6,15 @@
 #include "enforce.hpp"
 #include "futils.hpp"
 #include "i18n.h"  // for _exvGettext
-#include "safe_op.hpp"
 #include "utils.hpp"
 
 // + standard includes
-#include <array>
 #include <cctype>
 #include <climits>
 #include <cmath>
 #include <cstring>
 #include <iomanip>
 #include <numeric>
-#include <sstream>
-#include <utility>
 
 // *****************************************************************************
 namespace {

src/version.cpp

@@ -16,7 +16,6 @@
 #endif
 
 // + standard includes
-#include <array>
 #include <fstream>
 #include <set>
 
@@ -45,6 +44,9 @@
 #endif
 #define _WIN64 1
 #endif
+#ifdef _MSC_VER
+#include <array>
+#endif
 #elif defined(__APPLE__)
 #include <mach-o/dyld.h>
 #elif defined(__FreeBSD__)

src/xmpsidecar.cpp

@@ -10,7 +10,9 @@
 #include "utils.hpp"
 #include "xmp_exiv2.hpp"
 
+#ifdef EXIV2_DEBUG_MESSAGES
 #include <iostream>
+#endif
 
 namespace {
 constexpr char xmlHeader[] = "<?xpacket begin=\"\xef\xbb\xbf\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>\n";

unitTests/test_XmpKey.cpp

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <gtest/gtest.h>
-#include <exiv2/error.hpp>
 #include <exiv2/properties.hpp>
 
 using namespace Exiv2;