From 6bda235a592737fa04aefa756026f32892810715 Mon Sep 17 00:00:00 2001
From: Stefano Ceccherini <stefano.ceccherini@gmail.com>
Date: Fri, 17 Oct 2008 08:08:20 +0000
Subject: [PATCH] some gcc4 warning fixes

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28207 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp | 2 +-
 src/add-ons/translators/jpeg2000/JPEG2000Translator.h   | 2 +-
 src/apps/pulse/NormalPulseView.cpp                      | 2 +-
 src/bin/vmstat.cpp                                      | 2 +-
 src/preferences/screen/ScreenWindow.cpp                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp b/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
index c41a7f0376..b754ca8d33 100644
--- a/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
+++ b/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
@@ -663,7 +663,7 @@ SSlider::SSlider(BRect frame, const char *name, const char *label,
 
 
 //!	Update status string - show actual value
-char*
+const char*
 SSlider::UpdateText() const
 {
 	snprintf(fStatusLabel, sizeof(fStatusLabel), "%ld", Value());
diff --git a/src/add-ons/translators/jpeg2000/JPEG2000Translator.h b/src/add-ons/translators/jpeg2000/JPEG2000Translator.h
index 50112e58bb..9e210b4d97 100644
--- a/src/add-ons/translators/jpeg2000/JPEG2000Translator.h
+++ b/src/add-ons/translators/jpeg2000/JPEG2000Translator.h
@@ -89,7 +89,7 @@ class SSlider : public BSlider {
 					thumb_style thumbType = B_BLOCK_THUMB,
 					uint32 resizingMode = B_FOLLOW_LEFT | B_FOLLOW_TOP,
 					uint32 flags = B_NAVIGABLE | B_WILL_DRAW | B_FRAME_EVENTS);
-		char*	UpdateText() const;
+		const char*	UpdateText() const;
 		void	ResizeToPreferred();
 
 	private:
diff --git a/src/apps/pulse/NormalPulseView.cpp b/src/apps/pulse/NormalPulseView.cpp
index 58cd2be6eb..38aceff56e 100644
--- a/src/apps/pulse/NormalPulseView.cpp
+++ b/src/apps/pulse/NormalPulseView.cpp
@@ -238,7 +238,7 @@ NormalPulseView::Pulse()
 		if (Window()->Lock()) {
 			// Set the value of each CPU bar
 			for (int x = 0; x < fCpuCount; x++) {
-				fProgressBars[x]->Set(max_c(0, cpu_times[x] * 100));
+				fProgressBars[x]->Set((int32)max_c(0, cpu_times[x] * 100));
 			}
 
 			Sync();
diff --git a/src/bin/vmstat.cpp b/src/bin/vmstat.cpp
index 96e2613e49..8575cf8c97 100644
--- a/src/bin/vmstat.cpp
+++ b/src/bin/vmstat.cpp
@@ -27,7 +27,7 @@ void
 usage(int status)
 {
 	fprintf(stderr, "usage: %s [-p] [-r <time>]\n"
-		" -p,--periodic\tDumps changes periodically every second.\n",
+		" -p,--periodic\tDumps changes periodically every second.\n"
 		" -r,--rate\tDumps changes periodically every <time> milli seconds.\n",
 		kProgramName);
 
diff --git a/src/preferences/screen/ScreenWindow.cpp b/src/preferences/screen/ScreenWindow.cpp
index 2e682b0d3b..9032f5dd33 100644
--- a/src/preferences/screen/ScreenWindow.cpp
+++ b/src/preferences/screen/ScreenWindow.cpp
@@ -285,7 +285,7 @@ ScreenWindow::ScreenWindow(ScreenSettings *settings)
 		item->SetMarked(true);
 
 	fMonitorView = new MonitorView(BRect(0.0, 0.0, 80.0, 80.0), "monitor",
-		screen.Frame().Width() + 1, screen.Frame().Height() + 1);
+		screen.Frame().IntegerWidth() + 1, screen.Frame().IntegerHeight() + 1);
 	fScreenBox->AddChild(fMonitorView);
 
 	view->AddChild(fScreenBox);