[Uml-devel] branches/work/isi-umbrello

[Thibault Normand]

SVN commit 625292 by tnormand:

# SVN MERGE 625291

 M  +1 -2      CMakeLists.txt  
 M  +1 -1      cervisia/CMakeLists.txt  
 M  +1 -1      cervisia/annotatectl.cpp  
 M  +3 -2      cervisia/cervisiapart.h  
 M  +3 -2      cervisia/changelogdlg.h  
 M  +5 -6      cervisia/cvsservice/cvsjob.h  
 M  +2 -3      cervisia/cvsservice/cvsservice.desktop  
 M  +3 -2      cervisia/cvsservice/main.cpp  
 M  +5 -6      cervisia/cvsservice/org.kde.cervisia.cvsjob.xml  
 M  +1 -0      cervisia/cvsservice/org.kde.cervisia.cvsservice.xml  
 M  +9 -9      cervisia/cvsservice/repository.h  
 M  +3 -3      cervisia/diffdlg.cpp  
 M  +2 -0      cervisia/diffview.cpp  
 M  +1 -1      cervisia/globalignorelist.cpp  
 M  +8 -0      cervisia/logmessageedit.cpp  
 M  +2 -0      cervisia/logplainview.cpp  
 M  +1 -1      cervisia/misc.cpp  
 M  +7 -7      cervisia/org.kde.cervisia.protocolview.xml  
 M  +2 -0      cervisia/qttableview.cpp  
 M  +0 -3      cervisia/resolvedlg.h  
 M  +2 -2      cervisia/tagdlg.h  
 M  +4 -0      cervisia/tooltip.cpp  
 M  +17 -15    kapptemplate/kapp4/kapp4.cpp  
 M  +8 -4      kapptemplate/kapp4/kapp4.h  
 M  +20 -17    kapptemplate/kapp4/kapp4view.cpp  
 M  +14 -10    kapptemplate/kapp4/kapp4view.h  
 M  +4 -5      kapptemplate/kapp4/main.cpp  
 M  +1 -1      kapptemplate/kapp4template.module  
 M  +1 -0      kbabel/addons/kfile-plugins/kfile_po.desktop  
 M  +1 -0      kbabel/addons/preview/pothumbnail.desktop  
 M  +2 -0      kbabel/catalogmanager/catalogmanager.desktop  
 M  +1 -0      kbabel/common/kbabelfilter.desktop  
 M  +1 -0      kbabel/commonui/kbabel_validator.desktop  
 M  +2 -0      kbabel/datatools/accelerators/kbabel_accelstool.desktop  
 M  +2 -0      kbabel/datatools/arguments/kbabel_argstool.desktop  
 M  +2 -0      kbabel/datatools/context/kbabel_contexttool.desktop  
 M  +2 -0      kbabel/datatools/equations/kbabel_equationstool.desktop  
 M  +2 -0      kbabel/datatools/length/kbabel_lengthtool.desktop  
 M  +2 -0      kbabel/datatools/not-translated/kbabel_nottranslatedtool.desktop  
 M  +2 -0      kbabel/datatools/pluralforms/kbabel_pluralformstool.desktop  
 M  +2 -0      kbabel/datatools/punctuation/kbabel_punctuationtool.desktop  
 M  +2 -0      kbabel/datatools/regexp/kbabel_regexptool.desktop  
 M  +2 -0      kbabel/datatools/setfuzzy/kbabel_setfuzzytool.desktop  
 M  +2 -0      kbabel/datatools/whitespace/kbabel_whitespacetool.desktop  
 M  +2 -0      kbabel/datatools/xml/kbabel_xmltool.desktop  
 M  +1 -0      kbabel/filters/gettext/kbabel_gettext_export.desktop  
 M  +1 -0      kbabel/filters/gettext/kbabel_gettext_import.desktop  
 M  +1 -0      kbabel/filters/linguist/kbabel_linguist_export.desktop  
 M  +1 -0      kbabel/filters/linguist/kbabel_linguist_import.desktop  
 M  +1 -0      kbabel/filters/xliff/kbabel_xliff_export.desktop  
 M  +1 -0      kbabel/filters/xliff/kbabel_xliff_import.desktop  
 M  +1 -0      kbabel/kbabel/kbabel.desktop  
 M  +2 -0      kbabel/kbabeldict/kbabeldict.desktop  
 M  +1 -0      kbabel/kbabeldict/kbabeldict_module.desktop  
 M  +1 -0      kbabel/kbabeldict/modules/dbsearchengine/dbsearchengine.desktop  
 M  +1 -0      kbabel/kbabeldict/modules/dbsearchengine2/dbsearchengine2.desktop  
 M  +1 -0      kbabel/kbabeldict/modules/poauxiliary/poauxiliary.desktop  
 M  +1 -0      kbabel/kbabeldict/modules/pocompendium/pocompendium.desktop  
 M  +1 -0      kbabel/kbabeldict/modules/tmx/tmxcompendium.desktop  
 M  +1 -1      kbugbuster/gui/messageeditor.cpp  
 M  +2 -0      kbugbuster/gui/msginputdialog.cpp  
 M  +1 -0      kbugbuster/gui/packageselectdialog.cpp  
 M  +3 -0      kbugbuster/gui/preferencesdialog.cpp  
 M  +1 -0      kbugbuster/kbugbuster.desktop  
 M  +1 -0      kbugbuster/kresources/bugzilla.desktop  
 M  +2 -0      kcachegrind/kcachegrind/kcachegrind.desktop  
 M  +1 -0      kcachegrind/kcachegrind/x-kcachegrind.desktop  
 M  +1 -0      kdeaccounts-plugin/kdeaccountsplugin.desktop  
 M  +1 -0      kfile-plugins/c++/kfile_cpp.desktop  
 M  +1 -0      kfile-plugins/c++/kfile_h.desktop  
 M  +1 -0      kfile-plugins/diff/kfile_diff.desktop  
 M  +1 -0      kfile-plugins/ts/kfile_ts.desktop  
 M  +1 -0      kioslave/svn/ksvnd/ksvnd.desktop  
 M  +2 -0      kioslave/svn/svnhelper/apply_patch.desktop  
 M  +21 -0     kioslave/svn/svnhelper/subversion.desktop  
 M  +2 -0      kioslave/svn/svnhelper/subversion_toplevel.desktop  
 M  +1 -0      kompare/kompare.desktop  
 M  +1 -0      kuiviewer/designerthumbnail.desktop  
 M  +1 -0      kuiviewer/kuiviewer.desktop  
 M  +1 -0      scheck/scheck.themerc  
 M  +7 -7      scripts/kde-emacs/kde-emacs-utils.el  
 M  +4 -1      scripts/kde_generate_export_header  
 M  +2 -0      umbrello/ChangeLog  
 M  +0 -2      umbrello/umbrello/CMakeLists.txt  
 M  +82 -23    umbrello/umbrello/classifier.cpp  
 M  +34 -8     umbrello/umbrello/classifier.h  
 M  +3 -3      umbrello/umbrello/classifierwidget.cpp  
 M  +1 -0      umbrello/umbrello/codegenerators/adawriter.cpp  
 M  +3 -3      umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp  
 M  +2 -2      umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp  
 M  +136 -80   umbrello/umbrello/codeimport/adaimport.cpp  
 M  +34 -2     umbrello/umbrello/codeimport/adaimport.h  
 M  +1 -2      umbrello/umbrello/codeimport/cppimport.cpp  
 M  +18 -13    umbrello/umbrello/codeimport/import_utils.cpp  
 M  +3 -2      umbrello/umbrello/codeimport/javaimport.cpp  
 M  +5 -4      umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp  
 M  +8 -1      umbrello/umbrello/codeimport/nativeimportbase.cpp  
 M  +6 -4      umbrello/umbrello/codeimport/nativeimportbase.h  
 M  +51 -35    umbrello/umbrello/codeimport/pascalimport.cpp  
 D             umbrello/umbrello/datatype.cpp  
 D             umbrello/umbrello/datatype.h  
 M  +3 -3      umbrello/umbrello/datatypewidget.cpp  
 M  +4 -4      umbrello/umbrello/datatypewidget.h  
 M  +2 -0      umbrello/umbrello/dialogs/activitydialog.cpp  
 M  +2 -0      umbrello/umbrello/dialogs/assocpropdlg.cpp  
 M  +6 -0      umbrello/umbrello/dialogs/classpropdlg.cpp  
 M  +2 -2      umbrello/umbrello/dialogs/classpropdlg.h  
 M  +1 -0      umbrello/umbrello/dialogs/notedialog.cpp  
 M  +3 -0      umbrello/umbrello/dialogs/overwritedialogue.cpp  
 M  +1 -1      umbrello/umbrello/dialogs/parmpropdlg.cpp  
 M  +3 -0      umbrello/umbrello/dialogs/settingsdlg.cpp  
 M  +2 -0      umbrello/umbrello/dialogs/statedialog.cpp  
 M  +2 -0      umbrello/umbrello/dialogs/umlattributedialog.cpp  
 M  +10 -9     umbrello/umbrello/dialogs/umlentityattributedialog.cpp  
 M  +2 -0      umbrello/umbrello/dialogs/umloperationdialog.cpp  
 M  +2 -0      umbrello/umbrello/dialogs/umlroledialog.cpp  
 M  +2 -0      umbrello/umbrello/dialogs/umltemplatedialog.cpp  
 M  +3 -0      umbrello/umbrello/dialogs/umlviewdialog.cpp  
 M  +2 -2      umbrello/umbrello/docgenerators/xhtmlgenerator.cpp  
 M  +3 -1      umbrello/umbrello/docgenerators/xhtmlgenerator.h  
 M  +11 -0     umbrello/umbrello/model_utils.cpp  
 M  +18 -9     umbrello/umbrello/object_factory.cpp  
 M  +2 -1      umbrello/umbrello/object_factory.h  
 M  +2 -2      umbrello/umbrello/petaltree2uml.cpp  
 M  +1 -0      umbrello/umbrello/umbrello.desktop  
 D             umbrello/umbrello/umldatatypelist.h  
 M  +5 -5      umbrello/umbrello/umldoc.cpp  
 M  +3 -4      umbrello/umbrello/umldoc.h  
 M  +7 -4      umbrello/umbrello/umllistview.cpp  
 M  +2 -2      umbrello/umbrello/umlobject.h  
 M  +8 -9      umbrello/umbrello/umlview.cpp  
 M  +4 -4      umbrello/umbrello/widget_factory.cpp  
 M  +1 -0      umbrello/umbrello/x-umbrello.desktop  
 M  +1 -1      umbrello/uml.lsm