[kdelibs/frameworks] /: Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks

Git commit 95b34429f8b6c5288d8e0a8be760a7cd45c31740 by David Faure.
Committed on 14/02/2012 at 12:32.
Pushed by dfaure into branch 'frameworks'.

Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks

Conflicts:
kdecore/network/k3datagramsocket.cpp
kdeui/actions/kstandardaction.cpp
kdeui/dialogs/kconfigdialogmanager.cpp
kdeui/icons/kicondialog.cpp
kdeui/itemviews/kviewstatesaver.h
kfile/knewfilemenu.cpp
kio/misc/kpac/downloader.cpp
kio/tests/kdirlistertest.cpp
kparts/browserextension.cpp
nepomuk/core/nepomukmainmodel.cpp
nepomuk/query/queryserviceclient.cpp
nepomuk/test/ratingpaintertestwidget.cpp
nepomuk/ui/kedittagsdialog.cpp
nepomuk/ui/ktagcloudwidget.cpp
nepomuk/ui/ktagdisplaywidget.cpp
nepomuk/ui/nepomukmassupdatejob.cpp
nepomuk/ui/tagwidget.cpp
nepomuk/utils/daterangeselectionwidget.cpp
nepomuk/utils/facetwidget.cpp
nepomuk/utils/searchwidget.cpp
plasma/containment.cpp
plasma/datacontainer.cpp
plasma/deprecated/animator.cpp
plasma/extenders/extender.cpp
plasma/plasma.h
plasma/scripting/wallpaperscript.cpp
tier1/solid/tests/networkingclient.cpp
(signal/slot normalization changes conflicted with KUrl->QUrl changes
and with other changes in frameworks)

