diff options
| -rw-r--r-- | src/Option.cc | 1 | ||||
| -rw-r--r-- | src/Option.h | 5 | ||||
| -rw-r--r-- | src/OptionHandler.h | 3 | ||||
| -rw-r--r-- | src/OptionHandlerException.cc | 1 | ||||
| -rw-r--r-- | src/OptionHandlerException.h | 4 | ||||
| -rw-r--r-- | src/OptionParser.cc | 1 | ||||
| -rw-r--r-- | src/OptionParser.h | 4 | ||||
| -rw-r--r-- | src/util.cc | 1 | ||||
| -rw-r--r-- | src/util.h | 3 |
9 files changed, 7 insertions, 16 deletions
diff --git a/src/Option.cc b/src/Option.cc index 38307067..633e9281 100644 --- a/src/Option.cc +++ b/src/Option.cc @@ -37,7 +37,6 @@ #include <cstdlib> #include <cstring> -#include "prefs.h" #include "bitfield.h" namespace aria2 { diff --git a/src/Option.h b/src/Option.h index 83a4ce1e..7cbf7648 100644 --- a/src/Option.h +++ b/src/Option.h @@ -41,10 +41,9 @@ #include <vector> #include <memory> -namespace aria2 { +#include "prefs.h" -struct Pref; -typedef const Pref* PrefPtr; +namespace aria2 { class Option { private: diff --git a/src/OptionHandler.h b/src/OptionHandler.h index 96d44e5e..db47fa55 100644 --- a/src/OptionHandler.h +++ b/src/OptionHandler.h @@ -43,6 +43,7 @@ #include <functional> #include "console.h" +#include "prefs.h" namespace aria2 { @@ -56,8 +57,6 @@ extern const std::string PATH_TO_DIR; extern const std::string PATH_TO_COMMAND; class Option; -struct Pref; -typedef const Pref* PrefPtr; class OptionHandler { public: diff --git a/src/OptionHandlerException.cc b/src/OptionHandlerException.cc index 7cf2a1c5..0f924ed8 100644 --- a/src/OptionHandlerException.cc +++ b/src/OptionHandlerException.cc @@ -34,7 +34,6 @@ /* copyright --> */ #include "OptionHandlerException.h" #include "fmt.h" -#include "prefs.h" namespace aria2 { diff --git a/src/OptionHandlerException.h b/src/OptionHandlerException.h index 61ce642f..3913c6f7 100644 --- a/src/OptionHandlerException.h +++ b/src/OptionHandlerException.h @@ -35,12 +35,10 @@ #ifndef D_OPTION_HANDLER_EXCEPTION_H #define D_OPTION_HANDLER_EXCEPTION_H #include "RecoverableException.h" +#include "prefs.h" namespace aria2 { -struct Pref; -typedef const Pref* PrefPtr; - class OptionHandlerException:public RecoverableException { private: PrefPtr pref_; diff --git a/src/OptionParser.cc b/src/OptionParser.cc index 6a56d13d..78dcf45a 100644 --- a/src/OptionParser.cc +++ b/src/OptionParser.cc @@ -51,7 +51,6 @@ #include "OptionHandlerFactory.h" #include "DlAbortEx.h" #include "error_code.h" -#include "prefs.h" #include "UnknownOptionException.h" #include "LogFactory.h" #include "fmt.h" diff --git a/src/OptionParser.h b/src/OptionParser.h index 38ca8e2b..f72d9a30 100644 --- a/src/OptionParser.h +++ b/src/OptionParser.h @@ -44,12 +44,12 @@ #include <aria2/aria2.h> +#include "prefs.h" + namespace aria2 { class Option; class OptionHandler; -struct Pref; -typedef const Pref* PrefPtr; class OptionParser { private: diff --git a/src/util.cc b/src/util.cc index 06d41a41..4788d631 100644 --- a/src/util.cc +++ b/src/util.cc @@ -83,7 +83,6 @@ #include "DownloadContext.h" #include "BufferedFile.h" #include "SocketCore.h" -#include "prefs.h" #include "Lock.h" #ifdef ENABLE_MESSAGE_DIGEST @@ -62,6 +62,7 @@ #include "message.h" #include "DlAbortEx.h" #include "fmt.h" +#include "prefs.h" #ifndef HAVE_SIGACTION # define sigset_t int @@ -75,8 +76,6 @@ class BinaryStream; class FileEntry; class RequestGroup; class Option; -struct Pref; -typedef const Pref* PrefPtr; #define STRTOLL(X) strtoll(X, reinterpret_cast<char**>(0), 10) #define STRTOULL(X) strtoull(X, reinterpret_cast<char**>(0), 10) |