More Info

Revision 533942

(Back to digest)

Other in KDE-PIM

Reinhold Kainhofer committed changes in /trunk/KDE/kdepim:

Replace the old-style QGridLayout and Q[HV]BoxLayout constructors (which contain margin, spacing, name, and possibly the # of rows and cols) with the Qt4 constructors, where one then calls setMargin, setSpacing, and setObjectName. The nr of rows and columns is no longer needed.

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...

File Changes

Modified 140 files

/trunk/KDE/kdepim

/kaddressbook/addresseditwidget.cpp

/kaddressbook/addresseeeditorwidget.cpp

/kaddressbook/addviewdialog.cpp

/kaddressbook/advancedcustomfields.cpp

/kaddressbook/contacteditorwidgetmanager.cpp

/kaddressbook/customfieldswidget.cpp

/kaddressbook/emaileditwidget.cpp

/kaddressbook/filtereditdialog.cpp

/kaddressbook/freebusywidget.cpp

/kaddressbook/geowidget.cpp

/kaddressbook/imagewidget.cpp

/kaddressbook/imeditwidget.cpp

/kaddressbook/incsearchwidget.cpp

/kaddressbook/jumpbuttonbar.cpp

/kaddressbook/kabcore.cpp

/kaddressbook/keywidget.cpp

/kaddressbook/ldapsearchdialog.cpp

/kaddressbook/phoneeditwidget.cpp

/kaddressbook/secrecywidget.cpp

/kaddressbook/simpleaddresseeeditor.cpp

/kaddressbook/soundwidget.cpp

/kaddressbook/viewconfigurefieldspage.cpp

/kaddressbook/viewconfigurefilterpage.cpp

/kaddressbook/xxportselectdialog.cpp

/karm/edittaskdialog.cpp

/karm/preferences.cpp

/karm/printdialog.cpp

/kdgantt/KDGanttViewSubwidgets.cpp

/kleopatra/certificatewizardimpl.cpp

/kleopatra/crlview.cpp

/kmail/accountdialog.cpp

/kmail/accountwizard.cpp

/kmail/antispamwizard.cpp

/kmail/chiasmuskeyselector.cpp

/kmail/configuredialog.cpp

/kmail/configuredialog_p.cpp

/kmail/folderdiaacltab.cpp

/kmail/folderrequester.cpp

/kmail/identitydialog.cpp

/kmail/klistboxdialog.cpp

/kmail/kmacctseldlg.cpp

/kmail/kmcomposewin.cpp

/kmail/kmfilterdlg.cpp

/kmail/kmfoldercachedimap.cpp

/kmail/kmfolderdia.cpp

/kmail/kmmsgpartdlg.cpp

/kmail/kmpopfiltercnfrmdlg.cpp

/kmail/kmsearchpatternedit.cpp

/kmail/kmtransport.cpp

/kmail/mailinglistpropertiesdialog.cpp

/kmail/managesievescriptsdialog.cpp

/kmail/newfolderdialog.cpp

/kmail/regexplineedit.cpp

/kmail/searchwindow.cpp

/kmail/sieveconfig.cpp

/kmail/signatureconfigurator.cpp

/kmail/simplestringlisteditor.cpp

/kmail/vacationdialog.cpp

/kmail/xfaceconfigurator.cpp

/knode/kncleanup.cpp

/knode/kncomposer.cpp

/knode/knconfigpages.cpp

/knode/knconfigwidgets.cpp

/knode/knconvert.cpp

/knode/knfilterconfigwidget.cpp

/knode/knfilterdialog.cpp

/knode/kngroupbrowser.cpp

/knode/kngrouppropdlg.cpp

/knode/utilities.cpp

/knotes/knoteconfigdlg.cpp

/korganizer/exportwebdialog.cpp

/korganizer/freebusyurldialog.cpp

/korganizer/importdialog.cpp

/korganizer/kdatenavigator.cpp

/korganizer/koagendaview.cpp

/korganizer/koeditorattachments.cpp

/korganizer/koeditorgeneraltodo.cpp

/korganizer/koeditorrecurrence.cpp

/korganizer/koprefsdialog.cpp

/korganizer/navigatorbar.cpp

/korganizer/resourceview.cpp

/korganizer/searchdialog.cpp

/libkdepim/kcmdesignerfields.cpp

/libkdepim/recentaddresses.cpp

/libkpgp/kpgpui.cpp

/wizards/overviewpage.cpp

/akregator/src/simplenodeselector.cpp

/kaddressbook/editors/cryptowidget.cpp

/kaddressbook/features/distributionlistwidget.cpp

/kaddressbook/features/resourceselection.cpp

/kaddressbook/kcmconfigs/addhostdialog.cpp

/kaddressbook/kcmconfigs/addresseewidget.cpp

/kaddressbook/kcmconfigs/extensionconfigdialog.cpp

/kaddressbook/kcmconfigs/kabconfigwidget.cpp

/kaddressbook/kcmconfigs/ldapoptionswidget.cpp

/kaddressbook/printing/printprogress.cpp

/kaddressbook/printing/selectionpage.cpp

/kaddressbook/printing/stylepage.cpp

/kaddressbook/views/configurecardviewdialog.cpp

/kaddressbook/views/configuretableviewdialog.cpp

/kaddressbook/views/kaddressbooktableview.cpp

/kaddressbook/xxport/csvimportdialog.cpp

/kaddressbook/xxport/vcard_xxport.cpp

/kleopatra/conf/dirservconfigpage.cpp

/kleopatra/kwatchgnupg/kwatchgnupgconfig.cpp

/kresources/birthdays/resourcekabcconfig.cpp

/kresources/egroupware/debugdialog.cpp

/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp

/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp

/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp

/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp

/kresources/groupware/kabc_resourcegroupwareconfig.cpp

/kresources/groupware/kcal_resourcegroupwareconfig.cpp

/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp

/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp

/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp

/kresources/lib/kcal_cachesettingsdlg.cpp

/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp

/kresources/remote/resourceremoteconfig.cpp

/kresources/slox/kabcresourcesloxconfig.cpp

/kresources/slox/kcalresourcesloxconfig.cpp

/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp

/libkleo/ui/cryptoconfigmodule.cpp

/libkleo/ui/keyrequester.cpp

/kode/kwsdl/kung/binaryinputfield.cpp

/kode/kwsdl/kung/complexbaseinputfield.cpp

/kode/kwsdl/kung/listinputfield.cpp

/kode/kwsdl/kung/pageinputfield.cpp

/kontact/plugins/kmail/kcmkmailsummary.cpp

/kontact/plugins/kmail/summarywidget.cpp

/kontact/plugins/korganizer/apptsummarywidget.cpp

/kontact/plugins/korganizer/todosummarywidget.cpp

/kontact/plugins/kpilot/summarywidget.cpp

/kontact/plugins/newsticker/kcmkontactknt.cpp

/kontact/plugins/newsticker/summarywidget.cpp

/kontact/plugins/specialdates/sdsummarywidget.cpp

/kontact/plugins/summary/kcmkontactsummary.cpp

/kontact/plugins/summary/summaryview_part.cpp

/kontact/plugins/weather/summarywidget.cpp

/korganizer/plugins/datenums/configdialog.cpp

140 files changed in total