[Uml-devel] #include cleaning

[Sebastian Stein]

Jean Vittor <jean.vittor at wanadoo.fr> [021105 07:04]:
> OK. Dependency problem. I thought dependencies were recomputed at each 
> compilation but that is not the case.
> 
> This patch should be better.

Ok, some problems are left:

> Index: uml/associationwidget.cpp
> ===================================================================
> RCS file: /cvsroot/uml/uml/uml/associationwidget.cpp,v
> retrieving revision 1.12
> diff -u -r1.12 associationwidget.cpp
> --- uml/associationwidget.cpp	25 Oct 2002 02:38:03 -0000	1.12
> +++ uml/associationwidget.cpp	5 Nov 2002 02:07:40 -0000
> @@ -7,25 +7,18 @@
>   *                                                                         *
>   ***************************************************************************/
>  
> -#include <math.h>

We need this for line 1596/1597 calling:

total_length =  sqrt( pow( xt - xi, 2 ) + pow( yt - yi, 2 ) ) + sqrt( pow(
xt - xj, 2) + pow( yt - yj, 2) );

> Index: uml/classparser/ClassParser.h
> ===================================================================
> RCS file: /cvsroot/uml/uml/uml/classparser/ClassParser.h,v
> retrieving revision 1.5
> diff -u -r1.5 ClassParser.h
> --- uml/classparser/ClassParser.h	24 Oct 2002 11:49:47 -0000	1.5
> +++ uml/classparser/ClassParser.h	5 Nov 2002 02:08:20 -0000
> @@ -18,13 +18,10 @@
>  #ifndef _CLASSPARSER_H_INCLUDED
>  #define _CLASSPARSER_H_INCLUDED
>  
> -#include <qstring.h>
> -#include <qlist.h>
> -#include <qstack.h>
> -#include <FlexLexer.h>
> -#include <fstream>

We need fstream for the prototyp of void parseFile( ifstream &file );

> Index: uml/codegenerators/phpwriter.cpp
> ===================================================================
> RCS file: /cvsroot/uml/uml/uml/codegenerators/phpwriter.cpp,v
> retrieving revision 1.6
> diff -u -r1.6 phpwriter.cpp
> --- uml/codegenerators/phpwriter.cpp	25 Oct 2002 02:38:04 -0000	1.6
> +++ uml/codegenerators/phpwriter.cpp	5 Nov 2002 02:08:34 -0000
> @@ -16,26 +16,15 @@
>   ***************************************************************************/
>  
>  #include "phpwriter.h"
> -
> -
> -#include <kdebug.h>
> -
> -#include <klocale.h>
> -#include <kmessagebox.h>
> -#include <qfile.h>
> -#include <qtextstream.h>
> -#include <qregexp.h>
> -
> -#include <cassert>

We need this for line 152/153:

assert(generalizations.count() <= 1);


If nobody stops me, I am going to commit the patched files with the
mentioned fixes tomorrow morning.

Steinchen

PS: If you compress the patch with bzip2 it is only about 8K.
-- 
Umbrello UML Modeller
Description     : UML diagram drawing tool for KDE with code generation
Homepage        : http://uml.sourceforge.net/
Bug report      : http://sourceforge.net/tracker/?group_id=24919&atid=382951
Feature request : http://sourceforge.net/tracker/?group_id=24919&atid=382954