diff data/fileio/CachedFile.cpp @ 847:2d53205f70cd tonioni

Merge from default branch

--- a/data/fileio/CachedFile.cpp	Fri Nov 22 10:37:28 2013 +0000
+++ b/data/fileio/CachedFile.cpp	Tue Nov 26 14:37:01 2013 +0000
@@ -157,7 +157,7 @@
                 SVDEBUG << "CachedFile::check: Retrieval succeeded" << endl;
                 updateLastRetrieval(true);
             } else {
-                std::cerr << "CachedFile::check: Retrieval failed, will try again later (using existing file for now)" << std::endl;
+                cerr << "CachedFile::check: Retrieval failed, will try again later (using existing file for now)" << endl;
             }                
         }
     } else {
@@ -168,7 +168,7 @@
             m_ok = true;
             updateLastRetrieval(true);
         } else {
-            std::cerr << "CachedFile::check: Retrieval failed, remaining in invalid state" << std::endl;
+            cerr << "CachedFile::check: Retrieval failed, remaining in invalid state" << endl;
             // again, we don't need to do anything here -- the last
             // retrieval timestamp is already invalid
         }
@@ -212,7 +212,7 @@
     QFile previous(m_localFilename);
     if (previous.exists()) {
         if (!previous.remove()) {
-            std::cerr << "CachedFile::retrieve: ERROR: Failed to remove previous copy of cached file at \"" << m_localFilename << "\"" << std::endl;
+            cerr << "CachedFile::retrieve: ERROR: Failed to remove previous copy of cached file at \"" << m_localFilename << "\"" << endl;
             return false;
         }
     }
@@ -222,7 +222,7 @@
     //!!! disk space left)
 
     if (!tempFile.copy(m_localFilename)) {
-        std::cerr << "CachedFile::retrieve: ERROR: Failed to copy newly retrieved file from \"" << tempName << "\" to \"" << m_localFilename << "\"" << std::endl;
+        cerr << "CachedFile::retrieve: ERROR: Failed to copy newly retrieved file from \"" << tempName << "\" to \"" << m_localFilename << "\"" << endl;
         return false;
     }