From 6d22edc2d8accdfa1fabdd2722859453cc734990 Mon Sep 17 00:00:00 2001 From: louis Date: Thu, 2 Apr 2015 11:57:19 +0200 Subject: fixed some compiler warnings --- libtemplate/parameter.c | 2 +- libtemplate/parameter.h | 2 +- libtemplate/templatefunction.c | 4 +++- libtemplate/templatepixmap.c | 2 -- libtemplate/templateviewlist.c | 1 - 5 files changed, 5 insertions(+), 6 deletions(-) (limited to 'libtemplate') diff --git a/libtemplate/parameter.c b/libtemplate/parameter.c index 1479014..1675a8d 100644 --- a/libtemplate/parameter.c +++ b/libtemplate/parameter.c @@ -254,7 +254,7 @@ void cConditionalParameter::Tokenize(void) { } } -bool cConditionalParameter::Evaluate(map < string, int > *intTokens, map < string, string > *stringTokens) { +void cConditionalParameter::Evaluate(map < string, int > *intTokens, map < string, string > *stringTokens) { isTrue = false; bool first = true; for (vector::iterator cond = conditions.begin(); cond != conditions.end(); cond++) { diff --git a/libtemplate/parameter.h b/libtemplate/parameter.h index c92af28..bd20758 100644 --- a/libtemplate/parameter.h +++ b/libtemplate/parameter.h @@ -134,7 +134,7 @@ public: cConditionalParameter(cGlobals *globals, string value); virtual ~cConditionalParameter(void); void Tokenize(void); - bool Evaluate(map < string, int > *intTokens, map < string, string > *stringTokens); + void Evaluate(map < string, int > *intTokens, map < string, string > *stringTokens); bool IsTrue(void) { return isTrue; }; void Debug(void); }; diff --git a/libtemplate/templatefunction.c b/libtemplate/templatefunction.c index 9cd1861..6aa1ddd 100644 --- a/libtemplate/templatefunction.c +++ b/libtemplate/templatefunction.c @@ -316,6 +316,8 @@ bool cTemplateFunction::ReCalculateParameters(void) { case ptRowHeight: SetNumericParameter(type, value); break; + default: + break; } if (!paramValid) { paramsValid = false; @@ -1356,7 +1358,7 @@ int cTemplateFunction::CalculateTextBoxHeight(void) { stringstream sstrTextTall; stringstream sstrTextFull; - for (int i=0; i *string InitIterator(); cTemplateFunction *func = NULL; bool completelyParsed = true; - bool updated = false; while(func = GetNextFunction()) { func->SetStringTokens(stringTokens); func->SetIntTokens(intTokens); @@ -340,7 +339,6 @@ cTemplateFunction *cTemplatePixmap::GetScrollFunction(void) { return NULL; InitIterator(); cTemplateFunction *f = NULL; - bool foundElement = false; while (f = GetNextFunction()) { string funcName = f->GetParameter(ptName); if (!funcName.compare(scrollElement)) { diff --git a/libtemplate/templateviewlist.c b/libtemplate/templateviewlist.c index 0a6cabc..1d5dabe 100644 --- a/libtemplate/templateviewlist.c +++ b/libtemplate/templateviewlist.c @@ -115,7 +115,6 @@ cFont *cTemplateViewList::GetTextAreaFont(void) { if (!listElement) return NULL; - int fontWidth = 0; int numItems = GetNumericParameter(ptNumElements); int listHeight = GetNumericParameter(ptHeight); if (listHeight <= 0) -- cgit v1.2.3