From 840c8a25ccca6121e2e204e9c77fb5041a28bdad Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 12 Aug 2015 13:11:16 +0300 Subject: [PATCH] generic: make changes required for building against katie --- appmenu/appmenu.cpp | 2 +- appmenu/appmenu_dbus.cpp | 2 +- appmenu/appmenu_dbus.h | 2 +- appmenu/glowbar.cpp | 2 +- appmenu/menubar.cpp | 2 +- appmenu/menubutton.cpp | 2 +- appmenu/menuimporter.cpp | 2 +- appmenu/menuimporter.h | 2 +- appmenu/shadows.cpp | 2 +- appmenu/verticalmenu.cpp | 4 ++-- drkonqi/detachedprocessmonitor.cpp | 2 +- drkonqi/drkonqi.cpp | 4 ++-- drkonqi/parser/backtraceparser.cpp | 2 +- .../backtraceparsertest/backtraceparsertest.cpp | 2 +- .../backtraceparsertest/backtraceparsertest.h | 2 ++ .../backtraceparsertest_manual.cpp | 2 +- kcminit/main.cpp | 2 +- kcontrol/access/kaccess.cpp | 2 +- kcontrol/access/kaccess.h | 2 +- kcontrol/access/kcmaccess.cpp | 2 +- kcontrol/autostart/autostartitem.cpp | 2 +- kcontrol/autostart/autostartitem.h | 2 +- kcontrol/colors/previewwidget.cpp | 2 +- .../componentchooser/componentchooseremail.cpp | 4 ++-- kcontrol/dateandtime/dtime.cpp | 4 ++-- kcontrol/dateandtime/dtime.h | 2 +- kcontrol/emoticons/emoticonslist.cpp | 2 +- kcontrol/fonts/kxftconfig.cpp | 2 +- kcontrol/fonts/kxftconfig.h | 1 + kcontrol/input/kapplymousetheme.cpp | 2 +- kcontrol/input/main.cpp | 2 +- kcontrol/input/mouse.cpp | 2 +- kcontrol/input/xcursor/cursortheme.cpp | 2 +- kcontrol/input/xcursor/itemdelegate.cpp | 2 +- kcontrol/input/xcursor/previewwidget.cpp | 2 +- kcontrol/input/xcursor/thememodel.h | 2 +- kcontrol/input/xcursor/themepage.cpp | 2 +- kcontrol/input/xcursor/themepage.h | 2 +- kcontrol/input/xcursor/xcursortheme.cpp | 2 +- kcontrol/keyboard/iso_codes.cpp | 2 +- kcontrol/keyboard/kcm_keyboard_widget.cpp | 2 +- kcontrol/keyboard/kcm_view_models.h | 2 +- kcontrol/keyboard/kcmmisc.cpp | 2 +- kcontrol/keyboard/keyboard_applet.cpp | 2 +- kcontrol/keyboard/keyboard_daemon.cpp | 2 +- kcontrol/keyboard/keyboard_hardware.cpp | 2 +- kcontrol/keyboard/layout_memory.cpp | 2 +- kcontrol/keyboard/layout_memory.h | 2 +- kcontrol/keyboard/preview/keyaliases.cpp | 2 +- kcontrol/keyboard/preview/keyboardlayout.cpp | 2 +- kcontrol/keyboard/x11_helper.cpp | 2 +- kcontrol/keyboard/xinput_helper.cpp | 2 +- kcontrol/keyboard/xkb_helper.cpp | 4 ++-- kcontrol/keyboard/xkb_rules.cpp | 4 ++-- kcontrol/keyboard/xkb_rules.h | 2 +- kcontrol/kfontinst/CMakeLists.txt | 12 ------------ kcontrol/kfontinst/apps/CreateParent.h | 4 ++-- kcontrol/kfontinst/apps/Printer.cpp | 2 +- kcontrol/kfontinst/dbus/FcConfig.cpp | 8 ++++---- kcontrol/kfontinst/dbus/Folder.cpp | 6 +++--- kcontrol/kfontinst/dbus/FontInst.cpp | 7 +++++-- kcontrol/kfontinst/dbus/Helper.cpp | 5 +++-- .../kfontinst/kcmfontinst/DuplicatesDialog.cpp | 4 ++-- kcontrol/kfontinst/kcmfontinst/FontFilter.cpp | 2 +- kcontrol/kfontinst/kcmfontinst/FontList.cpp | 2 +- kcontrol/kfontinst/kcmfontinst/FontList.h | 2 +- kcontrol/kfontinst/kcmfontinst/GroupList.cpp | 6 +++--- kcontrol/kfontinst/kcmfontinst/GroupList.h | 2 +- kcontrol/kfontinst/kcmfontinst/JobRunner.cpp | 5 +++-- kcontrol/kfontinst/kcmfontinst/PreviewList.cpp | 5 +++-- kcontrol/kfontinst/kio/FontInstInterface.cpp | 1 + kcontrol/kfontinst/lib/Family.cpp | 2 +- kcontrol/kfontinst/lib/FcEngine.cpp | 2 +- kcontrol/kfontinst/lib/File.cpp | 2 +- kcontrol/kfontinst/lib/KfiConstants.h | 2 +- kcontrol/kfontinst/lib/Style.cpp | 2 +- kcontrol/kfontinst/viewpart/CharTip.cpp | 2 +- kcontrol/kfontinst/viewpart/FontPreview.cpp | 6 +++--- kcontrol/kfontinst/viewpart/FontPreview.h | 2 +- kcontrol/krdb/krdb.cpp | 2 +- kcontrol/locale/countryselectordialog.cpp | 2 +- kcontrol/locale/kcmlocale.cpp | 2 +- kcontrol/randr/krandrpassivepopup.cpp | 2 +- kcontrol/randr/krandrtray.cpp | 2 +- kcontrol/randr/krandrtray.h | 4 ++-- kcontrol/randr/legacyrandrscreen.cpp | 2 +- kcontrol/randr/outputgraphicsitem.h | 4 ++-- kcontrol/randr/randrcrtc.h | 2 +- kcontrol/randr/randrdisplay.cpp | 2 +- kcontrol/randr/randroutput.cpp | 2 +- kcontrol/randr/randrscreen.h | 2 +- kcontrol/screensaver/kswidget.cpp | 2 +- kcontrol/screensaver/scrnsave.cpp | 10 +++++----- kcontrol/screensaver/scrnsave.h | 6 +++--- kcontrol/smartcard/smartcard.h | 2 +- kcontrol/splash/installer.cpp | 6 +++--- kcontrol/splash/installer.h | 6 +++--- kcontrol/style/kcmstyle.cpp | 3 ++- .../touchpad/src/kcm/customconfigdialogmanager.h | 2 +- kcontrol/touchpad/src/kcm/customslider.cpp | 2 +- kcontrol/touchpad/src/kcm/testarea.cpp | 4 ++-- kcontrol/touchpad/src/kcm/testbutton.cpp | 2 +- kcontrol/touchpad/src/kcm/touchpadparametersbase.h | 2 +- kcontrol/touchpad/src/kded/kded.h | 2 +- kcontrol/touchpad/src/touchpadbackend.h | 2 +- kcontrol/touchpad/src/x11/xlibbackend.cpp | 2 +- kcontrol/touchpad/src/x11/xlibbackend.h | 4 ++-- kcontrol/touchpad/src/x11/xlibnotifications.h | 2 +- kcontrol/touchpad/src/x11/xrecordkeyboardmonitor.h | 2 +- kdm/kcm/kdm-theme.cpp | 2 +- kdm/kcm/kdm-users.cpp | 4 ++-- kdm/kcm/main.cpp | 2 +- kdm/kcm/positioner.cpp | 2 +- kdm/kfrontend/kchooser.cpp | 2 +- kdm/kfrontend/kdmclock.cpp | 2 +- kdm/kfrontend/kdmshutdown.cpp | 2 +- kdm/kfrontend/kfdialog.cpp | 4 ++-- kdm/kfrontend/kgapp.cpp | 2 +- kdm/kfrontend/kgreeter.cpp | 4 ++-- kdm/kfrontend/kgverify.cpp | 4 ++-- kdm/kfrontend/themer/kdmitem.h | 2 +- kdm/kfrontend/themer/kdmlabel.cpp | 2 +- kdm/kfrontend/themer/kdmthemer.cpp | 4 ++-- kdm/kfrontend/themer/parse.cpp | 2 +- kdontchangethehostname/khostname.cpp | 2 +- keditfiletype/mimetypewriter.cpp | 2 +- keditfiletype/typeslistitem.h | 2 +- kglobalaccel/component.cpp | 2 +- kglobalaccel/globalshortcutsregistry.cpp | 2 +- kglobalaccel/globalshortcutsregistry.h | 2 +- kglobalaccel/kglobalaccel_qws.cpp | 2 +- kglobalaccel/kglobalaccel_x11.cpp | 4 ++-- kglobalaccel/kglobalacceld.cpp | 4 ++-- .../kcm_hotkeys/helper_widgets/gesture_drawer.cpp | 4 ++-- .../helper_widgets/gesture_recorder.cpp | 2 +- .../kcm_hotkeys/helper_widgets/window_selector.cpp | 2 +- khotkeys/kcm_hotkeys/hotkeys_context_menu.cpp | 2 +- khotkeys/kcm_hotkeys/hotkeys_context_menu.h | 2 +- khotkeys/kcm_hotkeys/hotkeys_tree_view.cpp | 2 +- khotkeys/kcm_hotkeys/kcm_hotkeys.h | 2 +- .../actions/keyboard_input_action.cpp | 2 +- khotkeys/libkhotkeysprivate/shortcuts_handler.cpp | 2 +- khotkeys/libkhotkeysprivate/sound.h | 2 +- khotkeys/libkhotkeysprivate/triggers/gestures.cpp | 2 +- khotkeys/libkhotkeysprivate/voicesignature.cpp | 2 +- khotkeys/libkhotkeysprivate/windows_handler.cpp | 2 +- kinfocenter/CMakeLists.txt | 1 + kinfocenter/Modules/base/os_base.h | 2 +- kinfocenter/Modules/devinfo/devicelisting.h | 2 +- kinfocenter/Modules/devinfo/soldevice.h | 2 +- kinfocenter/Modules/memory/chartWidget.cpp | 2 +- kinfocenter/Modules/memory/memory.cpp | 2 +- kinfocenter/Modules/pci/kpci.cpp | 2 +- kinfocenter/Modules/view1394/view1394.cpp | 2 +- kinfocenter/ToolTips/ktooltipwindow.cpp | 2 +- kinfocenter/ToolTips/tooltipmanager.cpp | 4 ++-- kinfocenter/ToolTips/tooltipmanager.h | 2 +- kinfocenter/infokcmmodel.h | 2 +- kinfocenter/infokcmproxymodel.h | 2 +- kinfocenter/sidepanel.h | 4 ++-- kioexec/main.cpp | 2 +- kioslave/desktop/desktopnotifier.cpp | 2 ++ .../network/builder/dnssd/dnssdnetsystemable.h | 2 +- .../network/builder/dnssd/dnssdnetworkbuilder.cpp | 2 +- .../network/network/builder/upnp/cagibidevice.h | 2 +- .../network/builder/upnp/upnpnetsystemable.h | 2 +- .../network/builder/upnp/upnpnetworkbuilder.cpp | 2 +- kioslave/network/network/netdevice_p.cpp | 2 +- .../recentdocuments/recentdocumentsnotifier.cpp | 2 ++ kioslave/trash/kcmtrash.cpp | 2 +- klipper/klipper.h | 2 +- klipper/klipperpopup.cpp | 2 +- klipper/urlgrabber.cpp | 2 +- kmenuedit/klinespellchecking.cpp | 2 +- kmenuedit/treeview.cpp | 2 +- knotify/notifybypopup.cpp | 2 +- knotify/notifybypopup.h | 2 +- knotify/notifybysound.cpp | 2 +- krunner/interfaces/default/interface.cpp | 2 +- krunner/interfaces/default/interface.h | 2 +- .../interfaces/default/krunnerhistorycombobox.h | 4 ++-- krunner/interfaces/default/resultitem.cpp | 4 ++-- krunner/interfaces/default/resultscene.cpp | 4 ++-- krunner/interfaces/default/resultscene.h | 2 +- krunner/interfaces/default/resultview.cpp | 2 +- krunner/interfaces/default/selectionbar.cpp | 2 +- krunner/interfaces/quicksand/qs_completionbox.cpp | 4 ++-- krunner/interfaces/quicksand/qs_matchview.cpp | 8 ++++---- krunner/interfaces/quicksand/qs_statusbar.cpp | 2 +- krunner/krunnerdialog.cpp | 6 +++--- krunner/ksystemactivitydialog.cpp | 2 +- krunner/startupid.cpp | 2 +- kscreensaver/kdesavers/asciiquarium/aasaver.cpp | 2 +- kscreensaver/kdesavers/pendulum.cpp | 2 +- kscreensaver/kdesavers/rotation.cpp | 2 +- kscreensaver/kdesavers/science.cpp | 2 +- kscreensaver/krandom_screensaver/random.cpp | 2 +- kscreensaver/libkscreensaver/kscreensaver.cpp | 2 +- kscreensaver/libkscreensaver/main.cpp | 4 ++-- ksmserver/fadeeffect.cpp | 2 +- ksmserver/fadeeffect.h | 2 +- ksmserver/logouteffect.cpp | 2 +- ksmserver/main.cpp | 3 ++- ksmserver/screenlocker/greeter/greeterapp.cpp | 2 +- .../screenlocker/greeter/screensaverwindow.cpp | 6 +++--- ksmserver/screenlocker/ksldapp.cpp | 2 +- ksmserver/screenlocker/lockwindow.cpp | 2 +- ksmserver/server.cpp | 3 ++- ksmserver/server.h | 2 +- ksmserver/shutdown.cpp | 2 +- ksmserver/startup.cpp | 2 +- ksplash/ksplashqml/SplashWindow.cpp | 6 +++--- kstart/kstart.cpp | 2 +- kstart/kstart.h | 2 +- kstyles/oxygen/debug/oxygenwidgetexplorer.cpp | 2 +- kstyles/oxygen/demo/oxygenbenchmarkwidget.h | 2 +- kstyles/oxygen/demo/oxygensimulator.cpp | 10 +++++----- kstyles/oxygen/demo/oxygensimulator.h | 4 ++-- kstyles/oxygen/demo/oxygensliderdemowidget.cpp | 2 +- kstyles/oxygen/oxygenblurhelper.cpp | 2 +- kstyles/oxygen/oxygenblurhelper.h | 2 +- kstyles/oxygen/oxygenframeshadow.cpp | 2 +- kstyles/oxygen/oxygenframeshadow.h | 2 +- kstyles/oxygen/oxygenmdiwindowshadow.h | 2 +- kstyles/oxygen/oxygenmnemonics.cpp | 2 +- kstyles/oxygen/oxygenshadowhelper.cpp | 2 +- kstyles/oxygen/oxygensplitterproxy.h | 8 ++++---- kstyles/oxygen/oxygenstyle.cpp | 2 +- kstyles/oxygen/oxygenstyle.h | 2 +- kstyles/oxygen/oxygenstylehelper.cpp | 2 +- kstyles/oxygen/oxygenstylehelper.h | 2 +- kstyles/oxygen/oxygenwindowmanager.cpp | 6 +++--- kstyles/oxygen/oxygenwindowmanager.h | 2 +- ksysguard/gui/SensorBrowser.cpp | 2 +- ksysguard/gui/SensorBrowser.h | 2 +- ksysguard/gui/SensorDisplayLib/BarGraph.h | 2 +- ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp | 2 +- ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp | 2 +- .../gui/SensorDisplayLib/FancyPlotterSettings.cpp | 2 +- ksysguard/gui/SensorDisplayLib/ListView.cpp | 4 ++-- ksysguard/gui/SensorDisplayLib/LogFile.h | 2 +- .../gui/SensorDisplayLib/ProcessController.cpp | 2 +- ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp | 2 +- ksysguard/gui/SensorDisplayLib/SensorLogger.cpp | 12 ++++++------ ksysguard/gui/SensorDisplayLib/SensorModel.h | 2 +- ksysguard/gui/WorkSheet.cpp | 4 ++-- ksysguard/gui/tests/ksysguarddtest.cpp | 2 +- ksysguard/gui/tests/ksysguarddtest.h | 2 +- ksystraycmd/ksystraycmd.cpp | 4 ++-- ksystraycmd/main.cpp | 2 +- kuiserver/jobview.h | 2 +- kuiserver/progresslistdelegate.h | 2 +- kuiserver/requestviewcallwatcher.cpp | 2 +- kuiserver/requestviewcallwatcher.h | 2 +- kuiserver/uiserver.cpp | 2 +- kurifilter-plugins/ikws/ikwsopts_p.h | 2 +- kwalletd/autotests/qtest_kwallet.h | 3 ++- kwalletd/autotests/testpamopen.cpp | 1 + kwalletd/autotests/testpamopennofile.cpp | 3 +++ kwalletmanager/src/konfigurator/konfigurator.cpp | 1 + kwalletmanager/src/manager/allyourbase.cpp | 6 +++--- kwalletmanager/src/manager/allyourbase.h | 6 +++--- kwalletmanager/src/manager/kwalleteditor.cpp | 8 ++++---- kwalletmanager/src/manager/kwalletmanager.cpp | 2 +- .../src/manager/kwalletmanagerwidget.cpp | 2 +- kwalletmanager/src/manager/kwmapeditor.cpp | 4 ++-- kwin/activation.cpp | 2 +- kwin/clients/oxygen/config/oxygendetectwidget.cpp | 4 ++-- kwin/clients/oxygen/demo/oxygenshadowdemowidget.h | 2 +- kwin/clients/oxygen/oxygenclient.cpp | 4 ++-- kwin/clients/oxygen/oxygenclient.h | 2 +- kwin/clients/oxygen/oxygenclientgroupitemdata.h | 2 +- kwin/clients/oxygen/oxygensizegrip.cpp | 2 +- kwin/clients/oxygen/oxygensizegrip.h | 4 ++-- kwin/composite.cpp | 2 +- kwin/effects.cpp | 2 +- kwin/effects/desktopgrid/desktopgrid.cpp | 4 ++-- kwin/effects/presentwindows/presentwindows.cpp | 4 ++-- kwin/effects/sheet/sheet.cpp | 2 +- kwin/effects/showfps/showfps.h | 2 +- kwin/effects/trackmouse/trackmouse.cpp | 2 +- kwin/effects/zoom/zoom.h | 2 +- kwin/events.cpp | 2 +- kwin/geometry.cpp | 2 +- kwin/geometrytip.cpp | 2 +- kwin/group.cpp | 2 +- kwin/kcmkwin/kwindecoration/decorationmodel.h | 2 +- kwin/kcmkwin/kwindecoration/kwindecoration.cpp | 2 +- kwin/kcmkwin/kwindecoration/preview.cpp | 2 +- kwin/kcmkwin/kwindesktop/main.cpp | 2 +- kwin/kcmkwin/kwinrules/detectwidget.cpp | 4 ++-- kwin/kcmkwin/kwintabbox/layoutpreview.cpp | 2 +- kwin/kcmkwin/kwintabbox/layoutpreview.h | 2 +- kwin/kcmkwin/kwintabbox/main.cpp | 1 + kwin/killer/killer.cpp | 2 +- kwin/layers.cpp | 2 +- kwin/libkdecorations/kdecoration.cpp | 2 +- kwin/libkdecorations/kdecoration.h | 2 +- kwin/libkwineffects/kwinanimationeffect.cpp | 2 +- kwin/libkwineffects/kwineffects.cpp | 4 ++-- kwin/libkwineffects/kwinglcolorcorrection.cpp | 2 +- kwin/libkwineffects/kwinglobals.h | 2 +- kwin/libkwineffects/kwingltexture.h | 2 +- kwin/main.cpp | 2 +- kwin/manage.cpp | 2 +- kwin/scene_opengl.cpp | 2 +- kwin/tabbox/clientmodel.h | 2 +- kwin/tabbox/declarative.cpp | 6 +++--- kwin/tabbox/desktopmodel.h | 2 +- kwin/tabbox/tabbox.cpp | 2 +- kwin/tabbox/tabbox.h | 2 +- kwin/tabbox/tabboxhandler.cpp | 6 +++--- kwin/tabbox/tabboxhandler.h | 2 +- kwin/tests/test_window_paint_data.cpp | 4 ++-- kwin/thumbnailitem.h | 2 +- kwin/useractions.h | 2 +- kwin/utils.cpp | 2 +- kwin/workspace.cpp | 1 + libs/kdm/kgreet_winbind.cpp | 2 +- libs/kephal/service/xml/xmlnodehandler.h | 2 +- libs/kephal/service/xml/xmltype.h | 2 +- libs/kephal/service/xrandr12/randrcrtc.cpp | 2 +- libs/kephal/service/xrandr12/randrdisplay.cpp | 2 +- libs/kephal/service/xrandr12/randroutput.cpp | 2 +- libs/kephal/service/xrandr12/randrscreen.cpp | 2 +- libs/kephal/service/xrandroutputs.cpp | 4 ++-- libs/ksysguard/lsofui/CMakeLists.txt | 3 +-- libs/ksysguard/processcore/process.h | 4 ++-- libs/ksysguard/processcore/processes.cpp | 2 +- libs/ksysguard/processcore/processes_atop_p.cpp | 2 +- libs/ksysguard/processui/ProcessModel_p.h | 4 ++-- libs/ksysguard/processui/ksysguardprocesslist.cpp | 4 ++-- libs/ksysguard/signalplotter/ksignalplotter.cpp | 6 +++--- libs/ksysguard/signalplotter/ksignalplotter_p.h | 2 +- .../tests/graphicssignalplotterbenchmark.h | 2 +- libs/ksysguard/tests/signalplotterbenchmark.h | 2 +- libs/ksysguard/tests/signalplottertest.cpp | 1 + libs/ksysguard/tests/signalplottertest.h | 2 +- libs/kworkspace/kwindowlistmenu.cpp | 2 +- libs/kworkspace/screenpreviewwidget.cpp | 4 ++-- libs/oxygen/oxygenhelper.cpp | 2 +- libs/oxygen/oxygenhelper.h | 2 +- libs/oxygen/oxygenshadowcache.h | 2 +- libs/plasmaclock/calendar.cpp | 4 ++-- libs/plasmaclock/calendartable.cpp | 8 ++++---- libs/plasmaclock/clockapplet.cpp | 6 +++--- libs/plasmaclock/clockapplet.h | 4 ++-- libs/plasmaclock/wheelytoolbutton.cpp | 2 +- libs/plasmagenericshell/mouseinputbutton.cpp | 2 +- libs/plasmagenericshell/panelshadows.cpp | 2 +- libs/plasmagenericshell/scripting/appinterface.h | 2 +- libs/plasmagenericshell/scripting/applet.h | 2 +- libs/plasmagenericshell/scripting/containment.h | 2 +- libs/plasmagenericshell/scripting/rect.cpp | 2 +- libs/plasmagenericshell/scripting/widget.h | 2 +- libs/plasmagenericshell/toolbutton.cpp | 6 +++--- libs/plasmagenericshell/toolbutton.h | 2 +- libs/plasmagenericshell/wallpaperpreview.cpp | 2 +- libs/taskmanager/abstractgroupableitem.cpp | 2 +- libs/taskmanager/abstractsortingstrategy.cpp | 2 +- libs/taskmanager/launcherproperties.cpp | 4 ++-- .../strategies/alphasortingstrategy.cpp | 2 +- .../strategies/desktopsortingstrategy.cpp | 2 +- .../strategies/manualgroupingstrategy.cpp | 2 +- .../strategies/programgroupingstrategy.cpp | 2 +- libs/taskmanager/task_p.h | 2 +- libs/taskmanager/task_x11.cpp | 2 +- libs/taskmanager/taskactions.cpp | 4 ++-- libs/taskmanager/taskmanager.cpp | 2 +- libs/taskmanager/tasksmodel.cpp | 2 +- phonon/CMakeLists.txt | 10 +++------- phonon/kcm/backendselection.cpp | 2 +- phonon/kcm/devicepreference.h | 2 +- phonon/kded-module/phononserver.cpp | 2 +- phonon/kded-module/phononserver.h | 2 +- phonon/platform_kde/devicelisting.cpp | 4 ++-- phonon/platform_kde/kdeplatformplugin.cpp | 2 +- .../applets/folderview/abstractitemview.cpp | 2 +- .../desktop/applets/folderview/abstractitemview.h | 2 +- plasma/desktop/applets/folderview/actionoverlay.h | 2 +- plasma/desktop/applets/folderview/animator.h | 2 +- .../desktop/applets/folderview/asyncfiletester.h | 4 ++-- plasma/desktop/applets/folderview/dialog.cpp | 2 +- .../desktop/applets/folderview/dialogshadows.cpp | 2 +- plasma/desktop/applets/folderview/folderview.cpp | 2 +- plasma/desktop/applets/folderview/iconview.cpp | 6 +++--- plasma/desktop/applets/folderview/iconview.h | 2 +- plasma/desktop/applets/folderview/iconwidget.cpp | 2 +- plasma/desktop/applets/folderview/itemeditor.h | 2 +- plasma/desktop/applets/folderview/listview.cpp | 6 +++--- plasma/desktop/applets/folderview/popupview.h | 2 +- .../applets/folderview/previewpluginsmodel.h | 2 +- .../desktop/applets/folderview/tooltipwidget.cpp | 4 ++-- plasma/desktop/applets/folderview/tooltipwidget.h | 2 +- .../applets/homerun/components/actionmanager.h | 2 +- .../desktop/applets/homerun/components/image.cpp | 2 +- .../applets/homerun/components/sourcemodel.h | 2 +- .../sources/favorites/favoriteappsmodel.cpp | 2 +- .../sources/favorites/favoriteappsmodel.h | 2 +- .../sources/favorites/kfileplacesitem_p.h | 2 +- .../sources/installedapps/changenotifier.cpp | 2 +- .../installedapps/groupedinstalledappsmodel.h | 2 +- .../installedappsconfigurationwidget.cpp | 2 +- .../sources/installedapps/installedappsmodel.h | 2 +- .../sources/power/combinedpowersessionmodel.h | 2 +- .../sources/recentapps/recentappsmodel.h | 2 +- .../components/sources/runners/querymatchmodel.h | 2 +- .../sources/runners/runnerconfigurationwidget.cpp | 2 +- .../components/sources/runners/runnermodel.h | 2 +- .../desktop/applets/homerun/components/tabmodel.h | 2 +- .../homerun/fixes/declarativeitemcontainer_p.h | 4 ++-- plasma/desktop/applets/homerun/fixes/dialog.cpp | 2 +- plasma/desktop/applets/homerun/fixes/dialog.h | 2 +- .../applets/homerun/fullscreen/viewer/fullview.cpp | 3 ++- .../homerun/kicker/components/fadeouteffect.cpp | 2 +- .../homerun/kicker/components/fadeoutitem.cpp | 2 +- .../homerun/kicker/components/sourcelistmodel.h | 2 +- .../homerun/tests/auto/favoriteappsmodeltest.cpp | 4 ++-- .../applets/kickoff/core/applicationmodel.cpp | 2 +- .../desktop/applets/kickoff/core/krunnermodel.cpp | 2 +- plasma/desktop/applets/kickoff/core/models.cpp | 2 +- .../applets/kickoff/core/urlitemlauncher.cpp | 2 +- .../applets/kickoff/simpleapplet/menuview.cpp | 8 ++++---- .../applets/kickoff/simpleapplet/menuview.h | 2 +- .../applets/kickoff/simpleapplet/simpleapplet.cpp | 6 +++--- .../applets/kickoff/ui/contextmenufactory.h | 2 +- .../desktop/applets/kickoff/ui/flipscrollview.cpp | 4 ++-- plasma/desktop/applets/kickoff/ui/itemdelegate.cpp | 4 ++-- plasma/desktop/applets/kickoff/ui/launcher.cpp | 4 ++-- plasma/desktop/applets/kickoff/ui/launcher.h | 2 +- plasma/desktop/applets/kickoff/ui/searchbar.cpp | 2 +- plasma/desktop/applets/kickoff/ui/tabbar.cpp | 2 +- plasma/desktop/applets/kickoff/ui/tabbar.h | 2 +- plasma/desktop/applets/kickoff/ui/urlitemview.cpp | 6 +++--- plasma/desktop/applets/pager/model.h | 6 +++--- plasma/desktop/applets/pager/pager.cpp | 2 +- plasma/desktop/applets/pager/pager.h | 2 +- .../tasks/support/declarativeitemcontainer_p.h | 4 ++-- plasma/desktop/applets/tasks/support/tooltip.cpp | 2 +- plasma/desktop/applets/tasks/support/tooltip.h | 2 +- plasma/desktop/applets/tasks/tasks.cpp | 1 + plasma/desktop/applets/trash/trash.cpp | 2 +- plasma/desktop/applets/trash/trash.h | 5 +++-- plasma/desktop/applets/windowlist/WindowList.h | 4 ++-- plasma/desktop/containments/desktop/desktop.h | 2 +- plasma/desktop/containments/desktop/itemspace.h | 2 +- plasma/desktop/containments/panel/panel.cpp | 2 +- plasma/desktop/shell/checkbox.h | 2 +- plasma/desktop/shell/dashboardview.cpp | 2 +- plasma/desktop/shell/dashboardview.h | 2 +- plasma/desktop/shell/desktopview.cpp | 2 +- plasma/desktop/shell/interactiveconsole.h | 2 +- plasma/desktop/shell/main.cpp | 2 +- plasma/desktop/shell/panelappletoverlay.cpp | 2 +- plasma/desktop/shell/panelcontroller.cpp | 4 ++-- plasma/desktop/shell/panelview.cpp | 2 +- plasma/desktop/shell/plasmaapp.cpp | 1 + plasma/desktop/shell/plasmaapp.h | 2 +- plasma/desktop/shell/positioningruler.cpp | 2 +- plasma/desktop/shell/scripting/panel.h | 2 +- plasma/desktop/toolboxes/desktoptoolbox.cpp | 4 ++-- plasma/desktop/toolboxes/desktoptoolbox.h | 2 +- plasma/desktop/toolboxes/internaltoolbox.cpp | 4 ++-- plasma/desktop/toolboxes/paneltoolbox.cpp | 6 +++--- plasma/desktop/toolboxes/paneltoolbox.h | 2 +- plasma/generic/applets/analog-clock/clock.cpp | 2 +- plasma/generic/applets/analog-clock/clock.h | 2 +- plasma/generic/applets/digital-clock/clock.cpp | 6 +++--- plasma/generic/applets/digital-clock/clock.h | 4 ++-- plasma/generic/applets/icon/icon.cpp | 4 ++-- .../generic/applets/quicklaunch/icongridlayout.cpp | 6 +++--- .../generic/applets/quicklaunch/icongridlayout.h | 4 ++-- plasma/generic/applets/quicklaunch/launcher.cpp | 6 +++--- plasma/generic/applets/quicklaunch/launcher.h | 2 +- .../generic/applets/quicklaunch/launcherdata.cpp | 4 ++-- plasma/generic/applets/quicklaunch/launcherdata.h | 2 +- .../generic/applets/quicklaunch/launchergrid.cpp | 14 +++++++------- plasma/generic/applets/quicklaunch/launchergrid.h | 4 ++-- plasma/generic/applets/quicklaunch/popup.cpp | 2 +- plasma/generic/applets/quicklaunch/popup.h | 2 +- .../applets/quicklaunch/popuplauncherlist.cpp | 14 +++++++------- .../applets/quicklaunch/popuplauncherlist.h | 4 ++-- plasma/generic/applets/quicklaunch/quicklaunch.cpp | 4 ++-- plasma/generic/applets/quicklaunch/quicklaunch.h | 6 +++--- plasma/generic/applets/systemtray/CMakeLists.txt | 2 -- .../dbussystemtray/dbussystemtraytask.cpp | 2 +- .../systemtray/protocols/fdo/fdographicswidget.cpp | 2 +- .../systemtray/protocols/fdo/fdographicswidget.h | 2 +- .../protocols/fdo/fdoselectionmanager.cpp | 2 +- .../systemtray/protocols/fdo/x11embedcontainer.cpp | 2 +- .../systemtray/protocols/fdo/x11embedcontainer.h | 2 +- .../systemtray/protocols/fdo/x11embedpainter.cpp | 2 +- .../applets/systemtray/ui/mouseredirectarea.cpp | 8 ++++---- .../generic/applets/systemtray/ui/widgetitem.cpp | 2 +- plasma/generic/applets/webbrowser/bookmarkitem.h | 4 ++-- .../applets/webbrowser/bookmarksdelegate.cpp | 6 +++--- plasma/generic/applets/webbrowser/webbrowser.cpp | 2 +- .../generic/applets/webbrowser/webviewoverlay.cpp | 2 +- .../containmentactions/applauncher/launch.cpp | 4 ++-- .../containmentactions/contextmenu/menu.cpp | 4 ++-- .../containmentactions/minimalcontextmenu/menu.cpp | 4 ++-- plasma/generic/containmentactions/paste/paste.cpp | 4 ++-- .../containmentactions/switchdesktop/desktop.cpp | 4 ++-- .../containmentactions/switchwindow/switch.cpp | 4 ++-- .../containments/newspaper/appletmovespacer.cpp | 2 +- .../containments/newspaper/appletoverlay.cpp | 2 +- .../containments/newspaper/appletscontainer.cpp | 2 +- .../generic/containments/newspaper/appletsview.cpp | 2 +- .../containments/newspaper/applettitlebar.cpp | 4 ++-- .../containments/newspaper/applettitlebar.h | 2 +- .../containments/newspaper/dragcountdown.cpp | 2 +- .../generic/containments/newspaper/newspaper.cpp | 2 +- .../applicationjobs/kuiserverengine.cpp | 1 + .../dataengines/applicationjobs/kuiserverengine.h | 2 +- .../mouse/cursornotificationhandler.cpp | 2 +- plasma/generic/dataengines/mpris2/mpris2engine.cpp | 2 +- plasma/generic/dataengines/mpris2/mpris2engine.h | 2 +- .../dataengines/mpris2/multiplexedservice.h | 2 +- plasma/generic/dataengines/mpris2/multiplexer.h | 2 +- .../generic/dataengines/mpris2/playeractionjob.cpp | 4 ++-- .../generic/dataengines/mpris2/playercontainer.h | 2 +- plasma/generic/dataengines/mpris2/playercontrol.h | 2 +- .../notifications/notificationsengine.cpp | 1 + .../nowplaying/playerinterface/mpris/mpris_p.h | 2 +- .../nowplaying/playerinterface/mpris2/mpris2_p.h | 4 ++-- .../nowplaying/playerinterface/playerfactory.h | 2 +- .../powermanagement/powermanagementengine.cpp | 2 +- plasma/generic/dataengines/share/shareprovider.cpp | 2 +- plasma/generic/dataengines/soliddevice/hddtemp.cpp | 2 +- .../dataengines/soliddevice/soliddeviceengine.cpp | 2 +- .../statusnotifieritem_engine.cpp | 1 + .../statusnotifieritemsource.cpp | 4 ++-- .../statusnotifieritem/statusnotifieritemsource.h | 2 +- plasma/generic/dataengines/time/solarsystem.h | 2 +- plasma/generic/dataengines/time/timeengine.cpp | 4 ++-- .../ions/debianweather/iondebianweather.cpp | 2 +- .../core/declarativeitemcontainer_p.h | 4 ++-- plasma/generic/declarativeimports/core/dialog.cpp | 2 +- plasma/generic/declarativeimports/core/dialog.h | 2 +- .../generic/declarativeimports/core/iconitem.cpp | 2 +- .../generic/declarativeimports/core/runnermodel.h | 2 +- plasma/generic/declarativeimports/core/tooltip.cpp | 2 +- plasma/generic/declarativeimports/core/tooltip.h | 2 +- .../declarativeimports/dirmodel/dirmodel.cpp | 2 +- .../draganddrop/DeclarativeDragArea.cpp | 2 +- .../draganddrop/DeclarativeDragDropEvent.h | 2 +- .../draganddrop/DeclarativeDropArea.cpp | 2 +- .../graphicslayouts/gridlayout.h | 2 +- .../graphicslayouts/linearlayout.h | 2 +- .../graphicswidgets/declarativetabbar.h | 2 +- .../declarativeimports/locale/calendarsystem.h | 2 +- .../generic/declarativeimports/locale/locale_p.h | 4 ++-- .../plasmacomponents/fullscreenwindow.cpp | 2 +- .../plasmacomponents/fullscreenwindow.h | 4 ++-- .../declarativeimports/plasmacomponents/qmenu.cpp | 3 ++- .../declarativeimports/plasmacomponents/qmenu.h | 2 +- .../appbackgroundprovider.cpp | 2 +- .../qtextracomponents/columnproxymodel.h | 2 +- .../qtextracomponents/mouseeventlistener.cpp | 2 +- plasma/generic/kpart/scripting/rect.cpp | 2 +- plasma/generic/kpart/scripting/widget.h | 2 +- plasma/generic/runners/bookmarks/browsers/chrome.h | 2 +- .../bookmarks/browsers/chromefindprofile.cpp | 2 +- plasma/generic/runners/bookmarks/fetchsqlite.h | 2 +- .../generic/runners/calculator/qalculate_engine.h | 2 +- plasma/generic/runners/windows/windowsrunner.cpp | 2 +- .../scriptengines/javascript/common/scriptenv.cpp | 2 +- .../javascript/dataengine/javascriptservice.h | 2 +- .../declarative/declarativeitemcontainer_p.h | 4 ++-- .../javascript/declarative/toolboxproxy.h | 2 +- .../javascript/plasmoid/simplejavascriptapplet.cpp | 8 ++++---- .../javascript/simplebindings/easingcurve.cpp | 2 +- .../javascript/simplebindings/painter.cpp | 2 +- .../javascript/simplebindings/rect.cpp | 2 +- .../javascript/simplebindings/size.cpp | 2 +- plasma/generic/scriptengines/webkit/bundle.cpp | 2 +- .../generic/scriptengines/webkit/dashboardjs.cpp | 2 +- .../wallpapers/color/backgrounddelegate.cpp | 2 +- .../generic/wallpapers/color/backgroundlistmodel.h | 2 +- plasma/generic/wallpapers/color/color.cpp | 4 ++-- .../wallpapers/image/backgrounddelegate.cpp | 2 +- .../generic/wallpapers/image/backgroundlistmodel.h | 2 +- plasma/generic/wallpapers/image/removebutton.cpp | 2 +- .../wallpapers/image/removebuttonmanager.cpp | 4 ++-- plasma/generic/wallpapers/image/slideshowconfig.ui | 2 +- plasma/screensaver/shell/savercorona.cpp | 2 +- plasma/screensaver/shell/saverview.cpp | 2 +- plasma/screensaver/shell/saverview.h | 2 +- .../daemon/actions/dpms/powerdevildpmsaction.cpp | 2 +- .../daemon/backends/upower/login1suspendjob.h | 2 +- .../backends/upower/powerdevilupowerbackend.cpp | 3 +++ .../backends/upower/powerdevilupowerbackend.h | 1 + .../daemon/backends/upower/xrandrbrightness.h | 2 +- .../daemon/backends/upower/xrandrx11helper.cpp | 2 +- powerdevil/daemon/kdedpowerdevil.h | 2 +- powerdevil/daemon/powerdevilaction.h | 2 +- powerdevil/daemon/powerdevilcore.h | 2 +- powerdevil/daemon/powerdevilpolicyagent.cpp | 2 +- powerdevil/daemon/powerdevilpolicyagent.h | 2 +- solid-actions-kcm/ActionModel.h | 2 +- solid-actions-kcm/SolidActionData.cpp | 2 +- .../kcm/DeviceAutomounterKCM.cpp | 2 +- solid-device-automounter/kcm/DeviceModel.h | 2 +- solid-device-automounter/kded/DeviceAutomounter.h | 2 +- solid-networkstatus/kded/networkstatus.cpp | 1 + systemsettings/app/SettingsBase.cpp | 2 +- systemsettings/app/ToolTips/ktooltipwindow.cpp | 2 +- systemsettings/app/ToolTips/tooltipmanager.cpp | 4 ++-- systemsettings/app/ToolTips/tooltipmanager.h | 2 +- systemsettings/core/ModuleView.cpp | 6 +++--- systemsettings/core/ModuleView.h | 2 +- 611 files changed, 831 insertions(+), 810 deletions(-) diff --git a/appmenu/appmenu.cpp b/appmenu/appmenu.cpp index c0abb45f..3d155ee2 100644 --- a/appmenu/appmenu.cpp +++ b/appmenu/appmenu.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include diff --git a/appmenu/appmenu_dbus.cpp b/appmenu/appmenu_dbus.cpp index 3b627323..aef25a39 100644 --- a/appmenu/appmenu_dbus.cpp +++ b/appmenu/appmenu_dbus.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include static const char* DBUS_SERVICE = "org.kde.kded"; diff --git a/appmenu/appmenu_dbus.h b/appmenu/appmenu_dbus.h index 2d5bb7e3..c14373da 100644 --- a/appmenu/appmenu_dbus.h +++ b/appmenu/appmenu_dbus.h @@ -28,7 +28,7 @@ // Qt #include -#include +#include #include #include #include diff --git a/appmenu/glowbar.cpp b/appmenu/glowbar.cpp index 5afb567f..32a9ed41 100644 --- a/appmenu/glowbar.cpp +++ b/appmenu/glowbar.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include GlowBar::GlowBar() diff --git a/appmenu/menubar.cpp b/appmenu/menubar.cpp index 4c20e201..7bc72f9a 100644 --- a/appmenu/menubar.cpp +++ b/appmenu/menubar.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/appmenu/menubutton.cpp b/appmenu/menubutton.cpp index 08408ab9..835c22f8 100644 --- a/appmenu/menubutton.cpp +++ b/appmenu/menubutton.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include diff --git a/appmenu/menuimporter.cpp b/appmenu/menuimporter.cpp index b55b7d3b..f6d4cd21 100644 --- a/appmenu/menuimporter.cpp +++ b/appmenu/menuimporter.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/appmenu/menuimporter.h b/appmenu/menuimporter.h index adfc5422..94eff1f1 100644 --- a/appmenu/menuimporter.h +++ b/appmenu/menuimporter.h @@ -28,7 +28,7 @@ // Qt #include -#include +#include #include #include // For WId diff --git a/appmenu/shadows.cpp b/appmenu/shadows.cpp index f7933872..f10d4d03 100644 --- a/appmenu/shadows.cpp +++ b/appmenu/shadows.cpp @@ -22,7 +22,7 @@ #include #ifdef Q_WS_X11 -#include +#include #include #include #include diff --git a/appmenu/verticalmenu.cpp b/appmenu/verticalmenu.cpp index 15ae37b4..3c92d749 100644 --- a/appmenu/verticalmenu.cpp +++ b/appmenu/verticalmenu.cpp @@ -26,10 +26,10 @@ #include "verticalmenu.h" #include -#include +#include #include #include -#include +#include VerticalMenu::VerticalMenu(QWidget* parent) : QMenu(parent) { diff --git a/drkonqi/detachedprocessmonitor.cpp b/drkonqi/detachedprocessmonitor.cpp index af60492d..8088ed22 100644 --- a/drkonqi/detachedprocessmonitor.cpp +++ b/drkonqi/detachedprocessmonitor.cpp @@ -18,7 +18,7 @@ #include -#include +#include #include diff --git a/drkonqi/drkonqi.cpp b/drkonqi/drkonqi.cpp index 7be87d74..60108e07 100644 --- a/drkonqi/drkonqi.cpp +++ b/drkonqi/drkonqi.cpp @@ -41,9 +41,9 @@ */ #include "drkonqi.h" -#include +#include #include -#include +#include #include #include diff --git a/drkonqi/parser/backtraceparser.cpp b/drkonqi/parser/backtraceparser.cpp index d4170642..b349f6a4 100644 --- a/drkonqi/parser/backtraceparser.cpp +++ b/drkonqi/parser/backtraceparser.cpp @@ -20,7 +20,7 @@ #include "backtraceparserkdbgwin.h" #include "backtraceparsernull.h" #include -#include +#include #include //factory diff --git a/drkonqi/tests/backtraceparsertest/backtraceparsertest.cpp b/drkonqi/tests/backtraceparsertest/backtraceparsertest.cpp index bc745f56..ec4b9500 100644 --- a/drkonqi/tests/backtraceparsertest/backtraceparsertest.cpp +++ b/drkonqi/tests/backtraceparsertest/backtraceparsertest.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/drkonqi/tests/backtraceparsertest/backtraceparsertest.h b/drkonqi/tests/backtraceparsertest/backtraceparsertest.h index 31ff6bb2..ce43915a 100644 --- a/drkonqi/tests/backtraceparsertest/backtraceparsertest.h +++ b/drkonqi/tests/backtraceparsertest/backtraceparsertest.h @@ -18,6 +18,8 @@ #define BACKTRACEPARSERTEST_H #include +#include + #include "fakebacktracegenerator.h" #include "../../parser/backtraceparser.h" diff --git a/drkonqi/tests/backtraceparsertest/backtraceparsertest_manual.cpp b/drkonqi/tests/backtraceparsertest/backtraceparsertest_manual.cpp index 3cc03a31..57437750 100644 --- a/drkonqi/tests/backtraceparsertest/backtraceparsertest_manual.cpp +++ b/drkonqi/tests/backtraceparsertest/backtraceparsertest_manual.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcminit/main.cpp b/kcminit/main.cpp index ffccf579..f38d16ea 100644 --- a/kcminit/main.cpp +++ b/kcminit/main.cpp @@ -40,7 +40,7 @@ #include #ifdef Q_WS_X11 #include -#include +#include #endif #include diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index f40b384a..c0d19764 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -31,7 +31,7 @@ #include "moc_kaccess.cpp" -#include +#include #include struct ModifierKey { diff --git a/kcontrol/access/kaccess.h b/kcontrol/access/kaccess.h index c364b251..07c3f19b 100644 --- a/kcontrol/access/kaccess.h +++ b/kcontrol/access/kaccess.h @@ -6,7 +6,7 @@ #include //Added by qt3to4: #include -#include +#include #include diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index 4ced2fb2..eccdd8ee 100644 --- a/kcontrol/access/kcmaccess.cpp +++ b/kcontrol/access/kcmaccess.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include //Added by qt3to4: diff --git a/kcontrol/autostart/autostartitem.cpp b/kcontrol/autostart/autostartitem.cpp index d383ee6e..3673bb54 100644 --- a/kcontrol/autostart/autostartitem.cpp +++ b/kcontrol/autostart/autostartitem.cpp @@ -21,7 +21,7 @@ #include "autostart.h" #include -#include +#include #include #include diff --git a/kcontrol/autostart/autostartitem.h b/kcontrol/autostart/autostartitem.h index 85622e87..30b9844c 100644 --- a/kcontrol/autostart/autostartitem.h +++ b/kcontrol/autostart/autostartitem.h @@ -20,7 +20,7 @@ #ifndef AUTOSTARTITEM_H #define AUTOSTARTITEM_H -#include +#include #include #include diff --git a/kcontrol/colors/previewwidget.cpp b/kcontrol/colors/previewwidget.cpp index b7f359a2..4df1846b 100644 --- a/kcontrol/colors/previewwidget.cpp +++ b/kcontrol/colors/previewwidget.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include PreviewWidget::PreviewWidget(QWidget *parent) : QFrame(parent) { diff --git a/kcontrol/componentchooser/componentchooseremail.cpp b/kcontrol/componentchooser/componentchooseremail.cpp index 467692aa..63d416bb 100644 --- a/kcontrol/componentchooser/componentchooseremail.cpp +++ b/kcontrol/componentchooser/componentchooseremail.cpp @@ -15,11 +15,11 @@ #include "componentchooseremail.h" #include +#include +#include #include -#include #include #include - #include // for chmod: diff --git a/kcontrol/dateandtime/dtime.cpp b/kcontrol/dateandtime/dtime.cpp index 73d3e2b4..2ae90b74 100644 --- a/kcontrol/dateandtime/dtime.cpp +++ b/kcontrol/dateandtime/dtime.cpp @@ -34,10 +34,10 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/kcontrol/dateandtime/dtime.h b/kcontrol/dateandtime/dtime.h index 1a90698c..4f111620 100644 --- a/kcontrol/dateandtime/dtime.h +++ b/kcontrol/dateandtime/dtime.h @@ -30,7 +30,7 @@ #include #include //Added by qt3to4: -#include +#include #include #include diff --git a/kcontrol/emoticons/emoticonslist.cpp b/kcontrol/emoticons/emoticonslist.cpp index 98baa0ba..8fe6bd5c 100644 --- a/kcontrol/emoticons/emoticonslist.cpp +++ b/kcontrol/emoticons/emoticonslist.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/fonts/kxftconfig.cpp b/kcontrol/fonts/kxftconfig.cpp index 410bf015..b143cf48 100644 --- a/kcontrol/fonts/kxftconfig.cpp +++ b/kcontrol/fonts/kxftconfig.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/kcontrol/fonts/kxftconfig.h b/kcontrol/fonts/kxftconfig.h index 0df61645..1733df38 100644 --- a/kcontrol/fonts/kxftconfig.h +++ b/kcontrol/fonts/kxftconfig.h @@ -28,6 +28,7 @@ #include #include +#include class KXftConfig { diff --git a/kcontrol/input/kapplymousetheme.cpp b/kcontrol/input/kapplymousetheme.cpp index c9bc511b..ca5c4908 100644 --- a/kcontrol/input/kapplymousetheme.cpp +++ b/kcontrol/input/kapplymousetheme.cpp @@ -24,7 +24,7 @@ #include -#include +#include #include #include #include diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp index 0f9f33a6..efb1d6b0 100644 --- a/kcontrol/input/main.cpp +++ b/kcontrol/input/main.cpp @@ -29,7 +29,7 @@ #include #include "mouse.h" -#include +#include #include #include diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp index 2c3c7669..7f74b5a5 100644 --- a/kcontrol/input/mouse.cpp +++ b/kcontrol/input/mouse.cpp @@ -73,7 +73,7 @@ #include #include #include -#include +#include #undef Below diff --git a/kcontrol/input/xcursor/cursortheme.cpp b/kcontrol/input/xcursor/cursortheme.cpp index 2c8c260d..0cc8ecf5 100644 --- a/kcontrol/input/xcursor/cursortheme.cpp +++ b/kcontrol/input/xcursor/cursortheme.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "themepage.h" #include "cursortheme.h" diff --git a/kcontrol/input/xcursor/itemdelegate.cpp b/kcontrol/input/xcursor/itemdelegate.cpp index e7370056..701c6e39 100644 --- a/kcontrol/input/xcursor/itemdelegate.cpp +++ b/kcontrol/input/xcursor/itemdelegate.cpp @@ -21,7 +21,7 @@ #include "cursortheme.h" #include -#include +#include #include namespace diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp index aff149bc..c55701c0 100644 --- a/kcontrol/input/xcursor/previewwidget.cpp +++ b/kcontrol/input/xcursor/previewwidget.cpp @@ -17,7 +17,7 @@ */ #include -#include +#include #include "previewwidget.h" diff --git a/kcontrol/input/xcursor/thememodel.h b/kcontrol/input/xcursor/thememodel.h index bcf046a9..2b022733 100644 --- a/kcontrol/input/xcursor/thememodel.h +++ b/kcontrol/input/xcursor/thememodel.h @@ -20,7 +20,7 @@ #ifndef THEMEMODEL_H #define THEMEMODEL_H -#include +#include #include class QDir; diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index a2e81b3a..0f5adb66 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/kcontrol/input/xcursor/themepage.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include "themepage.h" #include "moc_themepage.cpp" diff --git a/kcontrol/input/xcursor/themepage.h b/kcontrol/input/xcursor/themepage.h index 7162e737..057ed286 100644 --- a/kcontrol/input/xcursor/themepage.h +++ b/kcontrol/input/xcursor/themepage.h @@ -20,7 +20,7 @@ #define THEMEPAGE_H #include -#include +#include #include "ui_themepage.h" diff --git a/kcontrol/input/xcursor/xcursortheme.cpp b/kcontrol/input/xcursor/xcursortheme.cpp index 7f6ae00b..0656e3b5 100644 --- a/kcontrol/input/xcursor/xcursortheme.cpp +++ b/kcontrol/input/xcursor/xcursortheme.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/kcontrol/keyboard/iso_codes.cpp b/kcontrol/keyboard/iso_codes.cpp index 0ffbbd92..a50a866e 100644 --- a/kcontrol/keyboard/iso_codes.cpp +++ b/kcontrol/keyboard/iso_codes.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include class IsoCodesPrivate { diff --git a/kcontrol/keyboard/kcm_keyboard_widget.cpp b/kcontrol/keyboard/kcm_keyboard_widget.cpp index c9a69103..b2679b9c 100644 --- a/kcontrol/keyboard/kcm_keyboard_widget.cpp +++ b/kcontrol/keyboard/kcm_keyboard_widget.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "keyboard_config.h" #include "preview/keyboardpainter.h" diff --git a/kcontrol/keyboard/kcm_view_models.h b/kcontrol/keyboard/kcm_view_models.h index 001d3a5a..f9db39e9 100644 --- a/kcontrol/keyboard/kcm_view_models.h +++ b/kcontrol/keyboard/kcm_view_models.h @@ -21,7 +21,7 @@ #define KCM_VIEW_MODELS_H_ #include -#include +#include #include #include diff --git a/kcontrol/keyboard/kcmmisc.cpp b/kcontrol/keyboard/kcmmisc.cpp index 382f026f..20df4138 100644 --- a/kcontrol/keyboard/kcmmisc.cpp +++ b/kcontrol/keyboard/kcmmisc.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/kcontrol/keyboard/keyboard_applet.cpp b/kcontrol/keyboard/keyboard_applet.cpp index 85422d8b..39584039 100644 --- a/kcontrol/keyboard/keyboard_applet.cpp +++ b/kcontrol/keyboard/keyboard_applet.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/kcontrol/keyboard/keyboard_daemon.cpp b/kcontrol/keyboard/keyboard_daemon.cpp index eb9061f3..abfba973 100644 --- a/kcontrol/keyboard/keyboard_daemon.cpp +++ b/kcontrol/keyboard/keyboard_daemon.cpp @@ -18,7 +18,7 @@ #include "keyboard_daemon.h" -#include +#include #include #include diff --git a/kcontrol/keyboard/keyboard_hardware.cpp b/kcontrol/keyboard/keyboard_hardware.cpp index d116eb2a..c05ba2ab 100644 --- a/kcontrol/keyboard/keyboard_hardware.cpp +++ b/kcontrol/keyboard/keyboard_hardware.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include // WTF? - otherwise compiler complains #include diff --git a/kcontrol/keyboard/layout_memory.cpp b/kcontrol/keyboard/layout_memory.cpp index 6940245a..a73688bd 100644 --- a/kcontrol/keyboard/layout_memory.cpp +++ b/kcontrol/keyboard/layout_memory.cpp @@ -19,7 +19,7 @@ #include "layout_memory.h" #include -#include +#include #include #include diff --git a/kcontrol/keyboard/layout_memory.h b/kcontrol/keyboard/layout_memory.h index df8568c2..04c25a43 100644 --- a/kcontrol/keyboard/layout_memory.h +++ b/kcontrol/keyboard/layout_memory.h @@ -22,7 +22,7 @@ #include #include -#include //For WId +#include //For WId #include "x11_helper.h" #include "keyboard_config.h" diff --git a/kcontrol/keyboard/preview/keyaliases.cpp b/kcontrol/keyboard/preview/keyaliases.cpp index 3eb45ec4..fdf2f123 100644 --- a/kcontrol/keyboard/preview/keyaliases.cpp +++ b/kcontrol/keyboard/preview/keyaliases.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/keyboard/preview/keyboardlayout.cpp b/kcontrol/keyboard/preview/keyboardlayout.cpp index 6ac2f3f7..5d607b0a 100644 --- a/kcontrol/keyboard/preview/keyboardlayout.cpp +++ b/kcontrol/keyboard/preview/keyboardlayout.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/keyboard/x11_helper.cpp b/kcontrol/keyboard/x11_helper.cpp index f8060fb2..c541e662 100644 --- a/kcontrol/keyboard/x11_helper.cpp +++ b/kcontrol/keyboard/x11_helper.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/kcontrol/keyboard/xinput_helper.cpp b/kcontrol/keyboard/xinput_helper.cpp index 2a10f340..b3d99e50 100644 --- a/kcontrol/keyboard/xinput_helper.cpp +++ b/kcontrol/keyboard/xinput_helper.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/kcontrol/keyboard/xkb_helper.cpp b/kcontrol/keyboard/xkb_helper.cpp index 60bf5a8f..e2e80595 100644 --- a/kcontrol/keyboard/xkb_helper.cpp +++ b/kcontrol/keyboard/xkb_helper.cpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/kcontrol/keyboard/xkb_rules.cpp b/kcontrol/keyboard/xkb_rules.cpp index cbaa556b..550f8fd0 100644 --- a/kcontrol/keyboard/xkb_rules.cpp +++ b/kcontrol/keyboard/xkb_rules.cpp @@ -25,7 +25,7 @@ #include #include #include // for Qt::escape -#include +#include #include //#include @@ -34,7 +34,7 @@ #include "x11_helper.h" // for findXkbRuleFile -#include +#include #include #include #include diff --git a/kcontrol/keyboard/xkb_rules.h b/kcontrol/keyboard/xkb_rules.h index 8066ebda..6400141e 100644 --- a/kcontrol/keyboard/xkb_rules.h +++ b/kcontrol/keyboard/xkb_rules.h @@ -20,7 +20,7 @@ #ifndef XKB_RULES_H_ #define XKB_RULES_H_ -#include +#include #include #include diff --git a/kcontrol/kfontinst/CMakeLists.txt b/kcontrol/kfontinst/CMakeLists.txt index 1ba461cf..8a12a3fb 100644 --- a/kcontrol/kfontinst/CMakeLists.txt +++ b/kcontrol/kfontinst/CMakeLists.txt @@ -1,15 +1,3 @@ -if (KFI_BUILD_STANDALONE) - cmake_minimum_required(VERSION 2.6.4) - find_package(KDE4 "4.6.0" REQUIRED) - find_package(Qt4 REQUIRED) - find_package(Freetype REQUIRED) - find_package(Fontconfig REQUIRED) - find_package(Strigi REQUIRED) - find_package(X11 REQUIRED) - macro_log_feature(X11_Xft_FOUND "libxft" "X FreeType interface library" "http://www.x.org" FALSE "" "Font installer and font previews") - include(KDE4Defaults) -endif (KFI_BUILD_STANDALONE) - if (X11_Xft_FOUND) check_include_files(locale.h HAVE_LOCALE_H) configure_file(config-fontinst.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-fontinst.h) diff --git a/kcontrol/kfontinst/apps/CreateParent.h b/kcontrol/kfontinst/apps/CreateParent.h index 5a3dc381..92887bf9 100644 --- a/kcontrol/kfontinst/apps/CreateParent.h +++ b/kcontrol/kfontinst/apps/CreateParent.h @@ -24,8 +24,8 @@ * Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include #include diff --git a/kcontrol/kfontinst/apps/Printer.cpp b/kcontrol/kfontinst/apps/Printer.cpp index 0a0aee9c..ad0351cb 100644 --- a/kcontrol/kfontinst/apps/Printer.cpp +++ b/kcontrol/kfontinst/apps/Printer.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/kfontinst/dbus/FcConfig.cpp b/kcontrol/kfontinst/dbus/FcConfig.cpp index 2213a5ef..3d37667c 100644 --- a/kcontrol/kfontinst/dbus/FcConfig.cpp +++ b/kcontrol/kfontinst/dbus/FcConfig.cpp @@ -27,10 +27,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/kcontrol/kfontinst/dbus/Folder.cpp b/kcontrol/kfontinst/dbus/Folder.cpp index 7bddf176..3a87ac1b 100644 --- a/kcontrol/kfontinst/dbus/Folder.cpp +++ b/kcontrol/kfontinst/dbus/Folder.cpp @@ -26,9 +26,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/kcontrol/kfontinst/dbus/FontInst.cpp b/kcontrol/kfontinst/dbus/FontInst.cpp index 37d5adeb..c1cb59bf 100644 --- a/kcontrol/kfontinst/dbus/FontInst.cpp +++ b/kcontrol/kfontinst/dbus/FontInst.cpp @@ -21,8 +21,11 @@ * Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include +#include +#include + #include #include #include diff --git a/kcontrol/kfontinst/dbus/Helper.cpp b/kcontrol/kfontinst/dbus/Helper.cpp index bb491604..cbae8e2b 100644 --- a/kcontrol/kfontinst/dbus/Helper.cpp +++ b/kcontrol/kfontinst/dbus/Helper.cpp @@ -27,8 +27,9 @@ #include "Misc.h" #include "Utils.h" #include -#include -#include +#include +#include +#include #include #include #include diff --git a/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp b/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp index 7809a489..b48917c8 100644 --- a/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp +++ b/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp @@ -41,12 +41,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/kfontinst/kcmfontinst/FontFilter.cpp b/kcontrol/kfontinst/kcmfontinst/FontFilter.cpp index 998945e4..e6c03875 100644 --- a/kcontrol/kfontinst/kcmfontinst/FontFilter.cpp +++ b/kcontrol/kfontinst/kcmfontinst/FontFilter.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include diff --git a/kcontrol/kfontinst/kcmfontinst/FontList.cpp b/kcontrol/kfontinst/kcmfontinst/FontList.cpp index f388d7ad..e29537bc 100644 --- a/kcontrol/kfontinst/kcmfontinst/FontList.cpp +++ b/kcontrol/kfontinst/kcmfontinst/FontList.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/kfontinst/kcmfontinst/FontList.h b/kcontrol/kfontinst/kcmfontinst/FontList.h index 184941fd..49977828 100644 --- a/kcontrol/kfontinst/kcmfontinst/FontList.h +++ b/kcontrol/kfontinst/kcmfontinst/FontList.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/kfontinst/kcmfontinst/GroupList.cpp b/kcontrol/kfontinst/kcmfontinst/GroupList.cpp index 214885b8..62c1e2ff 100644 --- a/kcontrol/kfontinst/kcmfontinst/GroupList.cpp +++ b/kcontrol/kfontinst/kcmfontinst/GroupList.cpp @@ -33,14 +33,14 @@ #include #include #include -#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/kcontrol/kfontinst/kcmfontinst/GroupList.h b/kcontrol/kfontinst/kcmfontinst/GroupList.h index 21234d43..b6bb2451 100644 --- a/kcontrol/kfontinst/kcmfontinst/GroupList.h +++ b/kcontrol/kfontinst/kcmfontinst/GroupList.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include "FontList.h" diff --git a/kcontrol/kfontinst/kcmfontinst/JobRunner.cpp b/kcontrol/kfontinst/kcmfontinst/JobRunner.cpp index ab9e3a1c..b6301d55 100644 --- a/kcontrol/kfontinst/kcmfontinst/JobRunner.cpp +++ b/kcontrol/kfontinst/kcmfontinst/JobRunner.cpp @@ -37,12 +37,13 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include +#include #include #include #include diff --git a/kcontrol/kfontinst/kcmfontinst/PreviewList.cpp b/kcontrol/kfontinst/kcmfontinst/PreviewList.cpp index 959bc2c0..4e9ebf0b 100644 --- a/kcontrol/kfontinst/kcmfontinst/PreviewList.cpp +++ b/kcontrol/kfontinst/kcmfontinst/PreviewList.cpp @@ -30,8 +30,9 @@ #include #include #include -#include -#include +#include +#include +#include namespace KFI { diff --git a/kcontrol/kfontinst/kio/FontInstInterface.cpp b/kcontrol/kfontinst/kio/FontInstInterface.cpp index c8ae4e0a..16027842 100644 --- a/kcontrol/kfontinst/kio/FontInstInterface.cpp +++ b/kcontrol/kfontinst/kio/FontInstInterface.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include "config-fontinst.h" #define KFI_DBUG kDebug(7000) << '(' << time(NULL) << ')' diff --git a/kcontrol/kfontinst/lib/Family.cpp b/kcontrol/kfontinst/lib/Family.cpp index 91cc1bd3..9f5597e1 100644 --- a/kcontrol/kfontinst/lib/Family.cpp +++ b/kcontrol/kfontinst/lib/Family.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include "Family.h" #include "Misc.h" diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp index decf6032..ad5d036a 100644 --- a/kcontrol/kfontinst/lib/FcEngine.cpp +++ b/kcontrol/kfontinst/lib/FcEngine.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/kfontinst/lib/File.cpp b/kcontrol/kfontinst/lib/File.cpp index 88d61e60..aa84257f 100644 --- a/kcontrol/kfontinst/lib/File.cpp +++ b/kcontrol/kfontinst/lib/File.cpp @@ -21,7 +21,7 @@ * Boston, MA 02110-1301, USA. */ -#include +#include #include #include #include "File.h" diff --git a/kcontrol/kfontinst/lib/KfiConstants.h b/kcontrol/kfontinst/lib/KfiConstants.h index f3e43b06..4c06433e 100644 --- a/kcontrol/kfontinst/lib/KfiConstants.h +++ b/kcontrol/kfontinst/lib/KfiConstants.h @@ -24,7 +24,7 @@ * Boston, MA 02110-1301, USA. */ -#include +#include #include #include diff --git a/kcontrol/kfontinst/lib/Style.cpp b/kcontrol/kfontinst/lib/Style.cpp index 1e5a63dd..ca239c65 100644 --- a/kcontrol/kfontinst/lib/Style.cpp +++ b/kcontrol/kfontinst/lib/Style.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include "Fc.h" #include "Style.h" #include "WritingSystems.h" diff --git a/kcontrol/kfontinst/viewpart/CharTip.cpp b/kcontrol/kfontinst/viewpart/CharTip.cpp index 4de59108..da8d9f2c 100644 --- a/kcontrol/kfontinst/viewpart/CharTip.cpp +++ b/kcontrol/kfontinst/viewpart/CharTip.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include namespace KFI { diff --git a/kcontrol/kfontinst/viewpart/FontPreview.cpp b/kcontrol/kfontinst/viewpart/FontPreview.cpp index ca4616a9..da6f4f4d 100644 --- a/kcontrol/kfontinst/viewpart/FontPreview.cpp +++ b/kcontrol/kfontinst/viewpart/FontPreview.cpp @@ -27,9 +27,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include namespace KFI diff --git a/kcontrol/kfontinst/viewpart/FontPreview.h b/kcontrol/kfontinst/viewpart/FontPreview.h index 2ef57f55..5ca6853c 100644 --- a/kcontrol/kfontinst/viewpart/FontPreview.h +++ b/kcontrol/kfontinst/viewpart/FontPreview.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "KfiConstants.h" #include "FcEngine.h" diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index 36fc99c7..b36f73f6 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -51,7 +51,7 @@ #include "krdb.h" #ifdef Q_WS_X11 #include -#include +#include #endif inline const char * gtkEnvVar(int version) { diff --git a/kcontrol/locale/countryselectordialog.cpp b/kcontrol/locale/countryselectordialog.cpp index 9e1344de..c19fa584 100644 --- a/kcontrol/locale/countryselectordialog.cpp +++ b/kcontrol/locale/countryselectordialog.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index c9b0b3c4..3bee24c1 100644 --- a/kcontrol/locale/kcmlocale.cpp +++ b/kcontrol/locale/kcmlocale.cpp @@ -23,7 +23,7 @@ #include "kcmlocale.h" #include -#include +#include #include #include diff --git a/kcontrol/randr/krandrpassivepopup.cpp b/kcontrol/randr/krandrpassivepopup.cpp index d4d70332..a58cd350 100644 --- a/kcontrol/randr/krandrpassivepopup.cpp +++ b/kcontrol/randr/krandrpassivepopup.cpp @@ -19,7 +19,7 @@ #include "krandrpassivepopup.h" #include -#include +#include //Added by qt3to4: #include #include diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp index 9c87ee6a..69ac8ffe 100644 --- a/kcontrol/randr/krandrtray.cpp +++ b/kcontrol/randr/krandrtray.cpp @@ -29,7 +29,7 @@ #include -#include +#include #include #include diff --git a/kcontrol/randr/krandrtray.h b/kcontrol/randr/krandrtray.h index 2d5e5dc0..a69b30a6 100644 --- a/kcontrol/randr/krandrtray.h +++ b/kcontrol/randr/krandrtray.h @@ -19,8 +19,8 @@ #ifndef KRANDRTRAY_H #define KRANDRTRAY_H -#include -#include +#include +#include #include diff --git a/kcontrol/randr/legacyrandrscreen.cpp b/kcontrol/randr/legacyrandrscreen.cpp index 091edac0..411902c5 100644 --- a/kcontrol/randr/legacyrandrscreen.cpp +++ b/kcontrol/randr/legacyrandrscreen.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include "legacyrandrscreen.h" LegacyRandRScreen::LegacyRandRScreen(int screenIndex) diff --git a/kcontrol/randr/outputgraphicsitem.h b/kcontrol/randr/outputgraphicsitem.h index 06f49665..4d94553b 100644 --- a/kcontrol/randr/outputgraphicsitem.h +++ b/kcontrol/randr/outputgraphicsitem.h @@ -19,8 +19,8 @@ #ifndef OUTPUTGRAPHICSITEM_H #define OUTPUTGRAPHICSITEM_H -#include -#include +#include +#include #include "randr.h" diff --git a/kcontrol/randr/randrcrtc.h b/kcontrol/randr/randrcrtc.h index 8ec4db6a..59f52fda 100644 --- a/kcontrol/randr/randrcrtc.h +++ b/kcontrol/randr/randrcrtc.h @@ -21,7 +21,7 @@ #include "randr.h" -#include +#include #include #include diff --git a/kcontrol/randr/randrdisplay.cpp b/kcontrol/randr/randrdisplay.cpp index 7d9b900a..eda44941 100644 --- a/kcontrol/randr/randrdisplay.cpp +++ b/kcontrol/randr/randrdisplay.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "randrdisplay.h" #ifdef HAS_RANDR_1_2 diff --git a/kcontrol/randr/randroutput.cpp b/kcontrol/randr/randroutput.cpp index ec406616..e334f906 100644 --- a/kcontrol/randr/randroutput.cpp +++ b/kcontrol/randr/randroutput.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include RandROutput::RandROutput(RandRScreen *parent, RROutput id) diff --git a/kcontrol/randr/randrscreen.h b/kcontrol/randr/randrscreen.h index a634a31f..5293a45a 100644 --- a/kcontrol/randr/randrscreen.h +++ b/kcontrol/randr/randrscreen.h @@ -21,7 +21,7 @@ #include "randr.h" -#include +#include #include #include diff --git a/kcontrol/screensaver/kswidget.cpp b/kcontrol/screensaver/kswidget.cpp index 7d95739f..a7c0406d 100644 --- a/kcontrol/screensaver/kswidget.cpp +++ b/kcontrol/screensaver/kswidget.cpp @@ -27,7 +27,7 @@ #include "testwin.h" -#include +#include #ifdef HAVE_GLXCHOOSEVISUAL #include diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index 2ea39a30..4ec0e5ba 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -41,14 +41,14 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include -#include -#include +#include +#include #include #include @@ -75,7 +75,7 @@ #include #include "scrnsave.h" -#include +#include template class QList; diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h index 202e14ea..4827cabc 100644 --- a/kcontrol/screensaver/scrnsave.h +++ b/kcontrol/screensaver/scrnsave.h @@ -29,9 +29,9 @@ #define SCRNSAVE__H #include -#include -#include -#include +#include +#include +#include #include diff --git a/kcontrol/smartcard/smartcard.h b/kcontrol/smartcard/smartcard.h index f3c45e03..99b86dd8 100644 --- a/kcontrol/smartcard/smartcard.h +++ b/kcontrol/smartcard/smartcard.h @@ -27,7 +27,7 @@ #define KDE3_SUPPORT #include -#include +#include #undef KDE3_SUPPORT #include "smartcardbase.h" diff --git a/kcontrol/splash/installer.cpp b/kcontrol/splash/installer.cpp index c69b18a1..34ba855e 100644 --- a/kcontrol/splash/installer.cpp +++ b/kcontrol/splash/installer.cpp @@ -19,10 +19,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include #include "installer.h" diff --git a/kcontrol/splash/installer.h b/kcontrol/splash/installer.h index 6296b6e1..33714319 100644 --- a/kcontrol/splash/installer.h +++ b/kcontrol/splash/installer.h @@ -13,10 +13,10 @@ #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index 3bf176d6..af1cf481 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -62,9 +62,10 @@ #include #include #include +#include #ifdef Q_WS_X11 -#include +#include #endif #include "../krdb/krdb.h" diff --git a/kcontrol/touchpad/src/kcm/customconfigdialogmanager.h b/kcontrol/touchpad/src/kcm/customconfigdialogmanager.h index cb6c8c05..7bb9403f 100644 --- a/kcontrol/touchpad/src/kcm/customconfigdialogmanager.h +++ b/kcontrol/touchpad/src/kcm/customconfigdialogmanager.h @@ -20,7 +20,7 @@ #define CUSTOMCONFIGDIALOGMANAGER_H #include -#include +#include #include diff --git a/kcontrol/touchpad/src/kcm/customslider.cpp b/kcontrol/touchpad/src/kcm/customslider.cpp index eebfd1c5..4c188eb1 100644 --- a/kcontrol/touchpad/src/kcm/customslider.cpp +++ b/kcontrol/touchpad/src/kcm/customslider.cpp @@ -20,7 +20,7 @@ #include -#include +#include CustomSlider::Interpolator::~Interpolator() { diff --git a/kcontrol/touchpad/src/kcm/testarea.cpp b/kcontrol/touchpad/src/kcm/testarea.cpp index e75e80cf..e8af2d00 100644 --- a/kcontrol/touchpad/src/kcm/testarea.cpp +++ b/kcontrol/touchpad/src/kcm/testarea.cpp @@ -18,8 +18,8 @@ #include "testarea.h" -#include -#include +#include +#include #include #include diff --git a/kcontrol/touchpad/src/kcm/testbutton.cpp b/kcontrol/touchpad/src/kcm/testbutton.cpp index 2b0d6365..561b4e18 100644 --- a/kcontrol/touchpad/src/kcm/testbutton.cpp +++ b/kcontrol/touchpad/src/kcm/testbutton.cpp @@ -18,7 +18,7 @@ #include "testbutton.h" -#include +#include #include #include diff --git a/kcontrol/touchpad/src/kcm/touchpadparametersbase.h b/kcontrol/touchpad/src/kcm/touchpadparametersbase.h index 8d0a17d3..c51a30e9 100644 --- a/kcontrol/touchpad/src/kcm/touchpadparametersbase.h +++ b/kcontrol/touchpad/src/kcm/touchpadparametersbase.h @@ -19,7 +19,7 @@ #ifndef TOUCHPADPARAMETERSBASE_H #define TOUCHPADPARAMETERSBASE_H -#include +#include #include diff --git a/kcontrol/touchpad/src/kded/kded.h b/kcontrol/touchpad/src/kded/kded.h index 90014d37..89ef548a 100644 --- a/kcontrol/touchpad/src/kded/kded.h +++ b/kcontrol/touchpad/src/kded/kded.h @@ -19,7 +19,7 @@ #ifndef KDED_H #define KDED_H -#include +#include #include #include diff --git a/kcontrol/touchpad/src/touchpadbackend.h b/kcontrol/touchpad/src/touchpadbackend.h index d2315964..dad3f139 100644 --- a/kcontrol/touchpad/src/touchpadbackend.h +++ b/kcontrol/touchpad/src/touchpadbackend.h @@ -20,7 +20,7 @@ #define TOUCHPADBACKEND_H #include -#include +#include #include diff --git a/kcontrol/touchpad/src/x11/xlibbackend.cpp b/kcontrol/touchpad/src/x11/xlibbackend.cpp index 2ba8bc55..fa5b2625 100644 --- a/kcontrol/touchpad/src/x11/xlibbackend.cpp +++ b/kcontrol/touchpad/src/x11/xlibbackend.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/kcontrol/touchpad/src/x11/xlibbackend.h b/kcontrol/touchpad/src/x11/xlibbackend.h index 3692a604..9d553b60 100644 --- a/kcontrol/touchpad/src/x11/xlibbackend.h +++ b/kcontrol/touchpad/src/x11/xlibbackend.h @@ -22,10 +22,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include "touchpadbackend.h" diff --git a/kcontrol/touchpad/src/x11/xlibnotifications.h b/kcontrol/touchpad/src/x11/xlibnotifications.h index ed6952b3..a989260f 100644 --- a/kcontrol/touchpad/src/x11/xlibnotifications.h +++ b/kcontrol/touchpad/src/x11/xlibnotifications.h @@ -19,7 +19,7 @@ #ifndef XLIBNOTIFICATIONS_H #define XLIBNOTIFICATIONS_H -#include +#include #include #include diff --git a/kcontrol/touchpad/src/x11/xrecordkeyboardmonitor.h b/kcontrol/touchpad/src/x11/xrecordkeyboardmonitor.h index 79e4052f..7632b587 100644 --- a/kcontrol/touchpad/src/x11/xrecordkeyboardmonitor.h +++ b/kcontrol/touchpad/src/x11/xrecordkeyboardmonitor.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/kdm/kcm/kdm-theme.cpp b/kdm/kcm/kdm-theme.cpp index b97d18cb..f7cea0d6 100644 --- a/kdm/kcm/kdm-theme.cpp +++ b/kdm/kcm/kdm-theme.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include diff --git a/kdm/kcm/kdm-users.cpp b/kdm/kcm/kdm-users.cpp index a3b2496e..93e763d5 100644 --- a/kdm/kcm/kdm-users.cpp +++ b/kdm/kcm/kdm-users.cpp @@ -37,11 +37,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/kdm/kcm/main.cpp b/kdm/kcm/main.cpp index 1b33683c..bb6c4550 100644 --- a/kdm/kcm/main.cpp +++ b/kdm/kcm/main.cpp @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include #include diff --git a/kdm/kcm/positioner.cpp b/kdm/kcm/positioner.cpp index ed180aa1..4d9f6e22 100644 --- a/kdm/kcm/positioner.cpp +++ b/kdm/kcm/positioner.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/kdm/kfrontend/kchooser.cpp b/kdm/kfrontend/kchooser.cpp index 46ecfd4f..eb4c0b81 100644 --- a/kdm/kfrontend/kchooser.cpp +++ b/kdm/kfrontend/kchooser.cpp @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include #include #include -#include +#include #include #include diff --git a/kdm/kfrontend/kdmclock.cpp b/kdm/kfrontend/kdmclock.cpp index 94b770eb..a3609d3a 100644 --- a/kdm/kfrontend/kdmclock.cpp +++ b/kdm/kfrontend/kdmclock.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "kdmclock.h" #include -#include +#include #include KdmClock::KdmClock(QWidget *parent) diff --git a/kdm/kfrontend/kdmshutdown.cpp b/kdm/kfrontend/kdmshutdown.cpp index 6f036f99..de3b85a2 100644 --- a/kdm/kfrontend/kdmshutdown.cpp +++ b/kdm/kfrontend/kdmshutdown.cpp @@ -48,7 +48,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include #include #include -#include +#include #include diff --git a/kdm/kfrontend/kfdialog.cpp b/kdm/kfrontend/kfdialog.cpp index b54607bd..f0008b91 100644 --- a/kdm/kfrontend/kfdialog.cpp +++ b/kdm/kfrontend/kfdialog.cpp @@ -34,8 +34,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include #include #include -#include -#include +#include +#include #include #include diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp index 7186c4f3..fd4c4de9 100644 --- a/kdm/kfrontend/kgapp.cpp +++ b/kdm/kfrontend/kgapp.cpp @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include #include -#include +#include #include #include // free(), exit() diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp index 3b82a81a..f8b487d0 100644 --- a/kdm/kfrontend/kgreeter.cpp +++ b/kdm/kfrontend/kgreeter.cpp @@ -43,10 +43,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/kdm/kfrontend/kgverify.cpp b/kdm/kfrontend/kgverify.cpp index c4e31c8e..0ef7a06d 100644 --- a/kdm/kfrontend/kgverify.cpp +++ b/kdm/kfrontend/kgverify.cpp @@ -43,11 +43,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include #include #include -#include +#include #include #include #include -#include +#include #include // for updateLockStatus() #include // ... and make eventFilter() work again diff --git a/kdm/kfrontend/themer/kdmitem.h b/kdm/kfrontend/themer/kdmitem.h index 62d45f0f..35c3afb3 100644 --- a/kdm/kfrontend/themer/kdmitem.h +++ b/kdm/kfrontend/themer/kdmitem.h @@ -24,7 +24,7 @@ #include "parse.h" -#include +#include #include #include diff --git a/kdm/kfrontend/themer/kdmlabel.cpp b/kdm/kfrontend/themer/kdmlabel.cpp index 9cd61e4f..435d08bc 100644 --- a/kdm/kfrontend/themer/kdmlabel.cpp +++ b/kdm/kfrontend/themer/kdmlabel.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include diff --git a/kdm/kfrontend/themer/kdmthemer.cpp b/kdm/kfrontend/themer/kdmthemer.cpp index aef275c1..aab0c731 100644 --- a/kdm/kfrontend/themer/kdmthemer.cpp +++ b/kdm/kfrontend/themer/kdmthemer.cpp @@ -35,8 +35,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/kdm/kfrontend/themer/parse.cpp b/kdm/kfrontend/themer/parse.cpp index a3362fb8..3261db8b 100644 --- a/kdm/kfrontend/themer/parse.cpp +++ b/kdm/kfrontend/themer/parse.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/kdontchangethehostname/khostname.cpp b/kdontchangethehostname/khostname.cpp index 3398186a..e86540e4 100644 --- a/kdontchangethehostname/khostname.cpp +++ b/kdontchangethehostname/khostname.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/keditfiletype/mimetypewriter.cpp b/keditfiletype/mimetypewriter.cpp index 19db75a0..8c7863c5 100644 --- a/keditfiletype/mimetypewriter.cpp +++ b/keditfiletype/mimetypewriter.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include /// WARNING: this code is duplicated between apps/nsplugins and runtime/filetypes diff --git a/keditfiletype/typeslistitem.h b/keditfiletype/typeslistitem.h index 05e425ae..b27c0df1 100644 --- a/keditfiletype/typeslistitem.h +++ b/keditfiletype/typeslistitem.h @@ -22,7 +22,7 @@ #define TYPESLISTITEM_H #include "mimetypedata.h" -#include +#include #include diff --git a/kglobalaccel/component.cpp b/kglobalaccel/component.cpp index 346b61b7..94fedaa7 100644 --- a/kglobalaccel/component.cpp +++ b/kglobalaccel/component.cpp @@ -30,7 +30,7 @@ #ifdef Q_WS_X11 #include -#include +#include #endif static QList keysFromString(const QString &str) diff --git a/kglobalaccel/globalshortcutsregistry.cpp b/kglobalaccel/globalshortcutsregistry.cpp index c70550ab..1cbcb2cb 100644 --- a/kglobalaccel/globalshortcutsregistry.cpp +++ b/kglobalaccel/globalshortcutsregistry.cpp @@ -31,7 +31,7 @@ #ifdef Q_WS_X11 #include "kglobalaccel_x11.h" -#include +#include #include #else #include "kglobalaccel_qws.h" diff --git a/kglobalaccel/globalshortcutsregistry.h b/kglobalaccel/globalshortcutsregistry.h index 9ea2ce38..abee0e36 100644 --- a/kglobalaccel/globalshortcutsregistry.h +++ b/kglobalaccel/globalshortcutsregistry.h @@ -22,7 +22,7 @@ #include #include -#include +#include class GlobalShortcut; diff --git a/kglobalaccel/kglobalaccel_qws.cpp b/kglobalaccel/kglobalaccel_qws.cpp index 7a7a03c8..a6ecc877 100644 --- a/kglobalaccel/kglobalaccel_qws.cpp +++ b/kglobalaccel/kglobalaccel_qws.cpp @@ -21,7 +21,7 @@ #include -#include +#include #ifdef Q_WS_QWS #include "kglobalaccel.h" diff --git a/kglobalaccel/kglobalaccel_x11.cpp b/kglobalaccel/kglobalaccel_x11.cpp index 55d04318..4dfa9dcf 100644 --- a/kglobalaccel/kglobalaccel_x11.cpp +++ b/kglobalaccel/kglobalaccel_x11.cpp @@ -21,7 +21,7 @@ #include "kglobalaccel_x11.h" -#include +#include #include "kaction.h" #include "globalshortcutsregistry.h" @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include diff --git a/kglobalaccel/kglobalacceld.cpp b/kglobalaccel/kglobalacceld.cpp index 3e228937..a836344a 100644 --- a/kglobalaccel/kglobalacceld.cpp +++ b/kglobalaccel/kglobalacceld.cpp @@ -28,9 +28,9 @@ #include "globalshortcutsregistry.h" #include -#include +#include #include -#include +#include #include "klocale.h" #include "kglobalaccel.h" diff --git a/khotkeys/kcm_hotkeys/helper_widgets/gesture_drawer.cpp b/khotkeys/kcm_hotkeys/helper_widgets/gesture_drawer.cpp index a1066086..d183cd07 100644 --- a/khotkeys/kcm_hotkeys/helper_widgets/gesture_drawer.cpp +++ b/khotkeys/kcm_hotkeys/helper_widgets/gesture_drawer.cpp @@ -13,8 +13,8 @@ #include #include #include -#include -#include +#include +#include #include "gesture_drawer.h" diff --git a/khotkeys/kcm_hotkeys/helper_widgets/gesture_recorder.cpp b/khotkeys/kcm_hotkeys/helper_widgets/gesture_recorder.cpp index a310ac05..681b1159 100644 --- a/khotkeys/kcm_hotkeys/helper_widgets/gesture_recorder.cpp +++ b/khotkeys/kcm_hotkeys/helper_widgets/gesture_recorder.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include "gesture_recorder.h" diff --git a/khotkeys/kcm_hotkeys/helper_widgets/window_selector.cpp b/khotkeys/kcm_hotkeys/helper_widgets/window_selector.cpp index 4804c5e9..74d11901 100644 --- a/khotkeys/kcm_hotkeys/helper_widgets/window_selector.cpp +++ b/khotkeys/kcm_hotkeys/helper_widgets/window_selector.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include namespace KHotKeys diff --git a/khotkeys/kcm_hotkeys/hotkeys_context_menu.cpp b/khotkeys/kcm_hotkeys/hotkeys_context_menu.cpp index 38bbae71..7c98e4e3 100644 --- a/khotkeys/kcm_hotkeys/hotkeys_context_menu.cpp +++ b/khotkeys/kcm_hotkeys/hotkeys_context_menu.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include HotkeysTreeViewContextMenu::HotkeysTreeViewContextMenu( const QModelIndex &index, HotkeysTreeView *parent ) diff --git a/khotkeys/kcm_hotkeys/hotkeys_context_menu.h b/khotkeys/kcm_hotkeys/hotkeys_context_menu.h index 04a8c4ea..d477607a 100644 --- a/khotkeys/kcm_hotkeys/hotkeys_context_menu.h +++ b/khotkeys/kcm_hotkeys/hotkeys_context_menu.h @@ -25,7 +25,7 @@ #include "libkhotkeysfwd.h" #include -#include +#include class HotkeysTreeView; diff --git a/khotkeys/kcm_hotkeys/hotkeys_tree_view.cpp b/khotkeys/kcm_hotkeys/hotkeys_tree_view.cpp index 637def15..d7120e17 100644 --- a/khotkeys/kcm_hotkeys/hotkeys_tree_view.cpp +++ b/khotkeys/kcm_hotkeys/hotkeys_tree_view.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include HotkeysTreeView::HotkeysTreeView( QWidget *parent ) diff --git a/khotkeys/kcm_hotkeys/kcm_hotkeys.h b/khotkeys/kcm_hotkeys/kcm_hotkeys.h index 0d445759..f6c5484b 100644 --- a/khotkeys/kcm_hotkeys/kcm_hotkeys.h +++ b/khotkeys/kcm_hotkeys/kcm_hotkeys.h @@ -21,7 +21,7 @@ #include -#include +#include class KCMHotkeysPrivate; class QWidget; diff --git a/khotkeys/libkhotkeysprivate/actions/keyboard_input_action.cpp b/khotkeys/libkhotkeysprivate/actions/keyboard_input_action.cpp index bf979ba1..fca81b7e 100644 --- a/khotkeys/libkhotkeysprivate/actions/keyboard_input_action.cpp +++ b/khotkeys/libkhotkeysprivate/actions/keyboard_input_action.cpp @@ -29,7 +29,7 @@ // #include #include -#include +#include /* */ diff --git a/khotkeys/libkhotkeysprivate/shortcuts_handler.cpp b/khotkeys/libkhotkeysprivate/shortcuts_handler.cpp index 5385a0c3..eff2c97a 100644 --- a/khotkeys/libkhotkeysprivate/shortcuts_handler.cpp +++ b/khotkeys/libkhotkeysprivate/shortcuts_handler.cpp @@ -27,7 +27,7 @@ #include // #include -#include +#include #include #include diff --git a/khotkeys/libkhotkeysprivate/sound.h b/khotkeys/libkhotkeysprivate/sound.h index 606e6d01..2c3d5092 100644 --- a/khotkeys/libkhotkeysprivate/sound.h +++ b/khotkeys/libkhotkeysprivate/sound.h @@ -21,7 +21,7 @@ #define SOUND_H #include -#include +#include #include /** diff --git a/khotkeys/libkhotkeysprivate/triggers/gestures.cpp b/khotkeys/libkhotkeysprivate/triggers/gestures.cpp index e70c074f..84f6e5cb 100644 --- a/khotkeys/libkhotkeysprivate/triggers/gestures.cpp +++ b/khotkeys/libkhotkeysprivate/triggers/gestures.cpp @@ -29,7 +29,7 @@ #include "windows_helper/window_selection_list.h" // only necessary for circumventing bug #173606, see below -#include +#include #include //#include diff --git a/khotkeys/libkhotkeysprivate/voicesignature.cpp b/khotkeys/libkhotkeysprivate/voicesignature.cpp index a0de8c62..e5c50644 100644 --- a/khotkeys/libkhotkeysprivate/voicesignature.cpp +++ b/khotkeys/libkhotkeysprivate/voicesignature.cpp @@ -30,7 +30,7 @@ #include -#include +#include #undef Complex diff --git a/khotkeys/libkhotkeysprivate/windows_handler.cpp b/khotkeys/libkhotkeysprivate/windows_handler.cpp index cf238337..19aff6c3 100644 --- a/khotkeys/libkhotkeysprivate/windows_handler.cpp +++ b/khotkeys/libkhotkeysprivate/windows_handler.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include namespace KHotKeys { diff --git a/kinfocenter/CMakeLists.txt b/kinfocenter/CMakeLists.txt index 9d8cbf2e..22a74529 100644 --- a/kinfocenter/CMakeLists.txt +++ b/kinfocenter/CMakeLists.txt @@ -1,3 +1,4 @@ +include(CheckCXXSymbolExists) include_directories( ${KDE4_INCLUDES} ) add_definitions( -DKDE_DEFAULT_DEBUG_AREA=1208 ) diff --git a/kinfocenter/Modules/base/os_base.h b/kinfocenter/Modules/base/os_base.h index 9b647393..89c1d945 100644 --- a/kinfocenter/Modules/base/os_base.h +++ b/kinfocenter/Modules/base/os_base.h @@ -28,7 +28,7 @@ License along with this library. If not, see . #include #include #include -#include +#include #include #include diff --git a/kinfocenter/Modules/devinfo/devicelisting.h b/kinfocenter/Modules/devinfo/devicelisting.h index c13921a8..eec5040f 100644 --- a/kinfocenter/Modules/devinfo/devicelisting.h +++ b/kinfocenter/Modules/devinfo/devicelisting.h @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include //Local diff --git a/kinfocenter/Modules/devinfo/soldevice.h b/kinfocenter/Modules/devinfo/soldevice.h index 833251f6..5c9f11e1 100644 --- a/kinfocenter/Modules/devinfo/soldevice.h +++ b/kinfocenter/Modules/devinfo/soldevice.h @@ -24,7 +24,7 @@ #define SOLDEVICE //QT -#include +#include #include //Solid diff --git a/kinfocenter/Modules/memory/chartWidget.cpp b/kinfocenter/Modules/memory/chartWidget.cpp index e668b7be..70a9cad2 100644 --- a/kinfocenter/Modules/memory/chartWidget.cpp +++ b/kinfocenter/Modules/memory/chartWidget.cpp @@ -12,7 +12,7 @@ #include "chartWidget.h" #include -#include +#include #include #include #include diff --git a/kinfocenter/Modules/memory/memory.cpp b/kinfocenter/Modules/memory/memory.cpp index 31e3cccd..51107620 100644 --- a/kinfocenter/Modules/memory/memory.cpp +++ b/kinfocenter/Modules/memory/memory.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/kinfocenter/Modules/pci/kpci.cpp b/kinfocenter/Modules/pci/kpci.cpp index fce41bbf..a096474b 100644 --- a/kinfocenter/Modules/pci/kpci.cpp +++ b/kinfocenter/Modules/pci/kpci.cpp @@ -20,7 +20,7 @@ extern "C" { #include //isxdigit #include //memcpy #include -#include +#include #include static const QString& getNameById(const id2name *const table, int id) { diff --git a/kinfocenter/Modules/view1394/view1394.cpp b/kinfocenter/Modules/view1394/view1394.cpp index 99bf056d..936e92e7 100644 --- a/kinfocenter/Modules/view1394/view1394.cpp +++ b/kinfocenter/Modules/view1394/view1394.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/kinfocenter/ToolTips/ktooltipwindow.cpp b/kinfocenter/ToolTips/ktooltipwindow.cpp index 5e3f777d..1d195cc7 100644 --- a/kinfocenter/ToolTips/ktooltipwindow.cpp +++ b/kinfocenter/ToolTips/ktooltipwindow.cpp @@ -27,7 +27,7 @@ #include #ifdef Q_WS_X11 - #include + #include #endif KToolTipWindow::KToolTipWindow(QWidget* content) : diff --git a/kinfocenter/ToolTips/tooltipmanager.cpp b/kinfocenter/ToolTips/tooltipmanager.cpp index 714af948..42f4f3f4 100644 --- a/kinfocenter/ToolTips/tooltipmanager.cpp +++ b/kinfocenter/ToolTips/tooltipmanager.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -36,7 +36,7 @@ #include #ifdef Q_WS_X11 -#include +#include #endif #include diff --git a/kinfocenter/ToolTips/tooltipmanager.h b/kinfocenter/ToolTips/tooltipmanager.h index 65630a03..6b1b3e1d 100644 --- a/kinfocenter/ToolTips/tooltipmanager.h +++ b/kinfocenter/ToolTips/tooltipmanager.h @@ -22,7 +22,7 @@ #include -#include +#include class QLayout; class QAbstractItemView; diff --git a/kinfocenter/infokcmmodel.h b/kinfocenter/infokcmmodel.h index e383d8e8..f099fb54 100644 --- a/kinfocenter/infokcmmodel.h +++ b/kinfocenter/infokcmmodel.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/kinfocenter/infokcmproxymodel.h b/kinfocenter/infokcmproxymodel.h index d13f85ce..47978956 100644 --- a/kinfocenter/infokcmproxymodel.h +++ b/kinfocenter/infokcmproxymodel.h @@ -24,7 +24,7 @@ #define INFOKCMPROXYMODEL //QT -#include +#include #include #include diff --git a/kinfocenter/sidepanel.h b/kinfocenter/sidepanel.h index 507a36d4..89225009 100644 --- a/kinfocenter/sidepanel.h +++ b/kinfocenter/sidepanel.h @@ -25,8 +25,8 @@ //QT #include -#include -#include +#include +#include #include #include #include diff --git a/kioexec/main.cpp b/kioexec/main.cpp index 78662b05..36cabe7a 100644 --- a/kioexec/main.cpp +++ b/kioexec/main.cpp @@ -22,7 +22,7 @@ #include "main.h" #include -#include +#include #include #include diff --git a/kioslave/desktop/desktopnotifier.cpp b/kioslave/desktop/desktopnotifier.cpp index 7783c868..5fe802ee 100644 --- a/kioslave/desktop/desktopnotifier.cpp +++ b/kioslave/desktop/desktopnotifier.cpp @@ -18,6 +18,8 @@ #include "desktopnotifier.h" +#include + #include #include #include diff --git a/kioslave/network/network/builder/dnssd/dnssdnetsystemable.h b/kioslave/network/network/builder/dnssd/dnssdnetsystemable.h index e1a85b99..ccb190a0 100644 --- a/kioslave/network/network/builder/dnssd/dnssdnetsystemable.h +++ b/kioslave/network/network/builder/dnssd/dnssdnetsystemable.h @@ -26,7 +26,7 @@ // KDE #include // Qt -#include +#include namespace Mollet { class NetServicePrivate; diff --git a/kioslave/network/network/builder/dnssd/dnssdnetworkbuilder.cpp b/kioslave/network/network/builder/dnssd/dnssdnetworkbuilder.cpp index 1fe1c18f..12deb6fa 100644 --- a/kioslave/network/network/builder/dnssd/dnssdnetworkbuilder.cpp +++ b/kioslave/network/network/builder/dnssd/dnssdnetworkbuilder.cpp @@ -32,7 +32,7 @@ #include // Qt #include -#include +#include #include diff --git a/kioslave/network/network/builder/upnp/cagibidevice.h b/kioslave/network/network/builder/upnp/cagibidevice.h index 849a510a..5d04a872 100644 --- a/kioslave/network/network/builder/upnp/cagibidevice.h +++ b/kioslave/network/network/builder/upnp/cagibidevice.h @@ -24,7 +24,7 @@ #define CAGIBIDEVICE_H // Qt -#include +#include namespace Cagibi { class Device; } class QString; diff --git a/kioslave/network/network/builder/upnp/upnpnetsystemable.h b/kioslave/network/network/builder/upnp/upnpnetsystemable.h index 79b7376f..491cc36b 100644 --- a/kioslave/network/network/builder/upnp/upnpnetsystemable.h +++ b/kioslave/network/network/builder/upnp/upnpnetsystemable.h @@ -24,7 +24,7 @@ #define UPNPNETSYSTEMABLE_H // Qt -#include +#include namespace Cagibi { class Device; diff --git a/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp b/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp index c7d9f94d..8b5b7809 100644 --- a/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp +++ b/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include diff --git a/kioslave/network/network/netdevice_p.cpp b/kioslave/network/network/netdevice_p.cpp index b3e66096..56eb689b 100644 --- a/kioslave/network/network/netdevice_p.cpp +++ b/kioslave/network/network/netdevice_p.cpp @@ -25,7 +25,7 @@ // library #include "netservice_p.h" // Qt -#include +#include namespace Mollet diff --git a/kioslave/recentdocuments/recentdocumentsnotifier.cpp b/kioslave/recentdocuments/recentdocumentsnotifier.cpp index ccf669e8..5b05daa5 100644 --- a/kioslave/recentdocuments/recentdocumentsnotifier.cpp +++ b/kioslave/recentdocuments/recentdocumentsnotifier.cpp @@ -8,6 +8,8 @@ #include #include +#include + #include "recentdocumentsnotifier.h" K_PLUGIN_FACTORY(RecentDocumentsFactory, registerPlugin();) diff --git a/kioslave/trash/kcmtrash.cpp b/kioslave/trash/kcmtrash.cpp index a7bb4551..2770b8ea 100644 --- a/kioslave/trash/kcmtrash.cpp +++ b/kioslave/trash/kcmtrash.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/klipper/klipper.h b/klipper/klipper.h index bbfd9c9e..113e7816 100644 --- a/klipper/klipper.h +++ b/klipper/klipper.h @@ -21,7 +21,7 @@ #ifndef KLIPPER_H #define KLIPPER_H -#include +#include #include #include diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp index 0aafed4f..f408fbaf 100644 --- a/klipper/klipperpopup.cpp +++ b/klipper/klipperpopup.cpp @@ -21,7 +21,7 @@ #include "klipperpopup.h" #include -#include +#include #include #include diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp index 7ecc7804..c69db09d 100644 --- a/klipper/urlgrabber.cpp +++ b/klipper/urlgrabber.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/kmenuedit/klinespellchecking.cpp b/kmenuedit/klinespellchecking.cpp index b2759418..8266b26f 100644 --- a/kmenuedit/klinespellchecking.cpp +++ b/kmenuedit/klinespellchecking.cpp @@ -19,7 +19,7 @@ #include "klinespellchecking.h" #include -#include +#include #include #include diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp index 6fd2558f..078ba195 100644 --- a/kmenuedit/treeview.cpp +++ b/kmenuedit/treeview.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/knotify/notifybypopup.cpp b/knotify/notifybypopup.cpp index b120ced4..df4ce632 100644 --- a/knotify/notifybypopup.cpp +++ b/knotify/notifybypopup.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include static const char dbusServiceName[] = "org.freedesktop.Notifications"; diff --git a/knotify/notifybypopup.h b/knotify/notifybypopup.h index cbde2a65..38775712 100644 --- a/knotify/notifybypopup.h +++ b/knotify/notifybypopup.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include class KPassivePopup; diff --git a/knotify/notifybysound.cpp b/knotify/notifybysound.cpp index 9e065cd5..48840b5b 100644 --- a/knotify/notifybysound.cpp +++ b/knotify/notifybysound.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/krunner/interfaces/default/interface.cpp b/krunner/interfaces/default/interface.cpp index 1399d104..82dd9883 100644 --- a/krunner/interfaces/default/interface.cpp +++ b/krunner/interfaces/default/interface.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/krunner/interfaces/default/interface.h b/krunner/interfaces/default/interface.h index 01680a1d..b84cbc6d 100644 --- a/krunner/interfaces/default/interface.h +++ b/krunner/interfaces/default/interface.h @@ -21,7 +21,7 @@ #ifndef INTERFACE_H #define INTERFACE_H -#include +#include #include // local includes diff --git a/krunner/interfaces/default/krunnerhistorycombobox.h b/krunner/interfaces/default/krunnerhistorycombobox.h index f129a8b9..361533f8 100644 --- a/krunner/interfaces/default/krunnerhistorycombobox.h +++ b/krunner/interfaces/default/krunnerhistorycombobox.h @@ -24,8 +24,8 @@ #include -#include -#include +#include +#include #include diff --git a/krunner/interfaces/default/resultitem.cpp b/krunner/interfaces/default/resultitem.cpp index eb4abf6a..9f33e0a0 100644 --- a/krunner/interfaces/default/resultitem.cpp +++ b/krunner/interfaces/default/resultitem.cpp @@ -30,11 +30,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/krunner/interfaces/default/resultscene.cpp b/krunner/interfaces/default/resultscene.cpp index 9090e1d1..d4f652ad 100644 --- a/krunner/interfaces/default/resultscene.cpp +++ b/krunner/interfaces/default/resultscene.cpp @@ -23,8 +23,8 @@ #include "resultscene.h" #include -#include -#include +#include +#include #include #include #include diff --git a/krunner/interfaces/default/resultscene.h b/krunner/interfaces/default/resultscene.h index 4aa48444..2bc7cd4f 100644 --- a/krunner/interfaces/default/resultscene.h +++ b/krunner/interfaces/default/resultscene.h @@ -24,7 +24,7 @@ #define __ResultScene_h__ #include -#include +#include #include #include diff --git a/krunner/interfaces/default/resultview.cpp b/krunner/interfaces/default/resultview.cpp index a78d9eec..4d68f55b 100644 --- a/krunner/interfaces/default/resultview.cpp +++ b/krunner/interfaces/default/resultview.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/krunner/interfaces/default/selectionbar.cpp b/krunner/interfaces/default/selectionbar.cpp index 1f5615bf..11fda467 100644 --- a/krunner/interfaces/default/selectionbar.cpp +++ b/krunner/interfaces/default/selectionbar.cpp @@ -20,7 +20,7 @@ #include "selectionbar.h" #include -#include +#include #include #include diff --git a/krunner/interfaces/quicksand/qs_completionbox.cpp b/krunner/interfaces/quicksand/qs_completionbox.cpp index 1e26ae67..0f200bc1 100644 --- a/krunner/interfaces/quicksand/qs_completionbox.cpp +++ b/krunner/interfaces/quicksand/qs_completionbox.cpp @@ -17,9 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . */ -#include +#include #include -#include +#include #include diff --git a/krunner/interfaces/quicksand/qs_matchview.cpp b/krunner/interfaces/quicksand/qs_matchview.cpp index f8960f28..d30b9d97 100644 --- a/krunner/interfaces/quicksand/qs_matchview.cpp +++ b/krunner/interfaces/quicksand/qs_matchview.cpp @@ -20,13 +20,13 @@ #include #include -#include +#include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include diff --git a/krunner/interfaces/quicksand/qs_statusbar.cpp b/krunner/interfaces/quicksand/qs_statusbar.cpp index 4e2748cd..5bfa2b18 100644 --- a/krunner/interfaces/quicksand/qs_statusbar.cpp +++ b/krunner/interfaces/quicksand/qs_statusbar.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include diff --git a/krunner/krunnerdialog.cpp b/krunner/krunnerdialog.cpp index 5b6498e5..b13836bc 100644 --- a/krunner/krunnerdialog.cpp +++ b/krunner/krunnerdialog.cpp @@ -20,10 +20,10 @@ #include #include -#include -#include +#include +#include #ifdef Q_WS_X11 -#include +#include #endif #include #include diff --git a/krunner/ksystemactivitydialog.cpp b/krunner/ksystemactivitydialog.cpp index ae42ad85..ebea24d4 100644 --- a/krunner/ksystemactivitydialog.cpp +++ b/krunner/ksystemactivitydialog.cpp @@ -20,7 +20,7 @@ #include "ksystemactivitydialog.h" #include -#include +#include #include #include #include diff --git a/krunner/startupid.cpp b/krunner/startupid.cpp index 773d40b5..630d2f01 100644 --- a/krunner/startupid.cpp +++ b/krunner/startupid.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kscreensaver/kdesavers/asciiquarium/aasaver.cpp b/kscreensaver/kdesavers/asciiquarium/aasaver.cpp index 75a1379d..ed54ff03 100644 --- a/kscreensaver/kdesavers/asciiquarium/aasaver.cpp +++ b/kscreensaver/kdesavers/asciiquarium/aasaver.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include diff --git a/kscreensaver/kdesavers/pendulum.cpp b/kscreensaver/kdesavers/pendulum.cpp index 92d65bf6..7d60bf62 100644 --- a/kscreensaver/kdesavers/pendulum.cpp +++ b/kscreensaver/kdesavers/pendulum.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include // KDE headers #include diff --git a/kscreensaver/kdesavers/rotation.cpp b/kscreensaver/kdesavers/rotation.cpp index 0d655879..be66704f 100644 --- a/kscreensaver/kdesavers/rotation.cpp +++ b/kscreensaver/kdesavers/rotation.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include // KDE headers #include diff --git a/kscreensaver/kdesavers/science.cpp b/kscreensaver/kdesavers/science.cpp index 8f134dc2..83167243 100644 --- a/kscreensaver/kdesavers/science.cpp +++ b/kscreensaver/kdesavers/science.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include diff --git a/kscreensaver/krandom_screensaver/random.cpp b/kscreensaver/krandom_screensaver/random.cpp index ffb5726b..70afecba 100644 --- a/kscreensaver/krandom_screensaver/random.cpp +++ b/kscreensaver/krandom_screensaver/random.cpp @@ -36,7 +36,7 @@ #include "kscreensaver_vroot.h" #include "random.h" #ifdef Q_WS_X11 -#include +#include #endif #include #include diff --git a/kscreensaver/libkscreensaver/kscreensaver.cpp b/kscreensaver/libkscreensaver/kscreensaver.cpp index 1414b0a9..8468afda 100644 --- a/kscreensaver/libkscreensaver/kscreensaver.cpp +++ b/kscreensaver/libkscreensaver/kscreensaver.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/kscreensaver/libkscreensaver/main.cpp b/kscreensaver/libkscreensaver/main.cpp index 1e9846d4..0dc5914a 100644 --- a/kscreensaver/libkscreensaver/main.cpp +++ b/kscreensaver/libkscreensaver/main.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include @@ -42,7 +42,7 @@ #include #ifdef Q_WS_X11 -#include +#include #endif static void crashHandler( int ) diff --git a/ksmserver/fadeeffect.cpp b/ksmserver/fadeeffect.cpp index f18b4beb..648babd4 100644 --- a/ksmserver/fadeeffect.cpp +++ b/ksmserver/fadeeffect.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/ksmserver/fadeeffect.h b/ksmserver/fadeeffect.h index 8d45ebc0..eba6bff4 100644 --- a/ksmserver/fadeeffect.h +++ b/ksmserver/fadeeffect.h @@ -23,7 +23,7 @@ #define FADEEFFECT_H #include -#include +#include #include "logouteffect.h" #include diff --git a/ksmserver/logouteffect.cpp b/ksmserver/logouteffect.cpp index a2fc0605..59be7c15 100644 --- a/ksmserver/logouteffect.cpp +++ b/ksmserver/logouteffect.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include "logouteffect.h" diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index f452b65f..595dbded 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -44,7 +44,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include "server.h" -#include +#include +#include #include diff --git a/ksmserver/screenlocker/greeter/greeterapp.cpp b/ksmserver/screenlocker/greeter/greeterapp.cpp index 9f263723..146c106f 100644 --- a/ksmserver/screenlocker/greeter/greeterapp.cpp +++ b/ksmserver/screenlocker/greeter/greeterapp.cpp @@ -46,7 +46,7 @@ along with this program. If not, see . #include #include #include -#include +#include #include // X11 #include diff --git a/ksmserver/screenlocker/greeter/screensaverwindow.cpp b/ksmserver/screenlocker/greeter/screensaverwindow.cpp index e43b7989..a6d91917 100644 --- a/ksmserver/screenlocker/greeter/screensaverwindow.cpp +++ b/ksmserver/screenlocker/greeter/screensaverwindow.cpp @@ -23,11 +23,11 @@ #include "kscreensaversettings.h" #include -#include -#include +#include +#include #include #include -#include +#include #include #include diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp index b493e2af..0de193a3 100644 --- a/ksmserver/screenlocker/ksldapp.cpp +++ b/ksmserver/screenlocker/ksldapp.cpp @@ -41,7 +41,7 @@ along with this program. If not, see . #include #include #include -#include +#include // X11 #include // other diff --git a/ksmserver/screenlocker/lockwindow.cpp b/ksmserver/screenlocker/lockwindow.cpp index cabbfab8..d56fb29f 100644 --- a/ksmserver/screenlocker/lockwindow.cpp +++ b/ksmserver/screenlocker/lockwindow.cpp @@ -33,7 +33,7 @@ along with this program. If not, see . #include #include #include -#include +#include // X11 #include #include diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index a28a563a..79e511c0 100644 --- a/ksmserver/server.cpp +++ b/ksmserver/server.cpp @@ -66,6 +66,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include +#include #include #include @@ -90,7 +91,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #endif #include -#include +#include #include #include diff --git a/ksmserver/server.h b/ksmserver/server.h index 3b993c59..77f149f8 100644 --- a/ksmserver/server.h +++ b/ksmserver/server.h @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #define INT32 QINT32 diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp index d1db3ff2..d2c4c75a 100644 --- a/ksmserver/shutdown.cpp +++ b/ksmserver/shutdown.cpp @@ -77,7 +77,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include #include diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp index d99ce4cf..4ba0eb50 100644 --- a/ksmserver/startup.cpp +++ b/ksmserver/startup.cpp @@ -76,7 +76,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "client.h" #include -#include +#include //#include "kdesktop_interface.h" #include diff --git a/ksplash/ksplashqml/SplashWindow.cpp b/ksplash/ksplashqml/SplashWindow.cpp index 44176437..be833af3 100644 --- a/ksplash/ksplashqml/SplashWindow.cpp +++ b/ksplash/ksplashqml/SplashWindow.cpp @@ -21,9 +21,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include "SystemInfo.h" diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp index 881d5415..903c9403 100644 --- a/kstart/kstart.cpp +++ b/kstart/kstart.cpp @@ -46,7 +46,7 @@ #include #include -#include +#include // some globals diff --git a/kstart/kstart.h b/kstart/kstart.h index 1b7a0827..bbc11583 100644 --- a/kstart/kstart.h +++ b/kstart/kstart.h @@ -25,7 +25,7 @@ #ifndef KSTART_H #define KSTART_H -#include +#include #include class KStart: public QObject { diff --git a/kstyles/oxygen/debug/oxygenwidgetexplorer.cpp b/kstyles/oxygen/debug/oxygenwidgetexplorer.cpp index f9e71575..66643be8 100644 --- a/kstyles/oxygen/debug/oxygenwidgetexplorer.cpp +++ b/kstyles/oxygen/debug/oxygenwidgetexplorer.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include namespace Oxygen diff --git a/kstyles/oxygen/demo/oxygenbenchmarkwidget.h b/kstyles/oxygen/demo/oxygenbenchmarkwidget.h index 345fc618..2fb3476c 100644 --- a/kstyles/oxygen/demo/oxygenbenchmarkwidget.h +++ b/kstyles/oxygen/demo/oxygenbenchmarkwidget.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include "oxygendemowidget.h" diff --git a/kstyles/oxygen/demo/oxygensimulator.cpp b/kstyles/oxygen/demo/oxygensimulator.cpp index ce0f657d..787fc9a6 100644 --- a/kstyles/oxygen/demo/oxygensimulator.cpp +++ b/kstyles/oxygen/demo/oxygensimulator.cpp @@ -35,18 +35,18 @@ #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include #include #include #include -#include -#include +#include +#include #include diff --git a/kstyles/oxygen/demo/oxygensimulator.h b/kstyles/oxygen/demo/oxygensimulator.h index e58b0e23..317444fc 100644 --- a/kstyles/oxygen/demo/oxygensimulator.h +++ b/kstyles/oxygen/demo/oxygensimulator.h @@ -36,8 +36,8 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/kstyles/oxygen/demo/oxygensliderdemowidget.cpp b/kstyles/oxygen/demo/oxygensliderdemowidget.cpp index e7e08d6e..6cb0ebdb 100644 --- a/kstyles/oxygen/demo/oxygensliderdemowidget.cpp +++ b/kstyles/oxygen/demo/oxygensliderdemowidget.cpp @@ -28,7 +28,7 @@ #include "moc_oxygensliderdemowidget.cpp" #include -#include +#include namespace Oxygen { diff --git a/kstyles/oxygen/oxygenblurhelper.cpp b/kstyles/oxygen/oxygenblurhelper.cpp index bac2031e..93accb4d 100644 --- a/kstyles/oxygen/oxygenblurhelper.cpp +++ b/kstyles/oxygen/oxygenblurhelper.cpp @@ -38,7 +38,7 @@ #include #ifdef Q_WS_X11 -#include +#include #include #include #endif diff --git a/kstyles/oxygen/oxygenblurhelper.h b/kstyles/oxygen/oxygenblurhelper.h index a29e1096..1463bb3f 100644 --- a/kstyles/oxygen/oxygenblurhelper.h +++ b/kstyles/oxygen/oxygenblurhelper.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include diff --git a/kstyles/oxygen/oxygenframeshadow.cpp b/kstyles/oxygen/oxygenframeshadow.cpp index 5b38b6a2..65e5ba62 100644 --- a/kstyles/oxygen/oxygenframeshadow.cpp +++ b/kstyles/oxygen/oxygenframeshadow.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/kstyles/oxygen/oxygenframeshadow.h b/kstyles/oxygen/oxygenframeshadow.h index b337efba..7eef0519 100644 --- a/kstyles/oxygen/oxygenframeshadow.h +++ b/kstyles/oxygen/oxygenframeshadow.h @@ -38,7 +38,7 @@ #include #include -#include +#include #include namespace Oxygen diff --git a/kstyles/oxygen/oxygenmdiwindowshadow.h b/kstyles/oxygen/oxygenmdiwindowshadow.h index 14fa76d9..66e68611 100644 --- a/kstyles/oxygen/oxygenmdiwindowshadow.h +++ b/kstyles/oxygen/oxygenmdiwindowshadow.h @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include "oxygenstylehelper.h" diff --git a/kstyles/oxygen/oxygenmnemonics.cpp b/kstyles/oxygen/oxygenmnemonics.cpp index 4b076e22..1d4be783 100644 --- a/kstyles/oxygen/oxygenmnemonics.cpp +++ b/kstyles/oxygen/oxygenmnemonics.cpp @@ -22,7 +22,7 @@ #include "oxygenmnemonics.h" -#include +#include #include namespace Oxygen diff --git a/kstyles/oxygen/oxygenshadowhelper.cpp b/kstyles/oxygen/oxygenshadowhelper.cpp index 74703fb3..c85c1424 100644 --- a/kstyles/oxygen/oxygenshadowhelper.cpp +++ b/kstyles/oxygen/oxygenshadowhelper.cpp @@ -37,7 +37,7 @@ #include #ifdef Q_WS_X11 -#include +#include #include #include #endif diff --git a/kstyles/oxygen/oxygensplitterproxy.h b/kstyles/oxygen/oxygensplitterproxy.h index 112e14c2..631b5135 100644 --- a/kstyles/oxygen/oxygensplitterproxy.h +++ b/kstyles/oxygen/oxygensplitterproxy.h @@ -29,11 +29,11 @@ #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include "oxygenaddeventfilter.h" diff --git a/kstyles/oxygen/oxygenstyle.cpp b/kstyles/oxygen/oxygenstyle.cpp index 24c9b1a7..841d3574 100644 --- a/kstyles/oxygen/oxygenstyle.cpp +++ b/kstyles/oxygen/oxygenstyle.cpp @@ -81,7 +81,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kstyles/oxygen/oxygenstyle.h b/kstyles/oxygen/oxygenstyle.h index 0e02e4ac..0d9ce744 100644 --- a/kstyles/oxygen/oxygenstyle.h +++ b/kstyles/oxygen/oxygenstyle.h @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kstyles/oxygen/oxygenstylehelper.cpp b/kstyles/oxygen/oxygenstylehelper.cpp index 298a6234..4510b94a 100644 --- a/kstyles/oxygen/oxygenstylehelper.cpp +++ b/kstyles/oxygen/oxygenstylehelper.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include diff --git a/kstyles/oxygen/oxygenstylehelper.h b/kstyles/oxygen/oxygenstylehelper.h index 797b6595..b99af0a3 100644 --- a/kstyles/oxygen/oxygenstylehelper.h +++ b/kstyles/oxygen/oxygenstylehelper.h @@ -28,7 +28,7 @@ #include #ifdef Q_WS_X11 -#include +#include #include #endif diff --git a/kstyles/oxygen/oxygenwindowmanager.cpp b/kstyles/oxygen/oxygenwindowmanager.cpp index f19ef210..6c3a69b6 100644 --- a/kstyles/oxygen/oxygenwindowmanager.cpp +++ b/kstyles/oxygen/oxygenwindowmanager.cpp @@ -45,12 +45,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include @@ -62,7 +62,7 @@ #include #ifdef Q_WS_X11 -#include +#include #include #endif diff --git a/kstyles/oxygen/oxygenwindowmanager.h b/kstyles/oxygen/oxygenwindowmanager.h index 7baa76f4..f5c7b4e9 100644 --- a/kstyles/oxygen/oxygenwindowmanager.h +++ b/kstyles/oxygen/oxygenwindowmanager.h @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include diff --git a/ksysguard/gui/SensorBrowser.cpp b/ksysguard/gui/SensorBrowser.cpp index b9a5b98e..8897746a 100644 --- a/ksysguard/gui/SensorBrowser.cpp +++ b/ksysguard/gui/SensorBrowser.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/ksysguard/gui/SensorBrowser.h b/ksysguard/gui/SensorBrowser.h index e98f1106..3efb55b8 100644 --- a/ksysguard/gui/SensorBrowser.h +++ b/ksysguard/gui/SensorBrowser.h @@ -22,7 +22,7 @@ #ifndef KSG_SENSORBROWSER_H #define KSG_SENSORBROWSER_H -#include +#include #include #include #include diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.h b/ksysguard/gui/SensorDisplayLib/BarGraph.h index 1b843dda..a6d576bd 100644 --- a/ksysguard/gui/SensorDisplayLib/BarGraph.h +++ b/ksysguard/gui/SensorDisplayLib/BarGraph.h @@ -23,7 +23,7 @@ #define KSG_BARGRAPH_H #include -#include +#include class BarGraph : public QWidget { diff --git a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp index ce11443f..9d9e19a0 100644 --- a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp +++ b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include "DummyDisplay.h" diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp index 7614ac85..bf777bc4 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp index cd02293b..60921b79 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cpp b/ksysguard/gui/SensorDisplayLib/ListView.cpp index 69805a43..cd870563 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.cpp +++ b/ksysguard/gui/SensorDisplayLib/ListView.cpp @@ -19,11 +19,11 @@ */ -#include +#include #include #include -#include +#include #include #include diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.h b/ksysguard/gui/SensorDisplayLib/LogFile.h index 2a0cb583..f28a0be3 100644 --- a/ksysguard/gui/SensorDisplayLib/LogFile.h +++ b/ksysguard/gui/SensorDisplayLib/LogFile.h @@ -28,7 +28,7 @@ class QListWidget; #include -#include +#include #include diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cpp b/ksysguard/gui/SensorDisplayLib/ProcessController.cpp index bd8367b0..25ebea68 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.cpp +++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include +#include #include #include #include diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp index 72ebcdf6..46cbd484 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp +++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp index 455b9d29..5c3ce980 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp +++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp @@ -19,18 +19,18 @@ */ -#include -#include +#include +#include #include #include -#include +#include #include #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/ksysguard/gui/SensorDisplayLib/SensorModel.h b/ksysguard/gui/SensorDisplayLib/SensorModel.h index abb1d6d1..2198ea34 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorModel.h +++ b/ksysguard/gui/SensorDisplayLib/SensorModel.h @@ -22,7 +22,7 @@ #ifndef SENSORMODEL_H #define SENSORMODEL_H -#include +#include #include #include diff --git a/ksysguard/gui/WorkSheet.cpp b/ksysguard/gui/WorkSheet.cpp index 7e0469b2..8df65474 100644 --- a/ksysguard/gui/WorkSheet.cpp +++ b/ksysguard/gui/WorkSheet.cpp @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/ksysguard/gui/tests/ksysguarddtest.cpp b/ksysguard/gui/tests/ksysguarddtest.cpp index 9380f6cc..acc0e278 100644 --- a/ksysguard/gui/tests/ksysguarddtest.cpp +++ b/ksysguard/gui/tests/ksysguarddtest.cpp @@ -1,6 +1,6 @@ #include "ksysguarddtest.h" #include -#include +#include KSGRD::SensorAgent *agent; diff --git a/ksysguard/gui/tests/ksysguarddtest.h b/ksysguard/gui/tests/ksysguarddtest.h index 4e5c26d4..329a23c7 100644 --- a/ksysguard/gui/tests/ksysguarddtest.h +++ b/ksysguard/gui/tests/ksysguarddtest.h @@ -1,6 +1,6 @@ #include -#include +#include #include #include diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp index 4d386cf0..879519dd 100644 --- a/ksystraycmd/ksystraycmd.cpp +++ b/ksystraycmd/ksystraycmd.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ #include "ksystraycmd.h" #include "moc_ksystraycmd.cpp" -#include +#include KSysTrayCmd::KSysTrayCmd() diff --git a/ksystraycmd/main.cpp b/ksystraycmd/main.cpp index 2b9f4b0c..8339c152 100644 --- a/ksystraycmd/main.cpp +++ b/ksystraycmd/main.cpp @@ -10,7 +10,7 @@ #include "ksystraycmd.h" #include -#include +#include const int XFocusOut = FocusOut; const int XFocusIn = FocusIn; #undef FocusOut diff --git a/kuiserver/jobview.h b/kuiserver/jobview.h index 721a7562..cd50f96a 100644 --- a/kuiserver/jobview.h +++ b/kuiserver/jobview.h @@ -23,7 +23,7 @@ #define JOBVIEW_H #include -#include +#include #include diff --git a/kuiserver/progresslistdelegate.h b/kuiserver/progresslistdelegate.h index d9991038..6579caec 100644 --- a/kuiserver/progresslistdelegate.h +++ b/kuiserver/progresslistdelegate.h @@ -20,7 +20,7 @@ #ifndef PROGRESSLISTDELEGATE_H #define PROGRESSLISTDELEGATE_H -#include +#include #include diff --git a/kuiserver/requestviewcallwatcher.cpp b/kuiserver/requestviewcallwatcher.cpp index 9102f9cb..123ccdef 100644 --- a/kuiserver/requestviewcallwatcher.cpp +++ b/kuiserver/requestviewcallwatcher.cpp @@ -15,7 +15,7 @@ * along with this program. If not, see . * *****************************************************************************/ -#include +#include #include "requestviewcallwatcher.h" #include "jobview.h" diff --git a/kuiserver/requestviewcallwatcher.h b/kuiserver/requestviewcallwatcher.h index 6d781bd0..06d256fd 100644 --- a/kuiserver/requestviewcallwatcher.h +++ b/kuiserver/requestviewcallwatcher.h @@ -19,7 +19,7 @@ #ifndef REQUESTVIEWCALLWATCHER_H #define REQUESTVIEWCALLWATCHER_H -#include +#include class JobView; class RequestViewCallWatcher : public QDBusPendingCallWatcher diff --git a/kuiserver/uiserver.cpp b/kuiserver/uiserver.cpp index 61980c0b..5f93c434 100644 --- a/kuiserver/uiserver.cpp +++ b/kuiserver/uiserver.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/kurifilter-plugins/ikws/ikwsopts_p.h b/kurifilter-plugins/ikws/ikwsopts_p.h index 1ef55605..bb6ade9a 100644 --- a/kurifilter-plugins/ikws/ikwsopts_p.h +++ b/kurifilter-plugins/ikws/ikwsopts_p.h @@ -19,7 +19,7 @@ #ifndef IKWSOPTS_P_H #define IKWSOPTS_P_H -#include +#include class SearchProvider; diff --git a/kwalletd/autotests/qtest_kwallet.h b/kwalletd/autotests/qtest_kwallet.h index d2564b03..7273f10b 100644 --- a/kwalletd/autotests/qtest_kwallet.h +++ b/kwalletd/autotests/qtest_kwallet.h @@ -2,6 +2,7 @@ #ifndef KWALLET_CUSTOM_QTEST #define KWALLET_CUSTOM_QTEST #include +#include #include #include #include @@ -45,4 +46,4 @@ int main(int argc, char *argv[]) \ dbus.waitForFinished(); \ return result; \ } -#endif //KWALLET_CUSTOM_QTEST \ No newline at end of file +#endif //KWALLET_CUSTOM_QTEST diff --git a/kwalletd/autotests/testpamopen.cpp b/kwalletd/autotests/testpamopen.cpp index a1f3b10a..438bc206 100644 --- a/kwalletd/autotests/testpamopen.cpp +++ b/kwalletd/autotests/testpamopen.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include diff --git a/kwalletd/autotests/testpamopennofile.cpp b/kwalletd/autotests/testpamopennofile.cpp index 92aeb31f..04b8612f 100644 --- a/kwalletd/autotests/testpamopennofile.cpp +++ b/kwalletd/autotests/testpamopennofile.cpp @@ -23,6 +23,9 @@ #include #include #include +#include +#include +#include class testPamOpenNoFile : public KWalletExecuter { diff --git a/kwalletmanager/src/konfigurator/konfigurator.cpp b/kwalletmanager/src/konfigurator/konfigurator.cpp index 6aed4c80..47c88a9f 100644 --- a/kwalletmanager/src/konfigurator/konfigurator.cpp +++ b/kwalletmanager/src/konfigurator/konfigurator.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include diff --git a/kwalletmanager/src/manager/allyourbase.cpp b/kwalletmanager/src/manager/allyourbase.cpp index a88b7118..4900f792 100644 --- a/kwalletmanager/src/manager/allyourbase.cpp +++ b/kwalletmanager/src/manager/allyourbase.cpp @@ -34,9 +34,9 @@ #include //Added by qt3to4: #include -#include -#include -#include +#include +#include +#include /**************** * KWalletFolderItem - ListView items to represent kwallet folders diff --git a/kwalletmanager/src/manager/allyourbase.h b/kwalletmanager/src/manager/allyourbase.h index ae8b3c75..c22237ac 100644 --- a/kwalletmanager/src/manager/allyourbase.h +++ b/kwalletmanager/src/manager/allyourbase.h @@ -26,9 +26,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #define KWALLETENTRYMAGIC ((quint32) 0x6B776C65) diff --git a/kwalletmanager/src/manager/kwalleteditor.cpp b/kwalletmanager/src/manager/kwalleteditor.cpp index fe1ccf7a..5fbf5e57 100644 --- a/kwalletmanager/src/manager/kwalleteditor.cpp +++ b/kwalletmanager/src/manager/kwalleteditor.cpp @@ -24,10 +24,10 @@ #include "allyourbase.h" #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/kwalletmanager/src/manager/kwalletmanager.cpp b/kwalletmanager/src/manager/kwalletmanager.cpp index 2f981863..e36dff34 100644 --- a/kwalletmanager/src/manager/kwalletmanager.cpp +++ b/kwalletmanager/src/manager/kwalletmanager.cpp @@ -42,7 +42,7 @@ #include #include -#include +#include #include #include #include diff --git a/kwalletmanager/src/manager/kwalletmanagerwidget.cpp b/kwalletmanager/src/manager/kwalletmanagerwidget.cpp index 7b001723..a6a42f54 100644 --- a/kwalletmanager/src/manager/kwalletmanagerwidget.cpp +++ b/kwalletmanager/src/manager/kwalletmanagerwidget.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include KWalletManagerWidget::KWalletManagerWidget(QWidget* parent, Qt::WindowFlags flags): KPageWidget(parent) diff --git a/kwalletmanager/src/manager/kwmapeditor.cpp b/kwalletmanager/src/manager/kwmapeditor.cpp index 6afd3f44..30e52738 100644 --- a/kwalletmanager/src/manager/kwmapeditor.cpp +++ b/kwalletmanager/src/manager/kwmapeditor.cpp @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include class InlineEditor : public KTextEdit { diff --git a/kwin/activation.cpp b/kwin/activation.cpp index c22110a6..b5c434a0 100644 --- a/kwin/activation.cpp +++ b/kwin/activation.cpp @@ -43,7 +43,7 @@ along with this program. If not, see . #include "rules.h" #include "screens.h" #include "useractions.h" -#include +#include namespace KWin { diff --git a/kwin/clients/oxygen/config/oxygendetectwidget.cpp b/kwin/clients/oxygen/config/oxygendetectwidget.cpp index 6305437b..a115ce79 100644 --- a/kwin/clients/oxygen/config/oxygendetectwidget.cpp +++ b/kwin/clients/oxygen/config/oxygendetectwidget.cpp @@ -34,9 +34,9 @@ #include #include #include -#include +#include -#include +#include #include #include #include diff --git a/kwin/clients/oxygen/demo/oxygenshadowdemowidget.h b/kwin/clients/oxygen/demo/oxygenshadowdemowidget.h index aa445fea..ee001d17 100644 --- a/kwin/clients/oxygen/demo/oxygenshadowdemowidget.h +++ b/kwin/clients/oxygen/demo/oxygenshadowdemowidget.h @@ -31,7 +31,7 @@ #include "oxygenhelper.h" #include -#include +#include #include #include diff --git a/kwin/clients/oxygen/oxygenclient.cpp b/kwin/clients/oxygen/oxygenclient.cpp index d66559d7..9b677ad3 100644 --- a/kwin/clients/oxygen/oxygenclient.cpp +++ b/kwin/clients/oxygen/oxygenclient.cpp @@ -43,8 +43,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/kwin/clients/oxygen/oxygenclient.h b/kwin/clients/oxygen/oxygenclient.h index 1988b28c..822b9e96 100644 --- a/kwin/clients/oxygen/oxygenclient.h +++ b/kwin/clients/oxygen/oxygenclient.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include diff --git a/kwin/clients/oxygen/oxygenclientgroupitemdata.h b/kwin/clients/oxygen/oxygenclientgroupitemdata.h index 8db8f3a8..fff0f313 100644 --- a/kwin/clients/oxygen/oxygenclientgroupitemdata.h +++ b/kwin/clients/oxygen/oxygenclientgroupitemdata.h @@ -30,7 +30,7 @@ #include "oxygenbutton.h" #include -#include +#include #include namespace Oxygen diff --git a/kwin/clients/oxygen/oxygensizegrip.cpp b/kwin/clients/oxygen/oxygensizegrip.cpp index be7dccf4..81c39f50 100644 --- a/kwin/clients/oxygen/oxygensizegrip.cpp +++ b/kwin/clients/oxygen/oxygensizegrip.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include namespace Oxygen diff --git a/kwin/clients/oxygen/oxygensizegrip.h b/kwin/clients/oxygen/oxygensizegrip.h index 0ed9455d..9088edfb 100644 --- a/kwin/clients/oxygen/oxygensizegrip.h +++ b/kwin/clients/oxygen/oxygensizegrip.h @@ -28,8 +28,8 @@ ////////////////////////////////////////////////////////////////////////////// #include -#include -#include +#include +#include namespace Oxygen { diff --git a/kwin/composite.cpp b/kwin/composite.cpp index 325cc9d0..d2c33460 100644 --- a/kwin/composite.cpp +++ b/kwin/composite.cpp @@ -43,7 +43,7 @@ along with this program. If not, see . #include #include #include -#include +#include #include #include #include diff --git a/kwin/effects.cpp b/kwin/effects.cpp index 9ec4523c..9886a8ae 100644 --- a/kwin/effects.cpp +++ b/kwin/effects.cpp @@ -46,7 +46,7 @@ along with this program. If not, see . #include #include #include -#include +#include #include #include diff --git a/kwin/effects/desktopgrid/desktopgrid.cpp b/kwin/effects/desktopgrid/desktopgrid.cpp index f5998da9..c0f00c10 100644 --- a/kwin/effects/desktopgrid/desktopgrid.cpp +++ b/kwin/effects/desktopgrid/desktopgrid.cpp @@ -39,12 +39,12 @@ along with this program. If not, see . #include #include #include -#include +#include #include #include #include #include -#include +#include namespace KWin { diff --git a/kwin/effects/presentwindows/presentwindows.cpp b/kwin/effects/presentwindows/presentwindows.cpp index ccf00361..86937574 100755 --- a/kwin/effects/presentwindows/presentwindows.cpp +++ b/kwin/effects/presentwindows/presentwindows.cpp @@ -34,7 +34,7 @@ along with this program. If not, see . #include -#include +#include #include #include @@ -44,7 +44,7 @@ along with this program. If not, see . #include #include #include -#include +#include #include #include #include diff --git a/kwin/effects/sheet/sheet.cpp b/kwin/effects/sheet/sheet.cpp index ee5eddf2..a3353a71 100644 --- a/kwin/effects/sheet/sheet.cpp +++ b/kwin/effects/sheet/sheet.cpp @@ -23,7 +23,7 @@ along with this program. If not, see . #include "sheetconfig.h" #include -#include +#include #include // Effect is based on fade effect by Philip Falkner diff --git a/kwin/effects/showfps/showfps.h b/kwin/effects/showfps/showfps.h index 27900b8f..2b1a0869 100644 --- a/kwin/effects/showfps/showfps.h +++ b/kwin/effects/showfps/showfps.h @@ -21,7 +21,7 @@ along with this program. If not, see . #ifndef KWIN_SHOWFPS_H #define KWIN_SHOWFPS_H -#include +#include #include diff --git a/kwin/effects/trackmouse/trackmouse.cpp b/kwin/effects/trackmouse/trackmouse.cpp index 5c52b734..c7403373 100644 --- a/kwin/effects/trackmouse/trackmouse.cpp +++ b/kwin/effects/trackmouse/trackmouse.cpp @@ -24,7 +24,7 @@ along with this program. If not, see . // KConfigSkeleton #include "trackmouseconfig.h" -#include +#include #include #include diff --git a/kwin/effects/zoom/zoom.h b/kwin/effects/zoom/zoom.h index 604655e6..e407b166 100644 --- a/kwin/effects/zoom/zoom.h +++ b/kwin/effects/zoom/zoom.h @@ -23,7 +23,7 @@ along with this program. If not, see . #define KWIN_ZOOM_H #include -#include +#include #include namespace KWin diff --git a/kwin/events.cpp b/kwin/events.cpp index 4919f3bc..98adbc00 100644 --- a/kwin/events.cpp +++ b/kwin/events.cpp @@ -57,7 +57,7 @@ along with this program. If not, see . #include #include #include -#include +#include #include "composite.h" #include "killwindow.h" diff --git a/kwin/geometry.cpp b/kwin/geometry.cpp index 8ebea421..9a573b49 100644 --- a/kwin/geometry.cpp +++ b/kwin/geometry.cpp @@ -48,7 +48,7 @@ along with this program. If not, see . #include #include #include -#include +#include #include #include "outline.h" diff --git a/kwin/geometrytip.cpp b/kwin/geometrytip.cpp index 736ddde9..f20fbb43 100644 --- a/kwin/geometrytip.cpp +++ b/kwin/geometrytip.cpp @@ -19,7 +19,7 @@ along with this program. If not, see . *********************************************************************/ #include "geometrytip.h" -#include +#include namespace KWin { diff --git a/kwin/group.cpp b/kwin/group.cpp index 26fa419f..984e6d5d 100644 --- a/kwin/group.cpp +++ b/kwin/group.cpp @@ -35,7 +35,7 @@ along with this program. If not, see . #include #include -#include +#include /* diff --git a/kwin/kcmkwin/kwindecoration/decorationmodel.h b/kwin/kcmkwin/kwindecoration/decorationmodel.h index a191341c..d48d4d35 100644 --- a/kwin/kcmkwin/kwindecoration/decorationmodel.h +++ b/kwin/kcmkwin/kwindecoration/decorationmodel.h @@ -20,7 +20,7 @@ along with this program. If not, see . #ifndef KWIN_DECORATIONMODEL_H #define KWIN_DECORATIONMODEL_H -#include +#include #include #include #include diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp index 3459e2a7..5195cf85 100644 --- a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp +++ b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include // KDE diff --git a/kwin/kcmkwin/kwindecoration/preview.cpp b/kwin/kcmkwin/kwindecoration/preview.cpp index 625587d2..8e6681a9 100644 --- a/kwin/kcmkwin/kwindecoration/preview.cpp +++ b/kwin/kcmkwin/kwindecoration/preview.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/kwin/kcmkwin/kwindesktop/main.cpp b/kwin/kcmkwin/kwindesktop/main.cpp index e8b22a5c..bbac16a5 100644 --- a/kwin/kcmkwin/kwindesktop/main.cpp +++ b/kwin/kcmkwin/kwindesktop/main.cpp @@ -36,7 +36,7 @@ along with this program. If not, see . #include #include -#include +#include #include diff --git a/kwin/kcmkwin/kwinrules/detectwidget.cpp b/kwin/kcmkwin/kwinrules/detectwidget.cpp index a01cface..0c77d30d 100644 --- a/kwin/kcmkwin/kwinrules/detectwidget.cpp +++ b/kwin/kcmkwin/kwinrules/detectwidget.cpp @@ -27,7 +27,7 @@ #include #include //Added by qt3to4: -#include +#include #include #include #include @@ -36,7 +36,7 @@ #include #include #include -#include +#include namespace KWin { diff --git a/kwin/kcmkwin/kwintabbox/layoutpreview.cpp b/kwin/kcmkwin/kwintabbox/layoutpreview.cpp index 8564b4d8..669cd233 100644 --- a/kwin/kcmkwin/kwintabbox/layoutpreview.cpp +++ b/kwin/kcmkwin/kwintabbox/layoutpreview.cpp @@ -23,7 +23,7 @@ along with this program. If not, see . #include #include #include -#include +#include #include #include #include diff --git a/kwin/kcmkwin/kwintabbox/layoutpreview.h b/kwin/kcmkwin/kwintabbox/layoutpreview.h index 4e9bb210..7c20a9f1 100644 --- a/kwin/kcmkwin/kwintabbox/layoutpreview.h +++ b/kwin/kcmkwin/kwintabbox/layoutpreview.h @@ -20,7 +20,7 @@ along with this program. If not, see . #ifndef KWIN_TABBOX_LAYOUTPREVIEW_H #define KWIN_TABBOX_LAYOUTPREVIEW_H -#include +#include #include #include diff --git a/kwin/kcmkwin/kwintabbox/main.cpp b/kwin/kcmkwin/kwintabbox/main.cpp index 9537a659..a2eb6770 100644 --- a/kwin/kcmkwin/kwintabbox/main.cpp +++ b/kwin/kcmkwin/kwintabbox/main.cpp @@ -23,6 +23,7 @@ along with this program. If not, see . #include #include #include +#include // KDE #include diff --git a/kwin/killer/killer.cpp b/kwin/killer/killer.cpp index db8b0f33..26910f5c 100644 --- a/kwin/killer/killer.cpp +++ b/kwin/killer/killer.cpp @@ -31,7 +31,7 @@ DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include // TODO: remove with Qt 5, only for HTML escaping the caption #include diff --git a/kwin/layers.cpp b/kwin/layers.cpp index 57e7f363..34567fcf 100644 --- a/kwin/layers.cpp +++ b/kwin/layers.cpp @@ -88,7 +88,7 @@ along with this program. If not, see . #include "unmanaged.h" #include "deleted.h" #include "effects.h" -#include +#include #include "composite.h" #ifdef KWIN_BUILD_SCREENEDGES #include "screenedge.h" diff --git a/kwin/libkdecorations/kdecoration.cpp b/kwin/libkdecorations/kdecoration.cpp index 5c44a2bb..08fe4289 100644 --- a/kwin/libkdecorations/kdecoration.cpp +++ b/kwin/libkdecorations/kdecoration.cpp @@ -32,7 +32,7 @@ DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include "kdecorationfactory.h" #include "kdecorationbridge.h" diff --git a/kwin/libkdecorations/kdecoration.h b/kwin/libkdecorations/kdecoration.h index 04a8a4f5..8c31ee7b 100644 --- a/kwin/libkdecorations/kdecoration.h +++ b/kwin/libkdecorations/kdecoration.h @@ -32,7 +32,7 @@ DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #define KWIN_DECORATION_API_VERSION 1 diff --git a/kwin/libkwineffects/kwinanimationeffect.cpp b/kwin/libkwineffects/kwinanimationeffect.cpp index 6ab8083f..71e9f407 100644 --- a/kwin/libkwineffects/kwinanimationeffect.cpp +++ b/kwin/libkwineffects/kwinanimationeffect.cpp @@ -23,7 +23,7 @@ along with this program. If not, see . #include #include -#include +#include #include QDebug operator<<(QDebug dbg, const KWin::FPx2 &fpx2) diff --git a/kwin/libkwineffects/kwineffects.cpp b/kwin/libkwineffects/kwineffects.cpp index 7832d445..e2d76ddf 100644 --- a/kwin/libkwineffects/kwineffects.cpp +++ b/kwin/libkwineffects/kwineffects.cpp @@ -32,8 +32,8 @@ along with this program. If not, see . #include #include #include -#include -#include +#include +#include #include #include diff --git a/kwin/libkwineffects/kwinglcolorcorrection.cpp b/kwin/libkwineffects/kwinglcolorcorrection.cpp index 68e98a2e..23f2e695 100644 --- a/kwin/libkwineffects/kwinglcolorcorrection.cpp +++ b/kwin/libkwineffects/kwinglcolorcorrection.cpp @@ -30,7 +30,7 @@ along with this program. If not, see . #include #include #include -#include +#include #include #include diff --git a/kwin/libkwineffects/kwinglobals.h b/kwin/libkwineffects/kwinglobals.h index 67922804..e229b0d6 100644 --- a/kwin/libkwineffects/kwinglobals.h +++ b/kwin/libkwineffects/kwinglobals.h @@ -21,7 +21,7 @@ along with this program. If not, see . #ifndef KWIN_LIB_KWINGLOBALS_H #define KWIN_LIB_KWINGLOBALS_H -#include +#include #include diff --git a/kwin/libkwineffects/kwingltexture.h b/kwin/libkwineffects/kwingltexture.h index 200d24f3..8271a7a1 100644 --- a/kwin/libkwineffects/kwingltexture.h +++ b/kwin/libkwineffects/kwingltexture.h @@ -27,7 +27,7 @@ along with this program. If not, see . #include #include #include -#include +#include #include class QImage; diff --git a/kwin/main.cpp b/kwin/main.cpp index d50d199d..c40345d6 100644 --- a/kwin/main.cpp +++ b/kwin/main.cpp @@ -32,7 +32,7 @@ along with this program. If not, see . #include #include #include -#include +#include #include #include #include diff --git a/kwin/manage.cpp b/kwin/manage.cpp index 0138930d..a75398c2 100644 --- a/kwin/manage.cpp +++ b/kwin/manage.cpp @@ -29,7 +29,7 @@ along with this program. If not, see . #include "cursor.h" #include "decorations.h" -#include +#include #include "rules.h" #include "group.h" #include "netinfo.h" diff --git a/kwin/scene_opengl.cpp b/kwin/scene_opengl.cpp index b1911943..005cce71 100644 --- a/kwin/scene_opengl.cpp +++ b/kwin/scene_opengl.cpp @@ -61,7 +61,7 @@ along with this program. If not, see . #include #include #include -#include +#include #include #include #include diff --git a/kwin/tabbox/clientmodel.h b/kwin/tabbox/clientmodel.h index 37d0c940..6b5d6c8c 100644 --- a/kwin/tabbox/clientmodel.h +++ b/kwin/tabbox/clientmodel.h @@ -22,7 +22,7 @@ along with this program. If not, see . #define CLIENTMODEL_H #include "tabboxhandler.h" -#include +#include /** * @file * This file defines the class ClientModel, the model for TabBoxClients. diff --git a/kwin/tabbox/declarative.cpp b/kwin/tabbox/declarative.cpp index 254d634e..a55bdaf9 100644 --- a/kwin/tabbox/declarative.cpp +++ b/kwin/tabbox/declarative.cpp @@ -26,9 +26,9 @@ along with this program. If not, see . #include #include #include -#include -#include -#include +#include +#include +#include // include KDE #include diff --git a/kwin/tabbox/desktopmodel.h b/kwin/tabbox/desktopmodel.h index c412e2cd..c253354e 100644 --- a/kwin/tabbox/desktopmodel.h +++ b/kwin/tabbox/desktopmodel.h @@ -21,7 +21,7 @@ along with this program. If not, see . #ifndef DESKTOPMODEL_H #define DESKTOPMODEL_H -#include +#include /** * @file * This file defines the class DesktopModel, the model for desktops. diff --git a/kwin/tabbox/tabbox.cpp b/kwin/tabbox/tabbox.cpp index 757b89ef..4bd2a676 100644 --- a/kwin/tabbox/tabbox.cpp +++ b/kwin/tabbox/tabbox.cpp @@ -41,7 +41,7 @@ along with this program. If not, see . #include "workspace.h" // Qt #include -#include +#include #include // KDE #include diff --git a/kwin/tabbox/tabbox.h b/kwin/tabbox/tabbox.h index b0d3c780..de3bb52d 100644 --- a/kwin/tabbox/tabbox.h +++ b/kwin/tabbox/tabbox.h @@ -24,7 +24,7 @@ along with this program. If not, see . #define KWIN_TABBOX_H #include -#include +#include #include #include "utils.h" #include "tabbox/tabboxhandler.h" diff --git a/kwin/tabbox/tabboxhandler.cpp b/kwin/tabbox/tabboxhandler.cpp index f0e0ffe8..4091f497 100644 --- a/kwin/tabbox/tabboxhandler.cpp +++ b/kwin/tabbox/tabboxhandler.cpp @@ -26,10 +26,10 @@ along with this program. If not, see . #include "desktopmodel.h" #include "tabboxconfig.h" // Qt -#include -#include +#include +#include #include -#include +#include #include // KDE #include diff --git a/kwin/tabbox/tabboxhandler.h b/kwin/tabbox/tabboxhandler.h index 26d3e91e..36bbbc6b 100644 --- a/kwin/tabbox/tabboxhandler.h +++ b/kwin/tabbox/tabboxhandler.h @@ -23,7 +23,7 @@ along with this program. If not, see . #include "tabboxconfig.h" -#include +#include #include #include #include diff --git a/kwin/tests/test_window_paint_data.cpp b/kwin/tests/test_window_paint_data.cpp index 81807e81..dc230adf 100644 --- a/kwin/tests/test_window_paint_data.cpp +++ b/kwin/tests/test_window_paint_data.cpp @@ -21,8 +21,8 @@ along with this program. If not, see . #include #include -#include -#include +#include +#include #include diff --git a/kwin/thumbnailitem.h b/kwin/thumbnailitem.h index 89fd48d7..0e75709a 100644 --- a/kwin/thumbnailitem.h +++ b/kwin/thumbnailitem.h @@ -21,7 +21,7 @@ along with this program. If not, see . #ifndef KWIN_THUMBNAILITEM_H #define KWIN_THUMBNAILITEM_H -#include +#include #include namespace KWin diff --git a/kwin/useractions.h b/kwin/useractions.h index ef7b242e..c325297d 100644 --- a/kwin/useractions.h +++ b/kwin/useractions.h @@ -24,7 +24,7 @@ along with this program. If not, see . #include // Qt #include -#include +#include class KKeySequenceWidget; class QAction; diff --git a/kwin/utils.cpp b/kwin/utils.cpp index d05bae49..3e4126ff 100644 --- a/kwin/utils.cpp +++ b/kwin/utils.cpp @@ -37,7 +37,7 @@ along with this program. If not, see . #include #include -#include +#include #include diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp index dc2f767c..345f68a0 100644 --- a/kwin/workspace.cpp +++ b/kwin/workspace.cpp @@ -66,6 +66,7 @@ along with this program. If not, see . #include // Qt #include +#include namespace KWin { diff --git a/libs/kdm/kgreet_winbind.cpp b/libs/kdm/kgreet_winbind.cpp index c94fbc45..d3182d61 100644 --- a/libs/kdm/kgreet_winbind.cpp +++ b/libs/kdm/kgreet_winbind.cpp @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include #include #include -#include +#include #include #include diff --git a/libs/kephal/service/xml/xmlnodehandler.h b/libs/kephal/service/xml/xmlnodehandler.h index b4c0a7f7..07f9ea3d 100644 --- a/libs/kephal/service/xml/xmlnodehandler.h +++ b/libs/kephal/service/xml/xmlnodehandler.h @@ -24,7 +24,7 @@ #include "xmltype.h" -#include +#include namespace Kephal { diff --git a/libs/kephal/service/xml/xmltype.h b/libs/kephal/service/xml/xmltype.h index 2f6e1127..b117ab82 100644 --- a/libs/kephal/service/xml/xmltype.h +++ b/libs/kephal/service/xml/xmltype.h @@ -22,7 +22,7 @@ #define KEPHAL_XMLTYPE_H #include -#include +#include #include diff --git a/libs/kephal/service/xrandr12/randrcrtc.cpp b/libs/kephal/service/xrandr12/randrcrtc.cpp index 50e10e8e..4161b0c0 100644 --- a/libs/kephal/service/xrandr12/randrcrtc.cpp +++ b/libs/kephal/service/xrandr12/randrcrtc.cpp @@ -18,7 +18,7 @@ #include "randrcrtc.h" -#include +#include #include #include "randrscreen.h" diff --git a/libs/kephal/service/xrandr12/randrdisplay.cpp b/libs/kephal/service/xrandr12/randrdisplay.cpp index 7cee464b..0473fa3e 100644 --- a/libs/kephal/service/xrandr12/randrdisplay.cpp +++ b/libs/kephal/service/xrandr12/randrdisplay.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include "randrdisplay.h" #include "randrscreen.h" diff --git a/libs/kephal/service/xrandr12/randroutput.cpp b/libs/kephal/service/xrandr12/randroutput.cpp index 51184ee2..ff966fef 100644 --- a/libs/kephal/service/xrandr12/randroutput.cpp +++ b/libs/kephal/service/xrandr12/randroutput.cpp @@ -19,7 +19,7 @@ #include "randroutput.h" -#include +#include #include #include "randrscreen.h" diff --git a/libs/kephal/service/xrandr12/randrscreen.cpp b/libs/kephal/service/xrandr12/randrscreen.cpp index f0dd8027..0568a17d 100644 --- a/libs/kephal/service/xrandr12/randrscreen.cpp +++ b/libs/kephal/service/xrandr12/randrscreen.cpp @@ -18,7 +18,7 @@ #include "randrscreen.h" -#include +#include #include #include "randrcrtc.h" diff --git a/libs/kephal/service/xrandroutputs.cpp b/libs/kephal/service/xrandroutputs.cpp index 6df983a1..54665ffb 100644 --- a/libs/kephal/service/xrandroutputs.cpp +++ b/libs/kephal/service/xrandroutputs.cpp @@ -26,10 +26,10 @@ #include -#include +#include #include -#include +#include namespace Kephal { diff --git a/libs/ksysguard/lsofui/CMakeLists.txt b/libs/ksysguard/lsofui/CMakeLists.txt index 6ef7a8cf..3a93d242 100644 --- a/libs/ksysguard/lsofui/CMakeLists.txt +++ b/libs/ksysguard/lsofui/CMakeLists.txt @@ -20,7 +20,7 @@ install(TARGETS lsofui EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAU install( FILES lsof.h DESTINATION ${INCLUDE_INSTALL_DIR}/ksysguard COMPONENT Devel) set(ksysguardlsofwidgets_PART_SRCS - ${CMAKE_CURRENT_BINARY_DIR}/ksysguardlsofwidgets.cpp + ${CMAKE_CURRENT_BINARY_DIR}/ksysguardlsofwidgets.cpp ) kde4_add_widget_files(ksysguardlsofwidgets_PART_SRCS ksysguardlsof.widgets) @@ -30,4 +30,3 @@ kde4_add_plugin(ksysguardlsofwidgets ${ksysguardlsofwidgets_PART_SRCS}) target_link_libraries(ksysguardlsofwidgets ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} lsofui) install(TARGETS ksysguardlsofwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) - diff --git a/libs/ksysguard/processcore/process.h b/libs/ksysguard/processcore/process.h index 940765ef..ac12e5b3 100644 --- a/libs/ksysguard/processcore/process.h +++ b/libs/ksysguard/processcore/process.h @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/libs/ksysguard/processcore/processes.cpp b/libs/ksysguard/processcore/processes.cpp index 885030f8..6c5dcaea 100644 --- a/libs/ksysguard/processcore/processes.cpp +++ b/libs/ksysguard/processcore/processes.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include //for sysconf diff --git a/libs/ksysguard/processcore/processes_atop_p.cpp b/libs/ksysguard/processcore/processes_atop_p.cpp index 369df36c..f6c3edea 100644 --- a/libs/ksysguard/processcore/processes_atop_p.cpp +++ b/libs/ksysguard/processcore/processes_atop_p.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include diff --git a/libs/ksysguard/processui/ProcessModel_p.h b/libs/ksysguard/processui/ProcessModel_p.h index 649bd004..4918e51b 100644 --- a/libs/ksysguard/processui/ProcessModel_p.h +++ b/libs/ksysguard/processui/ProcessModel_p.h @@ -33,13 +33,13 @@ #include #include #include -#include +#include #include #ifdef Q_WS_X11 #include #include -#include +#include #include #include diff --git a/libs/ksysguard/processui/ksysguardprocesslist.cpp b/libs/ksysguard/processui/ksysguardprocesslist.cpp index ff83b729..a93f76c6 100644 --- a/libs/ksysguard/processui/ksysguardprocesslist.cpp +++ b/libs/ksysguard/processui/ksysguardprocesslist.cpp @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/libs/ksysguard/signalplotter/ksignalplotter.cpp b/libs/ksysguard/signalplotter/ksignalplotter.cpp index 15921fdc..aec278af 100644 --- a/libs/ksysguard/signalplotter/ksignalplotter.cpp +++ b/libs/ksysguard/signalplotter/ksignalplotter.cpp @@ -36,12 +36,12 @@ #include #include #include -#include +#include #include #ifdef GRAPHICS_SIGNAL_PLOTTER -#include -#include +#include +#include #include #endif diff --git a/libs/ksysguard/signalplotter/ksignalplotter_p.h b/libs/ksysguard/signalplotter/ksignalplotter_p.h index 701dec58..126e5a9c 100644 --- a/libs/ksysguard/signalplotter/ksignalplotter_p.h +++ b/libs/ksysguard/signalplotter/ksignalplotter_p.h @@ -28,7 +28,7 @@ #ifndef GRAPHICS_SIGNAL_PLOTTER #define USE_SEPERATE_WIDGET #include -#include +#include #endif #ifdef SVG_SUPPORT diff --git a/libs/ksysguard/tests/graphicssignalplotterbenchmark.h b/libs/ksysguard/tests/graphicssignalplotterbenchmark.h index ef2438e3..feff249b 100644 --- a/libs/ksysguard/tests/graphicssignalplotterbenchmark.h +++ b/libs/ksysguard/tests/graphicssignalplotterbenchmark.h @@ -1,6 +1,6 @@ #include -#include +#include class KGraphicsSignalPlotter; class QGraphicsView; diff --git a/libs/ksysguard/tests/signalplotterbenchmark.h b/libs/ksysguard/tests/signalplotterbenchmark.h index 1dc51c20..8f4f95c8 100644 --- a/libs/ksysguard/tests/signalplotterbenchmark.h +++ b/libs/ksysguard/tests/signalplotterbenchmark.h @@ -1,6 +1,6 @@ #include -#include +#include class KSignalPlotter; class BenchmarkSignalPlotter : public QObject diff --git a/libs/ksysguard/tests/signalplottertest.cpp b/libs/ksysguard/tests/signalplottertest.cpp index 04d9c53c..205f9f2c 100644 --- a/libs/ksysguard/tests/signalplottertest.cpp +++ b/libs/ksysguard/tests/signalplottertest.cpp @@ -5,6 +5,7 @@ #include #include #include +#include void TestSignalPlotter::init() { diff --git a/libs/ksysguard/tests/signalplottertest.h b/libs/ksysguard/tests/signalplottertest.h index e2b2f640..f5e89ed5 100644 --- a/libs/ksysguard/tests/signalplottertest.h +++ b/libs/ksysguard/tests/signalplottertest.h @@ -1,6 +1,6 @@ #include -#include +#include class KSignalPlotter; class TestSignalPlotter : public QObject diff --git a/libs/kworkspace/kwindowlistmenu.cpp b/libs/kworkspace/kwindowlistmenu.cpp index c47d876f..8234db1f 100644 --- a/libs/kworkspace/kwindowlistmenu.cpp +++ b/libs/kworkspace/kwindowlistmenu.cpp @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include diff --git a/libs/kworkspace/screenpreviewwidget.cpp b/libs/kworkspace/screenpreviewwidget.cpp index 3bce80f7..04045a4c 100644 --- a/libs/kworkspace/screenpreviewwidget.cpp +++ b/libs/kworkspace/screenpreviewwidget.cpp @@ -20,8 +20,8 @@ #include "screenpreviewwidget.h" -#include -#include +#include +#include #include #include diff --git a/libs/oxygen/oxygenhelper.cpp b/libs/oxygen/oxygenhelper.cpp index bc05ecc5..191517c2 100644 --- a/libs/oxygen/oxygenhelper.cpp +++ b/libs/oxygen/oxygenhelper.cpp @@ -33,7 +33,7 @@ #include #ifdef Q_WS_X11 -#include +#include #include #include #include diff --git a/libs/oxygen/oxygenhelper.h b/libs/oxygen/oxygenhelper.h index c502c873..20871ae6 100644 --- a/libs/oxygen/oxygenhelper.h +++ b/libs/oxygen/oxygenhelper.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #ifdef Q_WS_X11 diff --git a/libs/oxygen/oxygenshadowcache.h b/libs/oxygen/oxygenshadowcache.h index cd01a15b..81238513 100644 --- a/libs/oxygen/oxygenshadowcache.h +++ b/libs/oxygen/oxygenshadowcache.h @@ -31,7 +31,7 @@ #include "oxygen_export.h" #include -#include +#include #include namespace Oxygen diff --git a/libs/plasmaclock/calendar.cpp b/libs/plasmaclock/calendar.cpp index e4c117af..3aa2721e 100644 --- a/libs/plasmaclock/calendar.cpp +++ b/libs/plasmaclock/calendar.cpp @@ -21,10 +21,10 @@ #include "calendar.h" //Qt -#include +#include #include #include -#include +#include #include #include #include diff --git a/libs/plasmaclock/calendartable.cpp b/libs/plasmaclock/calendartable.cpp index 3d1fa255..7cc50321 100644 --- a/libs/plasmaclock/calendartable.cpp +++ b/libs/plasmaclock/calendartable.cpp @@ -21,13 +21,13 @@ #include "calendartable.h" //Qt -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include //KDECore #include diff --git a/libs/plasmaclock/clockapplet.cpp b/libs/plasmaclock/clockapplet.cpp index 1b14117c..91cc952a 100644 --- a/libs/plasmaclock/clockapplet.cpp +++ b/libs/plasmaclock/clockapplet.cpp @@ -25,16 +25,16 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/libs/plasmaclock/clockapplet.h b/libs/plasmaclock/clockapplet.h index 55ca1194..bfdf3141 100644 --- a/libs/plasmaclock/clockapplet.h +++ b/libs/plasmaclock/clockapplet.h @@ -22,8 +22,8 @@ #ifndef CLOCKAPPLET_H #define CLOCKAPPLET_H -#include -#include +#include +#include #include #include diff --git a/libs/plasmaclock/wheelytoolbutton.cpp b/libs/plasmaclock/wheelytoolbutton.cpp index d70fafc2..ed1653c3 100644 --- a/libs/plasmaclock/wheelytoolbutton.cpp +++ b/libs/plasmaclock/wheelytoolbutton.cpp @@ -19,7 +19,7 @@ #include "wheelytoolbutton.h" -#include +#include WheelyToolButton::WheelyToolButton(QGraphicsWidget *parent) : Plasma::ToolButton(parent) diff --git a/libs/plasmagenericshell/mouseinputbutton.cpp b/libs/plasmagenericshell/mouseinputbutton.cpp index 20d41bad..d72b3082 100644 --- a/libs/plasmagenericshell/mouseinputbutton.cpp +++ b/libs/plasmagenericshell/mouseinputbutton.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include diff --git a/libs/plasmagenericshell/panelshadows.cpp b/libs/plasmagenericshell/panelshadows.cpp index cdf4ee29..c84ecaf3 100644 --- a/libs/plasmagenericshell/panelshadows.cpp +++ b/libs/plasmagenericshell/panelshadows.cpp @@ -22,7 +22,7 @@ #include #ifdef Q_WS_X11 -#include +#include #include #include #include diff --git a/libs/plasmagenericshell/scripting/appinterface.h b/libs/plasmagenericshell/scripting/appinterface.h index cfe06292..24b2191f 100644 --- a/libs/plasmagenericshell/scripting/appinterface.h +++ b/libs/plasmagenericshell/scripting/appinterface.h @@ -21,7 +21,7 @@ #define APPINTERFACE #include -#include +#include #include #include "../plasmagenericshell_export.h" diff --git a/libs/plasmagenericshell/scripting/applet.h b/libs/plasmagenericshell/scripting/applet.h index a7c96004..c07a104a 100644 --- a/libs/plasmagenericshell/scripting/applet.h +++ b/libs/plasmagenericshell/scripting/applet.h @@ -21,7 +21,7 @@ #define APPLET #include -#include +#include #include diff --git a/libs/plasmagenericshell/scripting/containment.h b/libs/plasmagenericshell/scripting/containment.h index 9f62a92e..4f469239 100644 --- a/libs/plasmagenericshell/scripting/containment.h +++ b/libs/plasmagenericshell/scripting/containment.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include "applet.h" diff --git a/libs/plasmagenericshell/scripting/rect.cpp b/libs/plasmagenericshell/scripting/rect.cpp index 855f198a..1b894bb8 100644 --- a/libs/plasmagenericshell/scripting/rect.cpp +++ b/libs/plasmagenericshell/scripting/rect.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "backportglobal.h" Q_DECLARE_METATYPE(QRectF*) diff --git a/libs/plasmagenericshell/scripting/widget.h b/libs/plasmagenericshell/scripting/widget.h index 400d7c9b..1db7cb6f 100644 --- a/libs/plasmagenericshell/scripting/widget.h +++ b/libs/plasmagenericshell/scripting/widget.h @@ -20,7 +20,7 @@ #ifndef WIDGET #define WIDGET -#include +#include #include "applet.h" diff --git a/libs/plasmagenericshell/toolbutton.cpp b/libs/plasmagenericshell/toolbutton.cpp index ed3139d2..636b9c0c 100644 --- a/libs/plasmagenericshell/toolbutton.cpp +++ b/libs/plasmagenericshell/toolbutton.cpp @@ -23,10 +23,10 @@ //Qt #include #include -#include +#include #include -#include -#include +#include +#include #include #include diff --git a/libs/plasmagenericshell/toolbutton.h b/libs/plasmagenericshell/toolbutton.h index 775ba3c4..f594e80d 100644 --- a/libs/plasmagenericshell/toolbutton.h +++ b/libs/plasmagenericshell/toolbutton.h @@ -22,7 +22,7 @@ #define TOOLBUTTON_H #include -#include +#include #include "plasmagenericshell_export.h" diff --git a/libs/plasmagenericshell/wallpaperpreview.cpp b/libs/plasmagenericshell/wallpaperpreview.cpp index d31e8c9f..fe235aa0 100644 --- a/libs/plasmagenericshell/wallpaperpreview.cpp +++ b/libs/plasmagenericshell/wallpaperpreview.cpp @@ -17,7 +17,7 @@ #include "wallpaperpreview.h" #include -#include +#include #include #include diff --git a/libs/taskmanager/abstractgroupableitem.cpp b/libs/taskmanager/abstractgroupableitem.cpp index fa3502aa..d6782363 100644 --- a/libs/taskmanager/abstractgroupableitem.cpp +++ b/libs/taskmanager/abstractgroupableitem.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // Own #include "abstractgroupableitem.h" -#include +#include #include diff --git a/libs/taskmanager/abstractsortingstrategy.cpp b/libs/taskmanager/abstractsortingstrategy.cpp index 4b774b24..27752c30 100644 --- a/libs/taskmanager/abstractsortingstrategy.cpp +++ b/libs/taskmanager/abstractsortingstrategy.cpp @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "taskmanager.h" #include "abstractgroupableitem.h" -#include +#include #include #include diff --git a/libs/taskmanager/launcherproperties.cpp b/libs/taskmanager/launcherproperties.cpp index 475dfe6d..bf99de5b 100644 --- a/libs/taskmanager/launcherproperties.cpp +++ b/libs/taskmanager/launcherproperties.cpp @@ -28,8 +28,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/libs/taskmanager/strategies/alphasortingstrategy.cpp b/libs/taskmanager/strategies/alphasortingstrategy.cpp index 98611979..ee2636a4 100644 --- a/libs/taskmanager/strategies/alphasortingstrategy.cpp +++ b/libs/taskmanager/strategies/alphasortingstrategy.cpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include #include diff --git a/libs/taskmanager/strategies/desktopsortingstrategy.cpp b/libs/taskmanager/strategies/desktopsortingstrategy.cpp index d96cca12..ea0fde77 100644 --- a/libs/taskmanager/strategies/desktopsortingstrategy.cpp +++ b/libs/taskmanager/strategies/desktopsortingstrategy.cpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include #include diff --git a/libs/taskmanager/strategies/manualgroupingstrategy.cpp b/libs/taskmanager/strategies/manualgroupingstrategy.cpp index b8988093..82840629 100644 --- a/libs/taskmanager/strategies/manualgroupingstrategy.cpp +++ b/libs/taskmanager/strategies/manualgroupingstrategy.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "manualgroupingstrategy.h" #include -#include +#include #include #include diff --git a/libs/taskmanager/strategies/programgroupingstrategy.cpp b/libs/taskmanager/strategies/programgroupingstrategy.cpp index 1fd6c2b9..ce633757 100644 --- a/libs/taskmanager/strategies/programgroupingstrategy.cpp +++ b/libs/taskmanager/strategies/programgroupingstrategy.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "programgroupingstrategy.h" #include -#include +#include #include #include diff --git a/libs/taskmanager/task_p.h b/libs/taskmanager/task_p.h index 79586933..b6647a36 100644 --- a/libs/taskmanager/task_p.h +++ b/libs/taskmanager/task_p.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "task.h" -#include +#include #include namespace TaskManager diff --git a/libs/taskmanager/task_x11.cpp b/libs/taskmanager/task_x11.cpp index 050524bf..fbe361d1 100644 --- a/libs/taskmanager/task_x11.cpp +++ b/libs/taskmanager/task_x11.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "task_p.h" -#include +#include namespace TaskManager { diff --git a/libs/taskmanager/taskactions.cpp b/libs/taskmanager/taskactions.cpp index 200e7892..dbd3d518 100644 --- a/libs/taskmanager/taskactions.cpp +++ b/libs/taskmanager/taskactions.cpp @@ -44,9 +44,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include -#include +#include /////////////////////////////////////////////////////////////////////////////// // NOTE: if you change the menu, keep kde-workspace/kwin/useractions.cpp in sync diff --git a/libs/taskmanager/taskmanager.cpp b/libs/taskmanager/taskmanager.cpp index a864ca00..197622b3 100644 --- a/libs/taskmanager/taskmanager.cpp +++ b/libs/taskmanager/taskmanager.cpp @@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #ifdef Q_WS_X11 -#include +#include #endif namespace TaskManager diff --git a/libs/taskmanager/tasksmodel.cpp b/libs/taskmanager/tasksmodel.cpp index 4788e7ae..3c51d312 100644 --- a/libs/taskmanager/tasksmodel.cpp +++ b/libs/taskmanager/tasksmodel.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "tasksmodel.h" -#include +#include #include #include diff --git a/phonon/CMakeLists.txt b/phonon/CMakeLists.txt index 158aa644..1a80f465 100644 --- a/phonon/CMakeLists.txt +++ b/phonon/CMakeLists.txt @@ -10,16 +10,12 @@ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCL option(KDEBASE_DISABLE_MULTIMEDIA "Disable multimedia support (default: off)" OFF) -# print a message for backward compatibility: -if(KDE4_DISABLE_MULTIMEDIA) - message(STATUS "*********** The switch KDE4_DISABLE_MULTIMEDIA is not supported anymore, use KDEBASE_DISABLE_MULTIMEDIA instead ************") -endif(KDE4_DISABLE_MULTIMEDIA) - - if(KDEBASE_DISABLE_MULTIMEDIA) message(STATUS "NOTICE: Multimedia support DISABLED (KDEBASE_DISABLE_MULTIMEDIA == ON)") else(KDEBASE_DISABLE_MULTIMEDIA) - set(PHONON_MIN_VERSION "4.4.57") + # TODO: even phonon 4.8.3 identifies itself as "4.4.0" in its namespace + # header, the version detection should query the .pc files first! + set(PHONON_MIN_VERSION "4.4.0") macro_ensure_version("${PHONON_MIN_VERSION}" "${PHONON_VERSION}" _phonon_version_ok) if(NOT _phonon_version_ok) message(FATAL_ERROR "The installed Phonon is too old. Found version ${PHONON_VERSION}. Required is ${PHONON_MIN_VERSION}") diff --git a/phonon/kcm/backendselection.cpp b/phonon/kcm/backendselection.cpp index 9712128f..56b8eb59 100644 --- a/phonon/kcm/backendselection.cpp +++ b/phonon/kcm/backendselection.cpp @@ -38,7 +38,7 @@ BackendSelection::BackendSelection(QWidget *parent) { setupUi(this); - m_messageWidget->setShown(false); + m_messageWidget->setVisible(false); m_messageWidget->setCloseButtonVisible(false); m_messageWidget->setMessageType(KMessageWidget::Information); m_messageWidget->setText(i18nc("@info User changed Phonon backend", diff --git a/phonon/kcm/devicepreference.h b/phonon/kcm/devicepreference.h index fdcb9384..6818363c 100644 --- a/phonon/kcm/devicepreference.h +++ b/phonon/kcm/devicepreference.h @@ -25,7 +25,7 @@ #include "ui_devicepreference.h" #include #include -#include +#include #include #include diff --git a/phonon/kded-module/phononserver.cpp b/phonon/kded-module/phononserver.cpp index 9a474231..a9e4e39a 100644 --- a/phonon/kded-module/phononserver.cpp +++ b/phonon/kded-module/phononserver.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/phonon/kded-module/phononserver.h b/phonon/kded-module/phononserver.h index 520e6d71..a3a0bc1c 100644 --- a/phonon/kded-module/phononserver.h +++ b/phonon/kded-module/phononserver.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include class PhononServer : public KDEDModule { diff --git a/phonon/platform_kde/devicelisting.cpp b/phonon/platform_kde/devicelisting.cpp index 2a7579cb..8644ef28 100644 --- a/phonon/platform_kde/devicelisting.cpp +++ b/phonon/platform_kde/devicelisting.cpp @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/phonon/platform_kde/kdeplatformplugin.cpp b/phonon/platform_kde/kdeplatformplugin.cpp index d5f9b4de..069b9fd5 100644 --- a/phonon/platform_kde/kdeplatformplugin.cpp +++ b/phonon/platform_kde/kdeplatformplugin.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/plasma/desktop/applets/folderview/abstractitemview.cpp b/plasma/desktop/applets/folderview/abstractitemview.cpp index f7943dfb..1a6aa920 100644 --- a/plasma/desktop/applets/folderview/abstractitemview.cpp +++ b/plasma/desktop/applets/folderview/abstractitemview.cpp @@ -37,7 +37,7 @@ #include #ifdef Q_WS_X11 -# include +# include # include #endif diff --git a/plasma/desktop/applets/folderview/abstractitemview.h b/plasma/desktop/applets/folderview/abstractitemview.h index aa68b90c..c6d27f4c 100644 --- a/plasma/desktop/applets/folderview/abstractitemview.h +++ b/plasma/desktop/applets/folderview/abstractitemview.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/plasma/desktop/applets/folderview/actionoverlay.h b/plasma/desktop/applets/folderview/actionoverlay.h index ef2d490a..edc8783b 100644 --- a/plasma/desktop/applets/folderview/actionoverlay.h +++ b/plasma/desktop/applets/folderview/actionoverlay.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include namespace Plasma { diff --git a/plasma/desktop/applets/folderview/animator.h b/plasma/desktop/applets/folderview/animator.h index 54d89fc0..a4f6ce32 100644 --- a/plasma/desktop/applets/folderview/animator.h +++ b/plasma/desktop/applets/folderview/animator.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include diff --git a/plasma/desktop/applets/folderview/asyncfiletester.h b/plasma/desktop/applets/folderview/asyncfiletester.h index 783c493e..f5775b28 100644 --- a/plasma/desktop/applets/folderview/asyncfiletester.h +++ b/plasma/desktop/applets/folderview/asyncfiletester.h @@ -22,8 +22,8 @@ #include -#include -#include +#include +#include class KJob; class KUrl; diff --git a/plasma/desktop/applets/folderview/dialog.cpp b/plasma/desktop/applets/folderview/dialog.cpp index 40b913a9..160775bd 100644 --- a/plasma/desktop/applets/folderview/dialog.cpp +++ b/plasma/desktop/applets/folderview/dialog.cpp @@ -33,7 +33,7 @@ #include #ifdef Q_WS_X11 -# include +# include # include #endif diff --git a/plasma/desktop/applets/folderview/dialogshadows.cpp b/plasma/desktop/applets/folderview/dialogshadows.cpp index 9622b63a..1eb92c9f 100644 --- a/plasma/desktop/applets/folderview/dialogshadows.cpp +++ b/plasma/desktop/applets/folderview/dialogshadows.cpp @@ -22,7 +22,7 @@ #include #ifdef Q_WS_X11 -#include +#include #include #include #include diff --git a/plasma/desktop/applets/folderview/folderview.cpp b/plasma/desktop/applets/folderview/folderview.cpp index 0df4f2f0..ef20272d 100644 --- a/plasma/desktop/applets/folderview/folderview.cpp +++ b/plasma/desktop/applets/folderview/folderview.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/plasma/desktop/applets/folderview/iconview.cpp b/plasma/desktop/applets/folderview/iconview.cpp index f402600b..8c11809b 100644 --- a/plasma/desktop/applets/folderview/iconview.cpp +++ b/plasma/desktop/applets/folderview/iconview.cpp @@ -26,13 +26,13 @@ #include #include #include -#include -#include +#include #include #include #include #include -#include +#include +#include #include #include diff --git a/plasma/desktop/applets/folderview/iconview.h b/plasma/desktop/applets/folderview/iconview.h index 24f4387f..611eca12 100644 --- a/plasma/desktop/applets/folderview/iconview.h +++ b/plasma/desktop/applets/folderview/iconview.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include diff --git a/plasma/desktop/applets/folderview/iconwidget.cpp b/plasma/desktop/applets/folderview/iconwidget.cpp index f2bd6f3b..42718089 100644 --- a/plasma/desktop/applets/folderview/iconwidget.cpp +++ b/plasma/desktop/applets/folderview/iconwidget.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include IconWidget::IconWidget(QGraphicsItem *parent) diff --git a/plasma/desktop/applets/folderview/itemeditor.h b/plasma/desktop/applets/folderview/itemeditor.h index 7ffa450b..d1d149e6 100644 --- a/plasma/desktop/applets/folderview/itemeditor.h +++ b/plasma/desktop/applets/folderview/itemeditor.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include class QStyleOptionViewItemV4; diff --git a/plasma/desktop/applets/folderview/listview.cpp b/plasma/desktop/applets/folderview/listview.cpp index d3069225..fa8ede50 100644 --- a/plasma/desktop/applets/folderview/listview.cpp +++ b/plasma/desktop/applets/folderview/listview.cpp @@ -22,11 +22,11 @@ #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include diff --git a/plasma/desktop/applets/folderview/popupview.h b/plasma/desktop/applets/folderview/popupview.h index dc89ed9f..79e760c7 100644 --- a/plasma/desktop/applets/folderview/popupview.h +++ b/plasma/desktop/applets/folderview/popupview.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/plasma/desktop/applets/folderview/previewpluginsmodel.h b/plasma/desktop/applets/folderview/previewpluginsmodel.h index 5e71abc4..4df6f7c9 100644 --- a/plasma/desktop/applets/folderview/previewpluginsmodel.h +++ b/plasma/desktop/applets/folderview/previewpluginsmodel.h @@ -20,7 +20,7 @@ #ifndef PREVIEWPLUGINSMODEL_H #define PREVIEWPLUGINSMODEL_H -#include +#include #include #include diff --git a/plasma/desktop/applets/folderview/tooltipwidget.cpp b/plasma/desktop/applets/folderview/tooltipwidget.cpp index 30a5ad53..9f3714a5 100644 --- a/plasma/desktop/applets/folderview/tooltipwidget.cpp +++ b/plasma/desktop/applets/folderview/tooltipwidget.cpp @@ -22,8 +22,8 @@ #include "proxymodel.h" #include -#include -#include +#include +#include #include #include diff --git a/plasma/desktop/applets/folderview/tooltipwidget.h b/plasma/desktop/applets/folderview/tooltipwidget.h index eb136f90..2d803a11 100644 --- a/plasma/desktop/applets/folderview/tooltipwidget.h +++ b/plasma/desktop/applets/folderview/tooltipwidget.h @@ -20,7 +20,7 @@ #ifndef TOOLTIPWIDGET_H #define TOOLTIPWIDGET_H -#include +#include #include #include #include diff --git a/plasma/desktop/applets/homerun/components/actionmanager.h b/plasma/desktop/applets/homerun/components/actionmanager.h index ebc5a129..7efc6ef4 100644 --- a/plasma/desktop/applets/homerun/components/actionmanager.h +++ b/plasma/desktop/applets/homerun/components/actionmanager.h @@ -24,7 +24,7 @@ along with this program. If not, see . #include // Qt -#include +#include // KDE #include diff --git a/plasma/desktop/applets/homerun/components/image.cpp b/plasma/desktop/applets/homerun/components/image.cpp index 3aedb581..f4fe0fed 100644 --- a/plasma/desktop/applets/homerun/components/image.cpp +++ b/plasma/desktop/applets/homerun/components/image.cpp @@ -28,7 +28,7 @@ along with this program. If not, see . // Qt #include -#include +#include Image::Image(QDeclarativeItem *parent) : QDeclarativeItem(parent) diff --git a/plasma/desktop/applets/homerun/components/sourcemodel.h b/plasma/desktop/applets/homerun/components/sourcemodel.h index f68200fc..116dc359 100644 --- a/plasma/desktop/applets/homerun/components/sourcemodel.h +++ b/plasma/desktop/applets/homerun/components/sourcemodel.h @@ -23,7 +23,7 @@ License along with this library. If not, see . // Local // Qt -#include +#include // KDE #include diff --git a/plasma/desktop/applets/homerun/components/sources/favorites/favoriteappsmodel.cpp b/plasma/desktop/applets/homerun/components/sources/favorites/favoriteappsmodel.cpp index f6729971..97ccbb61 100644 --- a/plasma/desktop/applets/homerun/components/sources/favorites/favoriteappsmodel.cpp +++ b/plasma/desktop/applets/homerun/components/sources/favorites/favoriteappsmodel.cpp @@ -23,7 +23,7 @@ #include "favoriteappsmodel.h" // Qt -#include +#include #include // KDE diff --git a/plasma/desktop/applets/homerun/components/sources/favorites/favoriteappsmodel.h b/plasma/desktop/applets/homerun/components/sources/favorites/favoriteappsmodel.h index 9b649389..55821cf0 100644 --- a/plasma/desktop/applets/homerun/components/sources/favorites/favoriteappsmodel.h +++ b/plasma/desktop/applets/homerun/components/sources/favorites/favoriteappsmodel.h @@ -22,7 +22,7 @@ #ifndef FAVORITEAPPSMODEL_H #define FAVORITEAPPSMODEL_H -#include +#include #include #include diff --git a/plasma/desktop/applets/homerun/components/sources/favorites/kfileplacesitem_p.h b/plasma/desktop/applets/homerun/components/sources/favorites/kfileplacesitem_p.h index b50cec4f..a0f35e9e 100644 --- a/plasma/desktop/applets/homerun/components/sources/favorites/kfileplacesitem_p.h +++ b/plasma/desktop/applets/homerun/components/sources/favorites/kfileplacesitem_p.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/plasma/desktop/applets/homerun/components/sources/installedapps/changenotifier.cpp b/plasma/desktop/applets/homerun/components/sources/installedapps/changenotifier.cpp index 79f8f39e..fa760670 100644 --- a/plasma/desktop/applets/homerun/components/sources/installedapps/changenotifier.cpp +++ b/plasma/desktop/applets/homerun/components/sources/installedapps/changenotifier.cpp @@ -29,7 +29,7 @@ along with this program. If not, see . // Qt #include -#include +#include #include namespace Homerun { diff --git a/plasma/desktop/applets/homerun/components/sources/installedapps/groupedinstalledappsmodel.h b/plasma/desktop/applets/homerun/components/sources/installedapps/groupedinstalledappsmodel.h index 4befe54f..46e73b71 100644 --- a/plasma/desktop/applets/homerun/components/sources/installedapps/groupedinstalledappsmodel.h +++ b/plasma/desktop/applets/homerun/components/sources/installedapps/groupedinstalledappsmodel.h @@ -25,7 +25,7 @@ License along with this library. If not, see . #include // Qt -#include +#include // KDE #include diff --git a/plasma/desktop/applets/homerun/components/sources/installedapps/installedappsconfigurationwidget.cpp b/plasma/desktop/applets/homerun/components/sources/installedapps/installedappsconfigurationwidget.cpp index 0243dea4..0bf9b6ea 100644 --- a/plasma/desktop/applets/homerun/components/sources/installedapps/installedappsconfigurationwidget.cpp +++ b/plasma/desktop/applets/homerun/components/sources/installedapps/installedappsconfigurationwidget.cpp @@ -30,7 +30,7 @@ License along with this library. If not, see . #include // Qt -#include +#include #include enum { diff --git a/plasma/desktop/applets/homerun/components/sources/installedapps/installedappsmodel.h b/plasma/desktop/applets/homerun/components/sources/installedapps/installedappsmodel.h index 712c17c0..52783866 100644 --- a/plasma/desktop/applets/homerun/components/sources/installedapps/installedappsmodel.h +++ b/plasma/desktop/applets/homerun/components/sources/installedapps/installedappsmodel.h @@ -25,7 +25,7 @@ License along with this library. If not, see . #include // Qt -#include +#include #include #include diff --git a/plasma/desktop/applets/homerun/components/sources/power/combinedpowersessionmodel.h b/plasma/desktop/applets/homerun/components/sources/power/combinedpowersessionmodel.h index 5e37b162..eb5d37ad 100644 --- a/plasma/desktop/applets/homerun/components/sources/power/combinedpowersessionmodel.h +++ b/plasma/desktop/applets/homerun/components/sources/power/combinedpowersessionmodel.h @@ -21,7 +21,7 @@ #include -#include +#include #include diff --git a/plasma/desktop/applets/homerun/components/sources/recentapps/recentappsmodel.h b/plasma/desktop/applets/homerun/components/sources/recentapps/recentappsmodel.h index a06eb516..124264d5 100644 --- a/plasma/desktop/applets/homerun/components/sources/recentapps/recentappsmodel.h +++ b/plasma/desktop/applets/homerun/components/sources/recentapps/recentappsmodel.h @@ -24,7 +24,7 @@ License along with this library. If not, see . #include // Qt -#include +#include // KDE #include diff --git a/plasma/desktop/applets/homerun/components/sources/runners/querymatchmodel.h b/plasma/desktop/applets/homerun/components/sources/runners/querymatchmodel.h index 2578d790..3587461a 100644 --- a/plasma/desktop/applets/homerun/components/sources/runners/querymatchmodel.h +++ b/plasma/desktop/applets/homerun/components/sources/runners/querymatchmodel.h @@ -26,7 +26,7 @@ along with this program. If not, see . #include // Qt -#include +#include namespace Plasma { diff --git a/plasma/desktop/applets/homerun/components/sources/runners/runnerconfigurationwidget.cpp b/plasma/desktop/applets/homerun/components/sources/runners/runnerconfigurationwidget.cpp index 51823725..b726eccf 100644 --- a/plasma/desktop/applets/homerun/components/sources/runners/runnerconfigurationwidget.cpp +++ b/plasma/desktop/applets/homerun/components/sources/runners/runnerconfigurationwidget.cpp @@ -28,7 +28,7 @@ License along with this library. If not, see . #include // Qt -#include +#include Q_DECLARE_METATYPE(KPluginInfo) diff --git a/plasma/desktop/applets/homerun/components/sources/runners/runnermodel.h b/plasma/desktop/applets/homerun/components/sources/runners/runnermodel.h index f88acd67..a61cd8ab 100644 --- a/plasma/desktop/applets/homerun/components/sources/runners/runnermodel.h +++ b/plasma/desktop/applets/homerun/components/sources/runners/runnermodel.h @@ -28,7 +28,7 @@ Boston, MA 02110-1301, USA. #include // Qt -#include +#include #include // KDE diff --git a/plasma/desktop/applets/homerun/components/tabmodel.h b/plasma/desktop/applets/homerun/components/tabmodel.h index 64647ec1..97b705ce 100644 --- a/plasma/desktop/applets/homerun/components/tabmodel.h +++ b/plasma/desktop/applets/homerun/components/tabmodel.h @@ -20,7 +20,7 @@ License along with this library. If not, see . #ifndef TABMODEL_H #define TABMODEL_H -#include +#include #include diff --git a/plasma/desktop/applets/homerun/fixes/declarativeitemcontainer_p.h b/plasma/desktop/applets/homerun/fixes/declarativeitemcontainer_p.h index e026afd6..53d837f0 100644 --- a/plasma/desktop/applets/homerun/fixes/declarativeitemcontainer_p.h +++ b/plasma/desktop/applets/homerun/fixes/declarativeitemcontainer_p.h @@ -21,9 +21,9 @@ #define DECLARATIVEITEMCONTAINER_P #include -#include +#include #include -#include +#include class DeclarativeItemContainer : public QGraphicsWidget diff --git a/plasma/desktop/applets/homerun/fixes/dialog.cpp b/plasma/desktop/applets/homerun/fixes/dialog.cpp index 8ab54240..447035dd 100644 --- a/plasma/desktop/applets/homerun/fixes/dialog.cpp +++ b/plasma/desktop/applets/homerun/fixes/dialog.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/plasma/desktop/applets/homerun/fixes/dialog.h b/plasma/desktop/applets/homerun/fixes/dialog.h index 08a466d6..f21b0c2a 100644 --- a/plasma/desktop/applets/homerun/fixes/dialog.h +++ b/plasma/desktop/applets/homerun/fixes/dialog.h @@ -21,7 +21,7 @@ #define DIALOG_PROXY_P #include -#include +#include #include #include diff --git a/plasma/desktop/applets/homerun/fullscreen/viewer/fullview.cpp b/plasma/desktop/applets/homerun/fullscreen/viewer/fullview.cpp index 6aa8c11e..f6fe019f 100644 --- a/plasma/desktop/applets/homerun/fullscreen/viewer/fullview.cpp +++ b/plasma/desktop/applets/homerun/fullscreen/viewer/fullview.cpp @@ -33,7 +33,8 @@ #include #include #include -#include +#include +#include #include diff --git a/plasma/desktop/applets/homerun/kicker/components/fadeouteffect.cpp b/plasma/desktop/applets/homerun/kicker/components/fadeouteffect.cpp index 7510989a..1eab4749 100644 --- a/plasma/desktop/applets/homerun/kicker/components/fadeouteffect.cpp +++ b/plasma/desktop/applets/homerun/kicker/components/fadeouteffect.cpp @@ -18,7 +18,7 @@ #include "fadeouteffect.h" -#include +#include #include FadeOutEffect::FadeOutEffect(QObject *parent) : QGraphicsEffect(parent) diff --git a/plasma/desktop/applets/homerun/kicker/components/fadeoutitem.cpp b/plasma/desktop/applets/homerun/kicker/components/fadeoutitem.cpp index c882fedc..65290e05 100644 --- a/plasma/desktop/applets/homerun/kicker/components/fadeoutitem.cpp +++ b/plasma/desktop/applets/homerun/kicker/components/fadeoutitem.cpp @@ -19,7 +19,7 @@ #include "fadeoutitem.h" #include "fadeouteffect.h" -#include +#include #include diff --git a/plasma/desktop/applets/homerun/kicker/components/sourcelistmodel.h b/plasma/desktop/applets/homerun/kicker/components/sourcelistmodel.h index f5fa2f4c..4eec4193 100644 --- a/plasma/desktop/applets/homerun/kicker/components/sourcelistmodel.h +++ b/plasma/desktop/applets/homerun/kicker/components/sourcelistmodel.h @@ -19,7 +19,7 @@ #ifndef SOURCELISTMODEL_H #define SOURCELISTMODEL_H -#include +#include class SourceListModel : public QAbstractListModel { diff --git a/plasma/desktop/applets/homerun/tests/auto/favoriteappsmodeltest.cpp b/plasma/desktop/applets/homerun/tests/auto/favoriteappsmodeltest.cpp index bc48c137..63fd5446 100644 --- a/plasma/desktop/applets/homerun/tests/auto/favoriteappsmodeltest.cpp +++ b/plasma/desktop/applets/homerun/tests/auto/favoriteappsmodeltest.cpp @@ -20,8 +20,8 @@ along with this program. If not, see . #include "favoriteappsmodeltest.h" // Qt -#include -#include +#include +#include // KDE #include diff --git a/plasma/desktop/applets/kickoff/core/applicationmodel.cpp b/plasma/desktop/applets/kickoff/core/applicationmodel.cpp index a1b8985f..65e48495 100644 --- a/plasma/desktop/applets/kickoff/core/applicationmodel.cpp +++ b/plasma/desktop/applets/kickoff/core/applicationmodel.cpp @@ -22,7 +22,7 @@ #include "applicationmodel.h" // Qt -#include +#include #include #include #include diff --git a/plasma/desktop/applets/kickoff/core/krunnermodel.cpp b/plasma/desktop/applets/kickoff/core/krunnermodel.cpp index 89de61ad..4840c52d 100644 --- a/plasma/desktop/applets/kickoff/core/krunnermodel.cpp +++ b/plasma/desktop/applets/kickoff/core/krunnermodel.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include // KDE #include diff --git a/plasma/desktop/applets/kickoff/core/models.cpp b/plasma/desktop/applets/kickoff/core/models.cpp index c787df6e..efee9fe3 100644 --- a/plasma/desktop/applets/kickoff/core/models.cpp +++ b/plasma/desktop/applets/kickoff/core/models.cpp @@ -23,7 +23,7 @@ // Qt #include -#include +#include #include // KDE diff --git a/plasma/desktop/applets/kickoff/core/urlitemlauncher.cpp b/plasma/desktop/applets/kickoff/core/urlitemlauncher.cpp index a69ebf14..91c9deb7 100644 --- a/plasma/desktop/applets/kickoff/core/urlitemlauncher.cpp +++ b/plasma/desktop/applets/kickoff/core/urlitemlauncher.cpp @@ -23,7 +23,7 @@ // Qt #include #include -#include +#include // KDE #include diff --git a/plasma/desktop/applets/kickoff/simpleapplet/menuview.cpp b/plasma/desktop/applets/kickoff/simpleapplet/menuview.cpp index b56354b8..ca9a1d3e 100644 --- a/plasma/desktop/applets/kickoff/simpleapplet/menuview.cpp +++ b/plasma/desktop/applets/kickoff/simpleapplet/menuview.cpp @@ -23,12 +23,12 @@ // Qt #include -#include +#include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/plasma/desktop/applets/kickoff/simpleapplet/menuview.h b/plasma/desktop/applets/kickoff/simpleapplet/menuview.h index e4e19a8e..384ee934 100644 --- a/plasma/desktop/applets/kickoff/simpleapplet/menuview.h +++ b/plasma/desktop/applets/kickoff/simpleapplet/menuview.h @@ -22,7 +22,7 @@ #define MENUVIEW_H // Qt -#include +#include // KDE #include diff --git a/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp b/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp index 9b1ebe58..7e73f38c 100644 --- a/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp +++ b/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp @@ -30,12 +30,12 @@ #include #include #include -#include -#include +#include +#include #include #include #include -#include +#include // KDE Libs #include diff --git a/plasma/desktop/applets/kickoff/ui/contextmenufactory.h b/plasma/desktop/applets/kickoff/ui/contextmenufactory.h index a4c3017b..b3e59ade 100644 --- a/plasma/desktop/applets/kickoff/ui/contextmenufactory.h +++ b/plasma/desktop/applets/kickoff/ui/contextmenufactory.h @@ -21,7 +21,7 @@ // Qt #include -#include +#include // Plasma #include diff --git a/plasma/desktop/applets/kickoff/ui/flipscrollview.cpp b/plasma/desktop/applets/kickoff/ui/flipscrollview.cpp index 1211e994..f17c1aaa 100644 --- a/plasma/desktop/applets/kickoff/ui/flipscrollview.cpp +++ b/plasma/desktop/applets/kickoff/ui/flipscrollview.cpp @@ -22,8 +22,8 @@ // Qt #include -#include -#include +#include +#include #include #include #include diff --git a/plasma/desktop/applets/kickoff/ui/itemdelegate.cpp b/plasma/desktop/applets/kickoff/ui/itemdelegate.cpp index 3b15dd2e..7c60a210 100644 --- a/plasma/desktop/applets/kickoff/ui/itemdelegate.cpp +++ b/plasma/desktop/applets/kickoff/ui/itemdelegate.cpp @@ -22,10 +22,10 @@ #include "ui/itemdelegate.h" // Qt -#include +#include #include #include -#include +#include // KDE #include diff --git a/plasma/desktop/applets/kickoff/ui/launcher.cpp b/plasma/desktop/applets/kickoff/ui/launcher.cpp index a1099084..56c17da7 100644 --- a/plasma/desktop/applets/kickoff/ui/launcher.cpp +++ b/plasma/desktop/applets/kickoff/ui/launcher.cpp @@ -26,9 +26,9 @@ // Qt #include -#include +#include #include -#include +#include #include #include #include diff --git a/plasma/desktop/applets/kickoff/ui/launcher.h b/plasma/desktop/applets/kickoff/ui/launcher.h index 7505c0ab..7fd8b45f 100644 --- a/plasma/desktop/applets/kickoff/ui/launcher.h +++ b/plasma/desktop/applets/kickoff/ui/launcher.h @@ -21,7 +21,7 @@ #define LAUNCHER_H // Qt -#include +#include #include // Plasma diff --git a/plasma/desktop/applets/kickoff/ui/searchbar.cpp b/plasma/desktop/applets/kickoff/ui/searchbar.cpp index 7800afeb..d7e808c5 100644 --- a/plasma/desktop/applets/kickoff/ui/searchbar.cpp +++ b/plasma/desktop/applets/kickoff/ui/searchbar.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/plasma/desktop/applets/kickoff/ui/tabbar.cpp b/plasma/desktop/applets/kickoff/ui/tabbar.cpp index 9103565b..ae0aa7f4 100644 --- a/plasma/desktop/applets/kickoff/ui/tabbar.cpp +++ b/plasma/desktop/applets/kickoff/ui/tabbar.cpp @@ -25,7 +25,7 @@ #include // Qt -#include +#include #include #include #include diff --git a/plasma/desktop/applets/kickoff/ui/tabbar.h b/plasma/desktop/applets/kickoff/ui/tabbar.h index c9281059..6f5acea9 100644 --- a/plasma/desktop/applets/kickoff/ui/tabbar.h +++ b/plasma/desktop/applets/kickoff/ui/tabbar.h @@ -22,7 +22,7 @@ #include #include -#include +#include class QPropertyAnimation; diff --git a/plasma/desktop/applets/kickoff/ui/urlitemview.cpp b/plasma/desktop/applets/kickoff/ui/urlitemview.cpp index bd2207ec..aced1859 100644 --- a/plasma/desktop/applets/kickoff/ui/urlitemview.cpp +++ b/plasma/desktop/applets/kickoff/ui/urlitemview.cpp @@ -22,12 +22,12 @@ // Qt #include -#include +#include #include -#include +#include #include -#include +#include #include #include diff --git a/plasma/desktop/applets/pager/model.h b/plasma/desktop/applets/pager/model.h index 93822473..00568cb0 100644 --- a/plasma/desktop/applets/pager/model.h +++ b/plasma/desktop/applets/pager/model.h @@ -18,9 +18,9 @@ #ifndef MODEL_H #define MODEL_H -#include -#include -#include // For WId +#include +#include +#include // For WId #include class RectangleModel : public QAbstractListModel diff --git a/plasma/desktop/applets/pager/pager.cpp b/plasma/desktop/applets/pager/pager.cpp index 52728fdf..f1e896a5 100644 --- a/plasma/desktop/applets/pager/pager.cpp +++ b/plasma/desktop/applets/pager/pager.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/plasma/desktop/applets/pager/pager.h b/plasma/desktop/applets/pager/pager.h index ce194890..334186b0 100644 --- a/plasma/desktop/applets/pager/pager.h +++ b/plasma/desktop/applets/pager/pager.h @@ -21,7 +21,7 @@ #ifndef PAGER_H #define PAGER_H -#include +#include #include #include diff --git a/plasma/desktop/applets/tasks/support/declarativeitemcontainer_p.h b/plasma/desktop/applets/tasks/support/declarativeitemcontainer_p.h index fd01c0c6..8ba63a1b 100644 --- a/plasma/desktop/applets/tasks/support/declarativeitemcontainer_p.h +++ b/plasma/desktop/applets/tasks/support/declarativeitemcontainer_p.h @@ -21,9 +21,9 @@ #define DECLARATIVEITEMCONTAINER_P #include -#include +#include #include -#include +#include class DeclarativeItemContainer : public QGraphicsWidget diff --git a/plasma/desktop/applets/tasks/support/tooltip.cpp b/plasma/desktop/applets/tasks/support/tooltip.cpp index 5ac13973..80babe79 100644 --- a/plasma/desktop/applets/tasks/support/tooltip.cpp +++ b/plasma/desktop/applets/tasks/support/tooltip.cpp @@ -22,7 +22,7 @@ #include "declarativeitemcontainer_p.h" #include -#include +#include #include #include #include diff --git a/plasma/desktop/applets/tasks/support/tooltip.h b/plasma/desktop/applets/tasks/support/tooltip.h index 075c18d4..fa9d527a 100644 --- a/plasma/desktop/applets/tasks/support/tooltip.h +++ b/plasma/desktop/applets/tasks/support/tooltip.h @@ -22,7 +22,7 @@ #define TOOLTIP_PROXY_P #include -#include +#include #include #include diff --git a/plasma/desktop/applets/tasks/tasks.cpp b/plasma/desktop/applets/tasks/tasks.cpp index 6ed394d9..941b1e36 100644 --- a/plasma/desktop/applets/tasks/tasks.cpp +++ b/plasma/desktop/applets/tasks/tasks.cpp @@ -41,6 +41,7 @@ #include #include +#include class GroupManager : public TaskManager::GroupManager { diff --git a/plasma/desktop/applets/trash/trash.cpp b/plasma/desktop/applets/trash/trash.cpp index 12249b90..8f5d2ab8 100644 --- a/plasma/desktop/applets/trash/trash.cpp +++ b/plasma/desktop/applets/trash/trash.cpp @@ -20,7 +20,7 @@ #include "trash.h" //QT -#include +#include #include //KDE diff --git a/plasma/desktop/applets/trash/trash.h b/plasma/desktop/applets/trash/trash.h index 84fec9e9..9573b0d6 100644 --- a/plasma/desktop/applets/trash/trash.h +++ b/plasma/desktop/applets/trash/trash.h @@ -21,9 +21,10 @@ #ifndef TRASH_H #define TRASH_H -#include +#include +#include +#include #include -#include #include #include diff --git a/plasma/desktop/applets/windowlist/WindowList.h b/plasma/desktop/applets/windowlist/WindowList.h index bf94e756..a1769b4b 100644 --- a/plasma/desktop/applets/windowlist/WindowList.h +++ b/plasma/desktop/applets/windowlist/WindowList.h @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/plasma/desktop/containments/desktop/desktop.h b/plasma/desktop/containments/desktop/desktop.h index 368470eb..a3888300 100644 --- a/plasma/desktop/containments/desktop/desktop.h +++ b/plasma/desktop/containments/desktop/desktop.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include diff --git a/plasma/desktop/containments/desktop/itemspace.h b/plasma/desktop/containments/desktop/itemspace.h index d632c493..4f152aa7 100644 --- a/plasma/desktop/containments/desktop/itemspace.h +++ b/plasma/desktop/containments/desktop/itemspace.h @@ -10,7 +10,7 @@ #ifndef ITEMSPACE_H #define ITEMSPACE_H -#include +#include #include #include diff --git a/plasma/desktop/containments/panel/panel.cpp b/plasma/desktop/containments/panel/panel.cpp index 2f51fcde..050c280c 100644 --- a/plasma/desktop/containments/panel/panel.cpp +++ b/plasma/desktop/containments/panel/panel.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/plasma/desktop/shell/checkbox.h b/plasma/desktop/shell/checkbox.h index 816ec6db..a02201a3 100644 --- a/plasma/desktop/shell/checkbox.h +++ b/plasma/desktop/shell/checkbox.h @@ -21,7 +21,7 @@ #define CHECKBOX_H #include -#include +#include class CheckBox: public QCheckBox { diff --git a/plasma/desktop/shell/dashboardview.cpp b/plasma/desktop/shell/dashboardview.cpp index 63e57b66..c0efad26 100644 --- a/plasma/desktop/shell/dashboardview.cpp +++ b/plasma/desktop/shell/dashboardview.cpp @@ -22,7 +22,7 @@ #include "dashboardview.h" #include -#include +#include #include #include diff --git a/plasma/desktop/shell/dashboardview.h b/plasma/desktop/shell/dashboardview.h index 1b809dac..b5f8bd14 100644 --- a/plasma/desktop/shell/dashboardview.h +++ b/plasma/desktop/shell/dashboardview.h @@ -21,7 +21,7 @@ #ifndef DASHBOARDVIEW_H #define DASHBOARDVIEW_H -#include +#include #include #include diff --git a/plasma/desktop/shell/desktopview.cpp b/plasma/desktop/shell/desktopview.cpp index 3a3adcb4..baffeeaa 100644 --- a/plasma/desktop/shell/desktopview.cpp +++ b/plasma/desktop/shell/desktopview.cpp @@ -21,7 +21,7 @@ #include "desktopview.h" #include -#include +#include #include #include diff --git a/plasma/desktop/shell/interactiveconsole.h b/plasma/desktop/shell/interactiveconsole.h index f068ee08..36ff91f2 100644 --- a/plasma/desktop/shell/interactiveconsole.h +++ b/plasma/desktop/shell/interactiveconsole.h @@ -20,7 +20,7 @@ #ifndef INTERACTIVECONSOLE #define INTERACTIVECONSOLE -#include +#include #include #include diff --git a/plasma/desktop/shell/main.cpp b/plasma/desktop/shell/main.cpp index c46c70ba..c2f9fded 100644 --- a/plasma/desktop/shell/main.cpp +++ b/plasma/desktop/shell/main.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include "plasmaapp.h" diff --git a/plasma/desktop/shell/panelappletoverlay.cpp b/plasma/desktop/shell/panelappletoverlay.cpp index 2b0d477c..10839596 100644 --- a/plasma/desktop/shell/panelappletoverlay.cpp +++ b/plasma/desktop/shell/panelappletoverlay.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/plasma/desktop/shell/panelcontroller.cpp b/plasma/desktop/shell/panelcontroller.cpp index 46a56a4c..93ad821b 100644 --- a/plasma/desktop/shell/panelcontroller.cpp +++ b/plasma/desktop/shell/panelcontroller.cpp @@ -25,11 +25,11 @@ #include #include #include -#include +#include #include #include #ifdef Q_WS_X11 -#include +#include #endif #include diff --git a/plasma/desktop/shell/panelview.cpp b/plasma/desktop/shell/panelview.cpp index 9773a8ca..87459399 100644 --- a/plasma/desktop/shell/panelview.cpp +++ b/plasma/desktop/shell/panelview.cpp @@ -25,7 +25,7 @@ #include #ifdef Q_WS_X11 #include -#include +#include #include #endif diff --git a/plasma/desktop/shell/plasmaapp.cpp b/plasma/desktop/shell/plasmaapp.cpp index b80f6481..e379fee6 100644 --- a/plasma/desktop/shell/plasmaapp.cpp +++ b/plasma/desktop/shell/plasmaapp.cpp @@ -41,6 +41,7 @@ #include #include #include +#include #include #include diff --git a/plasma/desktop/shell/plasmaapp.h b/plasma/desktop/shell/plasmaapp.h index f96fdb66..e161b713 100644 --- a/plasma/desktop/shell/plasmaapp.h +++ b/plasma/desktop/shell/plasmaapp.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include diff --git a/plasma/desktop/shell/positioningruler.cpp b/plasma/desktop/shell/positioningruler.cpp index 722a2b62..ef7e0196 100644 --- a/plasma/desktop/shell/positioningruler.cpp +++ b/plasma/desktop/shell/positioningruler.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/plasma/desktop/shell/scripting/panel.h b/plasma/desktop/shell/scripting/panel.h index 00903715..e9833f60 100644 --- a/plasma/desktop/shell/scripting/panel.h +++ b/plasma/desktop/shell/scripting/panel.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include diff --git a/plasma/desktop/toolboxes/desktoptoolbox.cpp b/plasma/desktop/toolboxes/desktoptoolbox.cpp index cc4c8dcf..98fc62bc 100644 --- a/plasma/desktop/toolboxes/desktoptoolbox.cpp +++ b/plasma/desktop/toolboxes/desktoptoolbox.cpp @@ -23,12 +23,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include diff --git a/plasma/desktop/toolboxes/desktoptoolbox.h b/plasma/desktop/toolboxes/desktoptoolbox.h index 0e8711bf..0edbcd10 100644 --- a/plasma/desktop/toolboxes/desktoptoolbox.h +++ b/plasma/desktop/toolboxes/desktoptoolbox.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include diff --git a/plasma/desktop/toolboxes/internaltoolbox.cpp b/plasma/desktop/toolboxes/internaltoolbox.cpp index 3a450b72..a60e96ba 100644 --- a/plasma/desktop/toolboxes/internaltoolbox.cpp +++ b/plasma/desktop/toolboxes/internaltoolbox.cpp @@ -22,10 +22,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/plasma/desktop/toolboxes/paneltoolbox.cpp b/plasma/desktop/toolboxes/paneltoolbox.cpp index 926cf522..8bd78a3d 100644 --- a/plasma/desktop/toolboxes/paneltoolbox.cpp +++ b/plasma/desktop/toolboxes/paneltoolbox.cpp @@ -20,11 +20,11 @@ #include "paneltoolbox.h" -#include +#include #include -#include +#include #include -#include +#include #include #include diff --git a/plasma/desktop/toolboxes/paneltoolbox.h b/plasma/desktop/toolboxes/paneltoolbox.h index 5ba5fe68..2bcc74ce 100644 --- a/plasma/desktop/toolboxes/paneltoolbox.h +++ b/plasma/desktop/toolboxes/paneltoolbox.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include diff --git a/plasma/generic/applets/analog-clock/clock.cpp b/plasma/generic/applets/analog-clock/clock.cpp index 1655285d..1ca1da4f 100644 --- a/plasma/generic/applets/analog-clock/clock.cpp +++ b/plasma/generic/applets/analog-clock/clock.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/plasma/generic/applets/analog-clock/clock.h b/plasma/generic/applets/analog-clock/clock.h index c1a8fae0..124de92d 100644 --- a/plasma/generic/applets/analog-clock/clock.h +++ b/plasma/generic/applets/analog-clock/clock.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/plasma/generic/applets/digital-clock/clock.cpp b/plasma/generic/applets/digital-clock/clock.cpp index 2f0a85c0..02eb51f4 100644 --- a/plasma/generic/applets/digital-clock/clock.cpp +++ b/plasma/generic/applets/digital-clock/clock.cpp @@ -25,12 +25,12 @@ #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include #include diff --git a/plasma/generic/applets/digital-clock/clock.h b/plasma/generic/applets/digital-clock/clock.h index 7311a83f..321a40b9 100644 --- a/plasma/generic/applets/digital-clock/clock.h +++ b/plasma/generic/applets/digital-clock/clock.h @@ -21,8 +21,8 @@ #ifndef CLOCK_H #define CLOCK_H -#include -#include +#include +#include #include #include diff --git a/plasma/generic/applets/icon/icon.cpp b/plasma/generic/applets/icon/icon.cpp index ed3b558e..b7290b0e 100644 --- a/plasma/generic/applets/icon/icon.cpp +++ b/plasma/generic/applets/icon/icon.cpp @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/plasma/generic/applets/quicklaunch/icongridlayout.cpp b/plasma/generic/applets/quicklaunch/icongridlayout.cpp index a3d28f37..f971f973 100644 --- a/plasma/generic/applets/quicklaunch/icongridlayout.cpp +++ b/plasma/generic/applets/quicklaunch/icongridlayout.cpp @@ -19,11 +19,11 @@ #include "icongridlayout.h" // Qt -#include +#include #include #include -#include -#include +#include +#include #include #include #include diff --git a/plasma/generic/applets/quicklaunch/icongridlayout.h b/plasma/generic/applets/quicklaunch/icongridlayout.h index 143293a8..cca8ae36 100644 --- a/plasma/generic/applets/quicklaunch/icongridlayout.h +++ b/plasma/generic/applets/quicklaunch/icongridlayout.h @@ -20,10 +20,10 @@ #define QUICKLAUNCH_ICONGRIDLAYOUT_H // Qt -#include +#include #include #include -#include +#include #include class QEvent; diff --git a/plasma/generic/applets/quicklaunch/launcher.cpp b/plasma/generic/applets/quicklaunch/launcher.cpp index e50eb647..75214a43 100644 --- a/plasma/generic/applets/quicklaunch/launcher.cpp +++ b/plasma/generic/applets/quicklaunch/launcher.cpp @@ -20,10 +20,10 @@ #include "launcher.h" // Qt -#include +#include #include -#include -#include +#include +#include // KDE #include diff --git a/plasma/generic/applets/quicklaunch/launcher.h b/plasma/generic/applets/quicklaunch/launcher.h index efef64b7..5ca5b698 100644 --- a/plasma/generic/applets/quicklaunch/launcher.h +++ b/plasma/generic/applets/quicklaunch/launcher.h @@ -21,7 +21,7 @@ #define QUICKLAUNCH_LAUNCHER_H // Qt -#include +#include #include #include diff --git a/plasma/generic/applets/quicklaunch/launcherdata.cpp b/plasma/generic/applets/quicklaunch/launcherdata.cpp index 36a208d9..8aced166 100644 --- a/plasma/generic/applets/quicklaunch/launcherdata.cpp +++ b/plasma/generic/applets/quicklaunch/launcherdata.cpp @@ -20,11 +20,11 @@ #include "launcherdata.h" // Qt -#include +#include #include #include #include -#include +#include // KDE #include diff --git a/plasma/generic/applets/quicklaunch/launcherdata.h b/plasma/generic/applets/quicklaunch/launcherdata.h index 548a8317..3e6e98c7 100644 --- a/plasma/generic/applets/quicklaunch/launcherdata.h +++ b/plasma/generic/applets/quicklaunch/launcherdata.h @@ -20,7 +20,7 @@ #define QUICKLAUNCH_LAUNCHERDATA_H // Qt -#include +#include #include #include #include diff --git a/plasma/generic/applets/quicklaunch/launchergrid.cpp b/plasma/generic/applets/quicklaunch/launchergrid.cpp index 1592885c..5537fb4a 100644 --- a/plasma/generic/applets/quicklaunch/launchergrid.cpp +++ b/plasma/generic/applets/quicklaunch/launchergrid.cpp @@ -19,13 +19,13 @@ #include "launchergrid.h" // Qt -#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #include @@ -33,14 +33,14 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include +#include #include // KDE diff --git a/plasma/generic/applets/quicklaunch/launchergrid.h b/plasma/generic/applets/quicklaunch/launchergrid.h index 226c592a..427f3e07 100644 --- a/plasma/generic/applets/quicklaunch/launchergrid.h +++ b/plasma/generic/applets/quicklaunch/launchergrid.h @@ -20,10 +20,10 @@ #define QUICKLAUNCH_LAUNCHERGRID_H // Qt -#include +#include #include #include -#include +#include #include // KDE diff --git a/plasma/generic/applets/quicklaunch/popup.cpp b/plasma/generic/applets/quicklaunch/popup.cpp index 9b48af65..9f00e53f 100644 --- a/plasma/generic/applets/quicklaunch/popup.cpp +++ b/plasma/generic/applets/quicklaunch/popup.cpp @@ -20,7 +20,7 @@ #include "popup.h" // Qt -#include +#include #include #include #include diff --git a/plasma/generic/applets/quicklaunch/popup.h b/plasma/generic/applets/quicklaunch/popup.h index 2c641a1d..99f9a60f 100644 --- a/plasma/generic/applets/quicklaunch/popup.h +++ b/plasma/generic/applets/quicklaunch/popup.h @@ -20,7 +20,7 @@ #define QUICKLAUNCH_POPUP_H // Qt -#include +#include #include #include diff --git a/plasma/generic/applets/quicklaunch/popuplauncherlist.cpp b/plasma/generic/applets/quicklaunch/popuplauncherlist.cpp index a19dc9e3..245be9a9 100644 --- a/plasma/generic/applets/quicklaunch/popuplauncherlist.cpp +++ b/plasma/generic/applets/quicklaunch/popuplauncherlist.cpp @@ -19,26 +19,26 @@ #include "popuplauncherlist.h" // Qt -#include +#include #include #include #include -#include -#include +#include +#include #include #include #include #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include +#include #include // KDE diff --git a/plasma/generic/applets/quicklaunch/popuplauncherlist.h b/plasma/generic/applets/quicklaunch/popuplauncherlist.h index aec61fb8..a93d6348 100644 --- a/plasma/generic/applets/quicklaunch/popuplauncherlist.h +++ b/plasma/generic/applets/quicklaunch/popuplauncherlist.h @@ -20,10 +20,10 @@ #define QUICKLAUNCH_POPUPLAUNCHERLIST_H // Qt -#include +#include #include #include -#include +#include #include // KDE diff --git a/plasma/generic/applets/quicklaunch/quicklaunch.cpp b/plasma/generic/applets/quicklaunch/quicklaunch.cpp index 54d8040b..cef98150 100644 --- a/plasma/generic/applets/quicklaunch/quicklaunch.cpp +++ b/plasma/generic/applets/quicklaunch/quicklaunch.cpp @@ -20,7 +20,7 @@ #include "quicklaunch.h" // Qt -#include +#include #include #include #include @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include // KDE diff --git a/plasma/generic/applets/quicklaunch/quicklaunch.h b/plasma/generic/applets/quicklaunch/quicklaunch.h index 1a730b24..3b0458bf 100644 --- a/plasma/generic/applets/quicklaunch/quicklaunch.h +++ b/plasma/generic/applets/quicklaunch/quicklaunch.h @@ -23,13 +23,13 @@ #include "ui_quicklaunchConfig.h" // Qt -#include +#include #include #include #include -#include +#include #include -#include +#include #include // Plasma diff --git a/plasma/generic/applets/systemtray/CMakeLists.txt b/plasma/generic/applets/systemtray/CMakeLists.txt index 9640088a..638d5c2e 100644 --- a/plasma/generic/applets/systemtray/CMakeLists.txt +++ b/plasma/generic/applets/systemtray/CMakeLists.txt @@ -1,7 +1,5 @@ project(plasma-systemtray) -find_package(Qt4 4.8 COMPONENTS QtCore QtGui QtDeclarative REQUIRED) - set(data_install_dir "plasma/packages/org.kde.systemtray") set(systemtray_SRCS diff --git a/plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp b/plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp index 498e644f..15c3291e 100644 --- a/plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp +++ b/plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp @@ -21,7 +21,7 @@ #include "dbussystemtraytask.h" #include "dbussystemtrayprotocol.h" -#include +#include #include #include #include diff --git a/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.cpp b/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.cpp index 48471e3c..9b7237ef 100644 --- a/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.cpp +++ b/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.cpp @@ -23,7 +23,7 @@ #include "x11embeddelegate.h" #include "x11embedcontainer.h" -#include +#include #include #include diff --git a/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.h b/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.h index fbe95720..ed646185 100644 --- a/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.h +++ b/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.h @@ -23,7 +23,7 @@ #define FDOGRAPHICSWIDGET_H #include -#include +#include namespace SystemTray diff --git a/plasma/generic/applets/systemtray/protocols/fdo/fdoselectionmanager.cpp b/plasma/generic/applets/systemtray/protocols/fdo/fdoselectionmanager.cpp index 4257202f..e1e11217 100644 --- a/plasma/generic/applets/systemtray/protocols/fdo/fdoselectionmanager.cpp +++ b/plasma/generic/applets/systemtray/protocols/fdo/fdoselectionmanager.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include diff --git a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp b/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp index 2cf997df..6d1ad1fe 100644 --- a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp +++ b/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp @@ -29,7 +29,7 @@ // Qt #include #include -#include +#include // Xlib #include diff --git a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.h b/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.h index a58fafa5..3af92306 100644 --- a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.h +++ b/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.h @@ -22,7 +22,7 @@ #ifndef X11EMBEDCONTAINER_H #define X11EMBEDCONTAINER_H -#include +#include namespace SystemTray diff --git a/plasma/generic/applets/systemtray/protocols/fdo/x11embedpainter.cpp b/plasma/generic/applets/systemtray/protocols/fdo/x11embedpainter.cpp index 5c925936..f173fead 100644 --- a/plasma/generic/applets/systemtray/protocols/fdo/x11embedpainter.cpp +++ b/plasma/generic/applets/systemtray/protocols/fdo/x11embedpainter.cpp @@ -22,7 +22,7 @@ #include "x11embedpainter.h" #include -#include +#include #include #include diff --git a/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp b/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp index 9806c506..a69d161a 100644 --- a/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp +++ b/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp @@ -27,10 +27,10 @@ #include "../core/task.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/plasma/generic/applets/systemtray/ui/widgetitem.cpp b/plasma/generic/applets/systemtray/ui/widgetitem.cpp index ec4db662..3fe30e46 100644 --- a/plasma/generic/applets/systemtray/ui/widgetitem.cpp +++ b/plasma/generic/applets/systemtray/ui/widgetitem.cpp @@ -28,7 +28,7 @@ #include "../core/task.h" -#include +#include #include #include diff --git a/plasma/generic/applets/webbrowser/bookmarkitem.h b/plasma/generic/applets/webbrowser/bookmarkitem.h index c0a950a0..3242727b 100644 --- a/plasma/generic/applets/webbrowser/bookmarkitem.h +++ b/plasma/generic/applets/webbrowser/bookmarkitem.h @@ -20,8 +20,8 @@ #define BOOKMARKITEM_H -#include -#include +#include +#include #include diff --git a/plasma/generic/applets/webbrowser/bookmarksdelegate.cpp b/plasma/generic/applets/webbrowser/bookmarksdelegate.cpp index d5cab3a8..199bcd8d 100644 --- a/plasma/generic/applets/webbrowser/bookmarksdelegate.cpp +++ b/plasma/generic/applets/webbrowser/bookmarksdelegate.cpp @@ -24,10 +24,10 @@ #include // Qt -#include -#include +#include +#include #include -#include +#include // KDE #include diff --git a/plasma/generic/applets/webbrowser/webbrowser.cpp b/plasma/generic/applets/webbrowser/webbrowser.cpp index ce616c2e..93075c81 100644 --- a/plasma/generic/applets/webbrowser/webbrowser.cpp +++ b/plasma/generic/applets/webbrowser/webbrowser.cpp @@ -21,7 +21,7 @@ #include "webbrowser.h" #include -#include +#include #include #include #include diff --git a/plasma/generic/applets/webbrowser/webviewoverlay.cpp b/plasma/generic/applets/webbrowser/webviewoverlay.cpp index 9cc0af28..3db7ccc0 100644 --- a/plasma/generic/applets/webbrowser/webviewoverlay.cpp +++ b/plasma/generic/applets/webbrowser/webviewoverlay.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/plasma/generic/containmentactions/applauncher/launch.cpp b/plasma/generic/containmentactions/applauncher/launch.cpp index 248bd9c2..fb22a60b 100644 --- a/plasma/generic/containmentactions/applauncher/launch.cpp +++ b/plasma/generic/containmentactions/applauncher/launch.cpp @@ -19,8 +19,8 @@ #include "launch.h" -#include -#include +#include +#include #include #include diff --git a/plasma/generic/containmentactions/contextmenu/menu.cpp b/plasma/generic/containmentactions/contextmenu/menu.cpp index b571bf1f..7fd8d7df 100644 --- a/plasma/generic/containmentactions/contextmenu/menu.cpp +++ b/plasma/generic/containmentactions/contextmenu/menu.cpp @@ -21,10 +21,10 @@ #include #include -#include -#include +#include #include #include +#include #include #include diff --git a/plasma/generic/containmentactions/minimalcontextmenu/menu.cpp b/plasma/generic/containmentactions/minimalcontextmenu/menu.cpp index 6ba1ab8b..2226f7b2 100644 --- a/plasma/generic/containmentactions/minimalcontextmenu/menu.cpp +++ b/plasma/generic/containmentactions/minimalcontextmenu/menu.cpp @@ -20,8 +20,8 @@ #include "menu.h" #include -#include -#include +#include +#include #include #include diff --git a/plasma/generic/containmentactions/paste/paste.cpp b/plasma/generic/containmentactions/paste/paste.cpp index 6b8d4f5d..1aeed84c 100644 --- a/plasma/generic/containmentactions/paste/paste.cpp +++ b/plasma/generic/containmentactions/paste/paste.cpp @@ -19,8 +19,8 @@ #include "paste.h" -#include -#include +#include +#include #include diff --git a/plasma/generic/containmentactions/switchdesktop/desktop.cpp b/plasma/generic/containmentactions/switchdesktop/desktop.cpp index 2d0e2b7b..19bc9e37 100644 --- a/plasma/generic/containmentactions/switchdesktop/desktop.cpp +++ b/plasma/generic/containmentactions/switchdesktop/desktop.cpp @@ -19,8 +19,8 @@ #include "desktop.h" -#include -#include +#include +#include #include #include diff --git a/plasma/generic/containmentactions/switchwindow/switch.cpp b/plasma/generic/containmentactions/switchwindow/switch.cpp index 34971782..634f6652 100644 --- a/plasma/generic/containmentactions/switchwindow/switch.cpp +++ b/plasma/generic/containmentactions/switchwindow/switch.cpp @@ -19,8 +19,8 @@ #include "switch.h" -#include -#include +#include +#include #include #include diff --git a/plasma/generic/containments/newspaper/appletmovespacer.cpp b/plasma/generic/containments/newspaper/appletmovespacer.cpp index f91dd0b0..ee5699d6 100644 --- a/plasma/generic/containments/newspaper/appletmovespacer.cpp +++ b/plasma/generic/containments/newspaper/appletmovespacer.cpp @@ -19,7 +19,7 @@ #include "appletmovespacer.h" -#include +#include #include diff --git a/plasma/generic/containments/newspaper/appletoverlay.cpp b/plasma/generic/containments/newspaper/appletoverlay.cpp index 585e61f0..c7dd0cff 100644 --- a/plasma/generic/containments/newspaper/appletoverlay.cpp +++ b/plasma/generic/containments/newspaper/appletoverlay.cpp @@ -20,7 +20,7 @@ #include "appletoverlay.h" #include -#include +#include AppletOverlay::AppletOverlay(QGraphicsWidget *parent) : QGraphicsWidget(parent) diff --git a/plasma/generic/containments/newspaper/appletscontainer.cpp b/plasma/generic/containments/newspaper/appletscontainer.cpp index c338fb1e..3d1fd874 100644 --- a/plasma/generic/containments/newspaper/appletscontainer.cpp +++ b/plasma/generic/containments/newspaper/appletscontainer.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/plasma/generic/containments/newspaper/appletsview.cpp b/plasma/generic/containments/newspaper/appletsview.cpp index be7e9212..8e1bc551 100644 --- a/plasma/generic/containments/newspaper/appletsview.cpp +++ b/plasma/generic/containments/newspaper/appletsview.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/plasma/generic/containments/newspaper/applettitlebar.cpp b/plasma/generic/containments/newspaper/applettitlebar.cpp index e3d58312..05726306 100644 --- a/plasma/generic/containments/newspaper/applettitlebar.cpp +++ b/plasma/generic/containments/newspaper/applettitlebar.cpp @@ -21,8 +21,8 @@ #include "newspaper.h" #include -#include -#include +#include +#include #include #include #include diff --git a/plasma/generic/containments/newspaper/applettitlebar.h b/plasma/generic/containments/newspaper/applettitlebar.h index 78403d0e..20652509 100644 --- a/plasma/generic/containments/newspaper/applettitlebar.h +++ b/plasma/generic/containments/newspaper/applettitlebar.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include diff --git a/plasma/generic/containments/newspaper/dragcountdown.cpp b/plasma/generic/containments/newspaper/dragcountdown.cpp index 65be072b..c452ceda 100644 --- a/plasma/generic/containments/newspaper/dragcountdown.cpp +++ b/plasma/generic/containments/newspaper/dragcountdown.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/plasma/generic/containments/newspaper/newspaper.cpp b/plasma/generic/containments/newspaper/newspaper.cpp index cfd5f4af..07474038 100644 --- a/plasma/generic/containments/newspaper/newspaper.cpp +++ b/plasma/generic/containments/newspaper/newspaper.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/plasma/generic/dataengines/applicationjobs/kuiserverengine.cpp b/plasma/generic/dataengines/applicationjobs/kuiserverengine.cpp index cc204ef6..7641cbcc 100644 --- a/plasma/generic/dataengines/applicationjobs/kuiserverengine.cpp +++ b/plasma/generic/dataengines/applicationjobs/kuiserverengine.cpp @@ -22,6 +22,7 @@ #include "jobcontrol.h" #include +#include #include diff --git a/plasma/generic/dataengines/applicationjobs/kuiserverengine.h b/plasma/generic/dataengines/applicationjobs/kuiserverengine.h index c03b0700..3b547288 100644 --- a/plasma/generic/dataengines/applicationjobs/kuiserverengine.h +++ b/plasma/generic/dataengines/applicationjobs/kuiserverengine.h @@ -19,7 +19,7 @@ #ifndef KUISERVERENGINE_H #define KUISERVERENGINE_H -#include +#include #include #include diff --git a/plasma/generic/dataengines/mouse/cursornotificationhandler.cpp b/plasma/generic/dataengines/mouse/cursornotificationhandler.cpp index 9b51f91a..4abfad2a 100644 --- a/plasma/generic/dataengines/mouse/cursornotificationhandler.cpp +++ b/plasma/generic/dataengines/mouse/cursornotificationhandler.cpp @@ -18,7 +18,7 @@ #include "cursornotificationhandler.h" -#include +#include #include #include diff --git a/plasma/generic/dataengines/mpris2/mpris2engine.cpp b/plasma/generic/dataengines/mpris2/mpris2engine.cpp index 9bbb7c30..a6afcb53 100644 --- a/plasma/generic/dataengines/mpris2/mpris2engine.cpp +++ b/plasma/generic/dataengines/mpris2/mpris2engine.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/plasma/generic/dataengines/mpris2/mpris2engine.h b/plasma/generic/dataengines/mpris2/mpris2engine.h index 4d314f76..71953ad0 100644 --- a/plasma/generic/dataengines/mpris2/mpris2engine.h +++ b/plasma/generic/dataengines/mpris2/mpris2engine.h @@ -21,7 +21,7 @@ #include -#include +#include class QDBusPendingCallWatcher; class PlayerContainer; diff --git a/plasma/generic/dataengines/mpris2/multiplexedservice.h b/plasma/generic/dataengines/mpris2/multiplexedservice.h index c2c47400..e2749028 100644 --- a/plasma/generic/dataengines/mpris2/multiplexedservice.h +++ b/plasma/generic/dataengines/mpris2/multiplexedservice.h @@ -22,7 +22,7 @@ #include #include "playercontrol.h" -#include +#include class Multiplexer; class PlayerControl; diff --git a/plasma/generic/dataengines/mpris2/multiplexer.h b/plasma/generic/dataengines/mpris2/multiplexer.h index 083cdf1a..6fffacd7 100644 --- a/plasma/generic/dataengines/mpris2/multiplexer.h +++ b/plasma/generic/dataengines/mpris2/multiplexer.h @@ -24,7 +24,7 @@ #include "playercontainer.h" -#include +#include class Multiplexer : public Plasma::DataContainer { diff --git a/plasma/generic/dataengines/mpris2/playeractionjob.cpp b/plasma/generic/dataengines/mpris2/playeractionjob.cpp index 07009a35..8828ba47 100644 --- a/plasma/generic/dataengines/mpris2/playeractionjob.cpp +++ b/plasma/generic/dataengines/mpris2/playeractionjob.cpp @@ -25,9 +25,9 @@ #include #include -#include +#include #include -#include +#include #include diff --git a/plasma/generic/dataengines/mpris2/playercontainer.h b/plasma/generic/dataengines/mpris2/playercontainer.h index 34a2ad85..5a4665d8 100644 --- a/plasma/generic/dataengines/mpris2/playercontainer.h +++ b/plasma/generic/dataengines/mpris2/playercontainer.h @@ -21,7 +21,7 @@ #define PLAYERCONTAINER_H #include -#include +#include class OrgFreedesktopDBusPropertiesInterface; class OrgMprisMediaPlayer2Interface; diff --git a/plasma/generic/dataengines/mpris2/playercontrol.h b/plasma/generic/dataengines/mpris2/playercontrol.h index 100654bf..f3a3130d 100644 --- a/plasma/generic/dataengines/mpris2/playercontrol.h +++ b/plasma/generic/dataengines/mpris2/playercontrol.h @@ -23,7 +23,7 @@ #include "playercontainer.h" #include -#include +#include class OrgFreedesktopDBusPropertiesInterface; class OrgMprisMediaPlayer2Interface; diff --git a/plasma/generic/dataengines/notifications/notificationsengine.cpp b/plasma/generic/dataengines/notifications/notificationsengine.cpp index 7594af3e..47081384 100644 --- a/plasma/generic/dataengines/notifications/notificationsengine.cpp +++ b/plasma/generic/dataengines/notifications/notificationsengine.cpp @@ -31,6 +31,7 @@ #include #include +#include #include diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/mpris/mpris_p.h b/plasma/generic/dataengines/nowplaying/playerinterface/mpris/mpris_p.h index d8c3121c..384651cd 100644 --- a/plasma/generic/dataengines/nowplaying/playerinterface/mpris/mpris_p.h +++ b/plasma/generic/dataengines/nowplaying/playerinterface/mpris/mpris_p.h @@ -21,7 +21,7 @@ #include "mprisdbustypes.h" #include "../player.h" -#include +#include class MprisPlayer; diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/mpris2/mpris2_p.h b/plasma/generic/dataengines/nowplaying/playerinterface/mpris2/mpris2_p.h index 04a3a762..7c568c74 100644 --- a/plasma/generic/dataengines/nowplaying/playerinterface/mpris2/mpris2_p.h +++ b/plasma/generic/dataengines/nowplaying/playerinterface/mpris2/mpris2_p.h @@ -20,8 +20,8 @@ #include "mpris2.h" #include "../player.h" -#include -#include +#include +#include class QDBusInterface; class Mpris2 : public QObject, public Player diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/playerfactory.h b/plasma/generic/dataengines/nowplaying/playerinterface/playerfactory.h index 27371f31..3a563317 100644 --- a/plasma/generic/dataengines/nowplaying/playerinterface/playerfactory.h +++ b/plasma/generic/dataengines/nowplaying/playerinterface/playerfactory.h @@ -19,7 +19,7 @@ #define PLAYERFACTORY_H #include -#include +#include #include "player.h" diff --git a/plasma/generic/dataengines/powermanagement/powermanagementengine.cpp b/plasma/generic/dataengines/powermanagement/powermanagementengine.cpp index 716de0ae..74ea83e7 100644 --- a/plasma/generic/dataengines/powermanagement/powermanagementengine.cpp +++ b/plasma/generic/dataengines/powermanagement/powermanagementengine.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include "powermanagementservice.h" diff --git a/plasma/generic/dataengines/share/shareprovider.cpp b/plasma/generic/dataengines/share/shareprovider.cpp index c80ae68a..307c1e41 100644 --- a/plasma/generic/dataengines/share/shareprovider.cpp +++ b/plasma/generic/dataengines/share/shareprovider.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ #include -#include +#include #include #include diff --git a/plasma/generic/dataengines/soliddevice/hddtemp.cpp b/plasma/generic/dataengines/soliddevice/hddtemp.cpp index 85436f1b..4c7d3024 100644 --- a/plasma/generic/dataengines/soliddevice/hddtemp.cpp +++ b/plasma/generic/dataengines/soliddevice/hddtemp.cpp @@ -21,7 +21,7 @@ #include -#include +#include #include diff --git a/plasma/generic/dataengines/soliddevice/soliddeviceengine.cpp b/plasma/generic/dataengines/soliddevice/soliddeviceengine.cpp index 952f2c8e..8fa68db4 100644 --- a/plasma/generic/dataengines/soliddevice/soliddeviceengine.cpp +++ b/plasma/generic/dataengines/soliddevice/soliddeviceengine.cpp @@ -19,7 +19,7 @@ #include "soliddeviceengine.h" #include "soliddeviceservice.h" -#include +#include #include #include diff --git a/plasma/generic/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp b/plasma/generic/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp index 98b2938f..562b59e8 100644 --- a/plasma/generic/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp +++ b/plasma/generic/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp @@ -22,6 +22,7 @@ #include "statusnotifieritem_engine.h" #include "statusnotifieritemsource.h" +#include #include #include #include diff --git a/plasma/generic/dataengines/statusnotifieritem/statusnotifieritemsource.cpp b/plasma/generic/dataengines/statusnotifieritem/statusnotifieritemsource.cpp index d2bdbc06..86f1dc59 100644 --- a/plasma/generic/dataengines/statusnotifieritem/statusnotifieritemsource.cpp +++ b/plasma/generic/dataengines/statusnotifieritem/statusnotifieritemsource.cpp @@ -34,11 +34,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include diff --git a/plasma/generic/dataengines/statusnotifieritem/statusnotifieritemsource.h b/plasma/generic/dataengines/statusnotifieritem/statusnotifieritemsource.h index c60fb321..3a94abcd 100644 --- a/plasma/generic/dataengines/statusnotifieritem/statusnotifieritemsource.h +++ b/plasma/generic/dataengines/statusnotifieritem/statusnotifieritemsource.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include "statusnotifieritem_interface.h" diff --git a/plasma/generic/dataengines/time/solarsystem.h b/plasma/generic/dataengines/time/solarsystem.h index 5ffdb5e1..85b06f94 100644 --- a/plasma/generic/dataengines/time/solarsystem.h +++ b/plasma/generic/dataengines/time/solarsystem.h @@ -20,7 +20,7 @@ #include #include -#include +#include /* * Mathematics, ideas, public domain code used for these classes from: diff --git a/plasma/generic/dataengines/time/timeengine.cpp b/plasma/generic/dataengines/time/timeengine.cpp index cea3d199..6a8a9aa9 100644 --- a/plasma/generic/dataengines/time/timeengine.cpp +++ b/plasma/generic/dataengines/time/timeengine.cpp @@ -20,10 +20,10 @@ #include "timeengine.h" -#include +#include #include #include -#include +#include #include #include diff --git a/plasma/generic/dataengines/weather/ions/debianweather/iondebianweather.cpp b/plasma/generic/dataengines/weather/ions/debianweather/iondebianweather.cpp index f09eb345..5fdbf532 100644 --- a/plasma/generic/dataengines/weather/ions/debianweather/iondebianweather.cpp +++ b/plasma/generic/dataengines/weather/ions/debianweather/iondebianweather.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include IonDebianWeather::IonDebianWeather(QObject*, const QVariantList&) : IonInterface(), m_ionname(QLatin1String("DebianWeather")) { diff --git a/plasma/generic/declarativeimports/core/declarativeitemcontainer_p.h b/plasma/generic/declarativeimports/core/declarativeitemcontainer_p.h index e026afd6..53d837f0 100644 --- a/plasma/generic/declarativeimports/core/declarativeitemcontainer_p.h +++ b/plasma/generic/declarativeimports/core/declarativeitemcontainer_p.h @@ -21,9 +21,9 @@ #define DECLARATIVEITEMCONTAINER_P #include -#include +#include #include -#include +#include class DeclarativeItemContainer : public QGraphicsWidget diff --git a/plasma/generic/declarativeimports/core/dialog.cpp b/plasma/generic/declarativeimports/core/dialog.cpp index 21db2beb..bd5ae708 100644 --- a/plasma/generic/declarativeimports/core/dialog.cpp +++ b/plasma/generic/declarativeimports/core/dialog.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/plasma/generic/declarativeimports/core/dialog.h b/plasma/generic/declarativeimports/core/dialog.h index 150221fb..f06965aa 100644 --- a/plasma/generic/declarativeimports/core/dialog.h +++ b/plasma/generic/declarativeimports/core/dialog.h @@ -21,7 +21,7 @@ #define DIALOG_PROXY_P #include -#include +#include #include #include diff --git a/plasma/generic/declarativeimports/core/iconitem.cpp b/plasma/generic/declarativeimports/core/iconitem.cpp index 24aa24ae..27705d98 100644 --- a/plasma/generic/declarativeimports/core/iconitem.cpp +++ b/plasma/generic/declarativeimports/core/iconitem.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/plasma/generic/declarativeimports/core/runnermodel.h b/plasma/generic/declarativeimports/core/runnermodel.h index e2914a51..f00aa5ac 100644 --- a/plasma/generic/declarativeimports/core/runnermodel.h +++ b/plasma/generic/declarativeimports/core/runnermodel.h @@ -20,7 +20,7 @@ #ifndef RUNNERMODEL_H #define RUNNERMODEL_H -#include +#include #include namespace Plasma diff --git a/plasma/generic/declarativeimports/core/tooltip.cpp b/plasma/generic/declarativeimports/core/tooltip.cpp index 67518427..137d2a15 100644 --- a/plasma/generic/declarativeimports/core/tooltip.cpp +++ b/plasma/generic/declarativeimports/core/tooltip.cpp @@ -22,7 +22,7 @@ #include "declarativeitemcontainer_p.h" #include -#include +#include #include #include #include diff --git a/plasma/generic/declarativeimports/core/tooltip.h b/plasma/generic/declarativeimports/core/tooltip.h index f2a2b38b..a57c2006 100644 --- a/plasma/generic/declarativeimports/core/tooltip.h +++ b/plasma/generic/declarativeimports/core/tooltip.h @@ -22,7 +22,7 @@ #define TOOLTIP_PROXY_P #include -#include +#include #include class QGraphicsObject; diff --git a/plasma/generic/declarativeimports/dirmodel/dirmodel.cpp b/plasma/generic/declarativeimports/dirmodel/dirmodel.cpp index 63f38f14..9d91a6db 100644 --- a/plasma/generic/declarativeimports/dirmodel/dirmodel.cpp +++ b/plasma/generic/declarativeimports/dirmodel/dirmodel.cpp @@ -23,7 +23,7 @@ #include #include #include - +#include DirModel::DirModel(QObject *parent) : KDirModel(parent), diff --git a/plasma/generic/declarativeimports/draganddrop/DeclarativeDragArea.cpp b/plasma/generic/declarativeimports/draganddrop/DeclarativeDragArea.cpp index 9fa71418..f4f649d7 100644 --- a/plasma/generic/declarativeimports/draganddrop/DeclarativeDragArea.cpp +++ b/plasma/generic/declarativeimports/draganddrop/DeclarativeDragArea.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/plasma/generic/declarativeimports/draganddrop/DeclarativeDragDropEvent.h b/plasma/generic/declarativeimports/draganddrop/DeclarativeDragDropEvent.h index cb19af2d..3369fbb8 100644 --- a/plasma/generic/declarativeimports/draganddrop/DeclarativeDragDropEvent.h +++ b/plasma/generic/declarativeimports/draganddrop/DeclarativeDragDropEvent.h @@ -25,7 +25,7 @@ #define DECLARATIVEDRAGDROPEVENT_H #include -#include +#include #include "DeclarativeMimeData.h" #include "DeclarativeDropArea.h" diff --git a/plasma/generic/declarativeimports/draganddrop/DeclarativeDropArea.cpp b/plasma/generic/declarativeimports/draganddrop/DeclarativeDropArea.cpp index f1ef54e9..5bed431f 100644 --- a/plasma/generic/declarativeimports/draganddrop/DeclarativeDropArea.cpp +++ b/plasma/generic/declarativeimports/draganddrop/DeclarativeDropArea.cpp @@ -24,7 +24,7 @@ #include "DeclarativeDropArea.h" #include "DeclarativeDragDropEvent.h" -#include +#include #include DeclarativeDropArea::DeclarativeDropArea(QDeclarativeItem *parent) diff --git a/plasma/generic/declarativeimports/graphicslayouts/gridlayout.h b/plasma/generic/declarativeimports/graphicslayouts/gridlayout.h index 335ae5d4..3f7f57e5 100644 --- a/plasma/generic/declarativeimports/graphicslayouts/gridlayout.h +++ b/plasma/generic/declarativeimports/graphicslayouts/gridlayout.h @@ -45,7 +45,7 @@ #include #include -#include +#include class GridLayoutAttached; class GraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout diff --git a/plasma/generic/declarativeimports/graphicslayouts/linearlayout.h b/plasma/generic/declarativeimports/graphicslayouts/linearlayout.h index 875d2e51..98798077 100644 --- a/plasma/generic/declarativeimports/graphicslayouts/linearlayout.h +++ b/plasma/generic/declarativeimports/graphicslayouts/linearlayout.h @@ -45,7 +45,7 @@ #include #include -#include +#include class GraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem { diff --git a/plasma/generic/declarativeimports/graphicswidgets/declarativetabbar.h b/plasma/generic/declarativeimports/graphicswidgets/declarativetabbar.h index aa7aae61..70870d46 100644 --- a/plasma/generic/declarativeimports/graphicswidgets/declarativetabbar.h +++ b/plasma/generic/declarativeimports/graphicswidgets/declarativetabbar.h @@ -21,7 +21,7 @@ #define DECLARATIVETABBAR #include -#include +#include #include "plasma/widgets/tabbar.h" diff --git a/plasma/generic/declarativeimports/locale/calendarsystem.h b/plasma/generic/declarativeimports/locale/calendarsystem.h index 7efca912..c7298b57 100644 --- a/plasma/generic/declarativeimports/locale/calendarsystem.h +++ b/plasma/generic/declarativeimports/locale/calendarsystem.h @@ -25,7 +25,7 @@ #include "locale_p.h" // needed for enums //Qt -#include +#include class KCalendarSystem; diff --git a/plasma/generic/declarativeimports/locale/locale_p.h b/plasma/generic/declarativeimports/locale/locale_p.h index 6eac7223..0e796e61 100644 --- a/plasma/generic/declarativeimports/locale/locale_p.h +++ b/plasma/generic/declarativeimports/locale/locale_p.h @@ -22,8 +22,8 @@ //Qt #include -#include -#include +#include +#include //KDE #include diff --git a/plasma/generic/declarativeimports/plasmacomponents/fullscreenwindow.cpp b/plasma/generic/declarativeimports/plasmacomponents/fullscreenwindow.cpp index 3a093933..804f34e9 100644 --- a/plasma/generic/declarativeimports/plasmacomponents/fullscreenwindow.cpp +++ b/plasma/generic/declarativeimports/plasmacomponents/fullscreenwindow.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/plasma/generic/declarativeimports/plasmacomponents/fullscreenwindow.h b/plasma/generic/declarativeimports/plasmacomponents/fullscreenwindow.h index 4e3c76e9..637c1225 100644 --- a/plasma/generic/declarativeimports/plasmacomponents/fullscreenwindow.h +++ b/plasma/generic/declarativeimports/plasmacomponents/fullscreenwindow.h @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include +#include #include #include "enums.h" diff --git a/plasma/generic/declarativeimports/plasmacomponents/qmenu.cpp b/plasma/generic/declarativeimports/plasmacomponents/qmenu.cpp index 33a38129..d5a5d627 100644 --- a/plasma/generic/declarativeimports/plasmacomponents/qmenu.cpp +++ b/plasma/generic/declarativeimports/plasmacomponents/qmenu.cpp @@ -22,7 +22,8 @@ #include #include #include -#include +#include +#include #include #include diff --git a/plasma/generic/declarativeimports/plasmacomponents/qmenu.h b/plasma/generic/declarativeimports/plasmacomponents/qmenu.h index 334410ab..3fe64981 100644 --- a/plasma/generic/declarativeimports/plasmacomponents/qmenu.h +++ b/plasma/generic/declarativeimports/plasmacomponents/qmenu.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include "qmenuitem.h" #include "enums.h" diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/appbackgroundprovider.cpp b/plasma/generic/declarativeimports/plasmaextracomponents/appbackgroundprovider.cpp index 45c84488..36c35636 100644 --- a/plasma/generic/declarativeimports/plasmaextracomponents/appbackgroundprovider.cpp +++ b/plasma/generic/declarativeimports/plasmaextracomponents/appbackgroundprovider.cpp @@ -19,7 +19,7 @@ #include "appbackgroundprovider_p.h" -#include +#include #include #include diff --git a/plasma/generic/declarativeimports/qtextracomponents/columnproxymodel.h b/plasma/generic/declarativeimports/qtextracomponents/columnproxymodel.h index 374fe66c..0aa1943c 100644 --- a/plasma/generic/declarativeimports/qtextracomponents/columnproxymodel.h +++ b/plasma/generic/declarativeimports/qtextracomponents/columnproxymodel.h @@ -20,7 +20,7 @@ #ifndef COLUMNPROXYMODEL_H #define COLUMNPROXYMODEL_H -#include +#include class ColumnProxyModel : public QAbstractListModel { diff --git a/plasma/generic/declarativeimports/qtextracomponents/mouseeventlistener.cpp b/plasma/generic/declarativeimports/qtextracomponents/mouseeventlistener.cpp index 18e0dedb..d7e25e87 100644 --- a/plasma/generic/declarativeimports/qtextracomponents/mouseeventlistener.cpp +++ b/plasma/generic/declarativeimports/qtextracomponents/mouseeventlistener.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/plasma/generic/kpart/scripting/rect.cpp b/plasma/generic/kpart/scripting/rect.cpp index 1c2a2226..bbf83adb 100644 --- a/plasma/generic/kpart/scripting/rect.cpp +++ b/plasma/generic/kpart/scripting/rect.cpp @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include "backportglobal.h" Q_DECLARE_METATYPE(QRectF*) diff --git a/plasma/generic/kpart/scripting/widget.h b/plasma/generic/kpart/scripting/widget.h index d7d5409b..a802332a 100644 --- a/plasma/generic/kpart/scripting/widget.h +++ b/plasma/generic/kpart/scripting/widget.h @@ -21,7 +21,7 @@ #define APPLET #include -#include +#include #include namespace Plasma diff --git a/plasma/generic/runners/bookmarks/browsers/chrome.h b/plasma/generic/runners/bookmarks/browsers/chrome.h index 44bde2e9..3e36f328 100644 --- a/plasma/generic/runners/bookmarks/browsers/chrome.h +++ b/plasma/generic/runners/bookmarks/browsers/chrome.h @@ -26,7 +26,7 @@ #include "findprofile.h" #include #include -#include +#include class FaviconFromBlob; class ProfileBookmarks; diff --git a/plasma/generic/runners/bookmarks/browsers/chromefindprofile.cpp b/plasma/generic/runners/bookmarks/browsers/chromefindprofile.cpp index 5983697f..9c8b3535 100644 --- a/plasma/generic/runners/bookmarks/browsers/chromefindprofile.cpp +++ b/plasma/generic/runners/bookmarks/browsers/chromefindprofile.cpp @@ -22,7 +22,7 @@ #include "chromefindprofile.h" #include #include -#include +#include #include #include "bookmarksrunner_defs.h" #include "faviconfromblob.h" diff --git a/plasma/generic/runners/bookmarks/fetchsqlite.h b/plasma/generic/runners/bookmarks/fetchsqlite.h index 15b49dcc..0c45e589 100644 --- a/plasma/generic/runners/bookmarks/fetchsqlite.h +++ b/plasma/generic/runners/bookmarks/fetchsqlite.h @@ -22,7 +22,7 @@ #define FETCHSQLITE_H #include #include -#include +#include #include #include diff --git a/plasma/generic/runners/calculator/qalculate_engine.h b/plasma/generic/runners/calculator/qalculate_engine.h index a2264738..a218ada7 100644 --- a/plasma/generic/runners/calculator/qalculate_engine.h +++ b/plasma/generic/runners/calculator/qalculate_engine.h @@ -20,7 +20,7 @@ #ifndef QALCULATEENGINE_H #define QALCULATEENGINE_H -#include +#include #include class KJob; diff --git a/plasma/generic/runners/windows/windowsrunner.cpp b/plasma/generic/runners/windows/windowsrunner.cpp index c6804225..c2576dd0 100644 --- a/plasma/generic/runners/windows/windowsrunner.cpp +++ b/plasma/generic/runners/windows/windowsrunner.cpp @@ -25,7 +25,7 @@ #include #ifdef Q_WS_X11 -#include +#include #include #endif diff --git a/plasma/generic/scriptengines/javascript/common/scriptenv.cpp b/plasma/generic/scriptengines/javascript/common/scriptenv.cpp index 12221d21..3c0b3398 100644 --- a/plasma/generic/scriptengines/javascript/common/scriptenv.cpp +++ b/plasma/generic/scriptengines/javascript/common/scriptenv.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/plasma/generic/scriptengines/javascript/dataengine/javascriptservice.h b/plasma/generic/scriptengines/javascript/dataengine/javascriptservice.h index c69f5d5c..85c7d74a 100644 --- a/plasma/generic/scriptengines/javascript/dataengine/javascriptservice.h +++ b/plasma/generic/scriptengines/javascript/dataengine/javascriptservice.h @@ -19,7 +19,7 @@ #ifndef JAVASCRIPTSERVICE_H #define JAVASCRIPTSERVICE_H -#include +#include #include #include diff --git a/plasma/generic/scriptengines/javascript/declarative/declarativeitemcontainer_p.h b/plasma/generic/scriptengines/javascript/declarative/declarativeitemcontainer_p.h index 27d2f1dc..66b7d89a 100644 --- a/plasma/generic/scriptengines/javascript/declarative/declarativeitemcontainer_p.h +++ b/plasma/generic/scriptengines/javascript/declarative/declarativeitemcontainer_p.h @@ -21,9 +21,9 @@ #define DECLARATIVEITEMCONTAINER_P #include -#include +#include #include -#include +#include class DeclarativeItemContainer : public QGraphicsWidget diff --git a/plasma/generic/scriptengines/javascript/declarative/toolboxproxy.h b/plasma/generic/scriptengines/javascript/declarative/toolboxproxy.h index 4e457366..773bf5a8 100644 --- a/plasma/generic/scriptengines/javascript/declarative/toolboxproxy.h +++ b/plasma/generic/scriptengines/javascript/declarative/toolboxproxy.h @@ -25,7 +25,7 @@ #include #include -#include +#include class QAction; diff --git a/plasma/generic/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp b/plasma/generic/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp index 36d93ca5..7767bf20 100644 --- a/plasma/generic/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp +++ b/plasma/generic/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp @@ -22,11 +22,11 @@ #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/plasma/generic/scriptengines/javascript/simplebindings/easingcurve.cpp b/plasma/generic/scriptengines/javascript/simplebindings/easingcurve.cpp index 8eaf1714..e467180b 100644 --- a/plasma/generic/scriptengines/javascript/simplebindings/easingcurve.cpp +++ b/plasma/generic/scriptengines/javascript/simplebindings/easingcurve.cpp @@ -17,7 +17,7 @@ */ #include -#include +#include #include #include #include diff --git a/plasma/generic/scriptengines/javascript/simplebindings/painter.cpp b/plasma/generic/scriptengines/javascript/simplebindings/painter.cpp index 66233bda..4abdef89 100644 --- a/plasma/generic/scriptengines/javascript/simplebindings/painter.cpp +++ b/plasma/generic/scriptengines/javascript/simplebindings/painter.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/plasma/generic/scriptengines/javascript/simplebindings/rect.cpp b/plasma/generic/scriptengines/javascript/simplebindings/rect.cpp index ac2382c5..10763092 100644 --- a/plasma/generic/scriptengines/javascript/simplebindings/rect.cpp +++ b/plasma/generic/scriptengines/javascript/simplebindings/rect.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "backportglobal.h" Q_DECLARE_METATYPE(QRectF*) diff --git a/plasma/generic/scriptengines/javascript/simplebindings/size.cpp b/plasma/generic/scriptengines/javascript/simplebindings/size.cpp index 3f41b46f..973607ff 100644 --- a/plasma/generic/scriptengines/javascript/simplebindings/size.cpp +++ b/plasma/generic/scriptengines/javascript/simplebindings/size.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "backportglobal.h" Q_DECLARE_METATYPE(QSizeF*) diff --git a/plasma/generic/scriptengines/webkit/bundle.cpp b/plasma/generic/scriptengines/webkit/bundle.cpp index 0d0fb35e..5d6c22c3 100644 --- a/plasma/generic/scriptengines/webkit/bundle.cpp +++ b/plasma/generic/scriptengines/webkit/bundle.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include #include #include -#include +#include #include diff --git a/plasma/generic/scriptengines/webkit/dashboardjs.cpp b/plasma/generic/scriptengines/webkit/dashboardjs.cpp index d41252e8..bc785cd0 100644 --- a/plasma/generic/scriptengines/webkit/dashboardjs.cpp +++ b/plasma/generic/scriptengines/webkit/dashboardjs.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #include #include -#include +#include #include #include diff --git a/plasma/generic/wallpapers/color/backgrounddelegate.cpp b/plasma/generic/wallpapers/color/backgrounddelegate.cpp index 3a9e2e0a..483949c7 100644 --- a/plasma/generic/wallpapers/color/backgrounddelegate.cpp +++ b/plasma/generic/wallpapers/color/backgrounddelegate.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/plasma/generic/wallpapers/color/backgroundlistmodel.h b/plasma/generic/wallpapers/color/backgroundlistmodel.h index 491216e7..85b42fff 100644 --- a/plasma/generic/wallpapers/color/backgroundlistmodel.h +++ b/plasma/generic/wallpapers/color/backgroundlistmodel.h @@ -11,7 +11,7 @@ #ifndef BACKGROUNDLISTMODEL_H #define BACKGROUNDLISTMODEL_H -#include +#include #include #include diff --git a/plasma/generic/wallpapers/color/color.cpp b/plasma/generic/wallpapers/color/color.cpp index 2b0c365d..7d060993 100644 --- a/plasma/generic/wallpapers/color/color.cpp +++ b/plasma/generic/wallpapers/color/color.cpp @@ -21,8 +21,8 @@ #include "color.h" #include -#include -#include +#include +#include #include "backgroundlistmodel.h" #include "backgrounddelegate.h" diff --git a/plasma/generic/wallpapers/image/backgrounddelegate.cpp b/plasma/generic/wallpapers/image/backgrounddelegate.cpp index dab0bc9e..d2647825 100644 --- a/plasma/generic/wallpapers/image/backgrounddelegate.cpp +++ b/plasma/generic/wallpapers/image/backgrounddelegate.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/plasma/generic/wallpapers/image/backgroundlistmodel.h b/plasma/generic/wallpapers/image/backgroundlistmodel.h index 8ec913b3..32b43d93 100644 --- a/plasma/generic/wallpapers/image/backgroundlistmodel.h +++ b/plasma/generic/wallpapers/image/backgroundlistmodel.h @@ -10,7 +10,7 @@ #ifndef BACKGROUNDLISTMODEL_H #define BACKGROUNDLISTMODEL_H -#include +#include #include #include #include diff --git a/plasma/generic/wallpapers/image/removebutton.cpp b/plasma/generic/wallpapers/image/removebutton.cpp index 388dbb54..81aefb73 100644 --- a/plasma/generic/wallpapers/image/removebutton.cpp +++ b/plasma/generic/wallpapers/image/removebutton.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/plasma/generic/wallpapers/image/removebuttonmanager.cpp b/plasma/generic/wallpapers/image/removebuttonmanager.cpp index b32f5eb7..d695f9f5 100644 --- a/plasma/generic/wallpapers/image/removebuttonmanager.cpp +++ b/plasma/generic/wallpapers/image/removebuttonmanager.cpp @@ -27,9 +27,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/plasma/generic/wallpapers/image/slideshowconfig.ui b/plasma/generic/wallpapers/image/slideshowconfig.ui index 5e348252..bc1d6cff 100644 --- a/plasma/generic/wallpapers/image/slideshowconfig.ui +++ b/plasma/generic/wallpapers/image/slideshowconfig.ui @@ -125,7 +125,7 @@ - + 0 diff --git a/plasma/screensaver/shell/savercorona.cpp b/plasma/screensaver/shell/savercorona.cpp index 2d8d4c38..5c7a31c7 100644 --- a/plasma/screensaver/shell/savercorona.cpp +++ b/plasma/screensaver/shell/savercorona.cpp @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include diff --git a/plasma/screensaver/shell/saverview.cpp b/plasma/screensaver/shell/saverview.cpp index ae7781ad..8f208e0b 100644 --- a/plasma/screensaver/shell/saverview.cpp +++ b/plasma/screensaver/shell/saverview.cpp @@ -20,7 +20,7 @@ #include "saverview.h" -#include +#include #include #include diff --git a/plasma/screensaver/shell/saverview.h b/plasma/screensaver/shell/saverview.h index dbf00cde..cbae0533 100644 --- a/plasma/screensaver/shell/saverview.h +++ b/plasma/screensaver/shell/saverview.h @@ -20,7 +20,7 @@ #ifndef SAVERVIEW_H #define SAVERVIEW_H -#include +#include #include #include diff --git a/powerdevil/daemon/actions/dpms/powerdevildpmsaction.cpp b/powerdevil/daemon/actions/dpms/powerdevildpmsaction.cpp index b0ff424b..17c44574 100644 --- a/powerdevil/daemon/actions/dpms/powerdevildpmsaction.cpp +++ b/powerdevil/daemon/actions/dpms/powerdevildpmsaction.cpp @@ -24,7 +24,7 @@ #include -#include +#include #include #include diff --git a/powerdevil/daemon/backends/upower/login1suspendjob.h b/powerdevil/daemon/backends/upower/login1suspendjob.h index e1c2ff42..8ee5a1fb 100644 --- a/powerdevil/daemon/backends/upower/login1suspendjob.h +++ b/powerdevil/daemon/backends/upower/login1suspendjob.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include "powerdevilbackendinterface.h" diff --git a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp index 92a442d3..6342e768 100644 --- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp +++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp @@ -24,6 +24,9 @@ #include #include +#include +#include +#include #include #include diff --git a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.h b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.h index c6563b0d..c654e650 100644 --- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.h +++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.h @@ -26,6 +26,7 @@ #include #include +#include #include diff --git a/powerdevil/daemon/backends/upower/xrandrbrightness.h b/powerdevil/daemon/backends/upower/xrandrbrightness.h index 875c6672..f7fd5cef 100644 --- a/powerdevil/daemon/backends/upower/xrandrbrightness.h +++ b/powerdevil/daemon/backends/upower/xrandrbrightness.h @@ -20,7 +20,7 @@ #ifndef XRANDRBRIGHTNESS_H #define XRANDRBRIGHTNESS_H -#include +#include #include #include diff --git a/powerdevil/daemon/backends/upower/xrandrx11helper.cpp b/powerdevil/daemon/backends/upower/xrandrx11helper.cpp index 3615ed84..aecf7558 100644 --- a/powerdevil/daemon/backends/upower/xrandrx11helper.cpp +++ b/powerdevil/daemon/backends/upower/xrandrx11helper.cpp @@ -19,7 +19,7 @@ #include "xrandrx11helper.h" -#include +#include #include #include diff --git a/powerdevil/daemon/kdedpowerdevil.h b/powerdevil/daemon/kdedpowerdevil.h index 137e6ca5..8f4a38af 100644 --- a/powerdevil/daemon/kdedpowerdevil.h +++ b/powerdevil/daemon/kdedpowerdevil.h @@ -21,7 +21,7 @@ #define KDEDPOWERDEVIL_H #include -#include +#include namespace PowerDevil { class Core; diff --git a/powerdevil/daemon/powerdevilaction.h b/powerdevil/daemon/powerdevilaction.h index 81249d47..ea256357 100644 --- a/powerdevil/daemon/powerdevilaction.h +++ b/powerdevil/daemon/powerdevilaction.h @@ -24,7 +24,7 @@ #include "powerdevilpolicyagent.h" #include -#include +#include #include diff --git a/powerdevil/daemon/powerdevilcore.h b/powerdevil/daemon/powerdevilcore.h index a8951eba..2d7b037c 100644 --- a/powerdevil/daemon/powerdevilcore.h +++ b/powerdevil/daemon/powerdevilcore.h @@ -23,7 +23,7 @@ #include "powerdevilbackendinterface.h" -#include +#include #include #include diff --git a/powerdevil/daemon/powerdevilpolicyagent.cpp b/powerdevil/daemon/powerdevilpolicyagent.cpp index bacc814a..db12ceab 100644 --- a/powerdevil/daemon/powerdevilpolicyagent.cpp +++ b/powerdevil/daemon/powerdevilpolicyagent.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include -#include +#include #include #include #include diff --git a/powerdevil/daemon/powerdevilpolicyagent.h b/powerdevil/daemon/powerdevilpolicyagent.h index aa3d0cd4..87524560 100644 --- a/powerdevil/daemon/powerdevilpolicyagent.h +++ b/powerdevil/daemon/powerdevilpolicyagent.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/solid-actions-kcm/ActionModel.h b/solid-actions-kcm/ActionModel.h index 209fcbff..384abd33 100644 --- a/solid-actions-kcm/ActionModel.h +++ b/solid-actions-kcm/ActionModel.h @@ -20,7 +20,7 @@ #ifndef ACTIONMODEL_H #define ACTIONMODEL_H -#include +#include class ActionItem; diff --git a/solid-actions-kcm/SolidActionData.cpp b/solid-actions-kcm/SolidActionData.cpp index dbc876eb..1775f5b0 100644 --- a/solid-actions-kcm/SolidActionData.cpp +++ b/solid-actions-kcm/SolidActionData.cpp @@ -20,7 +20,7 @@ #include "SolidActionData.h" #include -#include +#include #include #include diff --git a/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp b/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp index d5ece6b5..1ac9160c 100644 --- a/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp +++ b/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp @@ -19,7 +19,7 @@ #include "DeviceAutomounterKCM.h" -#include +#include #include #include diff --git a/solid-device-automounter/kcm/DeviceModel.h b/solid-device-automounter/kcm/DeviceModel.h index 3688feed..d49b4678 100644 --- a/solid-device-automounter/kcm/DeviceModel.h +++ b/solid-device-automounter/kcm/DeviceModel.h @@ -2,7 +2,7 @@ #define DEVICEMODEL_H #include -#include +#include #include #include #include diff --git a/solid-device-automounter/kded/DeviceAutomounter.h b/solid-device-automounter/kded/DeviceAutomounter.h index 045b6085..77294af1 100644 --- a/solid-device-automounter/kded/DeviceAutomounter.h +++ b/solid-device-automounter/kded/DeviceAutomounter.h @@ -19,7 +19,7 @@ #ifndef DEVICEAUTOMOUNTER_H #define DEVICEAUTOMOUNTER_H -#include +#include #include #include #include "AutomounterSettings.h" diff --git a/solid-networkstatus/kded/networkstatus.cpp b/solid-networkstatus/kded/networkstatus.cpp index a811f2d5..9c772ef2 100644 --- a/solid-networkstatus/kded/networkstatus.cpp +++ b/solid-networkstatus/kded/networkstatus.cpp @@ -26,6 +26,7 @@ #include #include +#include #include diff --git a/systemsettings/app/SettingsBase.cpp b/systemsettings/app/SettingsBase.cpp index d1694f52..fdb8f7ba 100644 --- a/systemsettings/app/SettingsBase.cpp +++ b/systemsettings/app/SettingsBase.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/systemsettings/app/ToolTips/ktooltipwindow.cpp b/systemsettings/app/ToolTips/ktooltipwindow.cpp index da67f250..3505501c 100644 --- a/systemsettings/app/ToolTips/ktooltipwindow.cpp +++ b/systemsettings/app/ToolTips/ktooltipwindow.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include // For the blurred tooltip background #include diff --git a/systemsettings/app/ToolTips/tooltipmanager.cpp b/systemsettings/app/ToolTips/tooltipmanager.cpp index d39b4508..2571441e 100644 --- a/systemsettings/app/ToolTips/tooltipmanager.cpp +++ b/systemsettings/app/ToolTips/tooltipmanager.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -35,7 +35,7 @@ #include #ifdef Q_WS_X11 -#include +#include #endif #include diff --git a/systemsettings/app/ToolTips/tooltipmanager.h b/systemsettings/app/ToolTips/tooltipmanager.h index 32966681..425b6046 100644 --- a/systemsettings/app/ToolTips/tooltipmanager.h +++ b/systemsettings/app/ToolTips/tooltipmanager.h @@ -22,7 +22,7 @@ #include -#include +#include class QLayout; class MenuItem; diff --git a/systemsettings/core/ModuleView.cpp b/systemsettings/core/ModuleView.cpp index 7d0129fb..915d47db 100644 --- a/systemsettings/core/ModuleView.cpp +++ b/systemsettings/core/ModuleView.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -390,8 +390,8 @@ void ModuleView::updateButtons() const int buttons = activeModule->buttons(); - d->mApply->setShown(buttons & KCModule::Apply ); - d->mReset->setShown(buttons & KCModule::Apply ); + d->mApply->setVisible(buttons & KCModule::Apply ); + d->mReset->setVisible(buttons & KCModule::Apply ); d->mHelp->setEnabled(buttons & KCModule::Help ); d->mDefault->setEnabled(buttons & KCModule::Default ); diff --git a/systemsettings/core/ModuleView.h b/systemsettings/core/ModuleView.h index a26200a1..3316e4fa 100644 --- a/systemsettings/core/ModuleView.h +++ b/systemsettings/core/ModuleView.h @@ -22,7 +22,7 @@ #define MODULE_VIEW_H #include -#include +#include #include "systemsettingsview_export.h" class MenuItem;