From cd7886a7b3fb71483cee9f57bbf3d3eaf37c4e32 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 27 Jun 2016 16:46:40 +0200 Subject: [PATCH] Debugger: Remove string freeze workaround Change-Id: Ifd9f89c0d3b5c060af28bdb29e93a5b95f6dc9cd Reviewed-by: Orgad Shaneh --- src/plugins/debugger/watchhandler.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index d19b2142cfb..d52d4e6ed02 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -36,7 +36,6 @@ #include "simplifytype.h" #include "imageviewer.h" #include "watchutils.h" -#include "cdb/cdbengine.h" // Remove after string freeze #include @@ -1185,9 +1184,9 @@ QString WatchModel::nameForFormat(int format) case AutomaticFormat: return tr("Automatic"); case RawFormat: return tr("Raw Data"); - case SimpleFormat: return CdbEngine::tr("Normal"); // FIXME: String + case SimpleFormat: return tr("Normal"); case EnhancedFormat: return tr("Enhanced"); - case SeparateFormat: return CdbEngine::tr("Separate Window"); // FIXME: String + case SeparateFormat: return tr("Separate Window"); case Latin1StringFormat: return tr("Latin1 String"); case SeparateLatin1StringFormat: return tr("Latin1 String in Separate Window");