[Libufo-commits] ufo-0.5/src umenumanager.cpp,1.15,1.16 uvalidator.cpp,1.2,1.3 uvertexarray.cpp,1.3,1.4

[Johannes S. <sch...@us...>]

Update of /cvsroot/libufo/ufo-0.5/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4188/src

Modified Files:
	umenumanager.cpp uvalidator.cpp uvertexarray.cpp 
Log Message:
Fixed warnings about comparison of signed vs. unsigned values. Fixed warnings about unhandled switch values. Fixed warnings about unused variables.

Index: umenumanager.cpp
===================================================================
RCS file: /cvsroot/libufo/ufo-0.5/src/umenumanager.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** umenumanager.cpp	17 Aug 2005 09:57:56 -0000	1.15
--- umenumanager.cpp	30 Sep 2005 12:37:20 -0000	1.16
***************
*** 149,152 ****
--- 149,154 ----
  				clearPath();
  			break;
+ 			default:
+ 			break;
  		}
  	}
***************
*** 210,213 ****
--- 212,217 ----
  			e->consume();
  		break;
+ 		default:
+ 		break;
  	}
  }
***************
*** 294,298 ****
  	// parent menus of item
  	std::vector<UMenu*> parents;
! 	UMenu * menu = dynamic_cast<UMenu*>(item);
  
  	UMenu * temp = dynamic_cast<UMenu*>(item->getParentMenu());
--- 298,302 ----
  	// parent menus of item
  	std::vector<UMenu*> parents;
! 	//UMenu * menu = dynamic_cast<UMenu*>(item);
  
  	UMenu * temp = dynamic_cast<UMenu*>(item->getParentMenu());
***************
*** 359,364 ****
  		return;
  	}
! 	int startIndex = parent->getIndexOf(item);
! 	int index = startIndex;
  	do {
  		index++;
--- 363,368 ----
  		return;
  	}
! 	unsigned int startIndex = parent->getIndexOf(item);
! 	unsigned int index = startIndex;
  	do {
  		index++;
***************
*** 403,408 ****
  		return;
  	}
! 	int startIndex = parent->getIndexOf(menu);
! 	int index = startIndex;
  	do {
  		index++;
--- 407,412 ----
  		return;
  	}
! 	unsigned int startIndex = parent->getIndexOf(menu);
! 	unsigned int index = startIndex;
  	do {
  		index++;

Index: uvalidator.cpp
===================================================================
RCS file: /cvsroot/libufo/ufo-0.5/src/uvalidator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** uvalidator.cpp	3 Jun 2005 13:05:47 -0000	1.2
--- uvalidator.cpp	30 Sep 2005 12:37:20 -0000	1.3
***************
*** 155,159 ****
  		return Invalid;
  	}
- 	bool ok = false;
  
  	UIStringStream stream(*text);
--- 155,158 ----
***************
*** 170,179 ****
  	if (i < std::string::npos) {
  		i++;
! 		int index = i;
  		while (index < text->length() && isdigit((*text)[index])) {
  			index++;
  		}
  
! 		if (index - i > m_decimals) {
  			return Intermediate;
  		}
--- 169,178 ----
  	if (i < std::string::npos) {
  		i++;
! 		unsigned int index = i;
  		while (index < text->length() && isdigit((*text)[index])) {
  			index++;
  		}
  
! 		if (int(index - i) > m_decimals) {
  			return Intermediate;
  		}

Index: uvertexarray.cpp
===================================================================
RCS file: /cvsroot/libufo/ufo-0.5/src/uvertexarray.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** uvertexarray.cpp	16 Aug 2005 12:16:56 -0000	1.3
--- uvertexarray.cpp	30 Sep 2005 12:37:20 -0000	1.4
***************
*** 61,65 ****
  UVertexArray::setColor(const UColor & col) {
  	if (m_colors.size() == 0 && m_vertices.size() > 0) {
! 		for (int i = 0; i < m_vertices.size(); ++i) {
  			m_colors.push_back(UColor::black);
  		}
--- 61,65 ----
  UVertexArray::setColor(const UColor & col) {
  	if (m_colors.size() == 0 && m_vertices.size() > 0) {
! 		for (unsigned int i = 0; i < m_vertices.size(); ++i) {
  			m_colors.push_back(UColor::black);
  		}