M +2 -2 dnssd/avahi-domainbrowser.cpp
M +2 -2 dnssd/avahi-publicservice.cpp
M +1 -1 dnssd/avahi-remoteservice.cpp
M +5 -5 dnssd/avahi-servicebrowser.cpp
M +2 -2 dnssd/avahi-servicetypebrowser.cpp
M +1 -1 dnssd/mdnsd-servicebrowser.cpp
M +2 -2 interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
M +4 -4 interfaces/kmediaplayer/kfileaudiopreview/mediacontrols.cpp
M +12 -12 kde3support/kdecore/k3procio.cpp
M +7 -7 kde3support/kdeui/k3iconview.cpp
M +9 -9 kde3support/kdeui/k3iconviewsearchline.cpp
M +7 -7 kde3support/kdeui/k3listbox.cpp
M +26 -26 kde3support/kdeui/k3listview.cpp
M +12 -12 kde3support/kdeui/k3listviewsearchline.cpp
M +2 -2 kde3support/kdeui/k3passworddialog.cpp
M +15 -15 kde3support/kdeui/k3spell.cpp
M +4 -4 kde3support/kdeui/k3spelldlg.cpp
M +15 -15 kde3support/kdeui/k3syntaxhighlighter.cpp
M +10 -10 kde3support/kdeui/k3textedit.cpp
M +18 -18 kde3support/kio/kfile/k3filetreeview.cpp
M +10 -10 kde3support/kio/kfile/k3fileview.cpp
M +18 -18 kde3support/kio/kfile/kfiletreebranch.cpp
M +8 -8 kde3support/kparts/dockmainwindow3.cpp
M +14 -14 kde3support/tests/itemcontainertest.cpp
M +16 -16 kde3support/tests/k3processtest.cpp
M +4 -4 kde3support/tests/kcommandtest.cpp
M +13 -13 kde3support/tests/kdockwidgetdemo.cpp
M +4 -4 kdecore/network/ktcpsocket.cpp
M +3 -3 kdecore/tests/kdirwatchtest.cpp
M +9 -9 kdecore/tests/kdirwatchtest_gui.cpp
M +8 -8 kded/kded.cpp
M +2 -2 kdeui/actions/kactionmenu.cpp
M +1 -1 kdeui/actions/kfontaction.cpp
M +2 -2 kdeui/actions/kselectaction.cpp
M +8 -8 kdeui/actions/kstandardaction.cpp
M +2 -2 kdeui/actions/ktoggleaction.cpp
M +6 -6 kdeui/actions/ktoolbarpopupaction.cpp
M +2 -2 kdeui/actions/ktoolbarspaceraction.cpp
M +19 -19 kdeui/colors/kcolordialog.cpp
M +4 -4 kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp
M +10 -10 kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp
M +1 -1 kdeui/dialogs/kassistantdialog.cpp
M +3 -3 kdeui/dialogs/kbugreport.cpp
M +30 -30 kdeui/dialogs/kconfigdialogmanager.cpp
M +1 -1 kdeui/dialogs/kcupsoptionsjobwidget_p.cpp
M +3 -3 kdeui/dialogs/kdialog.cpp
M +11 -11 kdeui/dialogs/kedittoolbar.cpp
M +4 -4 kdeui/dialogs/kinputdialog.cpp
M +1 -1 kdeui/dialogs/klinkdialog.cpp
M +2 -2 kdeui/dialogs/knewpassworddialog.cpp
M +3 -3 kdeui/dialogs/kpassworddialog.cpp
M +2 -2 kdeui/dialogs/kshortcutsdialog.cpp
M +4 -4 kdeui/dialogs/kshortcutseditor.cpp
M +2 -2 kdeui/dialogs/kswitchlanguagedialog_p.cpp
M +4 -4 kdeui/dialogs/ktip.cpp
M +2 -2 kdeui/findreplace/kfind.cpp
M +1 -1 kdeui/findreplace/kfinddialog.cpp
M +4 -4 kdeui/findreplace/kreplace.cpp
M +9 -9 kdeui/fonts/kfontchooser.cpp
M +1 -1 kdeui/fonts/kfontdialog.cpp
M +1 -1 kdeui/fonts/kfontrequester.cpp
A +3 -3 kdeui/icons/kicondialog.cpp [License: LGPL]
M +2 -2 kdeui/itemviews/kextendableitemdelegate.cpp
M +3 -3 kdeui/itemviews/kfilterproxysearchline.cpp
M +13 -13 kdeui/itemviews/klistwidget.cpp
M +17 -17 kdeui/itemviews/klistwidgetsearchline.cpp
M +15 -15 kdeui/itemviews/ktreewidgetsearchline.cpp
M +1 -1 kdeui/itemviews/kviewstatesaver.h
M +3 -3 kdeui/kernel/kapplication.cpp
M +4 -4 kdeui/kernel/kclipboard.cpp
M +5 -5 kdeui/kernel/kstartupinfo.cpp
M +5 -5 kdeui/notifications/ksystemtrayicon.cpp
M +7 -7 kdeui/paged/kpageview.cpp
M +6 -6 kdeui/paged/kpageview_p.cpp
M +8 -8 kdeui/paged/kpagewidget.cpp
M +4 -4 kdeui/shortcuts/kglobalaccel.cpp
M +5 -5 kdeui/sonnet/dialog.cpp
M +2 -2 kdeui/sonnet/dictionarycombobox.cpp
M +4 -4 kdeui/sonnet/highlighter.cpp
M +2 -2 kdeui/sonnet/tests/backgroundtest.cpp
M +2 -2 kdeui/sonnet/tests/test_dialog.cpp
M +1 -1 kdeui/sonnet/tests/test_highlighter.cpp
M +4 -4 kdeui/tests/kbuttongrouptest.cpp
M +4 -4 kdeui/tests/kcodecactiontest.cpp
M +6 -6 kdeui/tests/kcompletioncoretest.cpp
M +9 -9 kdeui/tests/kcompletionuitest.cpp
M +4 -4 kdeui/tests/kfindtest.cpp
M +2 -2 kdeui/tests/khboxtest.cpp
M +1 -1 kdeui/tests/kiconeffecttest.cpp
M +12 -12 kdeui/tests/klineedittest.cpp
M +1 -1 kdeui/tests/kmainwindowtest.cpp
M +10 -10 kdeui/tests/kmanagerselectiontest.cpp
M +5 -5 kdeui/tests/kmodifierkeyinfotest.cpp
M +13 -13 kdeui/tests/kpagewidgettest.cpp
M +6 -6 kdeui/tests/kpassivepopuptest.cpp
M +6 -6 kdeui/tests/kreplacetest.cpp
M +2 -2 kdeui/tests/kselectactiontest.cpp
M +1 -1 kdeui/tests/kstatusbartest.cpp
M +26 -26 kdeui/tests/ktabwidgettest.cpp
M +2 -2 kdeui/tests/kwindowtest.cpp
M +1 -1 kdeui/tests/kxmlguitest.cpp
M +8 -8 kdeui/util/kcursor.cpp
M +5 -5 kdeui/util/kmodifierkeyinfo.cpp
M +2 -2 kdeui/util/kpassivepopup.cpp
M +5 -5 kdeui/util/kwallet.cpp
M +1 -1 kdeui/util/kwallet_mac.cpp
M +6 -6 kdeui/widgets/kbuttongroup.cpp
M +6 -6 kdeui/widgets/kcharselect.cpp
M +2 -2 kdeui/widgets/kcmodule.cpp
M +16 -16 kdeui/widgets/kcombobox.cpp
M +4 -4 kdeui/widgets/kcompletionbox.cpp
M +4 -4 kdeui/widgets/kdatecombobox.cpp
M +15 -15 kdeui/widgets/kdatepicker.cpp
M +8 -8 kdeui/widgets/kdatetable.cpp
M +1 -1 kdeui/widgets/kdatetimewidget.cpp
M +3 -3 kdeui/widgets/kdatewidget.cpp
M +3 -3 kdeui/widgets/keditlistbox.cpp
M +3 -3 kdeui/widgets/keditlistwidget.cpp
M +5 -5 kdeui/widgets/khelpmenu.cpp
M +1 -1 kdeui/widgets/khistorycombobox.cpp
M +11 -11 kdeui/widgets/klineedit.cpp
M +2 -2 kdeui/widgets/kmainwindow.cpp
M +7 -7 kdeui/widgets/kmenubar.cpp
M +2 -2 kdeui/widgets/kpixmapregionselectorwidget.cpp
M +2 -2 kdeui/widgets/kpushbutton.cpp
M +4 -4 kdeui/widgets/krichtextwidget.cpp
M +4 -4 kdeui/widgets/kshortcutwidget.cpp
M +2 -2 kdeui/widgets/ktabbar.cpp
M +9 -9 kdeui/widgets/ktabwidget.cpp
M +23 -23 kdeui/widgets/ktextedit.cpp
M +2 -2 kdeui/widgets/ktimecombobox.cpp
M +1 -1 kdeui/widgets/ktoolbar.cpp
M +1 -1 kdeui/widgets/kurllabel.cpp
M +2 -2 kdeui/windowmanagement/kwindowsystem_win.cpp
M +2 -2 kdeui/windowmanagement/kwindowsystem_x11.cpp
M +1 -1 kdeui/xmlgui/kmenumenuhandler_p.cpp
M +4 -4 kdeui/xmlgui/ktoolbarhandler.cpp
M +1 -1 kdeui/xmlgui/kxmlguiwindow.cpp
M +1 -1 kdewebkit/kwebpage.cpp
M +24 -24 kfile/kdiroperator.cpp
M +20 -20 kfile/kdirselectdialog.cpp
M +3 -3 kfile/kfilefiltercombo.cpp
M +1 -1 kfile/kfileplaceeditdialog.cpp
M +1 -1 kfile/kfileplacesitem.cpp
M +16 -16 kfile/kfileplacesmodel.cpp
M +4 -4 kfile/kfileplacessharedbookmarks.cpp
M +13 -13 kfile/kfileplacesview.cpp
M +10 -10 kfile/kfilepreviewgenerator.cpp
M +6 -6 kfile/kfiletreeview.cpp
M +33 -33 kfile/kfilewidget.cpp
M +6 -7 kfile/knewfilemenu.cpp
M +9 -9 kfile/kurlnavigator.cpp
M +4 -4 kfile/kurlnavigatorbutton.cpp
M +5 -5 kfile/kurlnavigatorplacesselector.cpp
M +5 -5 khtml/ecma/debugger/debugwindow.cpp
M +2 -2 khtml/ecma/debugger/scriptsdock.cpp
M +3 -3 khtml/ecma/kjs_window.cpp
M +8 -8 khtml/ecma/xmlhttprequest.cpp
M +6 -6 khtml/html/html_documentimpl.cpp
M +1 -1 khtml/html/html_objectimpl.cpp
M +7 -7 khtml/java/kjavaappletserver.cpp
M +4 -4 khtml/java/kjavaappletviewer.cpp
M +4 -4 khtml/java/kjavaappletwidget.cpp
M +6 -6 khtml/java/kjavadownloader.cpp
M +6 -6 khtml/java/kjavaprocess.cpp
M +41 -41 khtml/khtml_ext.cpp
M +1 -1 khtml/khtml_pagecache.cpp
M +103 -103 khtml/khtml_part.cpp
M +1 -1 khtml/khtml_settings.cpp
M +8 -8 khtml/khtmlimage.cpp
M +1 -1 khtml/khtmlviewbarwidget.cpp
M +38 -38 khtml/kmultipart/kmultipart.cpp
M +4 -4 khtml/misc/loader.cpp
M +1 -1 khtml/rendering/media_controls.cpp
M +7 -7 khtml/rendering/render_form.cpp
M +1 -1 khtml/rendering/render_frames.cpp
M +2 -2 khtml/rendering/render_replaced.cpp
M +8 -8 khtml/test_regression.cpp
M +6 -6 khtml/test_regression_gui_window.cpp
M +9 -9 khtml/testkhtml.cpp
M +7 -7 khtml/tests/testkhtmlnew.cpp
M +6 -6 khtml/ui/findbar/khtmlfind.cpp
M +1 -1 khtml/ui/findbar/khtmlfindbar.cpp
M +1 -1 kinit/kinit.cpp
M +6 -6 kinit/klauncher.cpp
M +9 -9 kio/kfile/kacleditwidget.cpp
M +1 -1 kio/kfile/kcommentwidget.cpp
M +4 -4 kio/kfile/kdevicelistmodel.cpp
M +1 -1 kio/kfile/kfiledialog.cpp
M +4 -4 kio/kfile/kfilemetadataprovider.cpp
M +2 -2 kio/kfile/kfilemetadatareader.cpp
M +7 -7 kio/kfile/kfilemetainfowidget.cpp
M +4 -4 kio/kfile/kfilesharedialog.cpp
M +10 -10 kio/kfile/kimagefilepreview.cpp
M +1 -1 kio/kfile/kmetaprops.cpp
M +8 -8 kio/kfile/kopenwithdialog.cpp
M +2 -2 kio/kfile/kpreviewprops.cpp
M +68 -68 kio/kfile/kpropertiesdialog.cpp
M +1 -1 kio/kfile/kurlcombobox.cpp
M +9 -9 kio/kfile/kurlrequester.cpp
M +6 -6 kio/kio/accessmanager.cpp
M +6 -3 kio/kio/accessmanager.h
M +8 -8 kio/kio/accessmanagerreply_p.cpp
M +1 -1 kio/kio/chmodjob.cpp
M +4 -4 kio/kio/copyjob.cpp
M +2 -2 kio/kio/delegateanimationhandler.cpp
M +2 -2 kio/kio/deletejob.cpp
M +2 -2 kio/kio/directorysizejob.cpp
M +14 -14 kio/kio/filejob.cpp
M +2 -2 kio/kio/fileundomanager.cpp
M +24 -24 kio/kio/forwardingslavebase.cpp
M +56 -56 kio/kio/job.cpp
M +2 -2 kio/kio/kautomount.cpp
M +1 -1 kio/kio/kdatatool.cpp
M +30 -30 kio/kio/kdirlister.cpp
M +4 -4 kio/kio/kdirmodel.cpp
M +6 -6 kio/kio/kfileshare.cpp
M +2 -2 kio/kio/knfsshare.cpp
M +8 -8 kio/kio/krun.cpp
M +2 -2 kio/kio/kurlcompletion.cpp
M +2 -2 kio/kio/metainfojob.cpp
M +22 -22 kio/kio/netaccess.cpp
M +5 -5 kio/kio/pastedialog.cpp
M +1 -1 kio/kio/previewjob.cpp
M +11 -11 kio/kio/renamedialog.cpp
M +8 -8 kio/kio/scheduler.cpp
M +3 -3 kio/kio/skipdialog.cpp
M +2 -2 kio/kssl/kcm/cacertificatespage.cpp
M +2 -2 kio/kssl/ksslkeygen.cpp
M +3 -3 kio/misc/kpac/discovery.cpp
M +5 -5 kio/misc/kpac/downloader.cpp
M +2 -2 kio/tests/fileundomanagertest.cpp
M +26 -26 kio/tests/jobremotetest.cpp
M +15 -15 kio/tests/jobtest.cpp
M +5 -5 kio/tests/kdcopcheck.cpp
M +12 -12 kio/tests/kdirlistertest.cpp
M +42 -42 kio/tests/kdirlistertest_gui.cpp
M +6 -6 kio/tests/kdirmodeltest.cpp
M +1 -1 kio/tests/kfdtest.cpp
M +13 -13 kio/tests/kioslavetest.cpp
M +2 -2 kio/tests/previewtest.cpp
M +4 -4 kio/tests/speed.cpp
M +8 -6 kioslave/http/http.cpp
M +1 -1 kjsembed/examples/kjsconsole/console.cpp
M +4 -4 kjsembed/examples/kjsconsole/numberedtextview.cpp
M +1 -1 kjsembed/kjscmd/kjscmd.cpp
M +6 -6 knewstuff/knewstuff2/core/coreengine.cpp
M +6 -6 knewstuff/knewstuff2/core/entryloader.cpp
M +4 -4 knewstuff/knewstuff2/core/providerloader.cpp
M +8 -8 knewstuff/knewstuff2/core/security.cpp
M +1 -1 knewstuff/knewstuff2/dxs/dxs.cpp
M +2 -2 knewstuff/knewstuff2/dxs/dxsengine.cpp
M +2 -2 knewstuff/knewstuff2/dxs/soap.cpp
M +2 -2 knewstuff/knewstuff2/engine.cpp
M +12 -12 knewstuff/knewstuff2/ui/downloaddialog.cpp
M +3 -3 knewstuff/knewstuff2/ui/itemsview.cpp
M +1 -1 knewstuff/knewstuff2/ui/itemsviewdelegate.cpp
M +6 -6 knewstuff/knewstuff2/ui/kdxsbutton.cpp
M +2 -2 knewstuff/knewstuff2/ui/kdxscomments.cpp
M +1 -1 knewstuff/knewstuff2/ui/qasyncimage.cpp
M +3 -3 knewstuff/knewstuff3/attica/atticaprovider.cpp
M +6 -6 knewstuff/knewstuff3/core/engine.cpp
M +8 -8 knewstuff/knewstuff3/core/security.cpp
M +4 -4 knewstuff/knewstuff3/core/xmlloader.cpp
M +4 -4 knewstuff/knewstuff3/downloadwidget.cpp
M +1 -1 knewstuff/knewstuff3/staticxml/staticxmlprovider.cpp
M +1 -1 knewstuff/knewstuff3/ui/imageloader.cpp
M +1 -1 knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp
M +1 -1 knewstuff/knewstuff3/ui/itemsviewdelegate.cpp
M +1 -1 knewstuff/knewstuff3/upload/atticahelper.cpp
M +1 -1 knewstuff/knewstuff3/uploaddialog.cpp
M +2 -2 knewstuff/tests/knewstuff2_cache.cpp
M +2 -2 knewstuff/tests/knewstuff2_download.cpp
M +2 -2 knewstuff/tests/knewstuff2_test.cpp
M +2 -2 knotify/config/knotifyconfigwidget.cpp
M +1 -1 knotify/config/knotifyeventlist.cpp
M +3 -3 knotify/tests/knotifytestwindow.cpp
M +15 -16 kparts/browserextension.cpp
M +1 -1 kparts/browserextension.h
M +6 -6 kparts/browserrun.cpp
M +8 -8 kparts/mainwindow.cpp
M +6 -6 kparts/part.cpp
M +8 -8 kparts/partmanager.cpp
M +2 -2 kparts/scriptableextension.cpp
M +2 -2 kparts/tests/notepad.cpp
M +3 -3 kparts/tests/testmainwindow.cpp
M +1 -1 kpty/tests/kptyprocesstest.cpp
M +19 -19 kross/core/actioncollection.cpp
M +4 -4 kross/modules/form.cpp
M +12 -12 kross/ui/model.cpp
M +4 -4 kross/ui/view.cpp
M +1 -1 kutils/kcmodulecontainer.cpp
M +2 -2 kutils/kcmultidialog.cpp
M +1 -1 kutils/kemoticons/kemoticons.cpp
M +2 -2 kutils/kemoticons/tests/main.cpp
M +6 -6 kutils/ksettings/componentsdialog.cpp
M +2 -2 kutils/ksettings/dialog.cpp
M +1 -1 kutils/ksettings/dispatcher.cpp
M +3 -3 kutils/ksettings/pluginpage.cpp
M +2 -2 plasma/applet.cpp
M +8 -2 plasma/applet.h
M +2 -2 plasma/containment.cpp
M +1 -1 plasma/dataengine.cpp
M +1 -1 plasma/dataenginemanager.cpp
M +9 -15 plasma/plasma.h
M +2 -2 plasma/private/qtjolie-branch/qtjolie/serverthread.cpp
M +2 -2 plasma/private/qtjolie-branch/tests/calculatorservice.cpp
M +1 -1 plasma/private/remoteservice.cpp
M +1 -1 plasma/private/serviceprovider.cpp
M +1 -1 plasma/private/storage.cpp
M +2 -2 plasma/scripting/wallpaperscript.cpp
M +1 -1 plasma/tests/testcontainmentactionsplugin/test.cpp
M +2 -2 plasma/view.cpp
M +1 -1 plasma/wallpaper.cpp
M +3 -3 plasma/widgets/combobox.cpp
M +2 -2 plasma/widgets/lineedit.cpp
M +2 -2 plasma/widgets/videowidget.cpp
M +2 -2 plasma/widgets/webview.cpp
M +1 -1 security/crypto/certexport.cpp
M +4 -4 security/crypto/crypto.cpp
A +19 -19 staging/kcoreaddons/autotests/kjobtest.cpp [License: LGPL (v2)]
A +2 -2 staging/kcoreaddons/src/io/kdirwatch.cpp [License: LGPL (v2)]
A +13 -13 staging/kcoreaddons/src/jobs/kjobtrackerinterface.cpp [License: LGPL (v2)]
R +10 -10 tier1/itemmodels/autotests/proxymodeltestapp/breadcrumbnavigationwidget.cpp
A +1 -1 tier1/itemmodels/autotests/proxymodeltestapp/descendantpmwidget.cpp [License: LGPL (v2.1+)]
A +28 -28 tier1/itemmodels/autotests/proxymodeltestapp/kreparentingproxymodel.cpp [License: LGPL (v2+)]
A +2 -2 tier1/itemmodels/autotests/proxymodeltestsuite/dynamictreemodel.cpp [License: LGPL (v2+)]
R +4 -4 tier1/itemmodels/autotests/proxymodeltestsuite/modelselector.cpp
A +29 -29 tier1/itemmodels/autotests/proxymodeltestsuite/modelspy.cpp [License: LGPL (v2+)]
A +41 -41 tier1/itemmodels/autotests/proxymodeltestsuite/modeltest.cpp [License: GPL (v2)]
A +66 -66 tier1/itemmodels/autotests/proxymodeltestsuite/proxymodeltest.cpp [License: LGPL (v2+)]
A +2 -2 tier1/itemmodels/autotests/testmodelqueuedconnections.cpp [License: LGPL (v2+)]
A +3 -3 tier1/itemmodels/src/kbreadcrumbselectionmodel.cpp [License: LGPL (v2+)]
A +28 -28 tier1/itemmodels/src/kdescendantsproxymodel.cpp [License: LGPL (v2+)]
A +52 -52 tier1/itemmodels/src/kidentityproxymodel.cpp [License: LGPL (v2+)]
A +1 -1 tier1/itemmodels/src/klinkitemselectionmodel.cpp [License: LGPL (v2+)]
A +32 -32 tier1/itemmodels/src/kselectionproxymodel.cpp [License: LGPL (v2+)]
A +7 -7 tier1/itemmodels/src/kviewstateserializer.cpp [License: LGPL (v2+)]
A +2 -2 tier1/kauth/src/backends/dbus/DBusHelperProxy.cpp [License: LGPL (v2.1+)]
A +5 -5 tier1/kauth/src/kauthactionwatcher.cpp [License: LGPL (v2.1+)]
A +1 -1 tier1/kplotting/examples/testplot_widget.cpp [License: GPL (v2+)]
A +2 -2 tier1/solid/solid/acadapter.cpp [License: LGPL]
A +8 -8 tier1/solid/solid/backends/fakehw/fakedevice.cpp [License: LGPL]
A +4 -4 tier1/solid/solid/backends/fakehw/fakegenericinterface.cpp [License: LGPL]
A +2 -2 tier1/solid/solid/backends/fakehw/fakestorageaccess.cpp [License: LGPL]
A +1 -1 tier1/solid/solid/backends/fstab/fstabhandling.cpp [License: LGPL]
A +4 -4 tier1/solid/solid/backends/fstab/fstabstorageaccess.cpp [License: LGPL]
A +2 -2 tier1/solid/solid/backends/hal/halacadapter.cpp [License: LGPL]
A +2 -2 tier1/solid/solid/backends/hal/halbattery.cpp [License: LGPL]
A +2 -2 tier1/solid/solid/backends/hal/halbutton.cpp [License: LGPL]
A +6 -6 tier1/solid/solid/backends/hal/halcdrom.cpp [License: LGPL]
A +2 -2 tier1/solid/solid/backends/hal/haldevice.cpp [License: LGPL]
R +1 -1 tier1/solid/solid/backends/hal/halfstabhandling.cpp
A +4 -4 tier1/solid/solid/backends/hal/halgenericinterface.cpp [License: LGPL]
A +2 -2 tier1/solid/solid/backends/hal/halmanager.cpp [License: LGPL]
A +18 -18 tier1/solid/solid/backends/hal/halstorageaccess.cpp [License: LGPL]
A +2 -2 tier1/solid/solid/backends/kupnp/kupnpmanager.cpp [License: LGPL]
A +4 -4 tier1/solid/solid/backends/udev/udevgenericinterface.cpp [License: LGPL]
A +4 -4 tier1/solid/solid/backends/udisks/udisksgenericinterface.cpp [License: LGPL]
A +2 -2 tier1/solid/solid/backends/udisks/udisksopticaldrive.cpp [License: LGPL]
A +10 -10 tier1/solid/solid/backends/udisks/udisksstorageaccess.cpp [License: LGPL]
A +8 -8 tier1/solid/solid/backends/upnp/upnpinternetgateway.cpp [License: LGPL]
A +2 -2 tier1/solid/solid/backends/wmi/wmiacadapter.cpp [License: LGPL]
A +2 -2 tier1/solid/solid/backends/wmi/wmibattery.cpp [License: LGPL]
A +2 -2 tier1/solid/solid/backends/wmi/wmibutton.cpp [License: LGPL]
A +4 -4 tier1/solid/solid/backends/wmi/wmicdrom.cpp [License: LGPL]
A +4 -4 tier1/solid/solid/backends/wmi/wmigenericinterface.cpp [License: LGPL]
A +8 -8 tier1/solid/solid/backends/wmi/wmistorageaccess.cpp [License: LGPL]
A +6 -6 tier1/solid/solid/battery.cpp [License: LGPL]
A +2 -2 tier1/solid/solid/button.cpp [License: LGPL]
A +2 -2 tier1/solid/solid/device.cpp [License: LGPL]
A +2 -2 tier1/solid/solid/devicemanager.cpp [License: LGPL]
A +4 -4 tier1/solid/solid/genericinterface.cpp [License: LGPL]
R +8 -8 tier1/solid/solid/internetgateway.cpp
A +1 -1 tier1/solid/solid/networking.cpp [License: LGPL]
A +6 -6 tier1/solid/solid/opticaldrive.cpp [License: LGPL]
A +23 -23 tier1/solid/solid/storageaccess.cpp [License: LGPL]
A +2 -2 tier1/solid/tests/halbasictest.cpp [License: LGPL]
A +4 -4 tier1/solid/tests/networkingclient.cpp [License: LGPL]
A +4 -4 tier1/solid/tests/solidhwtest.cpp [License: LGPL]
R +3 -3 tier1/solid/tests/solidnettestdbusservice.cpp
A +10 -10 tier1/threadweaver/Examples/Jobs/Jobs.cpp [License: LGPL]
R +10 -10 tier1/threadweaver/Examples/Jobs/WeaverObserverTest.cpp
R +2 -2 tier1/threadweaver/Examples/QProcessJob/MainWindow.cpp
A +6 -6 tier1/threadweaver/Examples/SMIV/SMIV.cpp [License: LGPL]
A +6 -6 tier1/threadweaver/Examples/SMIV/SMIVItem.cpp [License: LGPL]
R +2 -2 tier1/threadweaver/Tests/DeleteTest.cpp
R +8 -8 tier1/threadweaver/Tests/JobTests.cpp
R +4 -4 tier1/threadweaver/Tests/QueueTests.cpp
A +6 -6 tier1/threadweaver/Weaver/Job.cpp [License: LGPL (v2+)]
A +6 -6 tier1/threadweaver/Weaver/Thread.cpp [License: LGPL (v2+)]
R +4 -4 tier1/threadweaver/Weaver/ThreadWeaver.cpp
A +18 -18 tier1/threadweaver/Weaver/WeaverImpl.cpp [License: LGPL (v2+)]
A +6 -6 tier1/threadweaver/WeaverGui/WeaverThreadGrid.cpp [License: LGPL (v2+)]
A +4 -4 tier2/sonnet/core/backgroundchecker.cpp [License: LGPL (v2.1+)]
R +2 -2 tier2/sonnet/core/tests/test_dialog.cpp

