[Uml-devel] KDE/kdesdk/umbrello [POSSIBLY UNSAFE]

[Oliver Kellogg]

SVN commit 567144 by okellogg:

Merge recent changes (r557370:565677) from branches/KDE/3.5, this
happens to correspond to the KDE 3.5.4 tag.
I get a compile error from umlviewimageexporter.cpp as follows:

/kdesdk/umbrello/umbrello/umlviewimageexporter.cpp: In member
   function `bool UMLViewImageExporter::getParametersFromUser()':
/kdesdk/umbrello/umbrello/umlviewimageexporter.cpp:83: error: no
   type `null' in `QString'
/kdesdk/umbrello/umbrello/umlviewimageexporter.cpp:83: error: type
   specifier omitted for parameter `m_view'
/kdesdk/umbrello/umbrello/umlviewimageexporter.cpp:84: error: no
   matching function for call to
`UMLViewImageExporter::prepareFileDialog(KFileDialog (&)(KUrl (*)()))'
/kdesdk/umbrello/umbrello/umlviewimageexporter.h:114: error: candidates
   are: void UMLViewImageExporter::prepareFileDialog(KFileDialog&)
/kdesdk/umbrello/umbrello/umlviewimageexporter.cpp:85: error: request
   for member `exec' in `fileDialog', which is of non-aggregate type `
   KFileDialog ()(KUrl (*)())'
/kdesdk/umbrello/umbrello/umlviewimageexporter.cpp:87: error: request
   for member `selectedUrl' in `fileDialog', which is of non-aggregate
   type `KFileDialog ()(KUrl (*)())'



 M  +15 -1     ChangeLog  
 M  +1 -0      THANKS  
 M  +27 -21    umbrello/CMakeLists.txt  
 M  +1 -1      umbrello/activitywidget.h  
 D             umbrello/adaimport.cpp  
 D             umbrello/adaimport.h  
 M  +1 -1      umbrello/associationwidget.cpp  
 M  +28 -24    umbrello/assocrules.cpp  
 M  +2 -2      umbrello/classifier.cpp  
 D             umbrello/classimport.cpp  
 D             umbrello/classimport.h  
 D             umbrello/classparser (directory)  
 M  +1 -1      umbrello/cmdlineexportallviewsevent.cpp  
 M  +7 -3      umbrello/codegenerators/codegenfactory.cpp  
 A             umbrello/codegenerators/pascalwriter.cpp   branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/pascalwriter.cpp#565677
 A             umbrello/codegenerators/pascalwriter.h   branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/pascalwriter.h#565677
 A             umbrello/codeimport (directory)   branches/KDE/3.5/kdesdk/umbrello/umbrello/codeimport#565677
 A             umbrello/codeimport/CMakeLists.txt  
 M  +14 -14    umbrello/codeimport/adaimport.cpp  
 M  +2 -2      umbrello/codeimport/classimport.cpp  
 _             umbrello/codeimport/classimport.h  
 M  +3 -3      umbrello/codeimport/cppimport.cpp  
 M  +13 -13    umbrello/codeimport/idlimport.cpp   [POSSIBLY UNSAFE: popen]
 _             umbrello/codeimport/idlimport.h  
 M  +7 -7      umbrello/codeimport/import_utils.cpp  
 M  +15 -15    umbrello/codeimport/javaimport.cpp  
 _             umbrello/codeimport/javaimport.h  
 _             umbrello/codeimport/kdevcppparser (directory)  
 A             umbrello/codeimport/kdevcppparser/CMakeLists.txt  
 _             umbrello/codeimport/kdevcppparser/Makefile.am  
 _             umbrello/codeimport/kdevcppparser/README  
 M  +8 -8      umbrello/codeimport/kdevcppparser/ast.cpp  
 M  +35 -35    umbrello/codeimport/kdevcppparser/ast.h  
 M  +13 -11    umbrello/codeimport/kdevcppparser/ast_utils.cpp  
 _             umbrello/codeimport/kdevcppparser/ast_utils.h  
 M  +51 -50    umbrello/codeimport/kdevcppparser/cpptree2uml.cpp  
 _             umbrello/codeimport/kdevcppparser/cpptree2uml.h  
 M  +12 -9     umbrello/codeimport/kdevcppparser/driver.cpp  
 M  +11 -9     umbrello/codeimport/kdevcppparser/driver.h  
 M  +5 -5      umbrello/codeimport/kdevcppparser/errors.cpp  
 M  +5 -4      umbrello/codeimport/kdevcppparser/errors.h  
 _             umbrello/codeimport/kdevcppparser/keywords.lut.h  
 M  +14 -14    umbrello/codeimport/kdevcppparser/lexer.cpp  
 M  +13 -11    umbrello/codeimport/kdevcppparser/lexer.h  
 M  +2 -2      umbrello/codeimport/kdevcppparser/lookup.cpp  
 M  +1 -1      umbrello/codeimport/kdevcppparser/lookup.h  
 M  +115 -115  umbrello/codeimport/kdevcppparser/parser.cpp  
 M  +4 -4      umbrello/codeimport/kdevcppparser/parser.h  
 M  +27 -25    umbrello/codeimport/kdevcppparser/tree_parser.cpp  
 M  +2 -2      umbrello/codeimport/kdevcppparser/tree_parser.h  
 M  +28 -30    umbrello/codeimport/kdevcppparser/urlutil.cpp  
 M  +13 -13    umbrello/codeimport/kdevcppparser/urlutil.h  
 M  +5 -5      umbrello/codeimport/nativeimportbase.cpp  
 M  +8 -8      umbrello/codeimport/pascalimport.cpp  
 M  +5 -5      umbrello/codeimport/pythonimport.cpp  
 D             umbrello/cppimport.cpp  
 D             umbrello/cppimport.h  
 M  +3 -0      umbrello/dialogs/settingsdlg.cpp  
 M  +4 -7      umbrello/dialogs/umlattributedialog.cpp  
 M  +5 -8      umbrello/dialogs/umlwidgetcolorpage.cpp  
 M  +1 -1      umbrello/entity.cpp  
 D             umbrello/idlimport.cpp  
 D             umbrello/idlimport.h  
 D             umbrello/import_utils.cpp  
 D             umbrello/import_utils.h  
 D             umbrello/javaimport.cpp  
 D             umbrello/javaimport.h  
 M  +1 -1      umbrello/listpopupmenu.cpp  
 M  +1 -1      umbrello/main.cpp  
 M  +4 -0      umbrello/model_utils.cpp  
 D             umbrello/nativeimportbase.cpp  
 D             umbrello/nativeimportbase.h  
 A             umbrello/optionstate.cpp   branches/KDE/3.5/kdesdk/umbrello/umbrello/optionstate.cpp#565677
 M  +7 -1      umbrello/optionstate.h  
 M  +1 -1      umbrello/petaltree2uml.cpp  
 D             umbrello/pythonimport.cpp  
 D             umbrello/pythonimport.h  
 M  +111 -104  umbrello/uml.cpp  
 M  +1 -10     umbrello/uml.h  
 M  +12 -12    umbrello/umldoc.cpp  
 M  +3 -4      umbrello/umllistview.cpp  
 M  +1 -0      umbrello/umlnamespace.h  
 M  +2 -2      umbrello/umlobject.cpp  
 M  +3 -3      uml.lsm