diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp index 824e0795578..7852cc88da2 100644 --- a/src/libs/utils/synchronousprocess.cpp +++ b/src/libs/utils/synchronousprocess.cpp @@ -106,12 +106,6 @@ void TerminalControllingProcess::setupChildProcess() } // ----------- SynchronousProcessResponse -SynchronousProcessResponse::SynchronousProcessResponse() : - result(StartFailed), - exitCode(-1) -{ -} - void SynchronousProcessResponse::clear() { result = StartFailed; @@ -263,11 +257,11 @@ void ChannelBuffer::append(const QByteArray &text, bool emitSignals) } // ----------- SynchronousProcessPrivate -struct SynchronousProcessPrivate { - SynchronousProcessPrivate(); +class SynchronousProcessPrivate { +public: void clearForRun(); - QTextCodec *m_codec; + QTextCodec *m_codec = QTextCodec::codecForLocale(); TerminalControllingProcess m_process; QTimer m_timer; QEventLoop m_eventLoop; @@ -284,11 +278,6 @@ struct SynchronousProcessPrivate { bool m_waitingForUser = false; }; -SynchronousProcessPrivate::SynchronousProcessPrivate() : - m_codec(QTextCodec::codecForLocale()) -{ -} - void SynchronousProcessPrivate::clearForRun() { m_hangTimerCount = 0; diff --git a/src/libs/utils/synchronousprocess.h b/src/libs/utils/synchronousprocess.h index a8772233644..d14b0372b89 100644 --- a/src/libs/utils/synchronousprocess.h +++ b/src/libs/utils/synchronousprocess.h @@ -37,11 +37,12 @@ QT_FORWARD_DECLARE_CLASS(QDebug) namespace Utils { -struct SynchronousProcessPrivate; +class SynchronousProcessPrivate; /* Result of SynchronousProcess execution */ -struct QTCREATOR_UTILS_EXPORT SynchronousProcessResponse +class QTCREATOR_UTILS_EXPORT SynchronousProcessResponse { +public: enum Result { // Finished with return code 0 Finished, @@ -54,7 +55,6 @@ struct QTCREATOR_UTILS_EXPORT SynchronousProcessResponse // Hang, no output after time out Hang }; - SynchronousProcessResponse(); void clear(); // Helper to format an exit message. @@ -66,12 +66,12 @@ struct QTCREATOR_UTILS_EXPORT SynchronousProcessResponse QString stdOut() const; QString stdErr() const; - Result result; - int exitCode; + Result result = StartFailed; + int exitCode = -1; - QTextCodec *codec = nullptr; QByteArray rawStdOut; QByteArray rawStdErr; + QTextCodec *codec = nullptr; }; QTCREATOR_UTILS_EXPORT QDebug operator<<(QDebug str, const SynchronousProcessResponse &); diff --git a/src/plugins/vcsbase/vcsbaseplugin.h b/src/plugins/vcsbase/vcsbaseplugin.h index 32862915892..dc719111b22 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.h +++ b/src/plugins/vcsbase/vcsbaseplugin.h @@ -38,18 +38,17 @@ class QAction; class QTextCodec; QT_END_NAMESPACE -namespace Utils -{ +namespace Utils { class FileName; -struct SynchronousProcessResponse; -} +class SynchronousProcessResponse; +} // namespace Utils namespace Core { class Context; class IVersionControl; class Id; class IDocument; -} +} // namespace Core namespace VcsBase {