Browse Source

Fix some warnings in plProgressMgr.

Darryl Pogue 13 years ago
parent
commit
d1608edf4a
  1. 4
      Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.cpp
  2. 4
      Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.h

4
Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.cpp

@ -70,7 +70,7 @@ plProgressMgr *plProgressMgr::fManager = nil;
char* plProgressMgr::fImageRotation[LOADING_RES_COUNT]; char* plProgressMgr::fImageRotation[LOADING_RES_COUNT];
char* plProgressMgr::fStaticTextIDs[] = { const char* plProgressMgr::fStaticTextIDs[] = {
"xLoading_Linking_Text.png", "xLoading_Linking_Text.png",
"xLoading_Updating_Text.png" "xLoading_Updating_Text.png"
}; };
@ -249,7 +249,7 @@ char* plProgressMgr::GetLoadingFrameID(int index)
return fImageRotation[0]; return fImageRotation[0];
} }
char* plProgressMgr::GetStaticTextID(StaticText staticTextType) const char* plProgressMgr::GetStaticTextID(StaticText staticTextType)
{ {
return fStaticTextIDs[staticTextType]; return fStaticTextIDs[staticTextType];
} }

4
Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.h

@ -197,7 +197,7 @@ class plProgressMgr
static plProgressMgr *fManager; static plProgressMgr *fManager;
static char* fImageRotation[]; static char* fImageRotation[];
static char* fStaticTextIDs[]; static const char* fStaticTextIDs[];
protected: protected:
@ -230,7 +230,7 @@ class plProgressMgr
static plProgressMgr* GetInstance() { return fManager; } static plProgressMgr* GetInstance() { return fManager; }
static char* GetLoadingFrameID(int index); static char* GetLoadingFrameID(int index);
static char* GetStaticTextID(StaticText staticTextType); static const char* GetStaticTextID(StaticText staticTextType);
virtual void Draw( plPipeline *p ) { } virtual void Draw( plPipeline *p ) { }

Loading…
Cancel
Save