From e937cd109086e50ccf2648e0585e261aafaa0825 Mon Sep 17 00:00:00 2001
From: Timo Lotterbach <timo.lotterbach@bmw-carit.de>
Date: Mon, 11 Mar 2013 08:07:16 -0700
Subject: [PATCH] LayerManagerCommands: log screen/layer/surface IDs in decimal
 and hex

Signed-off-by: Timo Lotterbach <timo.lotterbach@bmw-carit.de>
---
 LayerManagerCommands/src/GetOptimizationModeCommand.cpp            | 2 +-
 LayerManagerCommands/src/LayerAddSurfaceCommand.cpp                | 4 ++--
 LayerManagerCommands/src/LayerCreateCommand.cpp                    | 2 +-
 LayerManagerCommands/src/LayerDumpCommand.cpp                      | 2 +-
 LayerManagerCommands/src/LayerGetDimensionCommand.cpp              | 2 +-
 LayerManagerCommands/src/LayerGetOpacityCommand.cpp                | 2 +-
 LayerManagerCommands/src/LayerGetOrientationCommand.cpp            | 2 +-
 LayerManagerCommands/src/LayerGetPositionCommand.cpp               | 2 +-
 LayerManagerCommands/src/LayerGetVisibilityCommand.cpp             | 2 +-
 LayerManagerCommands/src/LayerRemoveCommand.cpp                    | 2 +-
 LayerManagerCommands/src/LayerRemoveSurfaceCommand.cpp             | 4 ++--
 LayerManagerCommands/src/LayerSetChromaKeyCommand.cpp              | 2 +-
 LayerManagerCommands/src/LayerSetDestinationRectangleCommand.cpp   | 2 +-
 LayerManagerCommands/src/LayerSetDimensionCommand.cpp              | 2 +-
 LayerManagerCommands/src/LayerSetOpacityCommand.cpp                | 2 +-
 LayerManagerCommands/src/LayerSetOrientationCommand.cpp            | 2 +-
 LayerManagerCommands/src/LayerSetPositionCommand.cpp               | 2 +-
 LayerManagerCommands/src/LayerSetRenderOrderCommand.cpp            | 2 +-
 LayerManagerCommands/src/LayerSetSourceRectangleCommand.cpp        | 2 +-
 LayerManagerCommands/src/LayerSetTypeCommand.cpp                   | 2 +-
 LayerManagerCommands/src/LayerSetVisibilityCommand.cpp             | 2 +-
 LayerManagerCommands/src/ScreenDumpCommand.cpp                     | 2 +-
 LayerManagerCommands/src/ScreenSetRenderOrderCommand.cpp           | 2 +-
 LayerManagerCommands/src/SetOptimizationModeCommand.cpp            | 2 +-
 LayerManagerCommands/src/ShaderDestroyCommand.cpp                  | 2 +-
 LayerManagerCommands/src/SurfaceCreateCommand.cpp                  | 2 +-
 LayerManagerCommands/src/SurfaceDumpCommand.cpp                    | 2 +-
 LayerManagerCommands/src/SurfaceGetDimensionCommand.cpp            | 2 +-
 LayerManagerCommands/src/SurfaceGetKeyboardFocusCommand.cpp        | 2 +-
 LayerManagerCommands/src/SurfaceGetOpacityCommand.cpp              | 2 +-
 LayerManagerCommands/src/SurfaceGetOrientationCommand.cpp          | 2 +-
 LayerManagerCommands/src/SurfaceGetPixelformatCommand.cpp          | 2 +-
 LayerManagerCommands/src/SurfaceGetPositionCommand.cpp             | 2 +-
 LayerManagerCommands/src/SurfaceGetVisibilityCommand.cpp           | 2 +-
 LayerManagerCommands/src/SurfaceRemoveCommand.cpp                  | 2 +-
 LayerManagerCommands/src/SurfaceRemoveNativeContentCommand.cpp     | 2 +-
 LayerManagerCommands/src/SurfaceSetChromaKeyCommand.cpp            | 2 +-
 LayerManagerCommands/src/SurfaceSetDestinationRectangleCommand.cpp | 2 +-
 LayerManagerCommands/src/SurfaceSetDimensionCommand.cpp            | 2 +-
 LayerManagerCommands/src/SurfaceSetKeyboardFocusCommand.cpp        | 2 +-
 LayerManagerCommands/src/SurfaceSetNativeContentCommand.cpp        | 2 +-
 LayerManagerCommands/src/SurfaceSetOpacityCommand.cpp              | 2 +-
 LayerManagerCommands/src/SurfaceSetOrientationCommand.cpp          | 2 +-
 LayerManagerCommands/src/SurfaceSetPositionCommand.cpp             | 2 +-
 LayerManagerCommands/src/SurfaceSetShaderCommand.cpp               | 2 +-
 LayerManagerCommands/src/SurfaceSetSourceRectangleCommand.cpp      | 2 +-
 LayerManagerCommands/src/SurfaceSetVisibilityCommand.cpp           | 2 +-
 LayerManagerCommands/src/SurfaceUpdateInputEventAcceptance.cpp     | 2 +-
 48 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/LayerManagerCommands/src/GetOptimizationModeCommand.cpp b/LayerManagerCommands/src/GetOptimizationModeCommand.cpp