http://commits.kde.org/kdelibs/95b34429f8b6c5288d8e0a8be760a7cd45c31740

[kdelibs/KDE/4.8] /: Normalize all signal/slot connections.

Git commit 0fa873e587fecdcf69d81da3f2d86f0a17c6fe2e by Dawit Alemayehu.
Committed on 22/01/2012 at 03:11.
Pushed by adawit into branch 'KDE/4.8'.

Normalize all signal/slot connections.

REVIEW: 103728

M +2 -2 dnssd/avahi-domainbrowser.cpp
M +2 -2 dnssd/avahi-publicservice.cpp
M +1 -1 dnssd/avahi-remoteservice.cpp
M +5 -5 dnssd/avahi-servicebrowser.cpp
M +2 -2 dnssd/avahi-servicetypebrowser.cpp
M +2 -2 dnssd/domainmodel.cpp
M +1 -1 dnssd/mdnsd-servicebrowser.cpp
M +2 -2 interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
M +4 -4 interfaces/kmediaplayer/kfileaudiopreview/mediacontrols.cpp
M +12 -12 kde3support/kdecore/k3procio.cpp
M +7 -7 kde3support/kdeui/k3iconview.cpp
M +9 -9 kde3support/kdeui/k3iconviewsearchline.cpp
M +7 -7 kde3support/kdeui/k3listbox.cpp
M +26 -26 kde3support/kdeui/k3listview.cpp
M +12 -12 kde3support/kdeui/k3listviewsearchline.cpp
M +2 -2 kde3support/kdeui/k3passworddialog.cpp
M +15 -15 kde3support/kdeui/k3spell.cpp
M +4 -4 kde3support/kdeui/k3spelldlg.cpp
M +15 -15 kde3support/kdeui/k3syntaxhighlighter.cpp
M +10 -10 kde3support/kdeui/k3textedit.cpp
M +18 -18 kde3support/kio/kfile/k3filetreeview.cpp
M +10 -10 kde3support/kio/kfile/k3fileview.cpp
M +18 -18 kde3support/kio/kfile/kfiletreebranch.cpp
M +8 -8 kde3support/kparts/dockmainwindow3.cpp
M +14 -14 kde3support/tests/itemcontainertest.cpp
M +16 -16 kde3support/tests/k3processtest.cpp
M +4 -4 kde3support/tests/kcommandtest.cpp
M +13 -13 kde3support/tests/kdockwidgetdemo.cpp
M +2 -2 kdecore/auth/backends/dbus/DBusHelperProxy.cpp
M +5 -5 kdecore/auth/kauthactionwatcher.cpp
M +2 -2 kdecore/io/kdirwatch.cpp
M +13 -13 kdecore/jobs/kjobtrackerinterface.cpp
M +2 -2 kdecore/network/k3clientsocketbase.cpp
M +2 -2 kdecore/network/k3datagramsocket.cpp
M +1 -1 kdecore/network/k3resolver.cpp
M +3 -3 kdecore/network/k3serversocket.cpp
M +4 -4 kdecore/network/ktcpsocket.cpp
M +4 -4 kdecore/sonnet/backgroundchecker.cpp
M +2 -2 kdecore/sonnet/tests/test_dialog.cpp
M +3 -3 kdecore/tests/kdirwatchtest.cpp
M +9 -9 kdecore/tests/kdirwatchtest_gui.cpp
M +19 -19 kdecore/tests/kjobtest.cpp
M +8 -8 kded/kded.cpp
M +2 -2 kdeui/actions/kactionmenu.cpp
M +1 -1 kdeui/actions/kfontaction.cpp
M +2 -2 kdeui/actions/kselectaction.cpp
M +8 -8 kdeui/actions/kstandardaction.cpp
M +2 -2 kdeui/actions/ktoggleaction.cpp
M +6 -6 kdeui/actions/ktoolbarpopupaction.cpp
M +2 -2 kdeui/actions/ktoolbarspaceraction.cpp
M +19 -19 kdeui/colors/kcolordialog.cpp
M +4 -4 kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp
M +10 -10 kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp
M +1 -1 kdeui/dialogs/kassistantdialog.cpp
M +3 -3 kdeui/dialogs/kbugreport.cpp
M +30 -30 kdeui/dialogs/kconfigdialogmanager.cpp
M +1 -1 kdeui/dialogs/kcupsoptionsjobwidget_p.cpp
M +3 -3 kdeui/dialogs/kdialog.cpp
M +11 -11 kdeui/dialogs/kedittoolbar.cpp
M +4 -4 kdeui/dialogs/kinputdialog.cpp
M +1 -1 kdeui/dialogs/klinkdialog.cpp
M +2 -2 kdeui/dialogs/knewpassworddialog.cpp
M +3 -3 kdeui/dialogs/kpassworddialog.cpp
M +4 -4 kdeui/dialogs/kshortcuteditwidget.cpp
M +2 -2 kdeui/dialogs/kshortcutschemeseditor.cpp
M +2 -2 kdeui/dialogs/kshortcutsdialog.cpp
M +4 -4 kdeui/dialogs/kshortcutseditor.cpp
M +4 -4 kdeui/dialogs/kshortcutseditordelegate.cpp
M +2 -2 kdeui/dialogs/kswitchlanguagedialog_p.cpp
M +4 -4 kdeui/dialogs/ktip.cpp
M +2 -2 kdeui/findreplace/kfind.cpp
M +1 -1 kdeui/findreplace/kfinddialog.cpp
M +4 -4 kdeui/findreplace/kreplace.cpp
M +9 -9 kdeui/fonts/kfontchooser.cpp
M +1 -1 kdeui/fonts/kfontdialog.cpp
M +1 -1 kdeui/fonts/kfontrequester.cpp
M +3 -3 kdeui/itemviews/kbreadcrumbselectionmodel.cpp
M +28 -28 kdeui/itemviews/kdescendantsproxymodel.cpp
M +2 -2 kdeui/itemviews/kextendableitemdelegate.cpp
M +3 -3 kdeui/itemviews/kfilterproxysearchline.cpp
M +52 -52 kdeui/itemviews/kidentityproxymodel.cpp
M +1 -1 kdeui/itemviews/klinkitemselectionmodel.cpp
M +13 -13 kdeui/itemviews/klistwidget.cpp
M +17 -17 kdeui/itemviews/klistwidgetsearchline.cpp
M +32 -32 kdeui/itemviews/kselectionproxymodel.cpp
M +15 -15 kdeui/itemviews/ktreewidgetsearchline.cpp
M +7 -7 kdeui/itemviews/kviewstatesaver.cpp
M +3 -3 kdeui/kernel/kapplication.cpp
M +4 -4 kdeui/kernel/kclipboard.cpp
M +5 -5 kdeui/kernel/kstartupinfo.cpp
M +5 -5 kdeui/notifications/ksystemtrayicon.cpp
M +7 -7 kdeui/paged/kpageview.cpp
M +6 -6 kdeui/paged/kpageview_p.cpp
M +8 -8 kdeui/paged/kpagewidget.cpp
M +4 -4 kdeui/shortcuts/kglobalaccel.cpp
M +5 -5 kdeui/sonnet/dialog.cpp
M +2 -2 kdeui/sonnet/dictionarycombobox.cpp
M +4 -4 kdeui/sonnet/highlighter.cpp
M +2 -2 kdeui/sonnet/tests/backgroundtest.cpp
M +2 -2 kdeui/sonnet/tests/test_dialog.cpp
M +1 -1 kdeui/sonnet/tests/test_highlighter.cpp
M +4 -4 kdeui/tests/kbuttongrouptest.cpp
M +4 -4 kdeui/tests/kcodecactiontest.cpp
M +6 -6 kdeui/tests/kcompletioncoretest.cpp
M +9 -9 kdeui/tests/kcompletionuitest.cpp
M +1 -1 kdeui/tests/kfadewidgeteffecttest.cpp
M +4 -4 kdeui/tests/kfindtest.cpp
M +2 -2 kdeui/tests/khboxtest.cpp
M +1 -1 kdeui/tests/kiconeffecttest.cpp
M +12 -12 kdeui/tests/klineedittest.cpp
M +1 -1 kdeui/tests/kmainwindowtest.cpp
M +10 -10 kdeui/tests/kmanagerselectiontest.cpp
M +5 -5 kdeui/tests/kmodifierkeyinfotest.cpp
M +13 -13 kdeui/tests/kpagewidgettest.cpp
M +6 -6 kdeui/tests/kpassivepopuptest.cpp
M +6 -6 kdeui/tests/kreplacetest.cpp
M +2 -2 kdeui/tests/kselectactiontest.cpp
M +1 -1 kdeui/tests/kstatusbartest.cpp
M +26 -26 kdeui/tests/ktabwidgettest.cpp
M +1 -1 kdeui/tests/ktoolbar_unittest.cpp
M +2 -2 kdeui/tests/kwindowtest.cpp
M +1 -1 kdeui/tests/kxmlguitest.cpp
M +10 -10 kdeui/tests/proxymodeltestapp/breadcrumbnavigationwidget.cpp
M +1 -1 kdeui/tests/proxymodeltestapp/descendantpmwidget.cpp
M +28 -28 kdeui/tests/proxymodeltestapp/kreparentingproxymodel.cpp
M +2 -2 kdeui/tests/proxymodeltestsuite/dynamictreemodel.cpp
M +4 -4 kdeui/tests/proxymodeltestsuite/modelselector.cpp
M +29 -29 kdeui/tests/proxymodeltestsuite/modelspy.cpp
M +41 -41 kdeui/tests/proxymodeltestsuite/modeltest.cpp
M +66 -66 kdeui/tests/proxymodeltestsuite/proxymodeltest.cpp
M +2 -2 kdeui/tests/testmodelqueuedconnections.cpp
M +1 -1 kdeui/tests/testplot_widget.cpp
M +8 -8 kdeui/util/kcursor.cpp
M +5 -5 kdeui/util/kmodifierkeyinfo.cpp
M +2 -2 kdeui/util/kpassivepopup.cpp
M +5 -5 kdeui/util/kwallet.cpp
M +1 -1 kdeui/util/kwallet_mac.cpp
M +6 -6 kdeui/widgets/kbuttongroup.cpp
M +6 -6 kdeui/widgets/kcharselect.cpp
M +2 -2 kdeui/widgets/kcmodule.cpp
M +16 -16 kdeui/widgets/kcombobox.cpp
M +4 -4 kdeui/widgets/kcompletionbox.cpp
M +4 -4 kdeui/widgets/kdatecombobox.cpp
M +15 -15 kdeui/widgets/kdatepicker.cpp
M +8 -8 kdeui/widgets/kdatetable.cpp
M +1 -1 kdeui/widgets/kdatetimewidget.cpp
M +3 -3 kdeui/widgets/kdatewidget.cpp
M +3 -3 kdeui/widgets/keditlistbox.cpp
M +3 -3 kdeui/widgets/keditlistwidget.cpp
M +5 -5 kdeui/widgets/khelpmenu.cpp
M +1 -1 kdeui/widgets/khistorycombobox.cpp
M +11 -11 kdeui/widgets/klineedit.cpp
M +2 -2 kdeui/widgets/kmainwindow.cpp
M +7 -7 kdeui/widgets/kmenubar.cpp
M +2 -2 kdeui/widgets/kpixmapregionselectorwidget.cpp
M +2 -2 kdeui/widgets/kpushbutton.cpp
M +4 -4 kdeui/widgets/krichtextwidget.cpp
M +4 -4 kdeui/widgets/kshortcutwidget.cpp
M +2 -2 kdeui/widgets/ktabbar.cpp
M +9 -9 kdeui/widgets/ktabwidget.cpp
M +23 -23 kdeui/widgets/ktextedit.cpp
M +2 -2 kdeui/widgets/ktimecombobox.cpp
M +1 -1 kdeui/widgets/ktoolbar.cpp
M +1 -1 kdeui/widgets/kurllabel.cpp
M +2 -2 kdeui/windowmanagement/kwindowsystem_win.cpp
M +2 -2 kdeui/windowmanagement/kwindowsystem_x11.cpp
M +1 -1 kdeui/xmlgui/kmenumenuhandler_p.cpp
M +4 -4 kdeui/xmlgui/ktoolbarhandler.cpp
M +1 -1 kdeui/xmlgui/kxmlguiwindow.cpp
M +1 -1 kdewebkit/kwebpage.cpp
M +24 -24 kfile/kdiroperator.cpp
M +20 -20 kfile/kdirselectdialog.cpp
M +3 -3 kfile/kfilefiltercombo.cpp
M +1 -1 kfile/kfileplaceeditdialog.cpp
M +1 -1 kfile/kfileplacesitem.cpp
M +16 -16 kfile/kfileplacesmodel.cpp
M +4 -4 kfile/kfileplacessharedbookmarks.cpp
M +13 -13 kfile/kfileplacesview.cpp
M +10 -10 kfile/kfilepreviewgenerator.cpp
M +6 -6 kfile/kfiletreeview.cpp
M +33 -33 kfile/kfilewidget.cpp
M +6 -6 kfile/knewfilemenu.cpp
M +9 -9 kfile/kurlnavigator.cpp
M +4 -4 kfile/kurlnavigatorbutton.cpp
M +5 -5 kfile/kurlnavigatorplacesselector.cpp
M +11 -11 kfile/tests/kfileplacesmodeltest.cpp
M +2 -2 khtml/ecma/debugger/debugdocument.cpp
M +5 -5 khtml/ecma/debugger/debugwindow.cpp
M +2 -2 khtml/ecma/debugger/scriptsdock.cpp
M +3 -3 khtml/ecma/kjs_window.cpp
M +8 -8 khtml/ecma/xmlhttprequest.cpp
M +6 -6 khtml/html/html_documentimpl.cpp
M +1 -1 khtml/html/html_objectimpl.cpp
M +7 -7 khtml/java/kjavaappletserver.cpp
M +4 -4 khtml/java/kjavaappletviewer.cpp
M +4 -4 khtml/java/kjavaappletwidget.cpp
M +6 -6 khtml/java/kjavadownloader.cpp
M +6 -6 khtml/java/kjavaprocess.cpp
M +41 -41 khtml/khtml_ext.cpp
M +1 -1 khtml/khtml_pagecache.cpp
M +103 -103 khtml/khtml_part.cpp
M +1 -1 khtml/khtml_settings.cpp
M +8 -8 khtml/khtmlimage.cpp
M +1 -1 khtml/khtmlviewbarwidget.cpp
M +38 -38 khtml/kmultipart/kmultipart.cpp
M +4 -4 khtml/misc/loader.cpp
M +1 -1 khtml/rendering/media_controls.cpp
M +7 -7 khtml/rendering/render_form.cpp
M +1 -1 khtml/rendering/render_frames.cpp
M +2 -2 khtml/rendering/render_replaced.cpp
M +8 -8 khtml/test_regression.cpp
M +6 -6 khtml/test_regression_gui_window.cpp
M +9 -9 khtml/testkhtml.cpp
M +7 -7 khtml/tests/testkhtmlnew.cpp
M +6 -6 khtml/ui/findbar/khtmlfind.cpp
M +1 -1 khtml/ui/findbar/khtmlfindbar.cpp
M +1 -1 kinit/kinit.cpp
M +6 -6 kinit/klauncher.cpp
M +1 -1 kinit/klauncher_main.cpp
M +9 -9 kio/kfile/kacleditwidget.cpp
M +1 -1 kio/kfile/kcommentwidget.cpp
M +4 -4 kio/kfile/kdevicelistmodel.cpp
M +1 -1 kio/kfile/kfiledialog.cpp
M +4 -4 kio/kfile/kfilemetadataprovider.cpp
M +2 -2 kio/kfile/kfilemetadatareader.cpp
M +7 -7 kio/kfile/kfilemetainfowidget.cpp
M +4 -4 kio/kfile/kfilesharedialog.cpp
M +5 -5 kio/kfile/kicondialog.cpp
M +10 -10 kio/kfile/kimagefilepreview.cpp
M +1 -1 kio/kfile/kmetaprops.cpp
M +8 -8 kio/kfile/kopenwithdialog.cpp
M +2 -2 kio/kfile/kpreviewprops.cpp
M +68 -68 kio/kfile/kpropertiesdialog.cpp
M +1 -1 kio/kfile/kurlcombobox.cpp
M +9 -9 kio/kfile/kurlrequester.cpp
M +8 -8 kio/kio/accessmanagerreply_p.cpp
M +1 -1 kio/kio/chmodjob.cpp
M +4 -4 kio/kio/copyjob.cpp
M +2 -2 kio/kio/delegateanimationhandler.cpp
M +2 -2 kio/kio/deletejob.cpp
M +2 -2 kio/kio/directorysizejob.cpp
M +14 -14 kio/kio/filejob.cpp
M +2 -2 kio/kio/fileundomanager.cpp
M +24 -24 kio/kio/forwardingslavebase.cpp
M +56 -56 kio/kio/job.cpp
M +2 -2 kio/kio/kautomount.cpp
M +1 -1 kio/kio/kdatatool.cpp
M +30 -30 kio/kio/kdirlister.cpp
M +4 -4 kio/kio/kdirmodel.cpp
M +6 -6 kio/kio/kfileshare.cpp
M +2 -2 kio/kio/knfsshare.cpp
M +4 -4 kio/kio/kpasswdserver.cpp
M +8 -8 kio/kio/krun.cpp
M +2 -2 kio/kio/ksambashare.cpp
M +2 -2 kio/kio/kurlcompletion.cpp
M +2 -2 kio/kio/metainfojob.cpp
M +22 -22 kio/kio/netaccess.cpp
M +5 -5 kio/kio/pastedialog.cpp
M +1 -1 kio/kio/previewjob.cpp
M +11 -11 kio/kio/renamedialog.cpp
M +8 -8 kio/kio/scheduler.cpp
M +3 -3 kio/kio/skipdialog.cpp
M +2 -2 kio/kssl/kcm/cacertificatespage.cpp
M +2 -2 kio/kssl/ksslkeygen.cpp
M +3 -3 kio/misc/kpac/discovery.cpp
M +5 -5 kio/misc/kpac/downloader.cpp
M +2 -2 kio/tests/fileundomanagertest.cpp
M +26 -26 kio/tests/jobremotetest.cpp
M +15 -15 kio/tests/jobtest.cpp
M +5 -5 kio/tests/kdcopcheck.cpp
M +12 -12 kio/tests/kdirlistertest.cpp
M +42 -42 kio/tests/kdirlistertest_gui.cpp
M +6 -6 kio/tests/kdirmodeltest.cpp
M +1 -1 kio/tests/kfdtest.cpp
M +13 -13 kio/tests/kioslavetest.cpp
M +2 -2 kio/tests/previewtest.cpp
M +4 -4 kio/tests/speed.cpp
M +6 -6 kioslave/http/http.cpp
M +1 -1 kjsembed/examples/kjsconsole/console.cpp
M +4 -4 kjsembed/examples/kjsconsole/numberedtextview.cpp
M +1 -1 kjsembed/kjscmd/kjscmd.cpp
M +6 -6 knewstuff/knewstuff2/core/coreengine.cpp
M +6 -6 knewstuff/knewstuff2/core/entryloader.cpp
M +4 -4 knewstuff/knewstuff2/core/providerloader.cpp
M +8 -8 knewstuff/knewstuff2/core/security.cpp
M +1 -1 knewstuff/knewstuff2/dxs/dxs.cpp
M +2 -2 knewstuff/knewstuff2/dxs/dxsengine.cpp
M +2 -2 knewstuff/knewstuff2/dxs/soap.cpp
M +2 -2 knewstuff/knewstuff2/engine.cpp
M +12 -12 knewstuff/knewstuff2/ui/downloaddialog.cpp
M +2 -2 knewstuff/knewstuff2/ui/itemsmodel.cpp
M +3 -3 knewstuff/knewstuff2/ui/itemsview.cpp
M +1 -1 knewstuff/knewstuff2/ui/itemsviewdelegate.cpp
M +6 -6 knewstuff/knewstuff2/ui/kdxsbutton.cpp
M +2 -2 knewstuff/knewstuff2/ui/kdxscomments.cpp
M +1 -1 knewstuff/knewstuff2/ui/qasyncimage.cpp
M +3 -3 knewstuff/knewstuff3/attica/atticaprovider.cpp
M +6 -6 knewstuff/knewstuff3/core/engine.cpp
M +8 -8 knewstuff/knewstuff3/core/security.cpp
M +4 -4 knewstuff/knewstuff3/core/xmlloader.cpp
M +4 -4 knewstuff/knewstuff3/downloadwidget.cpp
M +1 -1 knewstuff/knewstuff3/staticxml/staticxmlprovider.cpp
M +1 -1 knewstuff/knewstuff3/ui/imageloader.cpp
M +1 -1 knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp
M +1 -1 knewstuff/knewstuff3/ui/itemsviewdelegate.cpp
M +1 -1 knewstuff/knewstuff3/upload/atticahelper.cpp
M +1 -1 knewstuff/knewstuff3/uploaddialog.cpp
M +2 -2 knewstuff/tests/knewstuff2_cache.cpp
M +2 -2 knewstuff/tests/knewstuff2_download.cpp
M +2 -2 knewstuff/tests/knewstuff2_test.cpp
M +2 -2 knotify/config/knotifyconfigwidget.cpp
M +1 -1 knotify/config/knotifyeventlist.cpp
M +3 -3 knotify/tests/knotifytestwindow.cpp
M +15 -15 kparts/browserextension.cpp
M +6 -6 kparts/browserrun.cpp
M +8 -8 kparts/mainwindow.cpp
M +6 -6 kparts/part.cpp
M +8 -8 kparts/partmanager.cpp
M +2 -2 kparts/scriptableextension.cpp
M +2 -2 kparts/tests/notepad.cpp
M +3 -3 kparts/tests/testmainwindow.cpp
M +1 -1 kpty/tests/kptyprocesstest.cpp
M +19 -19 kross/core/actioncollection.cpp
M +4 -4 kross/modules/form.cpp
M +12 -12 kross/ui/model.cpp
M +4 -4 kross/ui/view.cpp
M +1 -1 kutils/kcmodulecontainer.cpp
M +2 -2 kutils/kcmultidialog.cpp
M +1 -1 kutils/kemoticons/kemoticons.cpp
M +2 -2 kutils/kemoticons/tests/main.cpp
M +6 -6 kutils/ksettings/componentsdialog.cpp
M +2 -2 kutils/ksettings/dialog.cpp
M +1 -1 kutils/ksettings/dispatcher.cpp
M +3 -3 kutils/ksettings/pluginpage.cpp
M +8 -8 nepomuk/core/nepomukmainmodel.cpp
M +8 -8 nepomuk/query/queryserviceclient.cpp
M +4 -4 nepomuk/test/ratingpaintertestwidget.cpp
M +2 -2 nepomuk/ui/kedittagsdialog.cpp
M +2 -2 nepomuk/ui/ktagcloudwidget.cpp
M +2 -2 nepomuk/ui/ktagdisplaywidget.cpp
M +2 -2 nepomuk/ui/nepomukmassupdatejob.cpp
M +3 -3 nepomuk/ui/tagwidget.cpp
M +16 -16 nepomuk/utils/daterangeselectionwidget.cpp
M +2 -2 nepomuk/utils/facetwidget.cpp
M +2 -2 nepomuk/utils/searchwidget.cpp
M +2 -2 plasma/applet.cpp
M +2 -2 plasma/containment.cpp
M +1 -1 plasma/datacontainer.cpp
M +1 -1 plasma/dataengine.cpp
M +1 -1 plasma/dataenginemanager.cpp
M +4 -4 plasma/deprecated/animator.cpp
M +2 -2 plasma/extenders/extender.cpp
M +1 -1 plasma/private/associatedapplicationmanager.cpp
M +4 -4 plasma/private/kineticscroll.cpp
M +2 -2 plasma/private/qtjolie-branch/qtjolie/serverthread.cpp
M +2 -2 plasma/private/qtjolie-branch/tests/calculatorservice.cpp
M +1 -1 plasma/private/remoteservice.cpp
M +1 -1 plasma/private/serviceprovider.cpp
M +1 -1 plasma/private/storage.cpp
M +4 -4 plasma/scripting/wallpaperscript.cpp
M +1 -1 plasma/tests/testcontainmentactionsplugin/test.cpp
M +2 -2 plasma/view.cpp
M +1 -1 plasma/wallpaper.cpp
M +3 -3 plasma/widgets/combobox.cpp
M +2 -2 plasma/widgets/lineedit.cpp
M +2 -2 plasma/widgets/videowidget.cpp
M +2 -2 plasma/widgets/webview.cpp
M +1 -1 security/crypto/certexport.cpp
M +4 -4 security/crypto/crypto.cpp
M +2 -2 solid/solid/acadapter.cpp
M +8 -8 solid/solid/backends/fakehw/fakedevice.cpp
M +4 -4 solid/solid/backends/fakehw/fakegenericinterface.cpp
M +2 -2 solid/solid/backends/fakehw/fakestorageaccess.cpp
M +1 -1 solid/solid/backends/fstab/fstabhandling.cpp
M +4 -4 solid/solid/backends/fstab/fstabstorageaccess.cpp
M +2 -2 solid/solid/backends/hal/halacadapter.cpp
M +2 -2 solid/solid/backends/hal/halbattery.cpp
M +2 -2 solid/solid/backends/hal/halbutton.cpp
M +6 -6 solid/solid/backends/hal/halcdrom.cpp
M +2 -2 solid/solid/backends/hal/haldevice.cpp
M +1 -1 solid/solid/backends/hal/halfstabhandling.cpp
M +4 -4 solid/solid/backends/hal/halgenericinterface.cpp
M +2 -2 solid/solid/backends/hal/halmanager.cpp
M +18 -18 solid/solid/backends/hal/halstorageaccess.cpp
M +2 -2 solid/solid/backends/kupnp/kupnpmanager.cpp
M +4 -4 solid/solid/backends/udev/udevgenericinterface.cpp
M +4 -4 solid/solid/backends/udisks/udisksgenericinterface.cpp
M +2 -2 solid/solid/backends/udisks/udisksopticaldrive.cpp
M +10 -10 solid/solid/backends/udisks/udisksstorageaccess.cpp
M +8 -8 solid/solid/backends/upnp/upnpinternetgateway.cpp
M +2 -2 solid/solid/backends/wmi/wmiacadapter.cpp
M +2 -2 solid/solid/backends/wmi/wmibattery.cpp
M +2 -2 solid/solid/backends/wmi/wmibutton.cpp
M +4 -4 solid/solid/backends/wmi/wmicdrom.cpp
M +4 -4 solid/solid/backends/wmi/wmigenericinterface.cpp
M +8 -8 solid/solid/backends/wmi/wmistorageaccess.cpp
M +6 -6 solid/solid/battery.cpp
M +2 -2 solid/solid/button.cpp
M +2 -2 solid/solid/device.cpp
M +2 -2 solid/solid/devicemanager.cpp
M +4 -4 solid/solid/genericinterface.cpp
M +8 -8 solid/solid/internetgateway.cpp
M +1 -1 solid/solid/networking.cpp
M +6 -6 solid/solid/opticaldrive.cpp
M +23 -23 solid/solid/storageaccess.cpp
M +2 -2 solid/tests/halbasictest.cpp
M +4 -4 solid/tests/networkingclient.cpp
M +4 -4 solid/tests/solidhwtest.cpp
M +3 -3 solid/tests/solidnettestdbusservice.cpp
M +10 -10 threadweaver/Examples/Jobs/Jobs.cpp
M +10 -10 threadweaver/Examples/Jobs/WeaverObserverTest.cpp
M +2 -2 threadweaver/Examples/QProcessJob/MainWindow.cpp
M +6 -6 threadweaver/Examples/SMIV/SMIV.cpp
M +6 -6 threadweaver/Examples/SMIV/SMIVItem.cpp
M +2 -2 threadweaver/Tests/DeleteTest.cpp
M +8 -8 threadweaver/Tests/JobTests.cpp
M +4 -4 threadweaver/Tests/QueueTests.cpp
M +6 -6 threadweaver/Weaver/Job.cpp
M +6 -6 threadweaver/Weaver/Thread.cpp
M +4 -4 threadweaver/Weaver/ThreadWeaver.cpp
M +18 -18 threadweaver/Weaver/WeaverImpl.cpp
M +6 -6 threadweaver/WeaverGui/WeaverThreadGrid.cpp

