some gcc4 warning fixes
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28207 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -663,7 +663,7 @@ SSlider::SSlider(BRect frame, const char *name, const char *label,
|
|||||||
|
|
||||||
|
|
||||||
//! Update status string - show actual value
|
//! Update status string - show actual value
|
||||||
char*
|
const char*
|
||||||
SSlider::UpdateText() const
|
SSlider::UpdateText() const
|
||||||
{
|
{
|
||||||
snprintf(fStatusLabel, sizeof(fStatusLabel), "%ld", Value());
|
snprintf(fStatusLabel, sizeof(fStatusLabel), "%ld", Value());
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ class SSlider : public BSlider {
|
|||||||
thumb_style thumbType = B_BLOCK_THUMB,
|
thumb_style thumbType = B_BLOCK_THUMB,
|
||||||
uint32 resizingMode = B_FOLLOW_LEFT | B_FOLLOW_TOP,
|
uint32 resizingMode = B_FOLLOW_LEFT | B_FOLLOW_TOP,
|
||||||
uint32 flags = B_NAVIGABLE | B_WILL_DRAW | B_FRAME_EVENTS);
|
uint32 flags = B_NAVIGABLE | B_WILL_DRAW | B_FRAME_EVENTS);
|
||||||
char* UpdateText() const;
|
const char* UpdateText() const;
|
||||||
void ResizeToPreferred();
|
void ResizeToPreferred();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|||||||
@@ -238,7 +238,7 @@ NormalPulseView::Pulse()
|
|||||||
if (Window()->Lock()) {
|
if (Window()->Lock()) {
|
||||||
// Set the value of each CPU bar
|
// Set the value of each CPU bar
|
||||||
for (int x = 0; x < fCpuCount; x++) {
|
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();
|
Sync();
|
||||||
|
|||||||
+1
-1
@@ -27,7 +27,7 @@ void
|
|||||||
usage(int status)
|
usage(int status)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "usage: %s [-p] [-r <time>]\n"
|
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",
|
" -r,--rate\tDumps changes periodically every <time> milli seconds.\n",
|
||||||
kProgramName);
|
kProgramName);
|
||||||
|
|
||||||
|
|||||||
@@ -285,7 +285,7 @@ ScreenWindow::ScreenWindow(ScreenSettings *settings)
|
|||||||
item->SetMarked(true);
|
item->SetMarked(true);
|
||||||
|
|
||||||
fMonitorView = new MonitorView(BRect(0.0, 0.0, 80.0, 80.0), "monitor",
|
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);
|
fScreenBox->AddChild(fMonitorView);
|
||||||
|
|
||||||
view->AddChild(fScreenBox);
|
view->AddChild(fScreenBox);
|
||||||
|
|||||||
Reference in New Issue
Block a user