OSDN Git Service

generic: make changes required for building against Katie
authorIvailo Monev <xakepa10@gmail.com>
Wed, 25 Nov 2015 10:00:54 +0000 (10:00 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Wed, 25 Nov 2015 10:01:00 +0000 (10:01 +0000)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
629 files changed:
akregator/src/akregator_part.cpp
akregator/src/articlelistview.cpp
akregator/src/articlemodel.h
akregator/src/feed.cpp
akregator/src/feedlist.cpp
akregator/src/importfeedlistcommand.cpp
akregator/src/loadfeedlistcommand.cpp
akregator/src/mainwidget.cpp
ark/app/batchextract.cpp
ark/app/mainwindow.cpp
ark/kerfuffle/addtoarchive.cpp
ark/kerfuffle/archiveinterface.h
ark/kerfuffle/queries.cpp
ark/kerfuffle/tests/jsonparser.cpp
ark/part/archivemodel.cpp
ark/part/archiveview.cpp
ark/part/arkviewer.h
ark/part/interface.h
ark/part/part.cpp
ark/part/part.h
ark/plugins/clilhaplugin/cliplugin.cpp
ark/plugins/cliplugin-example/cliplugin.cpp
bluedevil/libbluedevil/bluedevil/bluedeviladapter.h
bluedevil/libbluedevil/bluedevil/bluedevildbustypes.h
bluedevil/libbluedevil/bluedevil/bluedevildevice.h
bluedevil/libbluedevil/bluedevil/bluedevilmanager.cpp
bluedevil/libbluedevil/bluedevil/bluedevilmanager.h
bluedevil/libbluedevil/bluedevil/bluedevilmanager_p.cpp
bluedevil/libbluedevil/bluedevil/bluedevilmanager_p.h
bluedevil/src/daemon/helpers/requestpin/requestpin.cpp
bluedevil/src/daemon/kded/BlueDevilDaemon.cpp
bluedevil/src/daemon/kded/bluezagent.h
bluedevil/src/daemon/kded/filereceiver/filereceiver.cpp
bluedevil/src/daemon/kded/filereceiver/obexagent.h
bluedevil/src/daemon/kded/filereceiver/receivefilejob.cpp
bluedevil/src/daemon/kded/filereceiver/receivefilejob.h
bluedevil/src/fileitemactionplugin/sendfileitemaction.cpp
bluedevil/src/kcmodule/bluedevildevices.cpp
bluedevil/src/kcmodule/bluedevildevices.h
bluedevil/src/kcmodule/systemcheck.cpp
bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.h
bluedevil/src/kio/obexftp/kio_obexftp.cpp
bluedevil/src/kio/obexftp/kio_obexftp.h
bluedevil/src/kio/obexftp/obexdtypes.h
bluedevil/src/kio/obexftp/transferfilejob.h
bluedevil/src/monolithic/monolithic.h
bluedevil/src/sendfile/discoverwidget.cpp
bluedevil/src/sendfile/pages/connectingpage.h
bluedevil/src/sendfile/pages/selectdeviceandfilespage.h
bluedevil/src/sendfile/pages/selectdevicepage.h
bluedevil/src/sendfile/pages/selectfilespage.h
bluedevil/src/sendfile/sendfilesjob.h
bluedevil/src/wizard/pages/discoverpage.cpp
bluedevil/src/wizard/pages/discoverpage.h
bluedevil/src/wizard/pages/fail.h
bluedevil/src/wizard/pages/keyboardpairing.h
bluedevil/src/wizard/pages/legacypairing.h
bluedevil/src/wizard/pages/legacypairingdatabase.h
bluedevil/src/wizard/pages/nopairing.h
bluedevil/src/wizard/pages/ssppairing.h
bluedevil/src/wizard/pages/success.h
bluedevil/src/wizard/wizardagent.h
dragon/src/app/adjustSizeButton.cpp
dragon/src/app/analyzer/blockAnalyzer.cpp
dragon/src/app/analyzer/blockAnalyzer.h
dragon/src/app/discSelectionDialog.cpp
dragon/src/app/fullScreenToolBarHandler.cpp
dragon/src/app/mainWindow.cpp
dragon/src/app/part.cpp
dragon/src/app/partToolBar.cpp
dragon/src/app/recentlyPlayedList.cpp
dragon/src/app/textItem.cpp
dragon/src/app/textItem.h
dragon/src/app/videoWindow.cpp
dragon/src/app/videoWindow.h
dragon/src/mpris2/mediaplayer2player.h
dragon/src/mpris2/mpris2.cpp
dragon/src/mpris2/mpris2.h
ffmpegthumbs/ffmpegthumbnailer/videothumbnailer.cpp
filelight/src/part/radialMap/labels.cpp
filelight/src/part/radialMap/widget.h
filelight/src/part/radialMap/widgetEvents.cpp
filelight/src/part/settingsDialog.cpp
filelight/src/part/settingsDialog.h
filelight/src/part/summaryWidget.cpp
gwenview/app/browsemainpage.cpp
gwenview/app/filtercontroller.cpp
gwenview/app/folderviewcontextmanageritem.cpp
gwenview/app/infocontextmanageritem.cpp
gwenview/app/sidebar.cpp
gwenview/importer/importdialog.cpp
gwenview/importer/thumbnailpage.h
gwenview/lib/abstractimageoperation.h
gwenview/lib/crop/croptool.cpp
gwenview/lib/datewidget.cpp
gwenview/lib/document/document_p.h
gwenview/lib/documentview/abstractimageview.cpp
gwenview/lib/documentview/documentview.cpp
gwenview/lib/documentview/documentviewcontainer.cpp
gwenview/lib/documentview/rasterimageview.cpp
gwenview/lib/documentview/svgviewadapter.cpp
gwenview/lib/documentview/videoviewadapter.cpp
gwenview/lib/flowlayout.h
gwenview/lib/fullscreenbar.cpp
gwenview/lib/hud/hudbutton.cpp
gwenview/lib/hud/hudlabel.cpp
gwenview/lib/hud/hudslider.cpp
gwenview/lib/imageformats/imageformats.cpp
gwenview/lib/imageformats/jpeghandler.cpp
gwenview/lib/imageformats/jpegplugin.h
gwenview/lib/memoryutils.cpp
gwenview/lib/paintutils.cpp
gwenview/lib/recursivedirmodel.h
gwenview/lib/redeyereduction/redeyereductiontool.cpp
gwenview/lib/slidecontainer.cpp
gwenview/lib/slidecontainer.h
gwenview/lib/statusbartoolbutton.cpp
gwenview/lib/thumbnailview/contextbarbutton.cpp
gwenview/lib/thumbnailview/itemeditor.cpp
gwenview/lib/thumbnailview/previewitemdelegate.cpp
gwenview/lib/thumbnailview/thumbnailbarview.cpp
gwenview/lib/thumbnailview/thumbnailview.cpp
gwenview/tests/auto/documenttest.cpp
gwenview/tests/manual/imageloadbench.cpp
gwenview/tests/manual/thumbnailgen.cpp
kcalc/kcalc.cpp
kcalc/kcalc.h
kcalc/kcalc_button.cpp
kcalc/kcalc_const_menu.cpp
kcalc/kcalcdisplay.cpp
kcron/src/genericListWidget.cpp
kcron/src/kcmCron.h
kcron/src/taskWidget.h
kdenetwork-filesharing/samba/filepropertiesplugin/model.h
kdevelop/app/welcomepage/sessionsmodel.h
kdevelop/debuggers/gdb/debugsession.h
kdevelop/debuggers/gdb/disassemblewidget.cpp
kdevelop/debuggers/gdb/gdbcommand.h
kdevelop/debuggers/gdb/gdbglobal.h
kdevelop/debuggers/gdb/gdboutputwidget.cpp
kdevelop/debuggers/gdb/gdboutputwidget.h
kdevelop/debuggers/gdb/memviewdlg.cpp
kdevelop/debuggers/gdb/memviewdlg.h
kdevelop/debuggers/gdb/printers/tests/qdate.cpp
kdevelop/debuggers/gdb/printers/tests/qtime.cpp
kdevelop/debuggers/gdb/registers/registersview.cpp
kdevelop/debuggers/gdb/unittests/gdbtest.cpp
kdevelop/documentation/CMakeLists.txt
kdevelop/documentation/manpage/manpagemodel.h
kdevelop/documentation/manpage/manpageplugin.h
kdevelop/documentation/qthelp/qthelpdocumentation.cpp
kdevelop/documentation/qthelp/qthelpproviderabstract.cpp
kdevelop/documentation/qthelp/qthelpproviderabstract.h
kdevelop/file_templates/classes/qt_shared/class.h
kdevelop/kdeintegration/kdeprovider/kdeprojectsreader.cpp
kdevelop/kdeintegration/kdeprovider/kdeproviderplugin.cpp
kdevelop/languages/cpp/codecompletion/item.cpp
kdevelop/languages/cpp/cppduchain/overloadresolution.cpp
kdevelop/languages/cpp/cppparsejob.cpp
kdevelop/languages/cpp/parser/headergen/main.cpp
kdevelop/languages/cpp/parser/rpp/pp-macro-expander.cpp
kdevelop/languages/cpp/preprocessjob.cpp
kdevelop/languages/plugins/custom-definesandincludes/compilerprovider/msvccompiler.cpp
kdevelop/languages/plugins/custom-definesandincludes/definesandincludesmanager.h
kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/compilersmodel.h
kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/definesmodel.h
kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/includesmodel.h
kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/projectpathsmodel.h
kdevelop/projectbuilders/ninjabuilder/kdevninjabuilderplugin.h
kdevelop/projectmanagers/cmake/CMakeLists.txt
kdevelop/projectmanagers/cmake/cmakebuilddirchooser.h
kdevelop/projectmanagers/cmake/cmakecodecompletionmodel.cpp
kdevelop/projectmanagers/cmake/cmakedocumentation.h
kdevelop/projectmanagers/cmake/tests/manual/kde4app/kde4app.cpp
kdevelop/projectmanagers/custommake/custommakemanager.cpp
kdevelop/providers/ghprovider/ghlineedit.cpp
kdevelop/utils/okteta/oktetaplugin.h
kdevplatform/debugger/breakpoint/breakpointmodel.h
kdevplatform/debugger/breakpoint/breakpointwidget.cpp
kdevplatform/debugger/framestack/framestackmodel.h
kdevplatform/debugger/framestack/framestackwidget.cpp
kdevplatform/debugger/util/pathmappings.cpp
kdevplatform/debugger/util/treeitem.cpp
kdevplatform/debugger/util/treemodel.h
kdevplatform/debugger/variable/variabletooltip.cpp
kdevplatform/debugger/variable/variablewidget.cpp
kdevplatform/documentation/CMakeLists.txt
kdevplatform/documentation/documentationview.h
kdevplatform/interfaces/iassistant.cpp
kdevplatform/language/backgroundparser/backgroundparser.cpp
kdevplatform/language/backgroundparser/documentchangetracker.cpp
kdevplatform/language/backgroundparser/parsejob.cpp
kdevplatform/language/backgroundparser/parsejob.h
kdevplatform/language/backgroundparser/parserdependencypolicy.h
kdevplatform/language/codecompletion/codecompletionitem.cpp
kdevplatform/language/codegen/sourcefiletemplate.cpp
kdevplatform/language/codegen/templateclassgenerator.h
kdevplatform/language/codegen/templaterenderer.h
kdevplatform/language/duchain/builders/abstractcontextbuilder.h
kdevplatform/language/duchain/duchain.cpp
kdevplatform/language/duchain/duchainbase.cpp
kdevplatform/language/duchain/ducontext.cpp
kdevplatform/language/duchain/navigation/useswidget.cpp
kdevplatform/language/duchain/referencecounting.cpp
kdevplatform/language/duchain/repositories/itemrepositoryregistry.cpp
kdevplatform/language/duchain/repositories/itemrepositoryregistry.h
kdevplatform/language/duchain/repositories/typerepository.cpp
kdevplatform/language/duchain/types/typepointer.h
kdevplatform/language/highlighting/codehighlighting.h
kdevplatform/language/highlighting/colorcache.h
kdevplatform/outputview/ioutputview.h
kdevplatform/outputview/outputmodel.h
kdevplatform/plugins/appwizard/projectselectionpage.h
kdevplatform/plugins/bazaar/bazaarplugin.h
kdevplatform/plugins/classbrowser/classtree.cpp
kdevplatform/plugins/codeutils/codeutilsplugin.cpp
kdevplatform/plugins/contextbrowser/browsemanager.cpp
kdevplatform/plugins/contextbrowser/contextbrowserview.cpp
kdevplatform/plugins/cvs/editorsview.h
kdevplatform/plugins/documentswitcher/documentswitchertreeview.cpp
kdevplatform/plugins/documentview/kdevdocumentmodel.h
kdevplatform/plugins/documentview/kdevdocumentview.cpp
kdevplatform/plugins/executescript/executescriptplugin.cpp
kdevplatform/plugins/externalscript/externalscriptplugin.h
kdevplatform/plugins/externalscript/externalscriptview.cpp
kdevplatform/plugins/filetemplates/CMakeLists.txt
kdevplatform/plugins/filetemplates/filetemplatesplugin.h
kdevplatform/plugins/filetemplates/overridespage.cpp
kdevplatform/plugins/filetemplates/templateoptionspage.cpp
kdevplatform/plugins/filetemplates/templateoptionspage.h
kdevplatform/plugins/git/gitmessagehighlighter.cpp
kdevplatform/plugins/grepview/grepoutputdelegate.cpp
kdevplatform/plugins/grepview/grepoutputmodel.cpp
kdevplatform/plugins/konsole/kdevkonsoleview.cpp
kdevplatform/plugins/openwith/openwithplugin.cpp
kdevplatform/plugins/openwith/openwithplugin.h
kdevplatform/plugins/pastebin/pastebinplugin.cpp
kdevplatform/plugins/patchreview/patchhighlighter.cpp
kdevplatform/plugins/patchreview/patchreviewtoolview.h
kdevplatform/plugins/problemreporter/problemwidget.cpp
kdevplatform/plugins/projectfilter/filtermodel.h
kdevplatform/plugins/projectfilter/projectfilterkcm.cpp
kdevplatform/plugins/projectfilter/projectfilterprovider.h
kdevplatform/plugins/projectmanagerview/projectbuildsetwidget.cpp
kdevplatform/plugins/projectmanagerview/projectmanagerview.cpp
kdevplatform/plugins/projectmanagerview/projecttreeview.cpp
kdevplatform/plugins/quickopen/documentationquickopenprovider.cpp
kdevplatform/plugins/quickopen/expandingtree/expandingdelegate.cpp
kdevplatform/plugins/quickopen/expandingtree/expandingdelegate.h
kdevplatform/plugins/quickopen/expandingtree/expandingwidgetmodel.cpp
kdevplatform/plugins/quickopen/expandingtree/expandingwidgetmodel.h
kdevplatform/plugins/quickopen/quickopenmodel.h
kdevplatform/plugins/quickopen/quickopenplugin.cpp
kdevplatform/plugins/reviewboard/reviewboardplugin.cpp
kdevplatform/plugins/reviewboard/reviewpatchdialog.cpp
kdevplatform/plugins/snippet/legacy/snippet.h
kdevplatform/plugins/snippet/legacy/snippetrepository.cpp
kdevplatform/plugins/snippet/legacy/snippetrepository.h
kdevplatform/plugins/snippet/legacy/snippetview.cpp
kdevplatform/plugins/standardoutputview/tests/standardoutputviewtest.cpp
kdevplatform/plugins/subversion/svnaddjob.cpp
kdevplatform/plugins/subversion/svnblamejob.cpp
kdevplatform/plugins/subversion/svncatjob.cpp
kdevplatform/plugins/subversion/svncheckoutjob.cpp
kdevplatform/plugins/subversion/svncommitjob.cpp
kdevplatform/plugins/subversion/svncopyjob.cpp
kdevplatform/plugins/subversion/svndiffjob.cpp
kdevplatform/plugins/subversion/svnimportjob.cpp
kdevplatform/plugins/subversion/svninfojob.cpp
kdevplatform/plugins/subversion/svnlogjob.cpp
kdevplatform/plugins/subversion/svnmovejob.cpp
kdevplatform/plugins/subversion/svnremovejob.cpp
kdevplatform/plugins/subversion/svnrevertjob.cpp
kdevplatform/plugins/subversion/svnssldialog.cpp
kdevplatform/plugins/subversion/svnstatusjob.cpp
kdevplatform/plugins/subversion/svnupdatejob.cpp
kdevplatform/plugins/switchtobuddy/switchtobuddyplugin.h
kdevplatform/plugins/testview/testview.cpp
kdevplatform/plugins/testview/testviewplugin.h
kdevplatform/project/projectbuildsetmodel.h
kdevplatform/project/projectmodel.cpp
kdevplatform/project/tests/projectmodeltest.h
kdevplatform/shell/CMakeLists.txt
kdevplatform/shell/assistantpopup.cpp
kdevplatform/shell/core_p.h
kdevplatform/shell/debugcontroller.cpp
kdevplatform/shell/debugcontroller.h
kdevplatform/shell/languagecontroller.cpp
kdevplatform/shell/launchconfigurationdialog.h
kdevplatform/shell/mainwindow.cpp
kdevplatform/shell/openprojectpage.cpp
kdevplatform/shell/partcontroller.cpp
kdevplatform/shell/progresswidget/overlaywidget.cpp
kdevplatform/shell/progresswidget/progressdialog.cpp
kdevplatform/shell/progresswidget/progressmanager.h
kdevplatform/shell/progresswidget/statusbarprogresswidget.cpp
kdevplatform/shell/project.cpp
kdevplatform/shell/savedialog.cpp
kdevplatform/shell/sessionchooserdialog.cpp
kdevplatform/shell/sessiondialog.h
kdevplatform/shell/settings/environmentgroupmodel.cpp
kdevplatform/shell/settings/environmentgroupmodel.h
kdevplatform/shell/settings/sourceformattersettings.cpp
kdevplatform/shell/statusbar.h
kdevplatform/shell/workingsets/workingsetfilelabel.cpp
kdevplatform/shell/workingsets/workingsettoolbutton.cpp
kdevplatform/sublime/aggregatemodel.cpp
kdevplatform/sublime/areaindex.h
kdevplatform/sublime/container.cpp
kdevplatform/sublime/controller.cpp
kdevplatform/sublime/idealcontroller.h
kdevplatform/sublime/idealdockwidget.cpp
kdevplatform/sublime/mainwindow.cpp
kdevplatform/sublime/sublimedefs.h
kdevplatform/sublime/tests/aggregatemodeltest.cpp
kdevplatform/sublime/tests/viewactivationtest.cpp
kdevplatform/template/filters/kdevfilters.h
kdevplatform/tests/json/testsuite.h
kdevplatform/tests/modeltest.cpp
kdevplatform/tests/testfile.cpp
kdevplatform/util/activetooltip.cpp
kdevplatform/util/autoorientedsplitter.cpp
kdevplatform/util/duchainify/main.h
kdevplatform/util/richtextpushbutton.h
kdevplatform/util/spinlock.h
kdevplatform/vcs/models/vcseventmodel.cpp
kdevplatform/vcs/models/vcseventmodel.h
kdevplatform/vcs/models/vcsitemeventmodel.cpp
kfilemetadata/src/extractors/odfextractor.cpp
kfilemetadata/src/extractors/office2007extractor.cpp
kfloppy/floppy.cpp
kfloppy/floppy.h
kgpg/core/kgpgkey.h
kgpg/editor/kgpgtextedit.cpp
kgpg/keytreeview.cpp
kgpg/kgpgkeygenerate.cpp
kgpg/model/keylistproxymodel.cpp
kgpg/transactions/kgpgdeluid.cpp
kgpg/transactions/kgpgtransaction.cpp
kmix/backends/mixer_backend.h
kmix/backends/mixer_mpris2.h
kmix/core/ControlManager.cpp
kmix/core/GlobalConfig.h
kmix/gui/dialogviewconfiguration.h
kmix/gui/ksmallslider.cpp
kmix/gui/mdwenum.cpp
kmix/gui/mdwslider.cpp
kmix/gui/mdwswitch.cpp
kmix/gui/mixdevicewidget.cpp
kmix/gui/viewbase.cpp
kolourpaint/CMakeLists.txt
kolourpaint/commands/kpMacroCommand.cpp
kolourpaint/imagelib/effects/kpEffectBlurSharpen.cpp
kolourpaint/layers/selections/text/kpPreeditText.h
kolourpaint/layers/selections/text/kpTextSelection_Paint.cpp
kolourpaint/layers/selections/text/kpTextStyle.cpp
kolourpaint/lgpl/generic/widgets/kpColorCellsBase.cpp
kolourpaint/tools/kpTool_MouseEvents.cpp
kolourpaint/views/kpView_Events.cpp
kolourpaint/views/kpView_Paint.cpp
kolourpaint/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp
kolourpaint/widgets/kpColorCells.cpp
kolourpaint/widgets/kpDualColorButton.cpp
kolourpaint/widgets/kpTransparentColorCell.cpp
kolourpaint/widgets/toolbars/kpColorToolBar.cpp
kolourpaint/widgets/toolbars/options/kpToolWidgetBase.cpp
kompare/komparenavtreepart/komparenavtreepart.h
kompare/komparepart/kompare_part.h
kompare/komparepart/kompareconnectwidget.cpp
kompare/komparepart/kompareconnectwidget.h
kompare/komparepart/komparelistview.cpp
kompare/komparepart/komparelistview.h
kompare/komparepart/komparesplitter.cpp
kompare/kompareurldialog.cpp
krdc/config/hostpreferenceslist.h
krdc/core/hostpreferences.h
krdc/floatingtoolbar.cpp
krdc/krdc_approver/approvermanager.cpp
krdc/main.cpp
krdc/mainwindow.h
krdc/nx/nxresumesessions.cpp
krdc/nx/nxview.h
krdc/rdp/rdpview.cpp
krdc/remotedesktopsmodel.h
krdc/vnc/vncclientthread.cpp
krdc/vnc/vncview.cpp
krfb/krfb/framebuffermanager.h
krfb/krfb/framebufferplugin.h
ksnapshot/freeregiongrabber.cpp
ksnapshot/kbackgroundsnapshot.cpp
ksnapshot/ksnapshot.cpp
ksnapshot/ksnapshotpreview.cpp
ksnapshot/regiongrabber.cpp
ksnapshot/snapshottimer.cpp
ksnapshot/windowgrabber.cpp
ksystemlog/src/lib/logViewWidgetItem.cpp
ksystemlog/src/lib/logViewWidgetItem.h
ksystemlog/src/lib/view.cpp
ksystemlog/src/modes/base/logLevelFileList.cpp
ksystemlog/src/statusBar.cpp
ktimer/prefwidget.ui
kuassel/src/client/abstractui.h
kuassel/src/client/clientauthhandler.cpp
kuassel/src/client/coreaccount.h
kuassel/src/client/coreaccountmodel.h
kuassel/src/common/aliasmanager.h
kuassel/src/common/basichandler.cpp
kuassel/src/common/basichandler.h
kuassel/src/common/eventmanager.h
kuassel/src/common/identity.cpp
kuassel/src/common/ircchannel.cpp
kuassel/src/common/ircchannel.h
kuassel/src/common/ircuser.h
kuassel/src/common/network.h
kuassel/src/common/networkevent.h
kuassel/src/common/protocol.h
kuassel/src/common/protocols/datastream/datastreampeer.cpp
kuassel/src/common/remotepeer.cpp
kuassel/src/common/signalproxy.cpp
kuassel/src/common/syncableobject.cpp
kuassel/src/common/syncableobject.h
kuassel/src/common/util.h
kuassel/src/core/abstractsqlstorage.cpp
kuassel/src/core/coreauthhandler.cpp
kuassel/src/core/coretransfer.cpp
kuassel/src/core/coreusersettings.h
kuassel/src/qtui/bufferwidget.cpp
kuassel/src/qtui/chatitem.cpp
kuassel/src/qtui/chatline.cpp
kuassel/src/qtui/chatlinemodelitem.cpp
kuassel/src/qtui/chatmonitorview.cpp
kuassel/src/qtui/chatscene.cpp
kuassel/src/qtui/chatview.cpp
kuassel/src/qtui/columnhandleitem.cpp
kuassel/src/qtui/coreconfigwizard.h
kuassel/src/qtui/markerlineitem.h
kuassel/src/qtui/settingspages/appearancesettingspage.h
kuassel/src/qtui/settingspages/bufferviewsettingspage.h
kuassel/src/qtui/settingspages/highlightsettingspage.h
kuassel/src/qtui/settingspages/identityeditwidget.cpp
kuassel/src/qtui/settingspages/ignorelistsettingspage.cpp
kuassel/src/qtui/statusnotifieritem.cpp
kuassel/src/uisupport/abstractitemview.h
kuassel/src/uisupport/bufferview.cpp
kuassel/src/uisupport/bufferview.h
kuassel/src/uisupport/bufferviewfilter.h
kuassel/src/uisupport/clickable.cpp
kuassel/src/uisupport/clickablelabel.cpp
kuassel/src/uisupport/colorbutton.cpp
kuassel/src/uisupport/flatproxymodel.cpp
kuassel/src/uisupport/multilineedit.h
kuassel/src/uisupport/uistyle.h
kuser/ku_group.h
kuser/ku_groupmodel.h
kuser/ku_user.h
kuser/ku_usermodel.h
kvkbd/src/dragwidget.h
kvkbd/src/kbddock.cpp
kvkbd/src/kbddock.h
kvkbd/src/kvkbdapp.cpp
kvkbd/src/kvkbdapp.h
kvkbd/src/mainwidget.cpp
kvkbd/src/mainwidget.h
kvkbd/src/resizabledragwidget.cpp
kvkbd/src/themeloader.cpp
kvkbd/src/themeloader.h
kvkbd/src/vbutton.h
kvkbd/src/vkeyboard.h
libksane/libksane/ksane_preview_thread.cpp
libksane/libksane/ksane_viewer.cpp
libksane/libksane/ksane_viewer.h
libksane/libksane/ksane_widget_private.h
libksane/libksane/selectionitem.h
libksane/libksane/splittercollapser.cpp
lokalize/src/alttransview.cpp
lokalize/src/binunitsview.cpp
lokalize/src/binunitsview.h
lokalize/src/catalog/cmd.h
lokalize/src/catalog/gettext/catalogitem.cpp
lokalize/src/catalog/gettext/gettextimport.cpp
lokalize/src/catalog/phase.h
lokalize/src/catalog/ts/tsstorage.cpp
lokalize/src/catalog/ts/tsstorage.h
lokalize/src/catalog/xliff/xliffstorage.cpp
lokalize/src/catalog/xliff/xliffstorage.h
lokalize/src/cataloglistview/cataloglistview.cpp
lokalize/src/common/domroutines.h
lokalize/src/common/stemming.cpp
lokalize/src/common/termlabel.cpp
lokalize/src/editortab.cpp
lokalize/src/editorview.cpp
lokalize/src/filesearch/filesearchtab.cpp
lokalize/src/filesearch/filesearchtab.h
lokalize/src/glossary/glossary.cpp
lokalize/src/glossary/glossary.h
lokalize/src/glossary/glossaryview.cpp
lokalize/src/glossary/tbxparser_obsolete.h
lokalize/src/lokalizemainwindow.cpp
lokalize/src/lokalizemainwindow.h
lokalize/src/mergemode/mergecatalog.cpp
lokalize/src/mergemode/mergeview.cpp
lokalize/src/msgctxtview.cpp
lokalize/src/noteeditor.cpp
lokalize/src/phaseswindow.cpp
lokalize/src/phaseswindow.h
lokalize/src/prefs.cpp
lokalize/src/project.cpp
lokalize/src/project/project.cpp
lokalize/src/project/projectmodel.cpp
lokalize/src/project/projecttab.cpp
lokalize/src/project/projectwidget.cpp
lokalize/src/projectmodel.cpp
lokalize/src/projecttab.cpp
lokalize/src/projectwidget.cpp
lokalize/src/syntaxhighlighter.h
lokalize/src/tm/dbfilesmodel.h
lokalize/src/tm/jobs.cpp
lokalize/src/tm/qamodel.h
lokalize/src/tm/qaview.cpp
lokalize/src/tm/qaview.h
lokalize/src/tm/tmentry.h
lokalize/src/tm/tmmanager.h
lokalize/src/tm/tmscanapi.h
lokalize/src/tm/tmtab.cpp
lokalize/src/tm/tmview.cpp
lokalize/src/webquery/webqueryview.cpp
lokalize/src/xlifftextedit.cpp
okular/CMakeLists.txt
okular/conf/widgetannottools.cpp
okular/core/annotations.h
okular/core/area.cpp
okular/core/document.cpp
okular/core/document.h
okular/core/documentcommands_p.h
okular/core/fileprinter.cpp
okular/core/fontinfo.h
okular/core/generator.h
okular/core/global.h
okular/core/page.cpp
okular/core/pagesize.h
okular/core/textdocumentgenerator_p.h
okular/core/textpage.cpp
okular/generators/dvi/bigEndianByteReader.h
okular/generators/dvi/dviFile.cpp
okular/generators/dvi/dviRenderer.cpp
okular/generators/dvi/fontEncoding.cpp
okular/generators/dvi/pageNumber.h
okular/generators/epub/converter.cpp
okular/generators/fictionbook/converter.cpp
okular/generators/fictionbook/document.h
okular/generators/mobipocket/converter.cpp
okular/generators/ooo/converter.cpp
okular/generators/plucker/generator_plucker.h
okular/generators/plucker/unpluck/qunpluck.cpp
okular/generators/txt/converter.cpp
okular/generators/xps/generator_xps.h
okular/plasma/components/pageitem.cpp
okular/shell/okular_main.cpp
okular/shell/shell.cpp
okular/ui/annotationproxymodels.cpp
okular/ui/fileprinterpreview.cpp
okular/ui/formwidgets.cpp
okular/ui/ktreeviewsearchline.cpp
okular/ui/minibar.cpp
okular/ui/pageitemdelegate.cpp
okular/ui/side_reviews.cpp
okular/ui/side_reviews.h
okular/ui/toc.h
partitionmanager/CMakeLists.txt
partitionmanager/src/core/operationstack.cpp
partitionmanager/src/gui/applyprogressdialog.cpp
partitionmanager/src/gui/applyprogressdialog.h
partitionmanager/src/gui/devicepropsdialog.cpp
partitionmanager/src/gui/editmountpointdialogwidget.cpp
partitionmanager/src/gui/mainwindow.cpp
partitionmanager/src/gui/newdialog.cpp
partitionmanager/src/gui/partitionmanagerwidget.cpp
partitionmanager/src/gui/partpropsdialog.cpp
partitionmanager/src/gui/partresizerwidget.cpp
partitionmanager/src/gui/parttablewidget.cpp
partitionmanager/src/gui/partwidget.cpp
partitionmanager/src/gui/smartdialog.cpp
partitionmanager/src/gui/treelog.cpp
partitionmanager/src/jobs/job.cpp
partitionmanager/src/plugins/dummy/dummybackend.cpp
partitionmanager/src/plugins/libparted/libpartedbackend.cpp
partitionmanager/src/util/helpers.cpp
print-manager/configure-printer/ConfigureDialog.h
print-manager/configure-printer/ConfigurePrinterInterface.cpp
print-manager/libkcups/KCupsConnection.h
print-manager/libkcups/PPDModel.h
print-manager/libkcups/SelectMakeModel.cpp
print-manager/plasmoid/KPrintManagerConfigPlugin.cpp
print-manager/plasmoid/KPrintManagerConfigPlugin.h
print-manager/print-manager-kded/NewPrinterNotification.cpp
print-manager/print-manager-kded/PrintManagerKded.h
print-manager/printqueue/PrintQueueUi.h
skanlite/src/ImageViewer.cpp
skanlite/src/ImageViewer.h
syndication/atom/atomtools.cpp
syndication/atom/category.cpp
syndication/atom/content.cpp
syndication/atom/document.cpp
syndication/atom/entry.cpp
syndication/atom/parser.cpp
syndication/atom/source.cpp
syndication/documentsource.cpp
syndication/elementwrapper.cpp
syndication/mapper/feedatomimpl.cpp
syndication/mapper/feedrdfimpl.cpp
syndication/mapper/feedrss2impl.cpp
syndication/mapper/imageatomimpl.h
syndication/mapper/itematomimpl.cpp
syndication/mapper/itemrdfimpl.cpp
syndication/mapper/itemrss2impl.cpp
syndication/parsercollectionimpl.h
syndication/rdf/modelmaker.cpp
syndication/rdf/parser.cpp
syndication/rss2/document.cpp
syndication/rss2/item.cpp
syndication/rss2/parser.cpp
syndication/rss2/tools_p.cpp
syndication/tests/benchmark.cpp
thumbnailers/po/pocreator.cpp
yakuake/app/config/skinlistdelegate.cpp
yakuake/app/mainwindow.cpp
yakuake/app/tabbar.cpp
yakuake/app/terminal.cpp
yakuake/app/visualeventoverlay.h

index 0f794f3..26727b6 100644 (file)
@@ -70,7 +70,7 @@
 #include <QTextStream>
 #include <QTimer>
 #include <QWidget>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include "partadaptor.h"
 
 #include <memory>
index b33485e..3c8f92f 100644 (file)
 #include <KLocale>
 
 #include <QApplication>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QHeaderView>
 #include <QMenu>
-#include <QPaintEvent>
+
 #include <QPalette>
 #include <QScrollBar>
 
index 7e770f5..0757fb8 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef AKREGATOR_ARTICLEMODEL_H
 #define AKREGATOR_ARTICLEMODEL_H
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QList>
 
 #include "akregator_export.h"
index e524a5a..c733bd2 100644 (file)
@@ -48,8 +48,8 @@
 //#include <qtl.h>
 
 #include <QDateTime>
-#include <QDomDocument>
-#include <QDomElement>
+
+#include <QtXml/qdom.h>
 #include <QHash>
 #include <QIcon>
 #include <QList>
index c0cd8fe..c7ff45f 100644 (file)
@@ -40,7 +40,7 @@
 #include <qdom.h>
 #include <QHash>
 #include <QSet>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 #include <cassert>
 
index efd155b..19cdbf7 100644 (file)
@@ -32,7 +32,7 @@
 #include <KInputDialog>
 #include <KLocalizedString>
 
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QPointer>
 #include <QTimer>
 
index c3bc24d..3085630 100644 (file)
@@ -32,7 +32,7 @@
 #include <KRandom>
 
 #include <QDateTime>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QFile>
 #include <QPointer>
 #include <QString>
index 1078198..20451f0 100644 (file)
@@ -79,7 +79,7 @@
 #include <QClipboard>
 #include <QSplitter>
 #include <QTextDocument>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QTimer>
 
 #include <algorithm>
index 80cad21..9a7aa1c 100644 (file)
@@ -44,7 +44,7 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QTimer>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 BatchExtract::BatchExtract(QObject* parent)
     : KCompositeJob(parent),
index 1d8a1d1..db1896e 100644 (file)
@@ -40,9 +40,9 @@
 #include <KShortcutsDialog>
 #include <KXMLGUIFactory>
 
-#include <QDragEnterEvent>
-#include <QDragMoveEvent>
-#include <QWeakPointer>
+#include <QtGui/qevent.h>
+
+#include <QtCore/qsharedpointer.h>
 
 static bool isValidArchiveDrag(const QMimeData *data)
 {
index b58f88a..fa30e27 100644 (file)
@@ -41,7 +41,7 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QTimer>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 namespace Kerfuffle
 {
index 801318b..b2b5629 100644 (file)
@@ -34,7 +34,7 @@
 #include <QObject>
 #include <QStringList>
 #include <QString>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 namespace Kerfuffle
 {
index 2067d0f..16c4f65 100644 (file)
@@ -33,7 +33,7 @@
 #include <kio/renamedialog.h>
 
 #include <QApplication>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 namespace Kerfuffle
 {
index b4e54c7..8c4c7e6 100644 (file)
@@ -29,7 +29,7 @@
 
 #include <KDebug>
 
-#include <QtCore/QLatin1String>
+#include <QtCore/qstring.h>
 
 #include <qjson/parser.h>
 
index 84d0e0a..c014207 100644 (file)
 
 #include <QDir>
 #include <QFont>
-#include <QLatin1String>
+#include <QDateTime>
 #include <QList>
 #include <QMimeData>
-#include <QPersistentModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QPixmap>
 #include <QtDBus/QtDBus>
 
index 6b9918d..c467340 100644 (file)
@@ -25,9 +25,9 @@
 #include <KGlobalSettings>
 
 #include <QApplication>
-#include <QDragEnterEvent>
-#include <QDragMoveEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
+
+
 
 ArchiveView::ArchiveView(QWidget *parent)
         : QTreeView(parent)
index bb41472..315adca 100644 (file)
@@ -28,7 +28,7 @@
 #include <KParts/ReadOnlyPart>
 #include <KService>
 
-#include <QtCore/QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 class ArkViewer : public KDialog
 {
index 40f5902..e0d6295 100644 (file)
@@ -22,7 +22,7 @@
 #define INTERFACE_H
 
 #include <QStringList>
-#include <QtPlugin>
+#include <QtCore/qplugin.h>
 
 class Interface
 {
index 563539a..00a59d8 100644 (file)
 #include <QHeaderView>
 #include <QMenu>
 #include <QMimeData>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QScopedPointer>
 #include <QSplitter>
 #include <QTimer>
 #include <QVBoxLayout>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 #include <QtDBus/QtDBus>
 
 using namespace Kerfuffle;
index 93ed963..3d6ac1e 100644 (file)
@@ -29,7 +29,7 @@
 #include <KParts/StatusBarExtension>
 #include <KTempDir>
 
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 
 class ArchiveModel;
 class InfoPanel;
index 5c2aa6e..b69f5cd 100644 (file)
@@ -22,8 +22,8 @@
 #include "cliplugin.h"
 
 #include "kerfuffle/kerfuffle_export.h"
-#include <QDate>
-#include <QTime>
+
+#include <QtCore/qdatetime.h>
 #include <kdebug.h>
 
 using namespace Kerfuffle;
index c5ca4e0..b9a7c12 100644 (file)
@@ -26,8 +26,8 @@
 #include <kdebug.h>
 
 #include <QDir>
-#include <QDate>
-#include <QTime>
+
+#include <QtCore/qdatetime.h>
 
 CliPlugin::CliPlugin(QObject *parent, const QVariantList &args)
     : CliInterface(parent, args),
index 11cd211..155088d 100644 (file)
@@ -26,8 +26,8 @@
 #include <bluedevil/bluedevil_export.h>
 
 #include <QtCore/QObject>
-#include <QtDBus/QDBusObjectPath>
-#include <QtDBus/QDBusPendingCallWatcher>
+#include <QtDBus/qdbusextratypes.h>
+#include <QtDBus/qdbuspendingcall.h>
 
 namespace BlueDevil {
 
index 971dbbd..64652a8 100644 (file)
@@ -22,8 +22,8 @@
 #ifndef dbustypes_H
 #define dbustypes_H
 
-#include <QVariantMap>
-#include <QDBusObjectPath>
+#include <QtCore/qvariant.h>
+#include <QtDBus/qdbusextratypes.h>
 
 typedef QMap<QString,QVariantMap> QVariantMapMap;
 Q_DECLARE_METATYPE(QVariantMapMap)
index c18f10c..dbf8544 100644 (file)
@@ -30,7 +30,7 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
-#include <QtDBus/QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 
 namespace BlueDevil {
 
index a76b9b8..9410afe 100644 (file)
@@ -30,7 +30,7 @@
 #include "bluedevil/bluezagentmanager1.h"
 
 #include <QtCore/QHash>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 
 #include <QtDBus/QDBusConnectionInterface>
 
index 681fb2b..5e53154 100644 (file)
@@ -26,7 +26,7 @@
 #include <bluedevil/bluedevil_export.h>
 
 #include <QtCore/QObject>
-#include <QtDBus/QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 
 namespace BlueDevil {
 
index e59d36f..0c1825f 100644 (file)
@@ -16,6 +16,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA   *
  *************************************************************************************/
 
+#include <QtCore/qdebug.h>
+
 #include "bluedevilmanager.h"
 #include "bluedevilmanager_p.h"
 #include "bluedeviladapter.h"
index cf345ce..fea87bd 100644 (file)
@@ -24,7 +24,7 @@
 #include "bluedevildbustypes.h"
 
 #include <QObject>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 
 namespace BlueDevil {
 class Adapter;
index 8986458..b9adf83 100644 (file)
@@ -28,7 +28,7 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTimer>
 #include <QValidator>
-#include <QRegExpValidator>
+#include <QtGui/qvalidator.h>
 #include <QRegExp>
 
 #include <KIcon>
index 1a4c250..9d511ba 100644 (file)
@@ -25,7 +25,8 @@
 
 #include "filereceiver/filereceiver.h"
 
-#include <QtCore/QProcess>
+#include <QTimer>
+#include <QProcess>
 #include <QDBusServiceWatcher>
 #include <QDBusMetaType>
 
index 6c32688..4915534 100644 (file)
@@ -24,7 +24,7 @@
 #define BLUEZAGENT_H
 
 #include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 #include <QtDBus/QDBusAbstractAdaptor>
 
 class QProcess;
index 67d7e84..a4ee250 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <QDBusConnection>
 #include <QDBusPendingCall>
-#include <QDBusPendingCallWatcher>
+#include <QtDBus/qdbuspendingcall.h>
 #include <QDBusServiceWatcher>
 
 #include <KDebug>
index 0edff42..f60f578 100644 (file)
@@ -21,7 +21,7 @@
 
 #include <QDBusMessage>
 #include <QDBusAbstractAdaptor>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 
 #include <KComponentData>
 
index 1de755a..c35cefe 100644 (file)
 #include "obex_session.h"
 #include "dbus_properties.h"
 
-#include <KIcon>
+#include <QDir>
 #include <QDBusConnection>
 
 #include <bluedevil/bluedevilmanager.h>
 #include <bluedevil/bluedeviladapter.h>
 #include <bluedevil/bluedevildevice.h>
 
+#include <KIcon>
 #include <KDebug>
 #include <KIO/Job>
 #include <kio/copyjob.h>
index 675d45c..caddf12 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef RECEIVE_FILE_JOB_H
 #define RECEIVE_FILE_JOB_H
 
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QDBusMessage>
 
 #include <KJob>
index 5077cc7..b232a3f 100644 (file)
@@ -24,7 +24,7 @@
 #include <QMenu>
 #include <QAction>
 #include <QWidget>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 #include <KIcon>
 #include <KPluginFactory>
index e2e2282..776b3f2 100644 (file)
@@ -27,7 +27,7 @@
 #include <bluedevil/bluedevil.h>
 
 #include <QtCore/QAbstractItemModel>
-
+#include <QtCore/QTimer>
 #include <QtGui/QFontMetrics>
 #include <QtGui/QLabel>
 #include <QtGui/QPainter>
index 8df7e10..db83c25 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef _BLUEDEVILDEVICES_H
 #define _BLUEDEVILDEVICES_H
 
-#include <QtGui/QItemSelection>
+#include <QtGui/qitemselectionmodel.h>
 
 #include <kcmodule.h>
 
index 6ad75d2..c7c2165 100644 (file)
@@ -38,7 +38,7 @@
 #include <QtGui/QWidget>
 #include <QtGui/QPainter>
 #include <QtGui/QBoxLayout>
-#include <QtGui/QPaintEvent>
+#include <QtGui/qevent.h>
 
 SystemCheck::SystemCheck(QWidget *parent)
     : QObject(parent)
index e58a74d..1139b87 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "../obexdtypes.h"
 
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 #include <kdedmodule.h>
 
 class KJob;
index 82ce5cd..5bc01d7 100644 (file)
@@ -22,6 +22,7 @@
 #include "obexd_file_transfer.h"
 #include "kdedobexftp.h"
 #include "version.h"
+#include <QTimer>
 #include <KDebug>
 #include <KComponentData>
 #include <KCmdLineArgs>
index 6fe0e56..46918b3 100644 (file)
@@ -25,7 +25,7 @@
 #include "kdedobexftp.h"
 
 #include <QtCore/QObject>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 #include <QEventLoop>
 
 #include <kio/slavebase.h>
index f3496f1..78bbb86 100644 (file)
@@ -20,9 +20,9 @@
 #define OBEXD_TYPES_H
 
 #include <QtCore/QList>
-#include <QtCore/QVariantMap>
-#include <QVariantMap>
-#include <QDBusObjectPath>
+#include <QtCore/qvariant.h>
+
+#include <QtDBus/qdbusextratypes.h>
 
 typedef QList<QVariantMap> QVariantMapList;
 Q_DECLARE_METATYPE(QVariantMapList);
index d594359..6152c92 100644 (file)
@@ -19,7 +19,7 @@
 #ifndef KIO_GET_FILE_JOB_H
 #define KIO_GET_FILE_JOB_H
 
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QVariant>
 
 #include <KJob>
index da69e1d..eb22253 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef MONOLITHIC_H
 #define MONOLITHIC_H
 
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 
 #include <kstatusnotifieritem.h>
 
index a6da953..f6651ae 100644 (file)
@@ -24,7 +24,7 @@
 #include "discoverwidget.h"
 #include "ui_discover.h"
 
-#include <QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 #include <QListView>
 #include <QLabel>
 #include <QTimer>
index 89dffff..b380bb6 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "ui_connecting.h"
 
-#include <QtGui/QWizardPage>
+#include <QtGui/qwizard.h>
 
 class ConnectingPage : public QWizardPage,
 public Ui::Connecting
index ceb0674..02d4615 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "ui_selectfilediscover.h"
 
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class KUrl;
 class QWizard;
index 8c4b494..6be8e93 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "ui_selectfilediscover.h"
 
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class KUrl;
 class QWizard;
index a802270..8690db3 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef SELECTFILESPAGE_H
 #define SELECTFILESPAGE_H
 
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class QWizard;
 class KFileWidget;
index e230a4a..a9df005 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <QList>
 #include <QStringList>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 
 #include <kcompositejob.h>
 #include <KFileItemList>
index cd524e9..95d6261 100644 (file)
 #include "../bluewizard.h"
 #include "../wizardagent.h"
 
-#include <QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 #include <QListView>
 #include <QLabel>
 #include <QTimer>
-#include <QRegExpValidator>
+#include <QtGui/qvalidator.h>
 
 #include <KDebug>
 #include <KLocale>
index 98f5352..8fe4033 100644 (file)
@@ -20,7 +20,7 @@
 #define DISCOVERPAGE_H
 
 #include "ui_discover.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class BlueWizard;
 
index 1964788..a5bce12 100644 (file)
@@ -25,7 +25,7 @@
 #define FAIL_H
 
 #include "ui_fail.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class BlueWizard;
 class KPixmapSequenceOverlayPainter;
index 9b06a9a..b422c5c 100644 (file)
@@ -25,7 +25,7 @@
 #define KEYBOARDPAIRING_H
 
 #include "ui_keyboardpairing.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class BlueWizard;
 class KPixmapSequenceOverlayPainter;
index c822bd5..d3101fc 100644 (file)
@@ -25,7 +25,7 @@
 #define LEGACYPAIRING_H
 
 #include "ui_legacypairing.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class BlueWizard;
 class KPixmapSequenceOverlayPainter;
index e9e13aa..6c1dfaf 100644 (file)
@@ -25,7 +25,7 @@
 #define LEGACYPAIRINGDATABASE_H
 
 #include "ui_nopairing.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class BlueWizard;
 class KPixmapSequenceOverlayPainter;
index ca03fb8..3d17cea 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "ui_nopairing.h"
 #include <QWizard>
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class BlueWizard;
 class KPixmapSequenceOverlayPainter;
index d8d0a79..bc2da84 100644 (file)
@@ -25,7 +25,7 @@
 #define SSPPAIRINGPAGE_H
 
 #include "ui_ssppairing.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 #include <QDBusMessage>
 
 class BlueWizard;
index a41f73e..0c71faa 100644 (file)
@@ -25,7 +25,7 @@
 #define SUCCESS_H
 
 #include "ui_success.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class BlueWizard;
 
index 5a9ea2c..560e440 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <QtDBus>
 #include <QApplication>
-#include <QXmlStreamReader>
+#include <QtCore/qxmlstream.h>
 
 namespace BlueDevil {
     class Device;
index 4f7d9e7..a999755 100644 (file)
@@ -31,7 +31,7 @@
 #include <QLabel>
 #include <QLayout>
 #include <QPainter>
-#include <QTimerEvent>
+#include <QtCore/qcoreevent.h>
 
 #include "extern.h"
 #include "theStream.h"
index d51dcfc..0819d3c 100644 (file)
@@ -27,8 +27,8 @@
 
 #include <QPainter>        //paletteChange()
 //Added by qt3to4:
-#include <QContextMenuEvent>
-#include <QResizeEvent>
+#include <QtGui/qevent.h>
+
 
 static inline uint myMax( uint v1, uint v2 ) { return v1 > v2 ? v1 : v2; }
 
index b36c228..1811dc6 100644 (file)
@@ -20,9 +20,9 @@
 #include "analyzerBase.h"
 #include <QColor>
 //Added by qt3to4:
-#include <QResizeEvent>
-#include <QMouseEvent>
-#include <QContextMenuEvent>
+
+
+#include <QtGui/qevent.h>
 #include <QPixmap>
 
 class QResizeEvent;
index 8d041ce..395b471 100644 (file)
@@ -24,7 +24,7 @@
 #include "videoWindow.h"
 
 #include <QLabel>
-#include <QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 #include <QVBoxLayout>
 
 #include <KListWidget>
index 89d2264..2dee3e9 100644 (file)
@@ -25,7 +25,7 @@
 #include "mainWindow.h"
 
 #include <QEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QPoint>
 
 #include <KDebug>
index 19b49b6..cc9183a 100644 (file)
 #include <QActionGroup>
 #include <QDesktopWidget>
 #include <QDockWidget>
-#include <QDragEnterEvent>
-#include <QDropEvent>
+#include <QtGui/qevent.h>
+
 #include <QEvent>        //::stateChanged()
-#include <QKeyEvent>
+
 #include <QLabel>
 #include <QLayout>      //ctor
-#include <QMouseEvent>
+
 #include <QObject>
 #include <QTimer>
 #include <QStackedWidget>
index 4bbaff9..607d462 100644 (file)
@@ -36,7 +36,7 @@
 
 #include <QSlider>
 #include <QTimer>
-#include <QTimerEvent>
+#include <QtCore/qcoreevent.h>
 #include <QVBoxLayout>
 
 K_PLUGIN_FACTORY(CodeineFactory, registerPlugin<Dragon::Part>();)
index a47be05..2bca3d3 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <QApplication>
 #include <QEvent>
-#include <QResizeEvent>
+#include <QtGui/qevent.h>
 
 MouseOverToolBar::MouseOverToolBar( QWidget *parent )
       : KToolBar( parent )
index 8e8e2ed..3284a0f 100644 (file)
@@ -30,7 +30,7 @@
 
 #include <QFile>
 #include <QFileInfo>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 
 //this is a widget for dispaying the rcently played items in a list. It is subclassed so that we can hook up a context menu
 RecentlyPlayedList::RecentlyPlayedList(QWidget *parent)
index 7360dbb..113df4e 100644 (file)
@@ -23,7 +23,7 @@
 #include <KDebug>
 
 #include <QTextDocument>
-#include <QSizeF>
+#include <QtCore/qsize.h>
 #include <QWidget>
 
 ExpandingTextItem::ExpandingTextItem(QGraphicsWidget* parent)
index 89c70fd..38a3ac3 100644 (file)
@@ -22,7 +22,7 @@
 #define TEXTITEM_H
 
 #include <QGraphicsWidget>
-#include <QGraphicsTextItem>
+#include <QtGui/qgraphicsitem.h>
 
 /**
  * A QGV text widget which will automatically change its font size based on 
index 0144f28..e1fc8ec 100644 (file)
@@ -30,7 +30,7 @@
 #include "theStream.h"
 
 #include <QActionGroup>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QLabel>
 #include <QTimer>
 #include <QVBoxLayout>
index ab61ed0..74e9f1a 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "codeine.h"
 
-#include <QMultiMap>
+#include <QtCore/qmap.h>
 #include <QWidget>
 
 #include <Phonon/Path>
index 2bc0bdd..3a30fbb 100644 (file)
@@ -22,7 +22,7 @@
 #define DRAGONPLAYER_MEDIAPLAYRER2PLAYER_H
 
 #include <QDBusAbstractAdaptor>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 
 #include <Phonon/MediaSource>
 
index 3eaa7c6..1290d68 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <QDBusConnection>
 #include <QDBusMessage>
-#include <QMetaClassInfo>
+#include <QtCore/qmetaobject.h>
 #include <QStringList>
 
 #include <unistd.h>
index bc28cd7..6ff1756 100644 (file)
@@ -22,7 +22,7 @@
 #define DRAGONPLAYER_MPRIS2_H
 
 #include <QObject>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 
 class Mpris2 : public QObject
 {
index 97218c8..01667b1 100644 (file)
@@ -25,7 +25,7 @@
 #include <cmath>
 #include <qglobal.h>
 #include <sys/stat.h>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 
 using namespace std;
index 088f8fc..22ddead 100644 (file)
@@ -19,6 +19,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***********************************************************************/
 
+#include <QRect>
 #include <QFont>
 #include <QFontMetrics>
 #include <QPainter>
index 04af6d7..f9aed9b 100644 (file)
 #include <KJob>
 #include <KUrl>
 
-#include <QtGui/QDragEnterEvent>
-#include <QtGui/QDropEvent>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QResizeEvent>
+#include <QtGui/qevent.h>
+
+
+
+
 #include <QtGui/QWidget>
 #include <QtCore/QTimer>
 
index 46fe5e2..63d9ed7 100644 (file)
 #include <QtGui/QClipboard>
 #include <QtGui/QPainter>
 #include <QtCore/QTimer>      //::resizeEvent()
-#include <QtGui/QDropEvent>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QResizeEvent>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QDragEnterEvent>
+
+
+
+
+#include <QtGui/qevent.h>
 #include <QtGui/QToolTip>
 
 #include <cmath>         //::segmentAt()
index b35c4f9..117718a 100644 (file)
@@ -27,7 +27,7 @@
 #include <KMessageBox>
 
 #include <QtGui/QRadioButton>
-#include <QtGui/QCloseEvent>
+#include <QtGui/qevent.h>
 #include <QtCore/QDir>
 
 SettingsDialog::SettingsDialog(QWidget *parent) : KDialog(parent)
index 58174a0..414b268 100644 (file)
@@ -25,7 +25,7 @@
 #include "ui_dialog.h" //generated by uic
 
 #include <QtCore/QTimer>
-#include <QtGui/QCloseEvent>
+#include <QtGui/qevent.h>
 
 #include <kdialog.h>
 
index 64d0fea..a7d8ba9 100644 (file)
@@ -42,7 +42,7 @@
 #include <QtGui/QApplication>
 #include <QtCore/QByteArray>
 #include <QtCore/QList>
-#include <QtGui/QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QtGui/QLayout>
 
 struct Disk
index 9bc0b53..9003843 100644 (file)
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include "moc_browsemainpage.cpp"
 
 // Qt
-#include <QDropEvent>
+#include <QtGui/qevent.h>
 #include <QMenu>
 #include <QSlider>
 #include <QToolTip>
index 0046f59..9fa8b18 100644 (file)
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 // Qt
 #include <QAction>
 #include <QCompleter>
-#include <QDate>
+#include <QtCore/qdatetime.h>
 #include <QLineEdit>
 #include <QPainter>
 #include <QPainterPath>
index f306da1..c5cbb77 100644 (file)
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #include "folderviewcontextmanageritem.h"
 
 // Qt
-#include <QDragEnterEvent>
+#include <QtGui/qevent.h>
 #include <QHeaderView>
 #include <QTreeView>
 
index fb28f1e..eb18062 100644 (file)
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // Qt
 #include <QApplication>
 #include <QGridLayout>
-#include <QHelpEvent>
+#include <QtGui/qevent.h>
 #include <QLabel>
 #include <QPainter>
 #include <QPointer>
index a412199..b885db1 100644 (file)
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <QLabel>
 #include <QPainter>
 #include <QStyle>
-#include <QStyleOptionTabV3>
+#include <QtGui/qstyleoption.h>
 #include <QStylePainter>
 #include <QTabBar>
 #include <QToolButton>
index 896f3c0..2be3bb4 100644 (file)
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Qt
 #include <QApplication>
-#include <QDate>
+#include <QtCore/qdatetime.h>
 #include <QStackedWidget>
 
 // KDE
index 4f74482..bafc821 100644 (file)
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #define THUMBNAILPAGE_H
 
 // Qt
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QWidget>
 
 // KDE
index 51b0953..4a50b4e 100644 (file)
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #include <lib/gwenviewlib_export.h>
 
 // Qt
-#include <QUndoCommand>
+#include <QtGui/qundostack.h>
 
 // KDE
 
index 4b1b1bf..8d662e0 100644 (file)
@@ -24,9 +24,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 // Qt
 #include <qmath.h>
 #include <QApplication>
-#include <QFlags>
-#include <QGraphicsSceneMouseEvent>
-#include <QMouseEvent>
+#include <QtCore/qglobal.h>
+#include <QtGui/qgraphicssceneevent.h>
+#include <QtGui/qevent.h>
 #include <QPainter>
 #include <QRect>
 #include <QScrollBar>
index f867fb3..e278660 100644 (file)
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include "moc_datewidget.cpp"
 
 // Qt
-#include <QDate>
+#include <QtCore/qdatetime.h>
 #include <QHBoxLayout>
 
 // KDE
index 075f554..15687d6 100644 (file)
@@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <QObject>
 #include <QQueue>
 #include <QUndoStack>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 namespace Gwenview
 {
index 4ebd705..887b2f8 100644 (file)
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Qt
 #include <QCursor>
-#include <QGraphicsSceneMouseEvent>
+#include <QtGui/qgraphicssceneevent.h>
 
 namespace Gwenview
 {
index 1ca448d..b4961a7 100644 (file)
@@ -27,14 +27,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <QGraphicsLinearLayout>
 #include <QGraphicsProxyWidget>
 #include <QGraphicsScene>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsSceneWheelEvent>
-#include <QMouseEvent>
+#include <QtGui/qgraphicssceneevent.h>
+
+#include <QtGui/qevent.h>
 #include <QPainter>
 #include <QPropertyAnimation>
 #include <QScrollBar>
 #include <QVBoxLayout>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 // KDE
 #include <KDebug>
index fd9fa2b..b8e6d19 100644 (file)
@@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Qt
 #include <QEvent>
-#include <QGLWidget>
+#include <QGL>
 #include <QGraphicsScene>
 #include <QPropertyAnimation>
 #include <QTimer>
index 6a80590..4fb3417 100644 (file)
@@ -31,10 +31,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <KDebug>
 
 // Qt
-#include <QGraphicsSceneMouseEvent>
+#include <QtGui/qgraphicssceneevent.h>
 #include <QPainter>
 #include <QTimer>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 // LCMS2
 #include <lcms2.h>
index c082b14..7738d87 100644 (file)
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <QCursor>
 #include <QEvent>
 #include <QGraphicsSvgItem>
-#include <QGraphicsTextItem>
+#include <QtGui/qgraphicsitem.h>
 #include <QGraphicsWidget>
 #include <QPainter>
 #include <QSvgRenderer>
index 191b8ef..bd7d0eb 100644 (file)
@@ -30,8 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <QGraphicsLinearLayout>
 #include <QGraphicsProxyWidget>
 #include <QHBoxLayout>
-#include <QMouseEvent>
-#include <QTime>
+#include <QtGui/qevent.h>
+#include <QtCore/qdatetime.h>
 
 // KDE
 #include <KDebug>
index f7d0c2b..5385671 100644 (file)
@@ -42,7 +42,7 @@
 
 #include <QLayout>
 #include <QRect>
-#include <QWidgetItem>
+#include <QtGui/qlayoutitem.h>
 
 class GWENVIEWLIB_EXPORT FlowLayout : public QLayout
 {
index 695d2cb..1c9fc2d 100644 (file)
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #include <QDesktopWidget>
 #include <QBitmap>
 #include <QEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QLayout>
 #include <QTimeLine>
 #include <QTimer>
index 15d26ac..b9029a0 100644 (file)
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <QIcon>
 #include <QPainter>
 #include <QStyle>
-#include <QStyleOptionGraphicsItem>
+#include <QtGui/qstyleoption.h>
 
 namespace Gwenview
 {
index f8db4c3..913a81b 100644 (file)
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <QFontMetrics>
 #include <QPainter>
 #include <QStyle>
-#include <QStyleOptionGraphicsItem>
+#include <QtGui/qstyleoption.h>
 
 namespace Gwenview
 {
index 769e2b7..2c87915 100644 (file)
@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <QGraphicsSceneEvent>
 #include <QPainter>
 #include <QStyle>
-#include <QStyleOptionGraphicsItem>
+#include <QtGui/qstyleoption.h>
 #include <QTimer>
 
 namespace Gwenview
index 27022c7..4b4abb3 100644 (file)
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Include QImageIOPlugin to get qRegisterStaticPluginInstanceFunction(), which
 // does not come with QPluginLoader.
-#include <QImageIOPlugin>
+#include <QtGui/qimageiohandler.h>
 
 // KDE
 
index f3dd492..2b02424 100644 (file)
@@ -167,7 +167,7 @@ static bool loadJpeg(QImage* image, QIODevice* ioDevice, QSize scaledSize)
         break;
     case 1: // B&W image
         *image = QImage(cinfo.output_width, cinfo.output_height, QImage::Format_Indexed8);
-        image->setNumColors(256);
+        image->setColorCount(256);
         for (int i = 0; i < 256; ++i) {
             image->setColor(i, qRgba(i, i, i, 255));
         }
@@ -331,7 +331,7 @@ static bool write_jpeg_image(const QImage &sourceImage, QIODevice *device, int s
         case 1:
         case 8:
             gray = true;
-            for (int i = image.numColors(); gray && i--;) {
+            for (int i = image.colorCount(); gray && i--;) {
                 gray = gray & (qRed(cmap[i]) == qGreen(cmap[i]) &&
                                qRed(cmap[i]) == qBlue(cmap[i]));
             }
index b1c20f2..b87c056 100644 (file)
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Qt
 #include <QByteArray>
-#include <QImageIOPlugin>
+#include <QtGui/qimageiohandler.h>
 
 class QImageIOHandler;
 class QIODevice;
index 4e3aec1..dee6e6b 100644 (file)
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 // Qt
 #include <QFile>
 #include <QTextStream>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 // System
 #ifdef Q_OS_WIN
index 2902bca..50fb132 100644 (file)
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <QPainter>
 #include <QPainterPath>
 #include <QPixmap>
-#include <QRectF>
+#include <QtCore/qrect.h>
 
 namespace Gwenview
 {
index 05008b3..36f2e35 100644 (file)
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <KFileItem>
 
 // Qt
-#include <QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 
 class KUrl;
 
index 6f0d911..a4d821a 100644 (file)
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #include "moc_redeyereductiontool.cpp"
 
 // Qt
-#include <QGraphicsSceneMouseEvent>
+#include <QtGui/qgraphicssceneevent.h>
 #include <QPainter>
 #include <QPushButton>
 #include <QRect>
index 4f527e0..2cb4ec2 100644 (file)
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // Qt
 #include <QEvent>
 #include <QPropertyAnimation>
-#include <QResizeEvent>
+#include <QtGui/qevent.h>
 
 namespace Gwenview
 {
index d7ec0a9..0a812d4 100644 (file)
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define SLIDECONTAINER_H
 
 // Qt
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 #include <QFrame>
 
 #include <lib/gwenviewlib_export.h>
index 4e98b08..1374d55 100644 (file)
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 // Qt
 #include <QAction>
-#include <QStyleOptionToolButton>
+#include <QtGui/qstyleoption.h>
 #include <QStylePainter>
 #include <QToolButton>
 
index 3e87426..9653157 100644 (file)
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <KIconLoader>
 
 // Qt
-#include <QStyleOptionToolButton>
+#include <QtGui/qstyleoption.h>
 #include <QStylePainter>
 
 namespace Gwenview
index 34441ec..dfbd83f 100644 (file)
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Qt
 #include <QApplication>
-#include <QShowEvent>
+#include <QtGui/qevent.h>
 
 // KDE
 #include <KDebug>
index c3607c3..3cc6a7a 100644 (file)
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 // Qt
 #include <QHash>
 #include <QHBoxLayout>
-#include <QHelpEvent>
+#include <QtGui/qevent.h>
 #include <QLabel>
 #include <QPainter>
 #include <QPainterPath>
index 5a158d9..5881b89 100644 (file)
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 // Qt
 #include <QApplication>
 #include <QItemSelectionModel>
-#include <QHelpEvent>
+#include <QtGui/qevent.h>
 #include <QScrollBar>
 #include <QPainter>
 #include <QTimeLine>
index 4fc7037..3080339 100644 (file)
@@ -24,8 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // Qt
 #include <QApplication>
-#include <QDragEnterEvent>
-#include <QDropEvent>
+#include <QtGui/qevent.h>
+
 #include <QPainter>
 #include <QPointer>
 #include <QQueue>
index d58c8d9..24af83d 100644 (file)
@@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 */
 // Qt
-#include <QConicalGradient>
+#include <QtGui/qbrush.h>
 #include <QImage>
 #include <QPainter>
 
index a775991..f1bd471 100644 (file)
@@ -4,7 +4,7 @@
 #include <QFile>
 #include <QImage>
 #include <QImageReader>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 #include <lib/imageformats/imageformats.h>
 
index 1c9f773..4683940 100644 (file)
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Qt
 #include <QDir>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 using namespace Gwenview;
 
index 6b9dbce..868df7d 100644 (file)
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QApplication>
 #include <QCursor>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QShortcut>
 #include <QStyle>
 
index 823f6b8..77330ce 100644 (file)
@@ -55,7 +55,7 @@ class KCalcConstMenu;
 #include "ui_constants.h"
 #include "ui_colors.h"
 
-#include <QFlags>
+#include <QtCore/qglobal.h>
 
 #include <kxmlguiwindow.h>
 
index e62a9dd..cf43a9b 100644 (file)
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QAbstractTextDocumentLayout>
 #include <QApplication>
-#include <QStyleOptionButton>
+#include <QtGui/qstyleoption.h>
 #include <QStylePainter>
 #include <QTextDocument>
 
index cccd233..43d9514 100644 (file)
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "kcalc_const_menu.h"
 
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QFile>
 #include <kdebug.h>
 #include <klocale.h>
index 083e459..df6ea5b 100644 (file)
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "kcalcdisplay.h"
 
 #include <QClipboard>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QPainter>
 #include <QStyle>
 #include <QStyleOption>
index d8b57bc..e5f1fcd 100644 (file)
@@ -15,7 +15,7 @@
 #include <QTreeWidgetItemIterator>
 #include <QVBoxLayout>
 #include <QPixmap>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QAction>
 
 #include <klocale.h>
index 8253ddd..b518861 100644 (file)
@@ -21,7 +21,7 @@
 #include <QPixmap>
 #include <QString>
 #include <QWidget>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 #include <QStringList>
 
 #include <kcmodule.h>
index 390c4be..697c993 100644 (file)
@@ -12,7 +12,7 @@
 #ifndef TASK_WIDGET_H
 #define TASK_WIDGET_H
 
-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 
 class CTTask;
 class TasksWidget;
index 194bad0..d351195 100644 (file)
@@ -22,7 +22,7 @@
 #define model_h
 
 #include <QStringList>
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <ksambasharedata.h>
 
 class KSambaShareData;
index eabba77..079d1ec 100644 (file)
@@ -19,7 +19,7 @@
 #ifndef SESSIONSMODEL_H
 #define SESSIONSMODEL_H
 
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <shell/sessioncontroller.h>
 
 class SessionsModel : public QAbstractListModel
index 7a1a3d9..33b5070 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef GDB_DEBUGSESSION_H
 #define GDB_DEBUGSESSION_H
 
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 #include <QScopedPointer>
 
 #include <KConfigGroup>
index 3f87953..eb20bd8 100644 (file)
@@ -31,8 +31,8 @@
 #include <ktextedit.h>
 #include <kglobalsettings.h>
 
-#include <QShowEvent>
-#include <QHideEvent>
+#include <QtGui/qevent.h>
+
 #include <QAction>
 #include <QMenu>
 #include <QBoxLayout>
index e1ebc69..4a6a68b 100644 (file)
@@ -21,7 +21,7 @@
 #include <QStringList>
 
 #include "mi/gdbmi.h"
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 namespace GDBDebugger
 {
index ef31c02..1a661e7 100644 (file)
@@ -18,7 +18,7 @@
 #ifndef _GDBGLOBAL_H_
 #define _GDBGLOBAL_H_
 
-#include <QFlags>
+#include <QtCore/qglobal.h>
 
 namespace GDBDebugger
 {
index 65a14a5..f320303 100644 (file)
@@ -36,7 +36,7 @@
 #include <QToolTip>
 #include <QApplication>
 #include <QClipboard>
-#include <QFocusEvent>
+#include <QtGui/qevent.h>
 #include <QMenu>
 #include <khistorycombobox.h>
 #include <KIcon>
index e3bf3cd..bcc85d3 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <QTimer>
 #include <QStringList>
-#include <QFocusEvent>
+#include <QtGui/qevent.h>
 #include <QStringList>
 #include <QTextEdit>
 
index ca12b06..237d93d 100644 (file)
@@ -34,7 +34,7 @@
 #include <qtoolbox.h>
 #include <QTextEdit>
 #include <QHBoxLayout>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QGridLayout>
 #include <QVBoxLayout>
 
index 6ceaf93..db04832 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <kdialog.h>
 
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 
 #include "gdbglobal.h"
 
index 3081487..202633e 100644 (file)
@@ -1,4 +1,4 @@
-#include <QDate>
+#include <QtCore/qdatetime.h>
 int main()
 {
     QDate d(2010, 1, 20);
index 530745a..8488b21 100644 (file)
@@ -1,4 +1,4 @@
-#include <QTime>
+#include <QtCore/qdatetime.h>
 int main()
 {
     QTime t(15, 30, 10, 123);
index a91bce1..4850870 100644 (file)
@@ -24,7 +24,7 @@
 #include "converters.h"
 
 #include <QMenu>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QSignalMapper>
 
 #include <KDebug>
index ef3cd42..9d64cc0 100644 (file)
@@ -25,6 +25,7 @@
 #include <QApplication>
 #include <QFileInfo>
 #include <QDir>
+#include <QTemporaryFile>
 
 #include <KGlobal>
 #include <KSharedConfig>
index 66f1c5c..812a58a 100644 (file)
@@ -1,6 +1,8 @@
 macro_log_feature(QT_QTHELP_FOUND "QtHelp" "The Help module for the Qt toolkit, needed for the qthelp plugin" "http://qt-project.org/" FALSE)
+macro_log_feature(QT_QTWEBKIT_FOUND "QtWebKit" "The WebKit module for the Qt toolkit, needed for the qthelp and manpage plugin" "http://qt-project.org/" FALSE)
 
-if(QT_QTHELP_FOUND)
+# TODO: that should use a part
+if(QT_QTHELP_FOUND AND QT_QTWEBKIT_FOUND)
  macro_optional_add_subdirectory(qthelp)
+    macro_optional_add_subdirectory(manpage)
 endif()
-macro_optional_add_subdirectory(manpage)
index 1733d5f..41f8ce4 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <KIO/Job>
 
-#include <QListIterator>
+#include <QtCore/qlist.h>
 
 // id and name for man section
 typedef QPair<QString, QString> ManSection;
index 8677d87..3ed5f65 100644 (file)
@@ -26,7 +26,7 @@
 #include <interfaces/iplugin.h>
 #include <interfaces/idocumentationprovider.h>
 
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 #include <QProgressBar>
 
 class ManPageDocumentation;
index 979b96a..899a275 100644 (file)
@@ -24,7 +24,7 @@
 #include <KLocale>
 #include <KIcon>
 #include <QTreeView>
-#include <QHelpContentModel>
+#include <QtHelp/qhelpcontentwidget.h>
 #include <QHeaderView>
 #include <QMenu>
 #include <interfaces/icore.h>
index 9ba7ccd..6890c8f 100644 (file)
@@ -21,9 +21,9 @@
 
 #include "qthelpprovider.h"
 
-#include <QHelpIndexModel>
+#include <QtHelp/qhelpindexwidget.h>
 #include <QTemporaryFile>
-#include <QHelpContentModel>
+#include <QtHelp/qhelpcontentwidget.h>
 
 #include <KDebug>
 #include <KStandardDirs>
index 7bd49a6..04fb54b 100644 (file)
@@ -26,7 +26,7 @@
 #include <QObject>
 #include <QString>
 #include <QUrl>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 #include <QHelpEngine>
 
 
index 7adaa44..1ac099f 100644 (file)
@@ -3,7 +3,7 @@
 
 {% block includes %}
 {{ block.super }}
-#include <QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 {% endblock %}
 
 {% block forward_declarations %}
index 7e99155..db91fe3 100644 (file)
@@ -20,7 +20,7 @@
 #include <KUrl>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QXmlStreamReader>
+#include <QtCore/qxmlstream.h>
 #include <QDebug>
 #include <vcs/vcslocation.h>
 
index 72bc9d2..7f9b179 100644 (file)
@@ -19,7 +19,7 @@
  */
 
 #include "kdeproviderplugin.h"
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
index 455c509..6abbd3e 100644 (file)
@@ -26,7 +26,7 @@
 #include <ktexteditor/view.h>
 #include <ktexteditor/document.h>
 #include <cpptypes.h>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include "helpers.h"
 #include "model.h"
 #include <language/duchain/declaration.h>
index 5f38aa2..c24ebb6 100644 (file)
@@ -27,7 +27,7 @@
 #include "templatedeclaration.h"
 #include "templateparameterdeclaration.h"
 #include "typeutils.h"
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 #include "adlhelper.h"
 #include "typeconversion.h"
 #include <language/duchain/persistentsymboltable.h>
index 1b9f950..089a1b1 100644 (file)
@@ -37,7 +37,7 @@
 #include <QFile>
 #include <QByteArray>
 #include <QReadWriteLock>
-#include <QReadLocker>
+#include <QtCore/qreadwritelock.h>
 
 #include <KDebug>
 #include <KLocale>
index 16d6878..e58edbc 100644 (file)
 
 #include <QByteArray>
 #include <QFile>
-#include <QDomDocument>
-#include <QDomElement>
+
+#include <QtXml/qdom.h>
 #include <QDir>
 #include <QTextStream>
-#include <QMultiMap>
-#include <QMapIterator>
+
+#include <QtCore/qmap.h>
 #include <QSet>
 
 #include <kdebug.h>
index 59c8385..bad99c6 100644 (file)
@@ -22,8 +22,8 @@
 
 #include "pp-macro-expander.h"
 
-#include <QDate>
-#include <QTime>
+
+#include <QtCore/qdatetime.h>
 
 #include <kdebug.h>
 #include <klocale.h> 
index b9d5d7f..b88d127 100644 (file)
@@ -25,7 +25,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QByteArray>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QReadWriteLock>
 
 #include <kdebug.h>
index 8833c7b..246e765 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef CUSTOMDEFINESANDINCLUDESMANAGER_H
 #define CUSTOMDEFINESANDINCLUDESMANAGER_H
 
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 #include <QVector>
 
 #include <interfaces/iplugin.h>
index 7ad7af8..2fabf6f 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef COMPILERMODEL_H
 #define COMPILERMODEL_H
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QHash>
 
 #include "../compilerprovider/icompiler.h"
index 619a8c4..0329610 100644 (file)
@@ -19,7 +19,7 @@
 #ifndef DEFINESMODEL_H
 #define DEFINESMODEL_H
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QHash>
 
 #include <language/interfaces/idefinesandincludesmanager.h>
index 3b7fa3f..12f4497 100644 (file)
@@ -19,7 +19,7 @@
 #ifndef INCLUDESMODEL_H
 #define INCLUDESMODEL_H
 
-#include <QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QStringList>
 
 class IncludesModel : public QAbstractListModel
index 0eb6a4b..11df075 100644 (file)
@@ -22,7 +22,7 @@
 #include <interfaces/iplugin.h>
 #include <project/interfaces/iprojectbuilder.h>
 #include <KUrl>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 class NinjaJob;
 
index 39d0124..efbdf69 100644 (file)
@@ -67,34 +67,54 @@ remove_definitions( -DQT_NO_STL )
 
 add_library( kdev4cmakecommon SHARED ${cmakecommon_SRCS} )
 target_link_libraries( kdev4cmakecommon LINK_PRIVATE ${KDE4_KDEUI_LIBS}
-                        ${KDE4_KTEXTEDITOR_LIBS} ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES}
+                        ${KDE4_KTEXTEDITOR_LIBS} ${KDEVPLATFORM_INTERFACES_LIBRARIES}
+                        ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES}
                         ${QT_QTSCRIPT_LIBRARY} ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
                         )
 
 kde4_add_plugin( kdevcmakemanager ${cmakemanager_SRCS} )
-target_link_libraries( kdevcmakemanager ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDEVPLATFORM_UTIL_LIBRARIES}
+target_link_libraries( kdevcmakemanager ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}
+                        ${KDEVPLATFORM_UTIL_LIBRARIES}
                         ${KDEVPLATFORM_INTERFACES_LIBRARIES} kdev4cmakecommon
                         ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
                         ${KDEVPLATFORM_OUTPUTVIEW_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS})
 
+if(QT_QTWEBKIT_FOUND)
 kde4_add_plugin( kdevcmakedocumentation ${cmakedoc_SRCS} )
 target_link_libraries( kdevcmakedocumentation
                         ${KDEVPLATFORM_INTERFACES_LIBRARIES} kdev4cmakecommon
-                        ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+                        ${KDEVPLATFORM_PROJECT_LIBRARIES}
+                        ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
                         ${KDEVPLATFORM_DOCUMENTATION_LIBRARIES}
-                        ${KDE4_KTEXTEDITOR_LIBS} ${QT_QTWEBKIT_LIBRARY})
+                        ${KDE4_KTEXTEDITOR_LIBS}
+                        ${QT_QTWEBKIT_LIBRARY})
+endif()
 
 kde4_add_plugin( kcm_kdevcmake_settings ${cmakesettings_SRCS} )
-target_link_libraries( kcm_kdevcmake_settings ${KDE4_KIO_LIBS}
-                       ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES}
+target_link_libraries( kcm_kdevcmake_settings
+                       ${KDE4_KIO_LIBS}
+                       ${KDEVPLATFORM_INTERFACES_LIBRARIES}
+                       ${KDEVPLATFORM_PROJECT_LIBRARIES}
+                       ${KDEVPLATFORM_UTIL_LIBRARIES}
                        ${KDE4_KIO_LIBRARY} kdev4cmakecommon )
 
 install(TARGETS kdevcmakemanager DESTINATION ${PLUGIN_INSTALL_DIR} )
-install(TARGETS kdevcmakedocumentation DESTINATION ${PLUGIN_INSTALL_DIR} )
 install(TARGETS kcm_kdevcmake_settings DESTINATION ${PLUGIN_INSTALL_DIR} )
 install(TARGETS kdev4cmakecommon ${INSTALL_TARGETS_DEFAULT_ARGS} )
 configure_file(kdevcmakemanager.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdevcmakemanager.desktop)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevcmakemanager.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-configure_file(kdevcmakedocumentation.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdevcmakedocumentation.desktop)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevcmakedocumentation.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 install(FILES kcm_kdevcmake_settings.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+if(QT_QTWEBKIT_FOUND)
+    install(
+        TARGETS kdevcmakedocumentation
+        DESTINATION ${PLUGIN_INSTALL_DIR}
+    )
+    configure_file(
+        kdevcmakedocumentation.desktop.cmake
+        ${CMAKE_CURRENT_BINARY_DIR}/kdevcmakedocumentation.desktop
+    )
+    install(
+        FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevcmakedocumentation.desktop
+        DESTINATION ${SERVICES_INSTALL_DIR}
+    )
+endif()
\ No newline at end of file
index 88145ab..21279f6 100644 (file)
@@ -22,7 +22,7 @@
 #define CMAKEBUILDDIRCHOOSER_H
 
 #include <KDialog>
-#include <QFlags>
+#include <QtCore/qglobal.h>
 #include <kurl.h>
 
 #include "cmakeexport.h"
index 767468a..019f929 100644 (file)
@@ -20,7 +20,7 @@
 
 #include "cmakecodecompletionmodel.h"
 #include <QVariant>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <kurl.h>
 #include <language/duchain/duchain.h>
 #include <language/duchain/duchainlock.h>
index ab9ca90..c4ee9f1 100644 (file)
@@ -24,7 +24,7 @@
 #include <QString>
 #include <QMap>
 #include <QStringList>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 #include <interfaces/iplugin.h>
 #include "icmakedocumentation.h"
 
index 94ef582..a367f2e 100644 (file)
@@ -7,7 +7,7 @@
 #include "kde4appview.h"
 #include "settings.h"
 
-#include <QtGui/QDropEvent>
+#include <QtGui/qevent.h>
 #include <QtGui/QPainter>
 #include <QtGui/QPrinter>
 
index 90c4e08..bd089eb 100644 (file)
@@ -24,7 +24,7 @@
 #include <language/duchain/indexedstring.h>
 
 #include <QDir>
-#include <QFileInfoList>
+#include <QtCore/qfileinfo.h>
 #include <QFile>
 #include <QApplication>
 
index 2c9f9fb..71ef661 100644 (file)
@@ -18,7 +18,7 @@
  */
 
 
-#include <QtGui/QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QtCore/QTimer>
 #include <ghlineedit.h>
 
index 0bfc038..4d27d9b 100644 (file)
@@ -28,7 +28,7 @@
 // KDev
 #include <interfaces/iplugin.h>
 // Qt
-#include <QtCore/QVariantList>
+#include <QtCore/qvariant.h>
 
 class KUrl;
 
index 162d57c..73cacd7 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef KDEVPLATFORM_BREAKPOINTMODEL_H
 #define KDEVPLATFORM_BREAKPOINTMODEL_H
 
-#include <QtCore/QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 
 #include <KDE/KTextEditor/MarkInterface>
 #include "breakpoint.h"
index db876ca..81c260c 100644 (file)
@@ -27,7 +27,7 @@
 #include <QTableView>
 #include <QHeaderView>
 #include <QMenu>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 
 #include <KIcon>
 #include <KLocalizedString>
index 3661099..fdfd52b 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef KDEVPLATFORM_FRAMESTACKMODEL_H
 #define KDEVPLATFORM_FRAMESTACKMODEL_H
 
-#include <QtCore/QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QtCore/QHash>
 
 #include <KDE/KUrl>
index cc47ed7..430241b 100644 (file)
@@ -33,7 +33,7 @@
 #include <QMenu>
 #include <QApplication>
 #include <QClipboard>
-#include <QResizeEvent>
+#include <QtGui/qevent.h>
 
 #include <KAction>
 #include <KStandardAction>
index e5f9921..d89802f 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "pathmappings.h"
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QTableView>
index 1ba6c55..89b38d8 100644 (file)
@@ -22,7 +22,7 @@
 #include "treeitem.h"
 
 #include <QStringList>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 
 #include "treemodel.h"
 
index bbab15e..f24a415 100644 (file)
@@ -23,7 +23,7 @@
 #define KDEVPLATFORM_TREEMODEL_H
 
 #include <QtCore/QAbstractItemModel>
-#include <QtCore/QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QtCore/QVariant>
 #include <QtCore/QVector>
 #include <QtCore/QString>
index 5100421..06a23e0 100644 (file)
@@ -28,7 +28,7 @@
 #include <QApplication>
 #include <QEvent>
 #include <QStandardItemModel>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QHeaderView>
 #include <QLabel>
 #include <QPushButton>
index e629725..0eab804 100644 (file)
@@ -22,8 +22,8 @@
 #include <QRegExp>
 #include <QCursor>
 #include <QHBoxLayout>
-#include <QKeyEvent>
-#include <QFocusEvent>
+#include <QtGui/qevent.h>
+
 #include <QVBoxLayout>
 #include <QPoint>
 #include <QClipboard>
index d18e3a9..38a989f 100644 (file)
@@ -1,27 +1,30 @@
 macro_log_feature(QT_QTWEBKIT_FOUND "QtWebKit" "QtWebKit, for integrated documentation" "http://qt-project.org/" FALSE)
 
+set(kdevplatformdocumentation_LIB_SRCS
+    documentationfindwidget.cpp
+    documentationview.cpp
+)
+
 if(QT_QTWEBKIT_FOUND)
     set(kdevplatformdocumentation_LIB_SRCS
+        ${kdevplatformdocumentation_LIB_SRCS}
         standarddocumentationview.cpp
-        documentationfindwidget.cpp
-        documentationview.cpp
-        documentationfindwidget.ui
     )
+endif()
 
-    add_library(kdevplatformdocumentation SHARED ${kdevplatformdocumentation_LIB_SRCS})
+add_library(kdevplatformdocumentation SHARED ${kdevplatformdocumentation_LIB_SRCS})
 
-    install(TARGETS kdevplatformdocumentation EXPORT KDevPlatformTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kdevplatformdocumentation EXPORT KDevPlatformTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
-    target_link_libraries(kdevplatformdocumentation
-            LINK_PRIVATE ${QT_QTWEBKIT_LIBRARY}
-            LINK_PUBLIC kdevplatforminterfaces)
+target_link_libraries(kdevplatformdocumentation
+        LINK_PRIVATE ${QT_QTWEBKIT_LIBRARY}
+        LINK_PUBLIC kdevplatforminterfaces)
 
-    set_target_properties(kdevplatformdocumentation PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION})
+set_target_properties(kdevplatformdocumentation PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION})
 
-    install(FILES
-        documentationexport.h
-        documentationfindwidget.h
-        standarddocumentationview.h
-        DESTINATION ${INCLUDE_INSTALL_DIR}/kdevplatform/documentation COMPONENT Devel
-    )
-endif()
\ No newline at end of file
+install(FILES
+    documentationexport.h
+    documentationfindwidget.h
+    standarddocumentationview.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}/kdevplatform/documentation COMPONENT Devel
+)
\ No newline at end of file
index e0fa7d6..04a679d 100644 (file)
@@ -21,7 +21,7 @@
 #define KDEVPLATFORM_DOCUMENTATIONVIEW_H
 
 #include <QWidget>
-#include <QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <KToolBar>
 #include <interfaces/idocumentation.h>
 #include "documentationexport.h"
index 293696f..4e72d02 100644 (file)
@@ -20,7 +20,7 @@
 #include "icore.h"
 
 #include <KAction>
-#include <QXmlStreamReader>
+#include <QtCore/qxmlstream.h>
 #include <QTextEdit>
 #include <QThread>
 
index 93c179d..fa826d8 100644 (file)
@@ -28,9 +28,9 @@
 #include <QTimer>
 #include <QMutex>
 #include <QWaitCondition>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QThread>
-#include <QtCore/QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 #include <kdebug.h>
 #include <kglobal.h>
index 3086bbc..d4c42bd 100644 (file)
@@ -22,7 +22,7 @@
 #include "documentchangetracker.h"
 
 #include <QMutex>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <kdebug.h>
 #include <ktexteditor/document.h>
index fd276b9..3fae6e3 100644 (file)
@@ -30,7 +30,7 @@
 #include <QFile>
 #include <QByteArray>
 #include <QMutex>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QApplication>
 
 #include <kdebug.h>
index c7cb8ff..72e2384 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef KDEVPLATFORM_PARSEJOB_H
 #define KDEVPLATFORM_PARSEJOB_H
 
-#include <QtCore/QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 #include <KDE/KUrl>
 
 #include <threadweaver/JobSequence.h>
index 31352fe..11e71df 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <threadweaver/DependencyPolicy.h>
 
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 
 namespace KDevelop
 {
index 5cc0289..5443fd1 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "codecompletionitem.h"
 
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 
 #include <ktexteditor/codecompletionmodel.h>
 #include <ktexteditor/range.h>
index 62f1105..c48bd9b 100644 (file)
@@ -32,7 +32,7 @@
 #include <KConfigGroup>
 
 #include <QFileInfo>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 
 using namespace KDevelop;
 typedef SourceFileTemplate::ConfigOption ConfigOption;
index 76a08b7..9b8d310 100644 (file)
@@ -21,7 +21,7 @@
 #define KDEVPLATFORM_TEMPLATECLASSGENERATOR_H
 
 #include <QHash>
-#include <QVariantHash>
+#include <QtCore/qvariant.h>
 
 #include "../languageexport.h"
 #include <language/duchain/duchainpointer.h>
index fc339b4..84633a3 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef KDEVPLATFORM_TEMPLATERENDERER_H
 #define KDEVPLATFORM_TEMPLATERENDERER_H
 
-#include <QVariantHash>
+#include <QtCore/qvariant.h>
 
 #include "../languageexport.h"
 
index 58ba3d3..ac8d53e 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <climits>
 
-#include <QtCore/QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <ktexteditor/range.h>
 
index da18b69..7f5838e 100644 (file)
 #include <QtCore/QCoreApplication>
 #include <QApplication>
 #include <QtCore/QHash>
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 #include <QtCore/QTimer>
 #include <QtCore/QReadWriteLock>
-#include <QtCore/QAtomicInt>
+#include <QtCore/qatomic.h>
 #include <QtCore/QThread>
 #include <QtCore/QWaitCondition>
 #include <QtCore/QMutex>
index 0c8d438..4680c6e 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "duchainbase.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QThreadStorage>
 
 #include "duchainpointer.h"
index d4e071d..e113619 100644 (file)
@@ -21,7 +21,7 @@
 
 #include <limits>
 
-#include <QMutableLinkedListIterator>
+#include <QtCore/qlist.h>
 #include <QSet>
 
 #include <ktexteditor/document.h>
index bc22b1c..bbd21e5 100644 (file)
@@ -33,7 +33,7 @@
 #include <interfaces/idocumentcontroller.h>
 #include <interfaces/iprojectcontroller.h>
 #include <qtextdocument.h>
-#include <QResizeEvent>
+#include <QtGui/qevent.h>
 #include <language/duchain/duchainutils.h>
 #include <language/codegen/coderepresentation.h>
 #include <interfaces/iproject.h>
index ab3fc2b..fa909cd 100644 (file)
@@ -22,7 +22,7 @@
 #include "referencecounting.h"
 #include <QMutex>
 #include <QMap>
-#include <QAtomicInt>
+#include <QtCore/qatomic.h>
 #include <kdebug.h>
 #include "repositories/itemrepository.h"
 #include <util/spinlock.h>
index 83e50e0..733f0d6 100644 (file)
@@ -19,7 +19,7 @@
 #include "itemrepositoryregistry.h"
 
 #include <QtCore/QDir>
-#include <QtCore/QProcessEnvironment>
+#include <QtCore/qprocess.h>
 #include <QtCore/QCoreApplication>
 #include <QtDBus/QDBusConnection>
 
index 223a23d..1ff7d85 100644 (file)
@@ -21,7 +21,7 @@
 
 #include <QtCore/QString>
 #include <QtCore/QMutex>
-#include <QtCore/QAtomicInt>
+#include <QtCore/qatomic.h>
 #include <QtCore/QMap>
 
 #include <language/languageexport.h>
index 009da2a..adb5f99 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <QHash>
 #include <QMutex>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include "../types/typesystemdata.h"
 #include "../types/typeregister.h"
index c2d02b2..a23b1fb 100644 (file)
@@ -28,8 +28,8 @@
 #ifndef KDEVPLATFORM_TYPEPOINTER_H
 #define KDEVPLATFORM_TYPEPOINTER_H
 
-#include <QtCore/QExplicitlySharedDataPointer>
-#include <QtCore/QAtomicPointer>
+#include <QtCore/qsharedpointer.h>
+#include <QtCore/qatomic.h>
 #include <kdemacros.h>
 
 typedef QSharedData TypeShared;
index afc0918..9dbde8c 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QHash>
-#include <QtCore/QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 
 #include <ktexteditor/attribute.h>
 #include <ktexteditor/movingrange.h>
index ab385ba..1d87b8e 100644 (file)
@@ -25,7 +25,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QList>
 #include <QtGui/QColor>
-#include <QtCore/QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 #include "../languageexport.h"
 
index 2678017..f6757f3 100644 (file)
@@ -22,7 +22,7 @@
 #define KDEVPLATFORM_IOUTPUTVIEW_H
 
 #include <QtCore/QMetaType>
-#include <QtCore/QFlags>
+#include <QtCore/qglobal.h>
 #include <KDE/KIcon>
 
 #include "outputviewexport.h"
index fedeeec..f995434 100644 (file)
@@ -25,7 +25,7 @@
 #include "outputviewexport.h"
 #include "ioutputviewmodel.h"
 
-#include <QtCore/QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 
 class KUrl;
 
index 5cdfdc2..0de655f 100644 (file)
@@ -12,7 +12,7 @@
 
 #include "appwizardpagewidget.h"
 #include "appwizarddialog.h"
-#include <QRegExpValidator>
+#include <QtGui/qvalidator.h>
 
 namespace KDevelop
 {
index 6f0a3eb..f253667 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef BAZAAR_BAZAARPLUGIN_H
 #define BAZAAR_BAZAARPLUGIN_H
 
-#include <QtCore/QVariantList>
+#include <QtCore/qvariant.h>
 
 #include <interfaces/iplugin.h>
 #include <vcs/interfaces/idistributedversioncontrol.h>
index 902ece0..fc093fd 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <QtGui/QMenu>
 #include <QtGui/QHeaderView>
-#include <QtGui/QContextMenuEvent>
+#include <QtGui/qevent.h>
 
 #include "interfaces/contextmenuextension.h"
 #include "interfaces/icore.h"
index 26a457e..ecd2aa4 100644 (file)
@@ -20,7 +20,7 @@
 
 #include "codeutilsplugin.h"
 
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 #include <KLocale>
 #include <KPluginFactory>
index 9501ae5..ec7ffcf 100644 (file)
@@ -20,7 +20,7 @@
  */
 
 #include "browsemanager.h"
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QToolButton>
 #include <kdebug.h>
 #include <ktexteditor/view.h>
index f6a6c31..16a9878 100644 (file)
@@ -26,7 +26,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QToolButton>
-#include <QShowEvent>
+#include <QtGui/qevent.h>
 #include <QAction>
 #include <QMenu>
 #include <KIcon>
index 2b9a43d..5bf7373 100644 (file)
@@ -12,7 +12,7 @@
 #define KDEVPLATFORM_PLUGIN_EDITORSVIEW_H
 
 #include <QDialog>
-#include <QMultiMap>
+#include <QtCore/qmap.h>
 #include <KJob>
 
 #include "ui_editorsview.h"
index 09c3814..b75b621 100644 (file)
@@ -18,7 +18,7 @@
  ***************************************************************************/
 #include "documentswitchertreeview.h"
 
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 
 #include <kdebug.h>
 
index a7d20b7..c176e7d 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef KDEVPLATFORM_PLUGIN_KDEVDOCUMENTMODEL_H
 #define KDEVPLATFORM_PLUGIN_KDEVDOCUMENTMODEL_H
 
-#include <QStandardItem>
+#include <QtGui/qstandarditemmodel.h>
 #include <QStandardItemModel>
 #include <interfaces/idocumentcontroller.h>
 #include <interfaces/idocument.h>
index 0068cf9..6029578 100644 (file)
@@ -24,7 +24,7 @@ Boston, MA 02110-1301, USA.
 
 #include <QDir>
 #include <QHeaderView>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QSortFilterProxyModel>
 
 #include <kaction.h>
index 9c0de2b..4f855a1 100644 (file)
@@ -23,7 +23,7 @@
 #include "executescriptplugin.h"
 
 #include <QApplication>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 #include <klocale.h>
 #include <kpluginfactory.h>
index 7534ea8..08035dd 100644 (file)
@@ -23,9 +23,9 @@
 #define KDEVPLATFORM_PLUGIN_EXTERNALSCRIPTPLUGIN_H
 
 #include <interfaces/iplugin.h>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 #include <KConfigGroup>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 
 class ExternalScriptItem;
 
index 70e9cae..8afbac7 100644 (file)
@@ -29,7 +29,7 @@
 
 #include <QStandardItemModel>
 #include <QSortFilterProxyModel>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <KMessageBox>
 #include <QMenu>
 
index e28118e..7095d2e 100644 (file)
@@ -13,14 +13,6 @@ set(kdevfiletemplates_PART_SRCS
     templateoptionspage.cpp
     templateselectionpage.cpp
     testcasespage.cpp
-
-    templatepreviewtoolview.ui
-    licensechooser.ui
-    newclass.ui
-    outputlocation.ui
-    overridevirtuals.ui
-    templateselection.ui
-    testcases.ui
 )
 
 kde4_add_plugin(kdevfiletemplates ${kdevfiletemplates_PART_SRCS})
@@ -63,7 +55,7 @@ DESTINATION ${DATA_INSTALL_DIR}/kdevcodegen/licenses
 ################
 
 set(test_srcs
-main.cpp
+    main.cpp
     templatepreview.cpp
 
     classidentifierpage.cpp
index 3ba2af8..21c268b 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <interfaces/iplugin.h>
 #include <interfaces/itemplateprovider.h>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 class KUrl;
 namespace KDevelop
index 9b22383..b60cdb4 100644 (file)
@@ -29,7 +29,7 @@
 #include <language/duchain/classfunctiondeclaration.h>
 
 #include <QTreeWidget>
-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 #include <QHeaderView>
 
 using namespace KDevelop;
index ea6b871..5fc1e01 100644 (file)
@@ -27,7 +27,7 @@
 #include <KIntNumInput>
 #include <KDebug>
 
-#include <QDomElement>
+#include <QtXml/qdom.h>
 #include <QGroupBox>
 #include <QVBoxLayout>
 #include <QFormLayout>
index 54ed596..4169b04 100644 (file)
@@ -21,7 +21,7 @@
 #define KDEVPLATFORM_PLUGIN_TEMPLATEOPTIONSPAGE_H
 
 #include <QWidget>
-#include <QVariantHash>
+#include <QtCore/qvariant.h>
 
 
 
index 745bf13..21bf213 100644 (file)
@@ -21,7 +21,7 @@
 #include "gitmessagehighlighter.h"
 
 #include <QtCore/QString>
-#include <QtGui/QTextCharFormat>
+#include <QtGui/qtextformat.h>
 #include <QtGui/QTextEdit>
 #include <KDE/KLocalizedString>
 
index 6c923bb..6223ffc 100644 (file)
 #include "grepoutputmodel.h"
 
 #include <QtGui/QPainter>
-#include <QtCore/QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QtGui/QTextDocument>
 #include <QtGui/QTextCursor>
 #include <QtGui/QAbstractTextDocumentLayout>
-#include <QtGui/QTextCharFormat>
+#include <QtGui/qtextformat.h>
 #include <QtCore/QRegExp>
 #include <KLocalizedString>
 #include <cmath>
index 0c9a8a2..443ddf3 100644 (file)
@@ -21,7 +21,7 @@
 #include <ktexteditor/document.h>
 #include <klocale.h>
 
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QTextDocument>
 #include <interfaces/icore.h>
 #include <interfaces/idocumentcontroller.h>
index 2efdd41..782c81e 100644 (file)
@@ -16,7 +16,7 @@
 #include <QFrame>
 #include <QLayout>
 #include <QVBoxLayout>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QApplication>
 #include <QUuid>
 
index fb4a564..3141d9d 100644 (file)
@@ -20,7 +20,7 @@
 
 #include "openwithplugin.h"
 
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
index 1a3c7c7..114eade 100644 (file)
@@ -22,7 +22,7 @@
 #define KDEVPLATFORM_PLUGIN_OPENWITHPLUGIN_H
 
 #include <interfaces/iplugin.h>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 #include <kservice.h>
 
 #include "iopenwith.h"
index aa1d872..6d39ba2 100644 (file)
@@ -19,7 +19,7 @@
  */
 
 #include "pastebinplugin.h"
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
index a0fb45c..9739a30 100644 (file)
@@ -34,7 +34,7 @@
 #include <interfaces/iuicontroller.h>
 
 #include <QApplication>
-#include <QTextCharFormat>
+#include <QtGui/qtextformat.h>
 #include <QWidget>
 #include <QTextDocument>
 #include <QPointer>
index 26d6a97..2cd04e4 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <QWidget>
 #include <QPointer>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <ui_patchreview.h>
 #include <interfaces/ipatchsource.h>
 
index 38bde4c..05e75e1 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <QMenu>
 #include <QCursor>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QSignalMapper>
 #include <QHeaderView>
 
index 677bded..a044b37 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef FILTERMODEL_H
 #define FILTERMODEL_H
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 
 #include "filter.h"
 
index ba94c0e..3a092c6 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <QLayout>
 #include <QStandardItemModel>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 
 #include <kpluginfactory.h>
 #include <KConfigDialogManager>
index cb1fa97..9f05cb1 100644 (file)
@@ -27,7 +27,7 @@
 
 #include "projectfilter.h"
 
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 namespace KDevelop {
 
index 264b9a4..1b28397 100644 (file)
@@ -26,7 +26,7 @@
 #include <QToolButton>
 #include <QItemSelectionModel>
 #include <QStringListModel>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QStandardItemModel>
 
 #include <kdebug.h>
index b54f46a..a39ef3b 100644 (file)
@@ -22,7 +22,7 @@
 #include "projectmanagerview.h"
 
 #include <QtGui/QHeaderView>
-#include <QtGui/QKeyEvent>
+#include <QtGui/qevent.h>
 
 #include <kiconloader.h>
 #include <kdebug.h>
index 49912b3..aff3735 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <QtGui/QHeaderView>
 #include <QtCore/QDebug>
-#include <QtGui/QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QApplication>
 #include <QAbstractProxyModel>
 #include <QItemDelegate>
index 585826a..c295226 100644 (file)
@@ -26,7 +26,7 @@
 #include <KLocalizedString>
 #include <QAbstractItemModel>
 #include <QDebug>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QIcon>
 
 using namespace KDevelop;
index 963fb7c..eb64ab8 100644 (file)
 
 #include "expandingdelegate.h"
 
-#include <QtGui/QTextLine>
+#include <QtGui/qtextlayout.h>
 #include <QtGui/QPainter>
 #include <QtGui/QBrush>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QTreeView>
 #include <QApplication>
 
@@ -49,7 +49,7 @@ if (option.showDecorationSelected && (option.state & QStyle::State_Selected)) {
         return option.palette.brush(cg, QPalette::Highlight).color();
     } else {
         QVariant value = index.data(Qt::BackgroundRole);
-        if (qVariantCanConvert<QBrush>(value))
+        if (value.canConvert<QBrush>())
            return qvariant_cast<QBrush>(value).color();
     }
     
index 7e97108..9894488 100644 (file)
@@ -24,8 +24,8 @@
 
 #include <QtGui/QItemDelegate>
 #include <QItemDelegate>
-#include <QtGui/QTextLine>
-#include <QModelIndex>
+#include <QtGui/qtextlayout.h>
+#include <QtCore/qabstractitemmodel.h>
 #include <QPoint>
 
 class KateRenderer;
index a09d2b0..fddcb33 100644 (file)
@@ -21,7 +21,7 @@
 #include "expandingwidgetmodel.h"
 
 #include <QTreeView>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QBrush>
 
 #include <ktexteditor/codecompletionmodel.h>
index 4c6eb99..0a8b656 100644 (file)
 #ifndef KDEVPLATFORM_PLUGIN_EXPANDING_WIDGET_MODEL_H
 #define KDEVPLATFORM_PLUGIN_EXPANDING_WIDGET_MODEL_H
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QtCore/QHash>
 #include <QIcon>
-#include <QPersistentModelIndex>
+
 #include <QPointer>
 
 class KWidget;
index f9a0ae3..0979e40 100644 (file)
@@ -19,7 +19,7 @@
 #ifndef KDEVPLATFORM_PLUGIN_QUICKOPENMODEL_H
 #define KDEVPLATFORM_PLUGIN_QUICKOPENMODEL_H
 
-#include <QMultiMap>
+#include <QtCore/qmap.h>
 #include <QString>
 #include <QAbstractItemModel>
 #include <QSet>
index 879193a..46e1625 100644 (file)
 #include <QtGui/QTreeView>
 #include <QtGui/QHeaderView>
 #include <QDialog>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QApplication>
 #include <QScrollBar>
 #include <QCheckBox>
 #include <QMetaObject>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 #include <kbuttongroup.h>
 #include <klocale.h>
index 4d7dbfa..bb53283 100644 (file)
@@ -19,7 +19,7 @@
  */
 
 #include "reviewboardplugin.h"
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 #include <KPluginFactory>
 #include <KPluginLoader>
index 1308e2e..1999426 100644 (file)
@@ -19,7 +19,7 @@
  */
 
 #include "reviewpatchdialog.h"
-#include <Qt>
+#include <QtCore/qnamespace.h>
 #include <QStandardItemModel>
 #include <QSortFilterProxyModel>
 #include <KDebug>
index ab77646..d0dfbe5 100644 (file)
@@ -12,7 +12,7 @@
 #ifndef __SNIPPET_H__
 #define __SNIPPET_H__
 
-#include <QStandardItem>
+#include <QtGui/qstandarditemmodel.h>
 
 class SnippetRepository;
 class KAction;
index b81c456..440cc52 100644 (file)
@@ -19,8 +19,8 @@
 #include <KIcon>
 #include <KDebug>
 
-#include <QDomDocument>
-#include <QDomElement>
+
+#include <QtXml/qdom.h>
 #include <KStandardDirs>
 
 #include <KMessageBox>
index 29971a9..5ae4a7d 100644 (file)
@@ -13,7 +13,7 @@
 #define __SNIPPETREPOSITORY_H__
 
 #include <QObject>
-#include <QStandardItem>
+#include <QtGui/qstandarditemmodel.h>
 #include <QStringList>
 
 class Snippet;
index d38311c..e3351d6 100644 (file)
@@ -11,7 +11,7 @@
 
 #include "snippetview.h"
 
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <KMenu>
 #include <KMessageBox>
 #include <KAction>
index e869cdb..690db5a 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <QAction>
 #include <QStackedWidget>
-#include <QStandardItem>
+#include <QtGui/qstandarditemmodel.h>
 #include <QItemDelegate>
 #include <QTreeView>
 
index c5e8120..c170875 100644 (file)
@@ -21,7 +21,7 @@
 #include "svnaddjob.h"
 #include "svnaddjob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <klocale.h>
 #include <kdebug.h>
index c67bfea..2fc9993 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "svnblamejob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <klocale.h>
 #include <kdebug.h>
index 049786d..ad34afa 100644 (file)
@@ -21,7 +21,7 @@
 #include "svncatjob.h"
 #include "svncatjob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <kdebug.h>
 #include <klocale.h>
index b71db9a..59c272e 100644 (file)
@@ -21,7 +21,7 @@
 #include "svncheckoutjob.h"
 #include "svncheckoutjob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <klocale.h>
 #include <kdebug.h>
index 54c0433..c03936b 100644 (file)
@@ -22,7 +22,7 @@
 #include "svncommitjob.h"
 #include "svncommitjob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <ThreadWeaver.h>
 #include <QStandardItemModel>
index 061245e..d22ea5b 100644 (file)
@@ -21,7 +21,7 @@
 #include "svncopyjob.h"
 #include "svncopyjob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <klocale.h>
 #include <kdebug.h>
index b316fbd..d608875 100644 (file)
@@ -21,7 +21,7 @@
 #include "svndiffjob.h"
 #include "svndiffjob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QWaitCondition>
 #include <QRegExp>
 #include <QStringList>
index 7ceb2e8..cad1ced 100644 (file)
@@ -21,7 +21,7 @@
 #include "svnimportjob.h"
 #include "svnimportjob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QFileInfo>
 
 #include <klocale.h>
index 06479d0..a4e1bea 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "svninfojob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <kdebug.h>
 #include <klocale.h>
index 576e9ad..5996569 100644 (file)
@@ -21,7 +21,7 @@
 #include "svnlogjob.h"
 #include "svnlogjob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <klocale.h>
 #include <kdebug.h>
index b06d70b..901768d 100644 (file)
@@ -21,7 +21,7 @@
 #include "svnmovejob.h"
 #include "svnmovejob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <klocale.h>
 #include <kdebug.h>
index c2692da..4eef628 100644 (file)
@@ -21,7 +21,7 @@
 #include "svnremovejob.h"
 #include "svnremovejob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <kdebug.h>
 #include <klocale.h>
index f725501..546b985 100644 (file)
@@ -21,7 +21,7 @@
 #include "svnrevertjob.h"
 #include "svnrevertjob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <kdebug.h>
 #include <klocale.h>
index 45553ba..0d83a2c 100644 (file)
@@ -9,7 +9,7 @@
  ***************************************************************************/
 
 #include "svnssldialog.h"
-#include <QtGui/QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 #include <klocale.h>
 
 #include "ui_ssltrustdialog.h"
index 78157d3..f859302 100644 (file)
@@ -22,7 +22,7 @@
 #include "svnstatusjob_p.h"
 
 #include <QFileInfo>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <klocale.h>
 #include <kurl.h>
index 9b742da..a8d3d18 100644 (file)
@@ -21,7 +21,7 @@
 #include "svnupdatejob.h"
 #include "svnupdatejob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QDateTime>
 
 #include <kdebug.h>
index e5c1837..dd04124 100644 (file)
@@ -23,7 +23,7 @@
 #include <interfaces/iplugin.h>
 #include <interfaces/contextmenuextension.h>
 
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 /**
  * @short Implements a context menu extension in an editor context which provides
index 841aaea..8048c1b 100644 (file)
@@ -47,7 +47,7 @@
 #include <KConfigGroup>
 
 #include <QStandardItemModel>
-#include <QStandardItem>
+#include <QtGui/qstandarditemmodel.h>
 #include <QHeaderView>
 #include <QVBoxLayout>
 
index 2287840..c82246a 100644 (file)
@@ -21,7 +21,7 @@
 #define KDEVPLATFORM_PLUGIN_TESTVIEWPLUGIN_H
 
 #include "interfaces/iplugin.h"
-#include <QtCore/QVariantList>
+#include <QtCore/qvariant.h>
 
 class TestToolViewFactory;
 
index c5143f0..482a44f 100644 (file)
@@ -23,7 +23,7 @@
 
 #include "projectexport.h"
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QStringList>
 
 class KConfigGroup;
index 75bcce5..0ea22b5 100644 (file)
@@ -39,7 +39,7 @@
 #include <KMessageBox>
 #include <kio/udsentry.h>
 #include <kio/netaccess.h>
-#include <QMetaClassInfo>
+#include <QtCore/qmetaobject.h>
 #include <QThread>
 
 #include "path.h"
index 7301b72..0a361be 100644 (file)
@@ -21,7 +21,7 @@
 #define KDEVELOP_PROJECT_PROJECTMODELTEST_INCLUDED
 
 #include <QtCore/QObject>
-#include <QtCore/QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 
 class ProjectProxyModel;
 namespace KDevelop
index efee498..2dd3cc7 100644 (file)
@@ -97,7 +97,8 @@ target_link_libraries(kdevplatformshell LINK_PRIVATE
 )
 set_target_properties(kdevplatformshell PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION})
 
-install(FILES
+install(
+    FILES
     mainwindow.h
     plugincontroller.h
     shellextension.h
@@ -119,7 +120,8 @@ install(FILES
     selectioncontroller.h
     runcontroller.h
     launchconfiguration.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/kdevplatform/shell COMPONENT Devel
+    DESTINATION ${INCLUDE_INSTALL_DIR}/kdevplatform/shell
+    COMPONENT Devel
 )
 
 install(TARGETS kdevplatformshell EXPORT KDevPlatformTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
index 21a72b7..aaca0aa 100644 (file)
@@ -23,7 +23,7 @@
 #include "sublime/holdupdates.h"
 #include "util/kdevstringhandler.h"
 
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QDebug>
 #include <QTimer>
 #include <QDeclarativeContext>
index e62bf94..f07717e 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <kcomponentdata.h>
 #include <core.h>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 namespace KDevelop
 {
index 4c56d93..e144bb6 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "debugcontroller.h"
 
-#include <QtCore/QMetaEnum>
+#include <QtCore/qmetaobject.h>
 
 #include <KDE/KLocale>
 #include <KDE/KDebug>
index 095e7dd..6922ec8 100644 (file)
@@ -24,8 +24,8 @@
 #ifndef KDEVPLATFORM_DEBUGCONTROLLER_H
 #define KDEVPLATFORM_DEBUGCONTROLLER_H
 
-#include <QtCore/QVariantList>
-#include <QWeakPointer>
+#include <QtCore/qvariant.h>
+#include <QtCore/qsharedpointer.h>
 #include <KDE/KXMLGUIClient>
 #include <KDE/KTextEditor/MarkInterface>
 
index 7091077..57070dc 100644 (file)
@@ -20,7 +20,7 @@
 #include "languagecontroller.h"
 
 #include <QHash>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <kmimetype.h>
 
index 98149e0..2e94296 100644 (file)
@@ -23,7 +23,7 @@
 #include <QtCore/QAbstractItemModel>
 #include <QtCore/QMap>
 #include <QtCore/QList>
-#include <QtGui/QItemEditorCreatorBase>
+#include <QtGui/qitemeditorfactory.h>
 
 #include <kdialog.h>
 #include <kcombobox.h>
index 431326e..14c92f2 100644 (file)
@@ -24,8 +24,8 @@ Boston, MA 02110-1301, USA.
 
 #include <QtCore/QHash>
 #include <QtGui/QDockWidget>
-#include <QtGui/QDragEnterEvent>
-#include <QtGui/QDropEvent>
+#include <QtGui/qevent.h>
+
 #include <QtGui/QMenuBar>
 #include <QtDBus/QDBusConnection>
 
index f036617..4df2feb 100644 (file)
@@ -11,7 +11,7 @@
 #include "openprojectpage.h"
 
 #include <QtCore/QDir>
-#include <QtCore/QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QHeaderView>
 
index b32353d..523a4b6 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <QFile>
 #include <QTimer>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QApplication>
 
 #include <kdebug.h>
index ab0cf62..9ac7df2 100644 (file)
@@ -29,7 +29,7 @@
  */
 
 #include "overlaywidget.h"
-#include <QResizeEvent>
+#include <QtGui/qevent.h>
 #include <QEvent>
 
 using namespace KDevelop;
index 548454d..e742d14 100644 (file)
@@ -38,7 +38,7 @@
 #include <KStandardGuiItem>
 
 #include <QApplication>
-#include <QCloseEvent>
+#include <QtGui/qevent.h>
 #include <QEvent>
 #include <QFrame>
 #include <QLabel>
index c7343e1..2248404 100644 (file)
@@ -24,7 +24,7 @@
 #include <QString>
 #include <QMap>
 #include <QHash>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 #include <QPointer>
 namespace Akonadi {
 class AgentInstance;
index 92e024e..5e9f02e 100644 (file)
@@ -46,7 +46,7 @@
 #include <QFrame>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QProgressBar>
 #include <QPushButton>
 #include <QStackedWidget>
index 59b3ad0..d78b702 100644 (file)
@@ -31,6 +31,7 @@
 #include <QFileInfo>
 #include <QtDBus/QtDBus>
 #include <QStandardItemModel>
+#include <QTimer>
 
 #include <kconfig.h>
 #include <kconfiggroup.h>
index 5865364..007562a 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <QLabel>
 #include <QListWidget>
-#include <QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 #include <QVBoxLayout>
 
 #include <klocale.h>
index ca32a2c..efe1e48 100644 (file)
@@ -29,7 +29,7 @@
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <QListView>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 
 using namespace KDevelop;
 
index 500e9f6..55a6afd 100644 (file)
@@ -21,7 +21,7 @@ Boston, MA 02110-1301, USA.
 #define KDEVPLATFORM_SESSIONDIALOG_H
 
 #include <kdialog.h>
-#include <QtCore/QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 
 namespace Ui
 {
index 4123292..93b5121 100644 (file)
@@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA.
 #include "environmentgroupmodel.h"
 #include <QtCore/QVariant>
 #include <QtCore/QStringList>
-#include <QtCore/QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 
 #include <kdebug.h>
 #include <KLocalizedString>
index 3f6e823..bc7f4c3 100644 (file)
@@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA.
 #ifndef KDEVPLATFORM_ENVIRONMENTGROUPMODEL_H
 #define KDEVPLATFORM_ENVIRONMENTGROUPMODEL_H
 
-#include <QtCore/QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QtCore/QStringList>
 #include "util/environmentgrouplist.h"
 
index 46889ab..206b761 100644 (file)
@@ -21,7 +21,7 @@ Boston, MA 02110-1301, USA.
 
 #include <QVBoxLayout>
 #include <QList>
-#include <QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 #include <QInputDialog>
 #include <KMessageBox>
 #include <KIconLoader>
index 0ac9508..a021ad8 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef KDEVPLATFORM_STATUSBAR_H
 #define KDEVPLATFORM_STATUSBAR_H
 
-#include <QtCore/QTime>
+#include <QtCore/qdatetime.h>
 #include <QtCore/QMap>
 
 #include <KDE/KStatusBar>
index 3abaa5c..5c7551b 100644 (file)
@@ -18,7 +18,7 @@
 
 #include "workingsetfilelabel.h"
 
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 using namespace KDevelop;
 
index d3c0a22..c42963d 100644 (file)
@@ -19,7 +19,7 @@
 #include "workingsettoolbutton.h"
 
 #include <QMenu>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 
 #include <KLocalizedString>
 #include <KColorUtils>
index 0fd0a30..1e356d4 100644 (file)
@@ -18,7 +18,7 @@
  ***************************************************************************/
 #include "aggregatemodel.h"
 
-#include <QStandardItem>
+#include <QtGui/qstandarditemmodel.h>
 #include <QStandardItemModel>
 
 #include <kdebug.h>
index dfeae3f..251807b 100644 (file)
@@ -19,7 +19,7 @@
 #ifndef KDEVPLATFORM_SUBLIMEAREAINDEX_H
 #define KDEVPLATFORM_SUBLIMEAREAINDEX_H
 
-#include <QtCore/Qt>
+#include <QtCore/qnamespace.h>
 #include <QtCore/QList>
 
 #include <KDE/KConfigGroup>
index e7bee6e..e0df641 100644 (file)
@@ -23,7 +23,7 @@
 #include <QtGui/QLabel>
 #include <QtGui/QStylePainter>
 #include <QtGui/QStackedWidget>
-#include <QtGui/QStyleOptionTabBarBase>
+#include <QtGui/qstyleoption.h>
 #include <QtGui/QToolButton>
 #include <QtGui/qstyle.h>
 
@@ -43,7 +43,7 @@
 #include "view.h"
 #include "document.h"
 #include <QEvent>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include "urldocument.h"
 #include <ksqueezedtextlabel.h>
 
index f6bb6aa..6fe6a72 100644 (file)
@@ -21,7 +21,7 @@
 #include <QMap>
 #include <QList>
 #include <QEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QApplication>
 
 #include <kdebug.h>
index 7cf0145..4521548 100644 (file)
@@ -24,7 +24,7 @@
 #define SUBLIME_IDEAL_H
 
 #include <QtGui/QAction>
-#include <QtGui/QActionEvent>
+#include <QtGui/qevent.h>
 #include <QtGui/QToolButton>
 #include <QtGui/QDockWidget>
 #include <QtGui/QStyleOption>
index 31da011..7289875 100644 (file)
@@ -49,7 +49,7 @@ IdealDockWidget::IdealDockWidget(IdealController *controller, Sublime::MainWindo
             this, SLOT(contextMenuRequested(QPoint)));
 
     QAbstractButton *closeButton =
-    qFindChild<QAbstractButton *>(this, QLatin1String("qt_dockwidget_closebutton"));
+    this->findChild<QAbstractButton *>(QLatin1String("qt_dockwidget_closebutton"));
 
     if (closeButton) {
     disconnect(closeButton, SIGNAL(clicked()), 0, 0);
index a874569..1b4167e 100644 (file)
@@ -254,7 +254,7 @@ void MainWindow::loadSettings()
     // What follows is copy-paste from applyMainWindowSettings.  Unfortunately,
     // we don't really want that one to try restoring window size, and we also
     // cannot stop it from doing that in any clean way.
-    QStatusBar* sb = qFindChild<KStatusBar *>(this);
+    QStatusBar* sb = this->findChild<KStatusBar *>();
     if (sb) {
         QString entry = cg.readEntry("StatusBar", "Enabled");
         if ( entry == "Disabled" )
@@ -263,7 +263,7 @@ void MainWindow::loadSettings()
            sb->show();
     }
 
-    QMenuBar* mb = qFindChild<KMenuBar *>(this);
+    QMenuBar* mb = this->findChild<KMenuBar *>();
     if (mb) {
         QString entry = cg.readEntry ("MenuBar", "Enabled");
         if ( entry == "Disabled" )
index f1139f1..d618a8b 100644 (file)
@@ -19,8 +19,8 @@
 #ifndef KDEVPLATFORM_SUBLIMESUBLIMEDEFS_H
 #define KDEVPLATFORM_SUBLIMESUBLIMEDEFS_H
 
-#include <QtCore/Qt>
-#include <QtCore/QFlags>
+#include <QtCore/qnamespace.h>
+#include <QtCore/qglobal.h>
 
 #include "sublimeexport.h"
 
index a25006b..da31364 100644 (file)
@@ -19,7 +19,7 @@
 #include "aggregatemodeltest.h"
 
 #include <QtTest/QtTest>
-#include <QStandardItem>
+#include <QtGui/qstandarditemmodel.h>
 #include <QStandardItemModel>
 
 #include <sublime/aggregatemodel.h>
index 13a0708..92fbf15 100644 (file)
@@ -23,7 +23,7 @@
 #include <QListView>
 #include <QTextEdit>
 #include <QDockWidget>
-#include <QFocusEvent>
+#include <QtGui/qevent.h>
 
 #include <sublime/view.h>
 #include <sublime/area.h>
index 1a33fc6..e545c94 100644 (file)
@@ -24,7 +24,7 @@
 #include <grantlee/filter.h>
 
 #include <QObject>
-#include <QtPlugin>
+#include <QtCore/qplugin.h>
 
 namespace KDevelop {
 
index 77eab87..15009fb 100644 (file)
@@ -19,7 +19,7 @@
 #ifndef KDEVPLATFORM_TESTSUITE_H
 #define KDEVPLATFORM_TESTSUITE_H
 
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 #include "delayedoutput.h"
 #include <language/duchain/types/abstracttype.h>
 #include <QDebug>
index fe1634e..993ae2b 100644 (file)
@@ -391,27 +391,27 @@ void ModelTest::data()
     // General Purpose roles that should return a QString
     QVariant variant = model->data(model->index(0, 0), Qt::ToolTipRole);
     if (variant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QString>(variant));
+        Q_ASSERT(variant.canConvert<QString>());
     }
     variant = model->data(model->index(0, 0), Qt::StatusTipRole);
     if (variant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QString>(variant));
+        Q_ASSERT(variant.canConvert<QString>());
     }
     variant = model->data(model->index(0, 0), Qt::WhatsThisRole);
     if (variant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QString>(variant));
+        Q_ASSERT(variant.canConvert<QString>());
     }
 
     // General Purpose roles that should return a QSize
     variant = model->data(model->index(0, 0), Qt::SizeHintRole);
     if (variant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QSize>(variant));
+        Q_ASSERT(variant.canConvert<QSize>());
     }
 
     // General Purpose roles that should return a QFont
     QVariant fontVariant = model->data(model->index(0, 0), Qt::FontRole);
     if (fontVariant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QFont>(fontVariant));
+        Q_ASSERT(fontVariant.canConvert<QFont>());
     }
 
     // Check that the alignment is one we know about
@@ -424,12 +424,12 @@ void ModelTest::data()
     // General Purpose roles that should return a QColor
     QVariant colorVariant = model->data(model->index(0, 0), Qt::BackgroundColorRole);
     if (colorVariant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QColor>(colorVariant));
+        Q_ASSERT(colorVariant.canConvert<QColor>());
     }
 
     colorVariant = model->data(model->index(0, 0), Qt::TextColorRole);
     if (colorVariant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QColor>(colorVariant));
+        Q_ASSERT(colorVariant.canConvert<QColor>());
     }
 
     // Check that the "check state" is one we know about.
index 5e028d7..773f848 100644 (file)
@@ -23,7 +23,7 @@
 #include "testproject.h"
 
 #include <KTemporaryFile>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QTest>
 
 #include <language/duchain/duchainlock.h>
index 0bbf163..de9d684 100644 (file)
@@ -24,7 +24,7 @@
 #include <QPalette>
 #include <QApplication>
 #include <QEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <limits>
 #include <kdebug.h>
 #include <qdesktopwidget.h>
index 0de7882..c9a8914 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "autoorientedsplitter.h"
 
-#include <QResizeEvent>
+#include <QtGui/qevent.h>
 
 using namespace KDevelop;
 
index dfa5a2c..abb8299 100644 (file)
@@ -21,7 +21,7 @@
 #define KDEVPLATFORM_MAIN_H
 
 #include <QObject>
-#include <QAtomicInt>
+#include <QtCore/qatomic.h>
 #include <language/duchain/topducontext.h>
 
 namespace KDevelop {
index e031912..5bd55d3 100644 (file)
@@ -23,7 +23,7 @@
  
 #include <QPushButton>
 #include <QString>
-#include <QStyleOptionButton>
+#include <QtGui/qstyleoption.h>
 #include "utilexport.h"
  
 namespace KDevelop {
index cbdb904..fd2f340 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef KDEVPLATFORM_SPINLOCK_H
 #define KDEVPLATFORM_SPINLOCK_H
 
-#include <QAtomicInt>
+#include <QtCore/qatomic.h>
 #include <QMutex>
 #include <QWaitCondition>
 #include <sys/time.h>
index 0749c02..f2c5fb0 100644 (file)
@@ -20,7 +20,7 @@
 
 #include "vcseventmodel.h"
 
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QVariant>
 #include <QDateTime>
 #include <QList>
@@ -165,7 +165,7 @@ void VcsEventModel::jobReceivedResults(KJob* job)
     QList<KDevelop::VcsEvent> newevents;
     foreach( const QVariant &v, l )
     {
-        if( qVariantCanConvert<KDevelop::VcsEvent>( v ) )
+        if( v.canConvert<KDevelop::VcsEvent>( ) )
         {
             newevents << qvariant_cast<KDevelop::VcsEvent>( v );
         }
index 5c9413e..906edbd 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef KDEVPLATFORM_VCSEVENTMODEL_H
 #define KDEVPLATFORM_VCSEVENTMODEL_H
 
-#include <QtCore/QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 
 #include "../vcsexport.h"
 
index 1df7948..5f8b863 100644 (file)
@@ -20,7 +20,7 @@
 
 #include "vcsitemeventmodel.h"
 
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QVariant>
 #include <QList>
 
index f09b3c3..99c2190 100644 (file)
@@ -24,8 +24,8 @@
 #include <KDebug>
 #include <KZip>
 
-#include <QDomDocument>
-#include <QXmlStreamReader>
+#include <QtXml/qdom.h>
+#include <QtCore/qxmlstream.h>
 
 using namespace KFileMetaData;
 
index 16b8485..644ce33 100644 (file)
@@ -23,8 +23,8 @@
 #include <KDebug>
 #include <KZip>
 
-#include <QDomDocument>
-#include <QXmlStreamReader>
+#include <QtXml/qdom.h>
+#include <QtCore/qxmlstream.h>
 
 using namespace KFileMetaData;
 
index 87a44e7..8110e7d 100644 (file)
@@ -34,8 +34,8 @@
 #include <QFrame>
 #include <QHBoxLayout>
 #include <QGridLayout>
-#include <QKeyEvent>
-#include <QCloseEvent>
+#include <QtGui/qevent.h>
+
 #include <QtDBus/QtDBus>
 #include <kconfig.h>
 
index d3fd1fb..25e6223 100644 (file)
@@ -25,8 +25,8 @@
 #define FloppyData_included
 
 #include <kdialog.h>
-#include <QKeyEvent>
-#include <QCloseEvent>
+#include <QtGui/qevent.h>
+
 #include <kconfig.h>
 
 class QCheckBox;
index 1e345f8..73f6a9f 100644 (file)
@@ -16,7 +16,7 @@
 #define KGPGKEY_H
 
 #include <gpgme.h>
-#include <QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 #include <QSharedData>
 #include <QPointer>
 #include <QObject>
index d79b40d..84b04bf 100644 (file)
@@ -29,8 +29,8 @@
 
 #include <KLocale>
 #include <KMessageBox>
-#include <QDragEnterEvent>
-#include <QDropEvent>
+#include <QtGui/qevent.h>
+
 #include <QFile>
 #include <QTextCodec>
 #include <QTextStream>
index ada0819..74a4458 100644 (file)
@@ -27,8 +27,8 @@
 #include <KConfigGroup>
 #include <KLocale>
 #include <KMessageBox>
-#include <QDragMoveEvent>
-#include <QDropEvent>
+
+#include <QtGui/qevent.h>
 #include <QHeaderView>
 
 KeyTreeView::KeyTreeView(QWidget *parent, KeyListProxyModel *model)
index b63b10e..2214f48 100644 (file)
@@ -24,7 +24,7 @@
 #include <KLocale>
 #include <KMessageBox>
 #include <QGroupBox>
-#include <QIntValidator>
+#include <QtGui/qvalidator.h>
 #include <QLabel>
 #include <QVBoxLayout>
 #include <QWhatsThis>
index 749fa00..6ee27b5 100644 (file)
@@ -25,7 +25,7 @@
 #include "core/images.h"
 
 #include <KLocale>
-#include <QDate>
+#include <QtCore/qdatetime.h>
 
 using namespace KgpgCore;
 
index 604fbdd..1fd09be 100644 (file)
@@ -17,7 +17,7 @@
 #include "core/kgpgkey.h"
 #include "core/KGpgKeyNode.h"
 
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 
 KGpgDelUid::KGpgDelUid(QObject *parent, const KGpgSignableNode *uid)
        : KGpgUidTransaction(parent, uid->getParentKeyNode()->getId(), uid->getId()),
index 5d499d7..2c023dc 100644 (file)
@@ -26,7 +26,7 @@
 #include <QByteArray>
 #include <QPointer>
 #include <QStringList>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 #include <QWidget>
 
 class KGpgTransactionPrivate {
index e6208e4..5e9ef1d 100644 (file)
@@ -23,7 +23,7 @@
 #define MIXER_BACKEND_H
 
 #include <QString>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QTimer>
 
 //#include "core/mixer.h"
index ef61dcb..307243f 100644 (file)
@@ -25,7 +25,7 @@
 #include <QString>
 #include <QtDBus>
 #include <QDBusInterface>
-#include <QDBusPendingCallWatcher>
+#include <QtDBus/qdbuspendingcall.h>
 #include <QMap>
 #include <QMutex>
 #include <QWaitCondition>
index 75464f0..ba6da22 100644 (file)
@@ -20,7 +20,7 @@
 #include "ControlManager.h"
 #include "core/GlobalConfig.h"
 
-#include <QMutableListIterator>
+#include <QtCore/qlist.h>
 
 #include <KDebug>
 
index c561f3e..2fc7ab5 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef GLOBALCONFIG_H
 #define GLOBALCONFIG_H
 
-#include <Qt>
+#include <QtCore/qnamespace.h>
 #include <QSet>
 
 #include <KConfigSkeleton>
index 3a60f46..cdb178f 100644 (file)
@@ -32,7 +32,7 @@ class QScrollArea;
 class QVBoxLayout;
 
 // QT DND
-#include <QDragEnterEvent>
+#include <QtGui/qevent.h>
 #include <QMimeData>
 
 // KDE
index 1f3ed21..4dde3e7 100644 (file)
@@ -30,9 +30,9 @@
 #include <qpainter.h>
 #include <QColor>
 #include <qbrush.h>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <qstyle.h>
-#include <QStyleOptionSlider>
+#include <QtGui/qstyleoption.h>
 
 #include "kglobalsettings.h"
 #include "core/mixer.h"
index b4102dd..ae3caf1 100644 (file)
@@ -39,7 +39,7 @@
 // Qt
 #include <QCursor>
 #include <QLabel>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QObject>
 #include <QBoxLayout>
 
index 3764dc8..697873d 100644 (file)
@@ -36,7 +36,7 @@
 #include <QObject>
 #include <qcursor.h>
 #include <QCheckBox>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QLabel>
 #include <qpixmap.h>
 #include <qwmatrix.h>
index 3a922f0..ab1b828 100644 (file)
@@ -21,7 +21,7 @@
 //
 //#include <qcursor.h>
 //#include <QLabel>
-//#include <QMouseEvent>
+//#include <QtGui/qevent.h>
 //#include <QObject>
 //
 //#include <klocale.h>
index ae5c224..22eaaa5 100644 (file)
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 
 #include <qcursor.h>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <qpixmap.h>
 #include <qwmatrix.h>
 
index bcd76da..1ba1581 100644 (file)
@@ -23,7 +23,7 @@
 
 // QT
 #include <qcursor.h>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 // KDE
 #include <kaction.h>
index f214b62..0a53661 100644 (file)
@@ -1,8 +1,5 @@
 project(kolourpaint)
 
-find_package(KDE4 4.14.3 REQUIRED)
-include(KDE4Defaults)
-
 find_package(QImageBlitz REQUIRED)
 add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 
index aa9031b..b5ec76d 100644 (file)
@@ -34,7 +34,7 @@
 
 #include <climits>
 
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 
 //---------------------------------------------------------------------
 
index fa29f5b..35a2fe7 100644 (file)
@@ -42,7 +42,7 @@
 
 
 #if DEBUG_KP_EFFECT_BLUR_SHARPEN
-    #include <QTime>
+    #include <QtCore/qdatetime.h>
 #endif
 
 
index 2870a19..92200f6 100644 (file)
@@ -30,7 +30,7 @@
 #define kpPreeditText_H
 
 #include <QColor>
-#include <QInputMethodEvent>
+#include <QtGui/qevent.h>
 #include <QPoint>
 
 class kpPreeditText
index 94a8ec9..42ef300 100644 (file)
@@ -39,7 +39,7 @@
 #include <QFont>
 #include <QList>
 #include <QPainter>
-#include <QTextCharFormat>
+#include <QtGui/qtextformat.h>
 
 #include <KDebug>
 
index ce0b0ec..9b4390e 100644 (file)
@@ -29,6 +29,7 @@
 #include <kpTextStyle.h>
 
 #include <qdatastream.h>
+#include <qrect.h>
 #include <qfont.h>
 #include <qfontmetrics.h>
 
index f5f088f..fb28078 100644 (file)
 
 #include <kpColorCellsBase.h>
 
-#include <QDragEnterEvent>
-#include <QDragMoveEvent>
-#include <QDropEvent>
+#include <QtGui/qevent.h>
+
+
 #include <QHeaderView>
 #include <QItemDelegate>
-#include <QMouseEvent>
+
 #include <QPainter>
 #include <QImage>
 
index 83f106c..90a71f6 100644 (file)
@@ -40,7 +40,7 @@
 #include <kpView.h>
 #include <kpViewManager.h>
 
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QApplication>
 #include <QClipboard>
 
index 9532561..604b621 100644 (file)
@@ -39,8 +39,8 @@
 #include <KDebug>
 #endif
 
-#include <QKeyEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
+
 
 #include <kpTool.h>
 
index 5546809..61780a7 100644 (file)
@@ -34,8 +34,8 @@
 #include <kpViewPrivate.h>
 
 #include <QPainter>
-#include <QPaintEvent>
-#include <QTime>
+#include <QtGui/qevent.h>
+#include <QtCore/qdatetime.h>
 #include <QScrollBar>
 
 #include <KDebug>
index 72d8259..af8da8a 100644 (file)
@@ -31,8 +31,8 @@
 
 #include <kpColorCells.h>
 
-#include <QContextMenuEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
+
 #include <QScrollBar>
 
 #include <KColorDialog>
index b5c7366..5c53a64 100644 (file)
@@ -32,7 +32,7 @@
 #include <kpDualColorButton.h>
 
 #include <QBitmap>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QPainter>
 
 #include <KColorDialog>
index 3f8af8b..60ef923 100644 (file)
@@ -31,8 +31,8 @@
 
 #include <kpTransparentColorCell.h>
 
-#include <QContextMenuEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
+
 #include <QPainter>
 
 #include <KIconLoader>
index f883b3b..891d623 100644 (file)
@@ -32,8 +32,8 @@
 #include <kpColorToolBar.h>
 
 #include <QBoxLayout>
-#include <QDragEnterEvent>
-#include <QDragMoveEvent>
+#include <QtGui/qevent.h>
+
 
 #include <KColorMimeData>
 #include <kdebug.h>
index 22672d3..072675e 100644 (file)
@@ -34,7 +34,7 @@
 #include <qbitmap.h>
 #include <qcolor.h>
 #include <qevent.h>
-#include <QHelpEvent>
+#include <QtGui/qevent.h>
 #include <qimage.h>
 #include <qpainter.h>
 #include <qpixmap.h>
index eb08329..7cf58ce 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <QtGui/QSplitter>
 #include <QtGui/QTreeWidget>
-#include <QtGui/QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 
 #include <kparts/part.h>
 #include <kompare.h>
index 0c4d3dd..cc985ca 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <kparts/factory.h>
 #include <kparts/part.h>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 #include <kompare.h>
 
 #include "kompareinterface.h"
index 7210b81..2b6f79a 100644 (file)
@@ -24,9 +24,9 @@
 #include <QtGui/QPixmap>
 #include <QtGui/QStyle>
 #include <QtCore/QTimer>
-#include <QtGui/QPaintEvent>
+#include <QtGui/qevent.h>
 #include <QFrame>
-#include <QtGui/QMouseEvent>
+
 
 #include <kdebug.h>
 
index 03eb746..9e67581 100644 (file)
@@ -22,8 +22,8 @@
 
 #include <QtGui/QWidget>
 #include <QtGui/QSplitter>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QMouseEvent>
+#include <QtGui/qevent.h>
+
 #include <QVBoxLayout>
 #include <QtGui/QLabel>
 
index 759d96a..2a47584 100644 (file)
@@ -23,9 +23,9 @@
 #include <QtGui/QPainter>
 #include <QtCore/QRegExp>
 #include <QtCore/QTimer>
-#include <QtGui/QResizeEvent>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QWheelEvent>
+
+
+#include <QtGui/qevent.h>
 #include <QtGui/QScrollBar>
 
 #include <kdebug.h>
index 7c5c26c..128d529 100644 (file)
 
 #include <QHash>
 #include <QLabel>
-#include <QResizeEvent>
-#include <QWheelEvent>
+
+#include <QtGui/qevent.h>
 #include <QVBoxLayout>
-#include <QMouseEvent>
+
 #include <QFrame>
 #include <QTreeWidget>
 #include <QStyledItemDelegate>
index 4ea8930..f13243a 100644 (file)
 #include <QtGui/QApplication>
 #include <QtGui/QPainter>
 #include <QtGui/QPixmap>
-#include <QtGui/QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QtGui/QGridLayout>
-#include <QtGui/QResizeEvent>
-#include <QtCore/QChildEvent>
+
+#include <QtCore/qcoreevent.h>
 #include <QtCore/QEvent>
-#include <QtGui/QWheelEvent>
+
 
 // kde
 #include <kdebug.h>
index 949c493..f5e76f1 100644 (file)
@@ -16,7 +16,7 @@
 **
 ***************************************************************************/
 #include "kompareurldialog.h"
-#include <QShowEvent>
+#include <QtGui/qevent.h>
 
 #include <QGroupBox>
 
index 0b51563..050cae0 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <KConfigGroup>
 
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QWidget>
 
 class KPushButton;
index 21ed3b7..eb345ed 100644 (file)
@@ -30,7 +30,7 @@
 
 #include <KDialog>
 
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 
 #include <QSize>
 
index d04b7c3..e04c2ec 100644 (file)
@@ -31,7 +31,7 @@
 #include <QApplication>
 #include <QBitmap>
 #include <QDesktopWidget>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QPainter>
 #include <QTimer>
 
index 5e78fca..bf3ced7 100644 (file)
@@ -25,7 +25,7 @@
 #include "approvermanager.h"
 #include "approver.h"
 
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 #include <QDBusConnection>
 
 #include <KApplication>
index afc4531..9a54011 100644 (file)
@@ -30,7 +30,7 @@
 #include <KAboutData>
 #include <KDebug>
 
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 int main(int argc, char **argv)
 {
index 7f15bb1..e3a9266 100644 (file)
@@ -140,7 +140,7 @@ private:
 
 #include <QApplication>
 #include <QDesktopWidget>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 class MinimizePixel : public QWidget
 {
index 329b02a..39bd813 100644 (file)
@@ -24,7 +24,7 @@
 #include "nxresumesessions.h"
 
 #include <QTreeWidget>
-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 #include <QVBoxLayout>
 
 #include <KTitleWidget>
index 6a975f7..345573d 100644 (file)
@@ -30,7 +30,7 @@
 #include "nxhostpreferences.h"
 #include "nxresumesessions.h"
 
-#include <QX11EmbedContainer>
+#include <QtGui/qx11embed_x11.h>
 
 #define TCP_PORT_NX 22
 
index 3e6bb97..cbedf15 100644 (file)
@@ -33,7 +33,7 @@
 #include <KShell>
 #include <KLocale>
 
-#include <QX11EmbedContainer>
+#include <QtGui/qx11embed_x11.h>
 #include <QEvent>
 
 RdpView::RdpView(QWidget *parent,
index d7f1d84..6bb2ac6 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef REMOTEDESKTOPSMODEL_H
 #define REMOTEDESKTOPSMODEL_H
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <KDateTime>
 
 #ifdef BUILD_ZEROCONF
index e85898e..ca2e8e4 100644 (file)
@@ -28,7 +28,7 @@
 #include <netinet/tcp.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QThreadStorage>
 #include <QTimer>
 
index a1e0b0a..6f1630d 100644 (file)
@@ -26,7 +26,7 @@
 #include <QApplication>
 #include <QImage>
 #include <QPainter>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 #ifdef QTONLY
     #include <QMessageBox>
index d018c6a..2935bf0 100644 (file)
@@ -28,7 +28,7 @@
 #include <QtCore/QMap>
 #include <QtCore/QObject>
 #include <QtCore/QSharedPointer>
-#include <QtCore/QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 #include <QtGui/QWidget>
 
index 11ab081..190354e 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <kdemacros.h>
 
-#include <QtCore/QVariantList>
+#include <QtCore/qvariant.h>
 
 #include <QtGui/QWidget>
 
index 07a66f7..be96de5 100644 (file)
@@ -21,7 +21,7 @@
 
 #include <QPainter>
 #include <QPaintEngine>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QToolTip>
index 494540f..e05db5d 100644 (file)
@@ -31,7 +31,7 @@
 #include <KGlobalSettings>
 #include <kio/netaccess.h>
 
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QPixmap>
 #include <QDesktopWidget>
 
index 24abed0..7d69253 100644 (file)
 #include <QMenu>
 #include <QDesktopWidget>
 #include <QVarLengthArray>
-#include <QCloseEvent>
+#include <QtGui/qevent.h>
 #include <QDrag>
-#include <QMouseEvent>
+
 #include <QPainter>
-#include <QtCore/QXmlStreamReader>
+#include <QtCore/qxmlstream.h>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusConnectionInterface>
 #include <QtDBus/QDBusInterface>
index f2f4526..c377c4b 100644 (file)
@@ -21,7 +21,7 @@
 #include "ksnapshotpreview.h"
 
 #include <QPainter>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QPixmap>
 
 #include <KDebug>
index e254be5..09509a2 100644 (file)
@@ -19,7 +19,7 @@
 #include "regiongrabber.h"
 
 #include <QPainter>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QToolTip>
index 843f06d..ecc5a8f 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "snapshottimer.h"
 #include <QPainter>
-#include <QPaintEvent>
+#include <QtGui/qevent.h>
 #include <QToolTip>
 #include <QApplication>
 #include <QDesktopWidget>
index 68f737f..6a8be02 100644 (file)
@@ -30,8 +30,8 @@
 #include <QPainter>
 #include <QPixmap>
 #include <QPoint>
-#include <QMouseEvent>
-#include <QWheelEvent>
+
+#include <QtGui/qevent.h>
 
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>
index ad467ab..f8ece69 100644 (file)
@@ -23,7 +23,7 @@
 
 //Qt includes
 
-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 
 
 #include <QBrush>
index e13eae9..a6a5b5f 100644 (file)
@@ -23,7 +23,7 @@
 #define LOG_VIEW_WIDGET_ITEM_H
 
 
-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 
 
 #include "globals.h"
index 3f4120f..e3f97bc 100644 (file)
@@ -23,8 +23,8 @@
 
 #include <QWidget>
 
-#include <QDropEvent>
-#include <QDragEnterEvent>
+
+#include <QtGui/qevent.h>
 #include <QFileInfo>
 
 #include <QPushButton>
index 8369344..0e44c18 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <QString>
 #include <QStringList>
-#include <QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 
 #include <QPushButton>
 
index e3a29de..3f1a3e9 100644 (file)
@@ -24,7 +24,7 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QComboBox>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 #include <kicon.h>
 #include <kglobal.h>
index 4449edf..c1172fd 100644 (file)
         <property name="whatsThis">
          <string>This number is how many seconds are left for the selected countdown.</string>
         </property>
-        <property name="numDigits">
+        <property name="digitCount">
          <number>6</number>
         </property>
        </widget>
index 9ae112f..74c5386 100644 (file)
@@ -22,7 +22,7 @@
 #define ABSTRACTUI_H
 
 #include <QObject>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 //#include "message.h"
 
 class MessageFilter;
index 979def5..a34b530 100644 (file)
@@ -22,7 +22,7 @@
 
 // TODO: support system application proxy (new in Qt 4.6)
 
-#include <QtEndian>
+#include <QtCore/qendian.h>
 
 #ifdef HAVE_SSL
     #include <QSslSocket>
index 22c2ee7..64fe12b 100644 (file)
@@ -24,7 +24,7 @@
 #include <QCoreApplication>
 #include <QNetworkProxy>
 #include <QUuid>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 
 #include <KLocale>
 
index 2741f4f..72e2b62 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef COREACCOUNTMODEL_H_
 #define COREACCOUNTMODEL_H_
 
-#include <QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QUuid>
 
 #include "coreaccount.h"
index a536fe1..5655d80 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef ALIASMANAGER_H
 #define ALIASMANAGER_H
 
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 
 #include "bufferinfo.h"
 #include "syncableobject.h"
index ebddf1c..d81a75d 100644 (file)
@@ -20,7 +20,7 @@
 
 #include "basichandler.h"
 
-#include <QMetaMethod>
+#include <QtCore/qmetaobject.h>
 
 #include <KDebug>
 
index bf57790..8f31e89 100644 (file)
@@ -25,7 +25,7 @@
 #include <QString>
 #include <QStringList>
 #include <QHash>
-#include <QGenericArgument>
+#include <QtCore/qobjectdefs.h>
 
 class BasicHandler : public QObject
 {
index e3b2980..98e927a 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef EVENTMANAGER_H
 #define EVENTMANAGER_H
 
-#include <QMetaEnum>
+#include <QtCore/qmetaobject.h>
 
 #include "types.h"
 
index d59afe5..111227b 100644 (file)
@@ -20,8 +20,8 @@
 
 #include "identity.h"
 
-#include <QMetaProperty>
-#include <QVariantMap>
+#include <QtCore/qmetaobject.h>
+#include <QtCore/qvariant.h>
 #include <QString>
 
 #include <KLocale>
index 4eb5bfe..5007acf 100644 (file)
@@ -24,8 +24,8 @@
 #include "ircuser.h"
 #include "util.h"
 
-#include <QMapIterator>
-#include <QHashIterator>
+#include <QtCore/qmap.h>
+#include <QtCore/qhash.h>
 #include <QTextCodec>
 
 #include <KDebug>
index 693ed9c..16aed34 100644 (file)
@@ -25,7 +25,7 @@
 #include <QSet>
 #include <QString>
 #include <QStringList>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 
 #include "syncableobject.h"
 
index 3424a63..e7accfa 100644 (file)
@@ -24,7 +24,7 @@
 #include <QSet>
 #include <QString>
 #include <QStringList>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 #include <QDateTime>
 
 #include "syncableobject.h"
index b821052..77949a4 100644 (file)
@@ -26,7 +26,7 @@
 #include <QList>
 #include <QNetworkProxy>
 #include <QHash>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 #include <QPointer>
 #include <QMutex>
 #include <QByteArray>
index 82a4b8d..d327acf 100644 (file)
@@ -22,7 +22,7 @@
 #define NETWORKEVENT_H
 
 #include <QStringList>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 #include "event.h"
 #include "network.h"
index 1123107..46b43d7 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <QByteArray>
 #include <QDateTime>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 namespace Protocol {
 
index 524c354..44d9ff9 100644 (file)
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QtEndian>
+#include <QtCore/qendian.h>
 #include <QDataStream>
 #include <QHostAddress>
 #include <QTcpSocket>
index d311d20..3e895c9 100644 (file)
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QtEndian>
+#include <QtCore/qendian.h>
 
 #include <QHostAddress>
 #include <QTimer>
index 296e26f..2185fd4 100644 (file)
@@ -20,8 +20,8 @@
 
 #include <QCoreApplication>
 #include <QHostAddress>
-#include <QMetaMethod>
-#include <QMetaProperty>
+
+#include <QtCore/qmetaobject.h>
 #include <QThread>
 
 #ifdef HAVE_SSL
index 38477f6..4b76a17 100644 (file)
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QMetaProperty>
+#include <QtCore/qmetaobject.h>
 
 #include <KDebug>
 
index 3ddef14..c317b55 100644 (file)
@@ -24,7 +24,7 @@
 #include <QDataStream>
 #include <QMetaType>
 #include <QObject>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 
 #include "signalproxy.h"
 
index aac8380..4ec17b7 100644 (file)
@@ -24,7 +24,7 @@
 #include <QDir>
 #include <QVariant>
 #include <QString>
-#include <QMetaMethod>
+#include <QtCore/qmetaobject.h>
 
 // TODO Use versions from Network instead
 QString nickFromMask(QString mask);
index 1316c04..836ed6b 100644 (file)
@@ -21,7 +21,7 @@
 #include "abstractsqlstorage.h"
 #include "quassel.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QSqlDriver>
 #include <QSqlError>
 #include <QSqlField>
index c00a542..de479af 100644 (file)
@@ -23,6 +23,7 @@
 #ifdef HAVE_SSL
 #  include <QSslSocket>
 #endif
+#include <QtCore/qendian.h>
 
 #include "core.h"
 
index 1545831..4f17107 100644 (file)
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QtEndian>
+#include <QtCore/qendian.h>
 #include <QCoreApplication>
 #include <QTcpSocket>
 
index 54d4527..470ccfb 100644 (file)
@@ -26,7 +26,7 @@
 #include "network.h"
 #include "types.h"
 
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 
 class CoreUserSettings : public CoreSettings
 {
index afebc80..10185ff 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <QIcon>
 #include <QLayout>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QMenu>
 #include <QScrollBar>
 
index 4bac7a5..6750153 100644 (file)
@@ -22,7 +22,7 @@
 #include <QClipboard>
 #include <QDesktopServices>
 #include <QFontMetrics>
-#include <QGraphicsSceneMouseEvent>
+#include <QtGui/qgraphicssceneevent.h>
 #include <QIcon>
 #include <QPainter>
 #include <QPalette>
index def2450..f0b9348 100644 (file)
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <QDateTime>
-#include <QGraphicsSceneMouseEvent>
+#include <QtGui/qgraphicssceneevent.h>
 #include <QString>
 #include <QtGui>
 
index eadbfa7..e2740bf 100644 (file)
@@ -18,6 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#include <QRect>
 #include <QFontMetrics>
 #include <QTextBoundaryFinder>
 
index 9882fec..087ded8 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <QAction>
 #include <QMenu>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 
 #include <KIcon>
 
index 43ed45a..de988d2 100644 (file)
 #include <QClipboard>
 #include <QDesktopServices>
 #include <QDrag>
-#include <QGraphicsSceneMouseEvent>
+#include <QtGui/qgraphicssceneevent.h>
 #include <QIcon>
 #include <QMenu>
 #include <QMenuBar>
 #include <QMimeData>
-#include <QPersistentModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QUrl>
 
 #  include <KMenuBar>
index 20b25e0..276caff 100644 (file)
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QGraphicsTextItem>
-#include <QKeyEvent>
+#include <QtGui/qgraphicsitem.h>
+#include <QtGui/qevent.h>
 #include <QMenu>
 #include <QScrollBar>
 
index 87dc351..3e331cc 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <QApplication>
 #include <QCursor>
-#include <QGraphicsSceneHoverEvent>
+#include <QtGui/qgraphicssceneevent.h>
 #include <QPainter>
 #include <QPalette>
 
index 38350bc..f856659 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <QHash>
 #include <QWizard>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 
 #include "ui_coreconfigwizardintropage.h"
 #include "ui_coreconfigwizardadminuserpage.h"
index 0981a09..78674f5 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef MARKERLINEITEM_H_
 #define MARKERLINEITEM_H_
 
-#include <QGraphicsObject>
+#include <QtGui/qgraphicsitem.h>
 
 #include "chatscene.h"
 
index 3df6710..336f208 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <QHash>
 #include <QList>
-#include <QTextCharFormat>
+#include <QtGui/qtextformat.h>
 
 #include "settings.h"
 #include "settingspage.h"
index 91902bd..4c3e501 100644 (file)
@@ -25,7 +25,7 @@
 #include "ui_bufferviewsettingspage.h"
 #include "ui_buffervieweditdlg.h"
 
-#include <QItemSelection>
+#include <QtGui/qitemselectionmodel.h>
 
 class BufferViewConfig;
 
index 4bd9a9a..459d666 100644 (file)
@@ -21,8 +21,8 @@
 #ifndef _HIGHLIGHTSETTINGSPAGE_H_
 #define _HIGHLIGHTSETTINGSPAGE_H_
 
-#include <QVariantList>
-#include <QTableWidgetItem>
+#include <QtCore/qvariant.h>
+#include <QtGui/qtablewidget.h>
 
 #include <KLocale>
 
index b441aeb..0785dde 100644 (file)
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QDragEnterEvent>
-#include <QDropEvent>
+#include <QtGui/qevent.h>
+
 #include <QFileDialog>
 #include <QMimeData>
 #include <QUrl>
index 1eb011b..c898e5c 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <QHeaderView>
 #include <QItemSelectionModel>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QPainter>
 #include <QMessageBox>
 #include <QString>
index 17e18c8..ecfacd5 100644 (file)
 
 #ifdef HAVE_DBUS
 
+#include <QMetaObject>
 #include <QApplication>
 #include <QMenu>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QTextDocument>
 
 #include "quassel.h"
index 13abb48..179ef6c 100644 (file)
@@ -24,8 +24,8 @@
 #include <QWidget>
 #include <QAbstractItemModel>
 #include <QItemSelectionModel>
-#include <QModelIndex>
-#include <QItemSelection>
+#include <QtCore/qabstractitemmodel.h>
+#include <QtGui/qitemselectionmodel.h>
 #include <QAbstractItemDelegate>
 #include <QPointer>
 
index 324858d..4cce473 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <QApplication>
 #include <QAction>
-#include <QFlags>
+#include <QtCore/qglobal.h>
 #include <QHeaderView>
 #include <QLineEdit>
 #include <QMenu>
index 021df37..e642e5b 100644 (file)
@@ -24,7 +24,7 @@
 #include <QAction>
 #include <QMenu>
 #include <QDockWidget>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QStyledItemDelegate>
 #include <QTreeView>
 #include <QPointer>
index 3c63467..2fcd350 100644 (file)
@@ -22,8 +22,8 @@
 #define BUFFERVIEWFILTER_H_
 
 #include <QAction>
-#include <QDropEvent>
-#include <QFlags>
+#include <QtGui/qevent.h>
+#include <QtCore/qglobal.h>
 #include <QPointer>
 #include <QSet>
 #include <QSortFilterProxyModel>
index 3b32f26..111fde6 100644 (file)
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <QDesktopServices>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QUrl>
 
 #include "buffermodel.h"
index a7f2ec9..5de1a83 100644 (file)
@@ -21,7 +21,7 @@
 #include "clickablelabel.h"
 
 #include <KDebug>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 ClickableLabel::ClickableLabel(QWidget *parent)
     : QLabel(parent)
index fdab472..238af97 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <QPainter>
 #include <QStyle>
-#include <QStyleOptionFrame>
+#include <QtGui/qstyleoption.h>
 
 #  include <KColorDialog>
 
index b4f4ecb..b0f7734 100644 (file)
@@ -20,7 +20,7 @@
 
 #include "flatproxymodel.h"
 
-#include <QItemSelection>
+#include <QtGui/qitemselectionmodel.h>
 #include <KDebug>
 
 FlatProxyModel::FlatProxyModel(QObject *parent)
index 1389030..2d387c9 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef MULTILINEEDIT_H_
 #define MULTILINEEDIT_H_
 
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QHash>
 
 #include <KTextEdit>
index 0b51501..8a97d52 100644 (file)
 #define UISTYLE_H_
 
 #include <QDataStream>
-#include <QFontMetricsF>
+#include <QRect>
+#include <QFontMetrics>
 #include <QHash>
 #include <QIcon>
-#include <QTextCharFormat>
+#include <QtGui/qtextformat.h>
 #include <QTextLayout>
 #include <QPalette>
 #include <QVector>
index ad29d82..9d5ab13 100644 (file)
@@ -25,7 +25,7 @@
 
 
 #include <QList>
-#include <QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 
 #include "globals.h"
 #include "ku_prefs.h"
index def2ecd..d34ea1d 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef _KU_GROUPMODEL_H_
 #define _KU_GROUPMODEL_H_
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QSortFilterProxyModel>
 
 #include "ku_group.h"
index b94bd63..1452218 100644 (file)
@@ -24,7 +24,7 @@
 #include <sys/types.h>
 
 
-#include <QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 
 #include "globals.h"
 #include "ku_prefs.h"
index 0bb83fe..83d67f6 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef _KU_USERMODEL_H_
 #define _KU_USERMODEL_H_
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QSortFilterProxyModel>
 
 #include "ku_user.h"
index f4891ed..3fe24a5 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <QWidget>
 #include <QPoint>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 class DragWidget : public QWidget
 {
index 4800022..492336a 100644 (file)
@@ -24,7 +24,7 @@
 #include <QDBusConnection>
 #include <QPainter>
 #include <QWidget>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 #include <KIconLoader>
 #include <KLocale>
index 23fca77..5c0f043 100644 (file)
@@ -25,7 +25,7 @@
 #include "dragwidget.h"
 
 #include <QPixmap>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 
 class KbdDock : public DragWidget
index a15304f..4e856dc 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <QDebug>
 #include <QDesktopWidget>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QFile>
 #include <QGridLayout>
 #include <QMessageBox>
index 498f842..8fba54a 100644 (file)
@@ -24,8 +24,8 @@
 #include <QAction>
 #include <QSignalMapper>
 #include <QGridLayout>
-#include <QDomNode>
-#include <QDomNamedNodeMap>
+
+#include <QtXml/qdom.h>
 
 #include "resizabledragwidget.h"
 #include "mainwidget.h"
index 533b94c..26b9b26 100644 (file)
@@ -1,6 +1,6 @@
 #include "mainwidget.h"
 
-#include <QObjectList>
+#include <QtCore/qobject.h>
 #include <QList>
 
 #include "vbutton.h"
index c35a5f3..a62d403 100644 (file)
@@ -5,7 +5,7 @@
 #include <QString>
 #include <QFont>
 #include <QSize>
-#include <QResizeEvent>
+#include <QtGui/qevent.h>
 
 #include "vkeyboard.h"
 
index 885e215..cbc4eac 100644 (file)
@@ -23,7 +23,7 @@
 #include <QPoint>
 #include <QPainter>
 
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 
 #include <iostream>
index 9151e22..fee8d32 100644 (file)
 #include <QMessageBox>
 #include <QString>
 #include <QFile>
-#include <QDomDocument>
-#include <QDomElement>
-#include <QDomNode>
-#include <QDomNodeList>
+
+
+
+#include <QtXml/qdom.h>
 #include <QFileInfo>
 #include <QDir>
 #include <QMenu>
index f673352..982269d 100644 (file)
@@ -21,8 +21,8 @@
 #define THEMELOADER_H
 
 #include <QObject>
-#include <QDomNode>
-#include <QDomNamedNodeMap>
+
+#include <QtXml/qdom.h>
 #include <QVariant>
 #include <QMap>
 #include <QMenu>
index 70e3f82..aca513e 100644 (file)
@@ -5,9 +5,9 @@
 #include <QRect>
 #include <QSize>
 #include <QString>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QTimer>
-#include <QDomNode>
+#include <QtXml/qdom.h>
 #include "x11keyboard.h"
 
 class VButton : public QPushButton
index b96cc87..320cce5 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <QObject>
 #include <QMap>
-#include <QMapIterator>
+#include <QtCore/qmap.h>
 #include <QList>
 #include <QChar>
 
index 14329ec..7884091 100644 (file)
@@ -29,7 +29,7 @@
 #include "moc_ksane_preview_thread.cpp"
 
 #include <KDebug>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 
 namespace KSaneIface
index f6e42f3..0fe3a6c 100644 (file)
 #include "moc_ksane_viewer.cpp"
 #include "selectionitem.h"
 
-#include <QGraphicsPixmapItem>
+
 #include <QGraphicsScene>
-#include <QGraphicsRectItem>
-#include <QWheelEvent>
+#include <QtGui/qgraphicsitem.h>
+#include <QtGui/qevent.h>
 #include <QScrollBar>
 #include <QAction>
 #include <QList>
index f7b4744..61b7910 100644 (file)
@@ -29,7 +29,7 @@
 #define KSANE_VIEWER_H
 
 #include <QGraphicsView>
-#include <QWheelEvent>
+#include <QtGui/qevent.h>
 
 namespace KSaneIface
 {
index 8adf06f..33c5895 100644 (file)
@@ -39,7 +39,7 @@ extern "C"
 #include <QtGui/QWidget>
 #include <QCheckBox>
 #include <QTimer>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QProgressBar>
 
 // KDE includes
index 17f6ab2..2372413 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef SELECTIONITEM_H
 #define SELECTIONITEM_H
 
-#include <QGraphicsPixmapItem>
+#include <QtGui/qgraphicsitem.h>
 #include <QPainter>
 
 namespace KSaneIface
index 6791779..8923818 100644 (file)
@@ -27,9 +27,9 @@ License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Qt
 #include <QApplication>
 #include <QEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QSplitter>
-#include <QStyleOptionToolButton>
+#include <QtGui/qstyleoption.h>
 #include <QStylePainter>
 #include <QTimeLine>
 
index 0d7ac07..3c571e4 100644 (file)
@@ -24,7 +24,7 @@
 #define KDE_NO_DEBUG_OUTPUT
 
 #include "alttransview.h"
-#include <QDragEnterEvent>
+#include <QtGui/qevent.h>
 
 #include "diff.h"
 #include "catalog.h"
@@ -40,7 +40,7 @@
 #include <kaction.h>
 
 #include <QSignalMapper>
-//#include <QTime>
+//#include <QtCore/qdatetime.h>
 #include <QFileInfo>
 #include <QToolTip>
 
index 11e09f1..24e7b36 100644 (file)
@@ -29,7 +29,7 @@
 
 #include <klocale.h>
 #include <krun.h>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QMenu>
 #include <kfiledialog.h>
 #include <kdirwatch.h>
index d01b71e..1ba70f7 100644 (file)
@@ -35,7 +35,7 @@ class MyTreeView;
 
 #include <QHash>
 #include <QDockWidget>
-#include <QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 
 class BinUnitsView: public QDockWidget
 {
index 6147df4..1d8ba37 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef CMD_H
 #define CMD_H
 
-#include <QUndoCommand>
+#include <QtGui/qundostack.h>
 
 #include "pos.h"
 #include "note.h"
index b13df5e..6e56184 100644 (file)
@@ -37,7 +37,7 @@
 #include "catalogitem_private.h"
 
 #include <kdebug.h>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 using namespace GettextCatalog;
 
index d337cec..194b1ab 100644 (file)
@@ -40,7 +40,7 @@
 //#include <resources.h>
 
 #include <QFile>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QFileInfo>
 #include <QRegExp>
 #include <QTextCodec>
index 4ab5d67..3126710 100644 (file)
@@ -28,7 +28,7 @@
 #include "projectlocal.h"
 
 #include <QString>
-#include <QDate>
+#include <QtCore/qdatetime.h>
 
 class Catalog;
 struct Phase
index 966b0b8..ec3f6d8 100644 (file)
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QProcess>
 #include <QString>
 #include <QMap>
-#include <QDomDocument>
-#include <QTime>
+#include <QtXml/qdom.h>
+#include <QtCore/qdatetime.h>
 #include <QPair>
 #include <QList>
 
@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdatetime.h>
-#include <QXmlSimpleReader>
+#include <QtXml/qxml.h>
 
 static const char* const noyes[]={"no","yes"};
 
index 0a1eae5..07e6dc3 100644 (file)
@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TSSTORAGE_H
 
 #include "catalogstorage.h"
-#include <QDomNodeList>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
+
 #include <QVector>
 #include <QMap>
 // class QDomDocument;
index b663c46..6c07926 100644 (file)
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QProcess>
 #include <QString>
 #include <QMap>
-#include <QDomDocument>
-#include <QTime>
+#include <QtXml/qdom.h>
+#include <QtCore/qdatetime.h>
 #include <QPair>
 #include <QList>
 
@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdatetime.h>
-#include <QXmlSimpleReader>
+#include <QtXml/qxml.h>
 
 static const QString noyes[]={"no","yes"};
 static const QString bintargettarget[]={"bin-target","target"};
index 4a66bc2..403f715 100644 (file)
@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define XLIFFSTORAGE_H
 
 #include "catalogstorage.h"
-#include <QDomNodeList>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
+
 #include <QVector>
 #include <QMap>
 // class QDomDocument;
index 6ec93fd..b49270b 100644 (file)
 #include <klineedit.h>
 #include <KConfigGroup>
 
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QTreeView>
 #include <QHeaderView>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QToolButton>
 #include <QVBoxLayout>
 #include <QAction>
@@ -44,7 +44,7 @@
 #include <QMdiSubWindow>
 #include <QMdiArea>
 
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 
 class CatalogTreeView: public QTreeView
 {
index e0b934e..abc5ffb 100644 (file)
@@ -23,7 +23,7 @@
 
 #ifndef DOMROUTINES_H
 #define DOMROUTINES_H
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 
 void setText(QDomElement element, QString text);
 
index a1115b7..bfef7c6 100644 (file)
@@ -26,7 +26,7 @@
 #include <QMap>
 #include <QFileInfo>
 #include <QMutex>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QDebug>
 
 QString enhanceLangCode(const QString& langCode)
index 249fe3a..605f028 100644 (file)
 #include <klocale.h>
 #include <kaction.h>
 #include <QMenu>
-#include <QMouseEvent>
+
 
 using namespace GlossaryNS;
-//#include <QShortcutEvent>
+//#include <QtGui/qevent.h>
 
 
 // TermLabel::TermLabel(QAction* action/*const QString& shortcutQWidget* parent,Qt::Key key,const QString& termTransl*/)
index c7bc0f3..0b1a3d1 100644 (file)
@@ -89,7 +89,7 @@
 
 
 #include <QDir>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <threadweaver/ThreadWeaver.h>
 
 
index 5a2e9ce..3a79c5d 100644 (file)
@@ -42,7 +42,7 @@
 
 #include <QTimer>
 #include <QMenu>
-#include <QDragEnterEvent>
+#include <QtGui/qevent.h>
 
 #include <QLabel>
 #include <QHBoxLayout>
index 220a6cc..5235b2f 100644 (file)
@@ -39,7 +39,7 @@
 #include <QTreeView>
 #include <QClipboard>
 #include <QShortcut>
-#include <QDragEnterEvent>
+#include <QtGui/qevent.h>
 #include <QSortFilterProxyModel>
 #include <QStyledItemDelegate>
 #include <QStringBuilder>
index b75d79e..927ae5b 100644 (file)
@@ -33,7 +33,7 @@
 #include <KUrl>
 
 #include <QDockWidget>
-#include <QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <state.h>
 #include <phase.h>
 
index b0b79db..131b2a9 100644 (file)
@@ -32,8 +32,8 @@
 #include <kdebug.h>
 
 #include <QFile>
-#include <QXmlSimpleReader>
-#include <QXmlStreamReader>
+#include <QtXml/qxml.h>
+#include <QtCore/qxmlstream.h>
 #include <QBuffer>
 #include <QApplication>
 
index 5ee1428..4eece79 100644 (file)
 
 #include <QStringList>
 #include <QMultiHash>
-#include <QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QSortFilterProxyModel>
 #include <QList>
 #include <QSet>
 
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 
 /**
  * Classes for TBX Glossary handling
index ee69bab..d5ccb7c 100644 (file)
 #include <kurl.h>
 #include <kaction.h>
 
-#include <QDragEnterEvent>
-#include <QTime>
+#include <QtGui/qevent.h>
+#include <QtCore/qdatetime.h>
 #include <QSet>
 #include <QScrollArea>
-// #include <QShortcutEvent>
+// 
 #include <QPushButton>
 
 
index ad8366d..b0abafd 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef TBXPARSER_H
 #define TBXPARSER_H
 
-#include <QXmlDefaultHandler>
+#include <QtXml/qxml.h>
 
 #include "glossary.h"
 
index f8fe608..79ff79c 100644 (file)
@@ -51,8 +51,6 @@
 #include <kmessagebox.h>
 #include <knotification.h>
 #include <kapplication.h>
-
-
 #include <kio/netaccess.h>
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <kurl.h>
 #include <kmenu.h>
 #include <kfiledialog.h>
-
+#include <kdialog.h>
 #include <kross/core/action.h>
-
 #include <threadweaver/ThreadWeaver.h>
 
-
+#include <QTimer>
 #include <QActionGroup>
 #include <QMdiArea>
 #include <QMdiSubWindow>
 #include <QMenuBar>
-#include <kdialog.h>
-
 
 
 LokalizeMainWindow::LokalizeMainWindow()
index a894239..b302c4a 100644 (file)
@@ -32,7 +32,7 @@
 
 #include <QPointer>
 #include <QMap>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 
 
 class QMdiSubWindow;
index c909628..ca76078 100644 (file)
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <klocalizedstring.h>
 #include <QMultiHash>
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 
 
 
index 02bbbf0..fac1243 100644 (file)
@@ -39,7 +39,7 @@
 #include <kaction.h>
 #include <threadweaver/ThreadWeaver.h>
 
-#include <QDragEnterEvent>
+#include <QtGui/qevent.h>
 #include <QFile>
 #include <QToolTip>
 
index 9b3ba90..02a2ee2 100644 (file)
@@ -38,7 +38,7 @@
 #include <kcombobox.h>
 #include <kpushbutton.h>
 
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QTimer>
 #include <QBoxLayout>
 #include <QStackedLayout>
index f32f22f..8bda898 100644 (file)
@@ -39,7 +39,7 @@
 #include <QLabel>
 #include <QStringListModel>
 #include <QLineEdit>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 
 void TextEdit::keyPressEvent(QKeyEvent* keyEvent)
 {
index 172d09b..6387b71 100644 (file)
@@ -39,7 +39,7 @@
 
 
 //BEGIN PhasesModel
-#include <QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QSplitter>
 #include <QStackedLayout>
 
index 5768144..ba336aa 100644 (file)
@@ -29,7 +29,7 @@
 #include "note.h"
 
 #include <KDialog>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QVector>
 #include <QMap>
 
index 025647d..bbec39d 100644 (file)
@@ -54,8 +54,8 @@
 #include <threadweaver/ThreadWeaver.h>
 
 #include <QBoxLayout>
-#include <QDragEnterEvent>
-#include <QDropEvent>
+#include <QtGui/qevent.h>
+
 #include <QTimer>
 
 //#include <sonnet/configwidget.h>
index d5742fa..ea4045b 100644 (file)
@@ -37,7 +37,7 @@
 #include "qamodel.h"
 
 #include <QTimer>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 #include <kurl.h>
 #include <kdirlister.h>
index d5742fa..ea4045b 100644 (file)
@@ -37,7 +37,7 @@
 #include "qamodel.h"
 
 #include <QTimer>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 #include <kurl.h>
 #include <kdirlister.h>
index 6531a5b..dfb0280 100644 (file)
@@ -33,9 +33,9 @@
 #include <kapplication.h>
 #include <kstandarddirs.h>
 
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QFile>
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 #include <QTimer>
 #include <QSqlDatabase>
 #include <QSqlQuery>
index 4ebe279..58d5b1e 100644 (file)
@@ -37,7 +37,7 @@
 #include <kstatusbar.h>
 #include <khbox.h>
 
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QMenu>
 #include <QVBoxLayout>
 #include <QShortcut>
index ae90bc0..0860aad 100644 (file)
 
 #include <QTreeView>
 #include <QTimer>
-#include <QMouseEvent>
-#include <QKeyEvent>
+
+#include <QtGui/qevent.h>
 #include <QPainter>
-#include <QLinearGradient>
+#include <QtGui/qbrush.h>
 #include <QHeaderView>
 #include <QItemDelegate>
 #include <QStyledItemDelegate>
index 6531a5b..dfb0280 100644 (file)
@@ -33,9 +33,9 @@
 #include <kapplication.h>
 #include <kstandarddirs.h>
 
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QFile>
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 #include <QTimer>
 #include <QSqlDatabase>
 #include <QSqlQuery>
index 4ebe279..58d5b1e 100644 (file)
@@ -37,7 +37,7 @@
 #include <kstatusbar.h>
 #include <khbox.h>
 
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QMenu>
 #include <QVBoxLayout>
 #include <QShortcut>
index ae90bc0..0860aad 100644 (file)
 
 #include <QTreeView>
 #include <QTimer>
-#include <QMouseEvent>
-#include <QKeyEvent>
+
+#include <QtGui/qevent.h>
 #include <QPainter>
-#include <QLinearGradient>
+#include <QtGui/qbrush.h>
 #include <QHeaderView>
 #include <QItemDelegate>
 #include <QStyledItemDelegate>
index 7e885d0..60ac6a5 100644 (file)
@@ -29,7 +29,7 @@
 #include <kcolorscheme.h>
 
 #include <QHash>
-#include <QTextCharFormat>
+#include <QtGui/qtextformat.h>
 
 
 class QTextDocument;
index 868de34..c7ce938 100644 (file)
@@ -27,7 +27,7 @@
 #include "jobs.h"
 
 #include <QSortFilterProxyModel>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 class QFileSystemModel;
 class QPersistentModelIndex;
 
index ce325e6..ee7684c 100644 (file)
@@ -1658,8 +1658,8 @@ void UpdateJob::run ()
 
 //BEGIN TMX
 
-#include <QXmlDefaultHandler>
-#include <QXmlSimpleReader>
+
+#include <QtXml/qxml.h>
 
 /**
        @author Nick Shaforostoff <shafff@ukr.net>
@@ -1912,7 +1912,7 @@ void ImportTmxJob::run()
 
 
 
-#include <QXmlStreamWriter>
+#include <QtCore/qxmlstream.h>
 
 ExportTmxJob::ExportTmxJob(const QString& filename,//const KUrl& url,
                      const QString& dbName,
index 83dc3e0..695c6ad 100644 (file)
@@ -26,8 +26,8 @@
 #define QAMODEL_H
 
 #include "rule.h"
-#include <QAbstractListModel>
-#include <QDomDocument>
+#include <QtCore/qabstractitemmodel.h>
+#include <QtXml/qdom.h>
 
 class QaModel: public QAbstractListModel
 {
index 9dc0cf2..d5d03be 100644 (file)
@@ -27,7 +27,7 @@
 #include "project.h"
 
 #include <KLocale>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QFile>
 #include <QAction>
 
index ddc3e9e..fa828a4 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <QDockWidget>
 #include <QTreeView>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 
 #include "rule.h"
 
index f2b140a..efe1d3d 100644 (file)
@@ -28,7 +28,7 @@
 #include "catalogstring.h"
 
 #include <QString>
-#include <QDate>
+#include <QtCore/qdatetime.h>
 
 namespace TM {
 
index 91c05ce..27cbdff 100644 (file)
@@ -34,7 +34,7 @@
 #define TMMANAGER_H
 
 #include <kmainwindow.h>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QTimer>
 
 class QTreeView;
index 4e4cc96..a7b413d 100644 (file)
@@ -28,7 +28,7 @@
 #include <kjob.h>
 #include <QDir>
 #include <QUrl>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QVector>
 
 namespace ThreadWeaver{class Job;}
index 178bd6e..d6d6dc8 100644 (file)
 #include <QButtonGroup>
 #include <QClipboard>
 #include <QShortcut>
-#include <QDragEnterEvent>
+#include <QtGui/qevent.h>
 #include <QSortFilterProxyModel>
 #include <QStyledItemDelegate>
 #include <QStringBuilder>
 #include <QTextDocument>
+#include <QTextCodec>
+#include <QStringListModel>
 
 #include <KColorScheme>
 #include <kactioncategory.h>
@@ -51,7 +53,6 @@
 #include <kxmlguifactory.h>
 #include <threadweaver/ThreadWeaver.h>
 #include <fastsizehintitemdelegate.h>
-#include <QStringListModel>
 
 
 using namespace TM;
index c92e9b8..0d2377e 100644 (file)
@@ -42,8 +42,8 @@
 #include <kaction.h>
 #include <kmessagebox.h>
 
-#include <QTime>
-#include <QDragEnterEvent>
+#include <QtCore/qdatetime.h>
+#include <QtGui/qevent.h>
 #include <QFileInfo>
 #include <QDir>
 #include <QSignalMapper>
index e7b5984..997384b 100644 (file)
 #include <ktextbrowser.h>
 #include <kaction.h>
 
-#include <QDragEnterEvent>
-#include <QTime>
+#include <QtGui/qevent.h>
+#include <QtCore/qdatetime.h>
 #include <QSplitter>
 #include <QSignalMapper>
 #include <QTimer>
 
-// #include <QShortcutEvent>
+// 
 #include "myactioncollectionview.h"
 
 using namespace Kross;
index 5538b7f..ccda8b1 100644 (file)
 #include <QPainter>
 #include <QStyle>
 #include <QApplication>
-#include <QStyleOptionButton>
+#include <QtGui/qstyleoption.h>
 #include <QMimeData>
 #include <QMetaType>
 
 #include <QMenu>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QToolTip>
 
 // static int im_count=0;
index 16cb281..83244bb 100644 (file)
@@ -107,9 +107,13 @@ kde4_add_kcfg_files(okularcore_SRCS ${PROJECT_SOURCE_DIR}/conf/settings_core.kcf
 
 add_library(okularcore SHARED ${okularcore_SRCS})
 
-target_link_libraries(okularcore ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBRARY} ${MATH_LIB} ${KDE4_THREADWEAVER_LIBRARY} )
-
-target_link_libraries(okularcore kscreen)
+target_link_libraries(okularcore
+    ${KDE4_KIO_LIBS}
+    ${KDE4_PHONON_LIBRARY}
+    ${MATH_LIB}
+    ${KDE4_THREADWEAVER_LIBRARY}
+    kscreen
+)
 
 set_target_properties(okularcore PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
 
index 6d05eed..e5017ce 100644 (file)
 #include <QtGui/QGroupBox>
 #include <QtGui/QLabel>
 #include <QtGui/QListWidget>
-#include <QtGui/QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 #include <QtGui/QStackedWidget>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+
+#include <QtXml/qdom.h>
 
 #include "core/annotations.h"
 #include "ui/annotationwidgets.h"
index 4f10744..09b77ae 100644 (file)
@@ -15,8 +15,8 @@
 #include <QtCore/QLinkedList>
 #include <QtCore/QRect>
 #include <QtGui/QFont>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+
+#include <QtXml/qdom.h>
 
 #include "okular_export.h"
 #include "area.h"
index bf2eb70..3d9f042 100644 (file)
@@ -10,7 +10,7 @@
 #include "area.h"
 
 #include <QtCore/QRect>
-#include <QtGui/QPolygonF>
+#include <QtGui/qpolygon.h>
 #include <kdebug.h>
 
 #include <math.h>
index 55ea8ad..836177c 100644 (file)
@@ -23,7 +23,7 @@
 #endif
 
 // qt/kde/system includes
-#include <QtCore/QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
@@ -34,7 +34,7 @@
 #include <QtGui/QLabel>
 #include <QtGui/QPrinter>
 #include <QtGui/QPrintDialog>
-#include <QUndoCommand>
+#include <QtGui/qundostack.h>
 
 #include <kaboutdata.h>
 #include <kauthorized.h>
index 193de57..7efc1ef 100644 (file)
@@ -20,7 +20,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVector>
 #include <QtGui/QPrinter>
-#include <QtXml/QDomDocument>
+#include <QtXml/qdom.h>
 
 #include <kmimetype.h>
 
index 17394f2..25a26aa 100644 (file)
@@ -10,8 +10,8 @@
 #ifndef _OKULAR_DOCUMENT_COMMANDS_P_H_
 #define _OKULAR_DOCUMENT_COMMANDS_P_H_
 
-#include <QtGui/QUndoCommand>
-#include <QDomNode>
+#include <QtGui/qundostack.h>
+#include <QtXml/qdom.h>
 
 #include "area.h"
 
index c65bd12..6400b27 100644 (file)
@@ -19,7 +19,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
 #include <QtGui/QLabel>
-#include <QtGui/QShowEvent>
+#include <QtGui/qevent.h>
 #include <QtNetwork/QTcpSocket>
 
 #include <KProcess>
index d11b3b0..adbda24 100644 (file)
@@ -12,7 +12,7 @@
 
 #include <QtCore/QList>
 #include <QtCore/QMetaType>
-#include <QtCore/QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 #include <QtCore/QString>
 
 #include "okular_export.h"
index 506f8a8..977a902 100644 (file)
@@ -20,8 +20,8 @@
 
 #include <QtCore/QList>
 #include <QtCore/QObject>
-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QSizeF>
+#include <QtCore/qshareddata.h>
+#include <QtCore/qsize.h>
 #include <QtCore/QString>
 #include <QtCore/QVariant>
 #include <QtCore/QVector>
index 92a922f..68c7d57 100644 (file)
@@ -10,7 +10,7 @@
 #ifndef OKULAR_GLOBAL_H
 #define OKULAR_GLOBAL_H
 
-#include <QtCore/QGlobalStatic>
+#include <QtCore/qglobal.h>
 
 namespace Okular {
 
index 16cc3a4..dbed879 100644 (file)
@@ -16,8 +16,8 @@
 #include <QtCore/QVariant>
 #include <QtCore/QUuid>
 #include <QtGui/QPixmap>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+
+#include <QtXml/qdom.h>
 
 #include <kdebug.h>
 
@@ -45,7 +45,7 @@
 #include <limits>
 
 #ifdef PAGE_PROFILE
-#include <QtCore/QTime>
+#include <QtCore/qdatetime.h>
 #endif
 
 using namespace Okular;
index 0619f06..38c720b 100644 (file)
@@ -11,7 +11,7 @@
 #define _OKULAR_PAGESIZE_H_
 
 #include <QtCore/QList>
-#include <QtCore/QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 #include <QtCore/QString>
 
 #include "okular_export.h"
index fba73ff..f86c46a 100644 (file)
@@ -11,7 +11,7 @@
 #define _OKULAR_TEXTDOCUMENTGENERATOR_P_H_
 
 #include <QtGui/QAbstractTextDocumentLayout>
-#include <QtGui/QTextBlock>
+#include <QtGui/qtextobject.h>
 #include <QtGui/QTextDocument>
 
 #include "action.h"
index 348dea0..9d2c070 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <cstring>
 
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 #include <QVarLengthArray>
 
 using namespace Okular;
index 80ff009..e7e54f0 100644 (file)
@@ -18,7 +18,7 @@
 #ifndef _bigEndianByteReader_H
 #define _bigEndianByteReader_H
 
-#include <QGlobalStatic>
+#include <QtCore/qglobal.h>
 
 
 class bigEndianByteReader {
index d90ff1c..e6b6db8 100644 (file)
@@ -61,7 +61,7 @@
 #include <klocale.h>
 
 #include <QProcess>
-#include <QSysInfo>
+#include <QtCore/qglobal.h>
 #include <QTemporaryFile>
 
 #include <cstdlib>
@@ -378,7 +378,7 @@ QString dvifile::convertPDFtoPS(const QString &PDFFilename, QString *converrorms
 
   // Use pdf2ps to do the conversion
   QProcess pdf2ps;
-  pdf2ps.setReadChannelMode(QProcess::MergedChannels);
+  pdf2ps.setProcessChannelMode(QProcess::MergedChannels);
   pdf2ps.start("pdf2ps",
                QStringList() << PDFFilename << convertedFileName,
                QIODevice::ReadOnly|QIODevice::Text);
index 0bb117d..028e6c1 100644 (file)
@@ -22,7 +22,7 @@
 #include "dviPageInfo.h"
 
 #include <math.h>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <kconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
index 615cd6d..36a4c9a 100644 (file)
@@ -29,7 +29,7 @@ fontEncoding::fontEncoding(const QString &encName)
   _isValid = false;
   // Use kpsewhich to find the encoding file.
   QProcess kpsewhich;
-  kpsewhich.setReadChannelMode(QProcess::MergedChannels);
+  kpsewhich.setProcessChannelMode(QProcess::MergedChannels);
 
   kpsewhich.start("kpsewhich",
                   QStringList() << encName,
index 9da4e59..2db86dd 100644 (file)
@@ -10,7 +10,7 @@
 #ifndef PAGENUMBER_H
 #define PAGENUMBER_H
 
-#include <QGlobalStatic>
+#include <QtCore/qglobal.h>
 
 
 /** \brief Class to represent a page number
index 392947e..4499131 100644 (file)
@@ -11,7 +11,7 @@
 
 #include <QtGui/QAbstractTextDocumentLayout>
 #include <QtGui/QTextDocument>
-#include <QtGui/QTextFrame>
+#include <QtGui/qtextobject.h>
 #include <QTextDocumentFragment>
 #include <QFileInfo>
 #include <QApplication> // Because of the HACK
index 0c723c4..64c468a 100644 (file)
@@ -9,14 +9,14 @@
 
 #include "converter.h"
 
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 #include <QtCore/QUrl>
 #include <QtGui/QAbstractTextDocumentLayout>
 #include <QtGui/QTextCursor>
 #include <QtGui/QTextDocument>
-#include <QtGui/QTextFrame>
-#include <QtXml/QDomElement>
-#include <QtXml/QDomText>
+#include <QtGui/qtextobject.h>
+
+#include <QtXml/qdom.h>
 
 #include <kglobal.h>
 #include <klocale.h>
index 0abf584..114ed6d 100644 (file)
@@ -13,7 +13,7 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QMap>
 #include <QtCore/QString>
-#include <QtXml/QDomDocument>
+#include <QtXml/qdom.h>
 
 namespace FictionBook {
 
index afc077a..81fbfc9 100644 (file)
@@ -11,8 +11,8 @@
 
 #include <QtGui/QAbstractTextDocumentLayout>
 #include <QtGui/QTextDocument>
-#include <QtGui/QTextBlock>
-#include <QtGui/QTextFrame>
+#include <QtGui/qtextobject.h>
+
 #include <QtGui/QTextDocumentFragment>
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
index c70e370..086c51b 100644 (file)
@@ -13,9 +13,9 @@
 #include <QtCore/QUrl>
 #include <QtGui/QTextCursor>
 #include <QtGui/QTextDocument>
-#include <QtGui/QTextFrame>
+#include <QtGui/qtextobject.h>
 #include <QtGui/QTextList>
-#include <QtGui/QTextTableCell>
+#include <QtGui/qtexttable.h>
 #include <QtXml/qdom.h>
 #include <QtXml/qdom.h>
 #include <QtXml/qxml.h>
index 8dac4b8..d8cc2d0 100644 (file)
@@ -13,7 +13,7 @@
 #include <core/document.h>
 #include <core/generator.h>
 
-#include <QtGui/QTextBlock>
+#include <QtGui/qtextobject.h>
 
 #include "qunpluck.h"
 
index 8363dd3..1153988 100644 (file)
 #include <QtCore/QDateTime>
 #include <QtGui/QAbstractTextDocumentLayout>
 #include <QtGui/QFont>
-#include <QtGui/QTextBlock>
-#include <QtGui/QTextCharFormat>
+#include <QtGui/qtextobject.h>
+#include <QtGui/qtextformat.h>
 #include <QtGui/QTextCursor>
 #include <QtGui/QTextDocument>
-#include <QtGui/QTextFrame>
+
 
 #include <QtGui/QLabel>
 
index 5c1abfc..7ee9fca 100644 (file)
@@ -8,7 +8,7 @@
  ***************************************************************************/
 
 
-#include <QtGui/QTextFrame>
+#include <QtGui/qtextobject.h>
 
 #include "converter.h"
 #include "document.h"
index 4c56e8c..9bd7443 100644 (file)
 #include <core/textpage.h>
 
 #include <QColor>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QFontDatabase>
 #include <QImage>
-#include <QXmlStreamReader>
-#include <QXmlDefaultHandler>
+#include <QtCore/qxmlstream.h>
+#include <QtXml/qxml.h>
 #include <QStack>
 #include <QVariant>
 
index efd2cb8..bc08e6e 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <QPainter>
 #include <QTimer>
-#include <QStyleOptionGraphicsItem>
+#include <QtGui/qstyleoption.h>
 
 #include <core/bookmarkmanager.h>
 #include <core/document.h>
index ef2a5de..dc27c7e 100644 (file)
@@ -17,6 +17,7 @@
 #include "shell.h"
 #include <kapplication.h>
 #include <klocale.h>
+#include <QTemporaryFile>
 #include <QtDBus/qdbusinterface.h>
 #include <QTextStream>
 #include <kwindowsystem.h>
index e12f60e..1adef4a 100644 (file)
@@ -44,7 +44,7 @@
 #include <kwindowsystem.h>
 #include <ktabwidget.h>
 #include <kxmlguifactory.h>
-#include <QDragMoveEvent>
+#include <QtGui/qevent.h>
 #include <QTabBar>
 
 // local includes
index 27e747c..c3e76ee 100644 (file)
@@ -10,7 +10,7 @@
 #include "annotationproxymodels.h"
 
 #include <QtCore/QList>
-#include <QtGui/QItemSelection>
+#include <QtGui/qitemselectionmodel.h>
 
 #include <kicon.h>
 
index 9fca338..cd441e6 100644 (file)
@@ -16,7 +16,7 @@
 #include <QSize>
 #include <QtCore/QFile>
 #include <QtGui/QLabel>
-#include <QtGui/QShowEvent>
+#include <QtGui/qevent.h>
 
 #include <kmimetypetrader.h>
 #include <kparts/part.h>
index a7f7ffd..22d07d1 100644 (file)
@@ -11,7 +11,7 @@
 #include "pageviewutils.h"
 
 #include <qbuttongroup.h>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QMenu>
 #include <QEvent>
 #include <klineedit.h>
index cfd340a..5bd4611 100644 (file)
@@ -25,7 +25,7 @@
 #include <QtCore/QTimer>
 #include <QtCore/QRegExp>
 #include <QtGui/QApplication>
-#include <QtGui/QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QHeaderView>
 #include <QtGui/QLabel>
index 56b18d4..571a114 100644 (file)
@@ -17,7 +17,7 @@
 #include <qpushbutton.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <QStyleOptionButton>
+#include <QtGui/qstyleoption.h>
 #include <QStylePainter>
 #include <QtGui/QToolButton>
 #include <qvalidator.h>
index 069ac6c..ce629d2 100644 (file)
@@ -12,7 +12,7 @@
 // qt/kde includes
 #include <qapplication.h>
 #include <QItemDelegate>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QTextDocument>
 #include <qvariant.h>
 
index 48c9d98..6f96228 100644 (file)
@@ -13,7 +13,7 @@
 #include <QtCore/QStringList>
 #include <QtGui/QHeaderView>
 #include <QtGui/QLayout>
-#include <QtGui/QPaintEvent>
+#include <QtGui/qevent.h>
 #include <QtGui/QPainter>
 #include <QtGui/QSizePolicy>
 #include <QtGui/QTextDocument>
index 0b0befc..9d1f9b0 100644 (file)
@@ -10,7 +10,7 @@
 #ifndef _OKULAR_SIDE_REVIEWS_H_
 #define _OKULAR_SIDE_REVIEWS_H_
 
-#include <QtCore/QModelIndexList>
+#include <QtCore/qabstractitemmodel.h>
 #include <QtCore/QVector>
 #include <QtGui/QWidget>
 
index e6fda3c..3338c8d 100644 (file)
@@ -12,7 +12,7 @@
 
 #include <qwidget.h>
 #include "core/observer.h"
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 
 #include "okular_part_export.h"
 
index 4158a03..08ab7d1 100644 (file)
@@ -20,13 +20,6 @@ project(partitionmanager)
 set(CMAKE_USE_RELATIVE_PATHS OFF)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 
-set(VERSION_MAJOR "1")
-set(VERSION_MINOR "1")
-set(VERSION_RELEASE "1")
-set(VERSION_SUFFIX "")
-set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}${VERSION_SUFFIX})
-add_definitions(-DVERSION="${VERSION}")
-
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(BLKID REQUIRED blkid)
 pkg_check_modules(LIBATASMART REQUIRED libatasmart)
index 30cedbf..55f0003 100644 (file)
@@ -43,8 +43,8 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-#include <QReadLocker>
-#include <QWriteLocker>
+#include <QtCore/qreadwritelock.h>
+#include <QtCore/qreadwritelock.h>
 
 /** Constructs a new OperationStack */
 OperationStack::OperationStack(QObject* parent) :
index 3af263c..0b679d2 100644 (file)
 #include "util/report.h"
 #include "util/htmlreport.h"
 
-#include <QCloseEvent>
-#include <QTime>
+
+#include <QtCore/qdatetime.h>
 #include <QFont>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QFile>
 
 #include <kapplication.h>
index e326784..2691e91 100644 (file)
@@ -24,7 +24,7 @@
 #include <kdialog.h>
 
 #include <QTimer>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QString>
 
 class OperationRunner;
index 158051a..31b1e9d 100644 (file)
@@ -36,7 +36,7 @@
 #include <kglobal.h>
 #include <kglobalsettings.h>
 
-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 #include <QPointer>
 
 /** Creates a new DevicePropsDialog
index c5059c9..cfa94d2 100644 (file)
@@ -201,7 +201,7 @@ bool EditMountPointDialogWidget::readMountpoints(const QString& filename)
                        device = findBlkIdDevice("LABEL", QString(device).remove("LABEL="));
                }
                else if (device.startsWith('/'))
-                       device = QFile::symLinkTarget(device);
+                       device = QFile::readLink(device);
 
                if (!device.isEmpty())
                {
index ef29b83..6c7cf38 100644 (file)
@@ -69,8 +69,8 @@
 #include <kio/copyjob.h>
 #include <ktemporaryfile.h>
 
-#include <QCloseEvent>
-#include <QReadLocker>
+#include <QtGui/qevent.h>
+#include <QtCore/qreadwritelock.h>
 #include <QPointer>
 #include <QFile>
 #include <QDateTime>
index fef4adf..da4995e 100644 (file)
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 
 /** Creates a NewDialog
        @param parent the parent widget
index 873d27c..178af46 100644 (file)
@@ -57,7 +57,7 @@
 
 #include <QCursor>
 #include <QPointer>
-#include <QReadLocker>
+#include <QtCore/qreadwritelock.h>
 
 #include <config.h>
 
index 2d0ff7e..e7ee893 100644 (file)
@@ -35,7 +35,7 @@
 #include <klineedit.h>
 #include <klocale.h>
 
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 
 /** Creates a new PartPropsDialog
        @param parent pointer to the parent widget
index 3fb069f..54ed7e5 100644 (file)
 #include "fs/filesystem.h"
 
 #include <QPainter>
-#include <QMouseEvent>
-#include <QPaintEvent>
-#include <QResizeEvent>
-#include <QStyleOptionToolBar>
-#include <QStyleOptionFrameV3>
-#include <QStyleOptionButton>
+
+#include <QtGui/qevent.h>
+
+#include <QtGui/qstyleoption.h>
+#include <QtGui/qstyleoption.h>
+
 
 #include <kdebug.h>
 #include <kcolorscheme.h>
index 39c505d..f135eaf 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "core/partitiontable.h"
 
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 #include <kdebug.h>
 #include <klocale.h>
index 9f83c06..3e246e2 100644 (file)
@@ -26,7 +26,7 @@
 #include "fs/filesystem.h"
 
 #include <QPainter>
-#include <QStyleOptionButton>
+#include <QtGui/qstyleoption.h>
 #include <QApplication>
 #include <QPlastiqueStyle>
 
index c480cb0..466e2e2 100644 (file)
@@ -41,7 +41,7 @@
 #include <kglobalsettings.h>
 #include <kglobal.h>
 
-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 #include <QTextStream>
 #include <QTextDocument>
 #include <qglobal.h>
index 3231695..90a8df5 100644 (file)
@@ -38,7 +38,7 @@
 
 #include <QFile>
 #include <QTreeWidget>
-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 #include <QDateTime>
 #include <QTextStream>
 
index 6e480a8..c56e247 100644 (file)
@@ -28,7 +28,7 @@
 #include "util/report.h"
 
 #include <QIcon>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 #include <kdebug.h>
 #include <klocale.h>
index 59af190..5dde025 100644 (file)
@@ -45,7 +45,7 @@ static KAboutData createPluginAboutData()
                "pmdummybackendplugin",
                NULL,
                ki18nc("@title", "Dummy Backend Plugin"),
-               QString(VERSION).toUtf8(),
+               KDE_VERSION_STRING,
                ki18n("KDE Partition Manager dummy backend."),
                KAboutData::License_GPL,
                ki18n("Copyright 2010 Volker Lanz"));
index 3e7b8d2..5199b51 100644 (file)
@@ -61,7 +61,7 @@ static KAboutData createPluginAboutData()
                "pmlibpartedbackendplugin",
                NULL,
                ki18nc("@title", "LibParted Backend Plugin"),
-               QString("%1, libparted version: %2").arg(VERSION).arg(ped_get_version()).toUtf8(),
+               QString("%1, libparted version: %2").arg(KDE_VERSION_STRING).arg(ped_get_version()).toUtf8(),
                ki18n("KDE Partition Manager backend for libparted."),
                KAboutData::License_GPL,
                ki18n("Copyright 2008,2009,2010 Volker Lanz"));
index 2b0010d..f8d9520 100644 (file)
@@ -119,7 +119,7 @@ KAboutData* createPartitionManagerAboutData()
                "partitionmanager",
                NULL,
                ki18nc("@title", "<application>KDE Partition Manager</application>"),
-               VERSION,
+               KDE_VERSION_STRING,
                ki18nc("@title", "Manage your disks, partitions and file systems"),
                KAboutData::License_GPL,
                ki18nc("@info:credit", "© 2008-2013 Volker Lanz")
index 9994edb..4968819 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef CONFIGURE_DIALOG_H
 #define CONFIGURE_DIALOG_H
 
-#include <QCloseEvent>
+#include <QtGui/qevent.h>
 #include <KPageDialog>
 
 class PrinterPage;
index e4ddcab..a84160e 100644 (file)
@@ -26,6 +26,7 @@
 
 #include <QtDBus/QDBusConnection>
 #include <QtCore/QTimer>
+#include <QtCore/QPointer>
 #include <QtGui/QLayout>
 #include <KWindowSystem>
 #include <KDialog>
index e83ef6a..c61e25a 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <QThread>
 #include <QTimer>
-#include <QVariantHash>
+#include <QtCore/qvariant.h>
 #include <QStringList>
 #include <QWidget>
 
index 7685331..0317981 100644 (file)
@@ -22,7 +22,7 @@
 #define PPD_MODEL_H
 
 #include <QStandardItemModel>
-#include <QVariantHash>
+#include <QtCore/qvariant.h>
 
 struct DriverMatch{
     QString ppd;
index 60772bb..8ee3bfd 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <QStandardItemModel>
 #include <QLineEdit>
-#include <QItemSelection>
+#include <QtGui/qitemselectionmodel.h>
 #include <QStringBuilder>
 
 #include <QtDBus/QDBusMessage>
index 22a516c..556dbb7 100644 (file)
@@ -20,7 +20,7 @@
 #include "KPrintManagerConfigPlugin.h"
 #include "ClassListWidget.h"
 
-#include <QtPlugin>
+#include <QtCore/qplugin.h>
 
 #include <KGlobal>
 
index 3abade8..4c6d4df 100644 (file)
 #define KPRINT_MANAGER_CONFIG_H
 
 #include <QObject>
-#include <QDesignerCustomWidgetInterface>
+#ifdef QT_KATIE
+#include <QtUiTools/customwidget.h>
+#else
+#include <QtDesigner/customwidget.h>
+#endif
 
 class KPrintManagerConfigPlugin : public QObject, public QDesignerCustomWidgetInterface
 {
index 7fc00ae..aa1be15 100644 (file)
@@ -30,6 +30,7 @@
 #include <KCupsRequest.h>
 
 #include <QThread>
+#include <QPointer>
 #include <QtDBus/QDBusMessage>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusServiceWatcher>
index fa238cc..388bb72 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <KDEDModule>
 
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 class NewPrinterNotification;
 class PrintManagerKded : public KDEDModule
index afa8dfa..335794d 100644 (file)
@@ -22,7 +22,7 @@
 #define PRINT_QUEUE_UI_H
 
 #include <KDialog>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QToolButton>
 
 namespace Ui {
index d3e2a87..d1711aa 100644 (file)
@@ -25,7 +25,7 @@
 #include "ImageViewer.h"
 #include "moc_ImageViewer.cpp"
 
-#include <QGraphicsPixmapItem>
+#include <QtGui/qgraphicsitem.h>
 #include <QGraphicsScene>
 #include <QScrollBar>
 #include <QAction>
index 890ca98..1aaf204 100644 (file)
@@ -26,7 +26,7 @@
 #define IMAGE_VIEWER_H
 
 #include <QGraphicsView>
-#include <QWheelEvent>
+#include <QtGui/qevent.h>
 
 class ImageViewer : public QGraphicsView
 {
index 46c1d0e..4d0053b 100644 (file)
@@ -25,7 +25,7 @@
 #include <syndication/elementwrapper.h>
 #include <syndication/tools.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QString>
 
 namespace Syndication {
index f27f527..5c2fa47 100644 (file)
@@ -23,7 +23,7 @@
 #include "category.h"
 #include "constants.h"
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QString>
 
 namespace Syndication {
index 53876a1..79fe860 100644 (file)
@@ -25,7 +25,7 @@
 #include <tools.h>
 
 #include <QtCore/QByteArray>
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
index 843b866..c9bbda2 100644 (file)
@@ -32,7 +32,7 @@
 #include <documentvisitor.h>
 #include <tools.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QList>
 #include <QtCore/QString>
 
index 9141a80..671d97d 100644 (file)
@@ -31,7 +31,7 @@
 #include <specificitemvisitor.h>
 #include <tools.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QString>
 
 namespace Syndication {
index 2338f81..332991e 100644 (file)
 
 #include <documentsource.h>
 
-#include <QtXml/QDomAttr>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
-#include <QtXml/QDomNamedNodeMap>
-#include <QtXml/QDomNode>
-#include <QtXml/QDomNodeList>
+
+
+
+#include <QtXml/qdom.h>
+
+#include <QtXml/qdom.h>
 
 #include <QtCore/QHash>
 #include <QtCore/QRegExp>
index 26f7245..06aac8d 100644 (file)
@@ -30,7 +30,7 @@
 
 #include <tools.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QList>
 #include <QtCore/QString>
 
index d608164..3912286 100644 (file)
@@ -24,8 +24,8 @@
 #include "tools.h"
 
 #include <QtCore/QByteArray>
-#include <QtXml/QDomDocument>
-#include <QtXml/QXmlSimpleReader>
+#include <QtXml/qdom.h>
+#include <QtXml/qxml.h>
 
 namespace Syndication {
 
index a398338..b394fe3 100644 (file)
@@ -24,8 +24,8 @@
 
 #include <kurl.h>
 
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+
+#include <QtXml/qdom.h>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QTextStream>
index 93f786b..36cb967 100644 (file)
@@ -30,9 +30,9 @@
 #include <atom/link.h>
 #include <atom/person.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QList>
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 #include <QtCore/QString>
 
 namespace Syndication {
index 166d3a5..2d5ea4a 100644 (file)
@@ -30,9 +30,9 @@
 #include <personimpl.h>
 #include <tools.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QList>
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
index 5207503..230361d 100644 (file)
@@ -29,9 +29,9 @@
 #include <rss2/item.h>
 
 #include <QtCore/QList>
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 #include <QtCore/QString>
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 
 namespace Syndication {
 
index cd6378b..c71b2d9 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <image.h>
 
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 #include <QtCore/QString>
 
 namespace Syndication {
index 254ef65..5ed493d 100644 (file)
@@ -34,9 +34,9 @@
 #include <personimpl.h>
 #include <tools.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QList>
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 #include <QtCore/QString>
 
 using Syndication::Atom::Content;
index e8838d3..1104d1d 100644 (file)
@@ -33,9 +33,9 @@
 #include <personimpl.h>
 #include <tools.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QList>
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
index daff48f..1350446 100644 (file)
@@ -31,9 +31,9 @@
 #include <personimpl.h>
 #include <tools.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QList>
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 #include <QtCore/QString>
 
 namespace Syndication {
index ad2b20c..08aa371 100644 (file)
@@ -31,7 +31,7 @@
 #include <syndication/global.h>
 #include <syndication/mapper.h>
 
-#include <QtXml/QDomDocument>
+#include <QtXml/qdom.h>
 #include <QtCore/QHash>
 #include <QtCore/QString>
 
index daf0546..5c3815e 100644 (file)
@@ -29,7 +29,7 @@
 #include "sequence.h"
 #include "statement.h"
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QString>
 
 namespace Syndication {
index f675236..dcb27f1 100644 (file)
@@ -32,8 +32,8 @@
 
 #include <documentsource.h>
 
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomNodeList>
+
+#include <QtXml/qdom.h>
 #include <QtCore/QHash>
 #include <QtCore/QList>
 #include <QtCore/QMap>
index 086088e..68515da 100644 (file)
@@ -31,7 +31,7 @@
 #include <documentvisitor.h>
 #include <tools.h>
 
-#include <QtXml/QDomDocument>
+#include <QtXml/qdom.h>
 #include <QtCore/QList>
 #include <QtCore/QSet>
 #include <QtCore/QString>
index 47b5795..05f1ab0 100644 (file)
@@ -30,7 +30,7 @@
 #include <specificitemvisitor.h>
 #include <tools.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QString>
 #include <QtCore/QList>
 
index 8660a98..a954154 100644 (file)
@@ -25,8 +25,8 @@
 
 #include <documentsource.h>
 
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+
+#include <QtXml/qdom.h>
 #include <QtCore/QString>
 
 namespace Syndication {
index fe6525c..f6db895 100644 (file)
@@ -24,7 +24,7 @@
 #include <constants.h>
 #include <elementwrapper.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QList>
 #include <QtCore/QString>
 
index 850d535..ca54710 100644 (file)
@@ -31,7 +31,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
-#include <QtCore/QTime>
+#include <QtCore/qdatetime.h>
 #include <QtCore/QTextStream>
 
 #include <iostream>
index 3f16de0..3c7f040 100644 (file)
@@ -24,7 +24,7 @@
 #include <gettext-po.h>
 #include <QColor>
 #include <QImage>
-#include <QLatin1String>
+#include <QtCore/qstring.h>
 #include <QPainter>
 #include <QWidget>
 #include <kdemacros.h>
index 7bd63b7..d189bee 100644 (file)
@@ -23,7 +23,7 @@
 #include "appearancesettings.h"
 
 #include <QApplication>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QPainter>
 
 #include <KLocale>
index 3f51911..b43d6c9 100644 (file)
@@ -52,6 +52,7 @@
 #include <QDesktopWidget>
 #include <QPainter>
 #include <QWhatsThis>
+#include <QVarLengthArray>
 #include <QtDBus/QtDBus>
 
 #if defined(Q_WS_X11)
@@ -726,7 +727,7 @@ void MainWindow::applySettings()
 
     m_animationTimer.setInterval(10);
 
-    m_tabBar->setShown(Settings::showTabBar());
+    m_tabBar->setVisible(Settings::showTabBar());
 
     setKeepOpen(Settings::keepOpen());
 
index 3f91833..ac7bfe9 100644 (file)
@@ -38,7 +38,7 @@
 #include <QPainter>
 #include <QtDBus/QtDBus>
 #include <QToolButton>
-#include <QWheelEvent>
+#include <QtGui/qevent.h>
 #include <QWhatsThis>
 
 #include <QMimeData>
index e7163f7..176f2d9 100644 (file)
@@ -38,7 +38,7 @@
 #include <QLabel>
 #include <QWidget>
 
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 
 
 int Terminal::m_availableTerminalId = 0;
index c5cd718..4a1c3ac 100644 (file)
@@ -23,7 +23,7 @@
 
 
 #include <QRect>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QWidget>