index feefe3a..1783461 100644
--- a/LayerManagerCommands/src/GetOptimizationModeCommand.cpp
+++ b/LayerManagerCommands/src/GetOptimizationModeCommand.cpp
@@ -46,7 +46,7 @@ const std::string GetOptimizationModeCommand::getString()
 {
     std::stringstream description;
     description << "GetOptimizationModeCommand("
-                << "id=" << (int)m_id
+                << "id=" << (int)m_id << "(0x" << std::hex << (int)m_id << ")" << std::dec
                 << ", pReturnMode=" << (int)(*m_pReturnMode)
                 << ")";
     return description.str();
diff --git a/LayerManagerCommands/src/LayerAddSurfaceCommand.cpp b/LayerManagerCommands/src/LayerAddSurfaceCommand.cpp
index b091169..8c39051 100644
--- a/LayerManagerCommands/src/LayerAddSurfaceCommand.cpp
+++ b/LayerManagerCommands/src/LayerAddSurfaceCommand.cpp
@@ -54,8 +54,8 @@ const std::string LayerAddSurfaceCommand::getString()
 {
     std::stringstream description;
     description << "LayerAddSurfaceCommand("
-                << "layerid=" << m_layerid
-                << ", surfaceid=" << m_surfaceid
+                << "layerid=" << m_layerid << "(0x" << std::hex << m_layerid << ")" << std::dec
+                << ", surfaceid=" << m_surfaceid << "(0x" << std::hex << m_surfaceid << ")" << std::dec
                 << ")";
     return description.str();
 }
diff --git a/LayerManagerCommands/src/LayerCreateCommand.cpp b/LayerManagerCommands/src/LayerCreateCommand.cpp
index 587aeaf..0bf06fa 100644
--- a/LayerManagerCommands/src/LayerCreateCommand.cpp
+++ b/LayerManagerCommands/src/LayerCreateCommand.cpp
@@ -48,7 +48,7 @@ const std::string LayerCreateCommand::getString()
     description << "LayerCreateCommand("
                 << "OriginalWidth=" << m_originalWidth
                 << ", OriginalHeight=" << m_originalHeight
-                << ", idReturn=" << m_idReturn << "=" << *m_idReturn
+                << ", idReturn=" << m_idReturn << "=" << *m_idReturn << "(0x" << std::hex << *m_idReturn << ")" << std::dec
                 << ")";
     return description.str();
 }
diff --git a/LayerManagerCommands/src/LayerDumpCommand.cpp b/LayerManagerCommands/src/LayerDumpCommand.cpp
index 5604866..2fb235a 100644
--- a/LayerManagerCommands/src/LayerDumpCommand.cpp
+++ b/LayerManagerCommands/src/LayerDumpCommand.cpp
@@ -66,7 +66,7 @@ const std::string LayerDumpCommand::getString()
     std::stringstream description;
     description << "LayerDumpCommand("
                 << "filename=" << m_filename
-                << ", id=" << m_id
+                << ", id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ")";
     return description.str();
 }
