[Uml-devel] branches/work/kaction-cleanup-branch/KDE

[Simon Hausmann]

SVN commit 614460 by hausmann:

Merged revisions 614348-614458 via svnmerge from 
svn+ssh://hausmann@svn.kde.org/home/kde/trunk/KDE


 _M            . (directory)  
 M  +3 -3      kdeaddons/kate/kpybrowser/pybrowse_part.cpp  
 M  +3 -2      kdeaddons/kate/xmlcheck/plugin_katexmlcheck.cpp  
 M  +4 -1      kdeaddons/konq-plugins/akregator/akregatorplugin.cpp  
 M  +72 -104   kdeaddons/konq-plugins/babelfish/plugin_babelfish.cpp  
 M  +3 -4      kdeaddons/konq-plugins/dirfilter/dirfilterplugin.cpp  
 M  +32 -24    kdeaddons/konq-plugins/domtreeviewer/domtreewindow.cpp  
 M  +4 -4      kdeaddons/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp  
 M  +4 -3      kdeaddons/konq-plugins/fsview/fsview_part.cpp  
 M  +5 -2      kdeaddons/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp  
 M  +98 -32    kdeaddons/konq-plugins/rellinks/plugin_rellinks.cpp  
 M  +4 -3      kdeaddons/konq-plugins/searchbar/searchbar.cpp  
 M  +8 -16     kdeaddons/konq-plugins/validators/plugin_validators.cpp  
 M  +4 -4      kdeaddons/konq-plugins/webarchiver/plugin_webarchiver.cpp  
 M  +10 -3     kdeaddons/ksig/ksig.cpp  
 M  +12 -12    kdeadmin/kpackage/debAptInterface.cpp  
 M  +50 -42    kdeadmin/kpackage/kpackage.cpp  
 M  +1 -15     kdebase/workspace/ksysguard/gui/ProcessTable.sgrd  
 M  +1 -1      kdebase/workspace/ksysguard/gui/SensorDisplayLib/FancyPlotter.h  
 M  +10 -4     kdebase/workspace/ksysguard/gui/SensorDisplayLib/ProcessController.cc  
 M  +9 -5      kdebase/workspace/ksysguard/gui/SensorDisplayLib/ProcessController.h  
 M  +5 -1      kdebase/workspace/ksysguard/gui/SensorDisplayLib/ProcessFilter.cc  
 M  +6 -0      kdebase/workspace/ksysguard/gui/SensorDisplayLib/ProcessFilter.h  
 M  +25 -14    kdebase/workspace/ksysguard/gui/SensorDisplayLib/ProcessModel.cc  
 M  +4 -6      kdebase/workspace/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc  
 M  +1 -1      kdeedu/kvoctrain/kvoctrain/kva_init.cpp  
 M  +15 -18    kdeedu/kvoctrain/kvoctrain/kva_io.cpp  
 M  +1 -1      kdeedu/kvoctrain/kvoctrain/kvoctrain.cpp  
 M  +2 -2      kdeedu/kvoctrain/kvoctrain/kvoctrain.h  
 M  +1 -4      kdeedu/kvoctrain/kvoctrain/kvttabledelegate.cpp  
 M  +11 -5     kdeedu/kvoctrain/kvoctrain/kvttablemodel.cpp  
 M  +6 -2      kdeedu/libkdeedu/kdeeducore/keduvockvtmlreader.cpp  
 M  +8 -3      kdegraphics/ligature/plugins/ps/psMultipage.cpp  
 M  +3 -1      kdegraphics/ligature/shell/ligaturepart.cpp  
 M  +3 -1      kdelibs/kate/tests/katetest.cpp  
 M  +1 -0      kdelibs/kdecore/kdebug.areas  
 M  +5 -8      kdelibs/kio/kioexec/main.cpp  
 M  +0 -6      kdelibs/kjs/CMakeLists.txt  
 M  +1 -1      kdelibs/kjs/collector.cpp  
 M  +1 -2      kdelibs/kjs/kjs.cpp  
 M  +0 -2      kdelibs/kxmlcore/CMakeLists.txt  
 M  +2 -2      kdelibs/kxmlcore/FastMalloc.h  
 M  +3 -3      kdelibs/kxmlcore/ListRefPtr.h  
 M  +3 -3      kdelibs/kxmlcore/OwnArrayPtr.h  
 M  +3 -3      kdelibs/kxmlcore/OwnPtr.h  
 M  +1 -2      kdenetwork/kopete/protocols/oscar/TODO  
 M  +1 -0      kdenetwork/kopete/protocols/oscar/aim/CMakeLists.txt  
 M  +113 -54   kdenetwork/kopete/protocols/oscar/aim/aimaccount.cpp  
 M  +14 -5     kdenetwork/kopete/protocols/oscar/aim/aimaccount.h  
 M  +10 -37    kdenetwork/kopete/protocols/oscar/aim/aimcontact.cpp  
 A             kdenetwork/kopete/protocols/oscar/aim/aimpresence.cpp   trunk/KDE/kdenetwork/kopete/protocols/oscar/aim/aimpresence.cpp#614458
 A             kdenetwork/kopete/protocols/oscar/aim/aimpresence.h   trunk/KDE/kdenetwork/kopete/protocols/oscar/aim/aimpresence.h#614458
 M  +10 -9     kdenetwork/kopete/protocols/oscar/aim/aimprotocol.cpp  
 M  +4 -9      kdenetwork/kopete/protocols/oscar/aim/aimprotocol.h  
 M  +19 -30    kdenetwork/kopete/protocols/oscar/aim/icqcontact.cpp  
 M  +2 -0      kdenetwork/kopete/protocols/oscar/aimcontactbase.cpp  
 A             kdenetwork/kopete/protocols/oscar/icons/cr16-action-icq_overlay.png   trunk/KDE/kdenetwork/kopete/protocols/oscar/icons/cr16-action-icq_overlay.png#614458
 M  +7 -17     kdenetwork/kopete/protocols/oscar/icq/icqaccount.cpp  
 M  +0 -2      kdenetwork/kopete/protocols/oscar/icq/icqaccount.h  
 M  +41 -47    kdenetwork/kopete/protocols/oscar/liboscar/client.cpp  
 M  +1 -4      kdenetwork/kopete/protocols/oscar/liboscar/client.h  
 M  +1 -1      kdenetwork/kopete/protocols/oscar/liboscar/profiletask.cpp  
 M  +0 -5      kdenetwork/kopete/protocols/oscar/oscaraccount.h  
 M  +5 -1      kdesdk/umbrello/umbrello/kplayerslideraction.cpp  
 M  +9 -12     kdesdk/umbrello/umbrello/uml.cpp