comparison layer/ImageLayer.cpp @ 318:e9fe3923bdf4

* RemoteFile -> FileSource
  now it's used all over the place for local files as well.

 #include "base/RealTime.h"
 #include "base/Profiler.h"
 #include "view/View.h"
 
 #include "data/model/ImageModel.h"
-#include "data/fileio/RemoteFile.h"
+#include "data/fileio/FileSource.h"
 
 #include "widgets/ImageDialog.h"
 
 #include <QPainter>
 #include <QMouseEvent>

 {
 }
 
 ImageLayer::~ImageLayer()
 {
-    for (RemoteFileMap::iterator i = m_remoteFiles.begin();
+    for (FileSourceMap::iterator i = m_remoteFiles.begin();
          i != m_remoteFiles.end(); ++i) {
         delete i->second;
     }
 }
 

 }
 
 void
 ImageLayer::checkAddRemote(QString img) const
 {
-    if (RemoteFile::isRemote(img)) {
+    if (FileSource::isRemote(img)) {
 
         std::cerr << "ImageLayer::checkAddRemote(" << img.toStdString() << "): yes, trying..." << std::endl;
 
         if (m_remoteFiles.find(img) != m_remoteFiles.end()) {
             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;
             connect(rf, SIGNAL(ready()), this, SLOT(remoteFileReady()));
         } else {

 void
 ImageLayer::remoteFileReady()
 {
 //    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;
 //            std::cerr << "it's image \"" << img.toStdString() << "\"" << std::endl;
             break;