Include prefs.h instead of typedef PrefPtr everywhere

pull/135/merge
Tatsuhiro Tsujikawa 2013-09-23 15:48:22 +09:00
parent 8536f13cff
commit d7d5e8570b
9 changed files with 7 additions and 16 deletions

View File

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

View File

@ -41,10 +41,9 @@
#include <vector> #include <vector>
#include <memory> #include <memory>
namespace aria2 { #include "prefs.h"
struct Pref; namespace aria2 {
typedef const Pref* PrefPtr;
class Option { class Option {
private: private:

View File

@ -43,6 +43,7 @@
#include <functional> #include <functional>
#include "console.h" #include "console.h"
#include "prefs.h"
namespace aria2 { namespace aria2 {
@ -56,8 +57,6 @@ extern const std::string PATH_TO_DIR;
extern const std::string PATH_TO_COMMAND; extern const std::string PATH_TO_COMMAND;
class Option; class Option;
struct Pref;
typedef const Pref* PrefPtr;
class OptionHandler { class OptionHandler {
public: public:

View File

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

View File

@ -35,12 +35,10 @@
#ifndef D_OPTION_HANDLER_EXCEPTION_H #ifndef D_OPTION_HANDLER_EXCEPTION_H
#define D_OPTION_HANDLER_EXCEPTION_H #define D_OPTION_HANDLER_EXCEPTION_H
#include "RecoverableException.h" #include "RecoverableException.h"
#include "prefs.h"
namespace aria2 { namespace aria2 {
struct Pref;
typedef const Pref* PrefPtr;
class OptionHandlerException:public RecoverableException { class OptionHandlerException:public RecoverableException {
private: private:
PrefPtr pref_; PrefPtr pref_;

View File

@ -51,7 +51,6 @@
#include "OptionHandlerFactory.h" #include "OptionHandlerFactory.h"
#include "DlAbortEx.h" #include "DlAbortEx.h"
#include "error_code.h" #include "error_code.h"
#include "prefs.h"
#include "UnknownOptionException.h" #include "UnknownOptionException.h"
#include "LogFactory.h" #include "LogFactory.h"
#include "fmt.h" #include "fmt.h"

View File

@ -44,12 +44,12 @@
#include <aria2/aria2.h> #include <aria2/aria2.h>
#include "prefs.h"
namespace aria2 { namespace aria2 {
class Option; class Option;
class OptionHandler; class OptionHandler;
struct Pref;
typedef const Pref* PrefPtr;
class OptionParser { class OptionParser {
private: private:

View File

@ -83,7 +83,6 @@
#include "DownloadContext.h" #include "DownloadContext.h"
#include "BufferedFile.h" #include "BufferedFile.h"
#include "SocketCore.h" #include "SocketCore.h"
#include "prefs.h"
#include "Lock.h" #include "Lock.h"
#ifdef ENABLE_MESSAGE_DIGEST #ifdef ENABLE_MESSAGE_DIGEST

View File

@ -62,6 +62,7 @@
#include "message.h" #include "message.h"
#include "DlAbortEx.h" #include "DlAbortEx.h"
#include "fmt.h" #include "fmt.h"
#include "prefs.h"
#ifndef HAVE_SIGACTION #ifndef HAVE_SIGACTION
# define sigset_t int # define sigset_t int
@ -75,8 +76,6 @@ class BinaryStream;
class FileEntry; class FileEntry;
class RequestGroup; class RequestGroup;
class Option; class Option;
struct Pref;
typedef const Pref* PrefPtr;
#define STRTOLL(X) strtoll(X, reinterpret_cast<char**>(0), 10) #define STRTOLL(X) strtoll(X, reinterpret_cast<char**>(0), 10)
#define STRTOULL(X) strtoull(X, reinterpret_cast<char**>(0), 10) #define STRTOULL(X) strtoull(X, reinterpret_cast<char**>(0), 10)