[Uml-devel] branches/work/isi-umbrello
Thibault Normand
thibault.normand at gmail.com
Thu Jan 11 22:16:42 UTC 2007
SVN commit 622468 by tnormand:
Happy new Year to all Kde developers ^^
#SVN MERGE 621464
Conflict solving due to merge in umbrello/umbrello/CMakelist.txt
M +8 -6 cervisia/CMakeLists.txt
M +8 -5 cervisia/addremovedlg.cpp
M +2 -2 cervisia/addremovedlg.h
M +14 -8 cervisia/addrepositorydlg.cpp
M +5 -5 cervisia/addrepositorydlg.h
M +6 -7 cervisia/annotatectl.cpp
M +2 -2 cervisia/annotatectl.h
M +9 -8 cervisia/annotatedlg.cpp
M +3 -3 cervisia/annotatedlg.h
M +2 -2 cervisia/annotateview.cpp
M +2 -2 cervisia/annotateview.h
M +143 -117 cervisia/cervisiapart.cpp
M +3 -5 cervisia/cervisiapart.h
M +1 -0 cervisia/cervisiapart.kcfg
M +4 -4 cervisia/cervisiashell.cpp
M +14 -9 cervisia/changelogdlg.cpp
M +5 -5 cervisia/changelogdlg.h
M +15 -10 cervisia/checkoutdlg.cpp
M +7 -7 cervisia/checkoutdlg.h
M +18 -14 cervisia/commitdlg.cpp
M +6 -7 cervisia/commitdlg.h
M +9 -3 cervisia/cvsinitdlg.cpp
M +2 -2 cervisia/cvsinitdlg.h
M +9 -6 cervisia/cvsservice/CMakeLists.txt
M +3 -2 cervisia/cvsservice/cvsaskpass.cpp
M +14 -7 cervisia/cvsservice/cvsjob.cpp
M +2 -3 cervisia/cvsservice/cvsjob.h
M +13 -5 cervisia/cvsservice/cvsloginjob.cpp
M +5 -5 cervisia/cvsservice/cvsloginjob.h
M +91 -94 cervisia/cvsservice/cvsservice.cpp
M +37 -37 cervisia/cvsservice/cvsservice.h
A cervisia/cvsservice/org.kde.cervisia.cvsloginjob.xml trunk/KDE/kdesdk/cervisia/cvsservice/org.kde.cervisia.cvsloginjob.xml#622456
M +44 -2 cervisia/cvsservice/org.kde.cervisia.cvsservice.xml
M +11 -10 cervisia/cvsservice/repository.cpp
M +0 -2 cervisia/cvsservice/repository.h
M +17 -22 cervisia/diffdlg.cpp
M +6 -7 cervisia/diffdlg.h
M +4 -4 cervisia/diffview.cpp
M +4 -4 cervisia/diffview.h
M +1 -1 cervisia/editwithmenu.cpp
M +3 -3 cervisia/globalignorelist.cpp
M +2 -2 cervisia/globalignorelist.h
M +18 -18 cervisia/historydlg.cpp
M +6 -7 cervisia/historydlg.h
M +29 -27 cervisia/logdlg.cpp
M +7 -9 cervisia/logdlg.h
M +5 -4 cervisia/loglist.cpp
M +3 -3 cervisia/loglist.h
M +3 -3 cervisia/logmessageedit.cpp
M +0 -1 cervisia/logplainview.h
M +9 -9 cervisia/main.cpp
M +11 -5 cervisia/mergedlg.cpp
M +5 -5 cervisia/mergedlg.h
M +6 -7 cervisia/misc.cpp
M +3 -4 cervisia/misc.h
M +14 -13 cervisia/progressdlg.cpp
M +3 -5 cervisia/progressdlg.h
M +8 -8 cervisia/protocolview.cpp
M +3 -3 cervisia/protocolview.h
M +2 -2 cervisia/qttableview.cpp
M +3 -7 cervisia/repositories.cpp
M +21 -13 cervisia/repositorydlg.cpp
M +7 -8 cervisia/repositorydlg.h
M +16 -10 cervisia/resolvedlg.cpp
M +4 -5 cervisia/resolvedlg.h
M +13 -7 cervisia/resolvedlg_p.cpp
M +5 -5 cervisia/resolvedlg_p.h
M +8 -7 cervisia/settingsdlg.cpp
M +5 -6 cervisia/settingsdlg.h
M +4 -4 cervisia/tagdlg.cpp
M +3 -3 cervisia/tagdlg.h
M +11 -5 cervisia/updatedlg.cpp
M +5 -5 cervisia/updatedlg.h
M +6 -5 cervisia/updateview.cpp
M +3 -3 cervisia/updateview.h
M +7 -3 cervisia/watchdlg.cpp
M +2 -2 cervisia/watchdlg.h
M +15 -12 cervisia/watchersdlg.cpp
M +7 -7 cervisia/watchersdlg.h
M +865 -27 doc/kompare/index.docbook
A doc/kompare/settings-diff1.png trunk/KDE/kdesdk/doc/kompare/settings-diff1.png#622456
A doc/kompare/settings-diff2.png trunk/KDE/kdesdk/doc/kompare/settings-diff2.png#622456
A doc/kompare/settings-diff3.png trunk/KDE/kdesdk/doc/kompare/settings-diff3.png#622456
A doc/kompare/settings-diff4.png trunk/KDE/kdesdk/doc/kompare/settings-diff4.png#622456
A doc/kompare/settings-view1.png trunk/KDE/kdesdk/doc/kompare/settings-view1.png#622456
A doc/kompare/settings-view2.png trunk/KDE/kdesdk/doc/kompare/settings-view2.png#622456
M +63 -16 ebn/krazy/INSTALL.txt
M +11 -0 ebn/krazy/foodata
M +10 -5 ebn/krazy/install.sh
M +4 -0 ebn/krazy/krazy
M +1 -1 ebn/krazy/krazyebn
A ebn/krazy/plugins/Makefile trunk/KDE/kdesdk/ebn/krazy/plugins/Makefile#622456
D ebn/krazy/plugins/Makefile.PL
M +4 -0 ebn/krazy/plugins/TEMPLATE.pl
M +4 -0 ebn/krazy/plugins/captruefalse
M +3 -0 ebn/krazy/plugins/contractions
M +3 -0 ebn/krazy/plugins/copyright
M +6 -1 ebn/krazy/plugins/doublequote_chars
M +3 -0 ebn/krazy/plugins/doxytags.0
M +5 -0 ebn/krazy/plugins/emptystrcompare
M +3 -0 ebn/krazy/plugins/endswithnewline
M +5 -0 ebn/krazy/plugins/explicit
A ebn/krazy/plugins/inline trunk/KDE/kdesdk/ebn/krazy/plugins/inline#622456
M +3 -0 ebn/krazy/plugins/license
M +5 -0 ebn/krazy/plugins/nullstrassign
M +5 -0 ebn/krazy/plugins/nullstrcompare
M +6 -0 ebn/krazy/plugins/qminmax
M +3 -0 ebn/krazy/plugins/spelling
M +4 -0 ebn/krazy/tplugins/constmethods
M +4 -0 ebn/krazy/tplugins/doxygenation
M +4 -0 ebn/krazy/tplugins/includes
M +4 -0 ebn/krazy/tplugins/style
M +4 -0 ebn/krazy/tplugins/visibility
M +1 -1 kapptemplate/appframework/app.spec
M +5 -5 kapptemplate/kapp/app.cpp
M +1 -1 kapptemplate/kapp/main.cpp
M +1 -1 kapptemplate/kapp4/kapp4.cpp
M +1 -1 kapptemplate/kapp4/kapp4.h
M +1 -1 kapptemplate/kapp4/kapp4view.h
M +3 -4 kbabel/addons/preview/pothumbcreator.cpp
M +4 -66 kbabel/catalogmanager/CMakeLists.txt
M +254 -147 kbabel/catalogmanager/catalogmanager.cpp
M +5 -5 kbabel/catalogmanager/catalogmanager.h
M +4 -2 kbabel/catalogmanager/catalogmanagerapp.h
M +9 -9 kbabel/catalogmanager/catalogmanagerview.cpp
M +5 -5 kbabel/catalogmanager/catalogmanagerview.h
M +2 -2 kbabel/catalogmanager/libcvs/cvshandler.cpp
M +1 -1 kbabel/catalogmanager/libsvn/svnhandler.cpp
M +11 -1 kbabel/catalogmanager/main.cpp
M +8 -2 kbabel/catalogmanager/org.kde.kbabel.catalogmanager.xml
M +1 -1 kbabel/common/CMakeLists.txt
M +27 -16 kbabel/common/catalog.cpp
M +1 -1 kbabel/common/catalog.h
M +3 -2 kbabel/common/catalogfileplugin.h
M +3 -4 kbabel/common/importplugin.cpp
M +0 -6 kbabel/common/msgfmt.cpp
M +0 -1 kbabel/common/msgfmt.h
M +6 -6 kbabel/common/poinfo.cpp
M +12 -13 kbabel/commonui/toolaction.cpp
M +2 -2 kbabel/commonui/toolaction.h
M +5 -1 kbabel/kbabel/CMakeLists.txt
M +4 -3 kbabel/kbabel/contextview.cpp
M +1 -1 kbabel/kbabel/headereditor.cpp
M +234 -157 kbabel/kbabel/kbabel.cpp
M +15 -15 kbabel/kbabel/kbabel.h
M +1 -0 kbabel/kbabel/kbabel.kcfg
M +4 -4 kbabel/kbabel/kbabelinterface.cpp
M +2 -2 kbabel/kbabel/kbabelinterface.h
M +14 -14 kbabel/kbabel/kbabelview.cpp
M +4 -4 kbabel/kbabel/kbabelview2.cpp
M +9 -9 kbabel/kbabel/mymultilineedit.cpp
M +26 -0 kbabel/kbabel/org.kde.kbabel.kbabel.xml
M +4 -0 kbabel/kbabeldict/CMakeLists.txt
M +6 -4 kbabel/kbabeldict/dictionarymenu.cpp
M +7 -7 kbabel/kbabeldict/dictionarymenu.h
M +6 -5 kbabel/kbabeldict/kbabeldictbox.cpp
M +1 -1 kbabel/kbabeldict/modules/dbsearchengine2/database.cpp
M +1 -1 kbabel/kbabeldict/modules/dbsearchengine2/dbentries.cpp
M +2 -2 kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
M +7 -7 kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
M +2 -2 kbugbuster/backend/domprocessor.cpp
M +0 -1 kbugbuster/backend/mailsender.cpp
M +1 -1 kbugbuster/gui/centralwidget.cpp
M +8 -8 kbugbuster/gui/cwbugdetailscontainer.cpp
M +65 -31 kbugbuster/gui/kbbmainwindow.cpp
M +7 -7 kbugbuster/gui/kbbmainwindow.h
M +2 -2 kbugbuster/gui/msginputdialog.cpp
M +3 -2 kbugbuster/gui/serverconfigdialog.cpp
M +2 -2 kbugbuster/gui/serverconfigdialog.h
M +0 -4 kbugbuster/main.cpp
M +2 -2 kcachegrind/kcachegrind/callgraphview.cpp
M +1 -1 kcachegrind/kcachegrind/callitem.cpp
M +1 -1 kcachegrind/kcachegrind/instritem.cpp
M +1 -1 kcachegrind/kcachegrind/sourceitem.cpp
M +74 -50 kcachegrind/kcachegrind/toplevel.cpp
M +6 -6 kcachegrind/kcachegrind/treemap.cpp
M +1 -1 kdeaccounts-plugin/kdeaccountsformat.cpp
M +1 -1 kioslave/svn/svn.cpp
M +5 -5 kompare/komparepart/kompare_part.cpp
M +1 -0 kuiviewer/kuiviewer.cpp
M +4 -2 kuiviewer/kuiviewer_part.cpp
M +8 -7 scheck/scheck.cpp
M +52 -11 scripts/CMakeLists.txt
M +1 -1 scripts/cxxmetric
M +32 -4 scripts/kde-devel-vim.vim
M +2 -3 scripts/kde-emacs/kde-emacs-utils.el
A scripts/kde_generate_export_header trunk/KDE/kdesdk/scripts/kde_generate_export_header#622456
M +1 -1 scripts/kdelnk2desktop.py
M +7 -0 scripts/qt4/adapt-to-kde4-api.pl
M +78 -37 umbrello/umbrello/CMakeLists.txt
M +3 -3 umbrello/umbrello/association.cpp
M +1 -1 umbrello/umbrello/associationwidget.cpp
M +1 -1 umbrello/umbrello/attribute.cpp
M +2 -2 umbrello/umbrello/classifier.cpp
M +2 -2 umbrello/umbrello/codedocument.cpp
M +5 -5 umbrello/umbrello/codegenerationpolicy.cpp
M +6 -6 umbrello/umbrello/codegenerator.cpp
M +1 -1 umbrello/umbrello/codegenerators/cppcodedocumentation.cpp
M +1 -1 umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp
M +6 -2 umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp
M +1 -1 umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp
M +2 -2 umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
M +5 -5 umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
M +1 -1 umbrello/umbrello/codegenerators/cppmakecodedocument.cpp
M +2 -2 umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp
M +6 -6 umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp
M +8 -8 umbrello/umbrello/codegenerators/cppwriter.cpp
M +1 -1 umbrello/umbrello/codegenerators/javaantcodedocument.cpp
M +4 -4 umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
M +5 -5 umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp
M +2 -2 umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp
M +1 -1 umbrello/umbrello/codegenerators/javacodedocumentation.cpp
M +5 -5 umbrello/umbrello/codegenerators/javacodeoperation.cpp
M +4 -4 umbrello/umbrello/codegenerators/javawriter.cpp
M +6 -6 umbrello/umbrello/codegenerators/perlwriter.cpp
M +6 -6 umbrello/umbrello/codegenerators/php5writer.cpp
M +2 -2 umbrello/umbrello/codegenerators/pythonwriter.cpp
M +1 -1 umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
M +4 -4 umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
M +1 -1 umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp
M +3 -3 umbrello/umbrello/codegenerators/rubycodedocumentation.cpp
M +9 -9 umbrello/umbrello/codegenerators/rubycodeoperation.cpp
M +4 -4 umbrello/umbrello/codegenerators/rubywriter.cpp
M +6 -6 umbrello/umbrello/codegenerators/simplecodegenerator.cpp
M +16 -16 umbrello/umbrello/codegenerators/tclwriter.cpp
M +2 -2 umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp
M +3 -3 umbrello/umbrello/codegenerators/xmlschemawriter.cpp
M +2 -2 umbrello/umbrello/codeimport/adaimport.cpp
M +1 -1 umbrello/umbrello/codeimport/idlimport.cpp
M +1 -1 umbrello/umbrello/codeimport/import_utils.cpp
M +3 -3 umbrello/umbrello/codeimport/javaimport.cpp
M +3 -3 umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
M +1 -1 umbrello/umbrello/codeimport/kdevcppparser/ast.h
M +3 -3 umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
M +6 -6 umbrello/umbrello/codeimport/kdevcppparser/driver.cpp
M +2 -2 umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
M +2 -2 umbrello/umbrello/codeimport/kdevcppparser/lexer.h
M +2 -2 umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
M +2 -2 umbrello/umbrello/codeimport/nativeimportbase.cpp
M +1 -1 umbrello/umbrello/codeimport/pascalimport.cpp
M +2 -2 umbrello/umbrello/dialogs/assocrolepage.cpp
M +1 -1 umbrello/umbrello/dialogs/classifierlistpage.cpp
M +6 -6 umbrello/umbrello/dialogs/codeeditor.cpp
M +1 -1 umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
M +1 -1 umbrello/umbrello/entityattribute.cpp
M +1 -1 umbrello/umbrello/entitywidget.cpp
M +4 -4 umbrello/umbrello/folder.cpp
M +1 -1 umbrello/umbrello/import_rose.cpp
M +4 -8 umbrello/umbrello/kplayerslideraction.cpp
M +6 -8 umbrello/umbrello/kplayerslideraction.h
M +1 -1 umbrello/umbrello/main.cpp
M +3 -3 umbrello/umbrello/model_utils.cpp
M +1 -1 umbrello/umbrello/notewidget.cpp
M +2 -2 umbrello/umbrello/operation.cpp
M +1 -1 umbrello/umbrello/stereotype.cpp
M +1 -1 umbrello/umbrello/textblock.cpp
M +7 -1 umbrello/umbrello/toolbarstateassociation.cpp
M +86 -82 umbrello/umbrello/uml.cpp
M +1 -1 umbrello/umbrello/umlcanvasobject.cpp
M +4 -4 umbrello/umbrello/umldoc.cpp
M +3 -3 umbrello/umbrello/umllistview.cpp
M +2 -2 umbrello/umbrello/umlviewimageexporter.cpp
M +4 -4 umbrello/umbrello/umlviewimageexportermodel.cpp
M +3 -3 umbrello/umbrello/umlwidgetcontroller.cpp
M +11 -11 umbrello/umbrello/widget_utils.cpp
More information about the umbrello-devel
mailing list