Refactor a lot more includes into common.h

2025-01-18 16:04:52 +00:00 · 2012-02-27 23:57:19 +01:00 · 2012-02-27 23:57:19 +01:00 · c3633f3de6
commit c3633f3de6
parent 3bbcac84c1
36 changed files with 29 additions and 124 deletions
--- a/src/common/cli_parser.cpp
+++ b/src/common/cli_parser.cpp
@ -11,8 +11,6 @@

 #include "common/common_pch.h"

-#include <boost/bind.hpp>
-
 #include "common/cli_parser.h"
 #include "common/command_line.h"
 #include "common/strings/editing.h"
--- a/src/common/cli_parser.h
+++ b/src/common/cli_parser.h
@ -11,12 +11,7 @@
 #ifndef __COMMON_CLI_PARSER_H
 #define __COMMON_CLI_PARSER_H

-#include "common/os.h"
-
-#include <boost/function.hpp>
-#include <map>
-#include <string>
-#include <vector>
+#include "common/common_pch.h"

 #include "common/translation.h"

--- a/src/common/common.h
+++ b/src/common/common.h
@ -18,9 +18,31 @@
 #undef max
 #undef __STRICT_ANSI__

-#include <boost/format.hpp>
-#include <boost/regex.hpp>
+#include <algorithm>
+#include <stdexcept>
 #include <string>
+#include <vector>
+
+#include <cassert>
+#include <cstring>
+
+#include <boost/algorithm/string.hpp>
+#include <boost/bind.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/format.hpp>
+#include <boost/function.hpp>
+#include <boost/logic/tribool.hpp>
+#include <boost/math/common_factor.hpp>
+#include <boost/range.hpp>
+#include <boost/range/algorithm_ext.hpp>
+#include <boost/range/algorithm.hpp>
+#include <boost/range/numeric.hpp>
+#include <boost/rational.hpp>
+#include <boost/regex.hpp>
+#include <boost/system/error_code.hpp>
+
+namespace ba  = boost::algorithm;
+namespace bfs = boost::filesystem;

 #include "common/os.h"

--- a/src/common/compression.cpp
+++ b/src/common/compression.cpp
@ -13,8 +13,6 @@

 #include "common/common_pch.h"

-#include <boost/range/algorithm/for_each.hpp>
-
 #include <matroska/KaxContentEncoding.h>
 #include <matroska/KaxTracks.h>

