mirror of
https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
synced 2023-10-19 17:58:31 +02:00
fixed some compiler warnings
This commit is contained in:
parent
70ce62e353
commit
6d22edc2d8
@ -156,7 +156,7 @@ vector<string>& splitstring::split(char delim, int rep) {
|
||||
string work = data();
|
||||
string buf = "";
|
||||
int i = 0;
|
||||
while (i < work.length()) {
|
||||
while (i < (int)work.length()) {
|
||||
if (work[i] != delim)
|
||||
buf += work[i];
|
||||
else if (rep == 1) {
|
||||
|
@ -91,7 +91,7 @@ cImage *cImageCache::GetLogo(string channelID, int width, int height) {
|
||||
return NULL;
|
||||
bool success = LoadLogo(channel);
|
||||
if (success) {
|
||||
if (config.limitLogoCache && (channelLogoCache.size() >= config.numLogosMax)) {
|
||||
if (config.limitLogoCache && ((int)channelLogoCache.size() >= config.numLogosMax)) {
|
||||
//logo cache is full, don't cache anymore
|
||||
if (tempStaticLogo) {
|
||||
delete tempStaticLogo;
|
||||
@ -245,6 +245,8 @@ string cImageCache::GetIconName(string label, eMenuCategory cat) {
|
||||
return "standardicons/Miscellaneous";
|
||||
case mcCommand:
|
||||
return "standardicons/Commands";
|
||||
default:
|
||||
break;
|
||||
}
|
||||
//check for standard menu entries
|
||||
for (int i=0; i<16; i++) {
|
||||
|
@ -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<sCondition>::iterator cond = conditions.begin(); cond != conditions.end(); cond++) {
|
||||
|
@ -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);
|
||||
};
|
||||
|
@ -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<flds.size(); i++) {
|
||||
for (int i=0; i < (int)flds.size(); i++) {
|
||||
if (!flds[i].size()) {
|
||||
//empty line
|
||||
linesDrawn++;
|
||||
|
@ -189,7 +189,6 @@ void cTemplatePixmap::ParseDynamicFunctionParameters(map <string,string> *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)) {
|
||||
|
@ -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)
|
||||
|
@ -360,7 +360,6 @@ void cView::DrawLoop(int numPixmap, cTemplateFunction *func, map < string, vecto
|
||||
int columnWidth = loopFunc->GetNumericParameter(ptColumnWidth);
|
||||
int rowHeight = loopFunc->GetNumericParameter(ptRowHeight);
|
||||
int overflow = loopFunc->GetNumericParameter(ptOverflow);
|
||||
int maxItems = loopFunc->GetNumericParameter(ptNumElements);
|
||||
|
||||
int x0 = loopX0;
|
||||
int y0 = loopY0;
|
||||
@ -515,7 +514,6 @@ void cView::DoDrawTextVertical(int num, cTemplateFunction *func, int x0, int y0)
|
||||
int fontSize = func->GetNumericParameter(ptFontSize);
|
||||
int direction = func->GetNumericParameter(ptDirection);
|
||||
tColor clr = func->GetColorParameter(ptColor);
|
||||
tColor clrBack = clrTransparent;
|
||||
string text = func->GetText(false);
|
||||
cImage *textVertical = imgCache->GetVerticalText(text, clr, fontName, fontSize, direction);
|
||||
if (!textVertical)
|
||||
@ -649,7 +647,7 @@ void cView::DoDrawFloatingTextBox(int num, cTemplateFunction *func) {
|
||||
std::stringstream sstrTextTall;
|
||||
std::stringstream sstrTextFull;
|
||||
|
||||
for (int i=0; i<flds.size(); i++) {
|
||||
for (int i=0; i < (int)flds.size(); i++) {
|
||||
if (!flds[i].size()) {
|
||||
//empty line
|
||||
linesDrawn++;
|
||||
|
Loading…
Reference in New Issue
Block a user