diff options
-rw-r--r-- | src/libs/utils/qtcprocess.cpp | 6 | ||||
-rw-r--r-- | src/libs/utils/qtcprocess.h | 2 |
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() |