I used my kdesdk/scripts/qt4/convert-qgridlayout.pl and kdesdk/scripts/qt4/convert-qboxlayout.pl scripts for this. Apart from one instance (where the params were commented out), no manual intervention was needed and everything worked like a charm...
What still needs to be done is to replace all Q*Layout(QLayout*parent) constructors by Q*Layout(); parent->insertLayout(..); calls. This can't be automated since it's impossible to detect whether the parent object is a QWidget* or a QLayout*. At best one can parst the compiler warning and just replace in those lines that through a deprecated warning...
svn path=/trunk/KDE/kdepim/; revision=533942
( see: http://www.gnupg.org/aegypten/ )
b) Removed some misleading warnings
c) Added Marc Mutz's patch of kmmsgpart.cpp: Make sure
Quoted Printable processing goes analogous to base64
by using KMime now and have some little improvements
in ::body().
d) AEGYPTEN_BRANCH was using KDockWidgets, these have been
(temporarily) disabled in the HEAD branch: will be
activated once KDockWidget has better usability.
Result of this: At the moment the new KMMimePartTree
is invisible - will be fixed right now.
PLEASE use the bug tracker to report any errors that might
result from this merger - additionally you may send mails
directly to me.
Karl-Heinz Zimmer, Senior Software Engineer, Klaraelvdalens Datakonsult AB
<mailto:khz@klaralvdalens-datakonsult.se> <mailto:khz@kde.org>
svn path=/trunk/kdenetwork/kmail/; revision=151089