From d1608edf4a1653329edff45aaeaa317311f9c623 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Fri, 28 Oct 2011 23:13:23 -0700 Subject: [PATCH] Fix some warnings in plProgressMgr. --- Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.cpp | 4 ++-- Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.cpp b/Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.cpp index 1815f7c1..2871d17d 100644 --- a/Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.cpp @@ -70,7 +70,7 @@ plProgressMgr *plProgressMgr::fManager = nil; char* plProgressMgr::fImageRotation[LOADING_RES_COUNT]; -char* plProgressMgr::fStaticTextIDs[] = { +const char* plProgressMgr::fStaticTextIDs[] = { "xLoading_Linking_Text.png", "xLoading_Updating_Text.png" }; @@ -249,7 +249,7 @@ char* plProgressMgr::GetLoadingFrameID(int index) return fImageRotation[0]; } -char* plProgressMgr::GetStaticTextID(StaticText staticTextType) +const char* plProgressMgr::GetStaticTextID(StaticText staticTextType) { return fStaticTextIDs[staticTextType]; } diff --git a/Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.h b/Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.h index ae72db85..5b156aeb 100644 --- a/Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.h +++ b/Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.h @@ -197,7 +197,7 @@ class plProgressMgr static plProgressMgr *fManager; static char* fImageRotation[]; - static char* fStaticTextIDs[]; + static const char* fStaticTextIDs[]; protected: @@ -230,7 +230,7 @@ class plProgressMgr static plProgressMgr* GetInstance() { return fManager; } static char* GetLoadingFrameID(int index); - static char* GetStaticTextID(StaticText staticTextType); + static const char* GetStaticTextID(StaticText staticTextType); virtual void Draw( plPipeline *p ) { }