comparison mainwindow.cpp @ 143:f61f032b06f9

* Fix another use of stderr as identifier

     //!!! and something about updating
 
     QMessageBox::information(this, "Pull complete", report);
 }
 
-void MainWindow::commandFailed(HgAction action, QString stderr)
+void MainWindow::commandFailed(HgAction action, QString output)
 {
     DEBUG << "MainWindow::commandFailed" << endl;
 
     // Some commands we just have to ignore bad return values from:
 

         // uh huh
         return;
     case ACT_INCOMING:
         // returns non-zero code if the check was successful but there
         // are no changes pending
-        if (stderr.trimmed() == "") showIncoming("");
+        if (output.trimmed() == "") showIncoming("");
         return;
     case ACT_FOLDERDIFF:
     case ACT_FILEDIFF:
     case ACT_CHGSETDIFF:
         // external program, unlikely to be anything useful in stderr

     QString message = tr("<qt><h3>Command failed</h3>"
                          "<p>The following command failed:</p>"
                          "<code>%1</code>"
                          "%2</qt>")
         .arg(command)
-        .arg((stderr.trimmed() != "") ?
+        .arg((output.trimmed() != "") ?
              tr("<p>Its output said:</p><code>%1</code>")
-             .arg(xmlEncode(stderr.left(800))
+             .arg(xmlEncode(output.left(800))
                   .replace("\n", "<br>"))
              : "");
 
     QMessageBox::warning(this, tr("Command failed"), message);
 }