--- a/src/common/fs_sys_helpers.cpp
+++ b/src/common/fs_sys_helpers.cpp
@ -152,8 +152,6 @@ get_application_data_folder() {
 # include <stdlib.h>
 # include <sys/time.h>

-# include <boost/filesystem.hpp>
-
 int64_t
 get_current_time_millis() {
  struct timeval tv;
--- a/src/common/math.h
+++ b/src/common/math.h
@ -16,8 +16,6 @@

 #include "common/common_pch.h"

-#include <boost/rational.hpp>
-
 #define irnd(a) ((int64_t)((double)(a) + 0.5))
 #define iabs(a) ((a) < 0 ? (a) * -1 : (a))

--- a/src/common/mm_io.cpp
+++ b/src/common/mm_io.cpp
@ -25,9 +25,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>

-#include <boost/filesystem.hpp>
-#include <boost/system/error_code.hpp>
-
 #include "common/endian.h"
 #include "common/error.h"
 #include "common/fs_sys_helpers.h"
--- a/src/common/mm_multi_file_io.cpp
+++ b/src/common/mm_multi_file_io.cpp
@ -13,18 +13,13 @@

 #include "common/common_pch.h"

-#include <algorithm>
-#include <boost/regex.hpp>
 #include <sstream>
-#include <vector>

 #include "common/mm_multi_file_io.h"
 #include "common/output.h"
 #include "common/strings/editing.h"
 #include "common/strings/parsing.h"

-namespace bfs = boost::filesystem;
-
 mm_multi_file_io_c::file_t::file_t(const bfs::path &file_name,
                                   uint64_t global_start,
                                   mm_file_io_cptr file)
--- a/src/common/mm_multi_file_io.h
+++ b/src/common/mm_multi_file_io.h
@ -16,14 +16,8 @@

 #include "common/common_pch.h"

-#include <boost/filesystem.hpp>
-#include <string>
-#include <vector>
-
 #include "common/mm_io.h"

-namespace bfs = boost::filesystem;
-
 class mm_multi_file_io_c;
 typedef counted_ptr<mm_multi_file_io_c> mm_multi_file_io_cptr;

--- a/src/common/output.h
+++ b/src/common/output.h
@ -16,9 +16,6 @@

 #include "common/os.h"

-#include <boost/format.hpp>
-#include <string>
-
 #include <ebml/EbmlElement.h>

 #include "common/locale.h"
--- a/src/common/samples_timecode_conv.h
+++ b/src/common/samples_timecode_conv.h
@ -16,8 +16,6 @@

 #include "common/os.h"

-#include <boost/math/common_factor.hpp>
-
 class samples_to_timecode_converter_c {
 protected:
  int64_t m_numerator, m_denominator;
--- a/src/common/strings/editing.cpp
+++ b/src/common/strings/editing.cpp
@ -13,8 +13,6 @@

 #include "common/common_pch.h"

-#include <boost/algorithm/string.hpp>
-
 #include "common/memory.h"
 #include "common/strings/editing.h"

--- a/src/common/strings/editing.h
+++ b/src/common/strings/editing.h
@ -14,16 +14,10 @@
 #ifndef __MTX_COMMON_STRINGS_H
 #define __MTX_COMMON_STRINGS_H

-#include "common/os.h"
-
-#include <boost/algorithm/string.hpp>
-#include <string>
-#include <vector>
+#include "common/common_pch.h"

 #include <stdarg.h>

-namespace ba = boost::algorithm;
-
 std::vector<std::string> split(const char *src, const char *pattern = ",", int max_num = -1);
 inline std::vector<std::string>
 split(const std::string &src,
--- a/src/common/translation.cpp
+++ b/src/common/translation.cpp
@ -13,7 +13,6 @@

 #include "common/common_pch.h"

-#include <algorithm>
 #if HAVE_NL_LANGINFO
 # include <langinfo.h>
 #elif HAVE_LOCALE_CHARSET
@ -31,8 +30,6 @@
 #if defined(SYS_WINDOWS)
 # include <windows.h>

-# include <boost/filesystem/path.hpp>
-
 # include "common/fs_sys_helpers.h"
 # include "common/memory.h"
 #endif
--- a/src/common/unique_numbers.cpp
+++ b/src/common/unique_numbers.cpp
@ -13,10 +13,6 @@

 #include "common/common_pch.h"

-#include <cassert>
-#include <boost/range/algorithm.hpp>
-#include <boost/range/algorithm_ext/erase.hpp>
-
 #include "common/hacks.h"
 #include "common/random.h"
 #include "common/unique_numbers.h"
--- a/src/common/vc1.cpp
+++ b/src/common/vc1.cpp
@ -14,9 +14,6 @@

 #include "common/common_pch.h"

-#include <boost/range/numeric.hpp>
-#include <string.h>
-
 #include "common/bit_cursor.h"
 #include "common/endian.h"
 #include "common/strings/formatting.h"
--- a/src/common/version.cpp
+++ b/src/common/version.cpp
@ -13,8 +13,6 @@

 #include "common/common_pch.h"

-#include <boost/regex.hpp>
-
 #if defined(HAVE_CURL_EASY_H)
 # include <boost/property_tree/ptree.hpp>
 # include <boost/property_tree/xml_parser.hpp>
--- a/src/common/webm.cpp
+++ b/src/common/webm.cpp
@ -15,9 +15,6 @@

 #include "common/webm.h"

-#include <boost/regex.hpp>
-#include <string>
-
 bool
 is_webm_file_name(const std::string &file_name) {
  static boost::regex s_webm_file_name_re("\\.webm(?:a|v)?$", boost::regex::perl);
--- a/src/common/wx.h
+++ b/src/common/wx.h
@ -13,10 +13,7 @@
 #ifndef __MTX_COMMON_WXCOMMON_H
 #define __MTX_COMMON_WXCOMMON_H

-#include "common/os.h"
-
-#include <boost/format.hpp>
-#include <string>
+#include "common/common_pch.h"

 #include <ebml/EbmlString.h>

--- a/src/extract/extract_cli_parser.cpp
+++ b/src/extract/extract_cli_parser.cpp
@ -13,11 +13,6 @@

 #include "common/common_pch.h"

-#include <algorithm>
-#include <boost/bind.hpp>
-#include <stdexcept>
-#include <typeinfo>
-
 #include "common/ebml.h"
 #include "common/strings/formatting.h"
 #include "common/strings/parsing.h"
--- a/src/extract/xtr_ivf.cpp
+++ b/src/extract/xtr_ivf.cpp
@ -12,8 +12,6 @@

 #include "common/common_pch.h"

-#include <boost/math/common_factor.hpp>
-
 #include "common/ebml.h"
 #include "common/endian.h"
 #include "common/math.h"
--- a/src/info/info_cli_parser.cpp
+++ b/src/info/info_cli_parser.cpp
@ -13,11 +13,6 @@

 #include "common/common_pch.h"

-#include <algorithm>
-#include <boost/bind.hpp>
-#include <stdexcept>
-#include <typeinfo>
-
 #include "common/ebml.h"
 #include "common/strings/formatting.h"
 #include "common/strings/parsing.h"
--- a/src/input/r_matroska.cpp
+++ b/src/input/r_matroska.cpp
@ -15,7 +15,6 @@
 #include "common/common_pch.h"

 #include <avilib.h>   // for BITMAPINFOHEADER
-#include <boost/math/common_factor.hpp>

 #include <ebml/EbmlContexts.h>
 #include <ebml/EbmlHead.h>
--- a/src/input/r_matroska.h
+++ b/src/input/r_matroska.h
@ -17,8 +17,6 @@

 #include "common/common_pch.h"

-#include <boost/logic/tribool.hpp>
-
 #include "common/compression.h"
 #include "common/error.h"
 #include "common/kax_file.h"
--- a/src/input/r_mpeg_ps.h
+++ b/src/input/r_mpeg_ps.h
@ -23,8 +23,6 @@
 #include "merge/packet_extensions.h"
 #include "merge/pr_generic.h"

-namespace bfs = boost::filesystem;
-
 struct mpeg_ps_id_t {
  int id;
  int sub_id;
--- a/src/input/r_mpeg_ts.cpp
+++ b/src/input/r_mpeg_ts.cpp
@ -38,8 +38,6 @@
 #include "output/p_truehd.h"
 #include "output/p_vc1.h"

-namespace bfs = boost::filesystem;
-
 #define TS_CONSECUTIVE_PACKETS 16
 #define TS_PROBE_SIZE          (2 * TS_CONSECUTIVE_PACKETS * 204)
 #define TS_PIDS_DETECT_SIZE    10 * 1024 * 1024
--- a/src/input/r_mpeg_ts.h
+++ b/src/input/r_mpeg_ts.h
@ -17,8 +17,6 @@

 #include "common/common_pch.h"

-#include <boost/filesystem.hpp>
-
 #include "common/aac.h"
 #include "common/byte_buffer.h"
 #include "common/endian.h"
@ -29,8 +27,6 @@
 #include "merge/pr_generic.h"
 #include "mpegparser/M2VParser.h"

-namespace bfs = boost::filesystem;
-
 enum mpeg_ts_input_type_e {
  INPUT_PROBE = 0,
  INPUT_READ  = 1,
--- a/src/input/r_qtmp4.cpp
+++ b/src/input/r_qtmp4.cpp
@ -17,9 +17,6 @@

 #include "common/common_pch.h"

-#include <algorithm>
-#include <boost/math/common_factor.hpp>
-#include <boost/range/algorithm.hpp>
 #include <cstring>
 #include <zlib.h>

--- a/src/merge/cluster_helper.cpp
+++ b/src/merge/cluster_helper.cpp
@ -14,10 +14,6 @@

 #include "common/common_pch.h"

-#include <boost/range/numeric.hpp>
-
-#include <algorithm>
-#include <cassert>
 #include <limits.h>

 #include "common/ebml.h"
--- a/src/merge/output_control.cpp
+++ b/src/merge/output_control.cpp
@ -22,7 +22,6 @@
 #endif
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <time.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@ -31,13 +30,9 @@
 #include <windows.h>
 #endif

-#include <algorithm>
 #include <iostream>
 #include <typeinfo>

-#include <boost/range/algorithm.hpp>
-#include <boost/range/numeric.hpp>
-
 #include <ebml/EbmlHead.h>
 #include <ebml/EbmlSubHead.h>
 #include <ebml/EbmlVersion.h>
@ -117,7 +112,6 @@
 #include "merge/webm.h"

 using namespace libmatroska;
-namespace bfs = boost::filesystem;

 namespace libmatroska {

--- a/src/merge/pr_generic.h
+++ b/src/merge/pr_generic.h
@ -17,7 +17,6 @@

 #include "common/common_pch.h"

-#include <boost/logic/tribool.hpp>
 #include <deque>

 #include <matroska/KaxAttachments.h>
--- a/src/output/p_avc.cpp
+++ b/src/output/p_avc.cpp
@ -13,8 +13,6 @@

 #include "common/common_pch.h"

-#include <cassert>
-
 #include "common/hacks.h"
 #include "common/math.h"
 #include "common/matroska.h"
--- a/src/output/p_truehd.cpp
+++ b/src/output/p_truehd.cpp
@ -13,9 +13,6 @@

 #include "common/common_pch.h"

-#include <boost/math/common_factor.hpp>
-#include <vector>
-
 #include "common/hacks.h"
 #include "common/matroska.h"
 #include "common/truehd.h"
--- a/src/propedit/options.cpp
+++ b/src/propedit/options.cpp
@ -8,11 +8,7 @@
   Written by Moritz Bunkus <moritz@bunkus.org>.
 */

-#include "common/os.h"
-
-#include <cassert>
-#include <boost/range/algorithm.hpp>
-#include <boost/range/algorithm_ext/erase.hpp>
+#include "common/common_pch.h"

 #include <matroska/KaxChapters.h>
 #include <matroska/KaxTag.h>
--- a/src/propedit/propedit_cli_parser.cpp
+++ b/src/propedit/propedit_cli_parser.cpp
@ -11,17 +11,8 @@
   \author Written by Moritz Bunkus <moritz@bunkus.org>.
 */

-#include "common/os.h"
-
-#include <algorithm>
-#include <boost/bind.hpp>
-#include <boost/range/numeric.hpp>
-#include <stdexcept>
-#include <string>
-#include <typeinfo>
-#include <vector>
-
 #include "common/common_pch.h"
+
 #include "common/ebml.h"
 #include "common/strings/formatting.h"
 #include "common/translation.h"
--- a/src/propedit/target.cpp
+++ b/src/propedit/target.cpp
@ -10,10 +10,6 @@

 #include "common/common_pch.h"

-#include <boost/regex.hpp>
-#include <cassert>
-#include <stdexcept>
-
 #include <matroska/KaxChapters.h>
 #include <matroska/KaxInfo.h>
 #include <matroska/KaxInfoData.h>