Include prefs.h instead of typedef PrefPtr everywhere

src/Option.cc

@@ -37,7 +37,6 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "prefs.h"
 #include "bitfield.h"
 
 namespace aria2 {

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:

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:

src/OptionHandlerException.cc

@@ -34,7 +34,6 @@
 /* copyright --> */
 #include "OptionHandlerException.h"
 #include "fmt.h"
-#include "prefs.h"
 
 namespace aria2 {
 

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_;

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"

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:

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

src/util.h

@@ -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)