[Uml-devel] branches/work/kde4/kdesdk/umbrello/umbrello/classparser

[Laurent Montel]

SVN commit 431935 by mlaurent:

Fix compile


 M  +6 -6      lexer.cpp  
 M  +4 -4      lexer.h  


--- branches/work/kde4/kdesdk/umbrello/umbrello/classparser/lexer.cpp #431934:431935
@@ -232,7 +232,7 @@
         m_startLine = false;
         int ppe = preprocessorEnabled();
 	setPreprocessorEnabled( false );
-	while( currentChar() && currentChar() != '\n' ){
+	while( !currentChar().isNull() && currentChar() != '\n' ){
             Token tok;
             nextToken( tok, true );
         }
@@ -355,7 +355,7 @@
             QString textToInsert;
 
             m_endPtr = currentPosition() + m.body().length();
-            while( currentChar() ){
+            while( !currentChar().isNull() ){
 
                 readWhiteSpaces();
 
@@ -600,7 +600,7 @@
     }
 
     // skip line
-    while( currentChar() && currentChar() != '\n' ){
+    while( !currentChar().isNull() && currentChar() != '\n' ){
         Token tk;
         nextToken( tk, true );
     }
@@ -776,16 +776,16 @@
 	return;
 
     readWhiteSpaces( false );
-    if( currentChar() ){
+    if( !currentChar().isNull() ){
 	QChar ch = currentChar();
 	if( ch == '"' || ch == '<' ){
 	    nextChar();
 	    QChar ch2 = ch == QChar('"') ? QChar('"') : QChar('>');
 
 	    int startWord = currentPosition();
-	    while( currentChar() && currentChar() != ch2 )
+	    while( !currentChar().isNull() && currentChar() != ch2 )
 		nextChar();
-	    if( currentChar() ){
+	    if( !currentChar().isNull() ){
 		QString word = m_source.mid( startWord, int(currentPosition()-startWord) );
 		m_driver->addDependence( m_driver->currentFileName(),
 					 Dependence(word, ch == '"' ? Dep_Local : Dep_Global) );
--- branches/work/kde4/kdesdk/umbrello/umbrello/classparser/lexer.h #431934:431935
@@ -550,7 +550,7 @@
 	    int line = m_currentLine;
 	    int col = m_currentColumn;
 
-	    while( currentChar() ){
+	    while( !currentChar().isNull() ){
 		if( currentChar() == '*' && peekChar() == '/' )
 		    break;
 		else if( currentChar() == '\n' )
@@ -567,7 +567,7 @@
             int line = m_currentLine;
             int col = m_currentColumn;
 
-            while( currentChar() ){
+            while( !currentChar().isNull() ){
             if( currentChar() == '*' && peekChar() == '/' )
                 break;
             else if( currentChar() == '\n' )
@@ -594,7 +594,7 @@
 	    int line = m_currentLine;
 	    int col = m_currentColumn;
 
-	    while( currentChar() ){
+	    while( !currentChar().isNull() ){
 		if( currentChar() == '*' && peekChar() == '/' )
 		    break;
 		else if( currentChar() == '\n' )
@@ -610,7 +610,7 @@
             int line = m_currentLine;
             int col = m_currentColumn;
 
-            while( currentChar() ){
+            while( !currentChar().isNull() ){
             if( currentChar() == '*' && peekChar() == '/' )
                 break;
             else if( currentChar() == '\n' )