http://commits.kde.org/kdelibs/0fa873e587fecdcf69d81da3f2d86f0a17c6fe2e

[kdelibs/frameworks] /: Revert "Remove the exports targets from libraries in frameworks."

Git commit 70881d9cd999834e783e6d92241a8d5e9165418b by Stephen Kelly.
Committed on 12/02/2012 at 16:32.
Pushed by skelly into branch 'frameworks'.

Revert "Remove the exports targets from libraries in frameworks."

This reverts commit 24d1fb1228cc534d3de2324236fcad9a637e7906.

M +2 -2 CMakeLists.txt
M +1 -1 dnssd/CMakeLists.txt
M +1 -1 experimental/libkdeclarative/CMakeLists.txt
M +1 -1 interfaces/kimproxy/library/CMakeLists.txt
M +1 -1 interfaces/kmediaplayer/CMakeLists.txt
M +1 -1 interfaces/ktexteditor/CMakeLists.txt
M +1 -1 kde3support/CMakeLists.txt
M +1 -1 kde3support/kunittest/CMakeLists.txt
M +2 -2 kdecore/CMakeLists.txt
M +1 -1 kdesu/CMakeLists.txt
M +1 -1 kdeui/CMakeLists.txt
M +1 -1 kdewebkit/CMakeLists.txt
M +1 -1 kfile/CMakeLists.txt
M +1 -1 khtml/CMakeLists.txt
M +1 -1 kio/CMakeLists.txt
M +1 -1 kio/misc/kntlm/CMakeLists.txt
M +1 -1 kjs/CMakeLists.txt
M +1 -1 kjs/api/CMakeLists.txt
M +1 -1 kjsembed/kjsembed/CMakeLists.txt
M +1 -1 knewstuff/knewstuff2/CMakeLists.txt
M +1 -1 knewstuff/knewstuff3/CMakeLists.txt
M +1 -1 knotify/config/CMakeLists.txt
M +1 -1 kparts/CMakeLists.txt
M +1 -1 kpty/CMakeLists.txt
M +1 -1 kross/core/CMakeLists.txt
M +1 -1 kross/ui/CMakeLists.txt
M +1 -1 kunitconversion/CMakeLists.txt
M +5 -5 kutils/CMakeLists.txt
M +1 -1 libinqt5/src/CMakeLists.txt
M +2 -2 plasma/CMakeLists.txt
M +1 -1 staging/karchive/src/CMakeLists.txt
M +2 -1 tier1/solid/solid/CMakeLists.txt
M +1 -1 tier1/threadweaver/Experimental/CMakeLists.txt
M +1 -1 tier1/threadweaver/WeaverGui/CMakeLists.txt
M +1 -1 tier2/sonnet/core/CMakeLists.txt

