* More work on ip filter framework. Note some critical parts are not at this moment available to the public.

git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@1194 e378c898-3ddf-0310-93e7-cc216c733640

src/core/download_factory.cc

@@ -41,11 +41,11 @@
 #include <sstream>
 #include <stdexcept>
 #include <rak/path.h>
+#include <torrent/utils/resume.h>
 #include <torrent/object.h>
 #include <torrent/object_stream.h>
 #include <torrent/exceptions.h>
 #include <torrent/rate.h>
-#include <torrent/resume.h>
 #include <torrent/data/file_utils.h>
 
 #include "rpc/parse_commands.h"

src/core/download_list.cc

@@ -43,12 +43,12 @@
 #include <rak/functional.h>
 #include <rak/string_manip.h>
 #include <torrent/data/file.h>
+#include <torrent/utils/resume.h>
 #include <torrent/exceptions.h>
 #include <torrent/download.h>
 #include <torrent/hash_string.h>
 #include <torrent/object.h>
 #include <torrent/object_stream.h>
-#include <torrent/resume.h>
 #include <torrent/torrent.h>
 
 #include "rpc/parse_commands.h"

src/core/download_store.cc

@@ -44,11 +44,11 @@
 #include <rak/error_number.h>
 #include <rak/path.h>
 #include <rak/string_manip.h>
+#include <torrent/utils/resume.h>
 #include <torrent/object.h>
 #include <torrent/exceptions.h>
 #include <torrent/torrent.h>
 #include <torrent/rate.h>
-#include <torrent/resume.h>
 #include <torrent/object_stream.h>
 
 #include "utils/directory.h"

src/core/manager.cc

@@ -49,12 +49,12 @@
 #include <rak/string_manip.h>
 #include <sigc++/adaptors/bind.h>
 #include <sigc++/adaptors/hide.h>
+#include <torrent/utils/resume.h>
 #include <torrent/object.h>
 #include <torrent/connection_manager.h>
 #include <torrent/error.h>
 #include <torrent/exceptions.h>
 #include <torrent/object_stream.h>
-#include <torrent/resume.h>
 #include <torrent/tracker_list.h>
 #include <torrent/throttle.h>