aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorhjk <[email protected]>2025-05-09 16:21:19 +0200
committerhjk <[email protected]>2025-05-09 15:09:11 +0000
commita56d15d7d2228124700cd90e7e0c135d9a978a99 (patch)
treebec7308f6fc083c236e1555793c7a98b99100190 /src
parent3704221bf2cba1305279b77a00ea43f010ed179b (diff)
Utils: Replace a direct use of QTextCodec with its name in Process API
QTextCodec is as part of Qt5Compat still deprecated, and may not survive a Qt 6 -> Qt 7 transition. This here reduces its direct use in some places. Change-Id: Idc95e0d53d303b8763e3b55807946a9e85b73058 Reviewed-by: Orgad Shaneh <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/libs/utils/qtcprocess.cpp6
-rw-r--r--src/libs/utils/qtcprocess.h2
2 files changed, 1 insertions, 7 deletions
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index 10dd8496884..b0a2f856083 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -1797,11 +1797,7 @@ void ChannelBuffer::handleRest()
void Process::setCodec(const QByteArray &codecName)
{
- setCodec(QTextCodec::codecForName(codecName));
-}
-
-void Process::setCodec(const QTextCodec *codec)
-{
+ const QTextCodec *codec = QTextCodec::codecForName(codecName);
QTC_ASSERT(codec, return);
d->m_stdOutCodec = codec;
d->m_stdErrCodec = codec;
diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h
index ada711eeb89..5ee83a3d039 100644
--- a/src/libs/utils/qtcprocess.h
+++ b/src/libs/utils/qtcprocess.h
@@ -15,7 +15,6 @@
QT_BEGIN_NAMESPACE
class QDebug;
-class QTextCodec;
QT_END_NAMESPACE
namespace Utils {
@@ -145,7 +144,6 @@ public:
EventLoopMode eventLoopMode = EventLoopMode::Off);
void setCodec(const QByteArray &codecName); // for stdOut and stdErr
- void setCodec(const QTextCodec *codec); // for stdOut and stdErr
void setUtf8Codec(); // for stdOut and stdErr
void setUtf8StdOutCodec(); // for stdOut, stdErr uses executable.processStdErrCodec()