[Uml-devel] Codegeneration patch.. updated

[Sebastian Stein]

Brian Thomas <thomas at mail630.gsfc.nasa.gov> [030825 09:58]:
> 
> 	Ok, I've updated my codegeneration patch. For whatever reason, the
> 	-N flag just doesnt work with the diff utility inside my version of cvs.
> 	If I just diff between a vanilla version of umbrello, and my patched version,
> 	I can make a patch file. 

Ah I think it works. Because if I look at a line of your patch, you can see
it:

diff -urN kdesdk/umbrello/codegeneratorfactory.cpp ....
     ^^^^

But I've several problems applying your patch. After patching I've a lot of
files like:


-rw-r--r--    1 sstein   users       63295 Aug 25 20:07 .#umldoc.cpp.1.48
-rw-r--r--    1 sstein   users       20947 Aug 25 20:07 .#umldoc.h.1.22
-rw-r--r--    1 sstein   users       21744 Aug 25 20:07 .#umldoc.h.1.24
-rw-r--r--    1 sstein   users       21736 Aug 25 20:07 .#umldoc.h.1.25
-rw-r--r--    1 sstein   users       16781 Aug 25 20:07 .#uml.h.1.17
-rw-r--r--    1 sstein   users       16715 Aug 25 20:07 .#uml.h.1.18
-rw-r--r--    1 sstein   users        5523 Aug 25 20:07 .#umlobject.h.1.12
-rw-r--r--    1 sstein   users       91882 Aug 25 20:07 .#umlview.cpp.1.61
-rw-r--r--    1 sstein   users       24322 Aug 25 20:07 .#umlwidget.cpp.1.31
-rw-r--r--    1 sstein   users       24908 Aug 25 20:07 .#umlwidget.cpp.1.34
-rw-r--r--    1 sstein   users       13447 Aug 25 20:07 .#umlwidget.h.1.12
-rw-r--r--    1 sstein   users       13450 Aug 25 20:07 .#umlwidget.h.1.13

Well, there are a lot more, I have about 65 of them.

I tried to compile it. First you are using iostream. In the current gcc 3.2
the usage of iostream changed a little bit. But this only produces warnings
like:

In file included from /usr/include/c++/3.2.2/backward/iostream.h:31, from
umlroledialog.cpp:10:
/usr/include/c++/3.2.2/backward/backward_warning.h:32:2:

warning: #warning This file includes at least one deprecated or antiquated
header. Please consider using one of the 32 headers found in section
17.4.1.2 of the C++ standard. Examples include substituting the <X> header
for the <X.h> header for C++ includes, or <sstream> instead of the
deprecated header <strstream.h>. To disable this warning use
-Wno-deprecated.

A possible solution would be to use the QTextStream class like that:

#include <iostream>

static QTextStream output(stdout, IO_ReadWrite);

void main()
{
	output << "Hello world!" << endl;
}

Well, this isn't really a problem, but the app doesn't compile. It can't
find KFontChooser class:

codevieweroptionsbase.cpp:14:42: /usr/include/kde/kfontdialog.h: No such file or directory
codevieweroptionsbase.cpp: In constructor
   `CodeViewerOptionsBase::CodeViewerOptionsBase(QWidget*, const char*,
   unsigned int)':
codevieweroptionsbase.cpp:347: invalid use of undefined type `struct
   KFontChooser'
codevieweroptionsbase.h:20: forward declaration of `struct KFontChooser'
codevieweroptionsbase.cpp:348: invalid use of undefined type `struct
   KFontChooser'
codevieweroptionsbase.h:20: forward declaration of `struct KFontChooser'
codevieweroptionsbase.cpp:350: no matching function for call to `QGridLayout::
   addWidget(KFontChooser*&, int, int)'
/usr/lib/qt-3.1.2/include/qlayout.h:324: candidates are: void
   QGridLayout::addWidget(QWidget*, int, int, int = 0)

Ok, hope you can fix this stuff.

Steinchen
-- 
Umbrello UML Modeller
Description     : UML diagram drawing tool for KDE with code generation
Homepage        : http://www.umbrello.org/
Bug Reports     : http://bugs.kde.org/
CVS             : kdesdk/umbrello on cvs.kde.org:/home/kde