[Uml-devel] KDE/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 477567 by okellogg:

apply commit 477565 from branches/kde/3.5

 M  +3 -2      ChangeLog  
 M  +2 -0      umbrello/classparser/cpptree2uml.cpp  
 M  +2 -1      umbrello/classparser/parser.cpp  


--- trunk/KDE/kdesdk/umbrello/ChangeLog #477566:477567
@@ -6,13 +6,14 @@
 * Externalization of folders (i.e. submodel files)
 * Change interface into class and vice versa (if abstract and no attributes)
 * Image export via command line
+* All diagram objects can be resized
 * Automatic Diagram Layout (67059, not yet closed)
 
 * Bugs fixed / wishes implemented (see http://bugs.kde.org)
  57588  57672  58809  66461  67120  67719  72016  79433  87252  88117
  97162  98368 101550 105564 107405 108223 109591 109636 110073 110216
-110231 110379 110843 111088 111470 111502 111759 111768 112017 112292
-112293 112333 112531 112552 112936 112991 112992 114892
+110231 110379 110400 110843 111088 111470 111502 111759 111768 112017
+112292 112293 112333 112531 112552 112936 112991 112992 114892
 
 Version 1.4.2 (maintenance release)
 
--- trunk/KDE/kdesdk/umbrello/umbrello/classparser/cpptree2uml.cpp #477566:477567
@@ -172,6 +172,8 @@
 void CppTree2Uml::parseTemplateDeclaration( TemplateDeclarationAST* ast )
 {
     TemplateParameterListAST* parmListAST = ast->templateParameterList();
+    if (parmListAST == NULL)
+        return;
     Q3PtrList<TemplateParameterAST> parmList = parmListAST->templateParameterList();
     for (Q3PtrListIterator<TemplateParameterAST> it(parmList); it.current(); ++it) {
         // The template is either a typeParameter or a typeValueParameter.
--- trunk/KDE/kdesdk/umbrello/umbrello/classparser/parser.cpp #477566:477567
@@ -927,7 +927,8 @@
     TemplateParameterListAST::Node params;
     if( lex->lookAhead(0) == '<' ){
 	lex->nextToken();
-	parseTemplateParameterList( params );
+	if (lex->lookAhead(0) != '>')
+	    parseTemplateParameterList( params );
 
 	ADVANCE( '>', ">" );
     }