unused includes (#1133)

* unused includes

Signed-off-by: Rosen Penev <rosenp@gmail.com>

* Use consistent order of includes

Always include in the following order:
- Own header files
- Standard header files
- System header files
- Project header files (toolkit first)

Exceptions:
- cppunit/extensions/HelperMacros.h must be included after
  header files declaring stream operators
- config.h must be included before its definitions are used

---------

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Co-authored-by: Urs Fleisch <ufleisch@users.sourceforge.net>

tests/test_aiff.cpp

@@ -25,8 +25,9 @@
 
 #include <string>
 #include <cstdio>
-#include "tag.h"
+
 #include "tbytevectorlist.h"
+#include "tag.h"
 #include "aifffile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"

tests/test_ape.cpp

@@ -25,11 +25,12 @@
 
 #include <string>
 #include <cstdio>
-#include "apetag.h"
-#include "id3v1tag.h"
+
 #include "tstringlist.h"
 #include "tbytevectorlist.h"
 #include "tpropertymap.h"
+#include "apetag.h"
+#include "id3v1tag.h"
 #include "apefile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"

tests/test_apetag.cpp

@@ -25,13 +25,14 @@
 
 #include <string>
 #include <cstdio>
-#include "tag.h"
+
 #include "tstringlist.h"
 #include "tbytevectorlist.h"
 #include "tpropertymap.h"
+#include "tdebug.h"
+#include "tag.h"
 #include "apefile.h"
 #include "apetag.h"
-#include "tdebug.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 

tests/test_asf.cpp

@@ -25,10 +25,11 @@
 
 #include <string>
 #include <cstdio>
-#include "tag.h"
+
 #include "tstringlist.h"
 #include "tbytevectorlist.h"
 #include "tpropertymap.h"
+#include "tag.h"
 #include "asffile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"

tests/test_bytevector.cpp

@@ -25,6 +25,7 @@
 
 #define _USE_MATH_DEFINES
 #include <cmath>
+
 #include "tbytevector.h"
 #include "tbytevectorlist.h"
 #include <cppunit/extensions/HelperMacros.h>

tests/test_file.cpp

@@ -24,8 +24,8 @@
  ***************************************************************************/
 
 #include "tfile.h"
-#include <cppunit/extensions/HelperMacros.h>
 #include "plainfile.h"
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace TagLib;

tests/test_fileref.cpp

@@ -25,6 +25,9 @@
 
 #include <string>
 #include <cstdio>
+
+#include "tfilestream.h"
+#include "tbytevectorstream.h"
 #include "tag.h"
 #include "fileref.h"
 #include "oggflacfile.h"
@@ -42,8 +45,6 @@
 #include "wavpackfile.h"
 #include "opusfile.h"
 #include "xmfile.h"
-#include "tfilestream.h"
-#include "tbytevectorstream.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 

tests/test_flac.cpp

@@ -25,16 +25,17 @@
 
 #include <string>
 #include <cstdio>
-#include "tag.h"
+
 #include "tstringlist.h"
 #include "tbytevectorlist.h"
 #include "tpropertymap.h"
+#include "tag.h"
 #include "flacfile.h"
 #include "xiphcomment.h"
 #include "id3v1tag.h"
 #include "id3v2tag.h"
-#include <cppunit/extensions/HelperMacros.h>
 #include "plainfile.h"
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

tests/test_flacpicture.cpp

@@ -25,9 +25,10 @@
 
 #include <string>
 #include <cstdio>
-#include "tag.h"
+
 #include "tstringlist.h"
 #include "tbytevectorlist.h"
+#include "tag.h"
 #include "flacfile.h"
 #include "flacmetadatablock.h"
 #include <cppunit/extensions/HelperMacros.h>

tests/test_flacunknownmetadatablock.cpp

@@ -25,9 +25,10 @@
 
 #include <string>
 #include <cstdio>
-#include "tag.h"
+
 #include "tstringlist.h"
 #include "tbytevectorlist.h"
+#include "tag.h"
 #include "flacunknownmetadatablock.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"

tests/test_id3v1.cpp

@@ -25,6 +25,7 @@
 
 #include <string>
 #include <cstdio>
+
 #include "tstring.h"
 #include "mpegfile.h"
 #include "id3v1tag.h"

tests/test_id3v2.cpp

@@ -26,6 +26,10 @@
 #include <string>
 #include <cstdio>
 #include <utility>
+
+#include "tdebug.h"
+#include "tpropertymap.h"
+#include "tzlib.h"
 #include "id3v2tag.h"
 #include "mpegfile.h"
 #include "id3v2frame.h"
@@ -46,11 +50,8 @@
 #include "commentsframe.h"
 #include "podcastframe.h"
 #include "privateframe.h"
-#include "tdebug.h"
-#include "tpropertymap.h"
-#include "tzlib.h"
-#include <cppunit/extensions/HelperMacros.h>
 #include "plainfile.h"
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

tests/test_info.cpp

@@ -25,6 +25,7 @@
 
 #include <string>
 #include <cstdio>
+
 #include "infotag.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"

tests/test_it.cpp

@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "itfile.h"
 #include "tstringlist.h"
+#include "itfile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 

tests/test_mod.cpp

@@ -23,8 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "modfile.h"
 #include "tpropertymap.h"
+#include "modfile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 

tests/test_mp4.cpp

@@ -25,15 +25,16 @@
 
 #include <string>
 #include <cstdio>
-#include "tag.h"
-#include "mp4tag.h"
+
 #include "tbytevectorlist.h"
 #include "tbytevectorstream.h"
 #include "tpropertymap.h"
+#include "tag.h"
+#include "mp4tag.h"
 #include "mp4atom.h"
 #include "mp4file.h"
-#include <cppunit/extensions/HelperMacros.h>
 #include "plainfile.h"
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

tests/test_mp4coverart.cpp

@@ -25,6 +25,7 @@
 
 #include <string>
 #include <cstdio>
+
 #include "tag.h"
 #include "mp4coverart.h"
 #include <cppunit/extensions/HelperMacros.h>

tests/test_mp4item.cpp

@@ -25,6 +25,7 @@
 
 #include <string>
 #include <cstdio>
+
 #include "tag.h"
 #include "mp4coverart.h"
 #include "mp4item.h"

tests/test_mpc.cpp

@@ -25,11 +25,12 @@
 
 #include <string>
 #include <cstdio>
-#include "apetag.h"
-#include "id3v1tag.h"
+
 #include "tstringlist.h"
 #include "tbytevectorlist.h"
 #include "tpropertymap.h"
+#include "apetag.h"
+#include "id3v1tag.h"
 #include "mpcfile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"

tests/test_mpeg.cpp

@@ -25,6 +25,7 @@
 
 #include <string>
 #include <cstdio>
+
 #include "tstring.h"
 #include "tpropertymap.h"
 #include "mpegfile.h"

tests/test_ogg.cpp

@@ -25,6 +25,7 @@
 
 #include <string>
 #include <cstdio>
+
 #include "tag.h"
 #include "tstringlist.h"
 #include "tbytevectorlist.h"

tests/test_oggflac.cpp

@@ -25,9 +25,10 @@
 
 #include <string>
 #include <cstdio>
-#include "tag.h"
+
 #include "tstringlist.h"
 #include "tbytevectorlist.h"
+#include "tag.h"
 #include "oggfile.h"
 #include "oggflacfile.h"
 #include "oggpageheader.h"

tests/test_opus.cpp

@@ -25,8 +25,9 @@
 
 #include <string>
 #include <cstdio>
-#include "tag.h"
+
 #include "tbytevectorlist.h"
+#include "tag.h"
 #include "opusfile.h"
 #include "oggpageheader.h"
 #include <cppunit/extensions/HelperMacros.h>

tests/test_riff.cpp

@@ -25,8 +25,9 @@
 
 #include <string>
 #include <cstdio>
-#include "tag.h"
+
 #include "tbytevectorlist.h"
+#include "tag.h"
 #include "rifffile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"

tests/test_sizes.cpp

@@ -23,6 +23,8 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#include <cstring>
+
 #include "aifffile.h"
 #include "aiffproperties.h"
 #include "apefile.h"
@@ -124,7 +126,6 @@
 #include "xmfile.h"
 #include "xmproperties.h"
 
-#include <cstring>
 #include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;

tests/test_string.cpp

@@ -23,8 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "tstring.h"
 #include <cstring>
+
+#include "tstring.h"
 #include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;

tests/test_synchdata.cpp

@@ -23,7 +23,6 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-
 #include "id3v2synchdata.h"
 #include <cppunit/extensions/HelperMacros.h>
 

tests/test_trueaudio.cpp

@@ -25,9 +25,10 @@
 
 #include <string>
 #include <cstdio>
+
+#include "tpropertymap.h"
 #include "id3v1tag.h"
 #include "id3v2tag.h"
-#include "tpropertymap.h"
 #include "trueaudiofile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"

tests/test_wav.cpp

@@ -25,6 +25,7 @@
 
 #include <string>
 #include <cstdio>
+
 #include "id3v2tag.h"
 #include "infotag.h"
 #include "tbytevectorlist.h"
@@ -32,8 +33,8 @@
 #include "tfilestream.h"
 #include "tpropertymap.h"
 #include "wavfile.h"
-#include <cppunit/extensions/HelperMacros.h>
 #include "plainfile.h"
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

tests/test_wavpack.cpp

@@ -25,10 +25,11 @@
 
 #include <string>
 #include <cstdio>
-#include "apetag.h"
-#include "id3v1tag.h"
+
 #include "tbytevectorlist.h"
 #include "tpropertymap.h"
+#include "apetag.h"
+#include "id3v1tag.h"
 #include "wavpackfile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"

tests/test_xiphcomment.cpp

@@ -25,10 +25,11 @@
 
 #include <string>
 #include <cstdio>
-#include "xiphcomment.h"
-#include "vorbisfile.h"
+
 #include "tpropertymap.h"
 #include "tdebug.h"
+#include "xiphcomment.h"
+#include "vorbisfile.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"