SVN commit 1281796 by okellogg:

Merge 1269575:1272343 from trunk - excluding new i18n strings:
umbrello/codeimpwizard/codeimpstatuspage.cpp:206,207
umbrello/codeimpwizard/codeimpstatuspage.cpp:508,519
umbrello/widgets/notewidget.cpp:202 ff.


M +4 -1 codeimport/import_utils.cpp
M +19 -11 codeimport/kdevcppparser/parser.cpp
M +75 -19 codeimpwizard/codeimpstatuspage.cpp
M +11 -3 codeimpwizard/codeimpstatuspage.h
M +11 -9 codeimpwizard/codeimpthread.cpp
M +6 -4 codeimpwizard/codeimpthread.h
M +4 -4 controller/floatingtextwidgetcontroller.cpp
M +2 -2 controller/messagewidgetcontroller.cpp
M +8 -11 dialogs/codeeditor.cpp
M +7 -6 dialogs/codeeditor.h
M +1 -7 dialogs/exportallviewsdialog.cpp
M +1 -2 dialogs/exportallviewsdialog.h
M +3 -3 dialogs/umlviewdialog.cpp
M +87 -89 docwindow.cpp
M +6 -2 docwindow.h
M +30 -1 model_utils.cpp
M +5 -0 model_utils.h
M +46 -50 uml.cpp
M +3 -4 uml.h
M +44 -11 umldoc.cpp
M +8 -0 umldoc.h
M +190 -159 umllistview.cpp
M +2 -7 umllistview.h
M +4 -2 umllistviewitem.cpp
M +9 -2 umlobject.cpp
M +2 -1 umlobject.h
M +46 -22 umlview.cpp
M +5 -38 umlview.h
M +3 -4 umlviewimageexporterall.cpp
M +14 -10 umlviewimageexportermodel.cpp
M +29 -11 widgets/componentwidget.cpp
M +4 -27 widgets/componentwidget.h
M +125 -7 widgets/messagewidget.cpp
M +34 -161 widgets/messagewidget.h
M +24 -40 widgets/notewidget.cpp
M +16 -24 widgets/notewidget.h
M +12 -1 widgets/widgetbase.cpp
M +3 -1 widgets/widgetbase.h


http://websvn.kde.org/?view=rev&revision=1281796