Debugger: Make char * displayable in separate windows

Task-number: QTCREATORBUG-7313
Change-Id: I8d475dd94a48e7a1d5efe4c2c0d90cb6bdf9b3e2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

src/plugins/debugger/watchdata.cpp

@@ -619,8 +619,7 @@ void parseWatchData(const QSet<QByteArray> &expandedINames,
         data.editvalue = mi.data();
 
     mi = item["editformat"];
-    if (mi.isValid())
-        data.editformat = mi.toInt();
+    data.editformat = mi.toInt();
 
     mi = item["typeformats"];
     if (mi.isValid())

src/plugins/debugger/watchhandler.cpp

@@ -1262,6 +1262,8 @@ QString WatchModel::nameForFormat(int format)
         case Array100Format: return msgArrayFormat(100);
         case Array1000Format: return msgArrayFormat(1000);
         case Array10000Format: return msgArrayFormat(10000);
+        case SeparateLatin1StringFormat: return tr("Latin1 String in Separate Window");
+        case SeparateUtf8StringFormat: return tr("UTF-8 String in Separate Window");
         case DecimalIntegerFormat: return tr("Decimal Integer");
         case HexadecimalIntegerFormat: return tr("Hexadecimal Integer");
         case BinaryIntegerFormat: return tr("Binary Integer");
@@ -1296,7 +1298,9 @@ TypeFormatList WatchModel::typeFormatList(const WatchData &data) const
     if (data.origaddr || isPointerType(data.type)) {
         formats.append(RawFormat);
         formats.append(Latin1StringFormat);
+        formats.append(SeparateLatin1StringFormat);
         formats.append(Utf8StringFormat);
+        formats.append(SeparateUtf8StringFormat);
         formats.append(Local8BitStringFormat);
         formats.append(Utf16StringFormat);
         formats.append(Ucs4StringFormat);

src/plugins/debugger/watchhandler.h

@@ -62,6 +62,9 @@ enum DisplayFormat
     Array1000Format,
     Array10000Format,
 
+    SeparateLatin1StringFormat,
+    SeparateUtf8StringFormat,
+
 
     // Values above 200 refer to format solely handled in the WatchHandler code
     ArtificialFormatBase = 200,