Debugger: Remove debuggerstringutils.h

With QT_RESTRICTED_CAST_FROM_ASCII making GdbMi etc operate on
QString is feasible again. Take this as opportunity to move
debugger encoding handling closer to a 'conversion on input and
output if needed, storage in QString only' scheme.

Change-Id: I2f10c9fa8a6c62c44f4e6682efe3769e9fba30f7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 10 insertions, 10 deletions

diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h
index fd5118e50f..f62e255586 100644
--- a/src/plugins/debugger/cdb/cdbengine.h
+++ b/src/plugins/debugger/cdb/cdbengine.h
@@ -45,7 +45,7 @@ namespace Internal {
 class DisassemblerAgent;
 class CdbCommand;
 struct MemoryViewCookie;
-class ByteArrayInputStream;
+class StringInputStream;
 class GdbMi;
 
 class CdbEngine : public DebuggerEngine
@@ -74,7 +74,7 @@ public:
     void detachDebugger() override;
     bool hasCapability(unsigned cap) const override;
     void watchPoint(const QPoint &) override;
-    void setRegisterValue(const QByteArray &name, const QString &value) override;
+    void setRegisterValue(const QString &name, const QString &value) override;
 
     void executeStep() override;
     void executeStepOut() override;
@@ -169,17 +169,17 @@ private:
                                bool conditionalBreakPointTriggered = false);
     void processStop(const GdbMi &stopReason, bool conditionalBreakPointTriggered = false);
     bool commandsPending() const;
-    void handleExtensionMessage(char t, int token, const QByteArray &what, const QByteArray &message);
+    void handleExtensionMessage(char t, int token, const QString &what, const QString &message);
     bool doSetupEngine(QString *errorMessage);
     bool launchCDB(const DebuggerRunParameters &sp, QString *errorMessage);
     void handleSessionAccessible(unsigned long cdbExState);
     void handleSessionInaccessible(unsigned long cdbExState);
-    void handleSessionIdle(const QByteArray &message);
+    void handleSessionIdle(const QString &message);
     void doInterruptInferior(SpecialStopMode sm);
     void doInterruptInferiorCustomSpecialStop(const QVariant &v);
     void doContinueInferior();
-    inline void parseOutputLine(QByteArray line);
-    inline bool isCdbProcessRunning() const { return m_process.state() != QProcess::NotRunning; }
+    void parseOutputLine(QString line);
+    bool isCdbProcessRunning() const { return m_process.state() != QProcess::NotRunning; }
     bool canInterruptInferior() const;
     void syncOperateByInstruction(bool operateByInstruction);
     void postWidgetAtCommand();
@@ -219,7 +219,7 @@ private:
     unsigned parseStackTrace(const GdbMi &data, bool sourceStepInto);
     void mergeStartParametersSourcePathMap();
 
-    const QByteArray m_tokenPrefix;
+    const QString m_tokenPrefix;
 
     QProcess m_process;
     QScopedPointer<Utils::ConsoleProcess> m_consoleStub;
@@ -231,10 +231,10 @@ private:
     ProjectExplorer::DeviceProcessSignalOperation::Ptr m_signalOperation;
     int m_nextCommandToken;
     QHash<int, DebuggerCommand> m_commandForToken;
-    QByteArray m_currentBuiltinResponse;
+    QString m_currentBuiltinResponse;
     int m_currentBuiltinResponseToken;
     QMap<QString, NormalizedSourceFileName> m_normalizedFileCache;
-    const QByteArray m_extensionCommandPrefixBA; //!< Library name used as prefix
+    const QString m_extensionCommandPrefix; //!< Library name used as prefix
     bool m_operateByInstructionPending; //!< Creator operate by instruction action changed.
     bool m_operateByInstruction;
     bool m_hasDebuggee;
@@ -246,7 +246,7 @@ private:
     } m_wow64State;
     QTime m_logTime;
     mutable int m_elapsedLogTime;
-    QByteArray m_extensionMessageBuffer;
+    QString m_extensionMessageBuffer;
     bool m_sourceStepInto;
     int m_watchPointX;
     int m_watchPointY;