[Uml-devel] Codegeneration patch.. updated

[Sebastian Stein]

Brian Thomas <brian.thomas at gsfc.nasa.gov> [030825 22:10]:
> 	Well, I didnt do a "cvs diff -uRN", I had to checkout umbrello in a separate
> 	directory and then use my native diff utility to do it.

I always use diff -u old/ new/ > file.patch and that mostly seems to work.
I'm using GNU diff 2.8.1.

> 	problem is that the header file isnt properly specified, and
> 	codevieweroptionsbase.cpp needs to be modified. Change the following
> 	line:
> 
> #include </usr/include/kde/kfontdialog.h>
> 
> 	to:
> 
> #include <kfontdialog.h>
> 
> 	And I think you should get a compile.

Ah ok, you can fix this in the codevieweroptionsbase.ui file directly. The
line should look like:

<header location="global">kfontdialog.h</header>

Hopefully your qt-designer won't change it again ;-)

> 	Try that stuff out and let me know if you have any other problems.

Another thing is breaking compilation. klibloader.h is there where all kde
includes are. I'm tired and really need to get some sleep now...

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
-------------- next part --------------
/usr/lib/qt-3.1.2/bin/moc ./codegenerator.h -o codegenerator.moc.cpp
g++ -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -fno-builtin -g -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common -DQT_CLEAN_NAMESPACE -UQT_NO_COMPAT -DQT_NO_ASCII_CAST -DQT_THREAD_SUPPORT  -D_REENTRANT   codegenerator.moc.cpp   -o codegenerator.moc
In file included from codegenerator.moc.cpp:11:
codegenerator.h:21:24: klibloader.h: Datei oder Verzeichnis nicht gefunden
In file included from codegenerator.moc.cpp:11:
codegenerator.h:455: parse error before `{' token
codegenerator.h:456: virtual outside class declaration
codegenerator.h:456: non-member function `const char* className()' cannot have
   `const' method qualifier
codegenerator.h:456: virtual outside class declaration
codegenerator.h:456: virtual outside class declaration
codegenerator.h:456: virtual outside class declaration
codegenerator.h:456: virtual outside class declaration
codegenerator.h: In function `QObject* qObject()':
codegenerator.h:456: invalid use of `this' in non-member function
codegenerator.h: At global scope:
codegenerator.h:456: parse error before `private'
codegenerator.h:460: destructors must be member functions
codegenerator.h:460: virtual outside class declaration
codegenerator.h:476: virtual outside class declaration
codegenerator.h:478: parse error before `private'
codegenerator.moc.cpp:147: invalid use of undefined type `class
   CodeGeneratorFactory'
codegenerator.h:455: forward declaration of `class CodeGeneratorFactory'
codegenerator.moc.cpp:151: invalid use of undefined type `class
   CodeGeneratorFactory'
codegenerator.h:455: forward declaration of `class CodeGeneratorFactory'
codegenerator.moc.cpp:151: assignment (not initialization) in declaration
codegenerator.moc.cpp:152: incomplete type `CodeGeneratorFactory' does not have
   member `staticMetaObject'
codegenerator.moc.cpp:156: invalid use of undefined type `class
   CodeGeneratorFactory'
codegenerator.h:455: forward declaration of `class CodeGeneratorFactory'
codegenerator.moc.cpp:164: invalid use of undefined type `class
   CodeGeneratorFactory'
codegenerator.h:455: forward declaration of `class CodeGeneratorFactory'
codegenerator.moc.cpp:175: invalid use of undefined type `class
   CodeGeneratorFactory'
codegenerator.h:455: forward declaration of `class CodeGeneratorFactory'
codegenerator.moc.cpp: In member function `QMetaObject*
   CodeGeneratorFactory::staticMetaObject()':
codegenerator.moc.cpp:176: `metaObj' undeclared (first use this function)
codegenerator.moc.cpp:176: (Each undeclared identifier is reported only once
   for each function it appears in.)
codegenerator.moc.cpp:178: `KLibFactory' undeclared (first use this function)
codegenerator.moc.cpp:178: parse error before `::' token
codegenerator.moc.cpp: At global scope:
codegenerator.moc.cpp:193: invalid use of undefined type `class
   CodeGeneratorFactory'
codegenerator.h:455: forward declaration of `class CodeGeneratorFactory'
codegenerator.moc.cpp: In member function `void*
   CodeGeneratorFactory::qt_cast(const char*)':
codegenerator.moc.cpp:196: parse error before `::' token
codegenerator.moc.cpp: At global scope:
codegenerator.moc.cpp:200: invalid use of undefined type `class
   CodeGeneratorFactory'
codegenerator.h:455: forward declaration of `class CodeGeneratorFactory'
codegenerator.moc.cpp: In member function `bool
   CodeGeneratorFactory::qt_invoke(int, QUObject*)':
codegenerator.moc.cpp:201: parse error before `::' token
codegenerator.moc.cpp:200: warning: unused parameter `int _id'
codegenerator.moc.cpp:200: warning: unused parameter `QUObject*_o'
codegenerator.moc.cpp: At global scope:
codegenerator.moc.cpp:205: invalid use of undefined type `class
   CodeGeneratorFactory'
codegenerator.h:455: forward declaration of `class CodeGeneratorFactory'
codegenerator.moc.cpp: In member function `bool
   CodeGeneratorFactory::qt_emit(int, QUObject*)':
codegenerator.moc.cpp:206: parse error before `::' token
codegenerator.moc.cpp:205: warning: unused parameter `int _id'
codegenerator.moc.cpp:205: warning: unused parameter `QUObject*_o'
codegenerator.moc.cpp: At global scope:
codegenerator.moc.cpp:211: invalid use of undefined type `class
   CodeGeneratorFactory'
codegenerator.h:455: forward declaration of `class CodeGeneratorFactory'
codegenerator.moc.cpp: In member function `bool
   CodeGeneratorFactory::qt_property(int, int, QVariant*)':
codegenerator.moc.cpp:212: parse error before `::' token
codegenerator.moc.cpp:211: warning: unused parameter `int id'
codegenerator.moc.cpp:211: warning: unused parameter `int f'
codegenerator.moc.cpp:211: warning: unused parameter `QVariant*v'
codegenerator.moc.cpp: At global scope:
codegenerator.moc.cpp:215: invalid use of undefined type `class
   CodeGeneratorFactory'
codegenerator.h:455: forward declaration of `class CodeGeneratorFactory'
codegenerator.h:456: warning: `bool qt_static_property(QObject*, int, int,
   QVariant*)' declared `static' but never defined
codegenerator.h:456: warning: `QMetaObject* staticMetaObject()' declared
   `static' but never defined
codegenerator.h:456: warning: `QString tr(const char*, const char*)' declared
   `static' but never defined
codegenerator.h:456: warning: `QString trUtf8(const char*, const char*)'
   declared `static' but never defined
make[1]: *** [codegenerator.moc] Fehler 1