Changeset 437

Timestamp:

05/12/08 20:17:16 (12 years ago)

Author:

Eoin

Message:

Editing torrent folders added.

Location:

trunk

Files:

• res/Halite.rc (modified) (1 diff)
• src/AddTorrentDialog.hpp (modified) (2 diffs)
• src/ConfigOptions.cpp (modified) (1 diff)
• src/HaliteListView.cpp (modified) (3 diffs)
• src/HaliteListView.hpp (modified) (3 diffs)
• src/HaliteListViewDlg.hpp (modified) (1 diff)
• src/HaliteWindow.cpp (modified) (1 diff)
• src/advtabs/Torrent.cpp (modified) (1 diff)
• src/global/string_conv.hpp (modified) (11 diffs)
• src/halTorrent.cpp (modified) (65 diffs)
• src/halTorrent.hpp (modified) (3 diffs)
• src/halTorrentInternal.hpp (modified) (64 diffs)
• src/halTypes.hpp (modified) (1 diff)

trunk/res/Halite.rc

@@ -538 +538 @@
         MENUITEM SEPARATOR
         MENUITEM "Open Download Folder",ID_LVM_DOWNLOAD_FOLDER
+        MENUITEM "Edit Download Folders",ID_LVM_EDIT_FOLDERS
     END
 END

trunk/src/AddTorrentDialog.hpp

@@ -8 +8 @@
 
 #define ID_ADD_TORRENT_BEGIN            11000
-#define IDC_ADDT_DEFFLD_TEXT            ID_ADD_TORRENT_BEGIN + 6
-#define IDC_ADDT_NOTE_TEXT                      ID_ADD_TORRENT_BEGIN + 8
-#define HAL_ADJUST_DLG_HOLDER           ID_ADD_TORRENT_BEGIN + 9
+#define HAL_ADJUST_DLG_HOLDER           ID_ADD_TORRENT_BEGIN + 1
 
 #ifndef RC_INVOKED
@@ -39 +37 @@
         { Load(); }
 
-        ~AddTorrentDialog() { Save(); } 
+        ~AddTorrentDialog() 
+        { Save(); }     
 
         enum { IDD = IDD_ADD_TORRENT };

trunk/src/ConfigOptions.cpp

@@ -1 +1 @@
 
-//         Copyright Eóin O'Callaghan 2006 - 2007.
+//         Copyright Eóin O'Callaghan 2006 - 2008.
 // Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at

trunk/src/HaliteListView.cpp

@@ -10 +10 @@
 #include "HaliteListView.hpp"
 #include "HaliteWindow.hpp"
+#include "HaliteListViewDlg.hpp"
+
 #include "halTorrent.hpp"
 
@@ -27 +29 @@
         array<int, 21> widths = {100,110,60,60,60,42,45,61,45,45,45,45,45,45,45,45,45,45,45,45,45};
         array<int, 21> order = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20};
-        array<bool, 21> visible = {true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true};
+        array<bool, 21> visible = {true,true,true,true,true,true,true,true,true,true,true,\
+                true,true,true,true,true,true,true,true,true,true};
         
         SetDefaults(names, widths, order, visible);
@@ -214 +217 @@
 }
 
