Mercurial > hg > svgui
diff layer/ImageLayer.cpp @ 318:e9fe3923bdf4
* RemoteFile -> FileSource
now it's used all over the place for local files as well.
author | Chris Cannam |
---|---|
date | Thu, 18 Oct 2007 16:20:26 +0000 |
parents | e251c3599ea8 |
children | 984c1975f1ff |
line wrap: on
line diff
--- a/layer/ImageLayer.cpp Thu Oct 18 15:31:20 2007 +0000 +++ b/layer/ImageLayer.cpp Thu Oct 18 16:20:26 2007 +0000 @@ -21,7 +21,7 @@ #include "view/View.h" #include "data/model/ImageModel.h" -#include "data/fileio/RemoteFile.h" +#include "data/fileio/FileSource.h" #include "widgets/ImageDialog.h" @@ -52,7 +52,7 @@ ImageLayer::~ImageLayer() { - for (RemoteFileMap::iterator i = m_remoteFiles.begin(); + for (FileSourceMap::iterator i = m_remoteFiles.begin(); i != m_remoteFiles.end(); ++i) { delete i->second; } @@ -884,7 +884,7 @@ void ImageLayer::checkAddRemote(QString img) const { - if (RemoteFile::isRemote(img)) { + if (FileSource::isRemote(img)) { std::cerr << "ImageLayer::checkAddRemote(" << img.toStdString() << "): yes, trying..." << std::endl; @@ -892,7 +892,7 @@ return; } - RemoteFile *rf = new RemoteFile(img); + FileSource *rf = new FileSource(img); if (rf->isOK()) { std::cerr << "ok, adding it (local filename = " << rf->getLocalFilename().toStdString() << ")" << std::endl; m_remoteFiles[img] = rf; @@ -920,11 +920,11 @@ { // std::cerr << "ImageLayer::remoteFileReady" << std::endl; - RemoteFile *rf = dynamic_cast<RemoteFile *>(sender()); + FileSource *rf = dynamic_cast<FileSource *>(sender()); if (!rf) return; QString img; - for (RemoteFileMap::const_iterator i = m_remoteFiles.begin(); + for (FileSourceMap::const_iterator i = m_remoteFiles.begin(); i != m_remoteFiles.end(); ++i) { if (i->second == rf) { img = i->first;