Mercurial > hg > svcore
diff base/TempDirectory.cpp @ 843:e802e550a1f2
Drop std:: from cout, cerr, endl -- pull these in through Debug.h
author | Chris Cannam |
---|---|
date | Tue, 26 Nov 2013 13:35:08 +0000 |
parents | b867c07478be |
children | f5cd33909744 |
line wrap: on
line diff
--- a/base/TempDirectory.cpp Tue Nov 26 11:16:37 2013 +0000 +++ b/base/TempDirectory.cpp Tue Nov 26 13:35:08 2013 +0000 @@ -206,10 +206,10 @@ cleanupDirectory(fi.absoluteFilePath()); } else { if (!QFile(fi.absoluteFilePath()).remove()) { - std::cerr << "WARNING: TempDirectory::cleanup: " + cerr << "WARNING: TempDirectory::cleanup: " << "Failed to unlink file \"" << fi.absoluteFilePath() << "\"" - << std::endl; + << endl; } } } @@ -217,15 +217,15 @@ QString dirname = dir.dirName(); if (dirname != "") { if (!dir.cdUp()) { - std::cerr << "WARNING: TempDirectory::cleanup: " + cerr << "WARNING: TempDirectory::cleanup: " << "Failed to cd to parent directory of " - << tmpdir << std::endl; + << tmpdir << endl; return; } if (!dir.rmdir(dirname)) { - std::cerr << "WARNING: TempDirectory::cleanup: " + cerr << "WARNING: TempDirectory::cleanup: " << "Failed to remove directory " - << dirname << std::endl; + << dirname << endl; } } @@ -247,10 +247,10 @@ QDir subdir(dirpath, "*.pid", QDir::Name, QDir::Files); if (subdir.count() == 0) { - std::cerr << "INFO: Found temporary directory with no .pid file in it!\n(directory=\"" - << dirpath << "\"). Removing it..." << std::endl; + cerr << "INFO: Found temporary directory with no .pid file in it!\n(directory=\"" + << dirpath << "\"). Removing it..." << endl; cleanupDirectory(dirpath); - std::cerr << "...done." << std::endl; + cerr << "...done." << endl; continue; } @@ -261,13 +261,13 @@ if (!ok) continue; if (GetProcessStatus(pid) == ProcessNotRunning) { - std::cerr << "INFO: Found abandoned temporary directory from " + cerr << "INFO: Found abandoned temporary directory from " << "a previous, defunct process\n(pid=" << pid << ", directory=\"" << dirpath.toStdString() - << "\"). Removing it..." << std::endl; + << "\"). Removing it..." << endl; cleanupDirectory(dirpath); - std::cerr << "...done." << std::endl; + cerr << "...done." << endl; break; } }