forked from qt-creator/qt-creator
VcsBase: Use FilePath::fileContents() instead of FileReader
FileReader is going to be removed. Change-Id: I52661420b90d019ec019a9f5dc8daadfa49208ac Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
@@ -38,6 +38,7 @@
|
|||||||
#include <utils/icon.h>
|
#include <utils/icon.h>
|
||||||
#include <utils/qtcprocess.h>
|
#include <utils/qtcprocess.h>
|
||||||
#include <utils/qtcassert.h>
|
#include <utils/qtcassert.h>
|
||||||
|
#include <utils/stringutils.h>
|
||||||
#include <utils/temporarydirectory.h>
|
#include <utils/temporarydirectory.h>
|
||||||
#include <utils/theme/theme.h>
|
#include <utils/theme/theme.h>
|
||||||
|
|
||||||
@@ -239,14 +240,14 @@ static inline QStringList fieldTexts(const QString &fileContents)
|
|||||||
|
|
||||||
void VcsBaseSubmitEditor::createUserFields(const FilePath &fieldConfigFile)
|
void VcsBaseSubmitEditor::createUserFields(const FilePath &fieldConfigFile)
|
||||||
{
|
{
|
||||||
FileReader reader;
|
const Result<QByteArray> config = fieldConfigFile.fileContents();
|
||||||
if (!reader.fetch(fieldConfigFile)) {
|
if (!config) {
|
||||||
QMessageBox::critical(ICore::dialogParent(), Tr::tr("File Error"), reader.errorString());
|
QMessageBox::critical(ICore::dialogParent(), Tr::tr("File Error"), config.error());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse into fields
|
// Parse into fields
|
||||||
const QStringList fields = fieldTexts(QString::fromUtf8(reader.text()));
|
const QStringList fields = fieldTexts(QString::fromUtf8(normalizeNewlines(config.value())));
|
||||||
if (fields.empty())
|
if (fields.empty())
|
||||||
return;
|
return;
|
||||||
// Create a completer on user names
|
// Create a completer on user names
|
||||||
|
Reference in New Issue
Block a user