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

Core/ProjectExplorer: Reduce some QTextCodec uses in "leaf" code

Browse Source 
Uses are more centralized via FilePath::codec*() now.

Change-Id: Ib0c137a7da38c78bb1826915b121243862efee89
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2024-12-06 14:20:57 +01:00
parent 8941000dec
commit fcc921cc5b
5 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/qtcprocess.cpp
View File

@@ -1761,12 +1761,6 @@ void Process::setStdOutCodec(QTextCodec *c)
d->m_stdOutCodec = c; d->m_stdOutCodec = c;
} }
void Process::setStdErrCodec(QTextCodec *c)
{
QTC_ASSERT(c, return);
d->m_stdErrCodec = c;
}
void Process::setTimeOutMessageBoxEnabled(bool v) void Process::setTimeOutMessageBoxEnabled(bool v)
{ {
d->m_timeOutMessageBoxEnabled = v; d->m_timeOutMessageBoxEnabled = v;

3
src/libs/utils/qtcprocess.h
View File

@@ -144,8 +144,7 @@ public:
EventLoopMode eventLoopMode = EventLoopMode::Off); EventLoopMode eventLoopMode = EventLoopMode::Off);
void setCodec(QTextCodec *c); // for stdOut and stdErr void setCodec(QTextCodec *c); // for stdOut and stdErr
void setStdOutCodec(QTextCodec *c); void setStdOutCodec(QTextCodec *c); // for stdOut, stdErr uses executable.processStdErrCodec()
void setStdErrCodec(QTextCodec *c);
void setTimeOutMessageBoxEnabled(bool); void setTimeOutMessageBoxEnabled(bool);

2
src/plugins/coreplugin/locator/executefilter.cpp
View File

@@ -17,7 +17,6 @@
#include <QJsonArray> #include <QJsonArray>
#include <QJsonObject> #include <QJsonObject>
#include <QMessageBox> #include <QMessageBox>
#include <QTextCodec>
using namespace Tasking; using namespace Tasking;
using namespace Utils; using namespace Utils;
@@ -160,7 +159,6 @@ void ExecuteFilter::createProcess()
m_process = new Process; m_process = new Process;
m_process->setEnvironment(Environment::systemEnvironment()); m_process->setEnvironment(Environment::systemEnvironment());
m_process->setCodec(QTextCodec::codecForLocale());
connect(m_process, &Process::done, this, &ExecuteFilter::done); connect(m_process, &Process::done, this, &ExecuteFilter::done);
connect(m_process, &Process::readyReadStandardOutput, this, &ExecuteFilter::readStdOutput); connect(m_process, &Process::readyReadStandardOutput, this, &ExecuteFilter::readStdOutput);
connect(m_process, &Process::readyReadStandardError, this, &ExecuteFilter::readStdError); connect(m_process, &Process::readyReadStandardError, this, &ExecuteFilter::readStdError);

5
src/plugins/projectexplorer/abstractprocessstep.cpp
View File

@@ -194,9 +194,8 @@ bool AbstractProcessStep::setupProcess(Process &process)
if (d->m_lowPriority && projectExplorerSettings().lowBuildPriority) if (d->m_lowPriority && projectExplorerSettings().lowBuildPriority)
process.setLowPriority(); process.setLowPriority();
process.setStdOutCodec(buildEnvironment().hasKey("VSLANG") if (buildEnvironment().hasKey("VSLANG"))
? QTextCodec::codecForName("UTF-8") : QTextCodec::codecForLocale()); process.setStdOutCodec(QTextCodec::codecForName("UTF-8"));
process.setStdErrCodec(QTextCodec::codecForLocale());
process.setStdOutCallback([this](const QString &s){ process.setStdOutCallback([this](const QString &s){
emit addOutput(s, OutputFormat::Stdout, DontAppendNewline); emit addOutput(s, OutputFormat::Stdout, DontAppendNewline);

1
src/plugins/remotelinux/genericdirectuploadstep.cpp
View File

@@ -137,7 +137,6 @@ GroupItem GenericDirectUploadStep::statTask(UploadStorage *storage,
StatEndHandler statEndHandler) StatEndHandler statEndHandler)
{ {
const auto onSetup = [this, file](Process &process) { const auto onSetup = [this, file](Process &process) {
process.setCodec(QTextCodec::codecForName("UTF-8"));
// We'd like to use --format=%Y, but it's not supported by busybox. // We'd like to use --format=%Y, but it's not supported by busybox.
process.setCommand({deviceConfiguration()->filePath("stat"), process.setCommand({deviceConfiguration()->filePath("stat"),
{"-t", Utils::ProcessArgs::quoteArgUnix(file.remoteFilePath())}}); {"-t", Utils::ProcessArgs::quoteArgUnix(file.remoteFilePath())}});