Debugger: Re-organize passing of display formats

The current setup (dumper->gui: list of descriptions,
gui->dumper: index in list) is fragile and not easily
i18n'able. Go with an enum based approach now.

Change-Id: Ie78c596065a8b2ba87ad725274da29d4be3a6da4
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/src/plugins/debugger/debuggerdialogs.h b/src/plugins/debugger/debuggerdialogs.h
index eee9ee11c4..9b0ddc4673 100644
--- a/src/plugins/debugger/debuggerdialogs.h
+++ b/src/plugins/debugger/debuggerdialogs.h
@@ -31,6 +31,8 @@
 #ifndef DEBUGGER_DIALOGS_H
 #define DEBUGGER_DIALOGS_H
 
+#include "watchhandler.h"
+
 #include <projectexplorer/kitchooser.h>
 #include <projectexplorer/abi.h>
 
@@ -162,8 +164,6 @@ private:
      QDialogButtonBox *m_box;
 };
 
-typedef QHash<QString, QStringList> DumperTypeFormats;
-
 class StartRemoteEngineDialog : public QDialog
 {
     Q_OBJECT
@@ -191,9 +191,8 @@ public:
     explicit TypeFormatsDialog(QWidget *parent);
     ~TypeFormatsDialog();
 
-    void addTypeFormats(const QString &type, const QStringList &formats,
+    void addTypeFormats(const QString &type, const DisplayFormats &formats,
         int currentFormat);
-    DumperTypeFormats typeFormats() const;
 
 private:
     TypeFormatsDialogUi *m_ui;