feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use the default encoding for new files

Browse Source 
When new text files are created from Qt Creator, use the default
encoding from Qt Creator settings.

Change-Id: Iddfa173a70a363ec8d559d996b3fc658e15dfe57
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Marius Sincovici
2019-10-03 13:03:13 +02:00
parent 46afac5687
commit 2a21ed069f
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/coreplugin/generatedfile.cpp
View File

@@ -25,11 +25,14 @@
#include "generatedfile.h" #include "generatedfile.h"
#include <utils/fileutils.h> #include <coreplugin/editormanager/editormanager.h>
#include <utils/fileutils.h>
#include <utils/textfileformat.h>
#include <QString>
#include <QDir>
#include <QCoreApplication> #include <QCoreApplication>
#include <QDir>
#include <QString>
namespace Core { namespace Core {
@@ -142,22 +145,26 @@ bool GeneratedFile::write(QString *errorMessage) const
const QDir dir = info.absoluteDir(); const QDir dir = info.absoluteDir();
if (!dir.exists()) { if (!dir.exists()) {
if (!dir.mkpath(dir.absolutePath())) { if (!dir.mkpath(dir.absolutePath())) {
*errorMessage = QCoreApplication::translate("BaseFileWizard", "Unable to create the directory %1.").arg( *errorMessage = QCoreApplication::translate("BaseFileWizard",
QDir::toNativeSeparators(dir.absolutePath())); "Unable to create the directory %1.")
.arg(QDir::toNativeSeparators(dir.absolutePath()));
return false; return false;
} }
} }
// Write out // Write out
if (isBinary()) {
QIODevice::OpenMode flags = QIODevice::WriteOnly | QIODevice::Truncate; QIODevice::OpenMode flags = QIODevice::WriteOnly | QIODevice::Truncate;
if (!isBinary())
flags |= QIODevice::Text;
Utils::FileSaver saver(m_d->path, flags); Utils::FileSaver saver(m_d->path, flags);
saver.write(m_d->contents); saver.write(m_d->contents);
return saver.finalize(errorMessage); return saver.finalize(errorMessage);
} }
Utils::TextFileFormat format;
format.codec = EditorManager::defaultTextCodec();
return format.writeFile(m_d->path, contents(), errorMessage);
}
GeneratedFile::Attributes GeneratedFile::attributes() const GeneratedFile::Attributes GeneratedFile::attributes() const
{ {
return m_d->attributes; return m_d->attributes;