comparison base/ProgressPrinter.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 076dcd2ce209
children f5cd33909744
comparison
equal deleted inserted replaced
842:23d3a6eca5c3 843:e802e550a1f2
15 15
16 #include "ProgressPrinter.h" 16 #include "ProgressPrinter.h"
17 17
18 #include <iostream> 18 #include <iostream>
19 19
20 #include "Debug.h"
21
20 ProgressPrinter::ProgressPrinter(QString message, QObject *parent) : 22 ProgressPrinter::ProgressPrinter(QString message, QObject *parent) :
21 ProgressReporter(parent), 23 ProgressReporter(parent),
22 m_prefix(message), 24 m_prefix(message),
23 m_lastProgress(0), 25 m_lastProgress(0),
24 m_definite(true) 26 m_definite(true)
29 } 31 }
30 32
31 ProgressPrinter::~ProgressPrinter() 33 ProgressPrinter::~ProgressPrinter()
32 { 34 {
33 if (m_lastProgress > 0 && m_lastProgress != 100) { 35 if (m_lastProgress > 0 && m_lastProgress != 100) {
34 std::cerr << "\r\n"; 36 cerr << "\r\n";
35 } 37 }
36 // std::cerr << "(progress printer dtor)" << std::endl; 38 // cerr << "(progress printer dtor)" << endl;
37 } 39 }
38 40
39 bool 41 bool
40 ProgressPrinter::isDefinite() const 42 ProgressPrinter::isDefinite() const
41 { 43 {
58 } 60 }
59 61
60 void 62 void
61 ProgressPrinter::done() 63 ProgressPrinter::done()
62 { 64 {
63 std::cerr << "\r" 65 cerr << "\r"
64 << m_prefix.toStdString() 66 << m_prefix.toStdString()
65 << (m_prefix == "" ? "" : " ") 67 << (m_prefix == "" ? "" : " ")
66 << "Done" << std::endl; 68 << "Done" << endl;
67 } 69 }
68 70
69 void 71 void
70 ProgressPrinter::setProgress(int progress) 72 ProgressPrinter::setProgress(int progress)
71 { 73 {
72 if (progress == m_lastProgress) return; 74 if (progress == m_lastProgress) return;
73 std::cerr << "\r" 75 cerr << "\r"
74 << m_prefix.toStdString() 76 << m_prefix.toStdString()
75 << (m_prefix == "" ? "" : " "); 77 << (m_prefix == "" ? "" : " ");
76 if (m_definite) { 78 if (m_definite) {
77 std::cerr << progress << "%"; 79 cerr << progress << "%";
78 } else { 80 } else {
79 std::cerr << "|/-\\"[progress % 4]; 81 cerr << "|/-\\"[progress % 4];
80 } 82 }
81 m_lastProgress = progress; 83 m_lastProgress = progress;
82 } 84 }
83 85