comparison hgrunner.h @ 110:0f039d3cc38e

* Separate out the hgrunner output into stdout and stderr again (merging them was a failed experiment)
author Chris Cannam
date Fri, 26 Nov 2010 14:50:10 +0000
parents 1721c580c10e
children 151209bc5bd6
comparison
equal deleted inserted replaced
109:1721c580c10e 110:0f039d3cc38e
35 public: 35 public:
36 HgRunner(QWidget * parent = 0); 36 HgRunner(QWidget * parent = 0);
37 ~HgRunner(); 37 ~HgRunner();
38 38
39 void requestAction(HgAction action); 39 void requestAction(HgAction action);
40 /* 40 /*!!!
41 bool isCommandRunning(); 41 bool isCommandRunning();
42 void killCurrentCommand(); 42 void killCurrentCommand();
43 43
44 void hideProgBar(); 44 void hideProgBar();
45 */ 45 */
48 void commandFailed(HgAction action, QString stderr); 48 void commandFailed(HgAction action, QString stderr);
49 49
50 private slots: 50 private slots:
51 void started(); 51 void started();
52 void finished(int procExitCode, QProcess::ExitStatus procExitStatus); 52 void finished(int procExitCode, QProcess::ExitStatus procExitStatus);
53 void dataReady(); 53 void dataReadyStdout();
54 void dataReadyStderr();
54 55
55 private: 56 private:
56 void checkQueue(); 57 void checkQueue();
57 void startCommand(HgAction action); 58 void startCommand(HgAction action);
58 QString getHgBinaryName(); 59 QString getHgBinaryName();
70 QString m_ptySlaveFilename; 71 QString m_ptySlaveFilename;
71 QFile *m_procInput; 72 QFile *m_procInput;
72 73
73 bool m_isRunning; 74 bool m_isRunning;
74 QProcess *m_proc; 75 QProcess *m_proc;
75 QString m_output; 76 QString m_stdout;
77 QString m_stderr;
76 78
77 QString m_userName; 79 QString m_userName;
78 QString m_realm; 80 QString m_realm;
79 81
80 typedef std::deque<HgAction> ActionQueue; 82 typedef std::deque<HgAction> ActionQueue;