diff --git a/LayerManagerCommands/src/LayerGetDimensionCommand.cpp b/LayerManagerCommands/src/LayerGetDimensionCommand.cpp
index df0e236..3fff19e 100644
--- a/LayerManagerCommands/src/LayerGetDimensionCommand.cpp
+++ b/LayerManagerCommands/src/LayerGetDimensionCommand.cpp
@@ -50,7 +50,7 @@ const std::string LayerGetDimensionCommand::getString()
 {
     std::stringstream description;
     description << "LayerGetDimensionCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", pWidth=" << m_pWidth << "=" << *m_pWidth
                 << ", m_pHeight=" << m_pHeight << "=" << *m_pHeight
                 << ")";
diff --git a/LayerManagerCommands/src/LayerGetOpacityCommand.cpp b/LayerManagerCommands/src/LayerGetOpacityCommand.cpp
index 58caedf..d133d1f 100644
--- a/LayerManagerCommands/src/LayerGetOpacityCommand.cpp
+++ b/LayerManagerCommands/src/LayerGetOpacityCommand.cpp
@@ -42,7 +42,7 @@ const std::string LayerGetOpacityCommand::getString()
 {
     std::stringstream description;
     description << "LayerGetOpacityCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", pReturnOpacity=" << m_pReturnOpacity << "=" << *m_pReturnOpacity
                 << ")";
     return description.str();
diff --git a/LayerManagerCommands/src/LayerGetOrientationCommand.cpp b/LayerManagerCommands/src/LayerGetOrientationCommand.cpp
index 2f31cb6..684acb8 100644
--- a/LayerManagerCommands/src/LayerGetOrientationCommand.cpp
+++ b/LayerManagerCommands/src/LayerGetOrientationCommand.cpp
@@ -42,7 +42,7 @@ const std::string LayerGetOrientationCommand::getString()
 {
     std::stringstream description;
     description << "LayerGetOrientationCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", pReturnOrientation=" << m_pReturnOrientation << "=" << *m_pReturnOrientation
                 << ")";
     return description.str();
diff --git a/LayerManagerCommands/src/LayerGetPositionCommand.cpp b/LayerManagerCommands/src/LayerGetPositionCommand.cpp
index 5b6ebd6..5122310 100644
--- a/LayerManagerCommands/src/LayerGetPositionCommand.cpp
+++ b/LayerManagerCommands/src/LayerGetPositionCommand.cpp
@@ -49,7 +49,7 @@ const std::string LayerGetPositionCommand::getString()
 {
     std::stringstream description;
     description << "LayerGetPositionCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", pX=" << m_pX << "=" << *m_pX
                 << ", pY=" << m_pY << "=" << *m_pY
                 << ")";
diff --git a/LayerManagerCommands/src/LayerGetVisibilityCommand.cpp b/LayerManagerCommands/src/LayerGetVisibilityCommand.cpp
index 51d306c..72da042 100644
--- a/LayerManagerCommands/src/LayerGetVisibilityCommand.cpp
+++ b/LayerManagerCommands/src/LayerGetVisibilityCommand.cpp
@@ -44,7 +44,7 @@ const std::string LayerGetVisibilityCommand::getString()
 {
     std::stringstream description;
     description << "LayerGetVisibilityCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", pVisibility=" << m_pVisibility << "=" << *m_pVisibility
                 << ")";
     return description.str();
diff --git a/LayerManagerCommands/src/LayerRemoveCommand.cpp b/LayerManagerCommands/src/LayerRemoveCommand.cpp
index 310ff33..1343409 100644
--- a/LayerManagerCommands/src/LayerRemoveCommand.cpp
+++ b/LayerManagerCommands/src/LayerRemoveCommand.cpp
@@ -50,7 +50,7 @@ const std::string LayerRemoveCommand::getString()
 {
     std::stringstream description;
     description << "LayerRemoveCommand("
-                << "idToRemove=" << m_idToRemove
+                << "idToRemove=" << m_idToRemove << "(0x" << std::hex << m_idToRemove << ")" << std::dec
                 << ")";
     return description.str();
 }
diff --git a/LayerManagerCommands/src/LayerRemoveSurfaceCommand.cpp b/LayerManagerCommands/src/LayerRemoveSurfaceCommand.cpp
index 906e360..1215d4f 100644
--- a/LayerManagerCommands/src/LayerRemoveSurfaceCommand.cpp
+++ b/LayerManagerCommands/src/LayerRemoveSurfaceCommand.cpp
@@ -42,8 +42,8 @@ const std::string LayerRemoveSurfaceCommand::getString()
 {
     std::stringstream description;
     description << "LayerRemoveSurfaceCommand("
-                << "layerid=" << m_layerid
-                << ", surfaceid=" << m_surfaceid
+                << "layerid=" << m_layerid << "(0x" << std::hex << m_layerid << ")" << std::dec
+                << ", surfaceid=" << m_surfaceid << "(0x" << std::hex << m_surfaceid << ")" << std::dec
                 << ")";
     return description.str();
 }
diff --git a/LayerManagerCommands/src/LayerSetChromaKeyCommand.cpp b/LayerManagerCommands/src/LayerSetChromaKeyCommand.cpp
index de1aa56..9c8d6be 100644
--- a/LayerManagerCommands/src/LayerSetChromaKeyCommand.cpp
+++ b/LayerManagerCommands/src/LayerSetChromaKeyCommand.cpp
@@ -69,7 +69,7 @@ const std::string LayerSetChromaKeyCommand::getString()
 {
     std::stringstream description;
     description << "LayerSetChromaKeyCommand("
-                << "layerid=" << m_layerid
+                << "layerid=" << m_layerid << "(0x" << std::hex << m_layerid << ")" << std::dec
                 << ", m_array=[";
 
     for (unsigned int i = 0; i < m_length; ++i)
diff --git a/LayerManagerCommands/src/LayerSetDestinationRectangleCommand.cpp b/LayerManagerCommands/src/LayerSetDestinationRectangleCommand.cpp
index c0104ed..d0742ad 100644
--- a/LayerManagerCommands/src/LayerSetDestinationRectangleCommand.cpp
+++ b/LayerManagerCommands/src/LayerSetDestinationRectangleCommand.cpp
@@ -53,7 +53,7 @@ const std::string LayerSetDestinationRectangleCommand::getString()
 {
     std::stringstream description;
     description << "LayerSetDestinationRectangleCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", x=" << m_x
                 << ", y=" << m_y
                 << ", width=" << m_width
diff --git a/LayerManagerCommands/src/LayerSetDimensionCommand.cpp b/LayerManagerCommands/src/LayerSetDimensionCommand.cpp
index 3ca9372..e80c232 100644
--- a/LayerManagerCommands/src/LayerSetDimensionCommand.cpp
+++ b/LayerManagerCommands/src/LayerSetDimensionCommand.cpp
@@ -50,7 +50,7 @@ const std::string LayerSetDimensionCommand::getString()
 {
     std::stringstream description;
     description << "LayerSetDimensionCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", width=" << m_width
                 << ", height=" << m_height
                 << ")";
diff --git a/LayerManagerCommands/src/LayerSetOpacityCommand.cpp b/LayerManagerCommands/src/LayerSetOpacityCommand.cpp
index 62706c4..0b69525 100644
--- a/LayerManagerCommands/src/LayerSetOpacityCommand.cpp
+++ b/LayerManagerCommands/src/LayerSetOpacityCommand.cpp
@@ -50,7 +50,7 @@ const std::string LayerSetOpacityCommand::getString()
 {
     std::stringstream description;
     description << "LayerSetOpacityCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", opacity=" << m_opacity
                 << ")";
     return description.str();
diff --git a/LayerManagerCommands/src/LayerSetOrientationCommand.cpp b/LayerManagerCommands/src/LayerSetOrientationCommand.cpp
index 7a9db0b..8eeda93 100644
--- a/LayerManagerCommands/src/LayerSetOrientationCommand.cpp
+++ b/LayerManagerCommands/src/LayerSetOrientationCommand.cpp
@@ -49,7 +49,7 @@ const std::string LayerSetOrientationCommand::getString()
 {
     std::stringstream description;
     description << "LayerSetOrientationCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", orientation=" << m_orientation
                 << ")";
     return description.str();
diff --git a/LayerManagerCommands/src/LayerSetPositionCommand.cpp b/LayerManagerCommands/src/LayerSetPositionCommand.cpp
index 1c28b63..8929c21 100644
--- a/LayerManagerCommands/src/LayerSetPositionCommand.cpp
+++ b/LayerManagerCommands/src/LayerSetPositionCommand.cpp
@@ -49,7 +49,7 @@ const std::string LayerSetPositionCommand::getString()
 {
     std::stringstream description;
     description << "LayerSetPositionCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", m_x=" << m_x
                 << ", m_y=" << m_y
                 << ")";
diff --git a/LayerManagerCommands/src/LayerSetRenderOrderCommand.cpp b/LayerManagerCommands/src/LayerSetRenderOrderCommand.cpp
index d876584..8dff120 100644
--- a/LayerManagerCommands/src/LayerSetRenderOrderCommand.cpp
+++ b/LayerManagerCommands/src/LayerSetRenderOrderCommand.cpp
@@ -65,7 +65,7 @@ const std::string LayerSetRenderOrderCommand::getString()
 {
     std::stringstream description;
     description << "LayerSetRenderOrderCommand("
-                << "layerid=" << m_layerid
+                << "layerid=" << m_layerid << "(0x" << std::hex << m_layerid << ")" << std::dec
                 << ", m_array=[";
 
     for (unsigned int i = 0; i < m_length; ++i)
diff --git a/LayerManagerCommands/src/LayerSetSourceRectangleCommand.cpp b/LayerManagerCommands/src/LayerSetSourceRectangleCommand.cpp
index af33984..ea3fdb5 100644
--- a/LayerManagerCommands/src/LayerSetSourceRectangleCommand.cpp
+++ b/LayerManagerCommands/src/LayerSetSourceRectangleCommand.cpp
@@ -51,7 +51,7 @@ const std::string LayerSetSourceRectangleCommand::getString()
 {
     std::stringstream description;
     description << "LayerSetSourceRectangleCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", x=" << m_x
                 << ", y=" << m_y
                 << ", width=" << m_width
diff --git a/LayerManagerCommands/src/LayerSetTypeCommand.cpp b/LayerManagerCommands/src/LayerSetTypeCommand.cpp
index 2d327b4..aa5bacd 100644
--- a/LayerManagerCommands/src/LayerSetTypeCommand.cpp
+++ b/LayerManagerCommands/src/LayerSetTypeCommand.cpp
@@ -51,7 +51,7 @@ const std::string LayerSetTypeCommand::getString()
 {
     std::stringstream description;
     description << "LayerSetTypeCommand("
-                << "idtoSet=" << m_idtoSet
+                << "idtoSet=" << m_idtoSet << "(0x" << std::hex << m_idtoSet << ")" << std::dec
                 << ", layertype=" << m_layerType
                 << ")";
     return description.str();
diff --git a/LayerManagerCommands/src/LayerSetVisibilityCommand.cpp b/LayerManagerCommands/src/LayerSetVisibilityCommand.cpp
index e033d9f..1326f51 100644
--- a/LayerManagerCommands/src/LayerSetVisibilityCommand.cpp
+++ b/LayerManagerCommands/src/LayerSetVisibilityCommand.cpp
@@ -50,7 +50,7 @@ const std::string LayerSetVisibilityCommand::getString()
 {
     std::stringstream description;
     description << "LayerSetVisibilityCommand("
-                << "idtoSet=" << m_idtoSet
+                << "idtoSet=" << m_idtoSet << "(0x" << std::hex << m_idtoSet << ")" << std::dec
                 << ", visibility=" << m_visibility
                 << ")";
     return description.str();
diff --git a/LayerManagerCommands/src/ScreenDumpCommand.cpp b/LayerManagerCommands/src/ScreenDumpCommand.cpp
index 76a49a1..80f827a 100644
--- a/LayerManagerCommands/src/ScreenDumpCommand.cpp
+++ b/LayerManagerCommands/src/ScreenDumpCommand.cpp
@@ -58,7 +58,7 @@ const std::string ScreenDumpCommand::getString()
     std::stringstream description;
     description << "ScreenDumpCommand("
                 << "filename=" << m_filename
-                << ", id=" << m_id
+                << ", id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ")";
     return description.str();
 }
diff --git a/LayerManagerCommands/src/ScreenSetRenderOrderCommand.cpp b/LayerManagerCommands/src/ScreenSetRenderOrderCommand.cpp
index 7b41136..0a8484e 100644
--- a/LayerManagerCommands/src/ScreenSetRenderOrderCommand.cpp
+++ b/LayerManagerCommands/src/ScreenSetRenderOrderCommand.cpp
@@ -90,7 +90,7 @@ const std::string ScreenSetRenderOrderCommand::getString()
 {
     std::stringstream description;
     description << "ScreenSetRenderOrderCommand("
-                << "m_screenID=" << m_screenID
+                << "m_screenID=" << m_screenID << "(0x" << std::hex << m_screenID << ")" << std::dec
                 << ", m_array=[";
 
     for (unsigned int i = 0; i < m_length; ++i)
diff --git a/LayerManagerCommands/src/SetOptimizationModeCommand.cpp b/LayerManagerCommands/src/SetOptimizationModeCommand.cpp
index 2006327..d121f7c 100644
--- a/LayerManagerCommands/src/SetOptimizationModeCommand.cpp
+++ b/LayerManagerCommands/src/SetOptimizationModeCommand.cpp
@@ -46,7 +46,7 @@ const std::string SetOptimizationModeCommand::getString()
 {
     std::stringstream description;
     description << "SetOptimizationModeCommand("
-                << "id=" << (int)m_id
+                << "id=" << (int)m_id << "(0x" << std::hex << (int)m_id << ")" << std::dec
                 << ", mode=" << (int)m_mode
                 << ")";
     return description.str();
diff --git a/LayerManagerCommands/src/ShaderDestroyCommand.cpp b/LayerManagerCommands/src/ShaderDestroyCommand.cpp
index bc71bef..861310b 100644
--- a/LayerManagerCommands/src/ShaderDestroyCommand.cpp
+++ b/LayerManagerCommands/src/ShaderDestroyCommand.cpp
@@ -106,7 +106,7 @@ const std::string ShaderDestroyCommand::getString()
 {
     std::stringstream description;
     description << "DestroyShaderCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ")";
     return description.str();
 }
diff --git a/LayerManagerCommands/src/SurfaceCreateCommand.cpp b/LayerManagerCommands/src/SurfaceCreateCommand.cpp
index 3eb44a0..1c415a1 100644
--- a/LayerManagerCommands/src/SurfaceCreateCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceCreateCommand.cpp
@@ -41,7 +41,7 @@ const std::string SurfaceCreateCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceCreateCommand("
-                << "idReturn=" << m_idReturn << "=" << *m_idReturn
+                << "idReturn=" << m_idReturn << "=" << *m_idReturn << "(0x" << std::hex << *m_idReturn << ")" << std::dec
                 << ")";
     return description.str();
 }
diff --git a/LayerManagerCommands/src/SurfaceDumpCommand.cpp b/LayerManagerCommands/src/SurfaceDumpCommand.cpp
index a5ccafd..b582bf5 100644
--- a/LayerManagerCommands/src/SurfaceDumpCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceDumpCommand.cpp
@@ -68,7 +68,7 @@ const std::string SurfaceDumpCommand::getString()
     std::stringstream description;
     description << "SurfaceDumpCommand("
                 << "filename=" << m_filename
-                << ", id=" << m_id
+                << ", id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ")";
     return description.str();
 }
diff --git a/LayerManagerCommands/src/SurfaceGetDimensionCommand.cpp b/LayerManagerCommands/src/SurfaceGetDimensionCommand.cpp
index 7656a08..5439e95 100644
--- a/LayerManagerCommands/src/SurfaceGetDimensionCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceGetDimensionCommand.cpp
@@ -49,7 +49,7 @@ const std::string SurfaceGetDimensionCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceGetDimensionCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", pWidth=" << m_pWidth << "=" << *m_pWidth
                 << ", m_pHeight=" << m_pHeight << "=" << *m_pHeight
                 << ")";
diff --git a/LayerManagerCommands/src/SurfaceGetKeyboardFocusCommand.cpp b/LayerManagerCommands/src/SurfaceGetKeyboardFocusCommand.cpp
index a7cf24c..12ea0a2 100644
--- a/LayerManagerCommands/src/SurfaceGetKeyboardFocusCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceGetKeyboardFocusCommand.cpp
@@ -52,7 +52,7 @@ const std::string SurfaceGetKeyboardFocusCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceGetKeyboardFocusCommand("
-                << "pSurfId=" << m_pSurfId << "=" << *m_pSurfId
+                << "pSurfId=" << m_pSurfId << "=" << *m_pSurfId << "(0x" << std::hex << *m_pSurfId << ")" << std::dec
                 << ")";
     return description.str();
 }
diff --git a/LayerManagerCommands/src/SurfaceGetOpacityCommand.cpp b/LayerManagerCommands/src/SurfaceGetOpacityCommand.cpp
index 258ac92..bf3a227 100644
--- a/LayerManagerCommands/src/SurfaceGetOpacityCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceGetOpacityCommand.cpp
@@ -42,7 +42,7 @@ const std::string SurfaceGetOpacityCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceGetOpacityCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", pReturnOpacity=" << m_pReturnOpacity << "=" << *m_pReturnOpacity
                 << ")";
     return description.str();
diff --git a/LayerManagerCommands/src/SurfaceGetOrientationCommand.cpp b/LayerManagerCommands/src/SurfaceGetOrientationCommand.cpp
index 4bef3d1..3224b4c 100644
--- a/LayerManagerCommands/src/SurfaceGetOrientationCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceGetOrientationCommand.cpp
@@ -42,7 +42,7 @@ const std::string SurfaceGetOrientationCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceGetOrientationCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", pReturnOrientation=" << m_pReturnOrientation << "=" << *m_pReturnOrientation
                 << ")";
     return description.str();
diff --git a/LayerManagerCommands/src/SurfaceGetPixelformatCommand.cpp b/LayerManagerCommands/src/SurfaceGetPixelformatCommand.cpp
index 7bc4d34..2b5e66f 100644
--- a/LayerManagerCommands/src/SurfaceGetPixelformatCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceGetPixelformatCommand.cpp
@@ -41,7 +41,7 @@ const std::string SurfaceGetPixelformatCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceGetPixelformatCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", pFormatreturn=" << m_pFormatreturn << "=" << *m_pFormatreturn
                 << ")";
     return description.str();
diff --git a/LayerManagerCommands/src/SurfaceGetPositionCommand.cpp b/LayerManagerCommands/src/SurfaceGetPositionCommand.cpp
index 81b1efe..4748a9f 100644
--- a/LayerManagerCommands/src/SurfaceGetPositionCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceGetPositionCommand.cpp
@@ -49,7 +49,7 @@ const std::string SurfaceGetPositionCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceGetPositionCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", pX=" << m_pX << "=" << *m_pX
                 << ", pY=" << m_pY << "=" << *m_pY
                 << ")";
diff --git a/LayerManagerCommands/src/SurfaceGetVisibilityCommand.cpp b/LayerManagerCommands/src/SurfaceGetVisibilityCommand.cpp
index 268533f..04f91f6 100644
--- a/LayerManagerCommands/src/SurfaceGetVisibilityCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceGetVisibilityCommand.cpp
@@ -44,7 +44,7 @@ const std::string SurfaceGetVisibilityCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceGetVisibilityCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", pVisibility=" << m_pVisibility << "=" << *m_pVisibility
                 << ")";
     return description.str();
diff --git a/LayerManagerCommands/src/SurfaceRemoveCommand.cpp b/LayerManagerCommands/src/SurfaceRemoveCommand.cpp
index a650794..d84a1a4 100644
--- a/LayerManagerCommands/src/SurfaceRemoveCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceRemoveCommand.cpp
@@ -41,7 +41,7 @@ const std::string SurfaceRemoveCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceRemoveCommand("
-                << "idToRemove=" << m_idToRemove
+                << "idToRemove=" << m_idToRemove << "(0x" << std::hex << m_idToRemove << ")" << std::dec
                 << ")";
     return description.str();
 }
diff --git a/LayerManagerCommands/src/SurfaceRemoveNativeContentCommand.cpp b/LayerManagerCommands/src/SurfaceRemoveNativeContentCommand.cpp
index 7185069..f211b83 100644
--- a/LayerManagerCommands/src/SurfaceRemoveNativeContentCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceRemoveNativeContentCommand.cpp
@@ -49,7 +49,7 @@ const std::string SurfaceRemoveNativeContentCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceRemoveNativeContentCommand("
-                << "surfaceId=" << m_surfaceId
+                << "surfaceId=" << m_surfaceId << "(0x" << std::hex << m_surfaceId << ")" << std::dec
                 << ")";
     return description.str();
 }
diff --git a/LayerManagerCommands/src/SurfaceSetChromaKeyCommand.cpp b/LayerManagerCommands/src/SurfaceSetChromaKeyCommand.cpp
index a57c2ea..54dacab 100644
--- a/LayerManagerCommands/src/SurfaceSetChromaKeyCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceSetChromaKeyCommand.cpp
@@ -68,7 +68,7 @@ const std::string SurfaceSetChromaKeyCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceSetChromaKeyCommand("
-                << "surfaceid=" << m_surfaceid
+                << "surfaceid=" << m_surfaceid << "(0x" << std::hex << m_surfaceid << ")" << std::dec
                 << ", m_array=[";
 
     for (unsigned int i = 0; i < m_length; ++i)
diff --git a/LayerManagerCommands/src/SurfaceSetDestinationRectangleCommand.cpp b/LayerManagerCommands/src/SurfaceSetDestinationRectangleCommand.cpp
index 0f0f226..da8a945 100644
--- a/LayerManagerCommands/src/SurfaceSetDestinationRectangleCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceSetDestinationRectangleCommand.cpp
@@ -55,7 +55,7 @@ const std::string SurfaceSetDestinationRectangleCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceSetDestinationRectangleCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", x=" << m_x
                 << ", y=" << m_y
                 << ", width=" << m_width
diff --git a/LayerManagerCommands/src/SurfaceSetDimensionCommand.cpp b/LayerManagerCommands/src/SurfaceSetDimensionCommand.cpp
index 372deac..b6e32d3 100644
--- a/LayerManagerCommands/src/SurfaceSetDimensionCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceSetDimensionCommand.cpp
@@ -54,7 +54,7 @@ const std::string SurfaceSetDimensionCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceSetDimensionCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", width=" << m_width
                 << ", height=" << m_height
                 << ")";
diff --git a/LayerManagerCommands/src/SurfaceSetKeyboardFocusCommand.cpp b/LayerManagerCommands/src/SurfaceSetKeyboardFocusCommand.cpp
index 35d7a43..4ba3743 100644
--- a/LayerManagerCommands/src/SurfaceSetKeyboardFocusCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceSetKeyboardFocusCommand.cpp
@@ -45,7 +45,7 @@ const std::string SurfaceSetKeyboardFocusCommand::getString()
     std::stringstream description;
     
     description << "SurfaceSetKeyboardFocusCommand("
-                << "m_surfId=" << m_surfId
+                << "m_surfId=" << m_surfId << "(0x" << std::hex << m_surfId << ")" << std::dec
                 << ")";
     return description.str();
 }
diff --git a/LayerManagerCommands/src/SurfaceSetNativeContentCommand.cpp b/LayerManagerCommands/src/SurfaceSetNativeContentCommand.cpp
index 707ae2d..b72f87e 100644
--- a/LayerManagerCommands/src/SurfaceSetNativeContentCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceSetNativeContentCommand.cpp
@@ -56,7 +56,7 @@ const std::string SurfaceSetNativeContentCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceSetNativeContentCommand("
-                << "surfaceId=" << m_surfaceId
+                << "surfaceId=" << m_surfaceId << "(0x" << std::hex << m_surfaceId << ")" << std::dec
                 << ", nativeHandle=" << m_nativeHandle
                 << ", pixelformat=" << m_pixelformat
                 << ", OriginalWidth=" << m_originalWidth
diff --git a/LayerManagerCommands/src/SurfaceSetOpacityCommand.cpp b/LayerManagerCommands/src/SurfaceSetOpacityCommand.cpp
index 617c655..53f387b 100644
--- a/LayerManagerCommands/src/SurfaceSetOpacityCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceSetOpacityCommand.cpp
@@ -50,7 +50,7 @@ const std::string SurfaceSetOpacityCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceSetOpacityCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", opacity=" << m_opacity
                 << ")";
     return description.str();
diff --git a/LayerManagerCommands/src/SurfaceSetOrientationCommand.cpp b/LayerManagerCommands/src/SurfaceSetOrientationCommand.cpp
index 26d903b..96e511b 100644
--- a/LayerManagerCommands/src/SurfaceSetOrientationCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceSetOrientationCommand.cpp
@@ -49,7 +49,7 @@ const std::string SurfaceSetOrientationCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceSetOrientationCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", orientation=" << m_orientation
                 << ")";
     return description.str();
diff --git a/LayerManagerCommands/src/SurfaceSetPositionCommand.cpp b/LayerManagerCommands/src/SurfaceSetPositionCommand.cpp
index 560ce09..1a0938f 100644
--- a/LayerManagerCommands/src/SurfaceSetPositionCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceSetPositionCommand.cpp
@@ -53,7 +53,7 @@ const std::string SurfaceSetPositionCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceSetPositionCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", m_x=" << m_x
                 << ", m_y=" << m_y
                 << ")";
diff --git a/LayerManagerCommands/src/SurfaceSetShaderCommand.cpp b/LayerManagerCommands/src/SurfaceSetShaderCommand.cpp
index 0cf7629..0ac636f 100644
--- a/LayerManagerCommands/src/SurfaceSetShaderCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceSetShaderCommand.cpp
@@ -79,7 +79,7 @@ const std::string SurfaceSetShaderCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceSetShaderCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", shaderid=" << m_shaderid
                 << ")";
     return description.str();
diff --git a/LayerManagerCommands/src/SurfaceSetSourceRectangleCommand.cpp b/LayerManagerCommands/src/SurfaceSetSourceRectangleCommand.cpp
index 70b987c..7b0a346 100644
--- a/LayerManagerCommands/src/SurfaceSetSourceRectangleCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceSetSourceRectangleCommand.cpp
@@ -54,7 +54,7 @@ const std::string SurfaceSetSourceRectangleCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceSetSourceRectangleCommand("
-                << "id=" << m_id
+                << "id=" << m_id << "(0x" << std::hex << m_id << ")" << std::dec
                 << ", x=" << m_x
                 << ", y=" << m_y
                 << ", width=" << m_width
diff --git a/LayerManagerCommands/src/SurfaceSetVisibilityCommand.cpp b/LayerManagerCommands/src/SurfaceSetVisibilityCommand.cpp
index a1d3f12..2835187 100644
--- a/LayerManagerCommands/src/SurfaceSetVisibilityCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceSetVisibilityCommand.cpp
@@ -50,7 +50,7 @@ const std::string SurfaceSetVisibilityCommand::getString()
 {
     std::stringstream description;
     description << "SurfaceSetVisibilityCommand("
-                << "idtoSet=" << m_idtoSet
+                << "idtoSet=" << m_idtoSet << "(0x" << std::hex << m_idtoSet << ")" << std::dec
                 << ", visibility=" << m_visibility
                 << ")";
     return description.str();
diff --git a/LayerManagerCommands/src/SurfaceUpdateInputEventAcceptance.cpp b/LayerManagerCommands/src/SurfaceUpdateInputEventAcceptance.cpp
index acc7c1f..8b80686 100644
--- a/LayerManagerCommands/src/SurfaceUpdateInputEventAcceptance.cpp
+++ b/LayerManagerCommands/src/SurfaceUpdateInputEventAcceptance.cpp
@@ -45,7 +45,7 @@ const std::string SurfaceUpdateInputEventAcceptance::getString()
     std::stringstream description;
 
     description << "SurfaceUpdateInputEventAcceptance("
-                << "m_surfId=" << m_surfId
+                << "m_surfId=" << m_surfId << "(0x" << std::hex << m_surfId << ")" << std::dec
                 << ")";
     return description.str();
 }
-- 
2.7.4