Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compiler warning fixes.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37277 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Wim van der Meer 2010-06-27 10:17:50 +00:00
parent 0d29a22888
commit ca29fe0117
6 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/apps/glteapot/ObjectView.cpp
View File

@ -127,7 +127,8 @@ simonThread(void* cookie)
} }
ObjectView::ObjectView(BRect rect, char *name, ulong resizingMode, ulong options) ObjectView::ObjectView(BRect rect, const char *name, ulong resizingMode,
ulong options)
: BGLView(rect, name, resizingMode, 0, options), : BGLView(rect, name, resizingMode, 0, options),
fHistEntries(0), fHistEntries(0),
fOldestEntry(0), fOldestEntry(0),

4
src/apps/glteapot/ObjectView.h
View File

@ -53,8 +53,8 @@ struct TrackingInfo {
class ObjectView : public BGLView { class ObjectView : public BGLView {
public: public:
ObjectView(BRect rect, char* name, ulong resizingMode, ObjectView(BRect rect, const char* name,
ulong options); ulong resizingMode, ulong options);
~ObjectView(); ~ObjectView();
virtual void MouseDown(BPoint point); virtual void MouseDown(BPoint point);

6
src/apps/glteapot/TeapotWindow.cpp
View File

@ -11,8 +11,10 @@
#include "TeapotWindow.h" #include "TeapotWindow.h"
TeapotWindow::TeapotWindow(BRect rect, char* name, window_type wt, ulong something) TeapotWindow::TeapotWindow(BRect rect, const char* name, window_type wt,
: BDirectWindow(rect, name, wt, something) ulong something)
:
BDirectWindow(rect, name, wt, something)
{ {
GLenum type = BGL_RGB | BGL_DEPTH | BGL_DOUBLE; GLenum type = BGL_RGB | BGL_DEPTH | BGL_DOUBLE;

7
src/apps/glteapot/TeapotWindow.h
View File

@ -6,13 +6,16 @@
#ifndef _TEAPOT_WINDOW_ #ifndef _TEAPOT_WINDOW_
#define _TEAPOT_WINDOW_ #define _TEAPOT_WINDOW_
#include <DirectWindow.h> #include <DirectWindow.h>
#include "ObjectView.h" #include "ObjectView.h"
class TeapotWindow : public BDirectWindow { class TeapotWindow : public BDirectWindow {
public: public:
TeapotWindow(BRect r, char* name, window_type wt, ulong something); TeapotWindow(BRect r, const char* name, window_type wt,
ulong something);
virtual bool QuitRequested(); virtual bool QuitRequested();
virtual void DirectConnected( direct_buffer_info* info ); virtual void DirectConnected( direct_buffer_info* info );
@ -21,4 +24,6 @@ class TeapotWindow : public BDirectWindow {
private: private:
ObjectView* fObjectView; ObjectView* fObjectView;
}; };
#endif #endif

2
src/apps/glteapot/error.cpp
View File

@ -6,7 +6,7 @@
#include "error.h" #include "error.h"
void void
fatalerror(char *s) fatalerror(const char *s)
{ {
printf("FATAL ERROR: %s\n",s); printf("FATAL ERROR: %s\n",s);
} }

2
src/apps/glteapot/error.h
View File

@ -8,7 +8,7 @@
#include <stdio.h> #include <stdio.h>
extern void fatalerror(char *); extern void fatalerror(const char *);
#define DEBUGGING 1 #define DEBUGGING 1