+LRESULT HaliteListViewCtrl::OnEditFolders(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
+{
+        HAL_DEV_MSG(L"OnEditFolders");
+
+        hal::BitTorrent::torrent t = hal::bittorrent().get(manager_.selected());
+
+        wstring saveDirectory = static_cast<wpath>(t.save_directory).native_file_string();
+        wstring moveToDirectory = static_cast<wpath>(t.move_to_directory).native_file_string();
+        bool useMoveTo = (L"" != moveToDirectory);
+
+        HaliteListViewAdjustDlg addTorrent(L"Hello", saveDirectory, moveToDirectory, useMoveTo);        
+        
+        if (IDOK == addTorrent.DoModal())
+        {
+                t.save_directory = saveDirectory;
+
+                if (useMoveTo)
+                        t.move_to_directory = moveToDirectory;
+                else
+                        t.move_to_directory = L"";
+        }
+
+        return 0;
+}
+
 //LRESULT HaliteListViewCtrl::OnDeleteItem(int /*idCtrl*/, LPNMHDR pnmh, BOOL& /*bHandled*/)
 //{

trunk/src/HaliteListView.hpp

@@ -10 +10 @@
 #define ID_LVM_DOWNLOAD_FOLDER          HAL_MAIN_LISTVIEW_BEGIN + 1
 #define ID_LVM_RECHECK                                  HAL_MAIN_LISTVIEW_BEGIN + 2
+#define ID_LVM_EDIT_FOLDERS                             HAL_MAIN_LISTVIEW_BEGIN + 3
 
 #ifndef RC_INVOKED
@@ -346 +347 @@
                 COMMAND_ID_HANDLER(ID_LVM_REMOVE_TD, OnRemoveWipeFiles)
                 COMMAND_ID_HANDLER(ID_LVM_DOWNLOAD_FOLDER, OnDownloadFolder)
+                COMMAND_ID_HANDLER(ID_LVM_EDIT_FOLDERS, OnEditFolders)
 
                 CHAIN_MSG_MAP(listClass)
@@ -364 +366 @@
         LRESULT OnRemoveWipeFiles(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
         LRESULT OnDownloadFolder(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
+        LRESULT OnEditFolders(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
 
     friend class boost::serialization::access;

trunk/src/HaliteListViewDlg.hpp

@@ -14 +14 @@
 #define IDC_ADDT_MOVETO_BROWSE                  HAL_ADJUST_DLG_BEGIN + 2
 #define IDC_ADDT_MOVETO_CHECK                   HAL_ADJUST_DLG_BEGIN + 3
+#define IDC_ADDT_DEFFLD_TEXT                    HAL_ADJUST_DLG_BEGIN + 4
+#define IDC_ADDT_NOTE_TEXT                              HAL_ADJUST_DLG_BEGIN + 5
 
 #ifndef RC_INVOKED

trunk/src/HaliteWindow.cpp

@@ -357 +357 @@
         if (!boost::filesystem::exists(saveDirectory))
                 boost::filesystem::create_directory(saveDirectory);
-        
-/*      HaliteListViewAdjustDlg addTorrent(L"Hello", saveDirectory, moveToDirectory, useMoveTo);        
-        
-        if (IDOK != addTorrent.DoModal())
-                return;
-        return;
-*/
+
         if (hal::config().savePrompt)
         {

trunk/src/advtabs/Torrent.cpp

@@ -110 +110 @@
                 hal::bittorrent().setTorrentLimit(torrentName, totalConnections_, uploadConnections_);
                 hal::bittorrent().setTorrentRatio(torrentName, ratio_);
+
+//              hal::BitTorrent::torrent t = hal::bittorrent().get(torrent->name());
+
+//              t.ratio = ratio_;
         }
         

trunk/src/global/string_conv.hpp

@@ -111 +111 @@
 };
 
-
-
 template<typename str_t>
-inline std::wstring to_wstr_shim(str_t& s)
+inline const std::wstring to_wstr_shim(str_t& s)
 {
         return s;
@@ -120 +118 @@
 
 template<>
-inline std::wstring to_wstr_shim<const wchar_t *const>(const wchar_t *const& s)
+inline const std::wstring to_wstr_shim<const wchar_t *const>(const wchar_t *const& s)
 {
         return std::wstring(s);
@@ -126 +124 @@
 
 template<>
-inline std::wstring to_wstr_shim<const wchar_t *>(const wchar_t *& s)
+inline const std::wstring to_wstr_shim<const wchar_t *>(const wchar_t *& s)
 {
         return std::wstring(s);
@@ -132 +130 @@
 
 template<>
-inline std::wstring to_wstr_shim<const char *>(const char *& s)
+inline const std::wstring to_wstr_shim<const char *>(const char *& s)
 {
         return from_utf8_safe(s);
@@ -138 +136 @@
 
 template<>
-inline std::wstring to_wstr_shim<const char *const>(const char *const& s)
+inline const std::wstring to_wstr_shim<const char *const>(const char *const& s)
 {
         return from_utf8_safe(s);
@@ -144 +142 @@
 
 template<>
-inline std::wstring to_wstr_shim<const std::string>(const std::string& s)
+inline const std::wstring to_wstr_shim<const std::string>(const std::string& s)
 {
         return from_utf8_safe(s);
@@ -150 +148 @@
 
 template<>
-inline std::wstring to_wstr_shim<std::string>(std::string& s)
+inline const std::wstring to_wstr_shim<std::string>(std::string& s)
 {
         return from_utf8_safe(s);
@@ -156 +154 @@
 
 template<>
-inline std::wstring to_wstr_shim<const boost::wformat>(const boost::wformat& f)
+inline const std::wstring to_wstr_shim<const boost::wformat>(const boost::wformat& f)
 {
         return f.str();
@@ -162 +160 @@
 
 template<>
-inline std::wstring to_wstr_shim<boost::wformat>(boost::wformat& f)
+inline const std::wstring to_wstr_shim<boost::wformat>(boost::wformat& f)
 {
         return f.str();
@@ -168 +166 @@
 
 template<>
-inline std::wstring to_wstr_shim<const boost::format>(const boost::format& f)
+inline const std::wstring to_wstr_shim<const boost::format>(const boost::format& f)
 {
         return from_utf8_safe(f.str());
@@ -174 +172 @@
 
 template<>
-inline std::wstring to_wstr_shim<boost::format>(boost::format& f)
+inline const std::wstring to_wstr_shim<boost::format>(boost::format& f)
 {
         return from_utf8_safe(f.str());

trunk/src/halTorrent.cpp

@@ -28 +28 @@
 
 #include "halTorrent.hpp"
+#include "halTypes.hpp"
 #include "halEvent.hpp"
 #include "halSignaler.hpp"
@@ -73 +74 @@
 }
 
+template<class Archive, class String, class Traits>
+void save(Archive& ar, const boost::filesystem::basic_path<String, Traits>& p, const unsigned int version)
+{       
+        String str = p.string();
+        ar & BOOST_SERIALIZATION_NVP(str);
+}
+
+template<class Archive, class String, class Traits>
+void load(Archive& ar, boost::filesystem::basic_path<String, Traits>& p, const unsigned int version)
+{       
+        String str;
+        ar & BOOST_SERIALIZATION_NVP(str);
+
+        p = str;
+}
+
+template<class Archive, class String, class Traits>
+inline void serialize(
+        Archive & ar,
+        boost::filesystem::basic_path<String, Traits>& p,
+        const unsigned int file_version
+){
+        split_free(ar, p, file_version);            
+}
+
 template<class Archive, class address_type>
 void serialize(Archive& ar, libtorrent::ip_range<address_type>& addr, const unsigned int version)
@@ -116 +142 @@
 namespace hal 
 {
-        libtorrent::session* TorrentInternal::the_session_ = 0;
-        wpath_t TorrentInternal::workingDir_;
+        libtorrent::session* torrent_internal::the_session_ = 0;
+        wpath torrent_internal::workingDir_;
 }
 
@@ -123 +149 @@
 {
 
-namespace lbt = libtorrent;
-namespace fs = boost::filesystem;
-namespace pt = boost::posix_time;
-
-typedef std::wstring wstring_t;
-typedef std::string string_t;
-
-typedef boost::wformat wformat_t;
-typedef boost::format format_t;
-
-typedef boost::filesystem::wpath wpath_t;
-typedef boost::filesystem::path path_t;
-
-using boost::serialization::make_nvp;
-using boost::shared_ptr;
-using boost::bind;
+
 
 BitTorrent& bittorrent()
@@ -324 +335 @@
                 {
                         event().post(shared_ptr<EventDetail>(
-                                new EventMsg((wformat_t(hal::app().res_wstr(LBT_EVENT_TORRENT_FINISHED)) 
+                                new EventMsg((wformat(hal::app().res_wstr(LBT_EVENT_TORRENT_FINISHED)) 
                                                 % get(a.handle)->name()), 
                                         Event::info, a.timestamp())));
@@ -334 +345 @@
                 {
                         event().post(shared_ptr<EventDetail>(
-                                new EventMsg((wformat_t(hal::app().res_wstr(LBT_EVENT_TORRENT_PAUSED)) 
+                                new EventMsg((wformat(hal::app().res_wstr(LBT_EVENT_TORRENT_PAUSED)) 
                                                 % get(a.handle)->name()), 
                                         Event::info, a.timestamp())));
@@ -345 +356 @@
                         event().post(shared_ptr<EventDetail>(
                                 new EventGeneral(lbtAlertToHalEvent(a.severity()), a.timestamp(),
-                                        wformat_t(hal::app().res_wstr(HAL_PEER_ALERT))
+                                        wformat(hal::app().res_wstr(HAL_PEER_ALERT))
                                                 % hal::from_utf8_safe(a.msg())
                                                 % hal::from_utf8_safe(a.ip.address().to_string()))
@@ -355 +366 @@
                         event().post(shared_ptr<EventDetail>(
                                 new EventGeneral(lbtAlertToHalEvent(a.severity()), a.timestamp(),
-                                        wformat_t(hal::app().res_wstr(HAL_PEER_BAN_ALERT))
+                                        wformat(hal::app().res_wstr(HAL_PEER_BAN_ALERT))
                                                 % get(a.handle)->name()
                                                 % hal::from_utf8_safe(a.ip.address().to_string()))
@@ -365 +376 @@
                         event().post(shared_ptr<EventDetail>(
                                 new EventGeneral(lbtAlertToHalEvent(a.severity()), a.timestamp(),
-                                        wformat_t(hal::app().res_wstr(HAL_HASH_FAIL_ALERT))
+                                        wformat(hal::app().res_wstr(HAL_HASH_FAIL_ALERT))
                                                 % get(a.handle)->name()
                                                 % a.piece_index)
@@ -375 +386 @@
                         event().post(shared_ptr<EventDetail>(
                                 new EventGeneral(lbtAlertToHalEvent(a.severity()), a.timestamp(),
-                                        wformat_t(hal::app().res_wstr(HAL_URL_SEED_ALERT))
+                                        wformat(hal::app().res_wstr(HAL_URL_SEED_ALERT))
                                                 % get(a.handle)->name()
                                                 % hal::from_utf8_safe(a.url)
@@ -386 +397 @@
                         event().post(shared_ptr<EventDetail>(
                                 new EventGeneral(lbtAlertToHalEvent(a.severity()), a.timestamp(),
-                                        wformat_t(hal::app().res_wstr(HAL_TRACKER_WARNING_ALERT))
+                                        wformat(hal::app().res_wstr(HAL_TRACKER_WARNING_ALERT))
                                                 % get(a.handle)->name()
                                                 % hal::from_utf8_safe(a.msg()))
@@ -395 +406 @@
                 {
                         event().post(shared_ptr<EventDetail>(
-                                new EventMsg((wformat_t(hal::app().res_wstr(HAL_TRACKER_ANNOUNCE_ALERT)) 
+                                new EventMsg((wformat(hal::app().res_wstr(HAL_TRACKER_ANNOUNCE_ALERT)) 
                                                 % get(a.handle)->name()), 
                                         Event::info, a.timestamp())));
@@ -404 +415 @@
                         event().post(shared_ptr<EventDetail>(
                                 new EventGeneral(lbtAlertToHalEvent(a.severity()), a.timestamp(),
-                                        wformat_t(hal::app().res_wstr(HAL_TRACKER_ALERT))
+                                        wformat(hal::app().res_wstr(HAL_TRACKER_ALERT))
                                                 % get(a.handle)->name()
                                                 % hal::from_utf8_safe(a.msg())
@@ -416 +427 @@
                         event().post(shared_ptr<EventDetail>(
                                 new EventGeneral(lbtAlertToHalEvent(a.severity()), a.timestamp(),
-                                        wformat_t(hal::app().res_wstr(HAL_TRACKER_REPLY_ALERT))
+                                        wformat(hal::app().res_wstr(HAL_TRACKER_REPLY_ALERT))
                                                 % get(a.handle)->name()
                                                 % hal::from_utf8_safe(a.msg())
@@ -427 +438 @@
                         event().post(shared_ptr<EventDetail>(
                                 new EventGeneral(lbtAlertToHalEvent(a.severity()), a.timestamp(),
-                                        wformat_t(hal::app().res_wstr(HAL_FAST_RESUME_ALERT))
+                                        wformat(hal::app().res_wstr(HAL_FAST_RESUME_ALERT))
                                                 % get(a.handle)->name()
                                                 % hal::from_utf8_safe(a.msg()))
@@ -437 +448 @@
                         event().post(shared_ptr<EventDetail>(
                                 new EventGeneral(Event::debug, a.timestamp(),
-                                        wformat_t(hal::app().res_wstr(HAL_PIECE_FINISHED_ALERT))
+                                        wformat(hal::app().res_wstr(HAL_PIECE_FINISHED_ALERT))
                                                 % get(a.handle)->name()
                                                 % a.piece_index)
@@ -447 +458 @@
                         event().post(shared_ptr<EventDetail>(
                                 new EventGeneral(Event::debug, a.timestamp(),
-                                        wformat_t(hal::app().res_wstr(HAL_BLOCK_FINISHED_ALERT))
+                                        wformat(hal::app().res_wstr(HAL_BLOCK_FINISHED_ALERT))
                                                 % get(a.handle)->name()
                                                 % a.block_index
@@ -458 +469 @@
                         event().post(shared_ptr<EventDetail>(
                                 new EventGeneral(Event::debug, a.timestamp(),
-                                        wformat_t(hal::app().res_wstr(HAL_BLOCK_DOWNLOADING_ALERT))
+                                        wformat(hal::app().res_wstr(HAL_BLOCK_DOWNLOADING_ALERT))
                                                 % get(a.handle)->name()
                                                 % a.block_index
@@ -478 +489 @@
                                 event().post(shared_ptr<EventDetail>(
                                         new EventGeneral(Event::info, a.timestamp(),
-                                                wformat_t(hal::app().res_wstr(HAL_LISTEN_FAILED_ALERT))
+                                                wformat(hal::app().res_wstr(HAL_LISTEN_FAILED_ALERT))
                                                         % hal::from_utf8_safe(a.msg()))
                                 )       );
@@ -488 +499 @@
                         event().post(shared_ptr<EventDetail>(
                                 new EventGeneral(Event::info, a.timestamp(),
-                                        wformat_t(hal::app().res_wstr(HAL_LISTEN_SUCCEEDED_ALERT))
+                                        wformat(hal::app().res_wstr(HAL_LISTEN_SUCCEEDED_ALERT))
                                                 % hal::from_utf8_safe(a.msg()))
                         )       );      
@@ -499 +510 @@
                         event().post(shared_ptr<EventDetail>(
                                 new EventGeneral(Event::debug, a.timestamp(),
-                                        wformat_t(hal::app().res_wstr(HAL_IPFILTER_ALERT))
+                                        wformat(hal::app().res_wstr(HAL_IPFILTER_ALERT))
                                                 % hal::from_utf8_safe(a.ip.to_string())
                                                 % hal::from_utf8_safe(a.msg()))
@@ -515 +526 @@
                         BitTorrent_impl& bit_impl_;
                         
-                        TorrentInternal_ptr get(lbt::torrent_handle h) const 
+                        torrent_internal_ptr get(lbt::torrent_handle h) const 
                         { 
                                 return bit_impl_.theTorrents.get(from_utf8_safe(h.get_torrent_info().name())); 
@@ -593 +604 @@
         float defTorrentUpload() { return defTorrentUpload_; }
         
-        const wpath_t workingDir() { return workingDirectory; };
+        const wpath workingDir() { return workingDirectory; };
 
 private:
@@ -612 +623 @@
                 dht_on_(false)
         {
-                TorrentInternal::the_session_ = &theSession;
-                TorrentInternal::workingDir_ = workingDir();
+                torrent_internal::the_session_ = &theSession;
+                torrent_internal::workingDir_ = workingDir();
                 
                 theSession.set_severity_level(lbt::alert::debug);               
@@ -640 +651 @@
                         TorrentMap torrents;
                         boost::archive::xml_wiarchive ia(ifs);  
-                        ia >> make_nvp("torrents", torrents);
+                        ia >> slz::make_nvp("torrents", torrents);
                         
                         theTorrents = torrents;
@@ -646 +657 @@
                         
                         event().post(shared_ptr<EventDetail>(new EventMsg(
-                                wformat_t(L"Total %1%.") % theTorrents.size())));                               
+                                wformat(L"Total %1%.") % theTorrents.size())));                         
                         
                         fs::rename(workingDirectory/L"Torrents.xml", workingDirectory/L"Torrents.xml.safe.to.delete");
@@ -671 +682 @@
                 
                 {       lbt::session_settings settings = theSession.settings();
-                        settings.user_agent = string_t("Halite ") + HALITE_VERSION_STRING;
+                        settings.user_agent = string("Halite ") + HALITE_VERSION_STRING;
                         theSession.set_settings(settings);
                 }
@@ -692 +703 @@
                                 i != e; ++i)
                 {
-                        HAL_DEV_MSG(wformat_t(L"file path: %1%, size: %2%") % (*i).first % (*i).second);
+                        HAL_DEV_MSG(wformat(L"file path: %1%, size: %2%") % (*i).first % (*i).second);
                         t_info->add_file(to_utf8((*i).first.string()), (*i).second);
                 }
@@ -706 +717 @@
                                 i != e; ++i)
                 {
-                        HAL_DEV_MSG(wformat_t(L"URL: %1%, Tier: %2%") % (*i).url % (*i).tier);
+                        HAL_DEV_MSG(wformat(L"URL: %1%, Tier: %2%") % (*i).url % (*i).tier);
                         t_info->add_tracker(to_utf8((*i).url), (*i).tier);
                 }
@@ -714 +725 @@
                                 i != e; ++i)
                 {
-                        HAL_DEV_MSG(wformat_t(L"URL: %1%") % (*i).url);
+                        HAL_DEV_MSG(wformat(L"URL: %1%") % (*i).url);
                         t_info->add_url_seed(to_utf8((*i).url));
                 }
@@ -722 +733 @@
                                 i != e; ++i)
                 {
-                        HAL_DEV_MSG(wformat_t(L"URL: %1%, port: %2%") % (*i).url % (*i).port);
+                        HAL_DEV_MSG(wformat(L"URL: %1%, port: %2%") % (*i).url % (*i).port);
                         t_info->add_node(hal::make_pair(to_utf8((*i).url), (*i).port));
                 }
@@ -748 +759 @@
                 lbt::entry e = t_info->create_torrent();
                 halencode(out_file, e);
-        }
-        catch(const std::exception& e)
-        {
-                event().post(shared_ptr<EventDetail>(
-                        new EventStdException(Event::fatal, e, L"create_torrent")));
-        }       
-        }
-        
-        std::pair<lbt::entry, lbt::entry> prepTorrent(wpath_t filename, wpath_t saveDirectory);
-        void removalThread(TorrentInternal_ptr pIT, bool wipeFiles);
+                }
+                catch(const std::exception& e)
+                {
+                        event().post(shared_ptr<EventDetail>(
+                                new EventStdException(Event::fatal, e, L"create_torrent")));
+                }       
+        }
+        
+        std::pair<lbt::entry, lbt::entry> prepTorrent(wpath filename, wpath saveDirectory);
+        void removalThread(torrent_internal_ptr pIT, bool wipeFiles);
         
         lbt::session theSession;
@@ -764 +775 @@
         bool keepChecking_;
         
-        static wpath_t workingDirectory;
+        static wpath workingDirectory;
         ini_file bittorrentIni;
         TorrentManager theTorrents;     
@@ -790 +801 @@
 };
 
-wpath_t BitTorrent_impl::workingDirectory = hal::app().working_directory();
+wpath BitTorrent_impl::workingDirectory = hal::app().working_directory();
 
 BitTorrent::BitTorrent() :
@@ -828 +839 @@
 }
 
+BitTorrent::torrent BitTorrent::get_wstr(const std::wstring& filename)
+{
+        return BitTorrent::torrent(pimpl->theTorrents.get(filename));
+}
+
 bool BitTorrent::listenOn(std::pair<int, int> const& range)
 {
@@ -957 +973 @@
 
         event().post(shared_ptr<EventDetail>(new EventMsg(
-                wformat_t(L"Set Timeouts, peer %1%, tracker %2%") % peers % tracker)));
+                wformat(L"Set Timeouts, peer %1%, tracker %2%") % peers % tracker)));
 }
 
@@ -966 +982 @@
         
         event().post(shared_ptr<EventDetail>(new EventMsg(
-                wformat_t(L"Set connections totals %1% and uploads %2%.") 
+                wformat(L"Set connections totals %1% and uploads %2%.") 
                         % maxConn % maxUpload)));
 }
@@ -978 +994 @@
         
         event().post(shared_ptr<EventDetail>(new EventMsg(
-                wformat_t(L"Set session rates at download %1% and upload %2%.") 
+                wformat(L"Set session rates at download %1% and upload %2%.") 
                         % pimpl->theSession.download_rate_limit() % pimpl->theSession.upload_rate_limit())));
 }
@@ -1093 +1109 @@
                         hal::event().post(shared_ptr<hal::EventDetail>(
                                 new hal::EventGeneral(hal::Event::warning, hal::Event::unclassified, 
-                                        (wformat_t(hal::app().res_wstr(HAL_INCORRECT_ENCODING_LEVEL)) % enc_level).str())));
+                                        (wformat(hal::app().res_wstr(HAL_INCORRECT_ENCODING_LEVEL)) % enc_level).str())));
         }
 
@@ -1112 +1128 @@
                         hal::event().post(shared_ptr<hal::EventDetail>(
                                 new hal::EventGeneral(hal::Event::warning, hal::Event::unclassified, 
-                                        (wformat_t(hal::app().res_wstr(HAL_INCORRECT_CONNECT_POLICY)) % in_enc_policy).str())));
+                                        (wformat(hal::app().res_wstr(HAL_INCORRECT_CONNECT_POLICY)) % in_enc_policy).str())));
         }
 
@@ -1131 +1147 @@
                         hal::event().post(shared_ptr<hal::EventDetail>(
                                 new hal::EventGeneral(hal::Event::warning, hal::Event::unclassified, 
-                                        (wformat_t(hal::app().res_wstr(HAL_INCORRECT_CONNECT_POLICY)) % in_enc_policy).str())));
+                                        (wformat(hal::app().res_wstr(HAL_INCORRECT_CONNECT_POLICY)) % in_enc_policy).str())));
         }
         
@@ -1211 +1227 @@
                 boost::smatch m;
                 
-                string_t ip_address_line;               
+                string ip_address_line;         
                 while (!std::getline(ifs, ip_address_line).eof())
                 {               
@@ -1227 +1243 @@
                         if (boost::regex_match(ip_address_line, m, reg))
                         {
-                                string_t first = m[1];
-                                string_t last = m[2];
+                                string first = m[1];
+                                string last = m[2];
                                 
                                 if (octalFix)
@@ -1234 +1250 @@
                                         if (boost::regex_match(first, m, ip_reg))
                                         {
-                                                first = ((m.length(1) != 0) ? m[1] : string_t("0")) + "." +
-                                                                ((m.length(2) != 0) ? m[2] : string_t("0")) + "." +
-                                                                ((m.length(3) != 0) ? m[3] : string_t("0")) + "." +
-                                                                ((m.length(4) != 0) ? m[4] : string_t("0"));
+                                                first = ((m.length(1) != 0) ? m[1] : string("0")) + "." +
+                                                                ((m.length(2) != 0) ? m[2] : string("0")) + "." +
+                                                                ((m.length(3) != 0) ? m[3] : string("0")) + "." +
+                                                                ((m.length(4) != 0) ? m[4] : string("0"));
                                         }                                       
                                         if (boost::regex_match(last, m, ip_reg))
                                         {
-                                                last = ((m.length(1) != 0) ? m[1] : string_t("0")) + "." +
-                                                           ((m.length(2) != 0) ? m[2] : string_t("0")) + "." +
-                                                           ((m.length(3) != 0) ? m[3] : string_t("0")) + "." +
-                                                           ((m.length(4) != 0) ? m[4] : string_t("0"));
+                                                last = ((m.length(1) != 0) ? m[1] : string("0")) + "." +
+                                                           ((m.length(2) != 0) ? m[2] : string("0")) + "." +
+                                                           ((m.length(3) != 0) ? m[3] : string("0")) + "." +
+                                                           ((m.length(4) != 0) ? m[4] : string("0"));
                                         }
                                 }
@@ -1257 +1273 @@
                                         hal::event().post(shared_ptr<hal::EventDetail>(
                                                 new hal::EventDebug(hal::Event::info, 
-                                                        from_utf8((format_t("Invalid IP range: %1%-%2%.") % first % last).str()))));
+                                                        from_utf8((format("Invalid IP range: %1%-%2%.") % first % last).str()))));
                                 }
                         }
@@ -1299 +1315 @@
 
         event().post(shared_ptr<EventDetail>(new EventMsg(
-                wformat_t(L"Set half-open connections limit to %1%.") % pimpl->theSession.max_half_open_connections())));
+                wformat(L"Set half-open connections limit to %1%.") % pimpl->theSession.max_half_open_connections())));
 }
 
@@ -1308 +1324 @@
 
         event().post(shared_ptr<EventDetail>(new EventMsg(
-                wformat_t(L"Set torrent connections total %1% and uploads %2%.") % maxConn % maxUpload)));
+                wformat(L"Set torrent connections total %1% and uploads %2%.") % maxConn % maxUpload)));
 
         pimpl->defTorrentDownload_ = download;
@@ -1314 +1330 @@
 
         event().post(shared_ptr<EventDetail>(new EventMsg(
-                wformat_t(L"Set torrent default rates at %1$.2fkb/s down and %2$.2fkb/s upload.") % download % upload)));
-}
-
-std::pair<lbt::entry, lbt::entry> BitTorrent_impl::prepTorrent(wpath_t filename, wpath_t saveDirectory)
+                wformat(L"Set torrent default rates at %1$.2fkb/s down and %2$.2fkb/s upload.") % download % upload)));
+}
+
+std::pair<lbt::entry, lbt::entry> BitTorrent_impl::prepTorrent(wpath filename, wpath saveDirectory)
 {
         lbt::entry metadata = haldecode(filename);
         lbt::torrent_info info(metadata);
         
-        wstring_t torrentName = hal::from_utf8_safe(info.name());
+        wstring torrentName = hal::from_utf8_safe(info.name());
         if (!boost::find_last(torrentName, L".torrent")) 
                 torrentName += L".torrent";
         
-        wpath_t torrentFilename = torrentName;
-        const wpath_t resumeFile = workingDirectory/L"resume"/torrentFilename.leaf();
+        wpath torrentFilename = torrentName;
+        const wpath resumeFile = workingDirectory/L"resume"/torrentFilename.leaf();
         
         //  vvv Handle old naming style!
-        const wpath_t oldResumeFile = workingDirectory/L"resume"/filename.leaf();
+        const wpath oldResumeFile = workingDirectory/L"resume"/filename.leaf();
         
         if (filename.leaf() != torrentFilename.leaf() && exists(oldResumeFile))
@@ -1365 +1381 @@
 }
 
-void BitTorrent::addTorrent(wpath_t file, wpath_t saveDirectory, bool startStopped, bool compactStorage, 
+void BitTorrent::addTorrent(wpath file, wpath saveDirectory, bool startStopped, bool compactStorage, 
                 boost::filesystem::wpath moveToDirectory, bool useMoveTo) 
 {
         try 
         {       
-        TorrentInternal_ptr TIp;
+        torrent_internal_ptr TIp;
 
         std::pair<std::string, std::string> names = extract_names(file);
-        wstring_t xml_name = from_utf8(names.first) + L".xml";
+        wstring xml_name = from_utf8(names.first) + L".xml";
 
         if (fs::exists(file.branch_path()/xml_name))
@@ -1386 +1402 @@
         {
                 if (useMoveTo)
-                        TIp.reset(new TorrentInternal(file, saveDirectory, compactStorage, moveToDirectory));           
+                        TIp.reset(new torrent_internal(file, saveDirectory, compactStorage, moveToDirectory));          
                 else
-                        TIp.reset(new TorrentInternal(file, saveDirectory, compactStorage));
+                        TIp.reset(new torrent_internal(file, saveDirectory, compactStorage));
 
                 TIp->setTransferSpeed(bittorrent().defTorrentDownload(), bittorrent().defTorrentUpload());
@@ -1399 +1415 @@
         if (p.second)
         {
-                TorrentInternal_ptr me = pimpl->theTorrents.get(TIp->name());           
+                torrent_internal_ptr me = pimpl->theTorrents.get(TIp->name());          
                 
                 if (!startStopped) 
@@ -1429 +1445 @@
 }
 
-void BitTorrent::newTorrent(wpath_t filename, wpath_t files)
+void BitTorrent::newTorrent(wpath filename, wpath files)
 {
 /*      try
@@ -1479 +1495 @@
 }
 
-const TorrentDetails& BitTorrent::updateTorrentDetails(const wstring_t& focused, const std::set<wstring_t>& selected)
+const TorrentDetails& BitTorrent::updateTorrentDetails(const wstring& focused, const std::set<wstring>& selected)
 {
         try {
@@ -1490 +1506 @@
         for (TorrentManager::torrentByName::iterator i=pimpl->theTorrents.begin(), e=pimpl->theTorrents.end(); i != e; ++i)
         {
-                wstring_t utf8Name = (*i).torrent->name();
+                wstring utf8Name = (*i).torrent->name();
                 TorrentDetail_ptr pT = (*i).torrent->getTorrentDetail_ptr();
                 
@@ -1518 +1534 @@
         for (TorrentManager::torrentByName::iterator i=pimpl->theTorrents.begin(), e=pimpl->theTorrents.end(); i != e;)
         {
-                wpath_t file = wpath_t(pimpl->workingDirectory)/L"torrents"/(*i).torrent->filename();
+                wpath file = wpath(pimpl->workingDirectory)/L"torrents"/(*i).torrent->filename();
                 
                 if (exists(file))
@@ -1579 +1595 @@
                 if ((*i).torrent->inSession())
                 {
-                //      HAL_DEV_MSG(wformat_t(L"Internalling pausing writeData=%1%") % writeData);
+                //      HAL_DEV_MSG(wformat(L"Internalling pausing writeData=%1%") % writeData);
                         (*i).torrent->handle().pause(); // Internal pause, not registered in Torrents.xml
                 }
@@ -1620 +1636 @@
         client(hal::from_utf8_safe(peerInfo.client))
 {
-        std::vector<wstring_t> status_vec;
+        std::vector<wstring> status_vec;
         
 #ifndef TORRENT_DISABLE_RESOLVE_COUNTRIES
         if (peerInfo.country[0] != 0 && peerInfo.country[1] != 0)
-                country = (wformat_t(L"(%1%)") % hal::from_utf8_safe(string_t(peerInfo.country, 2))).str().c_str();
+                country = (wformat(L"(%1%)") % hal::from_utf8_safe(string(peerInfo.country, 2))).str().c_str();
 #endif  
 
@@ -1820 +1836 @@
 }
 
-void BitTorrent_impl::removalThread(TorrentInternal_ptr pIT, bool wipeFiles)
+void BitTorrent_impl::removalThread(torrent_internal_ptr pIT, bool wipeFiles)
 {
         try {
@@ -1845 +1861 @@
                                 , end(m_info.end_files(true)); i != end; ++i)
                         {
-                                std::string p = (hal::to_utf8(pIT->saveDirectory()) / i->path).string();
+                                std::string p = (hal::path_to_utf8(pIT->saveDirectory()) / i->path).string();
                                 fs::path bp = i->path.branch_path();
                                 
@@ -1853 +1869 @@
                                 {
                                         std::pair<std::set<std::string>::iterator, bool> ret = 
-                                                directories.insert((hal::to_utf8(pIT->saveDirectory()) / bp).string());
+                                                directories.insert((hal::path_to_utf8(pIT->saveDirectory()) / bp).string());
                                         bp = bp.branch_path();
                                 }
@@ -1883 +1899 @@
         try {
         
-        TorrentInternal_ptr pTI = pimpl->theTorrents.get(filename);
+        torrent_internal_ptr pTI = pimpl->theTorrents.get(filename);
         lbt::torrent_handle handle = pTI->handle();
         pimpl->theTorrents.erase(filename);
@@ -1915 +1931 @@
         try {
         
-        TorrentInternal_ptr pTI = pimpl->theTorrents.get(filename);
+        torrent_internal_ptr pTI = pimpl->theTorrents.get(filename);
         lbt::torrent_handle handle = pTI->handle();
         pimpl->theTorrents.erase(filename);
@@ -1966 +1982 @@
 }
 
-void BitTorrent::torrent::set_ratio(float new_ratio)
-{
-        try {
-        
-        ptr->setRatio(ratio);
+
+BitTorrent::torrent::torrent(boost::shared_ptr<torrent_internal> p) :
+        ptr(p)
+{}
+
+BitTorrent::torrent::exec_around_ptr::proxy::proxy(torrent_internal* t) : 
+        t_(t),
+        l_(t->mutex_)
+{
+        HAL_DEV_MSG(L"Ctor proxy");
+}
+
+BitTorrent::torrent::exec_around_ptr::proxy::~proxy() 
+{
+        HAL_DEV_MSG(L"Dtor proxy");
+}
+
+float BitTorrent::torrent::get_ratio() const
+{
+        try {
+        
+        return ptr->get_ratio();
+        
+        } HAL_GENERIC_TORRENT_EXCEPTION_CATCH(L"Me", "torrent::get_ratio")
+        
+        return 0;
+}
+
+void BitTorrent::torrent::set_ratio(float r)
+{
+        try {
+
+        ptr->set_ratio(r);
         
         } HAL_GENERIC_TORRENT_EXCEPTION_CATCH(L"Me", "torrent::set_ratio")
 }
 
-float BitTorrent::torrent::get_ratio() const
-{
-        try {
-        
-        return ptr->getRatio();
-        
-        } HAL_GENERIC_TORRENT_EXCEPTION_CATCH(L"Me", "torrent::get_ratio")
-        
-        return 0;
+wpath BitTorrent::torrent::get_save_directory() const
+{
+        try {
+        
+        return ptr->get_save_directory();
+        
+        } HAL_GENERIC_TORRENT_EXCEPTION_CATCH(L"Me", "torrent::get_save_directory")
+        
+        return L"";
+}
+
+void BitTorrent::torrent::set_save_directory(const wpath& s)
+{
+        try {
+        
+        ptr->set_save_directory(s);
+        
+        } HAL_GENERIC_TORRENT_EXCEPTION_CATCH(L"Me", "torrent::set_save_directory")
+}
+
+wpath BitTorrent::torrent::get_move_to_directory() const
+{
+        try {
+        
+        return ptr->get_move_to_directory();
+        
+        } HAL_GENERIC_TORRENT_EXCEPTION_CATCH(L"Me", "torrent::get_save_directory")
+        
+        return L"";
+}
+
+void BitTorrent::torrent::set_move_to_directory(const wpath& m)
+{
+        try {
+        
+        ptr->set_move_to_directory(m);
+        
+        } HAL_GENERIC_TORRENT_EXCEPTION_CATCH(L"Me", "torrent::set_move_to_directory")
 }
 
@@ -1995 +2068 @@
         try {
         
-        pimpl->theTorrents.get(filename)->setRatio(ratio);
+        pimpl->theTorrents.get(filename)->set_ratio(ratio);
         
         } HAL_GENERIC_TORRENT_EXCEPTION_CATCH(filename, "setTorrentRatio")
@@ -2009 +2082 @@
         try {
         
-        return pimpl->theTorrents.get(filename)->getRatio();
+        return pimpl->theTorrents.get(filename)->get_ratio();
         
         } HAL_GENERIC_TORRENT_EXCEPTION_CATCH(filename, "getTorrentRatio")

trunk/src/halTorrent.hpp

@@ -411 +411 @@
 
 class BitTorrent_impl;
-class TorrentInternal;
+class torrent_internal;
 
 class BitTorrent
 {
+public: 
+
         class torrent
         {
@@ -420 +422 @@
 
         public:
+                class exec_around_ptr
+                {
+                public:
+                        class proxy 
+                        {
+                        public:
+                                explicit proxy(torrent_internal* t);
+
+                                torrent_internal* operator->() 
+                                {
+                                        return t_;
+                                }
+
+                                ~proxy ();
+
+                        private:
+                                torrent_internal* t_;
+                                mutex_t::scoped_lock l_;
+                        };
+
+                        exec_around_ptr(boost::shared_ptr<torrent_internal> p) : ptr(p) {}
+
+                        proxy operator->() const
+                        {
+                                return proxy(&(*ptr));
+                        }
+
+                private:
+                        boost::shared_ptr<torrent_internal> ptr;
+                };
+
+                torrent(boost::shared_ptr<torrent_internal> p);
+
+                float get_ratio() const;
                 void set_ratio(float new_ratio);
-                float get_ratio() const;
+
+                wpath get_save_directory() const;
+                void set_save_directory(const wpath&);
+                wpath get_move_to_directory() const;
+                void set_move_to_directory(const wpath&);
 
         public:
                 STLSOFT_METHOD_PROPERTY_GETSET_EXTERNAL(float, float, class_type, 
                         get_ratio, set_ratio, ratio);
+                
+                STLSOFT_METHOD_PROPERTY_GETSET_EXTERNAL(wpath, const wpath&, class_type, 
+                        get_save_directory, set_save_directory, save_directory);
+                STLSOFT_METHOD_PROPERTY_GETSET_EXTERNAL(wpath, const wpath&, class_type, 
+                        get_move_to_directory, set_move_to_directory, move_to_directory);
 
         private:
-                boost::shared_ptr<TorrentInternal> ptr;
+                exec_around_ptr ptr;
         };
 
-public: 
         enum mappings
         {
@@ -443 +487 @@
 
         void create_torrent(const create_torrent_params& params, fs::wpath out_file, progress_callback fn);
+
+        template<typename T>
+        torrent get(T t)
+        {
+                return get_wstr(to_wstr_shim(t));
+        }
+
+        torrent get_wstr(const std::wstring& filename);
         
         bool listenOn(std::pair<int, int> const& portRange);

trunk/src/halTorrentInternal.hpp

@@ -83 +83 @@
 
 #include "halIni.hpp"
+#include "halTypes.hpp"
 #include "halSignaler.hpp"
 
@@ -88 +89 @@
 {
 class TorrentInternalOld;
-class TorrentInternal;
+class torrent_internal;
 }
 
 BOOST_CLASS_VERSION(hal::TorrentInternalOld, 9)
-BOOST_CLASS_VERSION(hal::TorrentInternal, 2)
+BOOST_CLASS_VERSION(hal::torrent_internal, 2)
 
 namespace hal 
@@ -98 +99 @@
 
 namespace lbt = libtorrent;
-namespace fs = boost::filesystem;
-namespace pt = boost::posix_time;
-
-typedef std::wstring wstring_t;
-typedef std::string string_t;
-
-typedef boost::wformat wformat_t;
-typedef boost::format format_t;
-
-typedef boost::filesystem::wpath wpath_t;
-typedef boost::filesystem::path path_t;
-
-using boost::serialization::make_nvp;
-using boost::shared_ptr;
-using boost::bind;
-
-lbt::entry haldecode(const wpath_t &file) 
+
+lbt::entry haldecode(const wpath &file) 
 {
         fs::ifstream ifs(file, fs::ifstream::binary);
@@ -125 +111 @@
 }
 
-bool halencode(const wpath_t &file, const lbt::entry &e) 
+bool halencode(const wpath &file, const lbt::entry &e) 
 {
         fs::ofstream ofs(file, fs::ofstream::binary);
@@ -136 +122 @@
 }
 
-std::pair<std::string, std::string> extract_names(const wpath_t &file)
+inline path path_to_utf8(const wpath& wp)
+{
+        return path(to_utf8(wp.string()));
+}
+
+inline wpath path_from_utf8(const path& p)
+{
+        return wpath(from_utf8(p.string()));
+}
+
+std::pair<std::string, std::string> extract_names(const wpath &file)
 {
         if (fs::exists(file)) 
@@ -149 +145 @@
                 
                 event().post(shared_ptr<EventDetail>(new EventMsg(
-                        wformat_t(L"Loaded names: %1%, %2%") % from_utf8(name) % from_utf8(filename))));
+                        wformat(L"Loaded names: %1%, %2%") % from_utf8(name) % from_utf8(filename))));
 
                 return std::make_pair(name, filename);
@@ -160 +156 @@
 {
 public:
-        invalidTorrent(const wstring_t& who) :
+        invalidTorrent(const wstring& who) :
                 who_(who)
         {}
@@ -166 +162 @@
         virtual ~invalidTorrent() throw () {}
 
-        wstring_t who() const throw ()
+        wstring who() const throw ()
         {
                 return who_;
@@ -172 +168 @@
         
 private:
-        wstring_t who_; 
+        wstring who_;   
 };
         
@@ -219 +215 @@
         void serialize(Archive& ar, const unsigned int version)
         {
-                ar & make_nvp("total", total_);
+                ar & slz::make_nvp("total", total_);
         }
         
@@ -256 +252 @@
         void serialize(Archive& ar, const unsigned int version)
         {
-                ar & make_nvp("total", total_);
+                ar & slz::make_nvp("total", total_);
         }
         
@@ -273 +269 @@
     void serialize(Archive& ar, const unsigned int version)
     {
-        ar & make_nvp("transferLimit", transferLimit_);
-        ar & make_nvp("connections", connections_);
-        ar & make_nvp("uploads", uploads_);     
+        ar & slz::make_nvp("transferLimit", transferLimit_);
+        ar & slz::make_nvp("connections", connections_);
+        ar & slz::make_nvp("uploads", uploads_);        
                 
                 if (version > 6) {
-                        ar & make_nvp("filename", filename_);
+                        ar & slz::make_nvp("filename", filename_);
                 }
                 else 
                 {
-                        wstring_t originalFilename;
-                        ar & make_nvp("filename", originalFilename);
+                        wstring originalFilename;
+                        ar & slz::make_nvp("filename", originalFilename);
                         
                         updatePreVersion7Files(originalFilename);
                 }
                 
-        ar & make_nvp("saveDirectory", save_directory_);
+        ar & slz::make_nvp("saveDirectory", save_directory_);
                 
                 if (version > 7) {
-                        ar & make_nvp("payloadUploaded_", payloadUploaded_);
-                        ar & make_nvp("payloadDownloaded_", payloadDownloaded_);
-                        ar & make_nvp("uploaded_", uploaded_);
-                        ar & make_nvp("downloaded_", downloaded_);      
-                        ar & make_nvp("ratio", ratio_); 
+                        ar & slz::make_nvp("payloadUploaded_", payloadUploaded_);
+                        ar & slz::make_nvp("payloadDownloaded_", payloadDownloaded_);
+                        ar & slz::make_nvp("uploaded_", uploaded_);
+                        ar & slz::make_nvp("downloaded_", downloaded_); 
+                        ar & slz::make_nvp("ratio", ratio_);    
                 } 
                 else if (version > 3) {
-                        ar & make_nvp("payloadUploaded_", payloadUploaded_);
-                        ar & make_nvp("payloadDownloaded_", payloadDownloaded_);
-                        ar & make_nvp("uploaded_", uploaded_);
-                        ar & make_nvp("downloaded_", downloaded_);              
+                        ar & slz::make_nvp("payloadUploaded_", payloadUploaded_);
+                        ar & slz::make_nvp("payloadDownloaded_", payloadDownloaded_);
+                        ar & slz::make_nvp("uploaded_", uploaded_);
+                        ar & slz::make_nvp("downloaded_", downloaded_);         
                 } 
                 else if (version > 1)
                 {
-                        ar & make_nvp("totalUploaded", totalUploaded_);
-                        ar & make_nvp("ratio", ratio_);
+                        ar & slz::make_nvp("totalUploaded", totalUploaded_);
+                        ar & slz::make_nvp("ratio", ratio_);
                         
                         payloadUploaded_.reset(totalUploaded_);
@@ -312 +308 @@
                 
                 if (version > 0) {
-                        ar & make_nvp("trackerUsername", trackerUsername_);
-                        ar & make_nvp("trackerPassword", trackerPassword_);
+                        ar & slz::make_nvp("trackerUsername", trackerUsername_);
+                        ar & slz::make_nvp("trackerPassword", trackerPassword_);
                 }
                 if (version > 1) {
-                        ar & make_nvp("state", state_);
-                        ar & make_nvp("trackers", trackers_);
+                        ar & slz::make_nvp("state", state_);
+                        ar & slz::make_nvp("trackers", trackers_);
                 }
         
                 if (version > 2) {
-                        ar & make_nvp("resolve_countries", resolve_countries_);
+                        ar & slz::make_nvp("resolve_countries", resolve_countries_);
                 }
                 if (version > 4) {
-                        ar & make_nvp("file_priorities", filePriorities_);
+                        ar & slz::make_nvp("file_priorities", filePriorities_);
                 }
                 if (version > 5) {
-                        ar & make_nvp("startTime", startTime_);
-                        ar & make_nvp("activeDuration", activeDuration_);
-                        ar & make_nvp("seedingDuration", seedingDuration_);
+                        ar & slz::make_nvp("startTime", startTime_);
+                        ar & slz::make_nvp("activeDuration", activeDuration_);
+                        ar & slz::make_nvp("seedingDuration", seedingDuration_);
                 }
                 if (version > 6) {
-                        ar & make_nvp("name", name_);
-                        ar & make_nvp("compactStorage", compactStorage_);
-                        ar & make_nvp("finishTime", finishTime_);
+                        ar & slz::make_nvp("name", name_);
+                        ar & slz::make_nvp("compactStorage", compactStorage_);
+                        ar & slz::make_nvp("finishTime", finishTime_);
                 }
                 if (version > 8) {
-                        ar & make_nvp("progress", progress_);
+                        ar & slz::make_nvp("progress", progress_);
                 }
     }
@@ -351 +347 @@
                 
                 event().post(shared_ptr<EventDetail>(new EventMsg(
-                        wformat_t(L"Loaded names: %1%, %2%") % name_ % filename_)));
-        }
-        
-        void updatePreVersion7Files(wstring_t originalFilename)
+                        wformat(L"Loaded names: %1%, %2%") % name_ % filename_)));
+        }
+        
+        void updatePreVersion7Files(wstring originalFilename)
         {
                 try 
                 {
 
-                wpath_t oldFile = app().working_directory()/L"torrents"/originalFilename;
+                wpath oldFile = app().working_directory()/L"torrents"/originalFilename;
                 
                 if (fs::exists(oldFile)) 
                         extractNames(haldecode(oldFile));
                 
-                wpath_t oldResumeFile = app().working_directory()/L"resume"/originalFilename;
+                wpath oldResumeFile = app().working_directory()/L"resume"/originalFilename;
                 
                 if (filename_ != originalFilename)
@@ -391 +387 @@
         bool resolve_countries_;
         
-        wstring_t filename_;
-        wstring_t name_;
-        wstring_t save_directory_;
-        wstring_t originalFilename_;
+        wstring filename_;
+        wstring name_;
+        wstring save_directory_;
+        wstring originalFilename_;
         lbt::torrent_handle handle_;    
         
@@ -400 +396 @@
         lbt::entry resumedata_;
         
-        wstring_t trackerUsername_;     
-        wstring_t trackerPassword_;
+        wstring trackerUsername_;       
+        wstring trackerPassword_;
         
         boost::int64_t totalUploaded_;
@@ -438 +434 @@
 
 
-class TorrentInternal;
-typedef shared_ptr<TorrentInternal> TorrentInternal_ptr;
+class torrent_internal;
+typedef shared_ptr<torrent_internal> torrent_internal_ptr;
 
 struct torrent_standalone :
@@ -451 +447 @@
         {}
 
-        torrent_standalone(TorrentInternal_ptr t) :
+        torrent_standalone(torrent_internal_ptr t) :
                 iniClass("torrent"),
                 torrent(t),
@@ -457 +453 @@
         {}
 
-        TorrentInternal_ptr torrent;
+        torrent_internal_ptr torrent;
         pt::ptime save_time;
 
@@ -464 +460 @@
     void serialize(Archive& ar, const unsigned int version)
     {
-        ar & make_nvp("torrent", torrent);
-        ar & make_nvp("save_time", save_time);
+                ar & slz::make_nvp("torrent", torrent);
+                ar & slz::make_nvp("save_time", save_time);
     }
 };
 
-class TorrentInternal :
-        public boost::enable_shared_from_this<TorrentInternal>,
+class torrent_internal :
+        public boost::enable_shared_from_this<torrent_internal>,
         private boost::noncopyable
 {
         friend class BitTorrent_impl;   
+        friend class BitTorrent::torrent::exec_around_ptr::proxy;
+
 public:
         #define TORRENT_INTERNALS_DEFAULTS \
@@ -488 +486 @@
                 in_session_(false)
                 
-        TorrentInternal() :     
+        torrent_internal() :    
                 TORRENT_INTERNALS_DEFAULTS,
                 compactStorage_(true),
@@ -494 +492 @@
         {}
         
-        TorrentInternal(wpath_t filename, wpath_t saveDirectory, bool compactStorage, wpath_t move_to_directory=L"") :
+        torrent_internal(wpath filename, wpath saveDirectory, bool compactStorage, wpath move_to_directory=L"") :
                 TORRENT_INTERNALS_DEFAULTS,
                 save_directory_(saveDirectory.string()),
@@ -505 +503 @@
         }
         
-        TorrentInternal(const TorrentInternalOld& t) :
+        torrent_internal(const TorrentInternalOld& t) :
                 transferLimit_(t.transferLimit_),
                 state_(t.state_),
@@ -550 +548 @@
         std::pair<int, int> getConnectionLimit();
         
-        const wstring_t& name() const { return name_; }
-        
-        void setRatio(float ratio) 
+        const wstring& name() const { return name_; }
+        
+        void set_ratio(float ratio) 
         { 
                 if (ratio < 0) ratio = 0;
                 ratio_ = ratio; 
                 
-                applyRatio();
-        }
-        
-        float getRatio()
+                apply_ratio();
+        }
+        
+        float get_ratio()
         {
                 return ratio_;
@@ -573 +571 @@
                 assert(the_session_ != 0);
 
-                HAL_DEV_MSG(wformat_t(L"addToSession() paused=%1%") % paused);
+                HAL_DEV_MSG(wformat(L"addToSession() paused=%1%") % paused);
                 
                 if (!inSession()) 
                 {                       
-                        string_t dir = to_utf8(save_directory_);
+                        path dir = path_to_utf8(save_directory_);
                         
                         lbt::storage_mode_t storage = lbt::storage_mode_sparse;
@@ -618 +616 @@
                 assert(inSession());
 
-                HAL_DEV_MSG(wformat_t(L"removeFromSession() writeData=%1%") % writeData);
+                HAL_DEV_MSG(wformat(L"removeFromSession() writeData=%1%") % writeData);
                 
                 if (writeData)
@@ -689 +687 @@
                         handle_.pause();
                         signals().torrent_paused.disconnect_all_once();
-                        signals().torrent_paused.connect_once(bind(&TorrentInternal::completed_pause, this));
+                        signals().torrent_paused.connect_once(bind(&torrent_internal::completed_pause, this));
 
                         state_ = TorrentDetail::torrent_pausing;        
@@ -706 +704 @@
 
                                 signals().torrent_paused.disconnect_all_once();
-                                signals().torrent_paused.connect_once(bind(&TorrentInternal::completed_stop, this));
+                                signals().torrent_paused.connect_once(bind(&torrent_internal::completed_stop, this));
                                 handle_.pause();
 
@@ -742 +740 @@
                 case TorrentDetail::torrent_active:
                         signals().torrent_paused.disconnect_all_once();
-                        signals().torrent_paused.connect_once(bind(&TorrentInternal::handle_recheck, this));
+                        signals().torrent_paused.connect_once(bind(&torrent_internal::handle_recheck, this));
                         handle_.pause();
                         state_ = TorrentDetail::torrent_pausing;
@@ -755 +753 @@
         {                                       
                 HAL_DEV_MSG(L"writeResumeData()");
-                wpath_t resumeDir = workingDir_/L"resume";
+                wpath resumeDir = workingDir_/L"resume";
                 
                 if (!exists(resumeDir))
@@ -767 +765 @@
         void clearResumeData()
         {
-                wpath_t resumeFile = workingDir_/L"resume"/filename_;
+                wpath resumeFile = workingDir_/L"resume"/filename_;
                 
                 if (exists(resumeFile))
@@ -774 +772 @@
                 resumedata_ = lbt::entry();
         }
+
+        const wpath get_save_directory()
+        {
+                return save_directory_;
+        }
+
+        void set_save_directory(wpath s)
+        {
+                if (inSession() && !is_finished() &&
+                                s != path_from_utf8(handle_.save_path()))
+                {
+                        handle_.move_storage(path_to_utf8(s));
+                        save_directory_ = s;
+                }
+        }
+
+        const wpath get_move_to_directory()
+        {
+                return move_to_directory_;
+        }
+        
+        void set_move_to_directory(wpath m)
+        {
+                if (is_finished() && !m.empty())
+                {
+                        if (m != path_from_utf8(handle_.save_path()))
+                        {
+                                handle_.move_storage(path_to_utf8(m));
+                                save_directory_ = move_to_directory_ = m;
+                        }
+                }
+                else
+                {
+                        move_to_directory_ = m;
+                }
+        }
+
+        bool is_finished()
+        {
+                if (inSession())
+                {
+                        lbt::torrent_status::state_t s = handle_.status().state;
+
+                        return (s == lbt::torrent_status::seeding ||
+                                                s == lbt::torrent_status::finished);
+                }
+                else return false;
+        }
         
         void finished()
@@ -780 +826 @@
                         finishTime_ = boost::posix_time::second_clock::universal_time();
 
-                // Only move seeding torrents for the mo!
-                if (inSession() && handle_.status().state == lbt::torrent_status::seeding)
-                {
-                        if (move_to_directory_ != L"" && move_to_directory_ != save_directory_)
+                if (is_finished())
+                {
+                        if (!move_to_directory_.empty() && 
+                                        move_to_directory_ !=  path_from_utf8(handle_.save_path()))
                         {
-                                handle_.move_storage(to_utf8(move_to_directory_));
+                                handle_.move_storage(path_to_utf8(move_to_directory_));
                                 save_directory_ = move_to_directory_;
                         }
@@ -795 +841 @@
         unsigned state() const { return state_; }
         
-        void setTrackerLogin(wstring_t username, wstring_t password)
+        void setTrackerLogin(wstring username, wstring password)
         {
                 trackerUsername_ = username;
@@ -803 +849 @@
         }       
         
-        std::pair<wstring_t, wstring_t> getTrackerLogin() const
+        std::pair<wstring, wstring> getTrackerLogin() const
         {
                 return make_pair(trackerUsername_, trackerPassword_);
         }
         
-        const wstring_t& filename() const { return filename_; }
-        
-        const wstring_t& originalFilename() const { return originalFilename_; }
+        const wstring& filename() const { return filename_; }
+        
+        const wstring& originalFilename() const { return originalFilename_; }
         
         const lbt::torrent_handle& handle() const { return handle_; }
@@ -857 +903 @@
         }
 
-        const wstring_t& saveDirectory() { return save_directory_; }
+        const wpath& saveDirectory() { return save_directory_; }
         
     friend class boost::serialization::access;
@@ -864 +910 @@
     {
                 if (version > 1) {
-                        ar & make_nvp("transfer_limits", transferLimit_);
-                        ar & make_nvp("connection_limits", connections_);
-                        ar & make_nvp("upload_limits", uploads_);       
-
-                        ar & make_nvp("name", name_);
-                        ar & make_nvp("filename", filename_);   
-
-                        ar & make_nvp("ratio", ratio_); 
-                        ar & make_nvp("progress", progress_);
-                        ar & make_nvp("state", state_);
-                        ar & make_nvp("compact_storage", compactStorage_);      
-                        ar & make_nvp("resolve_countries", resolve_countries_); 
-
-                        ar & make_nvp("tracker_username", trackerUsername_);
-                        ar & make_nvp("tracker_password", trackerPassword_);
-                        ar & make_nvp("trackers", trackers_);
-
-                        ar & make_nvp("save_directory", save_directory_);
-                        ar & make_nvp("move_to_directory", move_to_directory_);
-                        
-                        ar & make_nvp("payload_uploaded", payloadUploaded_);
-                        ar & make_nvp("payload_downloaded", payloadDownloaded_);
-                        ar & make_nvp("uploaded", uploaded_);
-                        ar & make_nvp("downloaded", downloaded_);                       
+                        ar & slz::make_nvp("transfer_limits", transferLimit_);
+                        ar & slz::make_nvp("connection_limits", connections_);
+                        ar & slz::make_nvp("upload_limits", uploads_);  
+
+                        ar & slz::make_nvp("name", name_);
+                        ar & slz::make_nvp("filename", filename_);      
+
+                        ar & slz::make_nvp("ratio", ratio_);    
+                        ar & slz::make_nvp("progress", progress_);
+                        ar & slz::make_nvp("state", state_);
+                        ar & slz::make_nvp("compact_storage", compactStorage_); 
+                        ar & slz::make_nvp("resolve_countries", resolve_countries_);    
+
+                        ar & slz::make_nvp("tracker_username", trackerUsername_);
+                        ar & slz::make_nvp("tracker_password", trackerPassword_);
+                        ar & slz::make_nvp("trackers", trackers_);
+
+                        ar & slz::make_nvp("save_directory", save_directory_);
+                        ar & slz::make_nvp("move_to_directory", move_to_directory_);
+                        
+                        ar & slz::make_nvp("payload_uploaded", payloadUploaded_);
+                        ar & slz::make_nvp("payload_downloaded", payloadDownloaded_);
+                        ar & slz::make_nvp("uploaded", uploaded_);
+                        ar & slz::make_nvp("downloaded", downloaded_);                  
                                         
-                        ar & make_nvp("file_priorities", filePriorities_);
-                        
-                        ar & make_nvp("start_time", startTime_);
-                        ar & make_nvp("finish_time", finishTime_);
-                        ar & make_nvp("active_duration", activeDuration_);
-                        ar & make_nvp("seeding_duration", seedingDuration_);
+                        ar & slz::make_nvp("file_priorities", filePriorities_);
+                        
+                        ar & slz::make_nvp("start_time", startTime_);
+                        ar & slz::make_nvp("finish_time", finishTime_);
+                        ar & slz::make_nvp("active_duration", activeDuration_);
+                        ar & slz::make_nvp("seeding_duration", seedingDuration_);
                                         
                 } 
                 else 
                 {
-                    ar & make_nvp("transferLimit", transferLimit_);
-                        ar & make_nvp("connections", connections_);
-                        ar & make_nvp("uploads", uploads_);                     
-                        ar & make_nvp("filename", filename_);           
-                        ar & make_nvp("saveDirectory", save_directory_);
+                    ar & slz::make_nvp("transferLimit", transferLimit_);
+                        ar & slz::make_nvp("connections", connections_);
+                        ar & slz::make_nvp("uploads", uploads_);                        
+                        ar & slz::make_nvp("filename", filename_);      
+                        if (version == 0) {
+                                wstring s;
+                                ar & slz::make_nvp("saveDirectory", save_directory_);
+                                save_directory_ = s;
+                        } else {                                
+                                ar & slz::make_nvp("saveDirectory", save_directory_);
+                        }
+
                         if (version > 0) {
-                                ar & make_nvp("moveToDirectory", move_to_directory_);
+                                wstring m;
+                                ar & slz::make_nvp("moveToDirectory", m);
+                                move_to_directory_ = m;
                         } else {
                                 move_to_directory_ = save_directory_;
                         }
                         
-                        ar & make_nvp("payloadUploaded_", payloadUploaded_);
-                        ar & make_nvp("payloadDownloaded_", payloadDownloaded_);
-                        ar & make_nvp("uploaded_", uploaded_);
-                        ar & make_nvp("downloaded_", downloaded_);      
-                        ar & make_nvp("ratio", ratio_); 
-                        ar & make_nvp("trackerUsername", trackerUsername_);
-                        ar & make_nvp("trackerPassword", trackerPassword_);
-                        
-                        ar & make_nvp("state", state_);
-                        ar & make_nvp("trackers", trackers_);
-                        
-                        ar & make_nvp("resolve_countries", resolve_countries_);
-                        
-                        ar & make_nvp("file_priorities", filePriorities_);
-                        
-                        ar & make_nvp("startTime", startTime_);
-                        ar & make_nvp("activeDuration", activeDuration_);
-                        ar & make_nvp("seedingDuration", seedingDuration_);
-                        
-                        ar & make_nvp("name", name_);
-                        ar & make_nvp("compactStorage", compactStorage_);
-                        ar & make_nvp("finishTime", finishTime_);
-                        
-                        ar & make_nvp("progress", progress_);
+                        ar & slz::make_nvp("payloadUploaded_", payloadUploaded_);
+                        ar & slz::make_nvp("payloadDownloaded_", payloadDownloaded_);
+                        ar & slz::make_nvp("uploaded_", uploaded_);
+                        ar & slz::make_nvp("downloaded_", downloaded_); 
+                        ar & slz::make_nvp("ratio", ratio_);    
+                        ar & slz::make_nvp("trackerUsername", trackerUsername_);
+                        ar & slz::make_nvp("trackerPassword", trackerPassword_);
+                        
+                        ar & slz::make_nvp("state", state_);
+                        ar & slz::make_nvp("trackers", trackers_);
+                        
+                        ar & slz::make_nvp("resolve_countries", resolve_countries_);
+                        
+                        ar & slz::make_nvp("file_priorities", filePriorities_);
+                        
+                        ar & slz::make_nvp("startTime", startTime_);
+                        ar & slz::make_nvp("activeDuration", activeDuration_);
+                        ar & slz::make_nvp("seedingDuration", seedingDuration_);
+                        
+                        ar & slz::make_nvp("name", name_);
+                        ar & slz::make_nvp("compactStorage", compactStorage_);
+                        ar & slz::make_nvp("finishTime", finishTime_);
+                        
+                        ar & slz::make_nvp("progress", progress_);
         }
     }
@@ -1007 +1062 @@
                         for(size_t i=0, e=files.size(); i<e; ++i)
                         {
-                                wstring_t fullPath = hal::from_utf8(files[i].path.string());
+                                wstring fullPath = hal::from_utf8(files[i].path.string());
                                 boost::int64_t size = static_cast<boost::int64_t>(files[i].size);
                                 
@@ -1029 +1084 @@
         }
         
-        void prepare(wpath_t filename)
+        void prepare(wpath filename)
         {
                 mutex_t::scoped_lock l(mutex_);
@@ -1038 +1093 @@
                 extractNames(metadata_);                        
                 
-                const wpath_t resumeFile = workingDir_/L"resume"/filename_;
-                const wpath_t torrentFile = workingDir_/L"torrents"/filename_;
+                const wpath resumeFile = workingDir_/L"resume"/filename_;
+                const wpath torrentFile = workingDir_/L"torrents"/filename_;
                 
                 event().post(shared_ptr<EventDetail>(new EventMsg(
-                        wformat_t(L"File: %1%, %2%.") % resumeFile % torrentFile)));
+                        wformat(L"File: %1%, %2%.") % resumeFile % torrentFile)));
                 
                 if (exists(resumeFile)) 
@@ -1074 +1129 @@
                 
                 event().post(shared_ptr<EventDetail>(new EventMsg(
-                        wformat_t(L"Loaded names: %1%, %2%") % name_ % filename_)));
+                        wformat(L"Loaded names: %1%, %2%") % name_ % filename_)));
         }
         
@@ -1097 +1152 @@
                 applyTransferSpeed();
                 applyConnectionLimit();
-                applyRatio();
+                apply_ratio();
                 applyTrackers();
                 applyTrackerLogin();
@@ -1115 +1170 @@
                         handle_.set_upload_limit(up);
 
-                        HAL_DEV_MSG(wformat_t(L"Applying Transfer Speed %1% - %2%") % down % up);
+                        HAL_DEV_MSG(wformat(L"Applying Transfer Speed %1% - %2%") % down % up);
                 }
         }
@@ -1127 +1182 @@
                         handle_.set_max_uploads(uploads_);
 
-                        HAL_DEV_MSG(wformat_t(L"Applying Connection Limit %1% - %2%") % connections_ % uploads_);
-                }
-        }
-        
-        void applyRatio()
+                        HAL_DEV_MSG(wformat(L"Applying Connection Limit %1% - %2%") % connections_ % uploads_);
+                }
+        }
+        
+        void apply_ratio()
         { 
                 mutex_t::scoped_lock l(mutex_);
@@ -1138 +1193 @@
                         handle_.set_ratio(ratio_);
 
-                        HAL_DEV_MSG(wformat_t(L"Applying Ratio %1%") % ratio_);
+                        HAL_DEV_MSG(wformat(L"Applying Ratio %1%") % ratio_);
                 }
         }
@@ -1178 +1233 @@
                         }
 
-                        HAL_DEV_MSG(wformat_t(L"Applying Tracker Login User: %1%, Pass: %2%") % trackerUsername_ % trackerPassword_ );
+                        HAL_DEV_MSG(wformat(L"Applying Tracker Login User: %1%, Pass: %2%") % trackerUsername_ % trackerPassword_ );
                 }
         }
@@ -1201 +1256 @@
                         handle_.resolve_countries(resolve_countries_);
                         
-                        HAL_DEV_MSG(wformat_t(L"Applying Resolve Countries %1%") % resolve_countries_);
+                        HAL_DEV_MSG(wformat(L"Applying Resolve Countries %1%") % resolve_countries_);
                 }
         }
@@ -1247 +1302 @@
                 
         static lbt::session* the_session_;
-        static wpath_t workingDir_;
+        static wpath workingDir_;
         
         mutable mutex_t mutex_;
@@ -1260 +1315 @@
         bool resolve_countries_;
         
-        wstring_t filename_;
-        wstring_t name_;
-        wstring_t save_directory_;
-        wstring_t move_to_directory_;
-        wstring_t originalFilename_;
+        wstring filename_;
+        wstring name_;
+        wpath save_directory_;
+        wpath move_to_directory_;
+        wstring originalFilename_;
         lbt::torrent_handle handle_;    
         
@@ -1270 +1325 @@
         lbt::entry resumedata_;
         
-        wstring_t trackerUsername_;     
-        wstring_t trackerPassword_;
+        wstring trackerUsername_;       
+        wstring trackerPassword_;
         
         boost::int64_t totalUploaded_;
@@ -1311 +1366 @@
         struct TorrentHolder
         {
-                mutable TorrentInternal_ptr torrent;
-                
-                wstring_t filename;
-                wstring_t name;         
+                mutable torrent_internal_ptr torrent;
+                
+                wstring filename;
+                wstring name;           
                 
                 TorrentHolder()
                 {}
                 
-                explicit TorrentHolder(TorrentInternal_ptr t) :
+                explicit TorrentHolder(torrent_internal_ptr t) :
                         torrent(t), filename(torrent->filename()), name(torrent->name())
                 {}
@@ -1330 +1385 @@
                         {
                                 TorrentInternalOld t;
-                                ar & make_nvp("torrent", t);
+                                ar & slz::make_nvp("torrent", t);
                                 
-                                torrent.reset(new TorrentInternal(t));
+                                torrent.reset(new torrent_internal(t));
                         }
                         else
                         {
-                                ar & make_nvp("torrent", torrent);
+                                ar & slz::make_nvp("torrent", torrent);
                         } 
                         
-                        ar & make_nvp("filename", filename);
-                        ar & make_nvp("name", name);
+                        ar & slz::make_nvp("filename", filename);
+                        ar & slz::make_nvp("name", name);
                 }
         };
@@ -1353 +1408 @@
                                 boost::multi_index::tag<byFilename>,
                                 boost::multi_index::member<
-                                        TorrentHolder, wstring_t, &TorrentHolder::filename> 
+                                        TorrentHolder, wstring, &TorrentHolder::filename> 
                                 >,
                         boost::multi_index::ordered_unique<
                                 boost::multi_index::tag<byName>,
                                 boost::multi_index::member<
-                                        TorrentHolder, wstring_t, &TorrentHolder::name> 
+                                        TorrentHolder, wstring, &TorrentHolder::name> 
                                 >
                 >
@@ -1377 +1432 @@
                 for (TorrentMap::const_iterator i=map.begin(), e=map.end(); i != e; ++i)
                 {       
-                        TorrentInternal_ptr TIp(new TorrentInternal((*i).second));
+                        torrent_internal_ptr TIp(new torrent_internal((*i).second));
                         
                         event().post(shared_ptr<EventDetail>(new EventMsg(
-                                wformat_t(L"Converting %1%.") % TIp->name())));
+                                wformat(L"Converting %1%.") % TIp->name())));
                         
                         torrents_.insert(TorrentHolder(TIp));
@@ -1393 +1448 @@
         }
         
-        std::pair<torrentByName::iterator, bool> insert(TorrentInternal_ptr t)
+        std::pair<torrentByName::iterator, bool> insert(torrent_internal_ptr t)
         {
                 return insert(TorrentHolder(t));
         }
 
-        TorrentInternal_ptr getByFile(const wstring_t& filename)
+        torrent_internal_ptr getByFile(const wstring& filename)
         {
                 torrentByFilename::iterator it = torrents_.get<byFilename>().find(filename);
@@ -1410 +1465 @@
         }
         
-        TorrentInternal_ptr get(const wstring_t& name)
+        torrent_internal_ptr get(const wstring& name)
         {
                 torrentByName::iterator it = torrents_.get<byName>().find(name);
@@ -1432 +1487 @@
         }
         
-        size_t erase(const wstring_t& name)
+        size_t erase(const wstring& name)
         {
                 return torrents_.get<byName>().erase(name);
         }
         
-        bool exists(const wstring_t& name)
+        bool exists(const wstring& name)
         {
                 torrentByName::iterator it = torrents_.get<byName>().find(name);
@@ -1454 +1509 @@
         void serialize(Archive& ar, const unsigned int version)
         {
-                ar & make_nvp("torrents", torrents_);
+                ar & slz::make_nvp("torrents", torrents_);
         }       
         
@@ -1461 +1516 @@
 };
 
-void TorrentInternal::setConnectionLimit(int maxConn, int maxUpload)
+void torrent_internal::setConnectionLimit(int maxConn, int maxUpload)
 {
         mutex_t::scoped_lock l(mutex_);
@@ -1471 +1526 @@
 }
 
-std::pair<int, int> TorrentInternal::getConnectionLimit()
+std::pair<int, int> torrent_internal::getConnectionLimit()
 {
         return std::make_pair(connections_, uploads_);
 }
 
-void TorrentInternal::setTransferSpeed(float download, float upload)
+void torrent_internal::setTransferSpeed(float download, float upload)
 {       
         mutex_t::scoped_lock l(mutex_);
@@ -1485 +1540 @@
 }
 
-std::pair<float, float> TorrentInternal::getTransferSpeed()
+std::pair<float, float> torrent_internal::getTransferSpeed()
 {
         return transferLimit_;
 }
 
-TorrentDetail_ptr TorrentInternal::getTorrentDetail_ptr()
+TorrentDetail_ptr torrent_internal::getTorrentDetail_ptr()
 {       
         mutex_t::scoped_lock l(mutex_);
@@ -1511 +1566 @@
         }
         
-        wstring_t state;
+        wstring state;
         
         switch (state_)
@@ -1587 +1642 @@
         boost::tuple<size_t, size_t, size_t, size_t> connections = updatePeers();               
 
-        return TorrentDetail_ptr(new TorrentDetail(name_, filename_, saveDirectory(), state, hal::from_utf8(statusMemory_.current_tracker), 
+        return TorrentDetail_ptr(new TorrentDetail(name_, filename_, saveDirectory().string(), state, hal::from_utf8(statusMemory_.current_tracker), 
                 std::pair<float, float>(statusMemory_.download_payload_rate, statusMemory_.upload_payload_rate),
                 progress_, statusMemory_.distributed_copies, statusMemory_.total_wanted_done, statusMemory_.total_wanted, uploaded_, payloadUploaded_,
@@ -1604 +1659 @@
         }
         
-        return TorrentDetail_ptr(new TorrentDetail(name_, filename_, saveDirectory(), app().res_wstr(HAL_TORRENT_STOPPED), app().res_wstr(HAL_NA)));
+        return TorrentDetail_ptr(new TorrentDetail(name_, filename_, saveDirectory().string(), app().res_wstr(HAL_TORRENT_STOPPED), app().res_wstr(HAL_NA)));
 }
 

trunk/src/halTypes.hpp

@@ -17 +17 @@
         namespace pt = boost::posix_time;
         namespace xp = boost::xpressive;
-        namespace sl = boost::serialization;
+        namespace slz = boost::serialization;
+
+        using std::wstring;
+        using std::string;
 
         using std::pair;
         using std::make_pair;   
-        using boost::tuple;
 
         typedef boost::int64_t size_type;
         typedef boost::recursive_mutex mutex_t;
         typedef boost::thread thread_t;
+
+        using boost::tuple;
+        using boost::shared_ptr;
+        using boost::bind;
+
+        using boost::wformat;
+        using boost::format;
+
+        using fs::wpath;
+        using fs::path;
 }