diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-24 22:13:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-24 22:13:53 +0100 |
| commit | 63ea6b6c5ee64f8ee067c2b488d004b6dfe363e0 (patch) | |
| tree | d248762556466fd076cfd20f2e6aa1d5d9544184 /src/lib/examine_content_job.cc | |
| parent | 977b36672892b14de4ecb68e98415c64946e8a93 (diff) | |
Use boost::signals2; fix bugs with x-thread signalling.
Diffstat (limited to 'src/lib/examine_content_job.cc')
| -rw-r--r-- | src/lib/examine_content_job.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc index 8fadce2f6..1e263ffa5 100644 --- a/src/lib/examine_content_job.cc +++ b/src/lib/examine_content_job.cc @@ -31,8 +31,9 @@ #include "log.h" #include "film.h" -using namespace std; -using namespace boost; +using std::string; +using std::vector; +using boost::shared_ptr; ExamineContentJob::ExamineContentJob (shared_ptr<Film> f, shared_ptr<Job> req) : Job (f, req) @@ -102,11 +103,11 @@ ExamineContentJob::run () string const tdir = _film->dir ("thumbs"); vector<int> thumbs; - for (filesystem::directory_iterator i = filesystem::directory_iterator (tdir); i != filesystem::directory_iterator(); ++i) { + for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (tdir); i != boost::filesystem::directory_iterator(); ++i) { /* Aah, the sweet smell of progress */ #if BOOST_FILESYSTEM_VERSION == 3 - string const l = filesystem::path(*i).leaf().generic_string(); + string const l = boost::filesystem::path(*i).leaf().generic_string(); #else string const l = i->leaf (); #endif |