From fbe95ad4586ed671aa735f260f6200b3c778b12f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 26 Aug 2009 13:24:59 +0000 Subject: [PATCH] Fix warning: deprecated conversion from string constant to 'char*'. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32709 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/preferences/screen/AlertView.cpp | 2 +- src/preferences/screen/AlertView.h | 2 +- src/preferences/screen/MonitorView.cpp | 2 +- src/preferences/screen/MonitorView.h | 2 +- src/preferences/time/DateTimeEdit.cpp | 2 +- src/preferences/time/TZDisplay.cpp | 2 +- src/preferences/virtualmemory/SettingsWindow.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/preferences/screen/AlertView.cpp b/src/preferences/screen/AlertView.cpp index 47fc6e0360..394a7881f5 100644 --- a/src/preferences/screen/AlertView.cpp +++ b/src/preferences/screen/AlertView.cpp @@ -25,7 +25,7 @@ #include -AlertView::AlertView(BRect frame, char *name) +AlertView::AlertView(BRect frame, const char *name) : BView(frame, name, B_FOLLOW_ALL, B_WILL_DRAW | B_PULSE_NEEDED), // we will wait 12 seconds until we send a message fSeconds(12) diff --git a/src/preferences/screen/AlertView.h b/src/preferences/screen/AlertView.h index 4c99960c1a..66432b3c42 100644 --- a/src/preferences/screen/AlertView.h +++ b/src/preferences/screen/AlertView.h @@ -20,7 +20,7 @@ class BStringView; class AlertView : public BView { public: - AlertView(BRect frame, char* name); + AlertView(BRect frame, const char* name); virtual void AttachedToWindow(); virtual void Draw(BRect updateRect); diff --git a/src/preferences/screen/MonitorView.cpp b/src/preferences/screen/MonitorView.cpp index 8cc6fbb9fd..66d8af2c1d 100644 --- a/src/preferences/screen/MonitorView.cpp +++ b/src/preferences/screen/MonitorView.cpp @@ -20,7 +20,7 @@ #include "Constants.h" -MonitorView::MonitorView(BRect rect, char *name, int32 width, int32 height) +MonitorView::MonitorView(BRect rect, const char *name, int32 width, int32 height) : BView(rect, name, B_FOLLOW_ALL, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE), fMaxWidth(1920), fMaxHeight(1200), diff --git a/src/preferences/screen/MonitorView.h b/src/preferences/screen/MonitorView.h index a3ed0ff611..a065de7bd5 100644 --- a/src/preferences/screen/MonitorView.h +++ b/src/preferences/screen/MonitorView.h @@ -17,7 +17,7 @@ class MonitorView : public BView { public: - MonitorView(BRect frame, char* name, + MonitorView(BRect frame, const char* name, int32 screenWidth, int32 screenHeight); virtual ~MonitorView(); diff --git a/src/preferences/time/DateTimeEdit.cpp b/src/preferences/time/DateTimeEdit.cpp index c30e81eea9..7c4d7b6330 100644 --- a/src/preferences/time/DateTimeEdit.cpp +++ b/src/preferences/time/DateTimeEdit.cpp @@ -170,7 +170,7 @@ TTimeEdit::DrawSeparator(uint32 index) BRect bounds = section->Frame(); float sepWidth = SeparatorWidth(); - char* sep = ":"; + const char* sep = ":"; if (index == 2) sep = "-"; diff --git a/src/preferences/time/TZDisplay.cpp b/src/preferences/time/TZDisplay.cpp index 06e234d967..aae3faed0d 100644 --- a/src/preferences/time/TZDisplay.cpp +++ b/src/preferences/time/TZDisplay.cpp @@ -123,7 +123,7 @@ TTZDisplay::SetTime(int32 hour, int32 minute) if (ahour == 0) ahour = 12; - char *ap = "AM"; + const char *ap = "AM"; if (hour > 11) ap = "PM"; diff --git a/src/preferences/virtualmemory/SettingsWindow.cpp b/src/preferences/virtualmemory/SettingsWindow.cpp index 82ff32b54b..eb456c8830 100644 --- a/src/preferences/virtualmemory/SettingsWindow.cpp +++ b/src/preferences/virtualmemory/SettingsWindow.cpp @@ -58,7 +58,7 @@ byte_string(int64 size) if (value < 1024) snprintf(string, sizeof(string), "%Ld B", size); else { - char *units[] = {"K", "M", "G", NULL}; + const char *units[] = {"K", "M", "G", NULL}; int32 i = -1; do {