[Uml-devel] KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser

[Andi Fischer]

SVN commit 952932 by fischer:

Compiler warning fixed.

 M  +5 -5      cpptree2uml.cpp  
 M  +4 -3      cpptree2uml.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp #952931:952932
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2004-2008                                               *
+ *   copyright (C) 2004-2009                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -243,7 +243,7 @@
 
         Q3PtrListIterator<InitDeclaratorAST> it( l );
         while( it.current() ){
-            parseDeclaration(  ast->functionSpecifier(), ast->storageSpecifier(), typeSpec, it.current() );
+            parseDeclaration2(  ast->functionSpecifier(), ast->storageSpecifier(), typeSpec, it.current() );
             ++it;
         }
     }
@@ -420,7 +420,7 @@
     flushTemplateParams( static_cast<UMLClassifier*>(o) );
 }
 
-void CppTree2Uml::parseDeclaration( GroupAST* funSpec, GroupAST* storageSpec,
+void CppTree2Uml::parseDeclaration2( GroupAST* funSpec, GroupAST* storageSpec,
                                     TypeSpecifierAST* typeSpec, InitDeclaratorAST* decl )
 {
     if( m_inStorageSpec )
@@ -443,13 +443,13 @@
         id = t->declaratorId()->unqualifiedName()->text();
 
     if( !scopeOfDeclarator(d, QStringList()).isEmpty() ){
-        uDebug() << "CppTree2Uml::parseDeclaration (" << id << "): skipping.";
+        uDebug() << "CppTree2Uml::parseDeclaration2 (" << id << "): skipping.";
         return;
     }
 
     UMLClassifier *c = m_currentClass[m_clsCnt];
     if (c == NULL) {
-        uDebug() << "CppTree2Uml::parseDeclaration (" << id
+        uDebug() << "CppTree2Uml::parseDeclaration2 (" << id
                   << "): need a surrounding class.";
         return;
     }
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h #952931:952932
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2005-2007                                               *
+ *   copyright (C) 2005-2009                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -12,9 +12,10 @@
 #define CPPTREE2UML_H
 
 #include "tree_parser.h"
-#include <QtCore/QStringList>
 #include "model_utils.h"
 
+#include <QtCore/QStringList>
+
 // fwd decls
 class UMLClassifier;
 class UMLOperation;
@@ -53,7 +54,7 @@
 
     // non-overriding (locally added) methods
 
-    virtual void parseDeclaration( GroupAST* funSpec, GroupAST* storageSpec, TypeSpecifierAST* typeSpec, InitDeclaratorAST* decl );
+    virtual void parseDeclaration2( GroupAST* funSpec, GroupAST* storageSpec, TypeSpecifierAST* typeSpec, InitDeclaratorAST* decl );
     virtual void parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storageSpec, TypeSpecifierAST* typeSpec, InitDeclaratorAST* decl );
     void parseFunctionArguments( DeclaratorAST* declarator, UMLOperation* method);
     virtual void parseBaseClause( BaseClauseAST* baseClause, UMLClassifier* klass );