From 9e11c3adb1eb18ab7cce6b8cf32dfc005369af03 Mon Sep 17 00:00:00 2001
From: Dario Casalinuovo <b.vitruvio@gmail.com>
Date: Thu, 2 Apr 2015 10:14:44 +0200
Subject: [PATCH] Deskbar: No need to use dynamic allocation, remove unused
 headers.

Signed-off-by: Adrien Destugues <pulkomandy@gmail.com>
---
 src/apps/deskbar/ShowHideMenuItem.cpp    | 4 ----
 src/apps/deskbar/TruncatableMenuItem.cpp | 7 ++++---
 src/apps/deskbar/WindowMenu.cpp          | 4 ----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/apps/deskbar/ShowHideMenuItem.cpp b/src/apps/deskbar/ShowHideMenuItem.cpp
index de39e2f77a..28f7a09f7b 100644
--- a/src/apps/deskbar/ShowHideMenuItem.cpp
+++ b/src/apps/deskbar/ShowHideMenuItem.cpp
@@ -36,10 +36,6 @@ All rights reserved.
 
 #include "ShowHideMenuItem.h"
 
-#include <malloc.h>
-#include <stdio.h>
-#include <strings.h>
-
 #include <Debug.h>
 #include <Roster.h>
 #include <WindowInfo.h>
diff --git a/src/apps/deskbar/TruncatableMenuItem.cpp b/src/apps/deskbar/TruncatableMenuItem.cpp
index 7b12880ec8..542b4d013c 100644
--- a/src/apps/deskbar/TruncatableMenuItem.cpp
+++ b/src/apps/deskbar/TruncatableMenuItem.cpp
@@ -37,6 +37,8 @@ All rights reserved.
 
 #include "TruncatableMenuItem.h"
 
+#include <StackOrHeapArray.h>
+
 #include <stdlib.h>
 
 #include "BarApp.h"
@@ -100,13 +102,12 @@ TTruncatableMenuItem::Label(float width)
 
 	const char* label = Label();
 	if (width > 0 && maxWidth > 0 && width > maxWidth) {
-		char* truncatedLabel = (char*)malloc(strlen(label) + 4);
-		if (truncatedLabel != NULL) {
+		BStackOrHeapArray<char, 128> truncatedLabel(strlen(label) + 4);
+		if (truncatedLabel.IsValid()) {
 			float labelWidth = menu->StringWidth(label);
 			float offset = width - labelWidth;
 			TruncateLabel(maxWidth - offset, truncatedLabel);
 			fTruncatedString.SetTo(truncatedLabel);
-			free(truncatedLabel);
 			return fTruncatedString.String();
 		}
 	}
diff --git a/src/apps/deskbar/WindowMenu.cpp b/src/apps/deskbar/WindowMenu.cpp
index ce5e948784..bbd2673dc8 100644
--- a/src/apps/deskbar/WindowMenu.cpp
+++ b/src/apps/deskbar/WindowMenu.cpp
@@ -36,10 +36,6 @@ All rights reserved.
 
 #include "WindowMenu.h"
 
-#include <malloc.h>
-#include <stdio.h>
-#include <strings.h>
-
 #include <Catalog.h>
 #include <Locale.h>
 #include <Window.h>