Changeset 811

Show
Ignore:
Timestamp:
11/23/06 08:54:49 (5 years ago)
Author:
rakshasa
Message:

* Moved torrent/file*.{cc,h} to torrent/data/.

Location:
trunk
Files:
14 modified
4 moved

Legend:

Unmodified
Added
Removed

  • trunk/libtorrent/src/data/content.cc

    r810 r811  
    4242 
    4343#include "torrent/exceptions.h" 
    44 #include "torrent/file.h" 
     44#include "torrent/data/file.h" 
     45#include "torrent/data/file_list.h" 
     46#include "torrent/data/piece.h" 
     47 
    4548#include "content.h" 
    46 #include "data/file_meta.h" 
    47 #include "data/chunk.h" 
    48  
    49 #include "torrent/file_list.h" 
    50 #include "torrent/data/piece.h" 
     49#include "file_meta.h" 
     50#include "chunk.h" 
    5151 
    5252namespace torrent { 
    … …  
    6363 
    6464Content::~Content() { 
    65   if (!m_fileList->empty()) 
    66     throw internal_error("Content::~Content() !m_fileList->empty()."); 
    67  
     65  m_fileList->clear(); 
    6866  delete m_fileList; 
    6967} 

  • trunk/libtorrent/src/download/download_constructor.cc

    r810 r811  
    4545#include "download/download_wrapper.h" 
    4646#include "torrent/exceptions.h" 
    47 #include "torrent/file_list.h" 
     47#include "torrent/object.h" 
     48#include "torrent/data/file_list.h" 
    4849#include "tracker/tracker_manager.h" 
    4950 
    50 #include "torrent/object.h" 
    5151#include "download_constructor.h" 
    5252 

  • trunk/libtorrent/src/download/download_main.cc

    r810 r811  
    4545#include "tracker/tracker_manager.h" 
    4646#include "torrent/exceptions.h" 
    47 #include "torrent/file_list.h" 
     47#include "torrent/data/file_list.h" 
    4848#include "torrent/peer/peer_info.h" 
    4949 

  • trunk/libtorrent/src/download/download_wrapper.cc

    r810 r811  
    5151#include "protocol/peer_connection_base.h" 
    5252#include "torrent/exceptions.h" 
    53 #include "torrent/file.h" 
    54 #include "torrent/file_list.h" 
    5553#include "torrent/object.h" 
     54#include "torrent/data/file.h" 
     55#include "torrent/data/file_list.h" 
    5656#include "tracker/tracker_manager.h" 
    5757 

  • trunk/libtorrent/src/torrent/Makefile.am

    r803 r811  
    2020        exceptions.cc \ 
    2121        exceptions.h \ 
    22         file.cc \ 
    23         file.h \ 
    24         file_list.cc \ 
    25         file_list.h \ 
    2622        hash_string.h \ 
    2723        http.cc \ 
    … …  
    6359        exceptions.h \ 
    6460        event.h \ 
    65         file.h \ 
    66         file_list.h \ 
    6761        hash_string.h \ 
    6862        http.h \ 

  • trunk/libtorrent/src/torrent/data/Makefile.am

    r803 r811  
    88        block_list.h \ 
    99        block_transfer.h \ 
     10        file.cc \ 
     11        file.h \ 
     12        file_list.cc \ 
     13        file_list.h \ 
    1014        piece.h \ 
    1115        transfer_list.cc \ 
    … …  
    1923        block_list.h \ 
    2024        block_transfer.h \ 
     25        file.h \ 
     26        file_list.h \ 
    2127        piece.h \ 
    2228        transfer_list.h 

  • trunk/libtorrent/src/torrent/data/file_list.cc

    r810 r811  
    5252 
    5353#include "torrent/exceptions.h" 
    54 #include "torrent/file.h" 
    5554#include "torrent/path.h" 
    5655 
     56#include "file.h" 
    5757#include "file_list.h" 
    5858#include "manager.h" 

  • trunk/libtorrent/src/torrent/resume.cc

    r810 r811  
    4545#include "peer/peer_list.h" 
    4646 
     47#include "data/file.h" 
     48#include "data/file_list.h" 
     49 
    4750#include "common.h" 
    4851#include "bitfield.h" 
    4952#include "download.h" 
    50 #include "file.h" 
    51 #include "file_list.h" 
    5253#include "object.h" 
    5354#include "tracker.h" 

  • trunk/rtorrent/src/core/download.cc

    r810 r811  
    4343#include <rak/path.h> 
    4444#include <torrent/exceptions.h> 
    45 #include <torrent/file_list.h> 
    4645#include <torrent/rate.h> 
    4746#include <torrent/torrent.h> 
    4847#include <torrent/tracker.h> 
    4948#include <torrent/tracker_list.h> 
     49#include <torrent/data/file_list.h> 
    5050 
    5151#include "utils/variable_generic.h" 

  • trunk/rtorrent/src/display/utils.cc

    r810 r811  
    4444#include <torrent/exceptions.h> 
    4545#include <torrent/connection_manager.h> 
    46 #include <torrent/file_list.h> 
    4746#include <torrent/rate.h> 
    4847#include <torrent/tracker.h> 
    4948#include <torrent/tracker_list.h> 
     49#include <torrent/data/file_list.h> 
    5050#include <torrent/peer/client_info.h> 
    5151 

  • trunk/rtorrent/src/display/window_file_list.cc

    r810 r811  
    3939#include <stdexcept> 
    4040#include <rak/algorithm.h> 
    41 #include <torrent/file.h> 
    42 #include <torrent/file_list.h> 
    4341#include <torrent/path.h> 
     42#include <torrent/data/file.h> 
     43#include <torrent/data/file_list.h> 
    4444 
    4545#include "core/download.h" 

  • trunk/rtorrent/src/option_handler_rules.cc

    r810 r811  
    5050#include <torrent/connection_manager.h> 
    5151#include <torrent/exceptions.h> 
    52 #include <torrent/file.h> 
    53 #include <torrent/file_list.h> 
    5452#include <torrent/path.h> 
    5553#include <torrent/rate.h> 
    … …  
    5755#include <torrent/tracker.h> 
    5856#include <torrent/tracker_list.h> 
     57#include <torrent/data/file.h> 
     58#include <torrent/data/file_list.h> 
    5959 
    6060#include "core/download.h" 

  • trunk/rtorrent/src/ui/download.cc

    r810 r811  
    4343#include <torrent/chunk_manager.h> 
    4444#include <torrent/connection_manager.h> 
    45 #include <torrent/file_list.h> 
    4645#include <torrent/torrent.h> 
    4746#include <torrent/tracker_list.h> 
     47#include <torrent/data/file_list.h> 
    4848 
    4949#include "core/download.h" 

  • trunk/rtorrent/src/ui/element_file_list.cc

    r810 r811  
    3838 
    3939#include <torrent/exceptions.h> 
    40 #include <torrent/file_list.h> 
     40#include <torrent/data/file.h> 
     41#include <torrent/data/file_list.h> 
    4142 
    4243#include "display/frame.h" 

  • trunk/rtorrent/src/ui/element_file_list.h

    r751 r811  
    3838#define RTORRENT_UI_ELEMENT_FILE_LIST_H 
    3939 
    40 #include <torrent/file.h> 
     40#include <torrent/common.h> 
    4141 
    4242#include "core/download.h"