Index: uml/associationwidget.cpp
===================================================================
RCS file: /cvsroot/uml/uml/uml/associationwidget.cpp,v
retrieving revision 1.12
diff -r1.12 associationwidget.cpp
10,18c10
< #include <math.h>
< 
< #include <qbitmap.h>
< #include <qpainter.h>
< 
< #include <klocale.h>
< #include <kdebug.h>
< #include <kfontdialog.h>
< 
---
> #include "activitywidget.h"
20,21c12
< #include "associationwidgetdata.h"
< #include "floatingtextdata.h"
---
> #include "assocrules.h"
23c14,16
< #include "clipboard/idchangelog.h"
---
> #include "floatingtextdata.h"
> #include "objectwidget.h"
> #include "umlwidget.h"
26,28c19,21
< #include "objectwidget.h"
< #include "activitywidget.h"
< #include "assocrules.h"
---
> #include <kdebug.h>
> #include <klineeditdlg.h>
> #include <klocale.h>
Index: uml/associationwidgetdatalist.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/associationwidgetdatalist.h,v
retrieving revision 1.4
diff -r1.4 associationwidgetdatalist.h
20a21
> #include "associationwidgetdata.h"
22,26d22
< 
< //#include "associationwidgetdata.h"
< class  AssociationWidgetData;
< class  AssociationWidget;
< 
Index: uml/classimport.cpp
===================================================================
RCS file: /cvsroot/uml/uml/uml/classimport.cpp,v
retrieving revision 1.2
diff -r1.2 classimport.cpp
10,14d9
< #include <qstrlist.h>
< #include <qfiledialog.h>
< 
< #include <kdebug.h>
< 
16c11,14
< #include "umlobject.h"
---
> #include "concept.h"
> #include "classparser/ClassParser.h"
> #include "classparser/ParsedClass.h"
> #include <kdebug.h>
Index: uml/classimport.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/classimport.h,v
retrieving revision 1.3
diff -r1.3 classimport.h
13,36d12
< // include files for Qt
< #include <qdir.h>
< #include <qwidget.h>
< #include <qclipboard.h>
< #include <qobjcoll.h>
< 
< // include files for KDE
< #include <klocale.h>
< #include <kmessagebox.h>
< #include "klineeditdlg.h"
< #include <kio/job.h>
< #include <kio/netaccess.h>
< 
< // application specific includes
< #include "umldoc.h"
< #include "uml.h"
< #include "umlview.h"
< #include "concept.h"
< #include "usecase.h"
< #include "actor.h"
< #include "umllistview.h"
< #include "uml.h"
< #include "worktoolbar.h"
< #include "operation.h"
38,43c14
< #include "dialogs/classpropdlg.h"
< #include "objectwidget.h"
< #include "umlwidget.h"
< 
< #include "classparser/ClassParser.h"
< 
---
> #include "umldoc.h"
Index: uml/main.cpp
===================================================================
RCS file: /cvsroot/uml/uml/uml/main.cpp,v
retrieving revision 1.11
diff -r1.11 main.cpp
10c10
< #include <kcmdlineargs.h>
---
> #include "uml.h"
11a12,13
> #include <kapplication.h>
> #include <kcmdlineargs.h>
14c16
< #include <unistd.h>
---
> #include <kstartuplogo.h>
16,18c18
< 
< #include "uml.h"
< #include "kstartuplogo.h"
---
> #include <unistd.h>
Index: uml/statewidgetdata.cpp
===================================================================
RCS file: /cvsroot/uml/uml/uml/statewidgetdata.cpp,v
retrieving revision 1.9
diff -r1.9 statewidgetdata.cpp
10,11d9
< #include <qdatastream.h>
< 
Index: uml/uml.cpp
===================================================================
RCS file: /cvsroot/uml/uml/uml/uml.cpp,v
retrieving revision 1.40
diff -r1.40 uml.cpp
10,26c10,24
< #include <cstdlib> //neded for setting up LD_LIBRARY_PATH
< 
< // include files for QT
< #include <qclipboard.h>
< #include <qdir.h>
< #include <qprinter.h>
< #include <qpainter.h>
< #include <qsize.h>
< #include <qtimer.h>
< #include <qvaluelist.h>
< 
< // include files for KDE
< #include <kiconloader.h>
< #include <kmessagebox.h>
< #include <kfiledialog.h>
< #include <kmenubar.h>
< #include <klocale.h>
---
> #include "classimport.h"
> #include "docwindow.h"
> #include "uml.h"
> #include "umldoc.h"
> #include "umllistview.h"
> #include "worktoolbar.h"
> #include "clipboard/umlclipboard.h"
> #include "clipboard/umldrag.h"
> #include "dialogs/classwizard.h"
> #include "dialogs/codegenerationwizard.h"
> #include "dialogs/configcodegenerators.h"
> #include "dialogs/diagramprintpage.h"
> #include "dialogs/selectlanguagesdlg.h"
> #include <kaction.h>
> #include <kapplication.h>
28,29d25
< #include <kstdaction.h>
< #include <kprinter.h>
31d26
< #include <kstatusbar.h>
32a28,32
> #include <kfiledialog.h>
> #include <klocale.h>
> #include <kprinter.h>
> #include <kmenubar.h>
> #include <kmessagebox.h>
34,49c34,37
< #include <kshortcut.h>
< 
< // application specific includes
< #include "codegenerator.h"
< #include "dialogs/configcodegenerators.h"
< #include "dialogs/selectlanguagesdlg.h"
< #include "dialogs/codegenerationwizard.h"
< #include "umlview.h"
< #include "dialogs/diagramprintpage.h"
< #include "dialogs/classwizard.h"
< #include "clipboard/umlclipboard.h"
< #include "clipboard/umldrag.h"
< #include "umldoc.h"
< #include "classimport.h"
< #include "umlnamespace.h"
< #include "uml.h"
---
> #include <kstatusbar.h>
> #include <qclipboard.h>
> #include <qpopmenu.h>
> #include <qtimer.h>
1250d1237
< 
Index: uml/uml.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/uml.h,v
retrieving revision 1.26
diff -r1.26 uml.h
19,33c19
< // include files for Qt
< #include <qsplitter.h>
< #include <qprogressbar.h>
< #include <qstring.h>
< 
< // include files for KDE
< #include <kapp.h>
< #include <kmainwindow.h>
< #include <kaccel.h>
< #include <kaction.h>
< #include <kstatusbar.h>
< 
< #include "umllistview.h"
< #include "infowidget.h"
< #include "worktoolbar.h"
---
> #include "codegenerator.h"
35c21,23
< #include "docwindow.h"
---
> #include <kmainwindow.h>
> #include <kurl.h>
> #include <qprogressbar.h>
37a26,33
> class CodeGenerator;
> class DocWindow;
> class KActionMenu;
> class KRecentFilesAction;
> class KStatusBarLabel;
> class KToggleAction;
> class QClipboard;
> class QSplitter;
38a35
> class UMLListView;
40c37
< class QClipboard;
---
> class WorkToolBar;
Index: uml/umldoc.cpp
===================================================================
RCS file: /cvsroot/uml/uml/uml/umldoc.cpp,v
retrieving revision 1.35
diff -r1.35 umldoc.cpp
10,30c10,15
< // include files for Qt
< #include <qdir.h>
< #include <qlist.h>
< #include <qwidget.h>
< #include <qpainter.h>
< #include <qobjcoll.h>
< #include <qclipboard.h>
< #include <qdom.h>
< #include <qregexp.h>
< 
< // include files for KDE
< #include <klocale.h>
< #include <kmessagebox.h>
< #include <klineeditdlg.h>
< #include <kio/job.h>
< #include <kio/netaccess.h>
< #include <ktempfile.h>
< #include <klocale.h>
< #include <kdebug.h>
< 
< // application specific includes
---
> #include "actor.h"
> #include "associationwidget.h"
> #include "concept.h"
> #include "docwindow.h"
> #include "infowidget.h"
> #include "objectwidget.h"
31a17,18
> #include "umldoc.h"
> #include "umllistview.h"
33d19
< #include "concept.h"
35,42c21
< #include "actor.h"
< #include "umllistview.h"
< #include "worktoolbar.h"
< #include "operation.h"
< #include "attribute.h"
< #include "objectwidget.h"
< #include "umlwidget.h"
< #include "associationwidget.h"
---
> #include "clipboard/idchangelog.h"
44d22
< #include "dialogs/settingsdlg.h"
47c25,34
< #include "umldoc.h"
---
> #include <kapplication.h>
> #include <kdebug.h>
> #include <kio/netaccess.h>
> #include <klineeditdlg.h>
> #include <klocale.h>
> #include <kmessagebox.h>
> #include <kprinter.h>
> #include <ktempfile.h>
> #include <qpainter.h>
> #include <qtimer.h>
Index: uml/umldoc.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/umldoc.h,v
retrieving revision 1.18
diff -r1.18 umldoc.h
17,32c17
< // include files for QT
< #include <qobject.h>
< #include <qstring.h>
< #include <qsplitter.h>
< #include <qlist.h>
< #include <qfile.h>
< #include <qtimer.h>
< 
< // include files for KDE
< #include <kurl.h>
< #include <kprinter.h>
< 
< #include "umlobject.h"
< #include "infowidget.h"
< #include "concept.h"
< #include "clipboard/idchangelog.h"
---
> #include "associationwidgetdatalist.h"
34d18
< #include "docwindow.h"
36,37c20
< #include "associationwidgetdatalist.h"
< #include "umlviewdata.h"
---
> #include <kurl.h>
40,41c23,26
< class UMLView;
< class UMLListView;
---
> class DocWindow;
> class IDChangeLog;
> class InfoWidget;
> class KPrinter;
42a28,34
> class QDomNode;
> class QFile;
> class QSplitter;
> class UMLListView;
> class UMLObject;
> class UMLView;
> class UMLViewData;
Index: uml/umllistview.cpp
===================================================================
RCS file: /cvsroot/uml/uml/uml/umllistview.cpp,v
retrieving revision 1.12
diff -r1.12 umllistview.cpp
10,22c10,17
< #include <qdragobject.h>
< #include <qlist.h>
< 
< #include <klocale.h>
< #include <klineeditdlg.h>
< #include <kmessagebox.h>
< #include <kfiledialog.h>
< #include <kdebug.h>
< #include <kglobal.h>
< #include <kstddirs.h>
< 
< #include "umlview.h"
< #include "dialogs/classpropdlg.h"
---
> #include "actor.h"
> #include "classimport.h"
> #include "concept.h"
> #include "docwindow.h"
> #include "listpopupmenu.h"
> #include "operation.h"
> #include "uml.h"
> #include "umldoc.h"
24a20,21
> #include "umlview.h"
> #include "usecase.h"
26a24
> #include "dialogs/classpropdlg.h"
29,32c27,32
< 
< #include "uml.h"
< #include "classimport.h"
< 
---
> #include <kapplication.h>
> #include <kdebug.h>
> #include <kfiledialog.h>
> #include <klocale.h>
> #include <kmessagebox.h>
> #include <kstddirs.h>
Index: uml/umllistview.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/umllistview.h,v
retrieving revision 1.5
diff -r1.5 umllistview.h
13,18d12
< #include <klistview.h>
< #include <klineeditdlg.h>
< #include "umldoc.h"
< #include "listpopupmenu.h"
< #include <qstring.h>
< #include "umllistviewitem.h"
20c14,15
< 
---
> #include <klistview.h>
> #include <qpixmap.h>
32a28,32
> class ListPopupMenu;
> class UMLConcept;
> class UMLDoc;
> class UMLListViewItem;
> class UMLView;
Index: uml/umllistviewitem.cpp
===================================================================
RCS file: /cvsroot/uml/uml/uml/umllistviewitem.cpp,v
retrieving revision 1.3
diff -r1.3 umllistviewitem.cpp
10,17c10
< #include <qpixmap.h>
< #include <kglobal.h>
< #include <kstddirs.h>
< #include <kmessagebox.h>
< #include <klocale.h>
< #include <kapplication.h>
< #include <kdebug.h>
< #include "umlview.h"
---
> #include "concept.h"
20a14,17
> #include "umlview.h"
> #include <kapplication.h>
> #include <klocale.h>
> #include <kmessagebox.h>
22c19,21
< UMLListViewItem::UMLListViewItem(UMLListView * parent, QString name, Uml::ListView_Type t,UMLObject*o) : QListViewItem(parent, name) {
---
> UMLListViewItem::UMLListViewItem( UMLListView * parent, QString name,
>                                   Uml::ListView_Type t, UMLObject* o)
>   : QListViewItem(parent, name) {
Index: uml/umllistviewitem.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/umllistviewitem.h,v
retrieving revision 1.1
diff -r1.1 umllistviewitem.h
13,15d12
< #include <qstring.h>
< #include "qlistview.h"
< #include "umlobject.h"
16a14,16
> #include <qlistview.h>
> //#include <qstring.h>
> //#include "umlobject.h"
Index: uml/umllistviewitemdatalist.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/umllistviewitemdatalist.h,v
retrieving revision 1.1
diff -r1.1 umllistviewitemdatalist.h
21,22d20
< #include <qlist.h>
< 
23a22
> #include <qlist.h>
Index: uml/umllistviewitemlist.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/umllistviewitemlist.h,v
retrieving revision 1.1
diff -r1.1 umllistviewitemlist.h
21,22d20
< #include <qlist.h>
< 
23a22
> #include <qlist.h>
Index: uml/umlobjectlist.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/umlobjectlist.h,v
retrieving revision 1.4
diff -r1.4 umlobjectlist.h
21,22d20
< #include <qlist.h>
< 
23a22
> #include <qlist.h>
Index: uml/umlview.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/umlview.h,v
retrieving revision 1.21
diff -r1.21 umlview.h
17,21c17
< // include files for Qt
< #include <qcanvas.h>
< #include <qptrlist.h>
< #include "umlnamespace.h"
< #include "umllistview.h"
---
> #include "umldoc.h"
23,25c19
< #include "umlobject.h"
< #include "listpopupmenu.h"
< #include "associationwidgetdatalist.h"
---
> #include "umlviewdata.h"
27d20
< #include "dialogs/settingsdlg.h"
29c22
< #include "umlviewdata.h"
---
> #include <qcanvas.h>
33c26
< class UMLDoc;
---
> class ClassOptionsPage;
34a28,29
> class KPrinter;
> class ListPopupMenu;
36d30
< class ClassOptionsPage;
37a32
> class UMLListView;
907a903
> 
Index: uml/umlviewdata.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/umlviewdata.h,v
retrieving revision 1.9
diff -r1.9 umlviewdata.h
13,14d12
< #include <qptrlist.h>
< #include "umlnamespace.h"
15a14
> #include "dialogs/settingsdlg.h"
Index: uml/umlviewlist.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/umlviewlist.h,v
retrieving revision 1.4
diff -r1.4 umlviewlist.h
20a21
> #include "umlviewdata.h"
22,24d22
< 
< class UMLView;
< class UMLViewData;
Index: uml/classparser/ClassParser.cc
===================================================================
RCS file: /cvsroot/uml/uml/uml/classparser/ClassParser.cc,v
retrieving revision 1.4
diff -r1.4 ClassParser.cc
20,25d19
< #include <qstring.h>
< #include <qregexp.h> 
< 
< #include <kapplication.h>
< #include <kdebug.h>
< 
26a21,22
> #include "ParsedClass.h"
> #include "ParsedStruct.h"
27a24,29
> #include "tokenizer.h"
> #include <kapplication.h>
> #include <qregexp.h> 
> #include <qstring.h>
> #include <qstringlist.h>
> #include <fstream>
166,168c168,170
< 	parseMethodAttributes( aStruct );
< 	bID = true;
< 	break;
---
>         parseMethodAttributes( aStruct );
>         bID = true;
>         break;
170,171c172,173
< 	parseEnum();
< 	break;
---
>         parseEnum();
>         break;
173,175c175,177
< 	parseUnion(); // e.g.: union { } var = 97
< 	bUnion = true;
< 	break;
---
>         parseUnion(); // e.g.: union { } var = 97
>         bUnion = true;
>         break;
177,178c179,180
< 	parseStruct( aStruct );
< 	break;
---
>         parseStruct( aStruct );
>         break;
180,183c182,185
< 	kdDebug( ) << "--- parseStructDeclarations: case default" << endl;
< 	kdDebug( ) << "lexem: " << lexem << " & " << char( lexem ) << endl;
< 	kdDebug( ) << "@line: " << getLineno( ) << endl;
< 	kdDebug( ) << "Found unknown struct declaration." << endl;
---
>         kdDebug( ) << "--- parseStructDeclarations: case default" << endl;
>         kdDebug( ) << "lexem: " << lexem << " & " << char( lexem ) << endl;
>         kdDebug( ) << "@line: " << getLineno( ) << endl;
>         kdDebug( ) << "Found unknown struct declaration." << endl;
Index: uml/classparser/ClassParser.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/classparser/ClassParser.h,v
retrieving revision 1.5
diff -r1.5 ClassParser.h
21,26c21,24
< #include <qstring.h>
< #include <qlist.h>
< #include <qstack.h>
< #include <FlexLexer.h>
< #include <fstream>
< #include "tokenizer.h"
---
> //#include <qstring.h>
> //#include <qlist.h>
> //#include <fstream>
> //#include "tokenizer.h"
27a26,27
> #include <FlexLexer.h>
> #include <qstack.h>
Index: uml/classparser/ClassStore.cc
===================================================================
RCS file: /cvsroot/uml/uml/uml/classparser/ClassStore.cc,v
retrieving revision 1.3
diff -r1.3 ClassStore.cc
20c20,21
< #include <qregexp.h>
---
> #include "ParsedClass.h"
> #include "ParsedStruct.h"
22a24
> #include <qregexp.h>
Index: uml/classparser/ClassStore.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/classparser/ClassStore.h,v
retrieving revision 1.3
diff -r1.3 ClassStore.h
20a21
> #include "ClassTreeNode.h"
23d23
< #include "ClassTreeNode.h"
Index: uml/classparser/ClassTreeNode.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/classparser/ClassTreeNode.h,v
retrieving revision 1.3
diff -r1.3 ClassTreeNode.h
20a21
> //#include "ParsedClass.h"
22c23,25
< #include "ParsedClass.h"
---
> #include <qstring.h>
> 
> class CParsedClass;
Index: uml/classparser/ParsedArgument.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/classparser/ParsedArgument.h,v
retrieving revision 1.3
diff -r1.3 ParsedArgument.h
20c20
< #include <qstring.h>
---
> //#include <qstring.h>
Index: uml/classparser/ParsedAttribute.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/classparser/ParsedAttribute.h,v
retrieving revision 1.3
diff -r1.3 ParsedAttribute.h
22c22
< #include "tokenizer.h"
---
> //#include "tokenizer.h"
Index: uml/classparser/ParsedClassContainer.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/classparser/ParsedClassContainer.h,v
retrieving revision 1.3
diff -r1.3 ParsedClassContainer.h
94c94
< #include "ParsedClass.h"
---
> //#include "ParsedClass.h"
Index: uml/classparser/ParsedContainer.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/classparser/ParsedContainer.h,v
retrieving revision 1.3
diff -r1.3 ParsedContainer.h
21,25d20
< #include <qlist.h>
< #include <qstrlist.h>
< #include <qdict.h>
< #include <qstring.h>
< #include "ParsedItem.h"
26a22
> #include "ParsedItem.h"
27a24,27
> //#include <qlist.h>
> #include <qdict.h>
> #include <qstrlist.h>
> //#include <qstring.h>
28a29
> class CParsedItem;
268c269
< #include "ParsedStruct.h"
---
> //#include "ParsedStruct.h"
Index: uml/classparser/ParsedItem.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/classparser/ParsedItem.h,v
retrieving revision 1.3
diff -r1.3 ParsedItem.h
22c22
< #include <assert.h>
---
> //#include <assert.h>
Index: uml/classparser/ParsedMethod.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/classparser/ParsedMethod.h,v
retrieving revision 1.3
diff -r1.3 ParsedMethod.h
21,22c21
< #include <qlist.h>
< #include "ParsedAttribute.h"
---
> //#include "ParsedAttribute.h"
23a23
> #include <qlist.h>
Index: uml/classparser/ParsedStruct.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/classparser/ParsedStruct.h,v
retrieving revision 1.3
diff -r1.3 ParsedStruct.h
21,25c21,25
< #include <qdict.h>
< #include <qstring.h>
< #include "ParsedAttribute.h"
< #include "ParsedItem.h"
< #include "ParsedContainer.h"
---
> //#include <qdict.h>
> //#include <qstring.h>
> //#include "ParsedAttribute.h"
> //#include "ParsedItem.h"
> //#include "ParsedContainer.h"
Index: uml/classparser/PersistantClassStore.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/classparser/PersistantClassStore.h,v
retrieving revision 1.3
diff -r1.3 PersistantClassStore.h
22c22
< #include "ParsedClass.h"
---
> //#include "ParsedClass.h"
23a24
> class CParsedClass;
Index: uml/clipboard/umlclipboard.cpp
===================================================================
RCS file: /cvsroot/uml/uml/uml/clipboard/umlclipboard.cpp,v
retrieving revision 1.15
diff -r1.15 umlclipboard.cpp
10,17c10,11
< #include <qmime.h>
< 
< #include <kdebug.h>
< 
< #include "../uml.h"
< #include "../umldoc.h"
< #include "../umlview.h"
< #include "../associationwidgetdata.h"
---
> #include "umlclipboard.h"
> #include "umldrag.h"
19,21c13
< #include "../umlwidgetlist.h"
< #include "../umlobjectlist.h"
< #include "../umlviewlist.h"
---
> #include "../concept.h"
22a15
> #include "../umldoc.h"
24d16
< #include "../umllistviewitem.h"
26,31c18,23
< #include "../umllistviewitemdata.h"
< #include "../umllistviewitem.h"
< #include "../umlnamespace.h"
< #include "idchangelog.h"
< #include "umlclipboard.h"
< #include "umldrag.h"
---
> #include "../umlobjectlist.h"
> #include "../umlview.h"
> #include "../umlviewlist.h"
> #include "../umlwidgetdata.h"
> #include "../umlwidgetlist.h"
> #include <kdebug.h>
Index: uml/clipboard/umlclipboard.h
===================================================================
RCS file: /cvsroot/uml/uml/uml/clipboard/umlclipboard.h,v
retrieving revision 1.11
diff -r1.11 umlclipboard.h
13,16d12
< //QT Includes
< #include <qobject.h>
< 
< #include "../umllistviewitemdatalist.h"
18d13
< #include "../umlwidgetdata.h"
19a15,16
> #include "../umllistviewitemdatalist.h"
> #include "../umllistviewitemlist.h"
23,25d19
< class UMLDrag;
< 
< class QMimeSource;
26a21,23
> class QMimeSource;
> class UMLDoc;
> class UMLDrag;
Index: uml/codegenerators/Makefile.am
===================================================================
RCS file: /cvsroot/uml/uml/uml/codegenerators/Makefile.am,v
retrieving revision 1.7
diff -r1.7 Makefile.am
8c8
< LDFLAGS =                    -Iuml/classparser -Iuml/dialogs -Iuml/clipboard
---
> LDFLAGS =                     -Iuml/classparser -Iuml/dialogs -Iuml/clipboard
Index: uml/codegenerators/phpwriter.cpp
===================================================================
RCS file: /cvsroot/uml/uml/uml/codegenerators/phpwriter.cpp,v
retrieving revision 1.6
diff -r1.6 phpwriter.cpp
17a18
> #include "../associationwidget.h" //hmm...I dont think this 3 includes should
19,20c20,23
< 
< 
---
> #include "../concept.h"
> #include "../umldoc.h"
> #include "../umlview.h"           //be needed here, but the way I have understood the code
> #include "../umlwidget.h"         //so far, there is no other way of getting the associations
22,26d24
< 
< #include <klocale.h>
< #include <kmessagebox.h>
< #include <qfile.h>
< #include <qtextstream.h>
28,38c26
< 
< #include <cassert>
< 
< #include "../concept.h"
< #include "../operation.h"
< #include "../umlnamespace.h"
< #include "../umlview.h"           //hmm...I dont think this 3 includes should
< #include "../umlwidget.h"         //be needed here, but the way I have understood the code
< #include "../associationwidget.h" //so far, there is no other way of getting the associations
< 
< 
---
> #include <qstring.h>
Index: uml/dialogs/activitypage.cpp
===================================================================
RCS file: /cvsroot/uml/uml/uml/dialogs/activitypage.cpp,v
retrieving revision 1.3
diff -r1.3 activitypage.cpp
10,16d9
< //qt includes
< #include <qlayout.h>
< //kde includes
< #include <klocale.h>
< //app includes
< #include "../statewidget.h"
< #include "../listpopupmenu.h"
17a11,15
> #include "../statewidget.h"
> #include <klineeditdlg.h>
> #include <klocale.h>
> #include <qlayout.h>
> #include <qstringlist.h>
Index: uml/dialogs/classwizard.cpp
===================================================================
RCS file: /cvsroot/uml/uml/uml/dialogs/classwizard.cpp,v
retrieving revision 1.5
diff -r1.5 classwizard.cpp
10,16d9
< //kde includes
< #include <klocale.h>
< #include <khelpmenu.h>
< #include <kdebug.h>
< //app includes
< #include "../umldoc.h"
< #include "../concept.h"
17a11,13
> #include "../umllistview.h"
> #include <khelpmenu.h>
> #include <klocale.h>
Index: uml/dialogs/parmpropdlg.cpp
===================================================================
RCS file: /cvsroot/uml/uml/uml/dialogs/parmpropdlg.cpp,v
retrieving revision 1.6
diff -r1.6 parmpropdlg.cpp
10,12d9
< #include <qlayout.h>
< #include <klocale.h>
< 
13a11
> #include "uml/concept.h"
14a13,14
> #include <klocale.h>
> #include <qlayout.h>
Index: uml/dialogs/selectlanguagesdlg.cpp
===================================================================
RCS file: /cvsroot/uml/uml/uml/dialogs/selectlanguagesdlg.cpp,v
retrieving revision 1.4
diff -r1.4 selectlanguagesdlg.cpp
19a20
> #include <qlistview.h>
22,23d22
< 
< 
Index: uml/dialogs/umlattributedialog.cpp
===================================================================
RCS file: /cvsroot/uml/uml/uml/dialogs/umlattributedialog.cpp,v
retrieving revision 1.11
diff -r1.11 umlattributedialog.cpp
10,17c10
< //qt includes
< #include <qlayout.h>
< //kde includes
< #include <klocale.h>
< #include <kdebug.h>
< #include <kmessagebox.h>
< //app includes
< #include "../attribute.h"
---
> #include "umlattributedialog.h"
20c13,15
< #include "umlattributedialog.h"
---
> #include <klocale.h>
> #include <kmessagebox.h>
> #include <qlayout.h>