http://commits.kde.org/kdelibs/70881d9cd999834e783e6d92241a8d5e9165418b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8742ae..fcd8041 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -405,8 +405,8 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/KDEPlatformProfile.cmake DESTINATION
install(CODE "set(EXPORT_FILES KDELibs4LibraryTargets.cmake KDELibs4ToolsTargets.cmake)"
CODE "set(EXPORT_INSTALL_DIR \"${DATA_INSTALL_DIR}/cmake/modules\")"
SCRIPT "${CMAKE_SOURCE_DIR}/cmake/modules/check_installed_exports_file.cmake" )
-# No longer applicable, replaced with individual frameworks
-# install( EXPORT kdelibsToolsTargets DESTINATION ${DATA_INSTALL_DIR}/cmake/modules NAMESPACE ${KDE4_TARGET_PREFIX} FILE KDELibs4ToolsTargets.cmake )
+install( EXPORT kdelibsLibraryTargets DESTINATION ${DATA_INSTALL_DIR}/cmake/modules NAMESPACE ${KDE4_TARGET_PREFIX} FILE KDELibs4LibraryTargets.cmake )
+install( EXPORT kdelibsToolsTargets DESTINATION ${DATA_INSTALL_DIR}/cmake/modules NAMESPACE ${KDE4_TARGET_PREFIX} FILE KDELibs4ToolsTargets.cmake )
# the following will be the correct locations once cmake has the improved FIND_PACKAGE()
# install( FILES ${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake DESTINATION ${PLUGIN_INSTALL_DIR}/cmake RENAME KDE4Config.cmake)

diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt
index 3f5f6b0b8..e06bd38 100644
--- a/dnssd/CMakeLists.txt
+++ b/dnssd/CMakeLists.txt
@@ -81,7 +81,7 @@ set_target_properties(kdnssd PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)
-install(TARGETS kdnssd ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdnssd EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

########### install files ###############
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/dnssd_export.h domainbrowser.h remoteservice.h servicetypebrowser.h publicservice.h
diff --git a/experimental/libkdeclarative/CMakeLists.txt b/experimental/libkdeclarative/CMakeLists.txt
index ac21ea3..2452b48 100644
--- a/experimental/libkdeclarative/CMakeLists.txt
+++ b/experimental/libkdeclarative/CMakeLists.txt
@@ -50,6 +50,6 @@ set(kdeclarative_LIB_HEADERS

install(FILES ${kdeclarative_LIB_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/ COMPONENT Devel)

-install(TARGETS kdeclarative ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdeclarative EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})


diff --git a/interfaces/kimproxy/library/CMakeLists.txt b/interfaces/kimproxy/library/CMakeLists.txt
index b7ce3a3..c2ff6b1 100644
--- a/interfaces/kimproxy/library/CMakeLists.txt
+++ b/interfaces/kimproxy/library/CMakeLists.txt
@@ -27,5 +27,5 @@ set_target_properties(kimproxy PROPERTIES

########### install files ###############

-install(TARGETS kimproxy ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kimproxy EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kimproxy_export.h kimproxy.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
diff --git a/interfaces/kmediaplayer/CMakeLists.txt b/interfaces/kmediaplayer/CMakeLists.txt
index 413f200..a2a4fdd 100644
--- a/interfaces/kmediaplayer/CMakeLists.txt
+++ b/interfaces/kmediaplayer/CMakeLists.txt
@@ -23,7 +23,7 @@ set_target_properties(kmediaplayer PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)
-install(TARGETS kmediaplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kmediaplayer EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})


########### install files ###############
diff --git a/interfaces/ktexteditor/CMakeLists.txt b/interfaces/ktexteditor/CMakeLists.txt
index a8f07a0..c59fbb4 100644
--- a/interfaces/ktexteditor/CMakeLists.txt
+++ b/interfaces/ktexteditor/CMakeLists.txt
@@ -41,7 +41,7 @@ set_target_properties(ktexteditor
PROPERTIES VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)
-install(TARGETS ktexteditor ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS ktexteditor EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

########### install files ###############
install( FILES
diff --git a/kde3support/CMakeLists.txt b/kde3support/CMakeLists.txt
index d3e5774..64e2531 100644
--- a/kde3support/CMakeLists.txt
+++ b/kde3support/CMakeLists.txt
@@ -91,7 +91,7 @@ set_target_properties(kde3support PROPERTIES VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)

-install(TARGETS kde3support ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kde3support EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

########### install files ###############

diff --git a/kde3support/kunittest/CMakeLists.txt b/kde3support/kunittest/CMakeLists.txt
index d880dd6..30d8205 100644
--- a/kde3support/kunittest/CMakeLists.txt
+++ b/kde3support/kunittest/CMakeLists.txt
@@ -15,7 +15,7 @@ set_target_properties(kunittest PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)
-install(TARGETS kunittest ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kunittest EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )


########### next target ###############
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index 7e95e14..6d854a0 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -144,7 +144,7 @@ if (UNIX)
if (NOT HAVE_TRUNC)
target_link_libraries(kdefakes m )
endif (NOT HAVE_TRUNC)
- install(TARGETS kdefakes ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ install(TARGETS kdefakes EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )

endif (UNIX)

@@ -321,7 +321,7 @@ set_target_properties(kdecore PROPERTIES
)


-install(TARGETS kdecore ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdecore EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

########### next target ###############

diff --git a/kdesu/CMakeLists.txt b/kdesu/CMakeLists.txt
index 7f639ab..ce8bb56 100644
--- a/kdesu/CMakeLists.txt
+++ b/kdesu/CMakeLists.txt
@@ -40,7 +40,7 @@ set_target_properties(kdesu PROPERTIES
SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}
)

-install(TARGETS kdesu ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kdesu EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )


########### next target ###############
diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index 9016fa6..c947551 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -470,7 +470,7 @@ set_target_properties(kdeui PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION}
SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}
)

-install(TARGETS kdeui ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdeui EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############

if (Q_WS_MAC)
diff --git a/kdewebkit/CMakeLists.txt b/kdewebkit/CMakeLists.txt
index e2b95af..c98553a 100644
--- a/kdewebkit/CMakeLists.txt
+++ b/kdewebkit/CMakeLists.txt
@@ -25,7 +25,7 @@ target_link_libraries(kdewebkit LINK_INTERFACE_LIBRARIES kparts kio kdecore ${QT

set_target_properties(kdewebkit PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION})

-install(TARGETS kdewebkit ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdewebkit EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

install(FILES
${CMAKE_CURRENT_BINARY_DIR}/kdewebkit_export.h
diff --git a/kfile/CMakeLists.txt b/kfile/CMakeLists.txt
index 4eba8a2..a9fb62a 100644
--- a/kfile/CMakeLists.txt
+++ b/kfile/CMakeLists.txt
@@ -62,7 +62,7 @@ set_target_properties(kfile PROPERTIES VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)

-install(TARGETS kfile ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kfile EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

install( FILES
kdiroperator.h
diff --git a/khtml/CMakeLists.txt b/khtml/CMakeLists.txt
index 946c75a..128b352 100644
--- a/khtml/CMakeLists.txt
+++ b/khtml/CMakeLists.txt
@@ -648,7 +648,7 @@ create_js_binding(html/HTMLVideoElement.idl)
#create_js_binding(svg/SVGPathSegMovetoAbs.idl)
#create_js_binding(svg/SVGPathSegMovetoRel.idl)

-install(TARGETS khtml ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS khtml EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

########### khtmlpart ###############

diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt
index 2642f4a..9dc3ba5 100644
--- a/kio/CMakeLists.txt
+++ b/kio/CMakeLists.txt
@@ -349,7 +349,7 @@ set_target_properties(kio PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION}


########### install files ###############
-install(TARGETS kio ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kio EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
if(NOT KIO_NO_NEPOMUK)
install(TARGETS kfilemetadatareader ${INSTALL_TARGETS_DEFAULT_ARGS})
endif(NOT KIO_NO_NEPOMUK)
diff --git a/kio/misc/kntlm/CMakeLists.txt b/kio/misc/kntlm/CMakeLists.txt
index 1e285ac..b000ebf 100644
--- a/kio/misc/kntlm/CMakeLists.txt
+++ b/kio/misc/kntlm/CMakeLists.txt
@@ -13,7 +13,7 @@ target_link_libraries(kntlm ${KDE4_KDECORE_LIBS} kcoreaddons)

set_target_properties(kntlm PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )

-install(TARGETS kntlm ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kntlm EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kntlm_export.h kntlm.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio COMPONENT Devel)

diff --git a/kjs/CMakeLists.txt b/kjs/CMakeLists.txt
index cd0d862..4c25839 100644
--- a/kjs/CMakeLists.txt
+++ b/kjs/CMakeLists.txt
@@ -215,7 +215,7 @@ if(PCRE_FOUND)
endif(PCRE_FOUND)

set_target_properties(${KJSLIBNAME} PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS ${KJSLIBNAME} ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS ${KJSLIBNAME} EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

########### kjs - basic shell ###############

diff --git a/kjs/api/CMakeLists.txt b/kjs/api/CMakeLists.txt
index 254b5d9..f7bda92 100644
--- a/kjs/api/CMakeLists.txt
+++ b/kjs/api/CMakeLists.txt
@@ -14,7 +14,7 @@ generate_export_header(kjsapi)
target_link_libraries(kjsapi ${KJSLIBNAME} ${KDE4_KDECORE_LIBS})

set_target_properties(kjsapi PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kjsapi ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kjsapi EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

install(FILES
${CMAKE_CURRENT_BINARY_DIR}/kjsapi_export.h
diff --git a/kjsembed/kjsembed/CMakeLists.txt b/kjsembed/kjsembed/CMakeLists.txt
index 0dd789d..d70f260 100644
--- a/kjsembed/kjsembed/CMakeLists.txt
+++ b/kjsembed/kjsembed/CMakeLists.txt
@@ -69,7 +69,7 @@ kde4_add_library(${KJSEMBEDLIBNAME} ${LIBRARY_TYPE} ${kjsembed_LIB_SRCS})
target_link_libraries(${KJSEMBEDLIBNAME} ${KDE4_KDECORE_LIBS} ${QT_QTUITOOLS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTCORE_LIBRARY} ${KJSLIBNAME} )

set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS ${KJSEMBEDLIBNAME} ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS ${KJSEMBEDLIBNAME} EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})



diff --git a/knewstuff/knewstuff2/CMakeLists.txt b/knewstuff/knewstuff2/CMakeLists.txt
index 3e66f38..bef7d36 100644
--- a/knewstuff/knewstuff2/CMakeLists.txt
+++ b/knewstuff/knewstuff2/CMakeLists.txt
@@ -66,7 +66,7 @@ set_target_properties(knewstuff2 PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)
-install(TARGETS knewstuff2 ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS knewstuff2 EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

install(FILES
core/author.h
diff --git a/knewstuff/knewstuff3/CMakeLists.txt b/knewstuff/knewstuff3/CMakeLists.txt
index 8349e9c..b715d64 100644
--- a/knewstuff/knewstuff3/CMakeLists.txt
+++ b/knewstuff/knewstuff3/CMakeLists.txt
@@ -65,7 +65,7 @@ set_target_properties(knewstuff3 PROPERTIES
SOVERSION ${GENERIC_LIB_SOVERSION}
)

-install(TARGETS knewstuff3 ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS knewstuff3 EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

install(FILES
downloaddialog.h
diff --git a/knotify/config/CMakeLists.txt b/knotify/config/CMakeLists.txt
index 117d2d7..43c2a3a 100644
--- a/knotify/config/CMakeLists.txt
+++ b/knotify/config/CMakeLists.txt
@@ -26,7 +26,7 @@ set_target_properties(knotifyconfig PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)
-install(TARGETS knotifyconfig ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS knotifyconfig EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

########### install files ###############
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/knotifyconfig_export.h knotifyconfigwidget.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
diff --git a/kparts/CMakeLists.txt b/kparts/CMakeLists.txt
index 44731c1..a264763 100644
--- a/kparts/CMakeLists.txt
+++ b/kparts/CMakeLists.txt
@@ -48,7 +48,7 @@ set_target_properties(kparts PROPERTIES VERSION ${GENERIC_LIB_VERSION}
)


-install(TARGETS kparts ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kparts EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

########### install files ###############

diff --git a/kpty/CMakeLists.txt b/kpty/CMakeLists.txt
index 5fc4cb3..9429d30 100644
--- a/kpty/CMakeLists.txt
+++ b/kpty/CMakeLists.txt
@@ -20,7 +20,7 @@ set_target_properties(kpty PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)
-install(TARGETS kpty ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kpty EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

install( FILES
${CMAKE_CURRENT_BINARY_DIR}/kpty_export.h
diff --git a/kross/core/CMakeLists.txt b/kross/core/CMakeLists.txt
index 2b364b2..d7a52ff 100644
--- a/kross/core/CMakeLists.txt
+++ b/kross/core/CMakeLists.txt
@@ -19,7 +19,7 @@ set_target_properties(krosscore PROPERTIES VERSION ${GENERIC_LIB_VERSION}
)


-install(TARGETS krosscore ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS krosscore EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

install(FILES
kross_export.h
diff --git a/kross/ui/CMakeLists.txt b/kross/ui/CMakeLists.txt
index c0d053b..5c0c478 100644
--- a/kross/ui/CMakeLists.txt
+++ b/kross/ui/CMakeLists.txt
@@ -20,7 +20,7 @@ set_target_properties(krossui PROPERTIES VERSION ${GENERIC_LIB_VERSION}
)


-install(TARGETS krossui ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS krossui EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

########### install files ###############

diff --git a/kunitconversion/CMakeLists.txt b/kunitconversion/CMakeLists.txt
index 5fa3323..ba9d986 100644
--- a/kunitconversion/CMakeLists.txt
+++ b/kunitconversion/CMakeLists.txt
@@ -62,5 +62,5 @@ kde4_add_library(kunitconversion ${LIBRARY_TYPE} ${kunitconversion_LIB_SRCS})
generate_export_header(kunitconversion)
target_link_libraries(kunitconversion ${KDE4_KDECORE_LIBS} ${KUNITCONVERSION_EXTRA_LIBS} kcoreaddons)
set_target_properties(kunitconversion PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
-install(TARGETS kunitconversion ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kunitconversion EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES ${kunitconversion_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kunitconversion COMPONENT Devel)
diff --git a/kutils/CMakeLists.txt b/kutils/CMakeLists.txt
index 5e22707..b1b1f4c 100644
--- a/kutils/CMakeLists.txt
+++ b/kutils/CMakeLists.txt
@@ -37,7 +37,7 @@ install(FILES
COMPONENT Devel
)

-install(TARGETS kemoticons ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kemoticons EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})


######## kidletime ####################
@@ -88,7 +88,7 @@ install( FILES
kidletime/kidletime.h
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)

-install(TARGETS kidletime ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kidletime EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})


########### kcmutils ###############
@@ -132,7 +132,7 @@ install(FILES
DESTINATION ${INCLUDE_INSTALL_DIR}/ksettings
COMPONENT Devel)

-install(TARGETS kcmutils ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kcmutils EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})


########### kprintutils ###############
@@ -154,7 +154,7 @@ install( FILES
kprintpreview.h
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)

-install(TARGETS kprintutils ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kprintutils EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})


########### kutils ###############
@@ -172,6 +172,6 @@ set_target_properties(kutils PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION})

-install(TARGETS kutils ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kutils EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
endif(NOT KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED)

diff --git a/libinqt5/src/CMakeLists.txt b/libinqt5/src/CMakeLists.txt
index 7e0a9ec..92ba3e6 100644
--- a/libinqt5/src/CMakeLists.txt
+++ b/libinqt5/src/CMakeLists.txt
@@ -18,7 +18,7 @@ set_target_properties(inqt5 PROPERTIES VERSION ${ECM_VERSION_STRING}
SOVERSION ${ECM_SOVERSION}
)

-install(TARGETS inqt5 ${ECM_TARGET_DEFAULT_ARGS})
+install(TARGETS inqt5 EXPORT kdelibsLibraryTargets ${ECM_TARGET_DEFAULT_ARGS})

#install(FILES
# qstandardpaths.h
diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt
index 9805ca5..a4ee855 100644
--- a/plasma/CMakeLists.txt
+++ b/plasma/CMakeLists.txt
@@ -310,8 +310,8 @@ set_target_properties(plasmaqgv PROPERTIES
SOVERSION 1
)

-install(TARGETS plasma ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(TARGETS plasmaqgv ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS plasma EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS plasmaqgv EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

########### install files ###############

diff --git a/staging/karchive/src/CMakeLists.txt b/staging/karchive/src/CMakeLists.txt
index 8547c3d..6f71534 100644
--- a/staging/karchive/src/CMakeLists.txt
+++ b/staging/karchive/src/CMakeLists.txt
@@ -44,7 +44,7 @@ set_target_properties(karchive PROPERTIES VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)

-install(TARGETS karchive ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS karchive EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

install( FILES
karchive.h
diff --git a/tier1/solid/solid/CMakeLists.txt b/tier1/solid/solid/CMakeLists.txt
index 77c3512..ff4d29f 100644
--- a/tier1/solid/solid/CMakeLists.txt
+++ b/tier1/solid/solid/CMakeLists.txt
@@ -393,7 +393,8 @@ set_target_properties(solid PROPERTIES
VERSION ${ECM_VERSION_STRING}
SOVERSION ${ECM_SOVERSION}
)
-install(TARGETS solid ${ECM_TARGET_DEFAULT_ARGS})
+
+install(TARGETS solid EXPORT kdelibsLibraryTargets ${ECM_TARGET_DEFAULT_ARGS})

# TODO Should this be in ECM?
set(DBUS_INTERFACES_INSTALL_DIR "share/dbus-1/interfaces")
diff --git a/tier1/threadweaver/Experimental/CMakeLists.txt b/tier1/threadweaver/Experimental/CMakeLists.txt
index 5465a13..3deaf08 100644
--- a/tier1/threadweaver/Experimental/CMakeLists.txt
+++ b/tier1/threadweaver/Experimental/CMakeLists.txt
@@ -11,7 +11,7 @@ kde4_add_library(ThreadWeaverExperimental ${LIBRARY_TYPE} ${ThreadWeaverExperime
target_link_libraries(ThreadWeaverExperimental threadweaver)
set_target_properties(ThreadWeaverExperimental PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})

-install(TARGETS ThreadWeaverExperimental ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS ThreadWeaverExperimental EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

install(FILES FileLoaderJob.h
DESTINATION ${INCLUDE_INSTALL_DIR}/threadweaver/ COMPONENT Devel )
diff --git a/tier1/threadweaver/WeaverGui/CMakeLists.txt b/tier1/threadweaver/WeaverGui/CMakeLists.txt
index c110369..f5e370b 100644
--- a/tier1/threadweaver/WeaverGui/CMakeLists.txt
+++ b/tier1/threadweaver/WeaverGui/CMakeLists.txt
@@ -10,7 +10,7 @@ kde4_add_library(ThreadWeaverGui ${LIBRARY_TYPE} ${ThreadWeaverGui_LIB_SRCS})
target_link_libraries(ThreadWeaverGui threadweaver ${QT_QTGUI_LIBRARY})
set_target_properties(ThreadWeaverGui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})

-install(TARGETS ThreadWeaverGui ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS ThreadWeaverGui EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})

install(FILES WeaverThreadGrid.h
DESTINATION ${INCLUDE_INSTALL_DIR}/threadweaver/ COMPONENT Devel
diff --git a/tier2/sonnet/core/CMakeLists.txt b/tier2/sonnet/core/CMakeLists.txt
index 341d87a..3d9d271 100644
--- a/tier2/sonnet/core/CMakeLists.txt
+++ b/tier2/sonnet/core/CMakeLists.txt
@@ -39,7 +39,7 @@ set_target_properties(sonnetcore PROPERTIES VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)

-install(TARGETS sonnetcore ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS sonnetcore EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})


install( FILES backgroundchecker.h speller.h globals.h ${CMAKE_CURRENT_BINARY_DIR}/sonnetcore_export.h

[kdelibs/frameworks] kjs/api: Port kjsapi to generate_export_header.

Git commit 02312ba3a00ea3eeb2adc417055501257b5a6314 by Stephen Kelly.
Committed on 10/02/2012 at 17:45.
Pushed by skelly into branch 'frameworks'.

Port kjsapi to generate_export_header.

M +2 -1 kjs/api/CMakeLists.txt
D +0 -43 kjs/api/kjsapi_export.h
M +2 -0 kjs/api/kjscontext.h

http://commits.kde.org/kdelibs/02312ba3a00ea3eeb2adc417055501257b5a6314

diff --git a/kjs/api/CMakeLists.txt b/kjs/api/CMakeLists.txt
index 3adca04..254b5d9 100644
--- a/kjs/api/CMakeLists.txt
+++ b/kjs/api/CMakeLists.txt
@@ -9,6 +9,7 @@ set(kjsapi_LIB_SRCS
)

kde4_add_library(kjsapi ${LIBRARY_TYPE} ${kjsapi_LIB_SRCS})
+generate_export_header(kjsapi)

target_link_libraries(kjsapi ${KJSLIBNAME} ${KDE4_KDECORE_LIBS})

@@ -16,7 +17,7 @@ set_target_properties(kjsapi PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION
install(TARGETS kjsapi ${INSTALL_TARGETS_DEFAULT_ARGS})

install(FILES
- kjsapi_export.h
+ ${CMAKE_CURRENT_BINARY_DIR}/kjsapi_export.h
kjsinterpreter.h
kjscontext.h
kjsobject.h
diff --git a/kjs/api/kjsapi_export.h b/kjs/api/kjsapi_export.h
deleted file mode 100644
index e4fd810..0000000
--- a/kjs/api/kjsapi_export.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 2007 David Faure <faure@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KJSAPI_EXPORT_H
-#define KJSAPI_EXPORT_H
-
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-#include <kdemacros.h>
-
-#ifndef KJSAPI_EXPORT
-# if defined(KDELIBS_STATIC_LIBS)
- /* No export/import for static libraries */
-# define KJSAPI_EXPORT
-# elif defined(MAKE_KJSAPI_LIB)
- /* We are building this library */
-# define KJSAPI_EXPORT KDE_EXPORT
-# else
- /* We are using this library */
-# define KJSAPI_EXPORT KDE_IMPORT
-# endif
-

[kdelibs/KDE/4.7] khtml/css: Fix some error checking problems in font src() descriptors

Git commit 3288e0fd78b964676254db5e9df6d152fce519a9 by Maks Orlovich.
Committed on 06/02/2012 at 13:08.
Pushed by orlovich into branch 'KDE/4.7'.

Fix some error checking problems in font src() descriptors

M +4 -1 khtml/css/cssparser.cpp

http://commits.kde.org/kdelibs/3288e0fd78b964676254db5e9df6d152fce519a9

diff --git a/khtml/css/cssparser.cpp b/khtml/css/cssparser.cpp
index 7559db3..c7472ba 100644
--- a/khtml/css/cssparser.cpp
+++ b/khtml/css/cssparser.cpp
@@ -2275,8 +2275,11 @@ bool CSSParser::parseFontFaceSrc()
expectComma = true;
} else if (val->unit == Value::Function) {
// There are two allowed functions: local() and format().
+ // For both we expect a string argument
ValueList *args = val->function->args;
- if (args && args->size() == 1) {
+ if (args && args->size() == 1 &&
+ (args->current()->unit == CSSPrimitiveValue::CSS_STRING ||
+ args->current()->unit == CSSPrimitiveValue::CSS_IDENT)) {
if (!strcasecmp(domString(val->function->name), "local(") && !expectComma) {
expectComma = true;
allowFormat = false;

[kdelibs/KDE/4.7] khtml/imload: Fix sign extension causing image scaling to read from wrong locations

Git commit 6f5f6ccf12ceabc0c1fc8a780bf9a87b8b344ff5 by Maks Orlovich.
Committed on 06/02/2012 at 13:11.
Pushed by orlovich into branch 'KDE/4.7'.

Fix sign extension causing image scaling to read from wrong locations
with very high ratios.

M +12 -6 khtml/imload/scaledimageplane.h

http://commits.kde.org/kdelibs/6f5f6ccf12ceabc0c1fc8a780bf9a87b8b344ff5

diff --git a/khtml/imload/scaledimageplane.h b/khtml/imload/scaledimageplane.h
index 953c34c..35fec21 100644
--- a/khtml/imload/scaledimageplane.h
+++ b/khtml/imload/scaledimageplane.h
@@ -24,6 +24,8 @@
#ifndef SCALED_IMAGE_PLANE_H
#define SCALED_IMAGE_PLANE_H

+#include <cassert>
+
#include "array2d.h"
#include "imageplane.h"
#include "rawimageplane.h"
@@ -48,21 +50,25 @@ private:

//### I bet this has all sorts of imprecision problems w/high ratios
unsigned int* origin = new unsigned int[scaled];
-
+
//### FIXME: replace with something that clamps on right edge later?
double ratio = double(orig)/double(scaled);
- int intRatio = int(ratio*65536.0 + 1);
- int pos = 0;
-
+
+ // Should be assured by ImageManager::isAcceptableScaleSize
+ assert(ratio < 65536);
+
+ unsigned intRatio = unsigned(ratio*65536.0 + 1);
+ unsigned pos = 0;
+
for (unsigned int pix = 0; pix < scaled; pix++)
{
origin[pix] = pos >> 16;
pos += intRatio;
}
-
+
return origin;
}
-
+
unsigned int* xScaleTable;
unsigned int* yScaleTable;
public:

[kdelibs/frameworks] /: Use QUrl::scheme() instead of KUrl::protocol().

Git commit e724753615895b5248681d75a578547778de6e90 by Stephen Kelly.
Committed on 07/02/2012 at 23:42.
Pushed by skelly into branch 'frameworks'.

Use QUrl::scheme() instead of KUrl::protocol().

The former lowercases internally in Qt5, so no need
to rely on KUrl API.

M +1 -1 experimental/libkdeclarative/bindings/url.cpp
M +1 -1 kde3support/kdecore/k3urldrag.cpp
M +9 -9 kdecore/kernel/kauthorized.cpp
M +1 -1 kdecore/kernel/ktoolinvocation.cpp
M +1 -1 kdecore/services/kmimetype.cpp
M +4 -4 kdecore/sycoca/kprotocolinfo.cpp
M +1 -1 kdeui/kernel/kglobalsettings.cpp
M +1 -1 kfile/kdiroperator.cpp
M +1 -1 kfile/kdirselectdialog.cpp
M +1 -1 kfile/kfilewidget.cpp
M +1 -1 kfile/knewfilemenu.cpp
M +4 -4 kfile/kurlnavigator.cpp
M +2 -2 kfile/kurlnavigatorbutton.cpp
M +4 -4 kfile/tests/kurlnavigatortest.cpp
M +2 -2 khtml/ecma/kjs_html.cpp
M +1 -1 khtml/ecma/kjs_window.cpp
M +3 -3 khtml/ecma/xmlhttprequest.cpp
M +1 -1 khtml/html/html_objectimpl.cpp
M +3 -3 khtml/khtml_ext.cpp
M +18 -18 khtml/khtml_part.cpp
M +2 -2 khtml/misc/loader.cpp
M +1 -1 khtml/rendering/render_form.cpp
M +3 -3 khtml/xml/dom_docimpl.cpp
M +2 -2 khtml/xml/security_origin.cpp
M +1 -1 kio/kfile/kfiledialog.cpp
M +8 -8 kio/kfile/kpropertiesdialog.cpp
M +1 -1 kio/kio/accessmanagerreply_p.cpp
M +1 -1 kio/kio/authinfo.cpp
M +1 -1 kio/kio/connection.cpp
M +7 -7 kio/kio/copyjob.cpp
M +1 -1 kio/kio/deletejob.cpp
M +1 -1 kio/kio/fileundomanager.cpp
M +1 -1 kio/kio/forwardingslavebase.cpp
M +2 -2 kio/kio/global.cpp
M +6 -6 kio/kio/job.cpp
M +1 -1 kio/kio/jobuidelegate.cpp
M +2 -2 kio/kio/kdirlister.cpp
M +2 -2 kio/kio/kdirmodel.cpp
M +1 -1 kio/kio/kfileitem.cpp
M +1 -1 kio/kio/kfileitemactions.cpp
M +9 -9 kio/kio/kprotocolmanager.cpp
M +5 -5 kio/kio/krun.cpp
M +1 -1 kio/kio/kurifilter.cpp
M +8 -8 kio/kio/kurlcompletion.cpp
M +2 -2 kio/kio/netaccess.cpp
M +3 -3 kio/kio/previewjob.cpp
M +1 -1 kio/kssl/ksslcsessioncache.cpp
M +6 -6 kio/misc/ktelnetservice.cpp
M +12 -12 kioslave/http/http.cpp
M +1 -1 kioslave/http/httpauthentication.cpp
M +1 -1 kioslave/http/kcookiejar/kcookiejar.cpp
M +1 -1 knewstuff/knewstuff2/ui/itemsview.cpp
M +1 -1 knewstuff/knewstuff2/ui/kdxscomments.cpp
M +3 -3 kparts/browserrun.cpp
M +1 -1 kparts/part.cpp
M +1 -1 kutils/kcmultidialog.cpp
M +1 -1 plasma/containment.cpp
M +1 -1 plasma/remote/accessmanager.cpp
M +4 -4 plasma/runnercontext.cpp

http://commits.kde.org/kdelibs/e724753615895b5248681d75a578547778de6e90

diff --git a/experimental/libkdeclarative/bindings/url.cpp b/experimental/libkdeclarative/bindings/url.cpp
index 0d8cc21..b003cbe 100644
--- a/experimental/libkdeclarative/bindings/url.cpp
+++ b/experimental/libkdeclarative/bindings/url.cpp
@@ -50,7 +50,7 @@ static QScriptValue protocol(QScriptContext *ctx, QScriptEngine *eng)
self->setProtocol(v);
}

- return QScriptValue(eng, self->protocol());
+ return QScriptValue(eng, self->scheme());
}

static QScriptValue host(QScriptContext *ctx, QScriptEngine *eng)
diff --git a/kde3support/kdecore/k3urldrag.cpp b/kde3support/kdecore/k3urldrag.cpp
index 700f0eb..72cd06b 100644
--- a/kde3support/kdecore/k3urldrag.cpp
+++ b/kde3support/kdecore/k3urldrag.cpp
@@ -271,7 +271,7 @@ QString K3URLDrag::urlToString(const KUrl &url)