AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fossil output is now treated as utf-8 on Windows

Browse Source 
FossilOrigin-Name: 9c28f79677e9fcd17ba7927b07bdf1403d1d5715
This commit is contained in:
kostas
2013-01-13 11:46:47 +00:00
parent 6f8e7a622a
commit 799e6d2b1a
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/MainWindow.cpp
View File

@ -17,6 +17,7 @@
#include <QDebug>
#include <QProgressBar>
#include <QDragEnterEvent>
#include <QTextCodec>
#include "CommitDialog.h"
#include "FileActionDialog.h"
#include "CloneDialog.h"
@ -1097,6 +1098,16 @@ bool MainWindow::runFossilRaw(const QStringList &args, QStringList *output, int
fossilAbort = false;
QString buffer;
#ifdef Q_WS_WIN32
QTextCodec *codec = QTextCodec::codecForName("UTF-8");
#else
QTextCodec *codec = QTextCodec::codecForLocale();
#endif
Q_ASSERT(codec);
QTextDecoder *decoder = codec->makeDecoder();
Q_ASSERT(decoder);
while(true)
{
QProcess::ProcessState state = process.state();
@ -1124,7 +1135,7 @@ bool MainWindow::runFossilRaw(const QStringList &args, QStringList *output, int
qDebug() << input;
#endif
buffer += input;
buffer += decoder->toUnicode(input);
QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
@ -1238,6 +1249,8 @@ bool MainWindow::runFossilRaw(const QStringList &args, QStringList *output, int
}
}
delete decoder;
// Must be finished by now
Q_ASSERT(process.state()==QProcess::NotRunning);