From bb1fc737154117f4eb8cdf623aae97c3059303fa Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Wed, 12 Aug 2009 03:01:48 +0000 Subject: [PATCH] Fixed BGLView constructor: name string argument wasn't qualified constant! Fixed GCC4 warnings in GLInfo. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32267 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/opengl/GLView.h | 4 ++-- src/kits/opengl/GLView.cpp | 4 ++-- src/tests/kits/opengl/glinfo/GLInfo.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/headers/os/opengl/GLView.h b/headers/os/opengl/GLView.h index f4f672bbfd..1b5cdb0b02 100644 --- a/headers/os/opengl/GLView.h +++ b/headers/os/opengl/GLView.h @@ -34,7 +34,7 @@ class GLRendererRoster; class BGLView : public BView { public: - BGLView(BRect rect, char *name, + BGLView(BRect rect, const char *name, ulong resizingMode, ulong mode, ulong options); virtual ~BGLView(); @@ -119,7 +119,7 @@ private: class BGLScreen : public BWindowScreen { public: - BGLScreen(char *name, + BGLScreen(const char *name, ulong screenMode, ulong options, status_t *error, bool debug=false); ~BGLScreen(); diff --git a/src/kits/opengl/GLView.cpp b/src/kits/opengl/GLView.cpp index d55b2fa8e7..9fee69465e 100644 --- a/src/kits/opengl/GLView.cpp +++ b/src/kits/opengl/GLView.cpp @@ -55,7 +55,7 @@ struct glview_direct_info { }; -BGLView::BGLView(BRect rect, char *name, ulong resizingMode, ulong mode, +BGLView::BGLView(BRect rect, const char *name, ulong resizingMode, ulong mode, ulong options) : BView(rect, name, B_FOLLOW_ALL_SIDES, mode | B_WILL_DRAW | B_FRAME_EVENTS), // | B_FULL_UPDATE_ON_RESIZE) fGc(NULL), @@ -462,7 +462,7 @@ BGLView &BGLView::operator=(const BGLView &v) // TODO: implement BGLScreen class... -BGLScreen::BGLScreen(char *name, ulong screenMode, ulong options, +BGLScreen::BGLScreen(const char *name, ulong screenMode, ulong options, status_t *error, bool debug) : BWindowScreen(name, screenMode, error, debug) { diff --git a/src/tests/kits/opengl/glinfo/GLInfo.cpp b/src/tests/kits/opengl/glinfo/GLInfo.cpp index dc068e9e19..58a319c572 100644 --- a/src/tests/kits/opengl/glinfo/GLInfo.cpp +++ b/src/tests/kits/opengl/glinfo/GLInfo.cpp @@ -43,7 +43,7 @@ private: }; -void AddItem(BListView *list, int level, char *text, ...) +void AddItem(BListView *list, int level, const char *text, ...) { char buffer[512]; va_list arg;