From 82fc15f54bfb5779f5e6840c443ed7c826d3880f Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 27 Feb 2015 07:40:26 +0000 Subject: [PATCH] generic: use CMake moc instead of automoc4 by default for compatibilty reasons automoc4 support is not removed but it shall be in the future. automoc4 has not been maintained for a while (last commit is from 2011) and the stable release is from 2009. CMake version >= 2.8.6 provides the functionality for mocking so I see no reason to not make use of it. --- cmake/modules/FindKDE4Internal.cmake | 1 - cmake/modules/KDE4Defaults.cmake | 4 +++ cmake/modules/KDE4Macros.cmake | 32 ------------------- dnssd/avahi-domainbrowser.cpp | 4 +-- dnssd/avahi-publicservice.cpp | 4 +-- dnssd/avahi-remoteservice.cpp | 4 +-- dnssd/avahi-servicebrowser.cpp | 4 +-- dnssd/avahi-servicetypebrowser.cpp | 4 +-- dnssd/avahi_entrygroup_interface.cpp | 2 +- dnssd/avahi_server_interface.cpp | 2 +- dnssd/avahi_serviceresolver_interface.cpp | 2 +- dnssd/dummy-domainbrowser.cpp | 2 +- dnssd/dummy-publicservice.cpp | 2 +- dnssd/dummy-remoteservice.cpp | 2 +- dnssd/dummy-servicebrowser.cpp | 2 +- dnssd/dummy-servicetypebrowser.cpp | 2 +- dnssd/mdnsd-domainbrowser.cpp | 4 +-- dnssd/mdnsd-publicservice.cpp | 2 +- dnssd/mdnsd-remoteservice.cpp | 2 +- dnssd/mdnsd-responder.cpp | 2 +- dnssd/mdnsd-servicebrowser.cpp | 4 +-- dnssd/mdnsd-servicetypebrowser.cpp | 4 +-- .../libkdeclarative/private/engineaccess.cpp | 2 +- experimental/libkdeclarative/test/test.cpp | 2 +- interfaces/kimproxy/library/kimproxy.cpp | 2 +- .../kfileaudiopreview/kfileaudiopreview.cpp | 2 +- .../kfileaudiopreview/mediacontrols.cpp | 2 +- .../kmediaplayer/kmediaplayeradaptor.cpp | 2 +- interfaces/kmediaplayer/player.cpp | 2 +- interfaces/kmediaplayer/view.cpp | 2 +- .../ktexteditor/codecompletionmodel.cpp | 2 +- interfaces/ktexteditor/cursorfeedback.cpp | 2 +- interfaces/ktexteditor/document.cpp | 4 +-- interfaces/ktexteditor/ktexteditor.cpp | 14 ++++---- interfaces/ktexteditor/rangefeedback.cpp | 2 +- kconf_update/tests/test_kconf_update.cpp | 2 +- kconf_update/tests/test_kconfigutils.cpp | 2 +- kdecore/auth/kauthactionwatcher.cpp | 2 +- kdecore/config/kconfigbackend.cpp | 2 +- kdecore/config/kcoreconfigskeleton.cpp | 2 +- kdecore/date/ksystemtimezone.cpp | 2 +- kdecore/io/kautosavefile.cpp | 2 +- kdecore/io/kdebugdbusiface.cpp | 2 +- kdecore/io/kdirwatch.cpp | 4 +-- kdecore/io/kprocess.cpp | 2 +- kdecore/jobs/kcompositejob.cpp | 2 +- kdecore/jobs/kjob.cpp | 2 +- kdecore/jobs/kjobtrackerinterface.cpp | 2 +- kdecore/jobs/kjobuidelegate.cpp | 2 +- kdecore/kernel/ktoolinvocation.cpp | 2 +- kdecore/network/klocalsocket.cpp | 2 +- kdecore/network/ksslcertificatemanager.cpp | 2 +- kdecore/network/kssld/kssld.cpp | 4 +-- kdecore/network/ktcpsocket.cpp | 2 +- kdecore/sonnet/backgroundchecker.cpp | 2 +- kdecore/sonnet/backgroundengine.cpp | 2 +- kdecore/sonnet/client.cpp | 2 +- kdecore/sonnet/loader.cpp | 2 +- kdecore/sonnet/tests/test_core.cpp | 2 +- kdecore/sonnet/tests/test_dialog.cpp | 2 +- kdecore/sonnet/tests/test_filter.cpp | 2 +- kdecore/sycoca/ksycoca.cpp | 2 +- kdecore/tests/karchivetest.cpp | 2 +- kdecore/tests/kasciitest.cpp | 2 +- kdecore/tests/kautosavefiletest.cpp | 2 +- kdecore/tests/kautostarttest.cpp | 2 +- kdecore/tests/kcalendartest.cpp | 2 +- kdecore/tests/kcompositejobtest.cpp | 2 +- kdecore/tests/kconfigtest.cpp | 2 +- kdecore/tests/kdatetimeformattertest.cpp | 2 +- kdecore/tests/kdatetimetest.cpp | 2 +- kdecore/tests/kdebug_unittest.cpp | 2 +- kdecore/tests/kdesktopfiletest.cpp | 2 +- kdecore/tests/kdirwatchtest.cpp | 2 +- kdecore/tests/kdirwatchtest_gui.cpp | 2 +- kdecore/tests/kencodingdetectortest.cpp | 2 +- kdecore/tests/kentrymaptest.cpp | 2 +- kdecore/tests/kfiltertest.cpp | 2 +- kdecore/tests/kjobtest.cpp | 2 +- kdecore/tests/klibloadertest.cpp | 2 +- kdecore/tests/klimitediodevicetest.cpp | 2 +- kdecore/tests/klocaletest.cpp | 2 +- kdecore/tests/klocaletimeformattest.cpp | 2 +- kdecore/tests/klocalizedstringtest.cpp | 2 +- kdecore/tests/klocalsocketservertest.cpp | 2 +- kdecore/tests/klocalsockettest.cpp | 2 +- kdecore/tests/klockfiletest.cpp | 2 +- kdecore/tests/kmd5benchmark.cpp | 2 +- kdecore/tests/kmimeglobsfileparsertest.cpp | 2 +- kdecore/tests/kmimetypetest.cpp | 2 +- kdecore/tests/kmountpointtest.cpp | 2 +- kdecore/tests/ksavefiletest.cpp | 2 +- kdecore/tests/kservicetest.cpp | 2 +- kdecore/tests/ksharedptrtest.cpp | 2 +- kdecore/tests/kstandarddirstest.cpp | 2 +- kdecore/tests/kstringhandlertest.cpp | 2 +- kdecore/tests/ktcpsockettest.cpp | 2 +- kdecore/tests/ktempdirtest.cpp | 2 +- kdecore/tests/ktemporaryfiletest.cpp | 2 +- kdecore/tests/ktimezonestest.cpp | 2 +- kdecore/tests/kurlmimetest.cpp | 2 +- kdecore/tests/kurltest.cpp | 2 +- kdecore/util/kautostart.cpp | 2 +- kdecore/util/kdedmodule.cpp | 2 +- kdecore/util/klauncher_iface.cpp | 2 +- kdecore/util/klibloader.cpp | 2 +- kdecore/util/klibrary.cpp | 2 +- kdecore/util/kpluginfactory.cpp | 2 +- kdecore/util/kpluginloader.cpp | 2 +- kded/kbuildsycoca.cpp | 2 +- kded/kded.cpp | 2 +- kded/kdedadaptor.cpp | 2 +- kded/vfolder_menu.cpp | 2 +- kdeui/actions/kaction.cpp | 2 +- kdeui/actions/kactioncollection.cpp | 2 +- kdeui/actions/kactionmenu.cpp | 2 +- kdeui/actions/kcodecaction.cpp | 2 +- kdeui/actions/kdualaction.cpp | 2 +- kdeui/actions/kfontaction.cpp | 2 +- kdeui/actions/kfontsizeaction.cpp | 2 +- kdeui/actions/kpastetextaction.cpp | 2 +- kdeui/actions/krecentfilesaction.cpp | 2 +- kdeui/actions/kselectaction.cpp | 2 +- kdeui/actions/kstandardaction.cpp | 2 +- kdeui/actions/ktoggleaction.cpp | 2 +- kdeui/actions/ktogglefullscreenaction.cpp | 2 +- kdeui/actions/ktoggletoolbaraction.cpp | 2 +- kdeui/actions/ktoolbarlabelaction.cpp | 2 +- kdeui/actions/ktoolbarpopupaction.cpp | 2 +- kdeui/actions/ktoolbarspaceraction.cpp | 2 +- kdeui/colors/kcolorbutton.cpp | 2 +- kdeui/colors/kcolorcombo.cpp | 2 +- kdeui/colors/kcolordialog.cpp | 4 +-- kdeui/colors/kcolorvalueselector.cpp | 2 +- kdeui/colors/khuesaturationselect.cpp | 2 +- kdeui/config/kconfigskeleton.cpp | 2 +- kdeui/dialogs/kaboutapplicationdialog.cpp | 2 +- .../kaboutapplicationpersonmodel_p.cpp | 2 +- kdeui/dialogs/kaboutkdedialog_p.cpp | 2 +- kdeui/dialogs/kassistantdialog.cpp | 2 +- kdeui/dialogs/kbugreport.cpp | 2 +- kdeui/dialogs/kconfigdialog.cpp | 2 +- kdeui/dialogs/kconfigdialogmanager.cpp | 2 +- kdeui/dialogs/kcupsoptionsjobwidget_p.cpp | 2 +- kdeui/dialogs/kcupsoptionspageswidget_p.cpp | 2 +- kdeui/dialogs/kdialog.cpp | 4 +-- kdeui/dialogs/kedittoolbar.cpp | 4 +-- kdeui/dialogs/kinputdialog.cpp | 2 +- kdeui/dialogs/kmessageboxmessagehandler.cpp | 2 +- kdeui/dialogs/knewpassworddialog.cpp | 2 +- kdeui/dialogs/kpassworddialog.cpp | 2 +- kdeui/dialogs/kpixmapregionselectordialog.cpp | 2 +- kdeui/dialogs/kprogressdialog.cpp | 2 +- kdeui/dialogs/kshortcutsdialog.cpp | 4 +-- kdeui/dialogs/kshortcutseditor.cpp | 2 +- kdeui/dialogs/ksplashscreen.cpp | 2 +- kdeui/dialogs/kswitchlanguagedialog_p.cpp | 2 +- kdeui/dialogs/ktip.cpp | 2 +- kdeui/findreplace/kfind.cpp | 2 +- kdeui/findreplace/kfinddialog.cpp | 2 +- kdeui/findreplace/kreplace.cpp | 2 +- kdeui/findreplace/kreplacedialog.cpp | 2 +- kdeui/fonts/kfontchooser.cpp | 4 +-- kdeui/fonts/kfontdialog.cpp | 2 +- kdeui/fonts/kfontrequester.cpp | 2 +- kdeui/icons/kiconloader.cpp | 2 +- kdeui/itemviews/kbreadcrumbselectionmodel.cpp | 2 +- kdeui/itemviews/kcategorizedview.cpp | 2 +- kdeui/itemviews/kcategorydrawer.cpp | 2 +- kdeui/itemviews/kcheckableproxymodel.cpp | 2 +- kdeui/itemviews/kextendableitemdelegate.cpp | 2 +- kdeui/itemviews/kfilterproxysearchline.cpp | 2 +- kdeui/itemviews/kidentityproxymodel.cpp | 2 +- kdeui/itemviews/klinkitemselectionmodel.cpp | 2 +- kdeui/itemviews/klistwidget.cpp | 2 +- kdeui/itemviews/klistwidgetsearchline.cpp | 2 +- kdeui/itemviews/kmodelindexproxymapper.cpp | 2 +- .../itemviews/krecursivefilterproxymodel.cpp | 2 +- kdeui/itemviews/ktreewidgetsearchline.cpp | 2 +- kdeui/itemviews/kviewstatemaintainer.cpp | 2 +- kdeui/itemviews/kviewstatesaver.cpp | 2 +- kdeui/itemviews/kwidgetitemdelegate.cpp | 4 +-- kdeui/jobs/kabstractwidgetjobtracker.cpp | 2 +- kdeui/jobs/kdialogjobuidelegate.cpp | 2 +- kdeui/jobs/kstatusbarjobtracker.cpp | 4 +-- kdeui/jobs/kuiserverjobtracker.cpp | 4 +-- kdeui/jobs/kwidgetjobtracker.cpp | 4 +-- kdeui/kernel/kapplication.cpp | 2 +- kdeui/kernel/kclipboard.cpp | 2 +- kdeui/kernel/kglobalsettings.cpp | 2 +- kdeui/kernel/kstartupinfo.cpp | 2 +- kdeui/kernel/kstyle.cpp | 2 +- kdeui/kernel/kuniqueapplication.cpp | 4 +-- kdeui/notifications/knotification.cpp | 2 +- kdeui/notifications/knotificationmanager.cpp | 2 +- .../knotificationrestrictions.cpp | 2 +- kdeui/notifications/kstatusnotifieritem.cpp | 4 +-- .../kstatusnotifieritemdbus_p.cpp | 2 +- kdeui/notifications/ksystemtrayicon.cpp | 2 +- kdeui/paged/kpagedialog.cpp | 2 +- kdeui/paged/kpagemodel.cpp | 2 +- kdeui/paged/kpageview.cpp | 2 +- kdeui/paged/kpageview_p.cpp | 2 +- kdeui/paged/kpagewidget.cpp | 2 +- kdeui/paged/kpagewidgetmodel.cpp | 2 +- kdeui/plotting/kplotwidget.cpp | 2 +- kdeui/shortcuts/kacceleratormanager.cpp | 2 +- kdeui/shortcuts/kcheckaccelerators.cpp | 2 +- kdeui/shortcuts/kgesturemap.cpp | 2 +- kdeui/shortcuts/kglobalaccel.cpp | 2 +- kdeui/sonnet/configdialog.cpp | 2 +- kdeui/sonnet/configwidget.cpp | 2 +- kdeui/sonnet/dialog.cpp | 2 +- kdeui/sonnet/dictionarycombobox.cpp | 2 +- kdeui/sonnet/highlighter.cpp | 2 +- kdeui/sonnet/tests/backgroundtest.cpp | 2 +- kdeui/sonnet/tests/test_dialog.cpp | 2 +- kdeui/sonnet/tests/test_highlighter.cpp | 2 +- kdeui/tests/kactioncollectiontest.cpp | 2 +- kdeui/tests/kanimatedbuttontest.cpp | 2 +- kdeui/tests/kapplication_unittest.cpp | 2 +- kdeui/tests/kbuttongrouptest.cpp | 2 +- kdeui/tests/kcodecactiontest.cpp | 2 +- kdeui/tests/kcolorbuttontest.cpp | 2 +- kdeui/tests/kcolorcombotest.cpp | 2 +- kdeui/tests/kcolorutilsdemo.cpp | 2 +- kdeui/tests/kcolorutilstest.cpp | 2 +- kdeui/tests/kcomboboxtest.cpp | 2 +- kdeui/tests/kcompletioncoretest.cpp | 2 +- kdeui/tests/kcompletionuitest.cpp | 2 +- .../kconfig_compiler/kconfigcompiler_test.cpp | 2 +- kdeui/tests/kconfigguitest.cpp | 2 +- kdeui/tests/kconfigskeletontest.cpp | 2 +- kdeui/tests/kdatecomboboxtest.cpp | 2 +- kdeui/tests/kdatetimeedittest.cpp | 2 +- kdeui/tests/kfindtest.cpp | 2 +- kdeui/tests/kglobalsettingstest.cpp | 2 +- kdeui/tests/kglobalshortcuttest.cpp | 2 +- kdeui/tests/khboxtest.cpp | 2 +- kdeui/tests/kiconeffecttest.cpp | 2 +- kdeui/tests/kimageframe.cpp | 2 +- kdeui/tests/kjobtrackerstest.cpp | 2 +- kdeui/tests/kledtest.cpp | 2 +- kdeui/tests/klineedittest.cpp | 2 +- kdeui/tests/kmainwindow_unittest.cpp | 2 +- kdeui/tests/kmainwindowrestoretest.cpp | 2 +- kdeui/tests/kmainwindowtest.cpp | 2 +- kdeui/tests/kmessagetest.cpp | 2 +- kdeui/tests/knuminputtest.cpp | 2 +- kdeui/tests/kpagedialogtest.cpp | 2 +- kdeui/tests/kpagewidgettest.cpp | 2 +- kdeui/tests/kpassivepopuptest.cpp | 2 +- .../kpixmapsequenceoverlaypaintertest.cpp | 2 +- kdeui/tests/kreplacetest.cpp | 2 +- kdeui/tests/krulertest.cpp | 2 +- kdeui/tests/kselectaction_unittest.cpp | 2 +- kdeui/tests/kselectactiontest.cpp | 2 +- kdeui/tests/kselectionproxymodeltestsuite.cpp | 2 +- kdeui/tests/kstandardactiontest.cpp | 2 +- kdeui/tests/kstandardshortcuttest.cpp | 2 +- kdeui/tests/kstatusbartest.cpp | 2 +- kdeui/tests/ktabwidgettest.cpp | 2 +- kdeui/tests/ktimecomboboxtest.cpp | 2 +- kdeui/tests/ktreewidgetsearchlinetest.cpp | 2 +- kdeui/tests/kwindowtest.cpp | 2 +- kdeui/tests/kxmlgui_unittest.cpp | 2 +- kdeui/tests/kxmlguitest.cpp | 2 +- .../kreparentingproxymodel.cpp | 2 +- .../proxymodeltestapp/matchcheckingwidget.cpp | 2 +- .../proxymodeltestapp/reparentingpmwidget.cpp | 2 +- .../scriptablereparentingwidget.cpp | 2 +- .../tests/proxymodeltestsuite/CMakeLists.txt | 2 +- .../proxymodeltestsuite/dynamictreewidget.cpp | 2 +- kdeui/tests/testplot_widget.cpp | 2 +- kdeui/util/kcompletion.cpp | 2 +- kdeui/util/kcursor.cpp | 2 +- kdeui/util/kmanagerselection.cpp | 2 +- kdeui/util/kmodifierkeyinfo.cpp | 2 +- kdeui/util/kmodifierkeyinfoprovider.cpp | 2 +- kdeui/util/knumvalidator.cpp | 2 +- kdeui/util/kpassivepopup.cpp | 2 +- kdeui/util/kpassivepopupmessagehandler.cpp | 2 +- kdeui/util/kpixmapsequenceoverlaypainter.cpp | 2 +- kdeui/util/kpixmapsequencewidget.cpp | 2 +- kdeui/util/ksvgrenderer.cpp | 2 +- kdeui/util/kundostack.cpp | 2 +- kdeui/util/kwallet.cpp | 2 +- kdeui/util/kxmessages.cpp | 2 +- kdeui/widgets/kactionselector.cpp | 2 +- kdeui/widgets/kanimatedbutton.cpp | 2 +- kdeui/widgets/karrowbutton.cpp | 2 +- kdeui/widgets/kbuttongroup.cpp | 2 +- kdeui/widgets/kcapacitybar.cpp | 2 +- kdeui/widgets/kcharselect.cpp | 4 +-- kdeui/widgets/kcmodule.cpp | 2 +- kdeui/widgets/kcombobox.cpp | 2 +- kdeui/widgets/kcompletionbox.cpp | 2 +- kdeui/widgets/kdatecombobox.cpp | 2 +- kdeui/widgets/kdatepicker.cpp | 4 +-- kdeui/widgets/kdatetable.cpp | 2 +- kdeui/widgets/kdatetimeedit.cpp | 2 +- kdeui/widgets/kdatetimewidget.cpp | 2 +- kdeui/widgets/kdatewidget.cpp | 2 +- kdeui/widgets/kdialogbuttonbox.cpp | 2 +- kdeui/widgets/keditlistbox.cpp | 2 +- kdeui/widgets/keditlistwidget.cpp | 2 +- kdeui/widgets/khbox.cpp | 2 +- kdeui/widgets/khelpmenu.cpp | 2 +- kdeui/widgets/khistorycombobox.cpp | 2 +- kdeui/widgets/kkeysequencewidget.cpp | 4 +-- kdeui/widgets/klanguagebutton.cpp | 2 +- kdeui/widgets/kled.cpp | 2 +- kdeui/widgets/klineedit.cpp | 4 +-- kdeui/widgets/kmainwindow.cpp | 2 +- kdeui/widgets/kmenu.cpp | 2 +- kdeui/widgets/kmenubar.cpp | 2 +- kdeui/widgets/kmessagewidget.cpp | 2 +- kdeui/widgets/kmultitabbar.cpp | 4 +-- kdeui/widgets/knuminput.cpp | 2 +- kdeui/widgets/kpixmapregionselectorwidget.cpp | 2 +- kdeui/widgets/kpushbutton.cpp | 2 +- kdeui/widgets/kratingwidget.cpp | 2 +- kdeui/widgets/krestrictedline.cpp | 2 +- kdeui/widgets/krichtextedit.cpp | 2 +- kdeui/widgets/krichtextwidget.cpp | 2 +- kdeui/widgets/kruler.cpp | 2 +- kdeui/widgets/kselector.cpp | 2 +- kdeui/widgets/kseparator.cpp | 2 +- kdeui/widgets/kshortcutwidget.cpp | 2 +- kdeui/widgets/ksqueezedtextlabel.cpp | 2 +- kdeui/widgets/kstatusbar.cpp | 2 +- kdeui/widgets/kstringvalidator.cpp | 2 +- kdeui/widgets/ktabbar.cpp | 2 +- kdeui/widgets/ktabwidget.cpp | 2 +- kdeui/widgets/ktextbrowser.cpp | 2 +- kdeui/widgets/ktextedit.cpp | 2 +- kdeui/widgets/ktimecombobox.cpp | 2 +- kdeui/widgets/ktimezonewidget.cpp | 2 +- kdeui/widgets/ktitlewidget.cpp | 2 +- kdeui/widgets/ktoolbar.cpp | 2 +- kdeui/widgets/kurllabel.cpp | 2 +- kdeui/widgets/kvbox.cpp | 2 +- kdeui/widgets/kxyselector.cpp | 2 +- kdeui/windowmanagement/kwindowsystem_qws.cpp | 2 +- kdeui/windowmanagement/kwindowsystem_x11.cpp | 2 +- kdeui/xmlgui/kmainwindowiface.cpp | 2 +- kdeui/xmlgui/kmenumenuhandler_p.cpp | 2 +- kdeui/xmlgui/ktoolbarhandler.cpp | 2 +- kdeui/xmlgui/kxmlguifactory.cpp | 2 +- kdeui/xmlgui/kxmlguiwindow.cpp | 2 +- kdewebkit/kgraphicswebview.cpp | 2 +- kdewebkit/kwebkitpart/src/kwebkitpart_ext.cpp | 2 +- .../kwebkitpart/src/kwebkitpartfactory.cpp | 2 +- .../kwebkitpart/src/networkaccessmanager.cpp | 2 +- kdewebkit/kwebkitpart/src/ui/passwordbar.cpp | 2 +- kdewebkit/kwebkitpart/src/ui/searchbar.cpp | 2 +- kdewebkit/kwebpage.cpp | 2 +- kdewebkit/kwebpluginfactory.cpp | 2 +- kdewebkit/kwebview.cpp | 2 +- kdewebkit/kwebwallet.cpp | 2 +- kfile/kdiroperator.cpp | 2 +- kfile/kdirselectdialog.cpp | 2 +- kfile/kdirsortfilterproxymodel.cpp | 2 +- kfile/kfilebookmarkhandler.cpp | 2 +- kfile/kfilefiltercombo.cpp | 2 +- kfile/kfilemodule.cpp | 2 +- kfile/kfileplaceeditdialog.cpp | 2 +- kfile/kfileplacesitem.cpp | 2 +- kfile/kfileplacesmodel.cpp | 2 +- kfile/kfileplacessharedbookmarks.cpp | 2 +- kfile/kfileplacesview.cpp | 4 +-- kfile/kfilepreviewgenerator.cpp | 2 +- kfile/kfiletreeview.cpp | 2 +- kfile/kfilewidget.cpp | 2 +- kfile/knameandurlinputdialog.cpp | 2 +- kfile/knewfilemenu.cpp | 2 +- kfile/kurlnavigator.cpp | 2 +- kfile/kurlnavigatorbutton.cpp | 2 +- kfile/kurlnavigatorbuttonbase.cpp | 2 +- kfile/kurlnavigatordropdownbutton.cpp | 2 +- kfile/kurlnavigatormenu.cpp | 2 +- kfile/kurlnavigatorplacesselector.cpp | 2 +- kfile/kurlnavigatorprotocolcombo.cpp | 2 +- kfile/kurlnavigatortogglebutton.cpp | 2 +- kfile/tests/kfiletreeviewtest.cpp | 2 +- kfile/tests/kurlnavigatortest.cpp | 2 +- kinit/klauncher.cpp | 2 +- kinit/klauncher_adaptor.cpp | 2 +- kio/bookmarks/kbookmarkdombuilder.cc | 2 +- kio/bookmarks/kbookmarkimporter_crash.cc | 2 +- kio/bookmarks/kbookmarkimporter_opera.cc | 2 +- kio/bookmarks/kbookmarkmanager.cc | 2 +- kio/bookmarks/kbookmarkmanageradaptor.cc | 2 +- kio/bookmarks/kbookmarkmenu.cc | 4 +-- kio/bookmarks/konqbookmarkmenu.cc | 2 +- kio/httpfilter/httpfilter.cc | 2 +- kio/kfile/kabstractfilemodule.cpp | 2 +- kio/kfile/kacleditwidget.cpp | 4 +-- kio/kfile/kdevicelistmodel.cpp | 2 +- kio/kfile/kdiskfreespace.cpp | 2 +- kio/kfile/kencodingfiledialog.cpp | 2 +- kio/kfile/kfile.cpp | 2 +- kio/kfile/kfiledialog.cpp | 2 +- .../kfilemetadataconfigurationwidget.cpp | 2 +- kio/kfile/kfilemetadatawidget.cpp | 2 +- kio/kfile/kfilemetainfowidget.cpp | 2 +- kio/kfile/kfilemetapreview.cpp | 2 +- kio/kfile/kfilesharedialog.cpp | 2 +- kio/kfile/kfsprocess.cpp | 2 +- kio/kfile/kicondialog.cpp | 2 +- kio/kfile/kimagefilepreview.cpp | 2 +- kio/kfile/kmetaprops.cpp | 2 +- kio/kfile/kopenwithdialog.cpp | 4 +-- kio/kfile/kpreviewprops.cpp | 2 +- kio/kfile/kpreviewwidgetbase.cpp | 2 +- kio/kfile/kpropertiesdialog.cpp | 4 +-- kio/kfile/kurlcombobox.cpp | 2 +- kio/kfile/kurlrequester.cpp | 2 +- kio/kfile/kurlrequesterdialog.cpp | 2 +- kio/kio/accessmanager.cpp | 2 +- kio/kio/accessmanagerreply_p.cpp | 2 +- kio/kio/chmodjob.cpp | 2 +- kio/kio/connection.cpp | 4 +-- kio/kio/copyjob.cpp | 2 +- kio/kio/dataslave.cpp | 2 +- kio/kio/davjob.cpp | 2 +- kio/kio/delegateanimationhandler.cpp | 2 +- kio/kio/deletejob.cpp | 2 +- kio/kio/directorysizejob.cpp | 2 +- kio/kio/filejob.cpp | 2 +- kio/kio/fileundomanager.cpp | 4 +-- kio/kio/forwardingslavebase.cpp | 2 +- kio/kio/job.cpp | 4 +-- kio/kio/jobuidelegate.cpp | 2 +- kio/kio/joburlcache.cpp | 2 +- kio/kio/kabstractfileitemactionplugin.cpp | 2 +- kio/kio/kautomount.cpp | 2 +- kio/kio/kbuildsycocaprogressdialog.cpp | 2 +- kio/kio/kdatatool.cpp | 2 +- kio/kio/kdirlister.cpp | 4 +-- kio/kio/kdirmodel.cpp | 2 +- kio/kio/kdirnotify.cpp | 2 +- kio/kio/kdynamicjobtracker.cpp | 2 +- kio/kio/kfileitemactionplugin.cpp | 2 +- kio/kio/kfileitemdelegate.cpp | 2 +- kio/kio/kfileshare.cpp | 2 +- kio/kio/kfilewriteplugin.cpp | 2 +- kio/kio/kmimetypechooser.cpp | 2 +- kio/kio/kmimetyperesolver.cpp | 2 +- kio/kio/knfsshare.cpp | 2 +- kio/kio/kpasswdserverloop.cpp | 2 +- kio/kio/krun.cpp | 4 +-- kio/kio/kscan.cpp | 2 +- kio/kio/kshellcompletion.cpp | 2 +- kio/kio/kstatusbarofflineindicator.cpp | 2 +- kio/kio/kurifilter.cpp | 2 +- kio/kio/kurlcompletion.cpp | 2 +- kio/kio/metainfojob.cpp | 2 +- kio/kio/netaccess.cpp | 2 +- kio/kio/passworddialog.cpp | 2 +- kio/kio/pastedialog.cpp | 2 +- kio/kio/previewjob.cpp | 2 +- kio/kio/renamedialog.cpp | 2 +- kio/kio/renamedialogplugin.cpp | 2 +- kio/kio/scheduler.cpp | 4 +-- kio/kio/sessiondata.cpp | 2 +- kio/kio/skipdialog.cpp | 2 +- kio/kio/slave.cpp | 2 +- kio/kio/slaveconfig.cpp | 2 +- kio/kio/slaveinterface.cpp | 2 +- kio/kio/usernotificationhandler.cpp | 2 +- kio/kssl/kcm/cacertificatespage.cpp | 2 +- kio/kssl/kcm/kcmssl.cpp | 2 +- kio/kssl/ksslcertdialog.cpp | 2 +- kio/kssl/ksslcertificatebox.cpp | 2 +- kio/kssl/ksslinfodialog.cpp | 2 +- kio/kssl/ksslkeygen.cpp | 4 +-- kio/misc/kpac/discovery.cpp | 2 +- kio/misc/kpac/downloader.cpp | 2 +- kio/misc/kpac/proxyscout.cpp | 2 +- kio/tests/clipboardupdatertest.cpp | 2 +- kio/tests/dataprotocoltest.cpp | 2 +- kio/tests/dummymeta.cpp | 2 +- kio/tests/fileundomanagertest.cpp | 2 +- kio/tests/globaltest.cpp | 2 +- kio/tests/jobremotetest.cpp | 2 +- kio/tests/jobtest.cpp | 2 +- kio/tests/kbookmarktest.cpp | 2 +- kio/tests/kdcopcheck.cpp | 2 +- kio/tests/kdirlistertest.cpp | 2 +- kio/tests/kdirlistertest_gui.cpp | 2 +- kio/tests/kdirmodeltest.cpp | 2 +- kio/tests/kfdtest.cpp | 2 +- kio/tests/kfileitemtest.cpp | 2 +- kio/tests/kfilemetainfotest.cpp | 2 +- kio/tests/kioslavetest.cpp | 2 +- kio/tests/kruntest.cpp | 2 +- kio/tests/krununittest.cpp | 2 +- kio/tests/previewtest.cpp | 2 +- kio/tests/speed.cpp | 2 +- kioslave/file/file.cpp | 2 +- kioslave/http/http.cpp | 2 +- kioslave/http/kcookiejar/kcookieserver.cpp | 2 +- kioslave/http/kcookiejar/kcookiewin.cpp | 2 +- .../http/tests/httpheaderdispositiontest.cpp | 2 +- .../http/tests/httpheadertokenizetest.cpp | 2 +- kioslave/http/tests/httpobjecttest.cpp | 2 +- knotify/config/knotifyconfigactionswidget.cpp | 2 +- knotify/config/knotifyconfigwidget.cpp | 2 +- knotify/config/knotifyeventlist.cpp | 2 +- knotify/tests/knotifytestwindow.cpp | 2 +- kparts/browserextension.cpp | 2 +- kparts/browserinterface.cpp | 2 +- kparts/browserrun.cpp | 4 +-- kparts/factory.cpp | 2 +- kparts/historyprovider.cpp | 2 +- kparts/mainwindow.cpp | 2 +- kparts/part.cpp | 2 +- kparts/partmanager.cpp | 2 +- kparts/plugin.cpp | 2 +- kparts/scriptableextension.cpp | 4 +-- kparts/statusbarextension.cpp | 2 +- kparts/tests/normalktm.cpp | 2 +- kparts/tests/notepad.cpp | 2 +- kparts/tests/parts.cpp | 2 +- kparts/tests/parttest.cpp | 2 +- kparts/tests/partviewer.cpp | 2 +- kparts/tests/testmainwindow.cpp | 2 +- kpty/kptydevice.cpp | 2 +- kpty/kptyprocess.cpp | 2 +- kpty/tests/kptyprocesstest.cpp | 2 +- kross/core/action.cpp | 2 +- kross/core/actioncollection.cpp | 2 +- kross/core/interpreter.cpp | 2 +- kross/core/manager.cpp | 2 +- kross/core/script.cpp | 2 +- kross/modules/form.cpp | 2 +- kross/modules/translation.cpp | 2 +- kross/qts/script.cpp | 2 +- kross/test/testobject.cpp | 2 +- kross/ui/model.cpp | 2 +- kross/ui/plugin.cpp | 2 +- kross/ui/view.cpp | 2 +- kunitconversion/converter.cpp | 2 +- kutils/kcmodulecontainer.cpp | 2 +- kutils/kcmoduleproxy.cpp | 2 +- kutils/kcmultidialog.cpp | 2 +- kutils/kemoticons/kemoticons.cpp | 2 +- kutils/kemoticons/tests/kemoticontest.cpp | 2 +- kutils/kidletime/abstractsystempoller.cpp | 2 +- kutils/kidletime/kidletime.cpp | 2 +- kutils/kidletime/macpoller.cpp | 2 +- kutils/kidletime/widgetbasedpoller.cpp | 2 +- kutils/kidletime/windowspoller.cpp | 2 +- kutils/kidletime/xscreensaverbasedpoller.cpp | 2 +- kutils/kidletime/xsyncbasedpoller.cpp | 2 +- kutils/kpluginselector.cpp | 4 +-- kutils/kprintpreview.cpp | 2 +- kutils/ksettings/componentsdialog.cpp | 2 +- kutils/ksettings/dialog.cpp | 2 +- kutils/ksettings/dispatcher.cpp | 2 +- kutils/ksettings/pluginpage.cpp | 2 +- kutils/ksettingswidgetadaptor.cpp | 2 +- plasma/abstractdialogmanager.cpp | 2 +- plasma/abstractrunner.cpp | 2 +- plasma/abstracttoolbox.cpp | 2 +- plasma/animations/animation.cpp | 2 +- plasma/animations/bindings/animationgroup.cpp | 2 +- plasma/animations/easinganimation.cpp | 2 +- plasma/animations/fade.cpp | 2 +- plasma/animations/geometry.cpp | 2 +- plasma/animations/grow.cpp | 2 +- plasma/animations/javascriptanimation.cpp | 2 +- plasma/animations/pixmaptransition.cpp | 2 +- plasma/animations/pulser.cpp | 2 +- plasma/animations/rotation.cpp | 2 +- plasma/animations/rotationstacked.cpp | 2 +- plasma/animations/slide.cpp | 2 +- plasma/animator.cpp | 2 +- plasma/applet.cpp | 4 +-- plasma/containment.cpp | 2 +- plasma/containmentactions.cpp | 2 +- plasma/corona.cpp | 2 +- plasma/datacontainer.cpp | 2 +- plasma/dataengine.cpp | 2 +- plasma/dataenginemanager.cpp | 2 +- plasma/delegate.cpp | 2 +- plasma/dialog.cpp | 2 +- plasma/extenders/extender.cpp | 2 +- plasma/extenders/extendergroup.cpp | 2 +- plasma/extenders/extenderitem.cpp | 2 +- plasma/framesvg.cpp | 2 +- plasma/glapplet.cpp | 2 +- plasma/packagestructure.cpp | 2 +- plasma/popupapplet.cpp | 2 +- plasma/private/animablegraphicswebview.cpp | 2 +- plasma/private/applethandle.cpp | 2 +- plasma/private/datacontainer_p.cpp | 2 +- plasma/private/dataengineconsumer.cpp | 2 +- plasma/private/dataengineservice.cpp | 2 +- plasma/private/dialogshadows.cpp | 2 +- plasma/private/effectwatcher.cpp | 2 +- plasma/private/extenderapplet.cpp | 2 +- plasma/private/focusindicator.cpp | 2 +- plasma/private/getsource.cpp | 2 +- plasma/private/nativetabbar.cpp | 2 +- plasma/private/packages.cpp | 2 +- plasma/private/plasmoidservice.cpp | 2 +- plasma/private/storage.cpp | 2 +- plasma/private/storagethread.cpp | 2 +- plasma/private/style.cpp | 2 +- plasma/private/themedwidgetinterface.cpp | 2 +- plasma/private/tooltip.cpp | 2 +- plasma/private/wallpaperrenderthread.cpp | 2 +- plasma/private/windowpreview.cpp | 2 +- plasma/runnercontext.cpp | 2 +- plasma/runnermanager.cpp | 2 +- plasma/scripting/appletscript.cpp | 2 +- plasma/scripting/dataenginescript.cpp | 2 +- plasma/scripting/runnerscript.cpp | 2 +- plasma/scripting/scriptengine.cpp | 2 +- plasma/scripting/wallpaperscript.cpp | 2 +- plasma/service.cpp | 2 +- plasma/servicejob.cpp | 2 +- plasma/svg.cpp | 2 +- .../testcontainmentactionsplugin/test.cpp | 2 +- plasma/tests/testengine/testengine.cpp | 2 +- plasma/theme.cpp | 2 +- plasma/tooltipmanager.cpp | 2 +- plasma/view.cpp | 2 +- plasma/wallpaper.cpp | 4 +-- plasma/widgets/busywidget.cpp | 2 +- plasma/widgets/checkbox.cpp | 2 +- plasma/widgets/combobox.cpp | 2 +- plasma/widgets/declarativewidget.cpp | 2 +- plasma/widgets/flashinglabel.cpp | 2 +- plasma/widgets/frame.cpp | 2 +- plasma/widgets/groupbox.cpp | 2 +- plasma/widgets/iconwidget.cpp | 4 +-- plasma/widgets/itembackground.cpp | 2 +- plasma/widgets/label.cpp | 2 +- plasma/widgets/lineedit.cpp | 2 +- plasma/widgets/meter.cpp | 4 +-- plasma/widgets/pushbutton.cpp | 2 +- plasma/widgets/radiobutton.cpp | 2 +- plasma/widgets/scrollbar.cpp | 2 +- plasma/widgets/scrollwidget.cpp | 2 +- plasma/widgets/separator.cpp | 2 +- plasma/widgets/signalplotter.cpp | 2 +- plasma/widgets/slider.cpp | 2 +- plasma/widgets/spinbox.cpp | 2 +- plasma/widgets/svgwidget.cpp | 2 +- plasma/widgets/tabbar.cpp | 2 +- plasma/widgets/textbrowser.cpp | 2 +- plasma/widgets/textedit.cpp | 2 +- plasma/widgets/toolbutton.cpp | 2 +- plasma/widgets/treeview.cpp | 2 +- plasma/widgets/videowidget.cpp | 2 +- plasma/widgets/webview.cpp | 2 +- security/crypto/certexport.cpp | 2 +- security/crypto/crypto.cpp | 2 +- security/crypto/kdatetimedlg.cpp | 2 +- security/kcert/kcertpart.cc | 2 +- solid/solid/acadapter.cpp | 2 +- solid/solid/audiointerface.cpp | 2 +- solid/solid/backends/fakehw/fakeacadapter.cpp | 2 +- .../backends/fakehw/fakeaudiointerface.cpp | 2 +- solid/solid/backends/fakehw/fakebattery.cpp | 2 +- solid/solid/backends/fakehw/fakeblock.cpp | 2 +- solid/solid/backends/fakehw/fakebutton.cpp | 2 +- solid/solid/backends/fakehw/fakecamera.cpp | 2 +- solid/solid/backends/fakehw/fakecdrom.cpp | 2 +- solid/solid/backends/fakehw/fakedevice.cpp | 4 +-- .../backends/fakehw/fakedeviceinterface.cpp | 2 +- .../backends/fakehw/fakedvbinterface.cpp | 2 +- .../backends/fakehw/fakegenericinterface.cpp | 2 +- solid/solid/backends/fakehw/fakemanager.cpp | 2 +- .../backends/fakehw/fakenetworkinterface.cpp | 2 +- .../solid/backends/fakehw/fakeopticaldisc.cpp | 2 +- .../fakehw/fakeportablemediaplayer.cpp | 2 +- solid/solid/backends/fakehw/fakeprocessor.cpp | 2 +- .../backends/fakehw/fakesmartcardreader.cpp | 2 +- solid/solid/backends/fakehw/fakestorage.cpp | 2 +- .../backends/fakehw/fakestorageaccess.cpp | 2 +- solid/solid/backends/fakehw/fakevideo.cpp | 2 +- solid/solid/backends/fakehw/fakevolume.cpp | 2 +- solid/solid/backends/shared/udevqtclient.cpp | 2 +- .../backends/udev/udevaudiointerface.cpp | 2 +- solid/solid/backends/udev/udevblock.cpp | 2 +- solid/solid/backends/udev/udevcamera.cpp | 2 +- .../backends/udev/udevdeviceinterface.cpp | 2 +- .../solid/backends/udev/udevdvbinterface.cpp | 2 +- .../backends/udev/udevgenericinterface.cpp | 2 +- .../backends/udev/udevnetworkinterface.cpp | 2 +- .../backends/udev/udevportablemediaplayer.cpp | 2 +- solid/solid/backends/udev/udevprocessor.cpp | 2 +- .../backends/udev/udevserialinterface.cpp | 2 +- solid/solid/backends/udev/udevvideo.cpp | 2 +- .../udisks/udisksgenericinterface.cpp | 2 +- solid/solid/backends/udisks/udisksmanager.cpp | 2 +- .../backends/udisks/udisksstorageaccess.cpp | 2 +- .../solid/backends/upower/upoweracadapter.cpp | 2 +- solid/solid/backends/upower/upowerbattery.cpp | 2 +- .../upower/upowergenericinterface.cpp | 2 +- solid/solid/backends/upower/upowermanager.cpp | 2 +- solid/solid/battery.cpp | 2 +- solid/solid/block.cpp | 2 +- solid/solid/button.cpp | 2 +- solid/solid/camera.cpp | 2 +- solid/solid/device.cpp | 2 +- solid/solid/deviceinterface.cpp | 2 +- solid/solid/devicemanager.cpp | 4 +-- solid/solid/dvbinterface.cpp | 2 +- solid/solid/genericinterface.cpp | 2 +- solid/solid/ifaces/device.cpp | 2 +- solid/solid/ifaces/devicemanager.cpp | 2 +- solid/solid/networking.cpp | 4 +-- solid/solid/networkinterface.cpp | 2 +- solid/solid/networkshare.cpp | 2 +- solid/solid/opticaldisc.cpp | 2 +- solid/solid/opticaldrive.cpp | 2 +- solid/solid/portablemediaplayer.cpp | 2 +- solid/solid/powermanagement.cpp | 4 +-- solid/solid/processor.cpp | 2 +- solid/solid/serialinterface.cpp | 2 +- solid/solid/smartcardreader.cpp | 2 +- solid/solid/storageaccess.cpp | 2 +- solid/solid/storagedrive.cpp | 2 +- solid/solid/storagevolume.cpp | 2 +- solid/solid/video.cpp | 2 +- solid/tests/fakehardwaretest.cpp | 2 +- solid/tests/networkingclient.cpp | 2 +- solid/tests/solidhwtest.cpp | 2 +- solid/tests/solidnettestdbusservice.cpp | 2 +- sonnet/plugins/enchant/enchantclient.cpp | 2 +- sonnet/plugins/hspell/kspell_hspellclient.cpp | 2 +- .../hunspell/kspell_hunspellclient.cpp | 2 +- threadweaver/Examples/Jobs/Jobs.cpp | 2 +- .../Examples/Jobs/WeaverObserverTest.cpp | 2 +- .../Examples/QProcessJob/MainWindow.cpp | 2 +- .../Examples/QProcessJob/QProcessJob.cpp | 2 +- .../Examples/SMIV/ComputeThumbNailJob.cpp | 2 +- .../Examples/SMIV/QImageLoaderJob.cpp | 2 +- threadweaver/Examples/SMIV/SMIV.cpp | 2 +- threadweaver/Examples/SMIV/SMIVItem.cpp | 2 +- .../Examples/SMIV/SMIVItemDelegate.cpp | 2 +- threadweaver/Examples/SMIV/SMIVModel.cpp | 2 +- threadweaver/Examples/SMIV/SMIVView.cpp | 2 +- threadweaver/Experimental/FileLoaderJob.cpp | 2 +- threadweaver/Tests/AppendCharacterJob.cpp | 2 +- threadweaver/Tests/DeleteTest.cpp | 2 +- threadweaver/Tests/JobTests.cpp | 2 +- threadweaver/Tests/QueueTests.cpp | 2 +- threadweaver/Weaver/IncludeMocs.cpp | 4 +-- threadweaver/Weaver/Job.cpp | 4 +-- threadweaver/Weaver/JobCollection.cpp | 4 +-- threadweaver/Weaver/JobSequence.cpp | 2 +- threadweaver/Weaver/Thread.cpp | 2 +- threadweaver/Weaver/ThreadWeaver.cpp | 2 +- threadweaver/Weaver/WeaverImpl.cpp | 2 +- threadweaver/Weaver/WeaverInterface.cpp | 2 +- threadweaver/Weaver/WeaverObserver.cpp | 2 +- threadweaver/WeaverGui/WeaverThreadGrid.cpp | 2 +- 763 files changed, 823 insertions(+), 852 deletions(-) diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake index 5b6c7ab1..28940ea0 100644 --- a/cmake/modules/FindKDE4Internal.cmake +++ b/cmake/modules/FindKDE4Internal.cmake @@ -195,7 +195,6 @@ # KDE4_ADD_EXECUTABLE (name [NOGUI] [TEST] [RUN_UNINSTALLED] file1 ... fileN) # Equivalent to ADD_EXECUTABLE(), but additionally adds some more features: # -support for KDE4_ENABLE_FINAL -# -support for automoc # -automatic RPATH handling # If the executable doesn't have a GUI, use the option NOGUI. By default on OS X # application bundles are created, with the NOGUI option no bundles but simple executables diff --git a/cmake/modules/KDE4Defaults.cmake b/cmake/modules/KDE4Defaults.cmake index 3faa70eb..3c9af3f0 100644 --- a/cmake/modules/KDE4Defaults.cmake +++ b/cmake/modules/KDE4Defaults.cmake @@ -3,6 +3,10 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/CTestConfig.cmake) include(CTest) endif (EXISTS ${CMAKE_SOURCE_DIR}/CTestConfig.cmake) +# let cmake handle mocking +# since cmake 2.8.6 +set(CMAKE_AUTOMOC ON) + # Always include srcdir and builddir in include path # This saves typing ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} in about every subdir # since cmake 2.4.0 diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake index 3cd5538e..5e334574 100644 --- a/cmake/modules/KDE4Macros.cmake +++ b/cmake/modules/KDE4Macros.cmake @@ -527,11 +527,6 @@ macro (KDE4_ADD_PLUGIN _target_NAME ) set(_SRCS ${_args}) - - if (NOT CMAKE_AUTOMOC) - _automoc4_kde4_pre_target_handling(${_target_NAME} _SRCS) - endif() - if("${_add_lib_param}" STREQUAL "STATIC") add_definitions(-DQT_STATICPLUGIN) endif("${_add_lib_param}" STREQUAL "STATIC") @@ -543,10 +538,6 @@ macro (KDE4_ADD_PLUGIN _target_NAME ) add_library(${_target_NAME} ${_add_lib_param} ${_SRCS}) endif (KDE4_ENABLE_FINAL) - if (NOT CMAKE_AUTOMOC) - _automoc4_kde4_post_target_handling(${_target_NAME}) - endif() - if (NOT _with_pre) set_target_properties(${_target_NAME} PROPERTIES PREFIX "") endif (NOT _with_pre) @@ -634,9 +625,6 @@ macro (KDE4_ADD_KDEINIT_EXECUTABLE _target_NAME ) # keep the linking logic from the CMakeLists.txt on UNIX working (under UNIX all necessary libs are linked against the kdeinit # library instead against the executable, under windows we want to have everything in the executable, but for compatibility we have to # keep the library there- - if (NOT CMAKE_AUTOMOC) - _automoc4_kde4_pre_target_handling(kdeinit_${_target_NAME} _SRCS) - endif() if (KDE4_ENABLE_FINAL) kde4_create_final_files(${CMAKE_CURRENT_BINARY_DIR}/kdeinit_${_target_NAME}_final_cpp.cpp _separate_files ${_SRCS}) @@ -645,10 +633,6 @@ macro (KDE4_ADD_KDEINIT_EXECUTABLE _target_NAME ) add_library(kdeinit_${_target_NAME} SHARED ${_SRCS}) endif (KDE4_ENABLE_FINAL) - if (NOT CMAKE_AUTOMOC) - _automoc4_kde4_post_target_handling(kdeinit_${_target_NAME}) - endif() - set_target_properties(kdeinit_${_target_NAME} PROPERTIES OUTPUT_NAME kdeinit4_${_target_NAME}) kde4_add_executable(${_target_NAME} "${_nogui}" ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${_resourcefile}) @@ -788,10 +772,6 @@ macro (KDE4_ADD_EXECUTABLE _target_NAME) set(_add_executable_param ${_add_executable_param} EXCLUDE_FROM_ALL) endif (_test AND NOT KDE4_BUILD_TESTS) - if (NOT CMAKE_AUTOMOC) - _automoc4_kde4_pre_target_handling(${_target_NAME} _SRCS) - endif() - if (KDE4_ENABLE_FINAL) kde4_create_final_files(${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp _separate_files ${_SRCS}) add_executable(${_target_NAME} ${_add_executable_param} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp ${_separate_files}) @@ -803,10 +783,6 @@ macro (KDE4_ADD_EXECUTABLE _target_NAME) _kde4_add_manifest(${_target_NAME}) ENDIF(KDE4_ENABLE_UAC_MANIFEST) - if (NOT CMAKE_AUTOMOC) - _automoc4_kde4_post_target_handling(${_target_NAME}) - endif() - if (_test) set_target_properties(${_target_NAME} PROPERTIES COMPILE_FLAGS -DKDESRCDIR="\\"${CMAKE_CURRENT_SOURCE_DIR}/\\"") endif (_test) @@ -835,10 +811,6 @@ macro (KDE4_ADD_LIBRARY _target_NAME _lib_TYPE) set(_SRCS ${_first_SRC} ${ARGN}) - if (NOT CMAKE_AUTOMOC) - _automoc4_kde4_pre_target_handling(${_target_NAME} _SRCS) - endif() - if (KDE4_ENABLE_FINAL) kde4_create_final_files(${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp _separate_files ${_SRCS}) add_library(${_target_NAME} ${_add_lib_param} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp ${_separate_files}) @@ -846,10 +818,6 @@ macro (KDE4_ADD_LIBRARY _target_NAME _lib_TYPE) add_library(${_target_NAME} ${_add_lib_param} ${_SRCS}) endif (KDE4_ENABLE_FINAL) - if (NOT CMAKE_AUTOMOC) - _automoc4_kde4_post_target_handling(${_target_NAME}) - endif() - # for shared libraries a -DMAKE_target_LIB is required string(TOUPPER ${_target_NAME} _symbol) string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _symbol ${_symbol}) diff --git a/dnssd/avahi-domainbrowser.cpp b/dnssd/avahi-domainbrowser.cpp index d36f8844..9a5c4d46 100644 --- a/dnssd/avahi-domainbrowser.cpp +++ b/dnssd/avahi-domainbrowser.cpp @@ -105,5 +105,5 @@ bool DomainBrowser::isRunning() const } -#include "domainbrowser.moc" -#include "avahi-domainbrowser_p.moc" +#include "moc_domainbrowser.cpp" +#include "moc_avahi-domainbrowser_p.cpp" diff --git a/dnssd/avahi-publicservice.cpp b/dnssd/avahi-publicservice.cpp index 618cc2f3..168f64ef 100644 --- a/dnssd/avahi-publicservice.cpp +++ b/dnssd/avahi-publicservice.cpp @@ -259,5 +259,5 @@ void PublicService::virtual_hook(int, void*) } -#include "publicservice.moc" -#include "avahi-publicservice_p.moc" +#include "moc_publicservice.cpp" +#include "moc_avahi-publicservice_p.cpp" diff --git a/dnssd/avahi-remoteservice.cpp b/dnssd/avahi-remoteservice.cpp index 56c0e73e..0cbc2333 100644 --- a/dnssd/avahi-remoteservice.cpp +++ b/dnssd/avahi-remoteservice.cpp @@ -120,5 +120,5 @@ void RemoteService::virtual_hook(int, void*) } -#include "remoteservice.moc" -#include "avahi-remoteservice_p.moc" +#include "moc_remoteservice.cpp" +#include "moc_avahi-remoteservice_p.cpp" diff --git a/dnssd/avahi-servicebrowser.cpp b/dnssd/avahi-servicebrowser.cpp index 28c40fa3..8f866b5c 100644 --- a/dnssd/avahi-servicebrowser.cpp +++ b/dnssd/avahi-servicebrowser.cpp @@ -189,5 +189,5 @@ QString ServiceBrowser::getLocalHostName() } -#include "servicebrowser.moc" -#include "avahi-servicebrowser_p.moc" +#include "moc_servicebrowser.cpp" +#include "moc_avahi-servicebrowser_p.cpp" diff --git a/dnssd/avahi-servicetypebrowser.cpp b/dnssd/avahi-servicetypebrowser.cpp index cf4fcd27..773a72b8 100644 --- a/dnssd/avahi-servicetypebrowser.cpp +++ b/dnssd/avahi-servicetypebrowser.cpp @@ -98,5 +98,5 @@ bool ServiceTypeBrowser::isRunning() const } -#include "servicetypebrowser.moc" -#include "avahi-servicetypebrowser_p.moc" +#include "moc_servicetypebrowser.cpp" +#include "moc_avahi-servicetypebrowser_p.cpp" diff --git a/dnssd/avahi_entrygroup_interface.cpp b/dnssd/avahi_entrygroup_interface.cpp index d784e745..9906eea9 100644 --- a/dnssd/avahi_entrygroup_interface.cpp +++ b/dnssd/avahi_entrygroup_interface.cpp @@ -27,4 +27,4 @@ OrgFreedesktopAvahiEntryGroupInterface::~OrgFreedesktopAvahiEntryGroupInterface( } -#include "avahi_entrygroup_interface.moc" +#include "moc_avahi_entrygroup_interface.cpp" diff --git a/dnssd/avahi_server_interface.cpp b/dnssd/avahi_server_interface.cpp index 9ca7756a..ab575558 100644 --- a/dnssd/avahi_server_interface.cpp +++ b/dnssd/avahi_server_interface.cpp @@ -53,4 +53,4 @@ QString DNSToDomain(const QString& domain) } } -#include "avahi_server_interface.moc" +#include "moc_avahi_server_interface.cpp" diff --git a/dnssd/avahi_serviceresolver_interface.cpp b/dnssd/avahi_serviceresolver_interface.cpp index 7175d9eb..b7e7b45d 100644 --- a/dnssd/avahi_serviceresolver_interface.cpp +++ b/dnssd/avahi_serviceresolver_interface.cpp @@ -26,4 +26,4 @@ OrgFreedesktopAvahiServiceResolverInterface::~OrgFreedesktopAvahiServiceResolver } -#include "avahi_serviceresolver_interface.moc" +#include "moc_avahi_serviceresolver_interface.cpp" diff --git a/dnssd/dummy-domainbrowser.cpp b/dnssd/dummy-domainbrowser.cpp index 0abe3f08..a41bb2e3 100644 --- a/dnssd/dummy-domainbrowser.cpp +++ b/dnssd/dummy-domainbrowser.cpp @@ -45,4 +45,4 @@ bool DomainBrowser::isRunning() const } } -#include "domainbrowser.moc" +#include "moc_domainbrowser.cpp" diff --git a/dnssd/dummy-publicservice.cpp b/dnssd/dummy-publicservice.cpp index a3af37b5..d3135a41 100644 --- a/dnssd/dummy-publicservice.cpp +++ b/dnssd/dummy-publicservice.cpp @@ -95,4 +95,4 @@ void PublicService::virtual_hook(int, void*) } -#include "publicservice.moc" +#include "moc_publicservice.cpp" diff --git a/dnssd/dummy-remoteservice.cpp b/dnssd/dummy-remoteservice.cpp index 3e56a5e9..22eb623e 100644 --- a/dnssd/dummy-remoteservice.cpp +++ b/dnssd/dummy-remoteservice.cpp @@ -58,4 +58,4 @@ void RemoteService::virtual_hook(int, void*) } -#include "remoteservice.moc" +#include "moc_remoteservice.cpp" diff --git a/dnssd/dummy-servicebrowser.cpp b/dnssd/dummy-servicebrowser.cpp index ab9cf337..888c5858 100644 --- a/dnssd/dummy-servicebrowser.cpp +++ b/dnssd/dummy-servicebrowser.cpp @@ -69,4 +69,4 @@ QString ServiceBrowser::getLocalHostName() } -#include "servicebrowser.moc" +#include "moc_servicebrowser.cpp" diff --git a/dnssd/dummy-servicetypebrowser.cpp b/dnssd/dummy-servicetypebrowser.cpp index cc9b61ad..18895cb3 100644 --- a/dnssd/dummy-servicetypebrowser.cpp +++ b/dnssd/dummy-servicetypebrowser.cpp @@ -47,4 +47,4 @@ bool ServiceTypeBrowser::isRunning() const #endif } -#include "servicetypebrowser.moc" +#include "moc_servicetypebrowser.cpp" diff --git a/dnssd/mdnsd-domainbrowser.cpp b/dnssd/mdnsd-domainbrowser.cpp index a8be2fb5..9d441d8e 100644 --- a/dnssd/mdnsd-domainbrowser.cpp +++ b/dnssd/mdnsd-domainbrowser.cpp @@ -127,5 +127,5 @@ void domain_callback(DNSServiceRef, DNSServiceFlags flags, uint32_t, DNSServiceE -#include "domainbrowser.moc" -#include "mdnsd-domainbrowser_p.moc" +#include "moc_domainbrowser.cpp" +#include "moc_mdnsd-domainbrowser_p.cpp" diff --git a/dnssd/mdnsd-publicservice.cpp b/dnssd/mdnsd-publicservice.cpp index 221c6fa7..2a775fab 100644 --- a/dnssd/mdnsd-publicservice.cpp +++ b/dnssd/mdnsd-publicservice.cpp @@ -204,4 +204,4 @@ void PublicService::virtual_hook(int, void*) } -#include "publicservice.moc" +#include "moc_publicservice.cpp" diff --git a/dnssd/mdnsd-remoteservice.cpp b/dnssd/mdnsd-remoteservice.cpp index bc661b88..cf3366ea 100644 --- a/dnssd/mdnsd-remoteservice.cpp +++ b/dnssd/mdnsd-remoteservice.cpp @@ -151,4 +151,4 @@ void resolve_callback ( DNSServiceRef, } -#include "remoteservice.moc" +#include "moc_remoteservice.cpp" diff --git a/dnssd/mdnsd-responder.cpp b/dnssd/mdnsd-responder.cpp index 6adbf46b..ddf0c4aa 100644 --- a/dnssd/mdnsd-responder.cpp +++ b/dnssd/mdnsd-responder.cpp @@ -82,4 +82,4 @@ QString DNSToDomain(const char* domain) } } -#include "mdnsd-responder.moc" +#include "moc_mdnsd-responder.cpp" diff --git a/dnssd/mdnsd-servicebrowser.cpp b/dnssd/mdnsd-servicebrowser.cpp index 36fe262b..307ff5ce 100644 --- a/dnssd/mdnsd-servicebrowser.cpp +++ b/dnssd/mdnsd-servicebrowser.cpp @@ -197,5 +197,5 @@ QString ServiceBrowser::getLocalHostName() } -#include "servicebrowser.moc" -#include "mdnsd-servicebrowser_p.moc" +#include "moc_servicebrowser.cpp" +#include "moc_mdnsd-servicebrowser_p.cpp" diff --git a/dnssd/mdnsd-servicetypebrowser.cpp b/dnssd/mdnsd-servicetypebrowser.cpp index f828ee4f..171bec36 100644 --- a/dnssd/mdnsd-servicetypebrowser.cpp +++ b/dnssd/mdnsd-servicetypebrowser.cpp @@ -76,5 +76,5 @@ void ServiceTypeBrowserPrivate::removeService(DNSSD::RemoteService::Ptr srv) -#include "servicetypebrowser.moc" -#include "mdnsd-servicetypebrowser_p.moc" +#include "moc_servicetypebrowser.cpp" +#include "moc_mdnsd-servicetypebrowser_p.cpp" diff --git a/experimental/libkdeclarative/private/engineaccess.cpp b/experimental/libkdeclarative/private/engineaccess.cpp index 8bc4b823..042312ea 100644 --- a/experimental/libkdeclarative/private/engineaccess.cpp +++ b/experimental/libkdeclarative/private/engineaccess.cpp @@ -38,4 +38,4 @@ void EngineAccess::setEngine(QScriptValue val) m_kDeclarative->d->scriptEngine = val.engine(); } -#include "engineaccess_p.moc" +#include "moc_engineaccess_p.cpp" diff --git a/experimental/libkdeclarative/test/test.cpp b/experimental/libkdeclarative/test/test.cpp index 8dfe6ee9..1f4a1358 100644 --- a/experimental/libkdeclarative/test/test.cpp +++ b/experimental/libkdeclarative/test/test.cpp @@ -58,4 +58,4 @@ int main(int argc, char *argv[]) return app.exec(); } -#include "testobject_p.moc" +#include "moc_testobject_p.cpp" diff --git a/interfaces/kimproxy/library/kimproxy.cpp b/interfaces/kimproxy/library/kimproxy.cpp index cff8c85e..0460c225 100644 --- a/interfaces/kimproxy/library/kimproxy.cpp +++ b/interfaces/kimproxy/library/kimproxy.cpp @@ -651,4 +651,4 @@ QString KIMProxy::preferredApp() return preferredApp; } -#include "kimproxy.moc" +#include "moc_kimproxy.cpp" diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp index cbd2110c..f7ee5747 100644 --- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp +++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp @@ -150,4 +150,4 @@ void KFileAudioPreview::toggleAuto( bool on ) d->player->stop(); } -#include "kfileaudiopreview.moc" +#include "moc_kfileaudiopreview.cpp" diff --git a/interfaces/kmediaplayer/kfileaudiopreview/mediacontrols.cpp b/interfaces/kmediaplayer/kfileaudiopreview/mediacontrols.cpp index 2a56df7e..40d3b649 100644 --- a/interfaces/kmediaplayer/kfileaudiopreview/mediacontrols.cpp +++ b/interfaces/kmediaplayer/kfileaudiopreview/mediacontrols.cpp @@ -140,5 +140,5 @@ void MediaControlsPrivate::_k_mediaDestroyed() } // namespace Phonon -#include "mediacontrols.moc" +#include "moc_mediacontrols.cpp" // vim: sw=4 ts=4 diff --git a/interfaces/kmediaplayer/kmediaplayeradaptor.cpp b/interfaces/kmediaplayer/kmediaplayeradaptor.cpp index 13d7282b..679d28f2 100644 --- a/interfaces/kmediaplayer/kmediaplayeradaptor.cpp +++ b/interfaces/kmediaplayer/kmediaplayeradaptor.cpp @@ -128,4 +128,4 @@ void KMediaPlayerAdaptor::stop() } -#include "kmediaplayeradaptor_p.moc" +#include "moc_kmediaplayeradaptor_p.cpp" diff --git a/interfaces/kmediaplayer/player.cpp b/interfaces/kmediaplayer/player.cpp index d28c6f9a..c050a6d3 100644 --- a/interfaces/kmediaplayer/player.cpp +++ b/interfaces/kmediaplayer/player.cpp @@ -74,4 +74,4 @@ int KMediaPlayer::Player::state(void) const return (int)currentState; } -#include "player.moc" +#include "moc_player.cpp" diff --git a/interfaces/kmediaplayer/view.cpp b/interfaces/kmediaplayer/view.cpp index c07dc0d1..72fdef26 100644 --- a/interfaces/kmediaplayer/view.cpp +++ b/interfaces/kmediaplayer/view.cpp @@ -86,4 +86,4 @@ QWidget* KMediaPlayer::View::videoWidget() return d->videoWidget; } -#include "view.moc" +#include "moc_view.cpp" diff --git a/interfaces/ktexteditor/codecompletionmodel.cpp b/interfaces/ktexteditor/codecompletionmodel.cpp index 4c80f122..c6fc9b08 100644 --- a/interfaces/ktexteditor/codecompletionmodel.cpp +++ b/interfaces/ktexteditor/codecompletionmodel.cpp @@ -121,4 +121,4 @@ void CodeCompletionModel2::executeCompletionItem2(Document* document, const Rang document->replaceText(word, data(index.sibling(index.row(), Name)).toString()); } -#include "codecompletionmodel.moc" +#include "moc_codecompletionmodel.cpp" diff --git a/interfaces/ktexteditor/cursorfeedback.cpp b/interfaces/ktexteditor/cursorfeedback.cpp index c012e157..0dabb9e0 100644 --- a/interfaces/ktexteditor/cursorfeedback.cpp +++ b/interfaces/ktexteditor/cursorfeedback.cpp @@ -76,6 +76,6 @@ void SmartCursorWatcher::deleted( SmartCursor * ) { } -#include "smartcursornotifier.moc" +#include "moc_smartcursornotifier.cpp" // kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/interfaces/ktexteditor/document.cpp b/interfaces/ktexteditor/document.cpp index 26a70384..0b2ff070 100644 --- a/interfaces/ktexteditor/document.cpp +++ b/interfaces/ktexteditor/document.cpp @@ -19,10 +19,10 @@ */ #include "document.h" -#include "document.moc" +#include "moc_document.cpp" #include "documentadaptor_p.h" -#include "documentadaptor_p.moc" +#include "moc_documentadaptor_p.cpp" using namespace KTextEditor; diff --git a/interfaces/ktexteditor/ktexteditor.cpp b/interfaces/ktexteditor/ktexteditor.cpp index 1c24a165..03d52743 100644 --- a/interfaces/ktexteditor/ktexteditor.cpp +++ b/interfaces/ktexteditor/ktexteditor.cpp @@ -22,21 +22,21 @@ #include "cursor.h" #include "configpage.h" -#include "configpage.moc" +#include "moc_configpage.cpp" #include "factory.h" -#include "factory.moc" +#include "moc_factory.cpp" #include "editor.h" -#include "editor.moc" +#include "moc_editor.cpp" #include "document.h" #include "view.h" -#include "view.moc" +#include "moc_view.cpp" #include "plugin.h" -#include "plugin.moc" +#include "moc_plugin.cpp" #include "recoveryinterface.h" #include "commandinterface.h" @@ -50,10 +50,10 @@ #include "containerinterface.h" #include "annotationinterface.h" -#include "annotationinterface.moc" +#include "moc_annotationinterface.cpp" #include "loadsavefiltercheckplugin.h" -#include "loadsavefiltercheckplugin.moc" +#include "moc_loadsavefiltercheckplugin.cpp" #include "modeinterface.h" diff --git a/interfaces/ktexteditor/rangefeedback.cpp b/interfaces/ktexteditor/rangefeedback.cpp index 7675c883..988f7005 100644 --- a/interfaces/ktexteditor/rangefeedback.cpp +++ b/interfaces/ktexteditor/rangefeedback.cpp @@ -107,6 +107,6 @@ void SmartRangeWatcher::parentRangeChanged( SmartRange *, SmartRange *, SmartRan { } -#include "smartrangenotifier.moc" +#include "moc_smartrangenotifier.cpp" // kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kconf_update/tests/test_kconf_update.cpp b/kconf_update/tests/test_kconf_update.cpp index 054693e9..84eb55dd 100644 --- a/kconf_update/tests/test_kconf_update.cpp +++ b/kconf_update/tests/test_kconf_update.cpp @@ -551,4 +551,4 @@ void TestKConfUpdate::testScript() QCOMPARE(newConfContent, expectedNewConfContent); } -#include "test_kconf_update.moc" +#include "moc_test_kconf_update.cpp" diff --git a/kconf_update/tests/test_kconfigutils.cpp b/kconf_update/tests/test_kconfigutils.cpp index 97dc6323..44db08d1 100644 --- a/kconf_update/tests/test_kconfigutils.cpp +++ b/kconf_update/tests/test_kconfigutils.cpp @@ -149,4 +149,4 @@ void TestKConfigUtils::testUnescapeString() } } -#include "test_kconfigutils.moc" +#include "moc_test_kconfigutils.cpp" diff --git a/kdecore/auth/kauthactionwatcher.cpp b/kdecore/auth/kauthactionwatcher.cpp index d2c920f6..98ae8387 100644 --- a/kdecore/auth/kauthactionwatcher.cpp +++ b/kdecore/auth/kauthactionwatcher.cpp @@ -115,4 +115,4 @@ void ActionWatcher::Private::statusChangedSlot(const QString &taction, Action::A } // namespace Auth -#include "kauthactionwatcher.moc" +#include "moc_kauthactionwatcher.cpp" diff --git a/kdecore/config/kconfigbackend.cpp b/kdecore/config/kconfigbackend.cpp index cd10da78..967dc3a8 100644 --- a/kdecore/config/kconfigbackend.cpp +++ b/kdecore/config/kconfigbackend.cpp @@ -39,7 +39,7 @@ #include "kconfigdata.h" #include "kdebug.h" #include "kstandarddirs.h" -#include "kconfigbackend.moc" +#include "moc_kconfigbackend.cpp" typedef KSharedPtr BackendPtr; diff --git a/kdecore/config/kcoreconfigskeleton.cpp b/kdecore/config/kcoreconfigskeleton.cpp index 938c6814..87cc74ff 100644 --- a/kdecore/config/kcoreconfigskeleton.cpp +++ b/kdecore/config/kcoreconfigskeleton.cpp @@ -1318,5 +1318,5 @@ KConfigSkeletonItem *KCoreConfigSkeleton::findItem(const QString &name) const return d->mItemDict.value(name); } -#include "kcoreconfigskeleton.moc" +#include "moc_kcoreconfigskeleton.cpp" diff --git a/kdecore/date/ksystemtimezone.cpp b/kdecore/date/ksystemtimezone.cpp index 4238c338..adb21c1b 100644 --- a/kdecore/date/ksystemtimezone.cpp +++ b/kdecore/date/ksystemtimezone.cpp @@ -22,7 +22,7 @@ // This file requires HAVE_STRUCT_TM_TM_ZONE to be defined if struct tm member tm_zone is available. // This file requires HAVE_TM_GMTOFF to be defined if struct tm member tm_gmtoff is available. -#include "ksystemtimezone.moc" +#include "moc_ksystemtimezone.cpp" #include #include diff --git a/kdecore/io/kautosavefile.cpp b/kdecore/io/kautosavefile.cpp index 91b723e9..7e81023e 100644 --- a/kdecore/io/kautosavefile.cpp +++ b/kdecore/io/kautosavefile.cpp @@ -226,4 +226,4 @@ QList KAutoSaveFile::allStaleFiles(const QString &applicationNa return list; } -#include "kautosavefile.moc" +#include "moc_kautosavefile.cpp" diff --git a/kdecore/io/kdebugdbusiface.cpp b/kdecore/io/kdebugdbusiface.cpp index 6fbab742..aa205a82 100644 --- a/kdecore/io/kdebugdbusiface.cpp +++ b/kdecore/io/kdebugdbusiface.cpp @@ -43,4 +43,4 @@ void KDebugDBusIface::printBacktrace() kDebug() << kBacktrace(); } -#include "kdebugdbusiface_p.moc" +#include "moc_kdebugdbusiface_p.cpp" diff --git a/kdecore/io/kdirwatch.cpp b/kdecore/io/kdirwatch.cpp index afda88d6..83a7a570 100644 --- a/kdecore/io/kdirwatch.cpp +++ b/kdecore/io/kdirwatch.cpp @@ -1915,7 +1915,7 @@ KDirWatch::Method KDirWatch::internalMethod() } -#include "kdirwatch.moc" -#include "kdirwatch_p.moc" +#include "moc_kdirwatch.cpp" +#include "moc_kdirwatch_p.cpp" //sven diff --git a/kdecore/io/kprocess.cpp b/kdecore/io/kprocess.cpp index 0dc6aaaa..ed45ceb2 100644 --- a/kdecore/io/kprocess.cpp +++ b/kdecore/io/kprocess.cpp @@ -358,4 +358,4 @@ int KProcess::pid() const #endif } -#include "kprocess.moc" +#include "moc_kprocess.cpp" diff --git a/kdecore/jobs/kcompositejob.cpp b/kdecore/jobs/kcompositejob.cpp index 47222641..6e952130 100644 --- a/kdecore/jobs/kcompositejob.cpp +++ b/kdecore/jobs/kcompositejob.cpp @@ -115,4 +115,4 @@ void KCompositeJob::slotInfoMessage( KJob *job, const QString &plain, const QStr emit infoMessage( job, plain, rich ); } -#include "kcompositejob.moc" +#include "moc_kcompositejob.cpp" diff --git a/kdecore/jobs/kjob.cpp b/kdecore/jobs/kjob.cpp index 123068b5..ba99a3ea 100644 --- a/kdecore/jobs/kjob.cpp +++ b/kdecore/jobs/kjob.cpp @@ -367,4 +367,4 @@ void KJob::setAutoDelete( bool autodelete ) d->isAutoDelete = autodelete; } -#include "kjob.moc" +#include "moc_kjob.cpp" diff --git a/kdecore/jobs/kjobtrackerinterface.cpp b/kdecore/jobs/kjobtrackerinterface.cpp index 1f87ede5..fecef8a0 100644 --- a/kdecore/jobs/kjobtrackerinterface.cpp +++ b/kdecore/jobs/kjobtrackerinterface.cpp @@ -147,4 +147,4 @@ void KJobTrackerInterface::speed(KJob *job, unsigned long value) Q_UNUSED(value) } -#include "kjobtrackerinterface.moc" +#include "moc_kjobtrackerinterface.cpp" diff --git a/kdecore/jobs/kjobuidelegate.cpp b/kdecore/jobs/kjobuidelegate.cpp index d3adea21..b2a9cc9c 100644 --- a/kdecore/jobs/kjobuidelegate.cpp +++ b/kdecore/jobs/kjobuidelegate.cpp @@ -117,4 +117,4 @@ void KJobUiDelegate::Private::_k_result(KJob *job2) q->showErrorMessage(); } -#include "kjobuidelegate.moc" +#include "moc_kjobuidelegate.cpp" diff --git a/kdecore/kernel/ktoolinvocation.cpp b/kdecore/kernel/ktoolinvocation.cpp index 9f393c29..a2a45add 100644 --- a/kdecore/kernel/ktoolinvocation.cpp +++ b/kdecore/kernel/ktoolinvocation.cpp @@ -386,4 +386,4 @@ void KToolInvocation::startKdeinit() // qApp->restoreOverrideCursor(); } -#include "ktoolinvocation.moc" +#include "moc_ktoolinvocation.cpp" diff --git a/kdecore/network/klocalsocket.cpp b/kdecore/network/klocalsocket.cpp index 234e2620..cc7a96e4 100644 --- a/kdecore/network/klocalsocket.cpp +++ b/kdecore/network/klocalsocket.cpp @@ -222,4 +222,4 @@ QString KLocalSocketServer::errorString() const return d->errorString; } -#include "klocalsocket.moc" +#include "moc_klocalsocket.cpp" diff --git a/kdecore/network/ksslcertificatemanager.cpp b/kdecore/network/ksslcertificatemanager.cpp index d7487093..da4a0a85 100644 --- a/kdecore/network/ksslcertificatemanager.cpp +++ b/kdecore/network/ksslcertificatemanager.cpp @@ -530,4 +530,4 @@ void _setAllKsslCaCertificates(KSslCertificateManager *cm, const QListsetAllCertificates(certsIn); } -#include "kssld/kssld_interface.moc" +#include "kssld/moc_kssld_interface.cpp" diff --git a/kdecore/network/kssld/kssld.cpp b/kdecore/network/kssld/kssld.cpp index abbba6a3..d6b6ff7b 100644 --- a/kdecore/network/kssld/kssld.cpp +++ b/kdecore/network/kssld/kssld.cpp @@ -280,5 +280,5 @@ KSslCertificateRule KSSLD::rule(const QSslCertificate &cert, const QString &host } -#include "kssld.moc" -#include "kssld_adaptor.moc" +#include "moc_kssld.cpp" +#include "moc_kssld_adaptor.cpp" diff --git a/kdecore/network/ktcpsocket.cpp b/kdecore/network/ktcpsocket.cpp index 8ade8743..bd604383 100644 --- a/kdecore/network/ktcpsocket.cpp +++ b/kdecore/network/ktcpsocket.cpp @@ -1150,4 +1150,4 @@ KSslErrorUiData &KSslErrorUiData::operator=(const KSslErrorUiData &other) } -#include "ktcpsocket.moc" +#include "moc_ktcpsocket.cpp" diff --git a/kdecore/sonnet/backgroundchecker.cpp b/kdecore/sonnet/backgroundchecker.cpp index c6fab83f..df166025 100644 --- a/kdecore/sonnet/backgroundchecker.cpp +++ b/kdecore/sonnet/backgroundchecker.cpp @@ -168,4 +168,4 @@ void Sonnet::BackgroundChecker::replace(int start, const QString &oldText, d->engine->filter()->replace(w, newText); } -#include "backgroundchecker.moc" +#include "moc_backgroundchecker.cpp" diff --git a/kdecore/sonnet/backgroundengine.cpp b/kdecore/sonnet/backgroundengine.cpp index 5d99d0e4..40c80901 100644 --- a/kdecore/sonnet/backgroundengine.cpp +++ b/kdecore/sonnet/backgroundengine.cpp @@ -116,4 +116,4 @@ QStringList BackgroundEngine::suggest(const QString &word) return m_dict.suggest(word); } -#include "backgroundengine_p.moc" +#include "moc_backgroundengine_p.cpp" diff --git a/kdecore/sonnet/client.cpp b/kdecore/sonnet/client.cpp index 00836702..c38d9b24 100644 --- a/kdecore/sonnet/client.cpp +++ b/kdecore/sonnet/client.cpp @@ -30,4 +30,4 @@ Client::Client( QObject *parent ) } -#include "client_p.moc" +#include "moc_client_p.cpp" diff --git a/kdecore/sonnet/loader.cpp b/kdecore/sonnet/loader.cpp index 7d72c4c6..dd37d306 100644 --- a/kdecore/sonnet/loader.cpp +++ b/kdecore/sonnet/loader.cpp @@ -295,4 +295,4 @@ void Loader::changed() } -#include "loader_p.moc" +#include "moc_loader_p.cpp" diff --git a/kdecore/sonnet/tests/test_core.cpp b/kdecore/sonnet/tests/test_core.cpp index ab2ce7e3..a4ffd2d5 100644 --- a/kdecore/sonnet/tests/test_core.cpp +++ b/kdecore/sonnet/tests/test_core.cpp @@ -169,4 +169,4 @@ void SonnetCoreTest::testCore2() kDebug()<<"\tlang is "<sycoca()->d->closeDatabase(); } -#include "ksycoca.moc" +#include "moc_ksycoca.cpp" diff --git a/kdecore/tests/karchivetest.cpp b/kdecore/tests/karchivetest.cpp index 3c620c29..7d67c47f 100644 --- a/kdecore/tests/karchivetest.cpp +++ b/kdecore/tests/karchivetest.cpp @@ -21,7 +21,7 @@ #include "karchivetest.h" #include -#include "karchivetest.moc" +#include "moc_karchivetest.cpp" #include #include diff --git a/kdecore/tests/kasciitest.cpp b/kdecore/tests/kasciitest.cpp index fb1177ef..d4c8630b 100644 --- a/kdecore/tests/kasciitest.cpp +++ b/kdecore/tests/kasciitest.cpp @@ -50,4 +50,4 @@ void KAsciiTest::testkasciistricmp() QVERIFY( kasciistricmp( "B", "A" ) > 0 ); } -#include "kasciitest.moc" +#include "moc_kasciitest.cpp" diff --git a/kdecore/tests/kautosavefiletest.cpp b/kdecore/tests/kautosavefiletest.cpp index ca70c009..57e86e00 100644 --- a/kdecore/tests/kautosavefiletest.cpp +++ b/kdecore/tests/kautosavefiletest.cpp @@ -111,4 +111,4 @@ void KAutoSaveFileTest::test_locking() } -#include "kautosavefiletest.moc" +#include "moc_kautosavefiletest.cpp" diff --git a/kdecore/tests/kautostarttest.cpp b/kdecore/tests/kautostarttest.cpp index 47f06811..c1e3ae87 100644 --- a/kdecore/tests/kautostarttest.cpp +++ b/kdecore/tests/kautostarttest.cpp @@ -23,7 +23,7 @@ #include -#include "kautostarttest.moc" +#include "moc_kautostarttest.cpp" #include diff --git a/kdecore/tests/kcalendartest.cpp b/kdecore/tests/kcalendartest.cpp index f0ec461e..484b10f6 100644 --- a/kdecore/tests/kcalendartest.cpp +++ b/kdecore/tests/kcalendartest.cpp @@ -34,7 +34,7 @@ #include "kstandarddirs.h" #include "kconfiggroup.h" -#include "kcalendartest.moc" +#include "moc_kcalendartest.cpp" QTEST_KDEMAIN_CORE_WITH_COMPONENTNAME(KCalendarTest, "kdecalendarsystems" /*so that the .po exists*/) diff --git a/kdecore/tests/kcompositejobtest.cpp b/kdecore/tests/kcompositejobtest.cpp index a3814b3e..cf6279cd 100644 --- a/kdecore/tests/kcompositejobtest.cpp +++ b/kdecore/tests/kcompositejobtest.cpp @@ -104,4 +104,4 @@ void KCompositeJobTest::testDeletionDuringExecution() QTEST_KDEMAIN_CORE( KCompositeJobTest ); -#include "kcompositejobtest.moc" +#include "moc_kcompositejobtest.cpp" diff --git a/kdecore/tests/kconfigtest.cpp b/kdecore/tests/kconfigtest.cpp index 78e6ad18..7f75382b 100644 --- a/kdecore/tests/kconfigtest.cpp +++ b/kdecore/tests/kconfigtest.cpp @@ -23,7 +23,7 @@ #include #include #include -#include "kconfigtest.moc" +#include "moc_kconfigtest.cpp" #include #include diff --git a/kdecore/tests/kdatetimeformattertest.cpp b/kdecore/tests/kdatetimeformattertest.cpp index 44aee359..3a68b328 100644 --- a/kdecore/tests/kdatetimeformattertest.cpp +++ b/kdecore/tests/kdatetimeformattertest.cpp @@ -35,7 +35,7 @@ #include "kstandarddirs.h" #include "kconfiggroup.h" -#include "kdatetimeformattertest.moc" +#include "moc_kdatetimeformattertest.cpp" QTEST_KDEMAIN_CORE_WITH_COMPONENTNAME(KDateTimeFormatterTest, "kdecalendarsystems" /*so that the .po exists*/) diff --git a/kdecore/tests/kdatetimetest.cpp b/kdecore/tests/kdatetimetest.cpp index 5a8c8f40..2ac6ee65 100644 --- a/kdecore/tests/kdatetimetest.cpp +++ b/kdecore/tests/kdatetimetest.cpp @@ -28,7 +28,7 @@ #include #include -#include "kdatetimetest.moc" +#include "moc_kdatetimetest.cpp" //TODO: test new methods diff --git a/kdecore/tests/kdebug_unittest.cpp b/kdecore/tests/kdebug_unittest.cpp index 918f4e58..70843c57 100644 --- a/kdecore/tests/kdebug_unittest.cpp +++ b/kdecore/tests/kdebug_unittest.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "kdebug_unittest.moc" +#include "moc_kdebug_unittest.cpp" QTEST_KDEMAIN_CORE( KDebugTest ) diff --git a/kdecore/tests/kdesktopfiletest.cpp b/kdecore/tests/kdesktopfiletest.cpp index 9473c3d3..7e8e0eb8 100644 --- a/kdecore/tests/kdesktopfiletest.cpp +++ b/kdecore/tests/kdesktopfiletest.cpp @@ -19,7 +19,7 @@ #include #include #include -#include "kdesktopfiletest.moc" +#include "moc_kdesktopfiletest.cpp" #include "kdesktopfile.h" diff --git a/kdecore/tests/kdirwatchtest.cpp b/kdecore/tests/kdirwatchtest.cpp index 2f2243e2..9c16ec9c 100644 --- a/kdecore/tests/kdirwatchtest.cpp +++ b/kdecore/tests/kdirwatchtest.cpp @@ -83,4 +83,4 @@ int main (int argc, char **argv) return a.exec(); } -#include "kdirwatchtest.moc" +#include "moc_kdirwatchtest.cpp" diff --git a/kdecore/tests/kdirwatchtest_gui.cpp b/kdecore/tests/kdirwatchtest_gui.cpp index 938df9a7..f056cc2b 100644 --- a/kdecore/tests/kdirwatchtest_gui.cpp +++ b/kdecore/tests/kdirwatchtest_gui.cpp @@ -149,4 +149,4 @@ void KDirWatchTest_GUI::slotDeleted(const QString& path) m_eventBrowser->append( "Deleted(" + sender()->objectName() + "): " + path + '\n' ); } -#include "kdirwatchtest_gui.moc" +#include "moc_kdirwatchtest_gui.cpp" diff --git a/kdecore/tests/kencodingdetectortest.cpp b/kdecore/tests/kencodingdetectortest.cpp index 15a4c4d0..893d9704 100644 --- a/kdecore/tests/kencodingdetectortest.cpp +++ b/kdecore/tests/kencodingdetectortest.cpp @@ -21,7 +21,7 @@ #include #include -#include "kencodingdetectortest.moc" +#include "moc_kencodingdetectortest.cpp" static const char data1[] = "this should decode correctly"; static const char data2[] = "this is an invalid utf-8 byte: \xBF and another one: \xBE"; diff --git a/kdecore/tests/kentrymaptest.cpp b/kdecore/tests/kentrymaptest.cpp index eee7bbee..577a985a 100644 --- a/kdecore/tests/kentrymaptest.cpp +++ b/kdecore/tests/kentrymaptest.cpp @@ -22,7 +22,7 @@ #include #include "kconfigdata.h" -#include "kentrymaptest.moc" +#include "moc_kentrymaptest.cpp" const QByteArray group1("A Group"); const QByteArray key1("A Key"); diff --git a/kdecore/tests/kfiltertest.cpp b/kdecore/tests/kfiltertest.cpp index ec05cf77..fbe9b73f 100644 --- a/kdecore/tests/kfiltertest.cpp +++ b/kdecore/tests/kfiltertest.cpp @@ -428,4 +428,4 @@ void KFilterTest::slotFilterOutput(const QByteArray& data) m_filterOutput += data; } -#include "kfiltertest.moc" +#include "moc_kfiltertest.cpp" diff --git a/kdecore/tests/kjobtest.cpp b/kdecore/tests/kjobtest.cpp index 59dfd8ba..497fe2be 100644 --- a/kdecore/tests/kjobtest.cpp +++ b/kdecore/tests/kjobtest.cpp @@ -416,4 +416,4 @@ void TestJobUiDelegate::connectJob( KJob *job ) QVERIFY( job->uiDelegate()!=0 ); } -#include "kjobtest.moc" +#include "moc_kjobtest.cpp" diff --git a/kdecore/tests/klibloadertest.cpp b/kdecore/tests/klibloadertest.cpp index 4284fc94..3ec7a597 100644 --- a/kdecore/tests/klibloadertest.cpp +++ b/kdecore/tests/klibloadertest.cpp @@ -19,7 +19,7 @@ #include "klibloadertest.h" #include -#include "klibloadertest.moc" +#include "moc_klibloadertest.cpp" QTEST_KDEMAIN_CORE( KLibLoaderTest ) diff --git a/kdecore/tests/klimitediodevicetest.cpp b/kdecore/tests/klimitediodevicetest.cpp index ca3352c9..989a5238 100644 --- a/kdecore/tests/klimitediodevicetest.cpp +++ b/kdecore/tests/klimitediodevicetest.cpp @@ -76,4 +76,4 @@ void KLimitedIODeviceTest::testSeeking() QCOMPARE(dev.readAll(), chunk.data); } -#include "klimitediodevicetest.moc" +#include "moc_klimitediodevicetest.cpp" diff --git a/kdecore/tests/klocaletest.cpp b/kdecore/tests/klocaletest.cpp index cf380cf3..6ee2c52d 100644 --- a/kdecore/tests/klocaletest.cpp +++ b/kdecore/tests/klocaletest.cpp @@ -33,7 +33,7 @@ #include #include -#include "klocaletest.moc" +#include "moc_klocaletest.cpp" void KLocaleTest::initTestCase() diff --git a/kdecore/tests/klocaletimeformattest.cpp b/kdecore/tests/klocaletimeformattest.cpp index e8808ac1..a1ec0476 100644 --- a/kdecore/tests/klocaletimeformattest.cpp +++ b/kdecore/tests/klocaletimeformattest.cpp @@ -213,4 +213,4 @@ void KLocaleTimeFormatTest::formatAndReadAllCountriesTest() } QTEST_MAIN(KLocaleTimeFormatTest) -#include "klocaletimeformattest.moc" +#include "moc_klocaletimeformattest.cpp" diff --git a/kdecore/tests/klocalizedstringtest.cpp b/kdecore/tests/klocalizedstringtest.cpp index b2276caa..675315c2 100644 --- a/kdecore/tests/klocalizedstringtest.cpp +++ b/kdecore/tests/klocalizedstringtest.cpp @@ -35,7 +35,7 @@ #include -#include "klocalizedstringtest.moc" +#include "moc_klocalizedstringtest.cpp" void KLocalizedStringTest::initTestCase () { diff --git a/kdecore/tests/klocalsocketservertest.cpp b/kdecore/tests/klocalsocketservertest.cpp index 39d6cb0b..de467a81 100644 --- a/kdecore/tests/klocalsocketservertest.cpp +++ b/kdecore/tests/klocalsocketservertest.cpp @@ -299,4 +299,4 @@ void tst_KLocalSocketServer::abstractUnixSocket() QTEST_MAIN(tst_KLocalSocketServer) -#include "klocalsocketservertest.moc" +#include "moc_klocalsocketservertest.cpp" diff --git a/kdecore/tests/klocalsockettest.cpp b/kdecore/tests/klocalsockettest.cpp index 9de659b3..10a79ef3 100644 --- a/kdecore/tests/klocalsockettest.cpp +++ b/kdecore/tests/klocalsockettest.cpp @@ -243,4 +243,4 @@ void tst_KLocalSocket::connected() QTEST_MAIN(tst_KLocalSocket) -#include "klocalsockettest.moc" +#include "moc_klocalsockettest.cpp" diff --git a/kdecore/tests/klockfiletest.cpp b/kdecore/tests/klockfiletest.cpp index 2da76de3..a3811c5d 100644 --- a/kdecore/tests/klockfiletest.cpp +++ b/kdecore/tests/klockfiletest.cpp @@ -17,7 +17,7 @@ */ #include "klockfiletest.h" -#include "klockfiletest.moc" +#include "moc_klockfiletest.cpp" #include #include diff --git a/kdecore/tests/kmd5benchmark.cpp b/kdecore/tests/kmd5benchmark.cpp index 118090ee..793b6cf5 100644 --- a/kdecore/tests/kmd5benchmark.cpp +++ b/kdecore/tests/kmd5benchmark.cpp @@ -114,4 +114,4 @@ private Q_SLOTS: QTEST_KDEMAIN_CORE( KMd5Test ) -#include "kmd5test.moc" +#include "kmd5benchmark.moc" diff --git a/kdecore/tests/kmimeglobsfileparsertest.cpp b/kdecore/tests/kmimeglobsfileparsertest.cpp index 79a3a540..165e5d46 100644 --- a/kdecore/tests/kmimeglobsfileparsertest.cpp +++ b/kdecore/tests/kmimeglobsfileparsertest.cpp @@ -272,4 +272,4 @@ private: QTEST_KDEMAIN_CORE( KMimeFileParserTest ) -#include "kmimefileparsertest.moc" +#include "kmimeglobsfileparsertest.moc" diff --git a/kdecore/tests/kmimetypetest.cpp b/kdecore/tests/kmimetypetest.cpp index 35d0e61b..8eabba76 100644 --- a/kdecore/tests/kmimetypetest.cpp +++ b/kdecore/tests/kmimetypetest.cpp @@ -996,4 +996,4 @@ void KMimeTypeTest::testProperties() QCOMPARE(patterns.toStringList(), pngMimeType->patterns()); } -#include "kmimetypetest.moc" +#include "moc_kmimetypetest.cpp" diff --git a/kdecore/tests/kmountpointtest.cpp b/kdecore/tests/kmountpointtest.cpp index edb69bcb..ac0d12fe 100644 --- a/kdecore/tests/kmountpointtest.cpp +++ b/kdecore/tests/kmountpointtest.cpp @@ -18,7 +18,7 @@ #include "kmountpointtest.h" #include -#include "kmountpointtest.moc" +#include "moc_kmountpointtest.cpp" #include "kmountpoint.h" #include diff --git a/kdecore/tests/ksavefiletest.cpp b/kdecore/tests/ksavefiletest.cpp index d87d0950..6f00d129 100644 --- a/kdecore/tests/ksavefiletest.cpp +++ b/kdecore/tests/ksavefiletest.cpp @@ -462,4 +462,4 @@ void KSaveFileTest::cleanupTestCase() } } -#include "ksavefiletest.moc" +#include "moc_ksavefiletest.cpp" diff --git a/kdecore/tests/kservicetest.cpp b/kdecore/tests/kservicetest.cpp index 73714758..0eccc87c 100644 --- a/kdecore/tests/kservicetest.cpp +++ b/kdecore/tests/kservicetest.cpp @@ -19,7 +19,7 @@ #include #include "kservicetest.h" -#include "kservicetest.moc" +#include "moc_kservicetest.cpp" #include #include diff --git a/kdecore/tests/ksharedptrtest.cpp b/kdecore/tests/ksharedptrtest.cpp index 0baccb15..c39de289 100644 --- a/kdecore/tests/ksharedptrtest.cpp +++ b/kdecore/tests/ksharedptrtest.cpp @@ -162,4 +162,4 @@ void KSharedPtrTest::testOrdering() QCOMPARE( map.count(), 2 ); } -#include "ksharedptrtest.moc" +#include "moc_ksharedptrtest.cpp" diff --git a/kdecore/tests/kstandarddirstest.cpp b/kdecore/tests/kstandarddirstest.cpp index 0b1e768c..03c7b120 100644 --- a/kdecore/tests/kstandarddirstest.cpp +++ b/kdecore/tests/kstandarddirstest.cpp @@ -19,7 +19,7 @@ #include "kstandarddirstest.h" #include "qtest_kde.h" -#include "kstandarddirstest.moc" +#include "moc_kstandarddirstest.cpp" QTEST_KDEMAIN_CORE( KStandarddirsTest ) diff --git a/kdecore/tests/kstringhandlertest.cpp b/kdecore/tests/kstringhandlertest.cpp index 38792430..e3ae3afb 100644 --- a/kdecore/tests/kstringhandlertest.cpp +++ b/kdecore/tests/kstringhandlertest.cpp @@ -1,7 +1,7 @@ #include "kstringhandlertest.h" #include "qtest_kde.h" -#include "kstringhandlertest.moc" +#include "moc_kstringhandlertest.cpp" QTEST_KDEMAIN_CORE(KStringHandlerTest) diff --git a/kdecore/tests/ktcpsockettest.cpp b/kdecore/tests/ktcpsockettest.cpp index 5a71787e..651acdc9 100644 --- a/kdecore/tests/ktcpsockettest.cpp +++ b/kdecore/tests/ktcpsockettest.cpp @@ -386,4 +386,4 @@ void Server::errors() QTEST_MAIN(KTcpSocketTest) -#include "ktcpsockettest.moc" +#include "moc_ktcpsockettest.cpp" diff --git a/kdecore/tests/ktempdirtest.cpp b/kdecore/tests/ktempdirtest.cpp index 34d28ce4..7ea6392b 100644 --- a/kdecore/tests/ktempdirtest.cpp +++ b/kdecore/tests/ktempdirtest.cpp @@ -23,7 +23,7 @@ #include #include "ktempdir.h" -#include "ktempdirtest.moc" +#include "moc_ktempdirtest.cpp" void KTempDirTest::testNoDelete() { diff --git a/kdecore/tests/ktemporaryfiletest.cpp b/kdecore/tests/ktemporaryfiletest.cpp index 3fef0d9d..38804505 100644 --- a/kdecore/tests/ktemporaryfiletest.cpp +++ b/kdecore/tests/ktemporaryfiletest.cpp @@ -13,7 +13,7 @@ This file has been placed in the Public Domain. #include "kstandarddirs.h" #include "ktemporaryfile.h" -#include "ktemporaryfiletest.moc" +#include "moc_ktemporaryfiletest.cpp" QTEST_KDEMAIN_CORE( KTemporaryFileTest ) diff --git a/kdecore/tests/ktimezonestest.cpp b/kdecore/tests/ktimezonestest.cpp index 62c9a7dd..aa1c43cb 100644 --- a/kdecore/tests/ktimezonestest.cpp +++ b/kdecore/tests/ktimezonestest.cpp @@ -27,7 +27,7 @@ #include // for HAVE_TM_GMTOFF #include "ksystemtimezone.h" #include "ktzfiletimezone.h" -#include "ktimezonestest.moc" +#include "moc_ktimezonestest.cpp" QTEST_KDEMAIN_CORE(KTimeZonesTest) diff --git a/kdecore/tests/kurlmimetest.cpp b/kdecore/tests/kurlmimetest.cpp index eade10e6..b61c4547 100644 --- a/kdecore/tests/kurlmimetest.cpp +++ b/kdecore/tests/kurlmimetest.cpp @@ -23,7 +23,7 @@ #include #include -#include "kurlmimetest.moc" +#include "moc_kurlmimetest.cpp" QTEST_KDEMAIN_CORE( KUrlMimeTest ) diff --git a/kdecore/tests/kurltest.cpp b/kdecore/tests/kurltest.cpp index 4ba20f6d..aafc7611 100644 --- a/kdecore/tests/kurltest.cpp +++ b/kdecore/tests/kurltest.cpp @@ -22,7 +22,7 @@ #include "kurltest.h" #include "qtest_kde.h" -#include "kurltest.moc" +#include "moc_kurltest.cpp" QTEST_KDEMAIN_CORE( KUrlTest ) diff --git a/kdecore/util/kautostart.cpp b/kdecore/util/kautostart.cpp index 97d8bc13..1eda6350 100644 --- a/kdecore/util/kautostart.cpp +++ b/kdecore/util/kautostart.cpp @@ -356,4 +356,4 @@ QString KAutostart::startAfter() const return d->df->desktopGroup().readEntry("X-KDE-autostart-after"); } -#include "kautostart.moc" +#include "moc_kautostart.cpp" diff --git a/kdecore/util/kdedmodule.cpp b/kdecore/util/kdedmodule.cpp index 00e0734c..7807c578 100644 --- a/kdecore/util/kdedmodule.cpp +++ b/kdecore/util/kdedmodule.cpp @@ -98,4 +98,4 @@ QString KDEDModule::moduleName() const return d->moduleName; } -#include "kdedmodule.moc" +#include "moc_kdedmodule.cpp" diff --git a/kdecore/util/klauncher_iface.cpp b/kdecore/util/klauncher_iface.cpp index b7ea6807..07bf42e2 100644 --- a/kdecore/util/klauncher_iface.cpp +++ b/kdecore/util/klauncher_iface.cpp @@ -25,4 +25,4 @@ OrgKdeKLauncherInterface::~OrgKdeKLauncherInterface() } -#include "klauncher_iface.moc" +#include "moc_klauncher_iface.cpp" diff --git a/kdecore/util/klibloader.cpp b/kdecore/util/klibloader.cpp index ff1512dd..c6b7a799 100644 --- a/kdecore/util/klibloader.cpp +++ b/kdecore/util/klibloader.cpp @@ -139,5 +139,5 @@ QString KLibLoader::errorString( int componentLoadingError ) } } -#include "klibloader.moc" +#include "moc_klibloader.cpp" // vim: sw=4 sts=4 et diff --git a/kdecore/util/klibrary.cpp b/kdecore/util/klibrary.cpp index 88e87610..7fe470e9 100644 --- a/kdecore/util/klibrary.cpp +++ b/kdecore/util/klibrary.cpp @@ -165,4 +165,4 @@ void KLibrary::setFileName(const QString &name, const KComponentData &data) QLibrary::setFileName(findLibrary(name, data)); } -#include "klibrary.moc" +#include "moc_klibrary.cpp" diff --git a/kdecore/util/kpluginfactory.cpp b/kdecore/util/kpluginfactory.cpp index 893f3b57..03402cd6 100644 --- a/kdecore/util/kpluginfactory.cpp +++ b/kdecore/util/kpluginfactory.cpp @@ -246,4 +246,4 @@ QVariantList KPluginFactory::stringListToVariantList(const QStringList &list) return variantlist; } -#include "kpluginfactory.moc" +#include "moc_kpluginfactory.cpp" diff --git a/kdecore/util/kpluginloader.cpp b/kdecore/util/kpluginloader.cpp index 81b3a28b..34ac7140 100644 --- a/kdecore/util/kpluginloader.cpp +++ b/kdecore/util/kpluginloader.cpp @@ -277,4 +277,4 @@ QString KPluginLoader::pluginName() const return d->name; } -#include "kpluginloader.moc" +#include "moc_kpluginloader.cpp" diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp index b4d57ce1..40ad63f4 100644 --- a/kded/kbuildsycoca.cpp +++ b/kded/kbuildsycoca.cpp @@ -829,4 +829,4 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) return 0; } -#include "kbuildsycoca.moc" +#include "moc_kbuildsycoca.cpp" diff --git a/kded/kded.cpp b/kded/kded.cpp index bc226981..b42d6a02 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -942,4 +942,4 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) return result; } -#include "kded.moc" +#include "moc_kded.cpp" diff --git a/kded/kdedadaptor.cpp b/kded/kdedadaptor.cpp index fe149a35..ac2e5bfc 100644 --- a/kded/kdedadaptor.cpp +++ b/kded/kdedadaptor.cpp @@ -85,4 +85,4 @@ void KdedAdaptor::quit() QCoreApplication::instance()->quit(); } -#include "kdedadaptor.moc" +#include "moc_kdedadaptor.cpp" diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp index f0b0b356..26b8c377 100644 --- a/kded/vfolder_menu.cpp +++ b/kded/vfolder_menu.cpp @@ -1646,4 +1646,4 @@ VFolderMenu::setTrackId(const QString &id) m_trackId = id; } -#include "vfolder_menu.moc" +#include "moc_vfolder_menu.cpp" diff --git a/kdeui/actions/kaction.cpp b/kdeui/actions/kaction.cpp index b81bf71d..c0703328 100644 --- a/kdeui/actions/kaction.cpp +++ b/kdeui/actions/kaction.cpp @@ -427,4 +427,4 @@ void KAction::setAuthAction(KAuth::Action *action) /* vim: et sw=2 ts=2 */ -#include "kaction.moc" +#include "moc_kaction.cpp" diff --git a/kdeui/actions/kactioncollection.cpp b/kdeui/actions/kactioncollection.cpp index ae2da5c0..137dc4e6 100644 --- a/kdeui/actions/kactioncollection.cpp +++ b/kdeui/actions/kactioncollection.cpp @@ -780,4 +780,4 @@ void KActionCollectionPrivate::_k_associatedWidgetDestroyed(QObject *obj) /* vim: et sw=2 ts=2 */ -#include "kactioncollection.moc" +#include "moc_kactioncollection.cpp" diff --git a/kdeui/actions/kactionmenu.cpp b/kdeui/actions/kactionmenu.cpp index dff93f4f..a9c5ce55 100644 --- a/kdeui/actions/kactionmenu.cpp +++ b/kdeui/actions/kactionmenu.cpp @@ -175,4 +175,4 @@ void KActionMenu::setMenu(KMenu *menu) /* vim: et sw=2 ts=2 */ -#include "kactionmenu.moc" +#include "moc_kactionmenu.cpp" diff --git a/kdeui/actions/kcodecaction.cpp b/kdeui/actions/kcodecaction.cpp index 2309fc4b..701ccef0 100644 --- a/kdeui/actions/kcodecaction.cpp +++ b/kdeui/actions/kcodecaction.cpp @@ -278,4 +278,4 @@ bool KCodecAction::setCurrentAutoDetectScript(KEncodingDetector::AutoDetectScrip return false; } -#include "kcodecaction.moc" +#include "moc_kcodecaction.cpp" diff --git a/kdeui/actions/kdualaction.cpp b/kdeui/actions/kdualaction.cpp index f44c9561..69bd8197 100644 --- a/kdeui/actions/kdualaction.cpp +++ b/kdeui/actions/kdualaction.cpp @@ -131,4 +131,4 @@ bool KDualAction::isActive() const return d->isActive; } -#include "kdualaction.moc" +#include "moc_kdualaction.cpp" diff --git a/kdeui/actions/kfontaction.cpp b/kdeui/actions/kfontaction.cpp index b793d759..113d6676 100644 --- a/kdeui/actions/kfontaction.cpp +++ b/kdeui/actions/kfontaction.cpp @@ -179,4 +179,4 @@ void KFontAction::setFont( const QString &family ) kDebug(129) << "Font not found " << family.toLower(); } -#include "kfontaction.moc" +#include "moc_kfontaction.cpp" diff --git a/kdeui/actions/kfontsizeaction.cpp b/kdeui/actions/kfontsizeaction.cpp index b53aaa15..c8df0bcb 100644 --- a/kdeui/actions/kfontsizeaction.cpp +++ b/kdeui/actions/kfontsizeaction.cpp @@ -145,4 +145,4 @@ void KFontSizeAction::actionTriggered( QAction* action ) /* vim: et sw=2 ts=2 */ -#include "kfontsizeaction.moc" +#include "moc_kfontsizeaction.cpp" diff --git a/kdeui/actions/kpastetextaction.cpp b/kdeui/actions/kpastetextaction.cpp index 86930757..fbe70a1a 100644 --- a/kdeui/actions/kpastetextaction.cpp +++ b/kdeui/actions/kpastetextaction.cpp @@ -143,4 +143,4 @@ void KPasteTextActionPrivate::_k_slotTriggered(QAction* action) /* vim: et sw=2 ts=2 */ -#include "kpastetextaction.moc" +#include "moc_kpastetextaction.cpp" diff --git a/kdeui/actions/krecentfilesaction.cpp b/kdeui/actions/krecentfilesaction.cpp index d4fcdbff..10511a6d 100644 --- a/kdeui/actions/krecentfilesaction.cpp +++ b/kdeui/actions/krecentfilesaction.cpp @@ -332,4 +332,4 @@ void KRecentFilesAction::saveEntries( const KConfigGroup &_cg ) /* vim: et sw=2 ts=2 */ -#include "krecentfilesaction.moc" +#include "moc_krecentfilesaction.cpp" diff --git a/kdeui/actions/kselectaction.cpp b/kdeui/actions/kselectaction.cpp index 0181f4e8..9bbfac36 100644 --- a/kdeui/actions/kselectaction.cpp +++ b/kdeui/actions/kselectaction.cpp @@ -758,4 +758,4 @@ bool KSelectAction::eventFilter (QObject *watched, QEvent *event) /* vim: et sw=2 ts=2 */ -#include "kselectaction.moc" +#include "moc_kselectaction.cpp" diff --git a/kdeui/actions/kstandardaction.cpp b/kdeui/actions/kstandardaction.cpp index 7de0c6fb..de2a67be 100644 --- a/kdeui/actions/kstandardaction.cpp +++ b/kdeui/actions/kstandardaction.cpp @@ -19,7 +19,7 @@ #include "kstandardaction.h" #include "kstandardaction_p.h" -#include "kstandardaction_p.moc" +#include "moc_kstandardaction_p.cpp" #include #include diff --git a/kdeui/actions/ktoggleaction.cpp b/kdeui/actions/ktoggleaction.cpp index 3ef01efa..a56b3cbc 100644 --- a/kdeui/actions/ktoggleaction.cpp +++ b/kdeui/actions/ktoggleaction.cpp @@ -109,4 +109,4 @@ void KToggleAction::slotToggled( bool ) } } -#include "ktoggleaction.moc" +#include "moc_ktoggleaction.cpp" diff --git a/kdeui/actions/ktogglefullscreenaction.cpp b/kdeui/actions/ktogglefullscreenaction.cpp index 49e0313b..1692ae42 100644 --- a/kdeui/actions/ktogglefullscreenaction.cpp +++ b/kdeui/actions/ktogglefullscreenaction.cpp @@ -117,4 +117,4 @@ void KToggleFullScreenAction::setFullScreen( QWidget* window, bool set ) window->setWindowState( window->windowState() & ~Qt::WindowFullScreen ); } -#include "ktogglefullscreenaction.moc" +#include "moc_ktogglefullscreenaction.cpp" diff --git a/kdeui/actions/ktoggletoolbaraction.cpp b/kdeui/actions/ktoggletoolbaraction.cpp index 9d61651d..0dd5b4ae 100644 --- a/kdeui/actions/ktoggletoolbaraction.cpp +++ b/kdeui/actions/ktoggletoolbaraction.cpp @@ -131,4 +131,4 @@ void KToggleToolBarAction::slotToggled( bool checked ) KToggleAction::slotToggled( checked ); } -#include "ktoggletoolbaraction.moc" +#include "moc_ktoggletoolbaraction.cpp" diff --git a/kdeui/actions/ktoolbarlabelaction.cpp b/kdeui/actions/ktoolbarlabelaction.cpp index 6b2199ef..85237986 100644 --- a/kdeui/actions/ktoolbarlabelaction.cpp +++ b/kdeui/actions/ktoolbarlabelaction.cpp @@ -124,4 +124,4 @@ QWidget *KToolBarLabelAction::createWidget( QWidget* _parent ) return d->label; } -#include "ktoolbarlabelaction.moc" +#include "moc_ktoolbarlabelaction.cpp" diff --git a/kdeui/actions/ktoolbarpopupaction.cpp b/kdeui/actions/ktoolbarpopupaction.cpp index f55218b9..0554f38d 100644 --- a/kdeui/actions/ktoolbarpopupaction.cpp +++ b/kdeui/actions/ktoolbarpopupaction.cpp @@ -117,4 +117,4 @@ void KToolBarPopupAction::setStickyMenu( bool sticky ) d->stickyMenu = sticky; } -#include "ktoolbarpopupaction.moc" +#include "moc_ktoolbarpopupaction.cpp" diff --git a/kdeui/actions/ktoolbarspaceraction.cpp b/kdeui/actions/ktoolbarspaceraction.cpp index e7024fe7..bb1350a5 100644 --- a/kdeui/actions/ktoolbarspaceraction.cpp +++ b/kdeui/actions/ktoolbarspaceraction.cpp @@ -119,4 +119,4 @@ void KToolBarSpacerAction::deleteWidget(QWidget *widget) KAction::deleteWidget(widget); } -#include "ktoolbarspaceraction.moc" +#include "moc_ktoolbarspaceraction.cpp" diff --git a/kdeui/colors/kcolorbutton.cpp b/kdeui/colors/kcolorbutton.cpp index 3c6a8f61..6cb292a5 100644 --- a/kdeui/colors/kcolorbutton.cpp +++ b/kdeui/colors/kcolorbutton.cpp @@ -282,4 +282,4 @@ void KColorButton::KColorButtonPrivate::_k_colorChosen() } } -#include "kcolorbutton.moc" +#include "moc_kcolorbutton.cpp" diff --git a/kdeui/colors/kcolorcombo.cpp b/kdeui/colors/kcolorcombo.cpp index 822c0713..c1988863 100644 --- a/kdeui/colors/kcolorcombo.cpp +++ b/kdeui/colors/kcolorcombo.cpp @@ -364,4 +364,4 @@ void KColorComboPrivate::addColors() } } -#include "kcolorcombo.moc" +#include "moc_kcolorcombo.cpp" diff --git a/kdeui/colors/kcolordialog.cpp b/kdeui/colors/kcolordialog.cpp index e376a328..eea403fc 100644 --- a/kdeui/colors/kcolordialog.cpp +++ b/kdeui/colors/kcolordialog.cpp @@ -1836,5 +1836,5 @@ void KColorDialog::KColorDialogPrivate::setHsvEdit(const QColor &col) vedit->setValue(v); } -#include "kcolordialog.moc" -#include "kcolordialog_p.moc" +#include "moc_kcolordialog.cpp" +#include "moc_kcolordialog_p.cpp" diff --git a/kdeui/colors/kcolorvalueselector.cpp b/kdeui/colors/kcolorvalueselector.cpp index cf5f3792..5715f327 100644 --- a/kdeui/colors/kcolorvalueselector.cpp +++ b/kdeui/colors/kcolorvalueselector.cpp @@ -150,4 +150,4 @@ void KColorValueSelector::drawPalette( QPixmap *pixmap ) } -#include "kcolorvalueselector.moc" +#include "moc_kcolorvalueselector.cpp" diff --git a/kdeui/colors/khuesaturationselect.cpp b/kdeui/colors/khuesaturationselect.cpp index 4e2be4bf..8060b00c 100644 --- a/kdeui/colors/khuesaturationselect.cpp +++ b/kdeui/colors/khuesaturationselect.cpp @@ -156,4 +156,4 @@ void KHueSaturationSelector::drawPalette( QPixmap *pixmap ) *pixmap = pix; } -#include "khuesaturationselect.moc" +#include "moc_khuesaturationselect.cpp" diff --git a/kdeui/config/kconfigskeleton.cpp b/kdeui/config/kconfigskeleton.cpp index 49d04c83..4a238001 100644 --- a/kdeui/config/kconfigskeleton.cpp +++ b/kdeui/config/kconfigskeleton.cpp @@ -118,5 +118,5 @@ KConfigSkeleton::ItemFont *KConfigSkeleton::addItemFont( const QString &name, QF return item; } -#include "kconfigskeleton.moc" +#include "moc_kconfigskeleton.cpp" diff --git a/kdeui/dialogs/kaboutapplicationdialog.cpp b/kdeui/dialogs/kaboutapplicationdialog.cpp index cb7fef7c..947777aa 100644 --- a/kdeui/dialogs/kaboutapplicationdialog.cpp +++ b/kdeui/dialogs/kaboutapplicationdialog.cpp @@ -344,4 +344,4 @@ void KAboutApplicationDialog::Private::_k_showLicense( const QString &number ) dialog->show(); } -#include "kaboutapplicationdialog.moc" +#include "moc_kaboutapplicationdialog.cpp" diff --git a/kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp b/kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp index debad9c1..619fb669 100644 --- a/kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp +++ b/kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp @@ -252,4 +252,4 @@ void KAboutApplicationPersonIconsJob::onJobFinished( QNetworkReply *reply ) //SL } //namespace KDEPrivate -#include "kaboutapplicationpersonmodel_p.moc" +#include "moc_kaboutapplicationpersonmodel_p.cpp" diff --git a/kdeui/dialogs/kaboutkdedialog_p.cpp b/kdeui/dialogs/kaboutkdedialog_p.cpp index cc625e72..eb88db53 100644 --- a/kdeui/dialogs/kaboutkdedialog_p.cpp +++ b/kdeui/dialogs/kaboutkdedialog_p.cpp @@ -87,4 +87,4 @@ KAboutKdeDialog::KAboutKdeDialog(QWidget *parent) } -#include "kaboutkdedialog_p.moc" +#include "moc_kaboutkdedialog_p.cpp" diff --git a/kdeui/dialogs/kassistantdialog.cpp b/kdeui/dialogs/kassistantdialog.cpp index 7a5fe14a..ae9b42b6 100644 --- a/kdeui/dialogs/kassistantdialog.cpp +++ b/kdeui/dialogs/kassistantdialog.cpp @@ -164,4 +164,4 @@ bool KAssistantDialog::isAppropriate(KPageWidgetItem * page) const return d->appropriate.value(page, true); } -#include "kassistantdialog.moc" +#include "moc_kassistantdialog.cpp" diff --git a/kdeui/dialogs/kbugreport.cpp b/kdeui/dialogs/kbugreport.cpp index f9bc296e..2051b834 100644 --- a/kdeui/dialogs/kbugreport.cpp +++ b/kdeui/dialogs/kbugreport.cpp @@ -566,4 +566,4 @@ bool KBugReport::sendBugReport() } -#include "kbugreport.moc" +#include "moc_kbugreport.cpp" diff --git a/kdeui/dialogs/kconfigdialog.cpp b/kdeui/dialogs/kconfigdialog.cpp index 4d247a95..09adac18 100644 --- a/kdeui/dialogs/kconfigdialog.cpp +++ b/kdeui/dialogs/kconfigdialog.cpp @@ -328,4 +328,4 @@ void KConfigDialog::settingsChangedSlot() d->_k_settingsChangedSlot(); } -#include "kconfigdialog.moc" +#include "moc_kconfigdialog.cpp" diff --git a/kdeui/dialogs/kconfigdialogmanager.cpp b/kdeui/dialogs/kconfigdialogmanager.cpp index f40cc3b9..e27090b2 100644 --- a/kdeui/dialogs/kconfigdialogmanager.cpp +++ b/kdeui/dialogs/kconfigdialogmanager.cpp @@ -544,5 +544,5 @@ bool KConfigDialogManager::isDefault() const return result; } -#include "kconfigdialogmanager.moc" +#include "moc_kconfigdialogmanager.cpp" diff --git a/kdeui/dialogs/kcupsoptionsjobwidget_p.cpp b/kdeui/dialogs/kcupsoptionsjobwidget_p.cpp index 5baf79e5..68e3f001 100644 --- a/kdeui/dialogs/kcupsoptionsjobwidget_p.cpp +++ b/kdeui/dialogs/kcupsoptionsjobwidget_p.cpp @@ -191,4 +191,4 @@ QStringList KCupsOptionsJobWidget::jobOptions() const return optionList; } -#include "kcupsoptionsjobwidget_p.moc" +#include "moc_kcupsoptionsjobwidget_p.cpp" diff --git a/kdeui/dialogs/kcupsoptionspageswidget_p.cpp b/kdeui/dialogs/kcupsoptionspageswidget_p.cpp index 454a369b..7a741faa 100644 --- a/kdeui/dialogs/kcupsoptionspageswidget_p.cpp +++ b/kdeui/dialogs/kcupsoptionspageswidget_p.cpp @@ -283,4 +283,4 @@ bool KCupsOptionsPagesWidget::mirrorPages() const return ui.mirrorPagesCheckBox->isChecked(); } -#include "kcupsoptionspageswidget_p.moc" +#include "moc_kcupsoptionspageswidget_p.cpp" diff --git a/kdeui/dialogs/kdialog.cpp b/kdeui/dialogs/kdialog.cpp index e6f0f66b..1eaae24b 100644 --- a/kdeui/dialogs/kdialog.cpp +++ b/kdeui/dialogs/kdialog.cpp @@ -1108,5 +1108,5 @@ void KDialogQueue::Private::slotShowQueuedDialog() QTimer::singleShot( 20, q, SLOT(slotShowQueuedDialog()) ); } -#include "kdialog.moc" -#include "kdialogqueue_p.moc" +#include "moc_kdialog.cpp" +#include "moc_kdialogqueue_p.cpp" diff --git a/kdeui/dialogs/kedittoolbar.cpp b/kdeui/dialogs/kedittoolbar.cpp index 5b62dd6d..ee318f43 100644 --- a/kdeui/dialogs/kedittoolbar.cpp +++ b/kdeui/dialogs/kedittoolbar.cpp @@ -1696,5 +1696,5 @@ void KEditToolBar::hideEvent(QHideEvent* event) KDialog::hideEvent(event); } -#include "kedittoolbar.moc" -#include "kedittoolbar_p.moc" +#include "moc_kedittoolbar.cpp" +#include "moc_kedittoolbar_p.cpp" diff --git a/kdeui/dialogs/kinputdialog.cpp b/kdeui/dialogs/kinputdialog.cpp index de0107c5..4cf26bae 100644 --- a/kdeui/dialogs/kinputdialog.cpp +++ b/kdeui/dialogs/kinputdialog.cpp @@ -479,7 +479,7 @@ QStringList getItemList( const QString &caption, } -#include "kinputdialog_p.moc" +#include "moc_kinputdialog_p.cpp" /* vim: set ai et sw=2 ts=2 */ diff --git a/kdeui/dialogs/kmessageboxmessagehandler.cpp b/kdeui/dialogs/kmessageboxmessagehandler.cpp index f32c22a3..211eec7c 100644 --- a/kdeui/dialogs/kmessageboxmessagehandler.cpp +++ b/kdeui/dialogs/kmessageboxmessagehandler.cpp @@ -79,5 +79,5 @@ QWidget *KMessageBoxMessageHandlerPrivate::parentWidget() return qobject_cast(q->parent()); } -#include "kmessageboxmessagehandler.moc" +#include "moc_kmessageboxmessagehandler.cpp" // kate: space-indent on; indent-width 4; encoding utf-8; replace-tabs on; diff --git a/kdeui/dialogs/knewpassworddialog.cpp b/kdeui/dialogs/knewpassworddialog.cpp index 32a0bb68..e342946b 100644 --- a/kdeui/dialogs/knewpassworddialog.cpp +++ b/kdeui/dialogs/knewpassworddialog.cpp @@ -355,6 +355,6 @@ bool KNewPasswordDialog::checkPassword(const QString &) return true; } -#include "knewpassworddialog.moc" +#include "moc_knewpassworddialog.cpp" // kate: space-indent on; indent-width 4; encoding utf-8; replace-tabs on; diff --git a/kdeui/dialogs/kpassworddialog.cpp b/kdeui/dialogs/kpassworddialog.cpp index 6245ce44..b6c0be7e 100644 --- a/kdeui/dialogs/kpassworddialog.cpp +++ b/kdeui/dialogs/kpassworddialog.cpp @@ -413,4 +413,4 @@ bool KPasswordDialog::checkPassword() return true; } -#include "kpassworddialog.moc" +#include "moc_kpassworddialog.cpp" diff --git a/kdeui/dialogs/kpixmapregionselectordialog.cpp b/kdeui/dialogs/kpixmapregionselectordialog.cpp index 11d964b9..f92f6cee 100644 --- a/kdeui/dialogs/kpixmapregionselectordialog.cpp +++ b/kdeui/dialogs/kpixmapregionselectordialog.cpp @@ -160,4 +160,4 @@ QImage KPixmapRegionSelectorDialog::getSelectedImage(const QPixmap &pixmap, int return image; } -#include "kpixmapregionselectordialog.moc" +#include "moc_kpixmapregionselectordialog.cpp" diff --git a/kdeui/dialogs/kprogressdialog.cpp b/kdeui/dialogs/kprogressdialog.cpp index 4b2203df..a4276d39 100644 --- a/kdeui/dialogs/kprogressdialog.cpp +++ b/kdeui/dialogs/kprogressdialog.cpp @@ -253,4 +253,4 @@ void KProgressDialog::KProgressDialogPrivate::slotAutoActions(int percentage) } } -#include "kprogressdialog.moc" +#include "moc_kprogressdialog.cpp" diff --git a/kdeui/dialogs/kshortcutsdialog.cpp b/kdeui/dialogs/kshortcutsdialog.cpp index a73f8f2f..98a9fc69 100644 --- a/kdeui/dialogs/kshortcutsdialog.cpp +++ b/kdeui/dialogs/kshortcutsdialog.cpp @@ -192,7 +192,7 @@ int KShortcutsDialog::configure(KActionCollection *collection, KShortcutsEditor: return dlg.configure(saveSettings); } -#include "kshortcutsdialog.moc" -#include "kshortcutsdialog_p.moc" +#include "moc_kshortcutsdialog.cpp" +#include "moc_kshortcutsdialog_p.cpp" //kate: space-indent on; indent-width 4; replace-tabs on;tab-width 4; diff --git a/kdeui/dialogs/kshortcutseditor.cpp b/kdeui/dialogs/kshortcutseditor.cpp index fcf4bc14..7ad530d0 100644 --- a/kdeui/dialogs/kshortcutseditor.cpp +++ b/kdeui/dialogs/kshortcutseditor.cpp @@ -723,4 +723,4 @@ void KShortcutsEditorPrivate::printShortcuts() const delete dlg; } -#include "kshortcutseditor.moc" +#include "moc_kshortcutseditor.cpp" diff --git a/kdeui/dialogs/ksplashscreen.cpp b/kdeui/dialogs/ksplashscreen.cpp index 52d916d7..316a93b8 100644 --- a/kdeui/dialogs/ksplashscreen.cpp +++ b/kdeui/dialogs/ksplashscreen.cpp @@ -41,4 +41,4 @@ KSplashScreen::~KSplashScreen() { } -#include "ksplashscreen.moc" +#include "moc_ksplashscreen.cpp" diff --git a/kdeui/dialogs/kswitchlanguagedialog_p.cpp b/kdeui/dialogs/kswitchlanguagedialog_p.cpp index 4e10d521..940e6c31 100644 --- a/kdeui/dialogs/kswitchlanguagedialog_p.cpp +++ b/kdeui/dialogs/kswitchlanguagedialog_p.cpp @@ -19,7 +19,7 @@ * */ -#include "kswitchlanguagedialog_p.moc" +#include "moc_kswitchlanguagedialog_p.cpp" #include #include diff --git a/kdeui/dialogs/ktip.cpp b/kdeui/dialogs/ktip.cpp index 74aa58f7..f23b7799 100644 --- a/kdeui/dialogs/ktip.cpp +++ b/kdeui/dialogs/ktip.cpp @@ -412,4 +412,4 @@ bool KTipDialog::eventFilter( QObject *object, QEvent *event ) } -#include "ktip.moc" +#include "moc_ktip.cpp" diff --git a/kdeui/findreplace/kfind.cpp b/kdeui/findreplace/kfind.cpp index 94d30569..72b23f35 100644 --- a/kdeui/findreplace/kfind.cpp +++ b/kdeui/findreplace/kfind.cpp @@ -720,4 +720,4 @@ QWidget* KFind::dialogsParent() const return d->findDialog ? (QWidget*)d->findDialog : ( d->dialog ? d->dialog : parentWidget() ); } -#include "kfind.moc" +#include "moc_kfind.cpp" diff --git a/kdeui/findreplace/kfinddialog.cpp b/kdeui/findreplace/kfinddialog.cpp index de2dd90f..e6cb1206 100644 --- a/kdeui/findreplace/kfinddialog.cpp +++ b/kdeui/findreplace/kfinddialog.cpp @@ -572,4 +572,4 @@ void KFindDialog::KFindDialogPrivate::_k_slotOk() q->accept(); } // kate: space-indent on; indent-width 4; replace-tabs on; -#include "kfinddialog.moc" +#include "moc_kfinddialog.cpp" diff --git a/kdeui/findreplace/kreplace.cpp b/kdeui/findreplace/kreplace.cpp index 26c7a979..d954792a 100644 --- a/kdeui/findreplace/kreplace.cpp +++ b/kdeui/findreplace/kreplace.cpp @@ -371,4 +371,4 @@ void KReplace::closeReplaceNextDialog() closeFindNextDialog(); } -#include "kreplace.moc" +#include "moc_kreplace.cpp" diff --git a/kdeui/findreplace/kreplacedialog.cpp b/kdeui/findreplace/kreplacedialog.cpp index 590eaf77..abf0717a 100644 --- a/kdeui/findreplace/kreplacedialog.cpp +++ b/kdeui/findreplace/kreplacedialog.cpp @@ -169,4 +169,4 @@ void KReplaceDialogPrivate::_k_slotOk() } // kate: space-indent on; indent-width 4; replace-tabs on; -#include "kreplacedialog.moc" +#include "moc_kreplacedialog.cpp" diff --git a/kdeui/fonts/kfontchooser.cpp b/kdeui/fonts/kfontchooser.cpp index a585dc4e..30e30514 100644 --- a/kdeui/fonts/kfontchooser.cpp +++ b/kdeui/fonts/kfontchooser.cpp @@ -1074,5 +1074,5 @@ QString KFontChooser::Private::styleIdentifier(const QFont &font) + QString::number(font.stretch()); } -#include "kfontchooser.moc" -#include "sampleedit_p.moc" +#include "moc_kfontchooser.cpp" +#include "moc_sampleedit_p.cpp" diff --git a/kdeui/fonts/kfontdialog.cpp b/kdeui/fonts/kfontdialog.cpp index 9bea4903..0af4a91f 100644 --- a/kdeui/fonts/kfontdialog.cpp +++ b/kdeui/fonts/kfontdialog.cpp @@ -177,4 +177,4 @@ int KFontDialog::getFontAndText( QFont &theFont, QString &theString, } -#include "kfontdialog.moc" +#include "moc_kfontdialog.cpp" diff --git a/kdeui/fonts/kfontrequester.cpp b/kdeui/fonts/kfontrequester.cpp index c3fe02ee..dfe3ca57 100644 --- a/kdeui/fonts/kfontrequester.cpp +++ b/kdeui/fonts/kfontrequester.cpp @@ -231,7 +231,7 @@ void KFontRequester::KFontRequesterPrivate::setToolTip() } } -#include "kfontrequester.moc" +#include "moc_kfontrequester.cpp" /* vim: et sw=2 ts=2 */ diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp index 5d1f4051..224e6349 100644 --- a/kdeui/icons/kiconloader.cpp +++ b/kdeui/icons/kiconloader.cpp @@ -1635,5 +1635,5 @@ void KIconLoader::newIconLoader() emit iconLoaderSettingsChanged(); } -#include "kiconloader.moc" +#include "moc_kiconloader.cpp" diff --git a/kdeui/itemviews/kbreadcrumbselectionmodel.cpp b/kdeui/itemviews/kbreadcrumbselectionmodel.cpp index f92ff851..d4290f90 100644 --- a/kdeui/itemviews/kbreadcrumbselectionmodel.cpp +++ b/kdeui/itemviews/kbreadcrumbselectionmodel.cpp @@ -240,4 +240,4 @@ void KBreadcrumbSelectionModelPrivate::syncBreadcrumbs() } -#include "kbreadcrumbselectionmodel.moc" +#include "moc_kbreadcrumbselectionmodel.cpp" diff --git a/kdeui/itemviews/kcategorizedview.cpp b/kdeui/itemviews/kcategorizedview.cpp index df8dbd8e..16f0a4fc 100644 --- a/kdeui/itemviews/kcategorizedview.cpp +++ b/kdeui/itemviews/kcategorizedview.cpp @@ -1535,4 +1535,4 @@ void KCategorizedView::slotLayoutChanged() //END: Public part -#include "kcategorizedview.moc" +#include "moc_kcategorizedview.cpp" diff --git a/kdeui/itemviews/kcategorydrawer.cpp b/kdeui/itemviews/kcategorydrawer.cpp index 2747e5b0..33e2033f 100644 --- a/kdeui/itemviews/kcategorydrawer.cpp +++ b/kdeui/itemviews/kcategorydrawer.cpp @@ -281,4 +281,4 @@ void KCategoryDrawerV3::mouseLeft(const QModelIndex&, const QRect&) { } -#include "kcategorydrawer.moc" +#include "moc_kcategorydrawer.cpp" diff --git a/kdeui/itemviews/kcheckableproxymodel.cpp b/kdeui/itemviews/kcheckableproxymodel.cpp index e3e8a47b..71e6b082 100644 --- a/kdeui/itemviews/kcheckableproxymodel.cpp +++ b/kdeui/itemviews/kcheckableproxymodel.cpp @@ -132,5 +132,5 @@ bool KCheckableProxyModel::select(const QItemSelection& selection, QItemSelectio } -#include "kcheckableproxymodel.moc" +#include "moc_kcheckableproxymodel.cpp" diff --git a/kdeui/itemviews/kextendableitemdelegate.cpp b/kdeui/itemviews/kextendableitemdelegate.cpp index 7d39a1df..08a68861 100644 --- a/kdeui/itemviews/kextendableitemdelegate.cpp +++ b/kdeui/itemviews/kextendableitemdelegate.cpp @@ -448,4 +448,4 @@ QPixmap KExtendableItemDelegate::contractPixmap() return d->contractPixmap; } -#include "kextendableitemdelegate.moc" +#include "moc_kextendableitemdelegate.cpp" diff --git a/kdeui/itemviews/kfilterproxysearchline.cpp b/kdeui/itemviews/kfilterproxysearchline.cpp index 426bed6f..93f86c05 100644 --- a/kdeui/itemviews/kfilterproxysearchline.cpp +++ b/kdeui/itemviews/kfilterproxysearchline.cpp @@ -100,4 +100,4 @@ KLineEdit* KFilterProxySearchLine::lineEdit() const return d->searchLine; } -#include "kfilterproxysearchline.moc" +#include "moc_kfilterproxysearchline.cpp" diff --git a/kdeui/itemviews/kidentityproxymodel.cpp b/kdeui/itemviews/kidentityproxymodel.cpp index b281f6cf..43c218f3 100644 --- a/kdeui/itemviews/kidentityproxymodel.cpp +++ b/kdeui/itemviews/kidentityproxymodel.cpp @@ -754,4 +754,4 @@ void KIdentityProxyModel::resetInternalData() } -#include "kidentityproxymodel.moc" +#include "moc_kidentityproxymodel.cpp" diff --git a/kdeui/itemviews/klinkitemselectionmodel.cpp b/kdeui/itemviews/klinkitemselectionmodel.cpp index dab5c779..826f864f 100644 --- a/kdeui/itemviews/klinkitemselectionmodel.cpp +++ b/kdeui/itemviews/klinkitemselectionmodel.cpp @@ -186,4 +186,4 @@ void KLinkItemSelectionModelPrivate::sourceCurrentChanged(const QModelIndex& cur q->setCurrentIndex(mappedCurrent, QItemSelectionModel::NoUpdate); } -#include "klinkitemselectionmodel.moc" +#include "moc_klinkitemselectionmodel.cpp" diff --git a/kdeui/itemviews/klistwidget.cpp b/kdeui/itemviews/klistwidget.cpp index 3c9ac395..ad02a0db 100644 --- a/kdeui/itemviews/klistwidget.cpp +++ b/kdeui/itemviews/klistwidget.cpp @@ -273,4 +273,4 @@ void KListWidget::mouseReleaseEvent ( QMouseEvent * e ) d->m_eventPos = oldPos; } -#include "klistwidget.moc" +#include "moc_klistwidget.cpp" diff --git a/kdeui/itemviews/klistwidgetsearchline.cpp b/kdeui/itemviews/klistwidgetsearchline.cpp index 32f3dd3c..e8ebcfea 100644 --- a/kdeui/itemviews/klistwidgetsearchline.cpp +++ b/kdeui/itemviews/klistwidgetsearchline.cpp @@ -280,4 +280,4 @@ void KListWidgetSearchLine::KListWidgetSearchLinePrivate::_k_dataChanged( const -#include "klistwidgetsearchline.moc" +#include "moc_klistwidgetsearchline.cpp" diff --git a/kdeui/itemviews/kmodelindexproxymapper.cpp b/kdeui/itemviews/kmodelindexproxymapper.cpp index 57d1cfb6..ba62cca4 100644 --- a/kdeui/itemviews/kmodelindexproxymapper.cpp +++ b/kdeui/itemviews/kmodelindexproxymapper.cpp @@ -306,4 +306,4 @@ QItemSelection KModelIndexProxyMapper::mapSelectionRightToLeft(const QItemSelect return seekSelection; } -#include "kmodelindexproxymapper.moc" +#include "moc_kmodelindexproxymapper.cpp" diff --git a/kdeui/itemviews/krecursivefilterproxymodel.cpp b/kdeui/itemviews/krecursivefilterproxymodel.cpp index 6d656316..0210e206 100644 --- a/kdeui/itemviews/krecursivefilterproxymodel.cpp +++ b/kdeui/itemviews/krecursivefilterproxymodel.cpp @@ -431,4 +431,4 @@ void KRecursiveFilterProxyModel::setSourceModel(QAbstractItemModel* model) } -#include "krecursivefilterproxymodel.moc" +#include "moc_krecursivefilterproxymodel.cpp" diff --git a/kdeui/itemviews/ktreewidgetsearchline.cpp b/kdeui/itemviews/ktreewidgetsearchline.cpp index 15bc5074..dd8cd35f 100644 --- a/kdeui/itemviews/ktreewidgetsearchline.cpp +++ b/kdeui/itemviews/ktreewidgetsearchline.cpp @@ -620,4 +620,4 @@ KTreeWidgetSearchLine *KTreeWidgetSearchLineWidget::searchLine() const return d->searchLine; } -#include "ktreewidgetsearchline.moc" +#include "moc_ktreewidgetsearchline.cpp" diff --git a/kdeui/itemviews/kviewstatemaintainer.cpp b/kdeui/itemviews/kviewstatemaintainer.cpp index e18caf48..6c00f087 100644 --- a/kdeui/itemviews/kviewstatemaintainer.cpp +++ b/kdeui/itemviews/kviewstatemaintainer.cpp @@ -116,4 +116,4 @@ void KViewStateMaintainerBase::setView(QAbstractItemView* view) } } -#include "kviewstatemaintainer.moc" +#include "moc_kviewstatemaintainer.cpp" diff --git a/kdeui/itemviews/kviewstatesaver.cpp b/kdeui/itemviews/kviewstatesaver.cpp index 05f85fd7..5d5fb05f 100644 --- a/kdeui/itemviews/kviewstatesaver.cpp +++ b/kdeui/itemviews/kviewstatesaver.cpp @@ -404,5 +404,5 @@ QPair KViewStateSaver::scrollState() const return qMakePair(d->m_scrollArea->verticalScrollBar()->value(), d->m_scrollArea->horizontalScrollBar()->value()); } -#include "kviewstatesaver.moc" +#include "moc_kviewstatesaver.cpp" diff --git a/kdeui/itemviews/kwidgetitemdelegate.cpp b/kdeui/itemviews/kwidgetitemdelegate.cpp index d4ecf598..cdd04618 100644 --- a/kdeui/itemviews/kwidgetitemdelegate.cpp +++ b/kdeui/itemviews/kwidgetitemdelegate.cpp @@ -310,5 +310,5 @@ QList KWidgetItemDelegate::blockedEventTypes(QWidget *widget) cons return widget->property("goya:blockedEventTypes").value >(); } -#include "kwidgetitemdelegate.moc" -#include "kwidgetitemdelegate_p.moc" +#include "moc_kwidgetitemdelegate.cpp" +#include "moc_kwidgetitemdelegate_p.cpp" diff --git a/kdeui/jobs/kabstractwidgetjobtracker.cpp b/kdeui/jobs/kabstractwidgetjobtracker.cpp index b4432fed..bdcea2eb 100644 --- a/kdeui/jobs/kabstractwidgetjobtracker.cpp +++ b/kdeui/jobs/kabstractwidgetjobtracker.cpp @@ -104,4 +104,4 @@ void KAbstractWidgetJobTracker::slotClean(KJob *job) Q_UNUSED(job); } -#include "kabstractwidgetjobtracker.moc" +#include "moc_kabstractwidgetjobtracker.cpp" diff --git a/kdeui/jobs/kdialogjobuidelegate.cpp b/kdeui/jobs/kdialogjobuidelegate.cpp index 79358922..b536639f 100644 --- a/kdeui/jobs/kdialogjobuidelegate.cpp +++ b/kdeui/jobs/kdialogjobuidelegate.cpp @@ -94,4 +94,4 @@ void KDialogJobUiDelegate::slotWarning(KJob* /*job*/, const QString &plain, cons } -#include "kdialogjobuidelegate.moc" +#include "moc_kdialogjobuidelegate.cpp" diff --git a/kdeui/jobs/kstatusbarjobtracker.cpp b/kdeui/jobs/kstatusbarjobtracker.cpp index 5d7c6b9a..45a0ef6a 100644 --- a/kdeui/jobs/kstatusbarjobtracker.cpp +++ b/kdeui/jobs/kstatusbarjobtracker.cpp @@ -280,5 +280,5 @@ bool KStatusBarJobTracker::Private::ProgressWidget::eventFilter(QObject *obj, QE return QWidget::eventFilter(obj, event); } -#include "kstatusbarjobtracker.moc" -#include "kstatusbarjobtracker_p.moc" +#include "moc_kstatusbarjobtracker.cpp" +#include "moc_kstatusbarjobtracker_p.cpp" diff --git a/kdeui/jobs/kuiserverjobtracker.cpp b/kdeui/jobs/kuiserverjobtracker.cpp index b02c1b6d..dfcdc96a 100644 --- a/kdeui/jobs/kuiserverjobtracker.cpp +++ b/kdeui/jobs/kuiserverjobtracker.cpp @@ -327,5 +327,5 @@ org::kde::JobViewServer &KSharedUiServerProxy::uiserver() return m_uiserver; } -#include "kuiserverjobtracker.moc" -#include "kuiserverjobtracker_p.moc" +#include "moc_kuiserverjobtracker.cpp" +#include "moc_kuiserverjobtracker_p.cpp" diff --git a/kdeui/jobs/kwidgetjobtracker.cpp b/kdeui/jobs/kwidgetjobtracker.cpp index c238f504..6c12ada5 100644 --- a/kdeui/jobs/kwidgetjobtracker.cpp +++ b/kdeui/jobs/kwidgetjobtracker.cpp @@ -663,5 +663,5 @@ void KWidgetJobTracker::Private::ProgressWidget::_k_arrowToggled() setMaximumHeight(sizeHint().height()); } -#include "kwidgetjobtracker.moc" -#include "kwidgetjobtracker_p.moc" +#include "moc_kwidgetjobtracker.cpp" +#include "moc_kwidgetjobtracker_p.cpp" diff --git a/kdeui/kernel/kapplication.cpp b/kdeui/kernel/kapplication.cpp index 6aec2b02..5096920c 100644 --- a/kdeui/kernel/kapplication.cpp +++ b/kdeui/kernel/kapplication.cpp @@ -1117,5 +1117,5 @@ void KApplication::setSynchronizeClipboard(bool synchronize) KClipboardSynchronizer::self()->setReverseSynchronizing(synchronize); } -#include "kapplication.moc" +#include "moc_kapplication.cpp" diff --git a/kdeui/kernel/kclipboard.cpp b/kdeui/kernel/kclipboard.cpp index 529a2cbb..448cff80 100644 --- a/kdeui/kernel/kclipboard.cpp +++ b/kdeui/kernel/kclipboard.cpp @@ -179,4 +179,4 @@ bool KClipboardSynchronizer::isReverseSynchronizing() return Private::s_reverse_sync; } -#include "kclipboard.moc" +#include "moc_kclipboard.cpp" diff --git a/kdeui/kernel/kglobalsettings.cpp b/kdeui/kernel/kglobalsettings.cpp index e65071ef..dd9902b1 100644 --- a/kdeui/kernel/kglobalsettings.cpp +++ b/kdeui/kernel/kglobalsettings.cpp @@ -1105,4 +1105,4 @@ void KGlobalSettings::Private::propagateQtSettings() emit q->settingsChanged(SETTINGS_QT); } -#include "kglobalsettings.moc" +#include "moc_kglobalsettings.cpp" diff --git a/kdeui/kernel/kstartupinfo.cpp b/kdeui/kernel/kstartupinfo.cpp index 87548c20..7fd8ef74 100644 --- a/kdeui/kernel/kstartupinfo.cpp +++ b/kdeui/kernel/kstartupinfo.cpp @@ -1617,4 +1617,4 @@ static QString escape_str( const QString& str_P ) return ret; } -#include "kstartupinfo.moc" +#include "moc_kstartupinfo.cpp" diff --git a/kdeui/kernel/kstyle.cpp b/kdeui/kernel/kstyle.cpp index 95a71c24..1e7767eb 100644 --- a/kdeui/kernel/kstyle.cpp +++ b/kdeui/kernel/kstyle.cpp @@ -44,7 +44,7 @@ */ #include "kstyle.h" -#include "kstyle.moc" +#include "moc_kstyle.cpp" #include #include diff --git a/kdeui/kernel/kuniqueapplication.cpp b/kdeui/kernel/kuniqueapplication.cpp index 9810fe82..cff7f8f9 100644 --- a/kdeui/kernel/kuniqueapplication.cpp +++ b/kdeui/kernel/kuniqueapplication.cpp @@ -416,5 +416,5 @@ int KUniqueApplicationAdaptor::newInstance(const QByteArray &asn_id, const QByte return ret; } -#include "kuniqueapplication.moc" -#include "kuniqueapplication_p.moc" +#include "moc_kuniqueapplication.cpp" +#include "moc_kuniqueapplication_p.cpp" diff --git a/kdeui/notifications/knotification.cpp b/kdeui/notifications/knotification.cpp index c0adeeb2..e9f6d781 100644 --- a/kdeui/notifications/knotification.cpp +++ b/kdeui/notifications/knotification.cpp @@ -436,4 +436,4 @@ bool KNotification::eventFilter( QObject * watched, QEvent * event ) } -#include "knotification.moc" +#include "moc_knotification.cpp" diff --git a/kdeui/notifications/knotificationmanager.cpp b/kdeui/notifications/knotificationmanager.cpp index 4d5d549f..7dae2815 100644 --- a/kdeui/notifications/knotificationmanager.cpp +++ b/kdeui/notifications/knotificationmanager.cpp @@ -177,4 +177,4 @@ void KNotificationManager::reemit(KNotification * n, int id) } -#include "knotificationmanager_p.moc" +#include "moc_knotificationmanager_p.cpp" diff --git a/kdeui/notifications/knotificationrestrictions.cpp b/kdeui/notifications/knotificationrestrictions.cpp index 818edeac..c4ea1e46 100644 --- a/kdeui/notifications/knotificationrestrictions.cpp +++ b/kdeui/notifications/knotificationrestrictions.cpp @@ -183,4 +183,4 @@ QString KNotificationRestrictions::Private::determineProgramName() return appName; } -#include "knotificationrestrictions.moc" +#include "moc_knotificationrestrictions.cpp" diff --git a/kdeui/notifications/kstatusnotifieritem.cpp b/kdeui/notifications/kstatusnotifieritem.cpp index a7aeb042..7d3fe45a 100644 --- a/kdeui/notifications/kstatusnotifieritem.cpp +++ b/kdeui/notifications/kstatusnotifieritem.cpp @@ -1022,5 +1022,5 @@ KDbusImageVector KStatusNotifierItemPrivate::iconToVector(const QIcon &icon) return iconVector; } -#include "kstatusnotifieritem.moc" -#include "kstatusnotifieritemprivate_p.moc" +#include "moc_kstatusnotifieritem.cpp" +#include "moc_kstatusnotifieritemprivate_p.cpp" diff --git a/kdeui/notifications/kstatusnotifieritemdbus_p.cpp b/kdeui/notifications/kstatusnotifieritemdbus_p.cpp index b8864a6c..9cbae702 100644 --- a/kdeui/notifications/kstatusnotifieritemdbus_p.cpp +++ b/kdeui/notifications/kstatusnotifieritemdbus_p.cpp @@ -332,4 +332,4 @@ void KStatusNotifierItemDBus::Scroll(int delta, const QString &orientation) -#include "kstatusnotifieritemdbus_p.moc" +#include "moc_kstatusnotifieritemdbus_p.cpp" diff --git a/kdeui/notifications/ksystemtrayicon.cpp b/kdeui/notifications/ksystemtrayicon.cpp index 5065ac53..500345ce 100644 --- a/kdeui/notifications/ksystemtrayicon.cpp +++ b/kdeui/notifications/ksystemtrayicon.cpp @@ -368,4 +368,4 @@ const QMovie* KSystemTrayIcon::movie() const return d->movie; } -#include "ksystemtrayicon.moc" +#include "moc_ksystemtrayicon.cpp" diff --git a/kdeui/paged/kpagedialog.cpp b/kdeui/paged/kpagedialog.cpp index 1690d713..066f8eef 100644 --- a/kdeui/paged/kpagedialog.cpp +++ b/kdeui/paged/kpagedialog.cpp @@ -132,4 +132,4 @@ const KPageWidget* KPageDialog::pageWidget() const return d_func()->mPageWidget; } -#include "kpagedialog.moc" +#include "moc_kpagedialog.cpp" diff --git a/kdeui/paged/kpagemodel.cpp b/kdeui/paged/kpagemodel.cpp index dce76d60..e8f7b4b2 100644 --- a/kdeui/paged/kpagemodel.cpp +++ b/kdeui/paged/kpagemodel.cpp @@ -42,4 +42,4 @@ KPageModel::~KPageModel() delete d_ptr; } -#include "kpagemodel.moc" +#include "moc_kpagemodel.cpp" diff --git a/kdeui/paged/kpageview.cpp b/kdeui/paged/kpageview.cpp index 8863934b..5f0d4f13 100644 --- a/kdeui/paged/kpageview.cpp +++ b/kdeui/paged/kpageview.cpp @@ -474,4 +474,4 @@ Qt::Alignment KPageView::viewPosition() const return Qt::AlignLeft; } -#include "kpageview.moc" +#include "moc_kpageview.cpp" diff --git a/kdeui/paged/kpageview_p.cpp b/kdeui/paged/kpageview_p.cpp index baeae115..d56d1b90 100644 --- a/kdeui/paged/kpageview_p.cpp +++ b/kdeui/paged/kpageview_p.cpp @@ -619,4 +619,4 @@ void SelectionModel::select( const QItemSelection &selection, QItemSelectionMode QItemSelectionModel::select( selection, command ); } -#include "kpageview_p.moc" +#include "moc_kpageview_p.cpp" diff --git a/kdeui/paged/kpagewidget.cpp b/kdeui/paged/kpagewidget.cpp index 36289f17..7bbfeb25 100644 --- a/kdeui/paged/kpagewidget.cpp +++ b/kdeui/paged/kpagewidget.cpp @@ -132,4 +132,4 @@ KPageWidgetItem* KPageWidget::currentPage() const return d_func()->model()->item(index); } -#include "kpagewidget.moc" +#include "moc_kpagewidget.cpp" diff --git a/kdeui/paged/kpagewidgetmodel.cpp b/kdeui/paged/kpagewidgetmodel.cpp index 677f75b3..e065888f 100644 --- a/kdeui/paged/kpagewidgetmodel.cpp +++ b/kdeui/paged/kpagewidgetmodel.cpp @@ -542,4 +542,4 @@ QModelIndex KPageWidgetModel::index( const KPageWidgetItem *item ) const return createIndex( pageItem->row(), 0, (void*)pageItem ); } -#include "kpagewidgetmodel.moc" +#include "moc_kpagewidgetmodel.cpp" diff --git a/kdeui/plotting/kplotwidget.cpp b/kdeui/plotting/kplotwidget.cpp index e29f6908..1455ecb3 100644 --- a/kdeui/plotting/kplotwidget.cpp +++ b/kdeui/plotting/kplotwidget.cpp @@ -19,7 +19,7 @@ */ #include "kplotwidget.h" -#include "kplotwidget.moc" +#include "moc_kplotwidget.cpp" #include #include diff --git a/kdeui/shortcuts/kacceleratormanager.cpp b/kdeui/shortcuts/kacceleratormanager.cpp index 65fd8172..c398d2a8 100644 --- a/kdeui/shortcuts/kacceleratormanager.cpp +++ b/kdeui/shortcuts/kacceleratormanager.cpp @@ -917,4 +917,4 @@ void KAcceleratorManager::setNoAccel( QWidget *widget ) KAcceleratorManagerPrivate::ignored_widgets[widget] = 1; } -#include "kacceleratormanager_private.moc" +#include "moc_kacceleratormanager_private.cpp" diff --git a/kdeui/shortcuts/kcheckaccelerators.cpp b/kdeui/shortcuts/kcheckaccelerators.cpp index b0af1dfd..20f0ec8a 100644 --- a/kdeui/shortcuts/kcheckaccelerators.cpp +++ b/kdeui/shortcuts/kcheckaccelerators.cpp @@ -276,4 +276,4 @@ void KCheckAccelerators::checkAccelerators( bool automatic ) // dlg will be destroyed before returning } -#include "kcheckaccelerators.moc" +#include "moc_kcheckaccelerators.cpp" diff --git a/kdeui/shortcuts/kgesturemap.cpp b/kdeui/shortcuts/kgesturemap.cpp index 6a775897..fb45c0e7 100644 --- a/kdeui/shortcuts/kgesturemap.cpp +++ b/kdeui/shortcuts/kgesturemap.cpp @@ -271,4 +271,4 @@ bool KGestureMap::eventFilter(QObject *obj, QEvent *e) return false; } -#include "kgesturemap.moc" +#include "moc_kgesturemap.cpp" diff --git a/kdeui/shortcuts/kglobalaccel.cpp b/kdeui/shortcuts/kglobalaccel.cpp index 81e41819..1ec35e1c 100644 --- a/kdeui/shortcuts/kglobalaccel.cpp +++ b/kdeui/shortcuts/kglobalaccel.cpp @@ -605,5 +605,5 @@ void KGlobalAccel::stealShortcutSystemwide(const QKeySequence &seq) self()->d->iface.setForeignShortcut(actionId, sc); } -#include "kglobalaccel.moc" +#include "moc_kglobalaccel.cpp" diff --git a/kdeui/sonnet/configdialog.cpp b/kdeui/sonnet/configdialog.cpp index ea953c8f..26f7a7a9 100644 --- a/kdeui/sonnet/configdialog.cpp +++ b/kdeui/sonnet/configdialog.cpp @@ -99,4 +99,4 @@ QString ConfigDialog::language() const return d->ui->language(); } -#include "configdialog.moc" +#include "moc_configdialog.cpp" diff --git a/kdeui/sonnet/configwidget.cpp b/kdeui/sonnet/configwidget.cpp index 867e2989..a51eb60c 100644 --- a/kdeui/sonnet/configwidget.cpp +++ b/kdeui/sonnet/configwidget.cpp @@ -154,4 +154,4 @@ QString ConfigWidget::language() const } } -#include "configwidget.moc" +#include "moc_configwidget.cpp" diff --git a/kdeui/sonnet/dialog.cpp b/kdeui/sonnet/dialog.cpp index 2162ad01..9a034236 100644 --- a/kdeui/sonnet/dialog.cpp +++ b/kdeui/sonnet/dialog.cpp @@ -449,4 +449,4 @@ void Dialog::slotDone() } -#include "dialog.moc" +#include "moc_dialog.cpp" diff --git a/kdeui/sonnet/dictionarycombobox.cpp b/kdeui/sonnet/dictionarycombobox.cpp index dc6766cf..416bbb76 100644 --- a/kdeui/sonnet/dictionarycombobox.cpp +++ b/kdeui/sonnet/dictionarycombobox.cpp @@ -112,4 +112,4 @@ void DictionaryComboBox::reloadCombo() } -#include "dictionarycombobox.moc" +#include "moc_dictionarycombobox.cpp" diff --git a/kdeui/sonnet/highlighter.cpp b/kdeui/sonnet/highlighter.cpp index b10310a3..712d0cdb 100644 --- a/kdeui/sonnet/highlighter.cpp +++ b/kdeui/sonnet/highlighter.cpp @@ -21,7 +21,7 @@ */ #include "highlighter.h" -#include "highlighter.moc" +#include "moc_highlighter.cpp" #include "speller.h" #include "loader_p.h" diff --git a/kdeui/sonnet/tests/backgroundtest.cpp b/kdeui/sonnet/tests/backgroundtest.cpp index ee4b692a..ef4a49bf 100644 --- a/kdeui/sonnet/tests/backgroundtest.cpp +++ b/kdeui/sonnet/tests/backgroundtest.cpp @@ -19,7 +19,7 @@ * 02110-1301 USA */ #include "backgroundtest.h" -#include "backgroundtest.moc" +#include "moc_backgroundtest.cpp" #include "speller.h" using namespace Sonnet; diff --git a/kdeui/sonnet/tests/test_dialog.cpp b/kdeui/sonnet/tests/test_dialog.cpp index 81401331..52e86d1d 100644 --- a/kdeui/sonnet/tests/test_dialog.cpp +++ b/kdeui/sonnet/tests/test_dialog.cpp @@ -19,7 +19,7 @@ * 02110-1301 USA */ #include "test_dialog.h" -#include "test_dialog.moc" +#include "moc_test_dialog.cpp" #include "backgroundchecker.h" diff --git a/kdeui/sonnet/tests/test_highlighter.cpp b/kdeui/sonnet/tests/test_highlighter.cpp index 3b113b6a..27836f8a 100644 --- a/kdeui/sonnet/tests/test_highlighter.cpp +++ b/kdeui/sonnet/tests/test_highlighter.cpp @@ -20,7 +20,7 @@ */ #include "highlighter.h" #include "test_highlighter.h" -#include "test_highlighter.moc" +#include "moc_test_highlighter.cpp" #include "filter_p.h" #include diff --git a/kdeui/tests/kactioncollectiontest.cpp b/kdeui/tests/kactioncollectiontest.cpp index aae26690..4c88888f 100644 --- a/kdeui/tests/kactioncollectiontest.cpp +++ b/kdeui/tests/kactioncollectiontest.cpp @@ -239,7 +239,7 @@ void tst_KActionCollection::testSetShortcuts() QTEST_KDEMAIN(tst_KActionCollection, GUI) -#include "kactioncollectiontest.moc" +#include "moc_kactioncollectiontest.cpp" /* vim: et sw=4 ts=4 */ diff --git a/kdeui/tests/kanimatedbuttontest.cpp b/kdeui/tests/kanimatedbuttontest.cpp index 52ac6659..b3bf9d3b 100644 --- a/kdeui/tests/kanimatedbuttontest.cpp +++ b/kdeui/tests/kanimatedbuttontest.cpp @@ -92,4 +92,4 @@ int main(int argc, char **argv) return app.exec(); } -#include "kanimatedbuttontest.moc" +#include "moc_kanimatedbuttontest.cpp" diff --git a/kdeui/tests/kapplication_unittest.cpp b/kdeui/tests/kapplication_unittest.cpp index 9982e34e..5e1381d1 100644 --- a/kdeui/tests/kapplication_unittest.cpp +++ b/kdeui/tests/kapplication_unittest.cpp @@ -18,7 +18,7 @@ */ #include "kapplication_unittest.h" -#include "kapplication_unittest.moc" +#include "moc_kapplication_unittest.cpp" #include QTEST_KDEMAIN( KApplication_UnitTest, GUI ) diff --git a/kdeui/tests/kbuttongrouptest.cpp b/kdeui/tests/kbuttongrouptest.cpp index 6df8a632..b47686a7 100644 --- a/kdeui/tests/kbuttongrouptest.cpp +++ b/kdeui/tests/kbuttongrouptest.cpp @@ -197,5 +197,5 @@ void KButtonGroupTest::testSignals() { QTEST_KDEMAIN(KButtonGroupTest, GUI) -#include "kbuttongrouptest.moc" +#include "moc_kbuttongrouptest.cpp" diff --git a/kdeui/tests/kcodecactiontest.cpp b/kdeui/tests/kcodecactiontest.cpp index 088cb1a7..282810a6 100644 --- a/kdeui/tests/kcodecactiontest.cpp +++ b/kdeui/tests/kcodecactiontest.cpp @@ -74,5 +74,5 @@ void CodecActionTest::slotActionTriggered(bool state) kDebug() << sender() << " state " << state; } -#include "kcodecactiontest.moc" +#include "moc_kcodecactiontest.cpp" diff --git a/kdeui/tests/kcolorbuttontest.cpp b/kdeui/tests/kcolorbuttontest.cpp index 5a31b123..8f019186 100644 --- a/kdeui/tests/kcolorbuttontest.cpp +++ b/kdeui/tests/kcolorbuttontest.cpp @@ -27,7 +27,7 @@ QTEST_KDEMAIN(KColorButtonTest, GUI) -#include "kcolorbuttontest.moc" +#include "moc_kcolorbuttontest.cpp" void KColorButtonTest::initTestCase() { diff --git a/kdeui/tests/kcolorcombotest.cpp b/kdeui/tests/kcolorcombotest.cpp index 4ddb068f..02988582 100644 --- a/kdeui/tests/kcolorcombotest.cpp +++ b/kdeui/tests/kcolorcombotest.cpp @@ -144,4 +144,4 @@ int main(int argc, char **argv) return a.exec(); } -#include "kcolorcombotest.moc" +#include "moc_kcolorcombotest.cpp" diff --git a/kdeui/tests/kcolorutilsdemo.cpp b/kdeui/tests/kcolorutilsdemo.cpp index a46f390b..5d13f7a6 100644 --- a/kdeui/tests/kcolorutilsdemo.cpp +++ b/kdeui/tests/kcolorutilsdemo.cpp @@ -216,5 +216,5 @@ int main(int argc, char* argv[]) { return app.exec(); } -#include "kcolorutilsdemo.moc" +#include "moc_kcolorutilsdemo.cpp" // kate: hl C++; indent-width 4; replace-tabs on; diff --git a/kdeui/tests/kcolorutilstest.cpp b/kdeui/tests/kcolorutilstest.cpp index e4ea0251..dcf8a40c 100644 --- a/kdeui/tests/kcolorutilstest.cpp +++ b/kdeui/tests/kcolorutilstest.cpp @@ -130,4 +130,4 @@ void tst_KColorUtils::testShading() } QTEST_MAIN(tst_KColorUtils) -#include "kcolorutilstest.moc" +#include "moc_kcolorutilstest.cpp" diff --git a/kdeui/tests/kcomboboxtest.cpp b/kdeui/tests/kcomboboxtest.cpp index b176f2bf..d5d3573f 100644 --- a/kdeui/tests/kcomboboxtest.cpp +++ b/kdeui/tests/kcomboboxtest.cpp @@ -237,4 +237,4 @@ int main ( int argc, char **argv) return a.exec(); } -#include "kcomboboxtest.moc" +#include "moc_kcomboboxtest.cpp" diff --git a/kdeui/tests/kcompletioncoretest.cpp b/kdeui/tests/kcompletioncoretest.cpp index d4addd1b..6a460716 100644 --- a/kdeui/tests/kcompletioncoretest.cpp +++ b/kdeui/tests/kcompletioncoretest.cpp @@ -17,7 +17,7 @@ */ #include "kcompletioncoretest.h" -#include "kcompletioncoretest.moc" +#include "moc_kcompletioncoretest.cpp" #include "QtTest/QSignalSpy" #define clampet strings[0] diff --git a/kdeui/tests/kcompletionuitest.cpp b/kdeui/tests/kcompletionuitest.cpp index f5b34cad..f237bffc 100644 --- a/kdeui/tests/kcompletionuitest.cpp +++ b/kdeui/tests/kcompletionuitest.cpp @@ -205,4 +205,4 @@ int main(int argc, char **argv ) } -#include "kcompletionuitest.moc" +#include "moc_kcompletionuitest.cpp" diff --git a/kdeui/tests/kconfig_compiler/kconfigcompiler_test.cpp b/kdeui/tests/kconfig_compiler/kconfigcompiler_test.cpp index b0ee8ea1..b4373e2a 100644 --- a/kdeui/tests/kconfig_compiler/kconfigcompiler_test.cpp +++ b/kdeui/tests/kconfig_compiler/kconfigcompiler_test.cpp @@ -22,7 +22,7 @@ #include #include #include "kconfigcompiler_test.h" -#include "kconfigcompiler_test.moc" +#include "moc_kconfigcompiler_test.cpp" QTEST_KDEMAIN_CORE(KConfigCompiler_Test) diff --git a/kdeui/tests/kconfigguitest.cpp b/kdeui/tests/kconfigguitest.cpp index 398dfc60..0cb5cbaf 100644 --- a/kdeui/tests/kconfigguitest.cpp +++ b/kdeui/tests/kconfigguitest.cpp @@ -19,7 +19,7 @@ #include #include "kconfigguitest.h" -#include "kconfigguitest.moc" +#include "moc_kconfigguitest.cpp" #include #include diff --git a/kdeui/tests/kconfigskeletontest.cpp b/kdeui/tests/kconfigskeletontest.cpp index 2bac0e11..50f3fdaf 100644 --- a/kdeui/tests/kconfigskeletontest.cpp +++ b/kdeui/tests/kconfigskeletontest.cpp @@ -19,7 +19,7 @@ #include #include "kconfigskeletontest.h" -#include "kconfigskeletontest.moc" +#include "moc_kconfigskeletontest.cpp" #include #include diff --git a/kdeui/tests/kdatecomboboxtest.cpp b/kdeui/tests/kdatecomboboxtest.cpp index a820fcd5..859725e6 100644 --- a/kdeui/tests/kdatecomboboxtest.cpp +++ b/kdeui/tests/kdatecomboboxtest.cpp @@ -29,7 +29,7 @@ QTEST_KDEMAIN(KDateComboBoxTest, GUI) -#include "kdatecomboboxtest.moc" +#include "moc_kdatecomboboxtest.cpp" void KDateComboBoxTest::testDefaults() { diff --git a/kdeui/tests/kdatetimeedittest.cpp b/kdeui/tests/kdatetimeedittest.cpp index 2741cc7d..f31bd85b 100644 --- a/kdeui/tests/kdatetimeedittest.cpp +++ b/kdeui/tests/kdatetimeedittest.cpp @@ -29,7 +29,7 @@ QTEST_KDEMAIN(KDateTimeEditTest, GUI) -#include "kdatetimeedittest.moc" +#include "moc_kdatetimeedittest.cpp" void KDateTimeEditTest::testDefaults() { diff --git a/kdeui/tests/kfindtest.cpp b/kdeui/tests/kfindtest.cpp index 3f19c4b8..0baa3cce 100644 --- a/kdeui/tests/kfindtest.cpp +++ b/kdeui/tests/kfindtest.cpp @@ -371,4 +371,4 @@ void TestKFind::testFindIncrementalDynamic() QTEST_KDEMAIN(TestKFind, GUI) -#include "kfindtest.moc" +#include "moc_kfindtest.cpp" diff --git a/kdeui/tests/kglobalsettingstest.cpp b/kdeui/tests/kglobalsettingstest.cpp index 6823e30e..a7cbc455 100644 --- a/kdeui/tests/kglobalsettingstest.cpp +++ b/kdeui/tests/kglobalsettingstest.cpp @@ -19,7 +19,7 @@ #include "qtest_kde.h" #include "kglobalsettingstest.h" -#include "kglobalsettingstest.moc" +#include "moc_kglobalsettingstest.cpp" QTEST_KDEMAIN( KGlobalSettingsTest, GUI ) diff --git a/kdeui/tests/kglobalshortcuttest.cpp b/kdeui/tests/kglobalshortcuttest.cpp index aa8c81cf..e3c2237f 100644 --- a/kdeui/tests/kglobalshortcuttest.cpp +++ b/kdeui/tests/kglobalshortcuttest.cpp @@ -427,4 +427,4 @@ void KGlobalShortcutTest::testForgetGlobalShortcut() } -#include "kglobalshortcuttest.moc" +#include "moc_kglobalshortcuttest.cpp" diff --git a/kdeui/tests/khboxtest.cpp b/kdeui/tests/khboxtest.cpp index 7596bb2c..bde44d64 100644 --- a/kdeui/tests/khboxtest.cpp +++ b/kdeui/tests/khboxtest.cpp @@ -40,4 +40,4 @@ int main( int argc, char ** argv ) app.exec(); } -#include "khboxtest.moc" +#include "moc_khboxtest.cpp" diff --git a/kdeui/tests/kiconeffecttest.cpp b/kdeui/tests/kiconeffecttest.cpp index 6b30bc7d..cee07ad3 100644 --- a/kdeui/tests/kiconeffecttest.cpp +++ b/kdeui/tests/kiconeffecttest.cpp @@ -150,5 +150,5 @@ int main( int argc, char **argv ) return app.exec(); } -#include "kiconeffecttest.moc" +#include "moc_kiconeffecttest.cpp" diff --git a/kdeui/tests/kimageframe.cpp b/kdeui/tests/kimageframe.cpp index e5066a32..518a3b28 100644 --- a/kdeui/tests/kimageframe.cpp +++ b/kdeui/tests/kimageframe.cpp @@ -49,5 +49,5 @@ void KImageFrame::paintEvent(QPaintEvent*) p.end(); } -#include "kimageframe.moc" +#include "moc_kimageframe.cpp" // kate: hl C++; indent-width 4; replace-tabs on; diff --git a/kdeui/tests/kjobtrackerstest.cpp b/kdeui/tests/kjobtrackerstest.cpp index b47f1d05..e25b6192 100644 --- a/kdeui/tests/kjobtrackerstest.cpp +++ b/kdeui/tests/kjobtrackerstest.cpp @@ -179,4 +179,4 @@ int main(int argc, char **argv) return app.exec(); } -#include "kjobtrackerstest.moc" +#include "moc_kjobtrackerstest.cpp" diff --git a/kdeui/tests/kledtest.cpp b/kdeui/tests/kledtest.cpp index 4daf1961..107acc46 100644 --- a/kdeui/tests/kledtest.cpp +++ b/kdeui/tests/kledtest.cpp @@ -160,5 +160,5 @@ int main( int argc, char **argv ) return a.exec(); // go } -#include "kledtest.moc" +#include "moc_kledtest.cpp" diff --git a/kdeui/tests/klineedittest.cpp b/kdeui/tests/klineedittest.cpp index 5daa5e58..eb2a52a2 100644 --- a/kdeui/tests/klineedittest.cpp +++ b/kdeui/tests/klineedittest.cpp @@ -183,4 +183,4 @@ int main ( int argc, char **argv) return a.exec(); } -#include "klineedittest.moc" +#include "moc_klineedittest.cpp" diff --git a/kdeui/tests/kmainwindow_unittest.cpp b/kdeui/tests/kmainwindow_unittest.cpp index 93598efe..3191c064 100644 --- a/kdeui/tests/kmainwindow_unittest.cpp +++ b/kdeui/tests/kmainwindow_unittest.cpp @@ -19,7 +19,7 @@ #include "qtest_kde.h" #include "kmainwindow_unittest.h" -#include "kmainwindow_unittest.moc" +#include "moc_kmainwindow_unittest.cpp" #include #include #include diff --git a/kdeui/tests/kmainwindowrestoretest.cpp b/kdeui/tests/kmainwindowrestoretest.cpp index 03ceb85f..d37be6b0 100644 --- a/kdeui/tests/kmainwindowrestoretest.cpp +++ b/kdeui/tests/kmainwindowrestoretest.cpp @@ -40,4 +40,4 @@ int main( int argc, char * argv[] ) { return app.exec(); } -#include "kmainwindowrestoretest.moc" +#include "moc_kmainwindowrestoretest.cpp" diff --git a/kdeui/tests/kmainwindowtest.cpp b/kdeui/tests/kmainwindowtest.cpp index 4fa9a2aa..4a0e5bb8 100644 --- a/kdeui/tests/kmainwindowtest.cpp +++ b/kdeui/tests/kmainwindowtest.cpp @@ -54,7 +54,7 @@ int main( int argc, char **argv ) return app.exec(); } -#include "kmainwindowtest.moc" +#include "moc_kmainwindowtest.cpp" /* vim: et sw=4 ts=4 */ diff --git a/kdeui/tests/kmessagetest.cpp b/kdeui/tests/kmessagetest.cpp index 5e934c53..729216a2 100644 --- a/kdeui/tests/kmessagetest.cpp +++ b/kdeui/tests/kmessagetest.cpp @@ -109,5 +109,5 @@ int main(int argc, char **argv) return app.exec(); } -#include "kmessagetest.moc" +#include "moc_kmessagetest.cpp" // kate: space-indent on; indent-width 4; encoding utf-8; replace-tabs on; diff --git a/kdeui/tests/knuminputtest.cpp b/kdeui/tests/knuminputtest.cpp index 8b523b2b..007ac763 100644 --- a/kdeui/tests/knuminputtest.cpp +++ b/kdeui/tests/knuminputtest.cpp @@ -180,5 +180,5 @@ int main( int argc, char ** argv ) a->exec(); } -#include "knuminputtest.moc" +#include "moc_knuminputtest.cpp" diff --git a/kdeui/tests/kpagedialogtest.cpp b/kdeui/tests/kpagedialogtest.cpp index d33bb0b5..594e110e 100644 --- a/kdeui/tests/kpagedialogtest.cpp +++ b/kdeui/tests/kpagedialogtest.cpp @@ -68,4 +68,4 @@ int main( int argc, char **argv ) return 0; } -#include "kpagedialogtest.moc" +#include "moc_kpagedialogtest.cpp" diff --git a/kdeui/tests/kpagewidgettest.cpp b/kdeui/tests/kpagewidgettest.cpp index 6d1efc91..86d241f1 100644 --- a/kdeui/tests/kpagewidgettest.cpp +++ b/kdeui/tests/kpagewidgettest.cpp @@ -209,4 +209,4 @@ int main( int argc, char **argv ) return app.exec(); } -#include "kpagewidgettest.moc" +#include "moc_kpagewidgettest.cpp" diff --git a/kdeui/tests/kpassivepopuptest.cpp b/kdeui/tests/kpassivepopuptest.cpp index af99e52d..c5a5a8ea 100644 --- a/kdeui/tests/kpassivepopuptest.cpp +++ b/kdeui/tests/kpassivepopuptest.cpp @@ -1,5 +1,5 @@ #include "kpassivepopuptest.h" -#include "kpassivepopuptest.moc" +#include "moc_kpassivepopuptest.cpp" #include #include #include diff --git a/kdeui/tests/kpixmapsequenceoverlaypaintertest.cpp b/kdeui/tests/kpixmapsequenceoverlaypaintertest.cpp index 138d28ef..94596b18 100644 --- a/kdeui/tests/kpixmapsequenceoverlaypaintertest.cpp +++ b/kdeui/tests/kpixmapsequenceoverlaypaintertest.cpp @@ -102,4 +102,4 @@ int main(int argc, char **argv) return testapp.exec(); } -#include "kpixmapsequenceoverlaypaintertest.moc" +#include "moc_kpixmapsequenceoverlaypaintertest.cpp" diff --git a/kdeui/tests/kreplacetest.cpp b/kdeui/tests/kreplacetest.cpp index a5b53666..38dd6663 100644 --- a/kdeui/tests/kreplacetest.cpp +++ b/kdeui/tests/kreplacetest.cpp @@ -382,4 +382,4 @@ int main( int argc, char **argv ) //return app.exec(); return 0; } -#include "kreplacetest.moc" +#include "moc_kreplacetest.cpp" diff --git a/kdeui/tests/krulertest.cpp b/kdeui/tests/krulertest.cpp index 36a4eff1..b55bb0de 100644 --- a/kdeui/tests/krulertest.cpp +++ b/kdeui/tests/krulertest.cpp @@ -387,5 +387,5 @@ int main(int argc, char **argv) return testapp->exec(); } -#include "krulertest.moc" +#include "moc_krulertest.cpp" diff --git a/kdeui/tests/kselectaction_unittest.cpp b/kdeui/tests/kselectaction_unittest.cpp index 0e509d64..a68fd937 100644 --- a/kdeui/tests/kselectaction_unittest.cpp +++ b/kdeui/tests/kselectaction_unittest.cpp @@ -19,7 +19,7 @@ #include "kselectaction_unittest.h" #include -#include "kselectaction_unittest.moc" +#include "moc_kselectaction_unittest.cpp" #include "qtest_kde.h" #include #include diff --git a/kdeui/tests/kselectactiontest.cpp b/kdeui/tests/kselectactiontest.cpp index 6768aa97..b610f303 100644 --- a/kdeui/tests/kselectactiontest.cpp +++ b/kdeui/tests/kselectactiontest.cpp @@ -114,5 +114,5 @@ void SelectActionTest::slotActionTriggered(bool state) kDebug() << sender() << " state " << state; } -#include "kselectactiontest.moc" +#include "moc_kselectactiontest.cpp" diff --git a/kdeui/tests/kselectionproxymodeltestsuite.cpp b/kdeui/tests/kselectionproxymodeltestsuite.cpp index 75c91fc2..f30ec191 100644 --- a/kdeui/tests/kselectionproxymodeltestsuite.cpp +++ b/kdeui/tests/kselectionproxymodeltestsuite.cpp @@ -21,4 +21,4 @@ #include "kselectionproxymodeltestsuite.h" -#include "kselectionproxymodeltestsuite.moc" +#include "moc_kselectionproxymodeltestsuite.cpp" diff --git a/kdeui/tests/kstandardactiontest.cpp b/kdeui/tests/kstandardactiontest.cpp index 28dada4e..7159515c 100644 --- a/kdeui/tests/kstandardactiontest.cpp +++ b/kdeui/tests/kstandardactiontest.cpp @@ -60,4 +60,4 @@ void tst_KStandardAction::shortcutForActionId() } QTEST_KDEMAIN(tst_KStandardAction, GUI) -#include "kstandardactiontest.moc" +#include "moc_kstandardactiontest.cpp" diff --git a/kdeui/tests/kstandardshortcuttest.cpp b/kdeui/tests/kstandardshortcuttest.cpp index fa50099d..dc797a1b 100644 --- a/kdeui/tests/kstandardshortcuttest.cpp +++ b/kdeui/tests/kstandardshortcuttest.cpp @@ -19,7 +19,7 @@ #include #include "kstandardshortcuttest.h" -#include "kstandardshortcuttest.moc" +#include "moc_kstandardshortcuttest.cpp" QTEST_KDEMAIN( KStandardShortcutTest, GUI ) // GUI needed by KAccel diff --git a/kdeui/tests/kstatusbartest.cpp b/kdeui/tests/kstatusbartest.cpp index ba3ff39a..0ca6dbec 100644 --- a/kdeui/tests/kstatusbartest.cpp +++ b/kdeui/tests/kstatusbartest.cpp @@ -122,5 +122,5 @@ int main( int argc, char *argv[] ) return ret; } -#include "kstatusbartest.moc" +#include "moc_kstatusbartest.cpp" diff --git a/kdeui/tests/ktabwidgettest.cpp b/kdeui/tests/ktabwidgettest.cpp index 65cddfc2..dac43043 100644 --- a/kdeui/tests/ktabwidgettest.cpp +++ b/kdeui/tests/ktabwidgettest.cpp @@ -392,4 +392,4 @@ int main(int argc, char** argv ) app.exec(); } -#include "ktabwidgettest.moc" +#include "moc_ktabwidgettest.cpp" diff --git a/kdeui/tests/ktimecomboboxtest.cpp b/kdeui/tests/ktimecomboboxtest.cpp index 053375aa..65584ae2 100644 --- a/kdeui/tests/ktimecomboboxtest.cpp +++ b/kdeui/tests/ktimecomboboxtest.cpp @@ -28,7 +28,7 @@ QTEST_KDEMAIN(KTimeComboBoxTest, GUI) -#include "ktimecomboboxtest.moc" +#include "moc_ktimecomboboxtest.cpp" void KTimeComboBoxTest::testDefaults() { diff --git a/kdeui/tests/ktreewidgetsearchlinetest.cpp b/kdeui/tests/ktreewidgetsearchlinetest.cpp index 5555a034..9b26b7de 100644 --- a/kdeui/tests/ktreewidgetsearchlinetest.cpp +++ b/kdeui/tests/ktreewidgetsearchlinetest.cpp @@ -116,4 +116,4 @@ int main( int argc, char **argv ) return 0; } -#include "ktreewidgetsearchlinetest.moc" +#include "moc_ktreewidgetsearchlinetest.cpp" diff --git a/kdeui/tests/kwindowtest.cpp b/kdeui/tests/kwindowtest.cpp index b4012d72..87c61f12 100644 --- a/kdeui/tests/kwindowtest.cpp +++ b/kdeui/tests/kwindowtest.cpp @@ -438,5 +438,5 @@ int main( int argc, char *argv[] ) return ret; } -#include "kwindowtest.moc" +#include "moc_kwindowtest.cpp" diff --git a/kdeui/tests/kxmlgui_unittest.cpp b/kdeui/tests/kxmlgui_unittest.cpp index a2d8e4f9..84428f57 100644 --- a/kdeui/tests/kxmlgui_unittest.cpp +++ b/kdeui/tests/kxmlgui_unittest.cpp @@ -29,7 +29,7 @@ #include #include "testxmlguiwindow.h" #include "testguiclient.h" -#include "kxmlgui_unittest.moc" +#include "moc_kxmlgui_unittest.cpp" #include #include // it's not exported, so we need to include the code here diff --git a/kdeui/tests/kxmlguitest.cpp b/kdeui/tests/kxmlguitest.cpp index 0a2aeb66..122b14d5 100644 --- a/kdeui/tests/kxmlguitest.cpp +++ b/kdeui/tests/kxmlguitest.cpp @@ -71,4 +71,4 @@ int main( int argc, char **argv ) return app.exec(); } -#include "kxmlguitest.moc" +#include "moc_kxmlguitest.cpp" diff --git a/kdeui/tests/proxymodeltestapp/kreparentingproxymodel.cpp b/kdeui/tests/proxymodeltestapp/kreparentingproxymodel.cpp index dec78ea2..711313e1 100644 --- a/kdeui/tests/proxymodeltestapp/kreparentingproxymodel.cpp +++ b/kdeui/tests/proxymodeltestapp/kreparentingproxymodel.cpp @@ -1525,4 +1525,4 @@ void KReparentingProxyModel::endChangeRule() } -#include "kreparentingproxymodel.moc" +#include "moc_kreparentingproxymodel.cpp" diff --git a/kdeui/tests/proxymodeltestapp/matchcheckingwidget.cpp b/kdeui/tests/proxymodeltestapp/matchcheckingwidget.cpp index d977052a..b74e9fc6 100644 --- a/kdeui/tests/proxymodeltestapp/matchcheckingwidget.cpp +++ b/kdeui/tests/proxymodeltestapp/matchcheckingwidget.cpp @@ -94,4 +94,4 @@ kDebug() << matchData << id << DynamicTreeModel::DynamicTreeModelId; } } -#include "matchcheckingwidget.moc" +#include "moc_matchcheckingwidget.cpp" diff --git a/kdeui/tests/proxymodeltestapp/reparentingpmwidget.cpp b/kdeui/tests/proxymodeltestapp/reparentingpmwidget.cpp index 9bcd9ec7..107020d7 100644 --- a/kdeui/tests/proxymodeltestapp/reparentingpmwidget.cpp +++ b/kdeui/tests/proxymodeltestapp/reparentingpmwidget.cpp @@ -54,5 +54,5 @@ ReparentingProxyModelWidget::ReparentingProxyModelWidget(QWidget* parent): QWidg setLayout(layout); } -#include "reparentingpmwidget.moc" +#include "moc_reparentingpmwidget.cpp" diff --git a/kdeui/tests/proxymodeltestapp/scriptablereparentingwidget.cpp b/kdeui/tests/proxymodeltestapp/scriptablereparentingwidget.cpp index 2888f5fc..6fa459ac 100644 --- a/kdeui/tests/proxymodeltestapp/scriptablereparentingwidget.cpp +++ b/kdeui/tests/proxymodeltestapp/scriptablereparentingwidget.cpp @@ -141,4 +141,4 @@ void ScriptableReparentingWidget::textChanged() } -#include "scriptablereparentingwidget.moc" +#include "moc_scriptablereparentingwidget.cpp" diff --git a/kdeui/tests/proxymodeltestsuite/CMakeLists.txt b/kdeui/tests/proxymodeltestsuite/CMakeLists.txt index 37b1a3ec..b2951fe9 100644 --- a/kdeui/tests/proxymodeltestsuite/CMakeLists.txt +++ b/kdeui/tests/proxymodeltestsuite/CMakeLists.txt @@ -73,7 +73,7 @@ if (proxymodeltestsuite_standalone) endif() -automoc4_add_library(proxymodeltestsuite ${LIBRARY_TYPE} +add_library(proxymodeltestsuite ${LIBRARY_TYPE} ${proxymodeltestsuite_SRCS} ${eventlogger_RCS_SRCS} ) diff --git a/kdeui/tests/proxymodeltestsuite/dynamictreewidget.cpp b/kdeui/tests/proxymodeltestsuite/dynamictreewidget.cpp index 9ff7d4bf..63bfabb5 100644 --- a/kdeui/tests/proxymodeltestsuite/dynamictreewidget.cpp +++ b/kdeui/tests/proxymodeltestsuite/dynamictreewidget.cpp @@ -388,4 +388,4 @@ void DynamicTreeWidget::setInsertSubTreePredefine(int index) } -#include "dynamictreewidget.moc" +#include "moc_dynamictreewidget.cpp" diff --git a/kdeui/tests/testplot_widget.cpp b/kdeui/tests/testplot_widget.cpp index 450ed996..ef321116 100644 --- a/kdeui/tests/testplot_widget.cpp +++ b/kdeui/tests/testplot_widget.cpp @@ -192,4 +192,4 @@ void TestPlot::slotSelectPlot( int n ) { } } -#include "testplot_widget.moc" +#include "moc_testplot_widget.cpp" diff --git a/kdeui/util/kcompletion.cpp b/kdeui/util/kcompletion.cpp index 97194a03..080e0495 100644 --- a/kdeui/util/kcompletion.cpp +++ b/kdeui/util/kcompletion.cpp @@ -988,4 +988,4 @@ KCompTreeNode *KCompTreeNodeList::at(uint index) const QSharedPointer KCompTreeNode::alloc(new KZoneAllocator(8*1024)); -#include "kcompletion.moc" +#include "moc_kcompletion.cpp" diff --git a/kdeui/util/kcursor.cpp b/kdeui/util/kcursor.cpp index 61b86d1e..991d6499 100644 --- a/kdeui/util/kcursor.cpp +++ b/kdeui/util/kcursor.cpp @@ -436,4 +436,4 @@ void KCursorPrivate::slotWidgetDestroyed( QObject* o ) delete filter; } -#include "kcursor_p.moc" +#include "moc_kcursor_p.cpp" diff --git a/kdeui/util/kmanagerselection.cpp b/kdeui/util/kmanagerselection.cpp index a289f476..41deadff 100644 --- a/kdeui/util/kmanagerselection.cpp +++ b/kdeui/util/kmanagerselection.cpp @@ -485,5 +485,5 @@ void KSelectionWatcher::filterEvent( XEvent* ev_P ) Atom KSelectionWatcher::Private::manager_atom = None; -#include "kmanagerselection.moc" +#include "moc_kmanagerselection.cpp" #endif diff --git a/kdeui/util/kmodifierkeyinfo.cpp b/kdeui/util/kmodifierkeyinfo.cpp index 18733d80..21c02c74 100644 --- a/kdeui/util/kmodifierkeyinfo.cpp +++ b/kdeui/util/kmodifierkeyinfo.cpp @@ -78,4 +78,4 @@ bool KModifierKeyInfo::isButtonPressed(Qt::MouseButton button) const return p->isButtonPressed(button); } -#include "kmodifierkeyinfo.moc" +#include "moc_kmodifierkeyinfo.cpp" diff --git a/kdeui/util/kmodifierkeyinfoprovider.cpp b/kdeui/util/kmodifierkeyinfoprovider.cpp index 6e994330..086afdc8 100644 --- a/kdeui/util/kmodifierkeyinfoprovider.cpp +++ b/kdeui/util/kmodifierkeyinfoprovider.cpp @@ -64,4 +64,4 @@ const QList KModifierKeyInfoProvider::knownKeys() const return m_modifierStates.keys(); } -#include "kmodifierkeyinfoprovider_p.moc" +#include "moc_kmodifierkeyinfoprovider_p.cpp" diff --git a/kdeui/util/knumvalidator.cpp b/kdeui/util/knumvalidator.cpp index 876f629a..c4268a19 100644 --- a/kdeui/util/knumvalidator.cpp +++ b/kdeui/util/knumvalidator.cpp @@ -368,4 +368,4 @@ QValidator::State KDoubleValidator::validate( QString & input, int & p ) const { return base::validate( s, p ); } -#include "knumvalidator.moc" +#include "moc_knumvalidator.cpp" diff --git a/kdeui/util/kpassivepopup.cpp b/kdeui/util/kpassivepopup.cpp index 3f376fcc..8389a4c9 100644 --- a/kdeui/util/kpassivepopup.cpp +++ b/kdeui/util/kpassivepopup.cpp @@ -18,7 +18,7 @@ */ #include "kpassivepopup.h" -#include "kpassivepopup.moc" +#include "moc_kpassivepopup.cpp" // Qt #include diff --git a/kdeui/util/kpassivepopupmessagehandler.cpp b/kdeui/util/kpassivepopupmessagehandler.cpp index 80f96fa4..6084cfa0 100644 --- a/kdeui/util/kpassivepopupmessagehandler.cpp +++ b/kdeui/util/kpassivepopupmessagehandler.cpp @@ -64,5 +64,5 @@ QWidget *KPassivePopupMessageHandler::parentWidget() return qobject_cast( parent() ); } -#include "kpassivepopupmessagehandler.moc" +#include "moc_kpassivepopupmessagehandler.cpp" // kate: space-indent on; indent-width 4; encoding utf-8; replace-tabs on; diff --git a/kdeui/util/kpixmapsequenceoverlaypainter.cpp b/kdeui/util/kpixmapsequenceoverlaypainter.cpp index 53bd3b6b..cc112dc7 100644 --- a/kdeui/util/kpixmapsequenceoverlaypainter.cpp +++ b/kdeui/util/kpixmapsequenceoverlaypainter.cpp @@ -275,4 +275,4 @@ bool KPixmapSequenceOverlayPainter::eventFilter(QObject *obj, QEvent *event) return false; } -#include "kpixmapsequenceoverlaypainter.moc" +#include "moc_kpixmapsequenceoverlaypainter.cpp" diff --git a/kdeui/util/kpixmapsequencewidget.cpp b/kdeui/util/kpixmapsequencewidget.cpp index c130d8bf..150db50d 100644 --- a/kdeui/util/kpixmapsequencewidget.cpp +++ b/kdeui/util/kpixmapsequencewidget.cpp @@ -85,4 +85,4 @@ void KPixmapSequenceWidget::setInterval(int msecs) d->m_painter.setInterval(msecs); } -#include "kpixmapsequencewidget.moc" +#include "moc_kpixmapsequencewidget.cpp" diff --git a/kdeui/util/ksvgrenderer.cpp b/kdeui/util/ksvgrenderer.cpp index ec218ed2..aab02c22 100644 --- a/kdeui/util/ksvgrenderer.cpp +++ b/kdeui/util/ksvgrenderer.cpp @@ -46,4 +46,4 @@ KSvgRenderer::load(const QByteArray &contents) return QSvgRenderer::load(contents); } -#include "ksvgrenderer.moc" +#include "moc_ksvgrenderer.cpp" diff --git a/kdeui/util/kundostack.cpp b/kdeui/util/kundostack.cpp index 20cb5ac4..d8078ee6 100644 --- a/kdeui/util/kundostack.cpp +++ b/kdeui/util/kundostack.cpp @@ -72,4 +72,4 @@ QAction* KUndoStack::createUndoAction(KActionCollection* actionCollection, const return action; } -#include "kundostack.moc" +#include "moc_kundostack.cpp" diff --git a/kdeui/util/kwallet.cpp b/kdeui/util/kwallet.cpp index 67a33d60..cf5787f8 100644 --- a/kdeui/util/kwallet.cpp +++ b/kdeui/util/kwallet.cpp @@ -1714,4 +1714,4 @@ org::kde::KWallet &KWalletDLauncher::getInterface() } // namespace KWallet -#include "kwallet.moc" +#include "moc_kwallet.cpp" diff --git a/kdeui/util/kxmessages.cpp b/kdeui/util/kxmessages.cpp index 0a79ede7..dafb0282 100644 --- a/kdeui/util/kxmessages.cpp +++ b/kdeui/util/kxmessages.cpp @@ -220,5 +220,5 @@ bool KXMessages::x11Event( XEvent* ev_P ) return false; // lets other KXMessages instances get the event too } -#include "kxmessages.moc" +#include "moc_kxmessages.cpp" #endif diff --git a/kdeui/widgets/kactionselector.cpp b/kdeui/widgets/kactionselector.cpp index 80229a19..6adf4eae 100644 --- a/kdeui/widgets/kactionselector.cpp +++ b/kdeui/widgets/kactionselector.cpp @@ -563,4 +563,4 @@ int KActionSelectorPrivate::selectedRowIndex( QListWidget *lb ) } //END Private Methods -#include "kactionselector.moc" +#include "moc_kactionselector.cpp" diff --git a/kdeui/widgets/kanimatedbutton.cpp b/kdeui/widgets/kanimatedbutton.cpp index e4789b93..6c7d20a0 100644 --- a/kdeui/widgets/kanimatedbutton.cpp +++ b/kdeui/widgets/kanimatedbutton.cpp @@ -201,4 +201,4 @@ int KAnimatedButton::iconDimensions() const return qMin(iconSize().width(), iconSize().height()); } -#include "kanimatedbutton.moc" +#include "moc_kanimatedbutton.cpp" diff --git a/kdeui/widgets/karrowbutton.cpp b/kdeui/widgets/karrowbutton.cpp index 5c9c9248..be1a5f68 100644 --- a/kdeui/widgets/karrowbutton.cpp +++ b/kdeui/widgets/karrowbutton.cpp @@ -116,4 +116,4 @@ void KArrowButton::paintEvent(QPaintEvent*) style()->drawPrimitive( e, &opt, &p, this ); } -#include "karrowbutton.moc" +#include "moc_karrowbutton.cpp" diff --git a/kdeui/widgets/kbuttongroup.cpp b/kdeui/widgets/kbuttongroup.cpp index 96c058e0..484a3999 100644 --- a/kdeui/widgets/kbuttongroup.cpp +++ b/kdeui/widgets/kbuttongroup.cpp @@ -159,5 +159,5 @@ void KButtonGroup::Private::slotClicked(int id) emit q->changed(id); } -#include "kbuttongroup.moc" +#include "moc_kbuttongroup.cpp" diff --git a/kdeui/widgets/kcapacitybar.cpp b/kdeui/widgets/kcapacitybar.cpp index ba20eea3..7d6c34d0 100644 --- a/kdeui/widgets/kcapacitybar.cpp +++ b/kdeui/widgets/kcapacitybar.cpp @@ -375,4 +375,4 @@ void KCapacityBar::paintEvent(QPaintEvent *event) p.end(); } -#include "kcapacitybar.moc" +#include "moc_kcapacitybar.cpp" diff --git a/kdeui/widgets/kcharselect.cpp b/kdeui/widgets/kcharselect.cpp index 6c7234c7..8250623f 100644 --- a/kdeui/widgets/kcharselect.cpp +++ b/kdeui/widgets/kcharselect.cpp @@ -891,5 +891,5 @@ QVariant KCharSelectItemModel::data(const QModelIndex &index, int role) const return QVariant(); } -#include "kcharselect.moc" -#include "kcharselect_p.moc" +#include "moc_kcharselect.cpp" +#include "moc_kcharselect_p.cpp" diff --git a/kdeui/widgets/kcmodule.cpp b/kdeui/widgets/kcmodule.cpp index 20dcc478..b0591578 100644 --- a/kdeui/widgets/kcmodule.cpp +++ b/kdeui/widgets/kcmodule.cpp @@ -293,5 +293,5 @@ QList KCModule::configs() const return d->managers; } -#include "kcmodule.moc" +#include "moc_kcmodule.cpp" // vim: sw=4 et sts=4 diff --git a/kdeui/widgets/kcombobox.cpp b/kdeui/widgets/kcombobox.cpp index e822c08e..c3d6e542 100644 --- a/kdeui/widgets/kcombobox.cpp +++ b/kdeui/widgets/kcombobox.cpp @@ -397,4 +397,4 @@ void KComboBox::setEditable(bool editable) } } -#include "kcombobox.moc" +#include "moc_kcombobox.cpp" diff --git a/kdeui/widgets/kcompletionbox.cpp b/kdeui/widgets/kcompletionbox.cpp index 040c95a7..d4ce2a0d 100644 --- a/kdeui/widgets/kcompletionbox.cpp +++ b/kdeui/widgets/kcompletionbox.cpp @@ -577,4 +577,4 @@ bool KCompletionBox::activateOnSelect() const return d->emitSelected; } -#include "kcompletionbox.moc" +#include "moc_kcompletionbox.cpp" diff --git a/kdeui/widgets/kdatecombobox.cpp b/kdeui/widgets/kdatecombobox.cpp index 6d51f348..e546036d 100644 --- a/kdeui/widgets/kdatecombobox.cpp +++ b/kdeui/widgets/kdatecombobox.cpp @@ -560,4 +560,4 @@ void KDateComboBox::resizeEvent(QResizeEvent *event) KComboBox::resizeEvent(event); } -#include "kdatecombobox.moc" +#include "moc_kdatecombobox.cpp" diff --git a/kdeui/widgets/kdatepicker.cpp b/kdeui/widgets/kdatepicker.cpp index 529c3da8..98c70d91 100644 --- a/kdeui/widgets/kdatepicker.cpp +++ b/kdeui/widgets/kdatepicker.cpp @@ -44,8 +44,8 @@ #include #include -#include "kdatepicker.moc" -#include "kdatepicker_p.moc" +#include "moc_kdatepicker.cpp" +#include "moc_kdatepicker_p.cpp" // Week numbers are defined by ISO 8601 // See http://www.merlyn.demon.co.uk/weekinfo.htm for details diff --git a/kdeui/widgets/kdatetable.cpp b/kdeui/widgets/kdatetable.cpp index 52f0a025..7e1d8f59 100644 --- a/kdeui/widgets/kdatetable.cpp +++ b/kdeui/widgets/kdatetable.cpp @@ -959,4 +959,4 @@ int KPopupFrame::exec( int x, int y ) return exec( QPoint( x, y ) ); } -#include "kdatetable.moc" +#include "moc_kdatetable.cpp" diff --git a/kdeui/widgets/kdatetimeedit.cpp b/kdeui/widgets/kdatetimeedit.cpp index 79387c43..dbfa5819 100644 --- a/kdeui/widgets/kdatetimeedit.cpp +++ b/kdeui/widgets/kdatetimeedit.cpp @@ -598,4 +598,4 @@ void KDateTimeEdit::resizeEvent(QResizeEvent *event) QWidget::resizeEvent(event); } -#include "kdatetimeedit.moc" +#include "moc_kdatetimeedit.cpp" diff --git a/kdeui/widgets/kdatetimewidget.cpp b/kdeui/widgets/kdatetimewidget.cpp index 756434b1..7b5ddebd 100644 --- a/kdeui/widgets/kdatetimewidget.cpp +++ b/kdeui/widgets/kdatetimewidget.cpp @@ -94,4 +94,4 @@ void KDateTimeWidget::slotValueChanged() emit valueChanged(datetime); } -#include "kdatetimewidget.moc" +#include "moc_kdatetimewidget.cpp" diff --git a/kdeui/widgets/kdatewidget.cpp b/kdeui/widgets/kdatewidget.cpp index 28631ddf..d49214f7 100644 --- a/kdeui/widgets/kdatewidget.cpp +++ b/kdeui/widgets/kdatewidget.cpp @@ -182,4 +182,4 @@ bool KDateWidget::setCalendarSystem( KLocale::CalendarSystem newCalendarSystem ) return true; } -#include "kdatewidget.moc" +#include "moc_kdatewidget.cpp" diff --git a/kdeui/widgets/kdialogbuttonbox.cpp b/kdeui/widgets/kdialogbuttonbox.cpp index 372329f8..4a433d9f 100644 --- a/kdeui/widgets/kdialogbuttonbox.cpp +++ b/kdeui/widgets/kdialogbuttonbox.cpp @@ -54,4 +54,4 @@ KPushButton *KDialogButtonBox::addButton( const KGuiItem& guiitem, ButtonRole r return pb; } -#include "kdialogbuttonbox.moc" +#include "moc_kdialogbuttonbox.cpp" diff --git a/kdeui/widgets/keditlistbox.cpp b/kdeui/widgets/keditlistbox.cpp index 2e00d2e4..35d14837 100644 --- a/kdeui/widgets/keditlistbox.cpp +++ b/kdeui/widgets/keditlistbox.cpp @@ -684,4 +684,4 @@ bool KEditListBox::eventFilter( QObject* o, QEvent* e ) return false; } -#include "keditlistbox.moc" +#include "moc_keditlistbox.cpp" diff --git a/kdeui/widgets/keditlistwidget.cpp b/kdeui/widgets/keditlistwidget.cpp index c6c687a7..8ac5056c 100644 --- a/kdeui/widgets/keditlistwidget.cpp +++ b/kdeui/widgets/keditlistwidget.cpp @@ -663,4 +663,4 @@ bool KEditListWidget::eventFilter( QObject* o, QEvent* e ) return false; } -#include "keditlistwidget.moc" +#include "moc_keditlistwidget.cpp" diff --git a/kdeui/widgets/khbox.cpp b/kdeui/widgets/khbox.cpp index fcf6e291..dc128e06 100644 --- a/kdeui/widgets/khbox.cpp +++ b/kdeui/widgets/khbox.cpp @@ -110,4 +110,4 @@ void KHBox::setMargin( int margin ) layout()->setMargin( margin ); } -#include "khbox.moc" +#include "moc_khbox.cpp" diff --git a/kdeui/widgets/khelpmenu.cpp b/kdeui/widgets/khelpmenu.cpp index 2850d8d4..dbb4ef7a 100644 --- a/kdeui/widgets/khelpmenu.cpp +++ b/kdeui/widgets/khelpmenu.cpp @@ -370,4 +370,4 @@ void KHelpMenu::contextHelpActivated() } -#include "khelpmenu.moc" +#include "moc_khelpmenu.cpp" diff --git a/kdeui/widgets/khistorycombobox.cpp b/kdeui/widgets/khistorycombobox.cpp index 30f8c83b..ecb8e91b 100644 --- a/kdeui/widgets/khistorycombobox.cpp +++ b/kdeui/widgets/khistorycombobox.cpp @@ -445,4 +445,4 @@ void KHistoryComboBox::reset() slotReset(); } -#include "khistorycombobox.moc" +#include "moc_khistorycombobox.cpp" diff --git a/kdeui/widgets/kkeysequencewidget.cpp b/kdeui/widgets/kkeysequencewidget.cpp index 1f44966d..d3ce35c2 100644 --- a/kdeui/widgets/kkeysequencewidget.cpp +++ b/kdeui/widgets/kkeysequencewidget.cpp @@ -830,5 +830,5 @@ bool KKeySequenceWidgetPrivate::isOkWhenModifierless(int keyQt) } } -#include "kkeysequencewidget.moc" -#include "kkeysequencewidget_p.moc" +#include "moc_kkeysequencewidget.cpp" +#include "moc_kkeysequencewidget_p.cpp" diff --git a/kdeui/widgets/klanguagebutton.cpp b/kdeui/widgets/klanguagebutton.cpp index 3a1840bb..7ffcdc6d 100644 --- a/kdeui/widgets/klanguagebutton.cpp +++ b/kdeui/widgets/klanguagebutton.cpp @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include "klanguagebutton.moc" +#include "moc_klanguagebutton.cpp" #include #include diff --git a/kdeui/widgets/kled.cpp b/kdeui/widgets/kled.cpp index bb618d93..1faac2a3 100644 --- a/kdeui/widgets/kled.cpp +++ b/kdeui/widgets/kled.cpp @@ -325,4 +325,4 @@ void KLed::paintLed(Shape shape, Look look) painter.end(); } -#include "kled.moc" +#include "moc_kled.cpp" diff --git a/kdeui/widgets/klineedit.cpp b/kdeui/widgets/klineedit.cpp index fe22f008..a6b6e52e 100644 --- a/kdeui/widgets/klineedit.cpp +++ b/kdeui/widgets/klineedit.cpp @@ -1869,5 +1869,5 @@ void KLineEdit::doCompletion(const QString& txt) d->completionRunning = false; } -#include "klineedit.moc" -#include "klineedit_p.moc" +#include "moc_klineedit.cpp" +#include "moc_klineedit_p.cpp" diff --git a/kdeui/widgets/kmainwindow.cpp b/kdeui/widgets/kmainwindow.cpp index c5628db0..a25f220f 100644 --- a/kdeui/widgets/kmainwindow.cpp +++ b/kdeui/widgets/kmainwindow.cpp @@ -1133,5 +1133,5 @@ QString KMainWindow::dbusName() const return k_func()->dbusName; } -#include "kmainwindow.moc" +#include "moc_kmainwindow.cpp" diff --git a/kdeui/widgets/kmenu.cpp b/kdeui/widgets/kmenu.cpp index ae4132b1..a884425b 100644 --- a/kdeui/widgets/kmenu.cpp +++ b/kdeui/widgets/kmenu.cpp @@ -626,4 +626,4 @@ KMenuContext::KMenuContext(QPointer menu,QPointer action) { } -#include "kmenu.moc" +#include "moc_kmenu.cpp" diff --git a/kdeui/widgets/kmenubar.cpp b/kdeui/widgets/kmenubar.cpp index b5783cbd..6cb667e2 100644 --- a/kdeui/widgets/kmenubar.cpp +++ b/kdeui/widgets/kmenubar.cpp @@ -561,4 +561,4 @@ void KMenuBar::paintEvent( QPaintEvent* pe ) #endif } -#include "kmenubar.moc" +#include "moc_kmenubar.cpp" diff --git a/kdeui/widgets/kmessagewidget.cpp b/kdeui/widgets/kmessagewidget.cpp index b09e9cbd..e12c40f4 100644 --- a/kdeui/widgets/kmessagewidget.cpp +++ b/kdeui/widgets/kmessagewidget.cpp @@ -461,4 +461,4 @@ void KMessageWidget::setIcon(const QIcon& icon) } -#include "kmessagewidget.moc" +#include "moc_kmessagewidget.cpp" diff --git a/kdeui/widgets/kmultitabbar.cpp b/kdeui/widgets/kmultitabbar.cpp index d090f5c0..6253162a 100644 --- a/kdeui/widgets/kmultitabbar.cpp +++ b/kdeui/widgets/kmultitabbar.cpp @@ -24,8 +24,8 @@ #include "kmultitabbar.h" #include "kmultitabbar_p.h" -#include "kmultitabbar.moc" -#include "kmultitabbar_p.moc" +#include "moc_kmultitabbar.cpp" +#include "moc_kmultitabbar_p.cpp" #include #include diff --git a/kdeui/widgets/knuminput.cpp b/kdeui/widgets/knuminput.cpp index cc44558e..519ee9a5 100644 --- a/kdeui/widgets/knuminput.cpp +++ b/kdeui/widgets/knuminput.cpp @@ -1085,4 +1085,4 @@ void KDoubleNumInput::setExponentRatio(double dbl) } -#include "knuminput.moc" +#include "moc_knuminput.cpp" diff --git a/kdeui/widgets/kpixmapregionselectorwidget.cpp b/kdeui/widgets/kpixmapregionselectorwidget.cpp index 431cbcef..60085160 100644 --- a/kdeui/widgets/kpixmapregionselectorwidget.cpp +++ b/kdeui/widgets/kpixmapregionselectorwidget.cpp @@ -523,4 +523,4 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height) resize(d->m_label->width(), d->m_label->height()); } -#include "kpixmapregionselectorwidget.moc" +#include "moc_kpixmapregionselectorwidget.cpp" diff --git a/kdeui/widgets/kpushbutton.cpp b/kdeui/widgets/kpushbutton.cpp index bb1a7e3e..0bc0b4eb 100644 --- a/kdeui/widgets/kpushbutton.cpp +++ b/kdeui/widgets/kpushbutton.cpp @@ -380,4 +380,4 @@ void KPushButton::paintEvent( QPaintEvent * ) p.drawControl(QStyle::CE_PushButton, option); } -#include "kpushbutton.moc" +#include "moc_kpushbutton.cpp" diff --git a/kdeui/widgets/kratingwidget.cpp b/kdeui/widgets/kratingwidget.cpp index 084555e5..90a5c6a9 100644 --- a/kdeui/widgets/kratingwidget.cpp +++ b/kdeui/widgets/kratingwidget.cpp @@ -296,4 +296,4 @@ void KRatingWidget::resizeEvent( QResizeEvent* e ) QFrame::resizeEvent( e ); } -#include "kratingwidget.moc" +#include "moc_kratingwidget.cpp" diff --git a/kdeui/widgets/krestrictedline.cpp b/kdeui/widgets/krestrictedline.cpp index 6a03b4f4..cea51666 100644 --- a/kdeui/widgets/krestrictedline.cpp +++ b/kdeui/widgets/krestrictedline.cpp @@ -101,4 +101,4 @@ QString KRestrictedLine::validChars() const return d->qsValidChars; } -#include "krestrictedline.moc" +#include "moc_krestrictedline.cpp" diff --git a/kdeui/widgets/krichtextedit.cpp b/kdeui/widgets/krichtextedit.cpp index e4cfda27..058e6b85 100644 --- a/kdeui/widgets/krichtextedit.cpp +++ b/kdeui/widgets/krichtextedit.cpp @@ -580,4 +580,4 @@ QString KRichTextEdit::toCleanHtml() const return result; } -#include "krichtextedit.moc" +#include "moc_krichtextedit.cpp" diff --git a/kdeui/widgets/krichtextwidget.cpp b/kdeui/widgets/krichtextwidget.cpp index 36ca2328..46b7c10c 100644 --- a/kdeui/widgets/krichtextwidget.cpp +++ b/kdeui/widgets/krichtextwidget.cpp @@ -712,4 +712,4 @@ void KRichTextWidget::updateActionStates() } // kate: space-indent on; indent-width 4; encoding utf-8; replace-tabs on; -#include "krichtextwidget.moc" +#include "moc_krichtextwidget.cpp" diff --git a/kdeui/widgets/kruler.cpp b/kdeui/widgets/kruler.cpp index 40d28c60..4c93ed39 100644 --- a/kdeui/widgets/kruler.cpp +++ b/kdeui/widgets/kruler.cpp @@ -772,4 +772,4 @@ KRuler::paintEvent(QPaintEvent * /*e*/) } -#include "kruler.moc" +#include "moc_kruler.cpp" diff --git a/kdeui/widgets/kselector.cpp b/kdeui/widgets/kselector.cpp index bceda6ae..dd3b39a4 100644 --- a/kdeui/widgets/kselector.cpp +++ b/kdeui/widgets/kselector.cpp @@ -442,4 +442,4 @@ QString KGradientSelector::secondText() const return d->text2; } -#include "kselector.moc" +#include "moc_kselector.cpp" diff --git a/kdeui/widgets/kseparator.cpp b/kdeui/widgets/kseparator.cpp index 3b834f23..6878a82a 100644 --- a/kdeui/widgets/kseparator.cpp +++ b/kdeui/widgets/kseparator.cpp @@ -59,4 +59,4 @@ Qt::Orientation KSeparator::orientation() const return ((frameStyle() & VLine) == VLine) ? Qt::Vertical : Qt::Horizontal; } -#include "kseparator.moc" +#include "moc_kseparator.cpp" diff --git a/kdeui/widgets/kshortcutwidget.cpp b/kdeui/widgets/kshortcutwidget.cpp index 910e1f7a..b9e318c1 100644 --- a/kdeui/widgets/kshortcutwidget.cpp +++ b/kdeui/widgets/kshortcutwidget.cpp @@ -146,4 +146,4 @@ void KShortcutWidgetPrivate::altKeySequenceChanged(const QKeySequence &seq) emit q->shortcutChanged(cut); } -#include "kshortcutwidget.moc" +#include "moc_kshortcutwidget.cpp" diff --git a/kdeui/widgets/ksqueezedtextlabel.cpp b/kdeui/widgets/ksqueezedtextlabel.cpp index e580f89b..073e0b73 100644 --- a/kdeui/widgets/ksqueezedtextlabel.cpp +++ b/kdeui/widgets/ksqueezedtextlabel.cpp @@ -211,4 +211,4 @@ void KSqueezedTextLabel::mouseReleaseEvent(QMouseEvent* ev) } } -#include "ksqueezedtextlabel.moc" +#include "moc_ksqueezedtextlabel.cpp" diff --git a/kdeui/widgets/kstatusbar.cpp b/kdeui/widgets/kstatusbar.cpp index f6826f40..d837a7dc 100644 --- a/kdeui/widgets/kstatusbar.cpp +++ b/kdeui/widgets/kstatusbar.cpp @@ -197,5 +197,5 @@ void KStatusBar::setItemFixed(int id, int w) } } -#include "kstatusbar.moc" +#include "moc_kstatusbar.cpp" diff --git a/kdeui/widgets/kstringvalidator.cpp b/kdeui/widgets/kstringvalidator.cpp index e58c1669..b47a812a 100644 --- a/kdeui/widgets/kstringvalidator.cpp +++ b/kdeui/widgets/kstringvalidator.cpp @@ -154,4 +154,4 @@ void KMimeTypeValidator::fixup( QString &input ) const input.remove( invalidChars ); } -#include "kstringvalidator.moc" +#include "moc_kstringvalidator.cpp" diff --git a/kdeui/widgets/ktabbar.cpp b/kdeui/widgets/ktabbar.cpp index cda64479..97b626be 100644 --- a/kdeui/widgets/ktabbar.cpp +++ b/kdeui/widgets/ktabbar.cpp @@ -444,4 +444,4 @@ QRect KTabBar::closeButtonRect( int tabIndex ) const return QRect(); } -#include "ktabbar.moc" +#include "moc_ktabbar.cpp" diff --git a/kdeui/widgets/ktabwidget.cpp b/kdeui/widgets/ktabwidget.cpp index 49dc2938..504e430b 100644 --- a/kdeui/widgets/ktabwidget.cpp +++ b/kdeui/widgets/ktabwidget.cpp @@ -723,4 +723,4 @@ void KTabWidget::currentChanged( int ) } #endif -#include "ktabwidget.moc" +#include "moc_ktabwidget.cpp" diff --git a/kdeui/widgets/ktextbrowser.cpp b/kdeui/widgets/ktextbrowser.cpp index 07d09bd3..cc07ba6f 100644 --- a/kdeui/widgets/ktextbrowser.cpp +++ b/kdeui/widgets/ktextbrowser.cpp @@ -128,4 +128,4 @@ void KTextBrowser::contextMenuEvent( QContextMenuEvent *event ) } } -#include "ktextbrowser.moc" +#include "moc_ktextbrowser.cpp" diff --git a/kdeui/widgets/ktextedit.cpp b/kdeui/widgets/ktextedit.cpp index 34e2ee1f..a587b851 100644 --- a/kdeui/widgets/ktextedit.cpp +++ b/kdeui/widgets/ktextedit.cpp @@ -1168,4 +1168,4 @@ void KTextEdit::mousePopupMenuImplementation(const QPoint& pos) } } -#include "ktextedit.moc" +#include "moc_ktextedit.cpp" diff --git a/kdeui/widgets/ktimecombobox.cpp b/kdeui/widgets/ktimecombobox.cpp index 14fab0eb..4a44e70a 100644 --- a/kdeui/widgets/ktimecombobox.cpp +++ b/kdeui/widgets/ktimecombobox.cpp @@ -538,4 +538,4 @@ void KTimeComboBox::resizeEvent(QResizeEvent *event) KComboBox::resizeEvent(event); } -#include "ktimecombobox.moc" +#include "moc_ktimecombobox.cpp" diff --git a/kdeui/widgets/ktimezonewidget.cpp b/kdeui/widgets/ktimezonewidget.cpp index 13dd064d..949e5ccf 100644 --- a/kdeui/widgets/ktimezonewidget.cpp +++ b/kdeui/widgets/ktimezonewidget.cpp @@ -247,4 +247,4 @@ QAbstractItemView::SelectionMode KTimeZoneWidget::selectionMode() const } } -#include "ktimezonewidget.moc" +#include "moc_ktimezonewidget.cpp" diff --git a/kdeui/widgets/ktitlewidget.cpp b/kdeui/widgets/ktitlewidget.cpp index 8464d7ec..cb81c839 100644 --- a/kdeui/widgets/ktitlewidget.cpp +++ b/kdeui/widgets/ktitlewidget.cpp @@ -294,4 +294,4 @@ void KTitleWidget::showEvent(QShowEvent *event) } } -#include "ktitlewidget.moc" +#include "moc_ktitlewidget.cpp" diff --git a/kdeui/widgets/ktoolbar.cpp b/kdeui/widgets/ktoolbar.cpp index 017af7b3..1664682e 100644 --- a/kdeui/widgets/ktoolbar.cpp +++ b/kdeui/widgets/ktoolbar.cpp @@ -1432,4 +1432,4 @@ bool KToolBar::toolBarsLocked() return KToolBar::Private::s_locked; } -#include "ktoolbar.moc" +#include "moc_ktoolbar.cpp" diff --git a/kdeui/widgets/kurllabel.cpp b/kdeui/widgets/kurllabel.cpp index e1f2a68f..71d62a30 100644 --- a/kdeui/widgets/kurllabel.cpp +++ b/kdeui/widgets/kurllabel.cpp @@ -329,4 +329,4 @@ bool KUrlLabel::event( QEvent *event ) return QLabel::event( event ); } -#include "kurllabel.moc" +#include "moc_kurllabel.cpp" diff --git a/kdeui/widgets/kvbox.cpp b/kdeui/widgets/kvbox.cpp index dcc97b79..967085c3 100644 --- a/kdeui/widgets/kvbox.cpp +++ b/kdeui/widgets/kvbox.cpp @@ -28,4 +28,4 @@ KVBox::~KVBox() { } -#include "kvbox.moc" +#include "moc_kvbox.cpp" diff --git a/kdeui/widgets/kxyselector.cpp b/kdeui/widgets/kxyselector.cpp index a6f66d2a..9784c201 100644 --- a/kdeui/widgets/kxyselector.cpp +++ b/kdeui/widgets/kxyselector.cpp @@ -258,4 +258,4 @@ void KXYSelector::drawMarker( QPainter *p, int xp, int yp ) -#include "kxyselector.moc" +#include "moc_kxyselector.cpp" diff --git a/kdeui/windowmanagement/kwindowsystem_qws.cpp b/kdeui/windowmanagement/kwindowsystem_qws.cpp index 96855b02..f9d1273c 100644 --- a/kdeui/windowmanagement/kwindowsystem_qws.cpp +++ b/kdeui/windowmanagement/kwindowsystem_qws.cpp @@ -270,5 +270,5 @@ void KWindowSystem::setBlockingCompositing( WId window, bool active ) kDebug() << "setBlockingCompositing( WId window, bool active ) isn't yet implemented!"; } -#include "kwindowsystem.moc" +#include "moc_kwindowsystem.cpp" diff --git a/kdeui/windowmanagement/kwindowsystem_x11.cpp b/kdeui/windowmanagement/kwindowsystem_x11.cpp index be32fc51..68f30497 100644 --- a/kdeui/windowmanagement/kwindowsystem_x11.cpp +++ b/kdeui/windowmanagement/kwindowsystem_x11.cpp @@ -1128,4 +1128,4 @@ QPoint KWindowSystem::constrainViewportRelativePosition( const QPoint& pos ) return QPoint( x - c.x, y - c.y ); } -#include "kwindowsystem.moc" +#include "moc_kwindowsystem.cpp" diff --git a/kdeui/xmlgui/kmainwindowiface.cpp b/kdeui/xmlgui/kmainwindowiface.cpp index e432bbe1..87badf07 100644 --- a/kdeui/xmlgui/kmainwindowiface.cpp +++ b/kdeui/xmlgui/kmainwindowiface.cpp @@ -117,4 +117,4 @@ void KMainWindowInterface::grabWindowToClipBoard() clipboard->setPixmap(QPixmap::grabWidget(m_MainWindow)); } -#include "kmainwindowiface_p.moc" +#include "moc_kmainwindowiface_p.cpp" diff --git a/kdeui/xmlgui/kmenumenuhandler_p.cpp b/kdeui/xmlgui/kmenumenuhandler_p.cpp index d8c82b6a..b400b74a 100644 --- a/kdeui/xmlgui/kmenumenuhandler_p.cpp +++ b/kdeui/xmlgui/kmenumenuhandler_p.cpp @@ -194,4 +194,4 @@ void KMenuMenuHandler::slotAddToToolBar(int tb) } //END namespace KDEPrivate -#include "kmenumenuhandler_p.moc" +#include "moc_kmenumenuhandler_p.cpp" diff --git a/kdeui/xmlgui/ktoolbarhandler.cpp b/kdeui/xmlgui/ktoolbarhandler.cpp index f7a59552..83361538 100644 --- a/kdeui/xmlgui/ktoolbarhandler.cpp +++ b/kdeui/xmlgui/ktoolbarhandler.cpp @@ -257,4 +257,4 @@ void ToolBarHandler::setupActions() d->connectToActionContainers(); } -#include "ktoolbarhandler_p.moc" +#include "moc_ktoolbarhandler_p.cpp" diff --git a/kdeui/xmlgui/kxmlguifactory.cpp b/kdeui/xmlgui/kxmlguifactory.cpp index 8ceef13b..f93e0b53 100644 --- a/kdeui/xmlgui/kxmlguifactory.cpp +++ b/kdeui/xmlgui/kxmlguifactory.cpp @@ -799,7 +799,7 @@ QDomElement KXMLGUIFactory::findActionByName( QDomElement& elem, const QString& return QDomElement(); } -#include "kxmlguifactory.moc" +#include "moc_kxmlguifactory.cpp" /* vim: et sw=4 */ diff --git a/kdeui/xmlgui/kxmlguiwindow.cpp b/kdeui/xmlgui/kxmlguiwindow.cpp index 27e7eca3..6af2e7a5 100644 --- a/kdeui/xmlgui/kxmlguiwindow.cpp +++ b/kdeui/xmlgui/kxmlguiwindow.cpp @@ -359,5 +359,5 @@ void KXmlGuiWindow::applyMainWindowSettings(const KConfigGroup &config, bool for void KXmlGuiWindow::finalizeGUI( KXMLGUIClient *client ) { KXMLGUIBuilder::finalizeGUI( client ); } -#include "kxmlguiwindow.moc" +#include "moc_kxmlguiwindow.cpp" diff --git a/kdewebkit/kgraphicswebview.cpp b/kdewebkit/kgraphicswebview.cpp index 6f83898e..c72683e5 100644 --- a/kdewebkit/kgraphicswebview.cpp +++ b/kdewebkit/kgraphicswebview.cpp @@ -82,4 +82,4 @@ void KGraphicsWebView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) QGraphicsWebView::mouseReleaseEvent(event); } -#include "kgraphicswebview.moc" +#include "moc_kgraphicswebview.cpp" diff --git a/kdewebkit/kwebkitpart/src/kwebkitpart_ext.cpp b/kdewebkit/kwebkitpart/src/kwebkitpart_ext.cpp index 88ffd959..1e45cebc 100644 --- a/kdewebkit/kwebkitpart/src/kwebkitpart_ext.cpp +++ b/kdewebkit/kwebkitpart/src/kwebkitpart_ext.cpp @@ -1235,4 +1235,4 @@ KWebKitPart* KWebKitScriptableExtension::part() return qobject_cast(parent()); } -#include "kwebkitpart_ext.moc" +#include "moc_kwebkitpart_ext.cpp" diff --git a/kdewebkit/kwebkitpart/src/kwebkitpartfactory.cpp b/kdewebkit/kwebkitpart/src/kwebkitpartfactory.cpp index 2a431188..9ffa29ed 100644 --- a/kdewebkit/kwebkitpart/src/kwebkitpartfactory.cpp +++ b/kdewebkit/kwebkitpart/src/kwebkitpartfactory.cpp @@ -67,4 +67,4 @@ void KWebKitFactory::slotDestroyed(QObject* object) K_EXPORT_PLUGIN(KWebKitFactory) -#include "kwebkitpartfactory.moc" +#include "moc_kwebkitpartfactory.cpp" diff --git a/kdewebkit/kwebkitpart/src/networkaccessmanager.cpp b/kdewebkit/kwebkitpart/src/networkaccessmanager.cpp index 1acac1b9..b6428ca7 100644 --- a/kdewebkit/kwebkitpart/src/networkaccessmanager.cpp +++ b/kdewebkit/kwebkitpart/src/networkaccessmanager.cpp @@ -147,4 +147,4 @@ void MyNetworkAccessManager::slotFinished(bool ok) } -#include "networkaccessmanager.moc" +#include "moc_networkaccessmanager.cpp" diff --git a/kdewebkit/kwebkitpart/src/ui/passwordbar.cpp b/kdewebkit/kwebkitpart/src/ui/passwordbar.cpp index 76b3052d..3b855dcc 100644 --- a/kdewebkit/kwebkitpart/src/ui/passwordbar.cpp +++ b/kdewebkit/kwebkitpart/src/ui/passwordbar.cpp @@ -104,4 +104,4 @@ void PasswordBar::clear() m_url.clear(); } -#include "passwordbar.moc" +#include "moc_passwordbar.cpp" diff --git a/kdewebkit/kwebkitpart/src/ui/searchbar.cpp b/kdewebkit/kwebkitpart/src/ui/searchbar.cpp index ce2189d7..b6739f05 100644 --- a/kdewebkit/kwebkitpart/src/ui/searchbar.cpp +++ b/kdewebkit/kwebkitpart/src/ui/searchbar.cpp @@ -191,4 +191,4 @@ bool SearchBar::event(QEvent* e) return QWidget::event(e); } -#include "searchbar.moc" +#include "moc_searchbar.cpp" diff --git a/kdewebkit/kwebpage.cpp b/kdewebkit/kwebpage.cpp index 04f50818..583df204 100644 --- a/kdewebkit/kwebpage.cpp +++ b/kdewebkit/kwebpage.cpp @@ -602,5 +602,5 @@ bool KWebPage::handleReply(QNetworkReply* reply, QString* contentType, KIO::Meta return false; } -#include "kwebpage.moc" +#include "moc_kwebpage.cpp" diff --git a/kdewebkit/kwebpluginfactory.cpp b/kdewebkit/kwebpluginfactory.cpp index da8c7a8b..c2fa0a4f 100644 --- a/kdewebkit/kwebpluginfactory.cpp +++ b/kdewebkit/kwebpluginfactory.cpp @@ -164,4 +164,4 @@ bool KWebPluginFactory::excludedMimeType (const QString& mimeType) const return false; } -#include "kwebpluginfactory.moc" +#include "moc_kwebpluginfactory.cpp" diff --git a/kdewebkit/kwebview.cpp b/kdewebkit/kwebview.cpp index a06aac09..43c46604 100644 --- a/kdewebkit/kwebview.cpp +++ b/kdewebkit/kwebview.cpp @@ -80,4 +80,4 @@ void KWebView::mouseReleaseEvent(QMouseEvent *event) QWebView::mouseReleaseEvent(event); } -#include "kwebview.moc" +#include "moc_kwebview.cpp" diff --git a/kdewebkit/kwebwallet.cpp b/kdewebkit/kwebwallet.cpp index ee147e55..a76679ab 100644 --- a/kdewebkit/kwebwallet.cpp +++ b/kdewebkit/kwebwallet.cpp @@ -615,4 +615,4 @@ void KWebWallet::removeFormDataFromCache(const WebFormList &forms) d->openWallet(); } -#include "kwebwallet.moc" +#include "moc_kwebwallet.cpp" diff --git a/kfile/kdiroperator.cpp b/kfile/kdiroperator.cpp index 078aca42..d424b7f2 100644 --- a/kfile/kdiroperator.cpp +++ b/kfile/kdiroperator.cpp @@ -2635,4 +2635,4 @@ void KDirOperator::Private::_k_slotDirectoryCreated(const KUrl& url) parent->setUrl(url, true); } -#include "kdiroperator.moc" +#include "moc_kdiroperator.cpp" diff --git a/kfile/kdirselectdialog.cpp b/kfile/kdirselectdialog.cpp index 77cab06a..53ff948c 100644 --- a/kfile/kdirselectdialog.cpp +++ b/kfile/kdirselectdialog.cpp @@ -485,4 +485,4 @@ KUrl KDirSelectDialog::selectDirectory( const KUrl& startDir, return KUrl(); } -#include "kdirselectdialog.moc" +#include "moc_kdirselectdialog.cpp" diff --git a/kfile/kdirsortfilterproxymodel.cpp b/kfile/kdirsortfilterproxymodel.cpp index 34ddcd27..820d9e35 100644 --- a/kfile/kdirsortfilterproxymodel.cpp +++ b/kfile/kdirsortfilterproxymodel.cpp @@ -285,4 +285,4 @@ bool KDirSortFilterProxyModel::subSortLessThan(const QModelIndex& left, return KCategorizedSortFilterProxyModel::subSortLessThan(left, right); } -#include "kdirsortfilterproxymodel.moc" +#include "moc_kdirsortfilterproxymodel.cpp" diff --git a/kfile/kfilebookmarkhandler.cpp b/kfile/kfilebookmarkhandler.cpp index b70bd6aa..14a4254e 100644 --- a/kfile/kfilebookmarkhandler.cpp +++ b/kfile/kfilebookmarkhandler.cpp @@ -68,4 +68,4 @@ QString KFileBookmarkHandler::currentTitle() const return m_widget->baseUrl().prettyUrl(); } -#include "kfilebookmarkhandler_p.moc" +#include "moc_kfilebookmarkhandler_p.cpp" diff --git a/kfile/kfilefiltercombo.cpp b/kfile/kfilefiltercombo.cpp index 85777fb7..4d77054b 100644 --- a/kfile/kfilefiltercombo.cpp +++ b/kfile/kfilefiltercombo.cpp @@ -229,4 +229,4 @@ bool KFileFilterCombo::isMimeFilter() const return d->isMimeFilter; } -#include "kfilefiltercombo.moc" +#include "moc_kfilefiltercombo.cpp" diff --git a/kfile/kfilemodule.cpp b/kfile/kfilemodule.cpp index f988b4b9..744c6115 100644 --- a/kfile/kfilemodule.cpp +++ b/kfile/kfilemodule.cpp @@ -53,4 +53,4 @@ KUrl KFileModule::selectDirectory( const KUrl& startDir, return KDirSelectDialog::selectDirectory(startDir, localOnly, parent, caption); } -#include "kfilemodule.moc" +#include "moc_kfilemodule.cpp" diff --git a/kfile/kfileplaceeditdialog.cpp b/kfile/kfileplaceeditdialog.cpp index 5537551e..e6057645 100644 --- a/kfile/kfileplaceeditdialog.cpp +++ b/kfile/kfileplaceeditdialog.cpp @@ -211,4 +211,4 @@ bool KFilePlaceEditDialog::applicationLocal() const } -#include "kfileplaceeditdialog.moc" +#include "moc_kfileplaceeditdialog.cpp" diff --git a/kfile/kfileplacesitem.cpp b/kfile/kfileplacesitem.cpp index 1cb0fa58..8f5482d0 100644 --- a/kfile/kfileplacesitem.cpp +++ b/kfile/kfileplacesitem.cpp @@ -329,4 +329,4 @@ void KFilePlacesItem::onListerCompleted() emit itemChanged(id()); } -#include "kfileplacesitem_p.moc" +#include "moc_kfileplacesitem_p.cpp" diff --git a/kfile/kfileplacesmodel.cpp b/kfile/kfileplacesmodel.cpp index 8c44d65a..45c308d4 100644 --- a/kfile/kfileplacesmodel.cpp +++ b/kfile/kfileplacesmodel.cpp @@ -855,4 +855,4 @@ void KFilePlacesModel::Private::_k_storageTeardownDone(Solid::ErrorType error, Q } } -#include "kfileplacesmodel.moc" +#include "moc_kfileplacesmodel.cpp" diff --git a/kfile/kfileplacessharedbookmarks.cpp b/kfile/kfileplacessharedbookmarks.cpp index c2ebd1ee..a6ed2f6e 100644 --- a/kfile/kfileplacessharedbookmarks.cpp +++ b/kfile/kfileplacessharedbookmarks.cpp @@ -278,4 +278,4 @@ void KFilePlacesSharedBookmarks::slotBookmarksChanged() if (dirty) m_sharedBookmarkManager->emitChanged(); } -#include "kfileplacessharedbookmarks_p.moc" +#include "moc_kfileplacessharedbookmarks_p.cpp" diff --git a/kfile/kfileplacesview.cpp b/kfile/kfileplacesview.cpp index 117a9ed9..67917352 100644 --- a/kfile/kfileplacesview.cpp +++ b/kfile/kfileplacesview.cpp @@ -1194,5 +1194,5 @@ void KFilePlacesView::dataChanged(const QModelIndex &topLeft, const QModelIndex d->adaptItemSize(); } -#include "kfileplacesview.moc" -#include "kfileplacesview_p.moc" +#include "moc_kfileplacesview.cpp" +#include "moc_kfileplacesview_p.cpp" diff --git a/kfile/kfilepreviewgenerator.cpp b/kfile/kfilepreviewgenerator.cpp index 59ff96f3..6f3d4b99 100644 --- a/kfile/kfilepreviewgenerator.cpp +++ b/kfile/kfilepreviewgenerator.cpp @@ -1302,4 +1302,4 @@ QStringList KFilePreviewGenerator::enabledPlugins() const return d->m_enabledPlugins; } -#include "kfilepreviewgenerator.moc" +#include "moc_kfilepreviewgenerator.cpp" diff --git a/kfile/kfiletreeview.cpp b/kfile/kfiletreeview.cpp index 33b0bbca..5836ac41 100644 --- a/kfile/kfiletreeview.cpp +++ b/kfile/kfiletreeview.cpp @@ -203,4 +203,4 @@ QSize KFileTreeView::sizeHint() const return QSize(680, 500); } -#include "kfiletreeview.moc" +#include "moc_kfiletreeview.cpp" diff --git a/kfile/kfilewidget.cpp b/kfile/kfilewidget.cpp index 91943976..20674e5e 100644 --- a/kfile/kfilewidget.cpp +++ b/kfile/kfilewidget.cpp @@ -2775,4 +2775,4 @@ void KFileWidgetPrivate::setInlinePreviewShown(bool show) } -#include "kfilewidget.moc" +#include "moc_kfilewidget.cpp" diff --git a/kfile/knameandurlinputdialog.cpp b/kfile/knameandurlinputdialog.cpp index 5fab72b3..24c10878 100644 --- a/kfile/knameandurlinputdialog.cpp +++ b/kfile/knameandurlinputdialog.cpp @@ -138,4 +138,4 @@ void KNameAndUrlInputDialog::setSuggestedUrl(const KUrl& url) d->m_urlRequester->setUrl(url); } -#include "knameandurlinputdialog.moc" +#include "moc_knameandurlinputdialog.cpp" diff --git a/kfile/knewfilemenu.cpp b/kfile/knewfilemenu.cpp index 53b5f1ed..8f81938e 100644 --- a/kfile/knewfilemenu.cpp +++ b/kfile/knewfilemenu.cpp @@ -1147,5 +1147,5 @@ QStringList KNewFileMenu::supportedMimeTypes() const } -#include "knewfilemenu.moc" +#include "moc_knewfilemenu.cpp" diff --git a/kfile/kurlnavigator.cpp b/kfile/kurlnavigator.cpp index 7614be1e..7af53dbe 100644 --- a/kfile/kurlnavigator.cpp +++ b/kfile/kurlnavigator.cpp @@ -1261,4 +1261,4 @@ void KUrlNavigator::setHomeUrl(const QString& homeUrl) } #endif -#include "kurlnavigator.moc" +#include "moc_kurlnavigator.cpp" diff --git a/kfile/kurlnavigatorbutton.cpp b/kfile/kurlnavigatorbutton.cpp index a37f2e63..da278325 100644 --- a/kfile/kurlnavigatorbutton.cpp +++ b/kfile/kurlnavigatorbutton.cpp @@ -689,4 +689,4 @@ void KUrlNavigatorButton::initMenu(KUrlNavigatorMenu* menu, int startIndex) } // namespace KDEPrivate -#include "kurlnavigatorbutton_p.moc" +#include "moc_kurlnavigatorbutton_p.cpp" diff --git a/kfile/kurlnavigatorbuttonbase.cpp b/kfile/kurlnavigatorbuttonbase.cpp index 938ef6bf..96d40280 100644 --- a/kfile/kurlnavigatorbuttonbase.cpp +++ b/kfile/kurlnavigatorbuttonbase.cpp @@ -151,4 +151,4 @@ void KUrlNavigatorButtonBase::activate() } // namespace KDEPrivate -#include "kurlnavigatorbuttonbase_p.moc" +#include "moc_kurlnavigatorbuttonbase_p.cpp" diff --git a/kfile/kurlnavigatordropdownbutton.cpp b/kfile/kurlnavigatordropdownbutton.cpp index b296c1be..e8432d63 100644 --- a/kfile/kurlnavigatordropdownbutton.cpp +++ b/kfile/kurlnavigatordropdownbutton.cpp @@ -84,4 +84,4 @@ void KUrlNavigatorDropDownButton::keyPressEvent(QKeyEvent* event) } // namespace KDEPrivate -#include "kurlnavigatordropdownbutton_p.moc" +#include "moc_kurlnavigatordropdownbutton_p.cpp" diff --git a/kfile/kurlnavigatormenu.cpp b/kfile/kurlnavigatormenu.cpp index c9b6c772..7b4d2fe3 100644 --- a/kfile/kurlnavigatormenu.cpp +++ b/kfile/kurlnavigatormenu.cpp @@ -71,4 +71,4 @@ void KUrlNavigatorMenu::mouseReleaseEvent(QMouseEvent* event) } // namespace KDEPrivate -#include "kurlnavigatormenu_p.moc" +#include "moc_kurlnavigatormenu_p.cpp" diff --git a/kfile/kurlnavigatorplacesselector.cpp b/kfile/kurlnavigatorplacesselector.cpp index 8ed00952..19966b68 100644 --- a/kfile/kurlnavigatorplacesselector.cpp +++ b/kfile/kurlnavigatorplacesselector.cpp @@ -238,5 +238,5 @@ void KUrlNavigatorPlacesSelector::onStorageSetupDone(const QModelIndex &index, b } // namespace KDEPrivate -#include "kurlnavigatorplacesselector_p.moc" +#include "moc_kurlnavigatorplacesselector_p.cpp" diff --git a/kfile/kurlnavigatorprotocolcombo.cpp b/kfile/kurlnavigatorprotocolcombo.cpp index 1a8b7906..7bba6037 100644 --- a/kfile/kurlnavigatorprotocolcombo.cpp +++ b/kfile/kurlnavigatorprotocolcombo.cpp @@ -230,4 +230,4 @@ void KUrlNavigatorProtocolCombo::initializeCategories() } // namespace KDEPrivate -#include "kurlnavigatorprotocolcombo_p.moc" +#include "moc_kurlnavigatorprotocolcombo_p.cpp" diff --git a/kfile/kurlnavigatortogglebutton.cpp b/kfile/kurlnavigatortogglebutton.cpp index ff860a0f..4ba042b0 100644 --- a/kfile/kurlnavigatortogglebutton.cpp +++ b/kfile/kurlnavigatortogglebutton.cpp @@ -104,4 +104,4 @@ void KUrlNavigatorToggleButton::updateCursor() } // namespace KDEPrivate -#include "kurlnavigatortogglebutton_p.moc" +#include "moc_kurlnavigatortogglebutton_p.cpp" diff --git a/kfile/tests/kfiletreeviewtest.cpp b/kfile/tests/kfiletreeviewtest.cpp index f5b77aed..278efb10 100644 --- a/kfile/tests/kfiletreeviewtest.cpp +++ b/kfile/tests/kfiletreeviewtest.cpp @@ -82,4 +82,4 @@ int main(int argc, char **argv) return app.exec(); } -#include "kfiletreeviewtest.moc" +#include "moc_kfiletreeviewtest.cpp" diff --git a/kfile/tests/kurlnavigatortest.cpp b/kfile/tests/kurlnavigatortest.cpp index 5233b07e..71340b1f 100644 --- a/kfile/tests/kurlnavigatortest.cpp +++ b/kfile/tests/kurlnavigatortest.cpp @@ -189,4 +189,4 @@ void KUrlNavigatorTest::bug251553_goUpFromArchive() QCOMPARE(m_navigator->locationUrl().protocol(), QLatin1String("file")); } -#include "kurlnavigatortest.moc" +#include "moc_kurlnavigatortest.cpp" diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp index 5028733c..a80c8410 100644 --- a/kinit/klauncher.cpp +++ b/kinit/klauncher.cpp @@ -1370,4 +1370,4 @@ void KLauncher::terminate_kdeinit() #endif } -#include "klauncher.moc" +#include "moc_klauncher.cpp" diff --git a/kinit/klauncher_adaptor.cpp b/kinit/klauncher_adaptor.cpp index 985612df..cae784c7 100644 --- a/kinit/klauncher_adaptor.cpp +++ b/kinit/klauncher_adaptor.cpp @@ -163,4 +163,4 @@ void KLauncherAdaptor::terminate_kdeinit() p->terminate_kdeinit(); } -#include "klauncher_adaptor.moc" +#include "moc_klauncher_adaptor.cpp" diff --git a/kio/bookmarks/kbookmarkdombuilder.cc b/kio/bookmarks/kbookmarkdombuilder.cc index 8e0be3c7..19e374d6 100644 --- a/kio/bookmarks/kbookmarkdombuilder.cc +++ b/kio/bookmarks/kbookmarkdombuilder.cc @@ -92,4 +92,4 @@ void KBookmarkDomBuilder::endFolder() { kWarning() << "m_stack is empty. This should not happen when importing a valid bookmarks file!"; } -#include "kbookmarkdombuilder.moc" +#include "moc_kbookmarkdombuilder.cpp" diff --git a/kio/bookmarks/kbookmarkimporter_crash.cc b/kio/bookmarks/kbookmarkimporter_crash.cc index ec36afc6..11c46a46 100644 --- a/kio/bookmarks/kbookmarkimporter_crash.cc +++ b/kio/bookmarks/kbookmarkimporter_crash.cc @@ -187,4 +187,4 @@ QString KCrashBookmarkImporterImpl::findDefaultLocation( bool ) const return KStandardDirs::locateLocal( "tmp", "" ); } -#include "kbookmarkimporter_crash.moc" +#include "moc_kbookmarkimporter_crash.cpp" diff --git a/kio/bookmarks/kbookmarkimporter_opera.cc b/kio/bookmarks/kbookmarkimporter_opera.cc index 5ad92cf6..14807c59 100644 --- a/kio/bookmarks/kbookmarkimporter_opera.cc +++ b/kio/bookmarks/kbookmarkimporter_opera.cc @@ -180,4 +180,4 @@ void KOperaBookmarkExporterImpl::write(const KBookmarkGroup &parent) { fstream << content; } -#include "kbookmarkimporter_opera_p.moc" +#include "moc_kbookmarkimporter_opera_p.cpp" diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc index 940cffde..99e65532 100644 --- a/kio/bookmarks/kbookmarkmanager.cc +++ b/kio/bookmarks/kbookmarkmanager.cc @@ -719,4 +719,4 @@ void KBookmarkOwner::openFolderinTabs(const KBookmarkGroup &) } -#include "kbookmarkmanager.moc" +#include "moc_kbookmarkmanager.cpp" diff --git a/kio/bookmarks/kbookmarkmanageradaptor.cc b/kio/bookmarks/kbookmarkmanageradaptor.cc index 6f4aa25a..e75fee7b 100644 --- a/kio/bookmarks/kbookmarkmanageradaptor.cc +++ b/kio/bookmarks/kbookmarkmanageradaptor.cc @@ -32,4 +32,4 @@ void KBookmarkManagerAdaptor::notifyCompleteChange() static_cast(parent())->notifyCompleteChange(QString()); } -#include "kbookmarkmanageradaptor_p.moc" +#include "moc_kbookmarkmanageradaptor_p.cpp" diff --git a/kio/bookmarks/kbookmarkmenu.cc b/kio/bookmarks/kbookmarkmenu.cc index deb973b5..e49273c0 100644 --- a/kio/bookmarks/kbookmarkmenu.cc +++ b/kio/bookmarks/kbookmarkmenu.cc @@ -764,5 +764,5 @@ KBookmarkActionMenu::~KBookmarkActionMenu() { } -#include "kbookmarkmenu.moc" -#include "kbookmarkmenu_p.moc" +#include "moc_kbookmarkmenu.cpp" +#include "moc_kbookmarkmenu_p.cpp" diff --git a/kio/bookmarks/konqbookmarkmenu.cc b/kio/bookmarks/konqbookmarkmenu.cc index 4fc6be07..1c1f5732 100644 --- a/kio/bookmarks/konqbookmarkmenu.cc +++ b/kio/bookmarks/konqbookmarkmenu.cc @@ -247,4 +247,4 @@ KMenu * KonqBookmarkMenu::contextMenu(QAction * action) return new KonqBookmarkContextMenu(act->bookmark(), manager(), owner()); } -#include "konqbookmarkmenu.moc" +#include "moc_konqbookmarkmenu.cpp" diff --git a/kio/httpfilter/httpfilter.cc b/kio/httpfilter/httpfilter.cc index bbc85744..f16e872e 100644 --- a/kio/httpfilter/httpfilter.cc +++ b/kio/httpfilter/httpfilter.cc @@ -188,4 +188,4 @@ HTTPFilterDeflate::HTTPFilterDeflate() { } -#include "httpfilter.moc" +#include "moc_httpfilter.cpp" diff --git a/kio/kfile/kabstractfilemodule.cpp b/kio/kfile/kabstractfilemodule.cpp index 82dacd6b..3978118b 100644 --- a/kio/kfile/kabstractfilemodule.cpp +++ b/kio/kfile/kabstractfilemodule.cpp @@ -25,4 +25,4 @@ KAbstractFileModule::KAbstractFileModule(QObject* parent) } -#include "kabstractfilemodule.moc" +#include "moc_kabstractfilemodule.cpp" diff --git a/kio/kfile/kacleditwidget.cpp b/kio/kfile/kacleditwidget.cpp index d89429fc..3e47eeed 100644 --- a/kio/kfile/kacleditwidget.cpp +++ b/kio/kfile/kacleditwidget.cpp @@ -1118,7 +1118,7 @@ bool KACLListView::defaultMaskCanBeDeleted() const return !findDefaultItemByType( NamedUser ) && !findDefaultItemByType( NamedGroup ); } -#include "kacleditwidget.moc" -#include "kacleditwidget_p.moc" +#include "moc_kacleditwidget.cpp" +#include "moc_kacleditwidget_p.cpp" #endif // vim:set ts=8 sw=4: diff --git a/kio/kfile/kdevicelistmodel.cpp b/kio/kfile/kdevicelistmodel.cpp index bd35303f..6289e2e3 100644 --- a/kio/kfile/kdevicelistmodel.cpp +++ b/kio/kfile/kdevicelistmodel.cpp @@ -284,4 +284,4 @@ QModelIndex KDeviceListModel::Private::indexForItem(KDeviceListItem *item) const } } -#include "kdevicelistmodel.moc" +#include "moc_kdevicelistmodel.cpp" diff --git a/kio/kfile/kdiskfreespace.cpp b/kio/kfile/kdiskfreespace.cpp index a90547b3..5f9991a7 100644 --- a/kio/kfile/kdiskfreespace.cpp +++ b/kio/kfile/kdiskfreespace.cpp @@ -84,5 +84,5 @@ KDiskFreeSpace * KDiskFreeSpace::findUsageInfo( const QString & path ) return job; } -#include "kdiskfreespace.moc" +#include "moc_kdiskfreespace.cpp" diff --git a/kio/kfile/kencodingfiledialog.cpp b/kio/kfile/kencodingfiledialog.cpp index 46860658..620befa3 100644 --- a/kio/kfile/kencodingfiledialog.cpp +++ b/kio/kfile/kencodingfiledialog.cpp @@ -210,4 +210,4 @@ KEncodingFileDialog::Result KEncodingFileDialog::getSaveUrlAndEncoding(const QS return res; } -#include "kencodingfiledialog.moc" +#include "moc_kencodingfiledialog.cpp" diff --git a/kio/kfile/kfile.cpp b/kio/kfile/kfile.cpp index 1bdf0f0d..623f59d0 100644 --- a/kio/kfile/kfile.cpp +++ b/kio/kfile/kfile.cpp @@ -90,4 +90,4 @@ bool KFile::isDetailTreeView( const FileView& view ) return (view & DetailTree) == DetailTree; } -#include "kfile.moc" +#include "moc_kfile.cpp" diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp index d76a877e..531b173c 100644 --- a/kio/kfile/kfiledialog.cpp +++ b/kio/kfile/kfiledialog.cpp @@ -1169,4 +1169,4 @@ public: static KFileDialogQtOverride qtOverride; -#include "kfiledialog.moc" +#include "moc_kfiledialog.cpp" diff --git a/kio/kfile/kfilemetadataconfigurationwidget.cpp b/kio/kfile/kfilemetadataconfigurationwidget.cpp index 72569f28..6b4d9c1a 100644 --- a/kio/kfile/kfilemetadataconfigurationwidget.cpp +++ b/kio/kfile/kfilemetadataconfigurationwidget.cpp @@ -175,4 +175,4 @@ QSize KFileMetaDataConfigurationWidget::sizeHint() const } -#include "kfilemetadataconfigurationwidget.moc" +#include "moc_kfilemetadataconfigurationwidget.cpp" diff --git a/kio/kfile/kfilemetadatawidget.cpp b/kio/kfile/kfilemetadatawidget.cpp index 9526e8a6..01156157 100644 --- a/kio/kfile/kfilemetadatawidget.cpp +++ b/kio/kfile/kfilemetadatawidget.cpp @@ -262,4 +262,4 @@ bool KFileMetaDataWidget::event(QEvent* event) return QWidget::event(event); } -#include "kfilemetadatawidget.moc" +#include "moc_kfilemetadatawidget.cpp" diff --git a/kio/kfile/kfilemetainfowidget.cpp b/kio/kfile/kfilemetainfowidget.cpp index bf6bc563..9e62dd97 100644 --- a/kio/kfile/kfilemetainfowidget.cpp +++ b/kio/kfile/kfilemetainfowidget.cpp @@ -433,4 +433,4 @@ void KFileMetaInfoWidget::slotDateTimeChanged(const QDateTime& value) d->m_dirty = true; } -#include "kfilemetainfowidget.moc" +#include "moc_kfilemetainfowidget.cpp" diff --git a/kio/kfile/kfilemetapreview.cpp b/kio/kfile/kfilemetapreview.cpp index b5791dfd..817eccc1 100644 --- a/kio/kfile/kfilemetapreview.cpp +++ b/kio/kfile/kfilemetapreview.cpp @@ -197,4 +197,4 @@ KPreviewWidgetBase * KFileMetaPreview::createAudioPreview( QWidget *parent ) return w; } -#include "kfilemetapreview.moc" +#include "moc_kfilemetapreview.cpp" diff --git a/kio/kfile/kfilesharedialog.cpp b/kio/kfile/kfilesharedialog.cpp index 4c095dff..2b6a28dd 100644 --- a/kio/kfile/kfilesharedialog.cpp +++ b/kio/kfile/kfilesharedialog.cpp @@ -277,7 +277,7 @@ QWidget* KFileSharePropsPlugin::page() const return d->m_vBox; } -#include "kfilesharedialog.moc" +#include "moc_kfilesharedialog.cpp" //TODO: do we need to monitor /etc/security/fileshare.conf ? // if the user is added to the 'fileshare' group, we wouldn't be notified diff --git a/kio/kfile/kfsprocess.cpp b/kio/kfile/kfsprocess.cpp index dbf1b812..5453a648 100644 --- a/kio/kfile/kfsprocess.cpp +++ b/kio/kfile/kfsprocess.cpp @@ -342,4 +342,4 @@ void KfsProcess::processHasExited() emit processExited(); } -#include "kfsprocess.moc" +#include "moc_kfsprocess.cpp" diff --git a/kio/kfile/kicondialog.cpp b/kio/kfile/kicondialog.cpp index 5c30c0c0..40a8104c 100644 --- a/kio/kfile/kicondialog.cpp +++ b/kio/kfile/kicondialog.cpp @@ -901,4 +901,4 @@ void KIconButton::KIconButtonPrivate::_k_newIconName(const QString& name) emit q->iconChanged(name); } -#include "kicondialog.moc" +#include "moc_kicondialog.cpp" diff --git a/kio/kfile/kimagefilepreview.cpp b/kio/kfile/kimagefilepreview.cpp index 74ef8b77..bb9fa8c0 100644 --- a/kio/kfile/kimagefilepreview.cpp +++ b/kio/kfile/kimagefilepreview.cpp @@ -283,4 +283,4 @@ void KImageFilePreview::clearPreview() } } -#include "kimagefilepreview.moc" +#include "moc_kimagefilepreview.cpp" diff --git a/kio/kfile/kmetaprops.cpp b/kio/kfile/kmetaprops.cpp index 5f2d859d..a9429368 100644 --- a/kio/kfile/kmetaprops.cpp +++ b/kio/kfile/kmetaprops.cpp @@ -145,4 +145,4 @@ void KFileMetaPropsPlugin::applyChanges() { } -#include "kmetaprops.moc" +#include "moc_kmetaprops.cpp" diff --git a/kio/kfile/kopenwithdialog.cpp b/kio/kfile/kopenwithdialog.cpp index 9c1ace86..39f812c5 100644 --- a/kio/kfile/kopenwithdialog.cpp +++ b/kio/kfile/kopenwithdialog.cpp @@ -1000,5 +1000,5 @@ void KOpenWithDialogPrivate::saveComboboxHistory() } } -#include "kopenwithdialog.moc" -#include "kopenwithdialog_p.moc" +#include "moc_kopenwithdialog.cpp" +#include "moc_kopenwithdialog_p.cpp" diff --git a/kio/kfile/kpreviewprops.cpp b/kio/kfile/kpreviewprops.cpp index d9775022..837bbcd1 100644 --- a/kio/kfile/kpreviewprops.cpp +++ b/kio/kfile/kpreviewprops.cpp @@ -89,4 +89,4 @@ void KPreviewPropsPlugin::currentPageChanged( KPageWidgetItem *current, KPageWid preview->showPreview(properties->item().url()); } -#include "kpreviewprops.moc" +#include "moc_kpreviewprops.cpp" diff --git a/kio/kfile/kpreviewwidgetbase.cpp b/kio/kfile/kpreviewwidgetbase.cpp index 1a8234d4..fa80c3c4 100644 --- a/kio/kfile/kpreviewwidgetbase.cpp +++ b/kio/kfile/kpreviewwidgetbase.cpp @@ -34,4 +34,4 @@ QStringList KPreviewWidgetBase::supportedMimeTypes() const return d->supportedMimeTypes; } -#include "kpreviewwidgetbase.moc" +#include "moc_kpreviewwidgetbase.cpp" diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index 1efb59ed..f8632741 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -3399,6 +3399,6 @@ bool KDesktopPropsPlugin::supports( const KFileItemList& _items ) KAuthorized::authorize("shell_access"); } -#include "kpropertiesdialog.moc" -#include "kpropertiesdialog_p.moc" +#include "moc_kpropertiesdialog.cpp" +#include "moc_kpropertiesdialog_p.cpp" diff --git a/kio/kfile/kurlcombobox.cpp b/kio/kfile/kurlcombobox.cpp index 47db6989..5605dbf0 100644 --- a/kio/kfile/kurlcombobox.cpp +++ b/kio/kfile/kurlcombobox.cpp @@ -444,4 +444,4 @@ void KUrlComboBox::KUrlComboBoxPrivate::updateItem( const KUrlComboBoxPrivate::K } -#include "kurlcombobox.moc" +#include "moc_kurlcombobox.cpp" diff --git a/kio/kfile/kurlrequester.cpp b/kio/kfile/kurlrequester.cpp index 7161f968..c08b3ba5 100644 --- a/kio/kfile/kurlrequester.cpp +++ b/kio/kfile/kurlrequester.cpp @@ -556,4 +556,4 @@ KUrlComboRequester::KUrlComboRequester( QWidget *parent) { } -#include "kurlrequester.moc" +#include "moc_kurlrequester.cpp" diff --git a/kio/kfile/kurlrequesterdialog.cpp b/kio/kfile/kurlrequesterdialog.cpp index 8ee29e11..ee3048e0 100644 --- a/kio/kfile/kurlrequesterdialog.cpp +++ b/kio/kfile/kurlrequesterdialog.cpp @@ -146,6 +146,6 @@ KUrlRequester * KUrlRequesterDialog::urlRequester() return d->urlRequester; } -#include "kurlrequesterdialog.moc" +#include "moc_kurlrequesterdialog.cpp" // vim:ts=4:sw=4:tw=78 diff --git a/kio/kio/accessmanager.cpp b/kio/kio/accessmanager.cpp index 327a58d3..456a7272 100644 --- a/kio/kio/accessmanager.cpp +++ b/kio/kio/accessmanager.cpp @@ -580,5 +580,5 @@ void CookieJar::reparseConfiguration() d->isEnabled = cfg.readEntry("Cookies", true); } -#include "accessmanager.moc" +#include "moc_accessmanager.cpp" diff --git a/kio/kio/accessmanagerreply_p.cpp b/kio/kio/accessmanagerreply_p.cpp index ba13af7a..d57d7ee8 100644 --- a/kio/kio/accessmanagerreply_p.cpp +++ b/kio/kio/accessmanagerreply_p.cpp @@ -487,4 +487,4 @@ void AccessManagerReply::emitFinished (bool state, Qt::ConnectionType type) } -#include "accessmanagerreply_p.moc" +#include "moc_accessmanagerreply_p.cpp" diff --git a/kio/kio/chmodjob.cpp b/kio/kio/chmodjob.cpp index 85e0c2ca..0ba341e1 100644 --- a/kio/kio/chmodjob.cpp +++ b/kio/kio/chmodjob.cpp @@ -291,4 +291,4 @@ ChmodJob *KIO::chmod( const KFileItemList& lstItems, int permissions, int mask, newGroupID, recursive, flags); } -#include "chmodjob.moc" +#include "moc_chmodjob.cpp" diff --git a/kio/kio/connection.cpp b/kio/kio/connection.cpp index 794c3ea6..bc86da3d 100644 --- a/kio/kio/connection.cpp +++ b/kio/kio/connection.cpp @@ -614,5 +614,5 @@ void ConnectionServer::setNextPendingConnection(Connection *conn) conn->d->dequeue(); } -#include "connection_p.moc" -#include "connection.moc" +#include "moc_connection_p.cpp" +#include "moc_connection.cpp" diff --git a/kio/kio/copyjob.cpp b/kio/kio/copyjob.cpp index e6c38173..0bfe6987 100644 --- a/kio/kio/copyjob.cpp +++ b/kio/kio/copyjob.cpp @@ -2242,4 +2242,4 @@ CopyJob *KIO::trash(const KUrl::List& srcList, JobFlags flags) return CopyJobPrivate::newJob(srcList, KUrl( "trash:/" ), CopyJob::Move, false, flags); } -#include "copyjob.moc" +#include "moc_copyjob.cpp" diff --git a/kio/kio/dataslave.cpp b/kio/kio/dataslave.cpp index 7313cc93..9be14330 100644 --- a/kio/kio/dataslave.cpp +++ b/kio/kio/dataslave.cpp @@ -179,4 +179,4 @@ DISPATCH_IMPL1(data, const QByteArray &, ba) #undef DISPATCH_IMPL #undef DISPATCH_IMPL1 -#include "dataslave.moc" +#include "moc_dataslave.cpp" diff --git a/kio/kio/davjob.cpp b/kio/kio/davjob.cpp index 6dc486ba..2bfd74d8 100644 --- a/kio/kio/davjob.cpp +++ b/kio/kio/davjob.cpp @@ -174,4 +174,4 @@ DavJob* KIO::davReport( const KUrl& url, const QString& report, const QString &d return job; } -#include "davjob.moc" +#include "moc_davjob.cpp" diff --git a/kio/kio/delegateanimationhandler.cpp b/kio/kio/delegateanimationhandler.cpp index 9055a984..2b4e7c5e 100644 --- a/kio/kio/delegateanimationhandler.cpp +++ b/kio/kio/delegateanimationhandler.cpp @@ -32,7 +32,7 @@ #include #include -#include "delegateanimationhandler_p.moc" +#include "moc_delegateanimationhandler_p.cpp" namespace KIO { diff --git a/kio/kio/deletejob.cpp b/kio/kio/deletejob.cpp index e7897312..68ffe5be 100644 --- a/kio/kio/deletejob.cpp +++ b/kio/kio/deletejob.cpp @@ -497,4 +497,4 @@ DeleteJob *KIO::del( const KUrl::List& src, JobFlags flags ) return job; } -#include "deletejob.moc" +#include "moc_deletejob.cpp" diff --git a/kio/kio/directorysizejob.cpp b/kio/kio/directorysizejob.cpp index 6940b1bd..4f3aa235 100644 --- a/kio/kio/directorysizejob.cpp +++ b/kio/kio/directorysizejob.cpp @@ -210,4 +210,4 @@ DirectorySizeJob * KIO::directorySize( const KFileItemList & lstItems ) return DirectorySizeJobPrivate::newJob(lstItems); } -#include "directorysizejob.moc" +#include "moc_directorysizejob.cpp" diff --git a/kio/kio/filejob.cpp b/kio/kio/filejob.cpp index e8fb8a11..77f3d8c2 100644 --- a/kio/kio/filejob.cpp +++ b/kio/kio/filejob.cpp @@ -215,5 +215,5 @@ FileJob *KIO::open(const KUrl &url, QIODevice::OpenMode mode) return FileJobPrivate::newJob(url, packedArgs); } -#include "filejob.moc" +#include "moc_filejob.cpp" diff --git a/kio/kio/fileundomanager.cpp b/kio/kio/fileundomanager.cpp index bf6f5f33..c8100cb8 100644 --- a/kio/kio/fileundomanager.cpp +++ b/kio/kio/fileundomanager.cpp @@ -816,5 +816,5 @@ void FileUndoManager::UiInterface::virtual_hook(int, void*) { } -#include "fileundomanager_p.moc" -#include "fileundomanager.moc" +#include "moc_fileundomanager_p.cpp" +#include "moc_fileundomanager.cpp" diff --git a/kio/kio/forwardingslavebase.cpp b/kio/kio/forwardingslavebase.cpp index 1076836e..9421b0a5 100644 --- a/kio/kio/forwardingslavebase.cpp +++ b/kio/kio/forwardingslavebase.cpp @@ -561,5 +561,5 @@ void ForwardingSlaveBasePrivate::_k_slotCanResume (KIO::Job* /*job*/, KIO::files } -#include "forwardingslavebase.moc" +#include "moc_forwardingslavebase.cpp" diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp index a6c42960..456bf18b 100644 --- a/kio/kio/job.cpp +++ b/kio/kio/job.cpp @@ -3190,5 +3190,5 @@ int CacheInfo::expireDate(); int CacheInfo::expireTimeout(); #endif -#include "jobclasses.moc" -#include "job_p.moc" +#include "moc_jobclasses.cpp" +#include "moc_job_p.cpp" diff --git a/kio/kio/jobuidelegate.cpp b/kio/kio/jobuidelegate.cpp index 5aff3302..4bbadb39 100644 --- a/kio/kio/jobuidelegate.cpp +++ b/kio/kio/jobuidelegate.cpp @@ -286,4 +286,4 @@ int KIO::JobUiDelegate::requestMessageBox(KIO::JobUiDelegate::MessageBoxType typ return result; } -#include "jobuidelegate.moc" +#include "moc_jobuidelegate.cpp" diff --git a/kio/kio/joburlcache.cpp b/kio/kio/joburlcache.cpp index bdc8f043..02bccba9 100644 --- a/kio/kio/joburlcache.cpp +++ b/kio/kio/joburlcache.cpp @@ -64,4 +64,4 @@ void JobUrlCache::requestJobUrlsChanged() emit jobUrlsChanged(m_destUrls); } -#include "joburlcache_p.moc" +#include "moc_joburlcache_p.cpp" diff --git a/kio/kio/kabstractfileitemactionplugin.cpp b/kio/kio/kabstractfileitemactionplugin.cpp index 07f15f66..f9f85e5a 100644 --- a/kio/kio/kabstractfileitemactionplugin.cpp +++ b/kio/kio/kabstractfileitemactionplugin.cpp @@ -29,4 +29,4 @@ KAbstractFileItemActionPlugin::~KAbstractFileItemActionPlugin() { } -#include "kabstractfileitemactionplugin.moc" +#include "moc_kabstractfileitemactionplugin.cpp" diff --git a/kio/kio/kautomount.cpp b/kio/kio/kautomount.cpp index 4ddf6d7d..17e0bc07 100644 --- a/kio/kio/kautomount.cpp +++ b/kio/kio/kautomount.cpp @@ -157,4 +157,4 @@ KAutoUnmount::~KAutoUnmount() delete d; } -#include "kautomount.moc" +#include "moc_kautomount.cpp" diff --git a/kio/kio/kbuildsycocaprogressdialog.cpp b/kio/kio/kbuildsycocaprogressdialog.cpp index fba30ecb..949fe0fc 100644 --- a/kio/kio/kbuildsycocaprogressdialog.cpp +++ b/kio/kio/kbuildsycocaprogressdialog.cpp @@ -102,4 +102,4 @@ void KBuildSycocaProgressDialogPrivate::_k_slotFinished() } -#include "kbuildsycocaprogressdialog.moc" +#include "moc_kbuildsycocaprogressdialog.cpp" diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp index 5dc99437..00e58c19 100644 --- a/kio/kio/kdatatool.cpp +++ b/kio/kio/kdatatool.cpp @@ -340,4 +340,4 @@ const KComponentData &KDataTool::componentData() const return d->componentData; } -#include "kdatatool.moc" +#include "moc_kdatatool.cpp" diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp index aad6893f..7e092b75 100644 --- a/kio/kio/kdirlister.cpp +++ b/kio/kio/kdirlister.cpp @@ -2785,5 +2785,5 @@ KFileItem KDirLister::cachedItemForUrl(const KUrl& url) return kDirListerCache->itemForUrl(url); } -#include "kdirlister.moc" -#include "kdirlister_p.moc" +#include "moc_kdirlister.cpp" +#include "moc_kdirlister_p.cpp" diff --git a/kio/kio/kdirmodel.cpp b/kio/kio/kdirmodel.cpp index 79b476b0..8f42498c 100644 --- a/kio/kio/kdirmodel.cpp +++ b/kio/kio/kdirmodel.cpp @@ -1145,4 +1145,4 @@ bool KDirModel::removeColumns(int, int, const QModelIndex&) return false; } -#include "kdirmodel.moc" +#include "moc_kdirmodel.cpp" diff --git a/kio/kio/kdirnotify.cpp b/kio/kio/kdirnotify.cpp index 448e6a38..477470b8 100644 --- a/kio/kio/kdirnotify.cpp +++ b/kio/kio/kdirnotify.cpp @@ -69,4 +69,4 @@ void OrgKdeKDirNotifyInterface::emitLeftDirectory(const QString &url) emitSignal(QLatin1String("leftDirectory"), QVariantList() << url); } -#include "kdirnotify.moc" +#include "moc_kdirnotify.cpp" diff --git a/kio/kio/kdynamicjobtracker.cpp b/kio/kio/kdynamicjobtracker.cpp index 64844fa0..aa7a0fed 100644 --- a/kio/kio/kdynamicjobtracker.cpp +++ b/kio/kio/kdynamicjobtracker.cpp @@ -108,4 +108,4 @@ void KDynamicJobTracker::unregisterJob(KJob *job) widgetTracker->unregisterJob(job); } -#include "kdynamicjobtracker_p.moc" +#include "moc_kdynamicjobtracker_p.cpp" diff --git a/kio/kio/kfileitemactionplugin.cpp b/kio/kio/kfileitemactionplugin.cpp index e9b074da..90e4cfa7 100644 --- a/kio/kio/kfileitemactionplugin.cpp +++ b/kio/kio/kfileitemactionplugin.cpp @@ -29,4 +29,4 @@ KFileItemActionPlugin::~KFileItemActionPlugin() { } -#include "kfileitemactionplugin.moc" +#include "moc_kfileitemactionplugin.cpp" diff --git a/kio/kio/kfileitemdelegate.cpp b/kio/kio/kfileitemdelegate.cpp index e1294f28..e3d79957 100644 --- a/kio/kio/kfileitemdelegate.cpp +++ b/kio/kio/kfileitemdelegate.cpp @@ -1682,7 +1682,7 @@ bool KFileItemDelegate::eventFilter(QObject *object, QEvent *event) -#include "kfileitemdelegate.moc" +#include "moc_kfileitemdelegate.cpp" // kate: space-indent on; indent-width 4; replace-tabs on; diff --git a/kio/kio/kfileshare.cpp b/kio/kio/kfileshare.cpp index 4308dc9a..a9a2247d 100644 --- a/kio/kio/kfileshare.cpp +++ b/kio/kio/kfileshare.cpp @@ -287,5 +287,5 @@ bool KFileShare::setShared( const QString& path, bool shared ) } //#include "kfileshare.moc" -#include "kfileshare_p.moc" +#include "moc_kfileshare_p.cpp" diff --git a/kio/kio/kfilewriteplugin.cpp b/kio/kio/kfilewriteplugin.cpp index e3040506..05409a90 100644 --- a/kio/kio/kfilewriteplugin.cpp +++ b/kio/kio/kfilewriteplugin.cpp @@ -57,5 +57,5 @@ KFileWriterProvider::loadPlugin(const QString& key) { return offers.first()->createInstance(); } -#include "kfilewriteplugin.moc" +#include "moc_kfilewriteplugin.cpp" diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp index 3c6bdc24..47eb111a 100644 --- a/kio/kio/kmimetypechooser.cpp +++ b/kio/kio/kmimetypechooser.cpp @@ -351,4 +351,4 @@ KMimeTypeChooserDialog::~KMimeTypeChooserDialog() //END KMimeTypeChooserDialog // kate: space-indent on; indent-width 2; replace-tabs on; -#include "kmimetypechooser.moc" +#include "moc_kmimetypechooser.cpp" diff --git a/kio/kio/kmimetyperesolver.cpp b/kio/kio/kmimetyperesolver.cpp index 2145b590..d6f7f09f 100644 --- a/kio/kio/kmimetyperesolver.cpp +++ b/kio/kio/kmimetyperesolver.cpp @@ -192,4 +192,4 @@ void KMimeTypeResolverPrivate::_k_slotViewportAdjusted() m_timer.start(0); } -#include "kmimetyperesolver.moc" +#include "moc_kmimetyperesolver.cpp" diff --git a/kio/kio/knfsshare.cpp b/kio/kio/knfsshare.cpp index 3c3bb622..127eaf0e 100644 --- a/kio/kio/knfsshare.cpp +++ b/kio/kio/knfsshare.cpp @@ -220,5 +220,5 @@ KNFSShare* KNFSShare::instance() return _instance; } -#include "knfsshare.moc" +#include "moc_knfsshare.cpp" diff --git a/kio/kio/kpasswdserverloop.cpp b/kio/kio/kpasswdserverloop.cpp index efbcbb7f..b95ba37a 100644 --- a/kio/kio/kpasswdserverloop.cpp +++ b/kio/kio/kpasswdserverloop.cpp @@ -74,4 +74,4 @@ void KPasswdServerLoop::kdedServiceUnregistered() } -#include "kpasswdserverloop_p.moc" +#include "moc_kpasswdserverloop_p.cpp" diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp index d4c5dad9..06d2403d 100644 --- a/kio/kio/krun.cpp +++ b/kio/kio/krun.cpp @@ -1793,5 +1793,5 @@ KProcessRunner::slotProcessExited(int exitCode, QProcess::ExitStatus exitStatus) deleteLater(); } -#include "krun.moc" -#include "krun_p.moc" +#include "moc_krun.cpp" +#include "moc_krun_p.cpp" diff --git a/kio/kio/kscan.cpp b/kio/kio/kscan.cpp index 4f67540b..9155f5bd 100644 --- a/kio/kio/kscan.cpp +++ b/kio/kio/kscan.cpp @@ -119,4 +119,4 @@ int KOCRDialog::nextId() -#include "kscan.moc" +#include "moc_kscan.cpp" diff --git a/kio/kio/kshellcompletion.cpp b/kio/kio/kshellcompletion.cpp index 8628eaa8..e5fdedd3 100644 --- a/kio/kio/kshellcompletion.cpp +++ b/kio/kio/kshellcompletion.cpp @@ -317,5 +317,5 @@ QString KShellCompletionPrivate::unquote(const QString &text) const return result; } -#include "kshellcompletion.moc" +#include "moc_kshellcompletion.cpp" diff --git a/kio/kio/kstatusbarofflineindicator.cpp b/kio/kio/kstatusbarofflineindicator.cpp index 5d3ed0d5..240a7517 100644 --- a/kio/kio/kstatusbarofflineindicator.cpp +++ b/kio/kio/kstatusbarofflineindicator.cpp @@ -75,4 +75,4 @@ void KStatusBarOfflineIndicatorPrivate::_k_networkStatusChanged( Solid::Networki } } -#include "kstatusbarofflineindicator.moc" +#include "moc_kstatusbarofflineindicator.cpp" diff --git a/kio/kio/kurifilter.cpp b/kio/kio/kurifilter.cpp index 0144a2c0..b06707ae 100644 --- a/kio/kio/kurifilter.cpp +++ b/kio/kio/kurifilter.cpp @@ -711,4 +711,4 @@ void KUriFilter::loadPlugins() } } -#include "kurifilter.moc" +#include "moc_kurifilter.cpp" diff --git a/kio/kio/kurlcompletion.cpp b/kio/kio/kurlcompletion.cpp index 7973475d..5f816c2c 100644 --- a/kio/kio/kurlcompletion.cpp +++ b/kio/kio/kurlcompletion.cpp @@ -1493,4 +1493,4 @@ static QString unescape(const QString& text) return result; } -#include "kurlcompletion.moc" +#include "moc_kurlcompletion.cpp" diff --git a/kio/kio/metainfojob.cpp b/kio/kio/metainfojob.cpp index 5a276a5a..2761d440 100644 --- a/kio/kio/metainfojob.cpp +++ b/kio/kio/metainfojob.cpp @@ -173,4 +173,4 @@ KIO_EXPORT MetaInfoJob *KIO::fileMetaInfo( const KUrl::List &items) return job; } -#include "metainfojob.moc" +#include "moc_metainfojob.cpp" diff --git a/kio/kio/netaccess.cpp b/kio/kio/netaccess.cpp index ca9d8d42..e051c139 100644 --- a/kio/kio/netaccess.cpp +++ b/kio/kio/netaccess.cpp @@ -545,4 +545,4 @@ void NetAccess::slotRedirection( KIO::Job*, const KUrl& url ) d->m_url = url; } -#include "netaccess.moc" +#include "moc_netaccess.cpp" diff --git a/kio/kio/passworddialog.cpp b/kio/kio/passworddialog.cpp index faf0c77e..cca3c231 100644 --- a/kio/kio/passworddialog.cpp +++ b/kio/kio/passworddialog.cpp @@ -77,4 +77,4 @@ int PasswordDialog::getNameAndPassword( QString& user, QString& pass, bool* keep } -#include "passworddialog.moc" +#include "moc_passworddialog.cpp" diff --git a/kio/kio/pastedialog.cpp b/kio/kio/pastedialog.cpp index cf4ae9ea..93c2568a 100644 --- a/kio/kio/pastedialog.cpp +++ b/kio/kio/pastedialog.cpp @@ -87,4 +87,4 @@ int KIO::PasteDialog::comboItem() const return m_comboBox->currentIndex(); } -#include "pastedialog.moc" +#include "moc_pastedialog.cpp" diff --git a/kio/kio/previewjob.cpp b/kio/kio/previewjob.cpp index 01b674d9..16613222 100644 --- a/kio/kio/previewjob.cpp +++ b/kio/kio/previewjob.cpp @@ -787,4 +787,4 @@ KIO::filesize_t PreviewJob::maximumFileSize() } #endif -#include "previewjob.moc" +#include "moc_previewjob.cpp" diff --git a/kio/kio/renamedialog.cpp b/kio/kio/renamedialog.cpp index 11e55a99..644bc2af 100644 --- a/kio/kio/renamedialog.cpp +++ b/kio/kio/renamedialog.cpp @@ -680,4 +680,4 @@ KSqueezedTextLabel* RenameDialog::createSqueezedLabel(QWidget* parent, const QSt return label; } -#include "renamedialog.moc" +#include "moc_renamedialog.cpp" diff --git a/kio/kio/renamedialogplugin.cpp b/kio/kio/renamedialogplugin.cpp index 09f470be..a1b86404 100644 --- a/kio/kio/renamedialogplugin.cpp +++ b/kio/kio/renamedialogplugin.cpp @@ -90,4 +90,4 @@ RenameDialogPlugin::RenameDialogPlugin( QDialog* dlg) : QWidget( dlg ) {} -#include "renamedialogplugin.moc" +#include "moc_renamedialogplugin.cpp" diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp index 8d144bb2..7d736f6f 100644 --- a/kio/kio/scheduler.cpp +++ b/kio/kio/scheduler.cpp @@ -1382,5 +1382,5 @@ void SchedulerPrivate::updateInternalMetaData(SimpleJob* job) } -#include "scheduler.moc" -#include "scheduler_p.moc" +#include "moc_scheduler.cpp" +#include "moc_scheduler_p.cpp" diff --git a/kio/kio/sessiondata.cpp b/kio/kio/sessiondata.cpp index 9097d6c0..8e7c9eb9 100644 --- a/kio/kio/sessiondata.cpp +++ b/kio/kio/sessiondata.cpp @@ -19,7 +19,7 @@ */ #include "sessiondata.h" -#include "sessiondata.moc" +#include "moc_sessiondata.cpp" #include #include diff --git a/kio/kio/skipdialog.cpp b/kio/kio/skipdialog.cpp index 77dc8ee3..4285900b 100644 --- a/kio/kio/skipdialog.cpp +++ b/kio/kio/skipdialog.cpp @@ -74,4 +74,4 @@ void SkipDialog::autoSkipPressed() done(S_AUTO_SKIP); } -#include "skipdialog.moc" +#include "moc_skipdialog.cpp" diff --git a/kio/kio/slave.cpp b/kio/kio/slave.cpp index eddb0425..bd943546 100644 --- a/kio/kio/slave.cpp +++ b/kio/kio/slave.cpp @@ -506,4 +506,4 @@ bool Slave::checkForHeldSlave(const KUrl &url) return KToolInvocation::klauncher()->checkForHeldSlave(url.url()); } -#include "slave.moc" +#include "moc_slave.cpp" diff --git a/kio/kio/slaveconfig.cpp b/kio/kio/slaveconfig.cpp index b92fbc78..11bf0a8f 100644 --- a/kio/kio/slaveconfig.cpp +++ b/kio/kio/slaveconfig.cpp @@ -217,4 +217,4 @@ void SlaveConfig::reset() } -#include "slaveconfig.moc" +#include "moc_slaveconfig.cpp" diff --git a/kio/kio/slaveinterface.cpp b/kio/kio/slaveinterface.cpp index f9c0f0d7..876f7c61 100644 --- a/kio/kio/slaveinterface.cpp +++ b/kio/kio/slaveinterface.cpp @@ -458,4 +458,4 @@ void SlaveInterfacePrivate::slotHostInfo(const QHostInfo& info) connection->send(CMD_HOST_INFO, data); } -#include "slaveinterface.moc" +#include "moc_slaveinterface.cpp" diff --git a/kio/kio/usernotificationhandler.cpp b/kio/kio/usernotificationhandler.cpp index 2b2e0912..af8544f7 100644 --- a/kio/kio/usernotificationhandler.cpp +++ b/kio/kio/usernotificationhandler.cpp @@ -105,4 +105,4 @@ void UserNotificationHandler::processRequest() } } -#include "usernotificationhandler_p.moc" +#include "moc_usernotificationhandler_p.cpp" diff --git a/kio/kssl/kcm/cacertificatespage.cpp b/kio/kssl/kcm/cacertificatespage.cpp index c369ac8c..d274e8ba 100644 --- a/kio/kssl/kcm/cacertificatespage.cpp +++ b/kio/kssl/kcm/cacertificatespage.cpp @@ -381,4 +381,4 @@ bool CaCertificatesPage::addCertificateItem(const KSslCaCertificate &caCert) return true; } -#include "cacertificatespage.moc" +#include "moc_cacertificatespage.cpp" diff --git a/kio/kssl/kcm/kcmssl.cpp b/kio/kssl/kcm/kcmssl.cpp index f1181adb..3cb52481 100644 --- a/kio/kssl/kcm/kcmssl.cpp +++ b/kio/kssl/kcm/kcmssl.cpp @@ -79,4 +79,4 @@ void KcmSsl::pageChanged(bool isChanged) emit changed(isChanged); } -#include "kcmssl.moc" +#include "moc_kcmssl.cpp" diff --git a/kio/kssl/ksslcertdialog.cpp b/kio/kssl/ksslcertdialog.cpp index 98e7a4cb..218583c9 100644 --- a/kio/kssl/ksslcertdialog.cpp +++ b/kio/kssl/ksslcertdialog.cpp @@ -172,5 +172,5 @@ QDataStream& operator>>(QDataStream& s, KSSLCertDialogRet& r) { } -#include "ksslcertdialog.moc" +#include "moc_ksslcertdialog.cpp" diff --git a/kio/kssl/ksslcertificatebox.cpp b/kio/kssl/ksslcertificatebox.cpp index 094787aa..70443f50 100644 --- a/kio/kssl/ksslcertificatebox.cpp +++ b/kio/kssl/ksslcertificatebox.cpp @@ -82,4 +82,4 @@ void KSslCertificateBox::clear() } -#include "ksslcertificatebox.moc" +#include "moc_ksslcertificatebox.cpp" diff --git a/kio/kssl/ksslinfodialog.cpp b/kio/kssl/ksslinfodialog.cpp index b6b12483..5a9d2e06 100644 --- a/kio/kssl/ksslinfodialog.cpp +++ b/kio/kssl/ksslinfodialog.cpp @@ -248,4 +248,4 @@ QList > KSslInfoDialog::errorsFromString(const QString & return ret; } -#include "ksslinfodialog.moc" +#include "moc_ksslinfodialog.cpp" diff --git a/kio/kssl/ksslkeygen.cpp b/kio/kssl/ksslkeygen.cpp index 229f492f..088a1051 100644 --- a/kio/kssl/ksslkeygen.cpp +++ b/kio/kssl/ksslkeygen.cpp @@ -273,6 +273,6 @@ void KSSLKeyGen::setKeySize(int idx) d->idx = idx; } -#include "ksslkeygen.moc" +#include "moc_ksslkeygen.cpp" -#include "ksslkeygen_p.moc" +#include "moc_ksslkeygen_p.cpp" diff --git a/kio/misc/kpac/discovery.cpp b/kio/misc/kpac/discovery.cpp index 6daef2d4..405d50fd 100644 --- a/kio/misc/kpac/discovery.cpp +++ b/kio/misc/kpac/discovery.cpp @@ -52,7 +52,7 @@ #include #include #include -#include "discovery.moc" +#include "moc_discovery.cpp" namespace KPAC { diff --git a/kio/misc/kpac/downloader.cpp b/kio/misc/kpac/downloader.cpp index 022b08e8..c26df080 100644 --- a/kio/misc/kpac/downloader.cpp +++ b/kio/misc/kpac/downloader.cpp @@ -99,5 +99,5 @@ namespace KPAC } // vim: ts=4 sw=4 et -#include "downloader.moc" +#include "moc_downloader.cpp" diff --git a/kio/misc/kpac/proxyscout.cpp b/kio/misc/kpac/proxyscout.cpp index 6eec6975..899d5f61 100644 --- a/kio/misc/kpac/proxyscout.cpp +++ b/kio/misc/kpac/proxyscout.cpp @@ -357,6 +357,6 @@ namespace KPAC } } -#include "proxyscout.moc" +#include "moc_proxyscout.cpp" // vim: ts=4 sw=4 et diff --git a/kio/tests/clipboardupdatertest.cpp b/kio/tests/clipboardupdatertest.cpp index 61fe8a90..b044cde2 100644 --- a/kio/tests/clipboardupdatertest.cpp +++ b/kio/tests/clipboardupdatertest.cpp @@ -165,4 +165,4 @@ void ClipboardUpdaterTest::testPasteAfterDeleteFiles() QVERIFY(!job); } -#include "clipboardupdatertest.moc" +#include "moc_clipboardupdatertest.cpp" diff --git a/kio/tests/dataprotocoltest.cpp b/kio/tests/dataprotocoltest.cpp index b807b2ce..028456c9 100644 --- a/kio/tests/dataprotocoltest.cpp +++ b/kio/tests/dataprotocoltest.cpp @@ -320,4 +320,4 @@ void DataProtocolTest::runAllTests_data() "%22%20stroke-width%3D%221%22%20fill%3D%22green%22%2F%3E%0A%3C%2Fsvg%3E%0A" ); } -#include "dataprotocoltest.moc" +#include "moc_dataprotocoltest.cpp" diff --git a/kio/tests/dummymeta.cpp b/kio/tests/dummymeta.cpp index 55da9a6c..30280fbf 100644 --- a/kio/tests/dummymeta.cpp +++ b/kio/tests/dummymeta.cpp @@ -17,4 +17,4 @@ bool DummyMeta::readInfo( KFileMetaInfo::Internal & info ) return 0L; } -#include "dummymeta.moc" +#include "moc_dummymeta.cpp" diff --git a/kio/tests/fileundomanagertest.cpp b/kio/tests/fileundomanagertest.cpp index 5b12ff9a..8939f1ec 100644 --- a/kio/tests/fileundomanagertest.cpp +++ b/kio/tests/fileundomanagertest.cpp @@ -44,7 +44,7 @@ #include #include -#include "fileundomanagertest.moc" +#include "moc_fileundomanagertest.cpp" QTEST_KDEMAIN( FileUndoManagerTest, GUI ) diff --git a/kio/tests/globaltest.cpp b/kio/tests/globaltest.cpp index 400beb8c..bc55f6d3 100644 --- a/kio/tests/globaltest.cpp +++ b/kio/tests/globaltest.cpp @@ -74,4 +74,4 @@ void GlobalTest::testOtherPermissionConversion() QCOMPARE(qPermissions & perms, perms); } -#include "globaltest.moc" +#include "moc_globaltest.cpp" diff --git a/kio/tests/jobremotetest.cpp b/kio/tests/jobremotetest.cpp index 1736dae5..c3606f07 100644 --- a/kio/tests/jobremotetest.cpp +++ b/kio/tests/jobremotetest.cpp @@ -390,4 +390,4 @@ void JobRemoteTest::slotMimetype(KIO::Job* job, const QString& type) m_mimetype = type; } -#include "jobremotetest.moc" +#include "moc_jobremotetest.cpp" diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp index 39fe5f9e..2bd52e3c 100644 --- a/kio/tests/jobtest.cpp +++ b/kio/tests/jobtest.cpp @@ -1517,4 +1517,4 @@ void JobTest::moveOverSymlinkToSelf() // #169547 QVERIFY(QFile::exists(sourceFile)); // it not moved } -#include "jobtest.moc" +#include "moc_jobtest.cpp" diff --git a/kio/tests/kbookmarktest.cpp b/kio/tests/kbookmarktest.cpp index 5ab002b9..51b4659e 100644 --- a/kio/tests/kbookmarktest.cpp +++ b/kio/tests/kbookmarktest.cpp @@ -18,7 +18,7 @@ #include #include "kbookmarktest.h" -#include "kbookmarktest.moc" +#include "moc_kbookmarktest.cpp" QTEST_KDEMAIN( KBookmarkTest, NoGUI ) diff --git a/kio/tests/kdcopcheck.cpp b/kio/tests/kdcopcheck.cpp index 3bfd4c55..a607fef4 100644 --- a/kio/tests/kdcopcheck.cpp +++ b/kio/tests/kdcopcheck.cpp @@ -128,4 +128,4 @@ int main(int argc, char *argv[]) qWarning("%d left after filtering.", i); } -#include "kdcopcheck.moc" +#include "moc_kdcopcheck.cpp" diff --git a/kio/tests/kdirlistertest.cpp b/kio/tests/kdirlistertest.cpp index 51a426b1..f9a2483b 100644 --- a/kio/tests/kdirlistertest.cpp +++ b/kio/tests/kdirlistertest.cpp @@ -19,7 +19,7 @@ #include "kdirlistertest.h" #include -#include "kdirlistertest.moc" +#include "moc_kdirlistertest.cpp" #include #include diff --git a/kio/tests/kdirlistertest_gui.cpp b/kio/tests/kdirlistertest_gui.cpp index 80f2e892..5497edae 100644 --- a/kio/tests/kdirlistertest_gui.cpp +++ b/kio/tests/kdirlistertest_gui.cpp @@ -159,4 +159,4 @@ int main ( int argc, char *argv[] ) return app.exec(); } -#include "kdirlistertest_gui.moc" +#include "moc_kdirlistertest_gui.cpp" diff --git a/kio/tests/kdirmodeltest.cpp b/kio/tests/kdirmodeltest.cpp index 9e3e5708..4cb2f52f 100644 --- a/kio/tests/kdirmodeltest.cpp +++ b/kio/tests/kdirmodeltest.cpp @@ -22,7 +22,7 @@ #include #include #include -#include "kdirmodeltest.moc" +#include "moc_kdirmodeltest.cpp" #include #include //TODO #include "../../kdeui/tests/proxymodeltestsuite/modelspy.h" diff --git a/kio/tests/kfdtest.cpp b/kio/tests/kfdtest.cpp index 94503543..7fda4739 100644 --- a/kio/tests/kfdtest.cpp +++ b/kio/tests/kfdtest.cpp @@ -30,4 +30,4 @@ void KFDTest::doit() // qApp->quit(); } -#include "kfdtest.moc" +#include "moc_kfdtest.cpp" diff --git a/kio/tests/kfileitemtest.cpp b/kio/tests/kfileitemtest.cpp index 9f611e20..6d1de820 100644 --- a/kio/tests/kfileitemtest.cpp +++ b/kio/tests/kfileitemtest.cpp @@ -20,7 +20,7 @@ #include "kfileitemtest.h" #include #include -#include "kfileitemtest.moc" +#include "moc_kfileitemtest.cpp" #include #include diff --git a/kio/tests/kfilemetainfotest.cpp b/kio/tests/kfilemetainfotest.cpp index 41f97c19..69c6fcaa 100644 --- a/kio/tests/kfilemetainfotest.cpp +++ b/kio/tests/kfilemetainfotest.cpp @@ -99,4 +99,4 @@ void KFileMetaInfoTest::exitLoop() } } -#include "kfilemetainfotest.moc" +#include "moc_kfilemetainfotest.cpp" diff --git a/kio/tests/kioslavetest.cpp b/kio/tests/kioslavetest.cpp index b4f36ba8..d987ff33 100644 --- a/kio/tests/kioslavetest.cpp +++ b/kio/tests/kioslavetest.cpp @@ -544,4 +544,4 @@ int main(int argc, char **argv) { } -#include "kioslavetest.moc" +#include "moc_kioslavetest.cpp" diff --git a/kio/tests/kruntest.cpp b/kio/tests/kruntest.cpp index d877045e..06524e46 100644 --- a/kio/tests/kruntest.cpp +++ b/kio/tests/kruntest.cpp @@ -153,4 +153,4 @@ int main(int argc, char **argv) return app.exec(); } -#include "kruntest.moc" +#include "moc_kruntest.cpp" diff --git a/kio/tests/krununittest.cpp b/kio/tests/krununittest.cpp index 2fae2645..6f4985e1 100644 --- a/kio/tests/krununittest.cpp +++ b/kio/tests/krununittest.cpp @@ -22,7 +22,7 @@ #undef QT_USE_FAST_CONCATENATION #include "krununittest.h" -#include "krununittest.moc" +#include "moc_krununittest.cpp" #include QTEST_KDEMAIN( KRunUnitTest, NoGUI ) diff --git a/kio/tests/previewtest.cpp b/kio/tests/previewtest.cpp index c1d41963..72293b6a 100644 --- a/kio/tests/previewtest.cpp +++ b/kio/tests/previewtest.cpp @@ -10,7 +10,7 @@ #include #include -#include "previewtest.moc" +#include "moc_previewtest.cpp" PreviewTest::PreviewTest() :QWidget() diff --git a/kio/tests/speed.cpp b/kio/tests/speed.cpp index 2cd684cd..a9eb4bc8 100644 --- a/kio/tests/speed.cpp +++ b/kio/tests/speed.cpp @@ -104,4 +104,4 @@ int main(int argc, char **argv) { kDebug() << mp->mountPoint() << " is the mount point for path " << url; } -#include "speed.moc" +#include "moc_speed.cpp" diff --git a/kioslave/file/file.cpp b/kioslave/file/file.cpp index f72bc5f9..86de93e0 100644 --- a/kioslave/file/file.cpp +++ b/kioslave/file/file.cpp @@ -1305,4 +1305,4 @@ bool FileProtocol::deleteRecursive(const QString& path) return true; } -#include "file.moc" +#include "moc_file.cpp" diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp index 931e6152..1a378259 100644 --- a/kioslave/http/http.cpp +++ b/kioslave/http/http.cpp @@ -5586,4 +5586,4 @@ bool HTTPProtocol::davStatDestination() return true; } -#include "http.moc" +#include "moc_http.cpp" diff --git a/kioslave/http/kcookiejar/kcookieserver.cpp b/kioslave/http/kcookiejar/kcookieserver.cpp index 2a8d58ee..469ef860 100644 --- a/kioslave/http/kcookiejar/kcookieserver.cpp +++ b/kioslave/http/kcookiejar/kcookieserver.cpp @@ -587,5 +587,5 @@ KCookieServer::shutdown() deleteLater(); } -#include "kcookieserver.moc" +#include "moc_kcookieserver.cpp" diff --git a/kioslave/http/kcookiejar/kcookiewin.cpp b/kioslave/http/kcookiejar/kcookiewin.cpp index 00f444fa..66f8fd89 100644 --- a/kioslave/http/kcookiejar/kcookiewin.cpp +++ b/kioslave/http/kcookiejar/kcookiewin.cpp @@ -337,4 +337,4 @@ void KCookieWin::slotButtonClicked(int button) } -#include "kcookiewin.moc" +#include "moc_kcookiewin.cpp" diff --git a/kioslave/http/tests/httpheaderdispositiontest.cpp b/kioslave/http/tests/httpheaderdispositiontest.cpp index 0b9521e4..182946a4 100644 --- a/kioslave/http/tests/httpheaderdispositiontest.cpp +++ b/kioslave/http/tests/httpheaderdispositiontest.cpp @@ -26,7 +26,7 @@ #include -#include "httpheaderdispositiontest.moc" +#include "moc_httpheaderdispositiontest.cpp" #include diff --git a/kioslave/http/tests/httpheadertokenizetest.cpp b/kioslave/http/tests/httpheadertokenizetest.cpp index 0bfc12a3..e2c25d3b 100644 --- a/kioslave/http/tests/httpheadertokenizetest.cpp +++ b/kioslave/http/tests/httpheadertokenizetest.cpp @@ -27,7 +27,7 @@ #include -#include "httpheadertokenizetest.moc" +#include "moc_httpheadertokenizetest.cpp" #include diff --git a/kioslave/http/tests/httpobjecttest.cpp b/kioslave/http/tests/httpobjecttest.cpp index c7f127c9..6116985a 100644 --- a/kioslave/http/tests/httpobjecttest.cpp +++ b/kioslave/http/tests/httpobjecttest.cpp @@ -24,7 +24,7 @@ #include #include -#include "httpobjecttest.moc" +#include "moc_httpobjecttest.cpp" QTEST_KDEMAIN(HeaderObjectTest, NoGUI) diff --git a/knotify/config/knotifyconfigactionswidget.cpp b/knotify/config/knotifyconfigactionswidget.cpp index 88d18b6d..9bce5e5a 100644 --- a/knotify/config/knotifyconfigactionswidget.cpp +++ b/knotify/config/knotifyconfigactionswidget.cpp @@ -146,4 +146,4 @@ void KNotifyConfigActionsWidget::slotKTTSComboChanged() emit changed(); } -#include "knotifyconfigactionswidget.moc" +#include "moc_knotifyconfigactionswidget.cpp" diff --git a/knotify/config/knotifyconfigwidget.cpp b/knotify/config/knotifyconfigwidget.cpp index dbbf7a63..6e925ba1 100644 --- a/knotify/config/knotifyconfigwidget.cpp +++ b/knotify/config/knotifyconfigwidget.cpp @@ -129,4 +129,4 @@ void KNotifyConfigWidget::slotActionChanged() } -#include "knotifyconfigwidget.moc" +#include "moc_knotifyconfigwidget.cpp" diff --git a/knotify/config/knotifyeventlist.cpp b/knotify/config/knotifyeventlist.cpp index 8dd21fb3..bb0d929a 100644 --- a/knotify/config/knotifyeventlist.cpp +++ b/knotify/config/knotifyeventlist.cpp @@ -214,4 +214,4 @@ void KNotifyEventListItem::update() setData(0 , Qt::UserRole , m_config.readEntry( "Action" )); } -#include "knotifyeventlist.moc" +#include "moc_knotifyeventlist.cpp" diff --git a/knotify/tests/knotifytestwindow.cpp b/knotify/tests/knotifytestwindow.cpp index 0da7d218..84bdc405 100644 --- a/knotify/tests/knotifytestwindow.cpp +++ b/knotify/tests/knotifytestwindow.cpp @@ -106,6 +106,6 @@ void KNotifyTestWindow::slotConfigureC( ) -#include "knotifytestwindow.moc" +#include "moc_knotifytestwindow.cpp" diff --git a/kparts/browserextension.cpp b/kparts/browserextension.cpp index 544d766c..42a765be 100644 --- a/kparts/browserextension.cpp +++ b/kparts/browserextension.cpp @@ -819,4 +819,4 @@ LiveConnectExtension *LiveConnectExtension::childObject( QObject *obj ) return KGlobal::findDirectChild(obj); } -#include "browserextension.moc" +#include "moc_browserextension.cpp" diff --git a/kparts/browserinterface.cpp b/kparts/browserinterface.cpp index 61a6f3b6..0f665ea6 100644 --- a/kparts/browserinterface.cpp +++ b/kparts/browserinterface.cpp @@ -72,4 +72,4 @@ void BrowserInterface::callMethod( const char *name, const QVariant &argument ) } } -#include "browserinterface.moc" +#include "moc_browserinterface.cpp" diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp index b9507f7f..a240f1ab 100644 --- a/kparts/browserrun.cpp +++ b/kparts/browserrun.cpp @@ -602,5 +602,5 @@ KParts::BrowserArguments& KParts::BrowserRun::browserArguments() return d->m_browserArgs; } -#include "browserrun.moc" -#include "browserrun_p.moc" +#include "moc_browserrun.cpp" +#include "moc_browserrun_p.cpp" diff --git a/kparts/factory.cpp b/kparts/factory.cpp index 9e030556..b4d3dcf5 100644 --- a/kparts/factory.cpp +++ b/kparts/factory.cpp @@ -78,4 +78,4 @@ QObject *Factory::createObject( QObject *parent, const char *classname, const QS return createPart( static_cast( parent ), parent, classname, args ); } -#include "factory.moc" +#include "moc_factory.cpp" diff --git a/kparts/historyprovider.cpp b/kparts/historyprovider.cpp index e472f8b6..177e6eb2 100644 --- a/kparts/historyprovider.cpp +++ b/kparts/historyprovider.cpp @@ -95,4 +95,4 @@ void HistoryProvider::clear() emit cleared(); } -#include "historyprovider.moc" +#include "moc_historyprovider.cpp" diff --git a/kparts/mainwindow.cpp b/kparts/mainwindow.cpp index ea7152c3..90948207 100644 --- a/kparts/mainwindow.cpp +++ b/kparts/mainwindow.cpp @@ -183,4 +183,4 @@ void KParts::MainWindow::configureToolbars() KXmlGuiWindow::configureToolbars(); } -#include "mainwindow.moc" +#include "moc_mainwindow.cpp" diff --git a/kparts/part.cpp b/kparts/part.cpp index 20089d46..f62c83d6 100644 --- a/kparts/part.cpp +++ b/kparts/part.cpp @@ -1148,4 +1148,4 @@ void KParts::OpenUrlArguments::setActionRequestedByUser(bool userRequested) d->actionRequestedByUser = userRequested; } -#include "part.moc" +#include "moc_part.cpp" diff --git a/kparts/partmanager.cpp b/kparts/partmanager.cpp index 54af8496..3b2815f6 100644 --- a/kparts/partmanager.cpp +++ b/kparts/partmanager.cpp @@ -603,4 +603,4 @@ void PartManager::setIgnoreExplictFocusRequests(bool ignore) d->m_bIgnoreExplicitFocusRequest = ignore; } -#include "partmanager.moc" +#include "moc_partmanager.cpp" diff --git a/kparts/plugin.cpp b/kparts/plugin.cpp index 358f6c4e..22abe106 100644 --- a/kparts/plugin.cpp +++ b/kparts/plugin.cpp @@ -352,4 +352,4 @@ void Plugin::loadPlugins(QObject *parent, KXMLGUIClient* parentGUIClient, // vim:sw=4:et:sts=4 -#include "plugin.moc" +#include "moc_plugin.cpp" diff --git a/kparts/scriptableextension.cpp b/kparts/scriptableextension.cpp index b43477f7..1edd8a99 100644 --- a/kparts/scriptableextension.cpp +++ b/kparts/scriptableextension.cpp @@ -447,7 +447,7 @@ unsigned int qHash(const KParts::ScriptableExtension::FunctionRef& f) -#include "scriptableextension.moc" -#include "scriptableextension_p.moc" +#include "moc_scriptableextension.cpp" +#include "moc_scriptableextension_p.cpp" // kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on; diff --git a/kparts/statusbarextension.cpp b/kparts/statusbarextension.cpp index caabea4a..4b518b97 100644 --- a/kparts/statusbarextension.cpp +++ b/kparts/statusbarextension.cpp @@ -188,6 +188,6 @@ void StatusBarExtension::removeStatusBarItem( QWidget * widget ) kWarning(1000) << "StatusBarExtension::removeStatusBarItem. Widget not found : " << widget; } -#include "statusbarextension.moc" +#include "moc_statusbarextension.cpp" // vim: ts=2 sw=2 et diff --git a/kparts/tests/normalktm.cpp b/kparts/tests/normalktm.cpp index ebc4f6c5..6812d970 100644 --- a/kparts/tests/normalktm.cpp +++ b/kparts/tests/normalktm.cpp @@ -152,4 +152,4 @@ int main( int argc, char **argv ) return 0; } -#include "normalktm.moc" +#include "moc_normalktm.cpp" diff --git a/kparts/tests/notepad.cpp b/kparts/tests/notepad.cpp index 9e1aa146..bcf99409 100644 --- a/kparts/tests/notepad.cpp +++ b/kparts/tests/notepad.cpp @@ -125,4 +125,4 @@ void NotepadPart::slotSearchReplace() { } -#include "notepad.moc" +#include "moc_notepad.cpp" diff --git a/kparts/tests/parts.cpp b/kparts/tests/parts.cpp index 03dd62a1..13599bb1 100644 --- a/kparts/tests/parts.cpp +++ b/kparts/tests/parts.cpp @@ -140,4 +140,4 @@ void Part2::guiActivateEvent( KParts::GUIActivateEvent * event ) emit setWindowCaption("[part2 activated]"); } -#include "parts.moc" +#include "moc_parts.cpp" diff --git a/kparts/tests/parttest.cpp b/kparts/tests/parttest.cpp index e48b5782..8618e62b 100644 --- a/kparts/tests/parttest.cpp +++ b/kparts/tests/parttest.cpp @@ -223,4 +223,4 @@ void PartTest::testToolbarVisibility() window.testToolbarVisibility(); } -#include "parttest.moc" +#include "moc_parttest.cpp" diff --git a/kparts/tests/partviewer.cpp b/kparts/tests/partviewer.cpp index 74689db7..016b2826 100644 --- a/kparts/tests/partviewer.cpp +++ b/kparts/tests/partviewer.cpp @@ -111,4 +111,4 @@ int main( int argc, char **argv ) return app.exec(); } -#include "partviewer.moc" +#include "moc_partviewer.cpp" diff --git a/kparts/tests/testmainwindow.cpp b/kparts/tests/testmainwindow.cpp index 8035844a..0f951e74 100644 --- a/kparts/tests/testmainwindow.cpp +++ b/kparts/tests/testmainwindow.cpp @@ -173,4 +173,4 @@ int main( int argc, char **argv ) return 0; } -#include "testmainwindow.moc" +#include "moc_testmainwindow.cpp" diff --git a/kpty/kptydevice.cpp b/kpty/kptydevice.cpp index 1579780e..cf208a49 100644 --- a/kpty/kptydevice.cpp +++ b/kpty/kptydevice.cpp @@ -610,4 +610,4 @@ qint64 KPtyDevice::writeData(const char *data, qint64 len) return len; } -#include "kptydevice.moc" +#include "moc_kptydevice.cpp" diff --git a/kpty/kptyprocess.cpp b/kpty/kptyprocess.cpp index d782068b..015a58c6 100644 --- a/kpty/kptyprocess.cpp +++ b/kpty/kptyprocess.cpp @@ -137,4 +137,4 @@ void KPtyProcess::setupChildProcess() KProcess::setupChildProcess(); } -#include "kptyprocess.moc" +#include "moc_kptyprocess.cpp" diff --git a/kpty/tests/kptyprocesstest.cpp b/kpty/tests/kptyprocesstest.cpp index 7285c272..4c69a98c 100644 --- a/kpty/tests/kptyprocesstest.cpp +++ b/kpty/tests/kptyprocesstest.cpp @@ -216,4 +216,4 @@ void KPtyProcessTest::test_ctty() QTEST_KDEMAIN_CORE( KPtyProcessTest ) -#include "kptyprocesstest.moc" +#include "moc_kptyprocesstest.cpp" diff --git a/kross/core/action.cpp b/kross/core/action.cpp index 3b7a206c..163bae64 100644 --- a/kross/core/action.cpp +++ b/kross/core/action.cpp @@ -547,4 +547,4 @@ WrapperInterface::~WrapperInterface() { } -#include "action.moc" +#include "moc_action.cpp" diff --git a/kross/core/actioncollection.cpp b/kross/core/actioncollection.cpp index f5b7f6de..b18db96d 100644 --- a/kross/core/actioncollection.cpp +++ b/kross/core/actioncollection.cpp @@ -459,4 +459,4 @@ bool ActionCollection::writeXml(QIODevice* device, int indent, const QStringList return device->write( document.toByteArray(indent) ) != -1; } -#include "actioncollection.moc" +#include "moc_actioncollection.cpp" diff --git a/kross/core/interpreter.cpp b/kross/core/interpreter.cpp index 8f488c04..a39aeeb7 100644 --- a/kross/core/interpreter.cpp +++ b/kross/core/interpreter.cpp @@ -174,4 +174,4 @@ InterpreterInfo* Interpreter::interpreterInfo() const return d->interpreterinfo; } -#include "interpreter.moc" +#include "moc_interpreter.cpp" diff --git a/kross/core/manager.cpp b/kross/core/manager.cpp index b7ca5ee6..58cc3ffd 100644 --- a/kross/core/manager.cpp +++ b/kross/core/manager.cpp @@ -427,4 +427,4 @@ bool Manager::hasHandlerAssigned(const QByteArray& typeName) const return d->wrappers.contains(typeName); } -#include "manager.moc" +#include "moc_manager.cpp" diff --git a/kross/core/script.cpp b/kross/core/script.cpp index 16f025c5..912fb7c0 100644 --- a/kross/core/script.cpp +++ b/kross/core/script.cpp @@ -63,4 +63,4 @@ Action* Script::action() const return d->action; } -#include "script.moc" +#include "moc_script.cpp" diff --git a/kross/modules/form.cpp b/kross/modules/form.cpp index 64664b9a..6c257f3e 100644 --- a/kross/modules/form.cpp +++ b/kross/modules/form.cpp @@ -824,4 +824,4 @@ QObject* FormModule::loadPart(QWidget* parent, const QString& name, const QUrl& return part; } -#include "form.moc" +#include "moc_form.cpp" diff --git a/kross/modules/translation.cpp b/kross/modules/translation.cpp index 75cc9c80..cff9ab92 100644 --- a/kross/modules/translation.cpp +++ b/kross/modules/translation.cpp @@ -101,4 +101,4 @@ QString TranslationModule::i18ncp( const QString &context, const QString &singul return substituteArguments( ls, arguments, 98 ).toString(); } -#include "translation.moc" +#include "moc_translation.cpp" diff --git a/kross/qts/script.cpp b/kross/qts/script.cpp index 1cee9075..6896d3e0 100644 --- a/kross/qts/script.cpp +++ b/kross/qts/script.cpp @@ -271,4 +271,4 @@ QObject* EcmaScript::engine() const return d->m_engine; } -#include "script.moc" +#include "moc_script.cpp" diff --git a/kross/test/testobject.cpp b/kross/test/testobject.cpp index c01990a3..a1bc5fe1 100644 --- a/kross/test/testobject.cpp +++ b/kross/test/testobject.cpp @@ -370,4 +370,4 @@ void TestThread::run() } } -#include "testobject.moc" +#include "moc_testobject.cpp" diff --git a/kross/ui/model.cpp b/kross/ui/model.cpp index e9177556..463709ea 100644 --- a/kross/ui/model.cpp +++ b/kross/ui/model.cpp @@ -538,4 +538,4 @@ bool ActionCollectionProxyModel::filterAcceptsRow(int source_row, const QModelIn return true; } -#include "model.moc" +#include "moc_model.cpp" diff --git a/kross/ui/plugin.cpp b/kross/ui/plugin.cpp index 7b152609..7e5107f7 100644 --- a/kross/ui/plugin.cpp +++ b/kross/ui/plugin.cpp @@ -263,4 +263,4 @@ void ScriptingPlugin::slotResetScriptActions() KIO::NetAccess::del(KUrl(d->userActionsFile), 0); } -#include "plugin.moc" +#include "moc_plugin.cpp" diff --git a/kross/ui/view.cpp b/kross/ui/view.cpp index 9b3fefde..b5b436a5 100644 --- a/kross/ui/view.cpp +++ b/kross/ui/view.cpp @@ -558,4 +558,4 @@ void ActionCollectionView::slotRemove() KMessageBox::sorry(0, "TODO"); } -#include "view.moc" +#include "moc_view.cpp" diff --git a/kunitconversion/converter.cpp b/kunitconversion/converter.cpp index 7f0136e3..364cdba3 100644 --- a/kunitconversion/converter.cpp +++ b/kunitconversion/converter.cpp @@ -196,4 +196,4 @@ QList Converter::categories() const } -#include "converter.moc" +#include "moc_converter.cpp" diff --git a/kutils/kcmodulecontainer.cpp b/kutils/kcmodulecontainer.cpp index 9dab67ed..eacdbecc 100644 --- a/kutils/kcmodulecontainer.cpp +++ b/kutils/kcmodulecontainer.cpp @@ -18,7 +18,7 @@ */ #include "kcmodulecontainer.h" -#include "kcmodulecontainer.moc" +#include "moc_kcmodulecontainer.cpp" #include #include diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp index 8e985ae2..1fc4fd22 100644 --- a/kutils/kcmoduleproxy.cpp +++ b/kutils/kcmoduleproxy.cpp @@ -356,6 +356,6 @@ QSize KCModuleProxy::minimumSizeHint() const //X } /***************************************************************/ -#include "kcmoduleproxy.moc" +#include "moc_kcmoduleproxy.cpp" // vim: ts=4 diff --git a/kutils/kcmultidialog.cpp b/kutils/kcmultidialog.cpp index 6a31af17..5973646b 100644 --- a/kutils/kcmultidialog.cpp +++ b/kutils/kcmultidialog.cpp @@ -503,4 +503,4 @@ void KCMultiDialog::setButtons(ButtonCodes buttonMask) } -#include "kcmultidialog.moc" +#include "moc_kcmultidialog.cpp" diff --git a/kutils/kemoticons/kemoticons.cpp b/kutils/kemoticons/kemoticons.cpp index 3063dedc..46e0ae9d 100644 --- a/kutils/kemoticons/kemoticons.cpp +++ b/kutils/kemoticons/kemoticons.cpp @@ -294,6 +294,6 @@ KEmoticonsTheme::ParseMode KEmoticons::parseMode() return (KEmoticonsTheme::ParseMode) config.readEntry("parseMode", int(KEmoticonsTheme::RelaxedParse)); } -#include "kemoticons.moc" +#include "moc_kemoticons.cpp" // kate: space-indent on; indent-width 4; replace-tabs on; diff --git a/kutils/kemoticons/tests/kemoticontest.cpp b/kutils/kemoticons/tests/kemoticontest.cpp index 5faf0199..2b7440b1 100644 --- a/kutils/kemoticons/tests/kemoticontest.cpp +++ b/kutils/kemoticons/tests/kemoticontest.cpp @@ -18,7 +18,7 @@ // QTestLib for KDE #include "kemoticontest.h" -#include "kemoticontest.moc" +#include "moc_kemoticontest.cpp" #include #include diff --git a/kutils/kidletime/abstractsystempoller.cpp b/kutils/kidletime/abstractsystempoller.cpp index d2b5d098..54750509 100644 --- a/kutils/kidletime/abstractsystempoller.cpp +++ b/kutils/kidletime/abstractsystempoller.cpp @@ -27,4 +27,4 @@ AbstractSystemPoller::~AbstractSystemPoller() { } -#include "abstractsystempoller.moc" +#include "moc_abstractsystempoller.cpp" diff --git a/kutils/kidletime/kidletime.cpp b/kutils/kidletime/kidletime.cpp index 2679ff52..d613cf3c 100644 --- a/kutils/kidletime/kidletime.cpp +++ b/kutils/kidletime/kidletime.cpp @@ -258,4 +258,4 @@ QHash KIdleTime::idleTimeouts() const return d->associations; } -#include "kidletime.moc" +#include "moc_kidletime.cpp" diff --git a/kutils/kidletime/macpoller.cpp b/kutils/kidletime/macpoller.cpp index c2a08456..fc53e6a3 100644 --- a/kutils/kidletime/macpoller.cpp +++ b/kutils/kidletime/macpoller.cpp @@ -219,4 +219,4 @@ void MacPoller::simulateUserActivity() // TODO } -#include "macpoller.moc" +#include "moc_macpoller.cpp" diff --git a/kutils/kidletime/widgetbasedpoller.cpp b/kutils/kidletime/widgetbasedpoller.cpp index 651033e7..6f37ebe6 100644 --- a/kutils/kidletime/widgetbasedpoller.cpp +++ b/kutils/kidletime/widgetbasedpoller.cpp @@ -166,4 +166,4 @@ void WidgetBasedPoller::stopCatchingIdleEvents() releaseInputLock(); } -#include "widgetbasedpoller.moc" +#include "moc_widgetbasedpoller.cpp" diff --git a/kutils/kidletime/windowspoller.cpp b/kutils/kidletime/windowspoller.cpp index 7cf43b22..b56d2167 100644 --- a/kutils/kidletime/windowspoller.cpp +++ b/kutils/kidletime/windowspoller.cpp @@ -85,4 +85,4 @@ void WindowsPoller::checkForIdle() } } -#include "windowspoller.moc" +#include "moc_windowspoller.cpp" diff --git a/kutils/kidletime/xscreensaverbasedpoller.cpp b/kutils/kidletime/xscreensaverbasedpoller.cpp index 089b5ed8..f91fdf6c 100644 --- a/kutils/kidletime/xscreensaverbasedpoller.cpp +++ b/kutils/kidletime/xscreensaverbasedpoller.cpp @@ -72,4 +72,4 @@ void XScreensaverBasedPoller::simulateUserActivity() emit resumingFromIdle(); } -#include "xscreensaverbasedpoller.moc" +#include "moc_xscreensaverbasedpoller.cpp" diff --git a/kutils/kidletime/xsyncbasedpoller.cpp b/kutils/kidletime/xsyncbasedpoller.cpp index 476f47e4..ddb10c1e 100644 --- a/kutils/kidletime/xsyncbasedpoller.cpp +++ b/kutils/kidletime/xsyncbasedpoller.cpp @@ -279,4 +279,4 @@ void XSyncBasedPoller::simulateUserActivity() XResetScreenSaver(QX11Info::display()); } -#include "xsyncbasedpoller.moc" +#include "moc_xsyncbasedpoller.cpp" diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp index 505e53f6..a431d8f4 100644 --- a/kutils/kpluginselector.cpp +++ b/kutils/kpluginselector.cpp @@ -899,5 +899,5 @@ QFont KPluginSelector::Private::PluginDelegate::titleFont(const QFont &baseFont) return retFont; } -#include "kpluginselector_p.moc" -#include "kpluginselector.moc" +#include "moc_kpluginselector_p.cpp" +#include "moc_kpluginselector.cpp" diff --git a/kutils/kprintpreview.cpp b/kutils/kprintpreview.cpp index c50a44ba..7b801dc7 100644 --- a/kutils/kprintpreview.cpp +++ b/kutils/kprintpreview.cpp @@ -168,7 +168,7 @@ bool KPrintPreview::isAvailable() return !KMimeTypeTrader::self()->query("application/pdf", "KParts/ReadOnlyPart").isEmpty(); } -#include "kprintpreview.moc" +#include "moc_kprintpreview.cpp" diff --git a/kutils/ksettings/componentsdialog.cpp b/kutils/ksettings/componentsdialog.cpp index 80b007c4..d3cce92f 100644 --- a/kutils/ksettings/componentsdialog.cpp +++ b/kutils/ksettings/componentsdialog.cpp @@ -176,4 +176,4 @@ void ComponentsDialog::slotApply() } //namespace -#include "componentsdialog_p.moc" +#include "moc_componentsdialog_p.cpp" diff --git a/kutils/ksettings/dialog.cpp b/kutils/ksettings/dialog.cpp index 82442c25..979c520c 100644 --- a/kutils/ksettings/dialog.cpp +++ b/kutils/ksettings/dialog.cpp @@ -558,6 +558,6 @@ void DialogPrivate::_k_updateEnabledState(bool enabled) } //namespace -#include "dialog.moc" +#include "moc_dialog.cpp" // vim: ts=4 diff --git a/kutils/ksettings/dispatcher.cpp b/kutils/ksettings/dispatcher.cpp index 44475d36..8628d247 100644 --- a/kutils/ksettings/dispatcher.cpp +++ b/kutils/ksettings/dispatcher.cpp @@ -122,4 +122,4 @@ void DispatcherPrivate::unregisterComponent(QObject *obj) } // namespace Dispatcher } // namespace KSettings -#include "dispatcher_p.moc" +#include "moc_dispatcher_p.cpp" diff --git a/kutils/ksettings/pluginpage.cpp b/kutils/ksettings/pluginpage.cpp index 6d065537..7200fb93 100644 --- a/kutils/ksettings/pluginpage.cpp +++ b/kutils/ksettings/pluginpage.cpp @@ -84,4 +84,4 @@ void PluginPage::defaults() } //namespace -#include "pluginpage.moc" +#include "moc_pluginpage.cpp" diff --git a/kutils/ksettingswidgetadaptor.cpp b/kutils/ksettingswidgetadaptor.cpp index b6838690..1d3ba9ed 100644 --- a/kutils/ksettingswidgetadaptor.cpp +++ b/kutils/ksettingswidgetadaptor.cpp @@ -31,4 +31,4 @@ QString KSettingsWidgetAdaptor::applicationName() return KGlobal::caption(); } -#include "ksettingswidgetadaptor.moc" +#include "moc_ksettingswidgetadaptor.cpp" diff --git a/plasma/abstractdialogmanager.cpp b/plasma/abstractdialogmanager.cpp index cf6cb518..b2ecd830 100644 --- a/plasma/abstractdialogmanager.cpp +++ b/plasma/abstractdialogmanager.cpp @@ -52,4 +52,4 @@ void AbstractDialogManager::showDialog(QWidget *widget, Plasma::Applet *applet) } -#include "abstractdialogmanager.moc" +#include "moc_abstractdialogmanager.cpp" diff --git a/plasma/abstractrunner.cpp b/plasma/abstractrunner.cpp index 4a547f42..d96ef30a 100644 --- a/plasma/abstractrunner.cpp +++ b/plasma/abstractrunner.cpp @@ -474,4 +474,4 @@ void AbstractRunnerPrivate::setupScriptSupport() } // Plasma namespace -#include "abstractrunner.moc" +#include "moc_abstractrunner.cpp" diff --git a/plasma/abstracttoolbox.cpp b/plasma/abstracttoolbox.cpp index 818d2b09..43fa7b5c 100644 --- a/plasma/abstracttoolbox.cpp +++ b/plasma/abstracttoolbox.cpp @@ -113,5 +113,5 @@ void AbstractToolBox::reposition() } // plasma namespace -#include "abstracttoolbox.moc" +#include "moc_abstracttoolbox.cpp" diff --git a/plasma/animations/animation.cpp b/plasma/animations/animation.cpp index 190b0b9d..d4fb3f4c 100644 --- a/plasma/animations/animation.cpp +++ b/plasma/animations/animation.cpp @@ -89,4 +89,4 @@ void Animation::updateCurrentTime(int currentTime) } //namespace Plasma -#include "animation.moc" +#include "moc_animation.cpp" diff --git a/plasma/animations/bindings/animationgroup.cpp b/plasma/animations/bindings/animationgroup.cpp index 7071c6bc..3a1b7e48 100644 --- a/plasma/animations/bindings/animationgroup.cpp +++ b/plasma/animations/bindings/animationgroup.cpp @@ -104,4 +104,4 @@ void SequentialAnimationGroup::removeAnimation(QAbstractAnimation *animation) } // namespace Plasma -#include "animationgroup_p.moc" +#include "moc_animationgroup_p.cpp" diff --git a/plasma/animations/easinganimation.cpp b/plasma/animations/easinganimation.cpp index e21313c9..125222ff 100644 --- a/plasma/animations/easinganimation.cpp +++ b/plasma/animations/easinganimation.cpp @@ -35,5 +35,5 @@ void EasingAnimation::updateCurrentTime(int currentTime) } // namespace Plasma -#include "easinganimation_p.moc" +#include "moc_easinganimation_p.cpp" diff --git a/plasma/animations/fade.cpp b/plasma/animations/fade.cpp index 813cb185..44ef63d4 100644 --- a/plasma/animations/fade.cpp +++ b/plasma/animations/fade.cpp @@ -83,4 +83,4 @@ void FadeAnimation::updateEffectiveTime(int currentTime) } //namespace Plasma -#include "fade_p.moc" +#include "moc_fade_p.cpp" diff --git a/plasma/animations/geometry.cpp b/plasma/animations/geometry.cpp index 9edf1100..a417904d 100644 --- a/plasma/animations/geometry.cpp +++ b/plasma/animations/geometry.cpp @@ -96,4 +96,4 @@ void GeometryAnimation::updateEffectiveTime(int currentTime) } //namespace Plasma -#include "geometry_p.moc" +#include "moc_geometry_p.cpp" diff --git a/plasma/animations/grow.cpp b/plasma/animations/grow.cpp index 1d9a009d..40a576b4 100644 --- a/plasma/animations/grow.cpp +++ b/plasma/animations/grow.cpp @@ -95,5 +95,5 @@ void GrowAnimation::updateState(QAbstractAnimation::State newState, QAbstractAni } //namespace Plasma -#include "grow_p.moc" +#include "moc_grow_p.cpp" diff --git a/plasma/animations/javascriptanimation.cpp b/plasma/animations/javascriptanimation.cpp index 01cefdf9..71defd24 100644 --- a/plasma/animations/javascriptanimation.cpp +++ b/plasma/animations/javascriptanimation.cpp @@ -121,4 +121,4 @@ void JavascriptAnimation::updateEffectiveTime(int currentTime) } //namespace Plasma -#include "javascriptanimation_p.moc" +#include "moc_javascriptanimation_p.cpp" diff --git a/plasma/animations/pixmaptransition.cpp b/plasma/animations/pixmaptransition.cpp index 54271b57..76aa6ce6 100644 --- a/plasma/animations/pixmaptransition.cpp +++ b/plasma/animations/pixmaptransition.cpp @@ -177,4 +177,4 @@ void PixmapTransition::updateEffectiveTime(int currentTime) } //namespace Plasma -#include "pixmaptransition_p.moc" +#include "moc_pixmaptransition_p.cpp" diff --git a/plasma/animations/pulser.cpp b/plasma/animations/pulser.cpp index 850b73b9..7bacf34c 100644 --- a/plasma/animations/pulser.cpp +++ b/plasma/animations/pulser.cpp @@ -141,4 +141,4 @@ void PulseAnimation::updateEffectiveTime(int currentTime) } //namespace Plasma -#include "pulser_p.moc" +#include "moc_pulser_p.cpp" diff --git a/plasma/animations/rotation.cpp b/plasma/animations/rotation.cpp index fbc8b360..a6c45e0d 100644 --- a/plasma/animations/rotation.cpp +++ b/plasma/animations/rotation.cpp @@ -165,4 +165,4 @@ void RotationAnimation::updateEffectiveTime(int currentTime) } -#include "rotation_p.moc" +#include "moc_rotation_p.cpp" diff --git a/plasma/animations/rotationstacked.cpp b/plasma/animations/rotationstacked.cpp index 20524152..70cac453 100644 --- a/plasma/animations/rotationstacked.cpp +++ b/plasma/animations/rotationstacked.cpp @@ -185,4 +185,4 @@ void RotationStackedAnimation::updateTransformations() } //namespace Plasma -#include "rotationstacked_p.moc" +#include "moc_rotationstacked_p.cpp" diff --git a/plasma/animations/slide.cpp b/plasma/animations/slide.cpp index cc0e0227..ee350f5a 100644 --- a/plasma/animations/slide.cpp +++ b/plasma/animations/slide.cpp @@ -126,4 +126,4 @@ void SlideAnimation::updateState(QAbstractAnimation::State newState, QAbstractAn } //namespace Plasma -#include "slide_p.moc" +#include "moc_slide_p.cpp" diff --git a/plasma/animator.cpp b/plasma/animator.cpp index 69526ad1..033537a2 100644 --- a/plasma/animator.cpp +++ b/plasma/animator.cpp @@ -212,5 +212,5 @@ Plasma::Animation *Animator::create(const QString &anim, QObject *parent) } // namespace Plasma -#include +#include "moc_animator.cpp" diff --git a/plasma/applet.cpp b/plasma/applet.cpp index c760239f..53a48ef7 100644 --- a/plasma/applet.cpp +++ b/plasma/applet.cpp @@ -2985,5 +2985,5 @@ void Applet::geometryChanged() } // Plasma namespace -#include "applet.moc" -#include "private/applet_p.moc" +#include "moc_applet.cpp" +#include "private/moc_applet_p.cpp" diff --git a/plasma/containment.cpp b/plasma/containment.cpp index 98ed7042..4958134c 100644 --- a/plasma/containment.cpp +++ b/plasma/containment.cpp @@ -2331,5 +2331,5 @@ QHash * ContainmentPrivate::actionPlugins() } // Plasma namespace -#include "containment.moc" +#include "moc_containment.cpp" diff --git a/plasma/containmentactions.cpp b/plasma/containmentactions.cpp index 7868426a..28b6bf5d 100644 --- a/plasma/containmentactions.cpp +++ b/plasma/containmentactions.cpp @@ -392,4 +392,4 @@ void ContainmentActions::setContainment(Containment *newContainment) { } // Plasma namespace -#include "containmentactions.moc" +#include "moc_containmentactions.cpp" diff --git a/plasma/corona.cpp b/plasma/corona.cpp index 771d068f..8510af4c 100644 --- a/plasma/corona.cpp +++ b/plasma/corona.cpp @@ -1071,5 +1071,5 @@ QList CoronaPrivate::importLayout(const KConfigBase &conf } // namespace Plasma -#include "corona.moc" +#include "moc_corona.cpp" diff --git a/plasma/datacontainer.cpp b/plasma/datacontainer.cpp index 4afa929c..3162aad7 100644 --- a/plasma/datacontainer.cpp +++ b/plasma/datacontainer.cpp @@ -348,5 +348,5 @@ void DataContainer::timerEvent(QTimerEvent * event) } // Plasma namespace -#include "datacontainer.moc" +#include "moc_datacontainer.cpp" diff --git a/plasma/dataengine.cpp b/plasma/dataengine.cpp index f772ae4f..5aa5f528 100644 --- a/plasma/dataengine.cpp +++ b/plasma/dataengine.cpp @@ -718,4 +718,4 @@ void DataEnginePrivate::setupScriptSupport() } -#include "dataengine.moc" +#include "moc_dataengine.cpp" diff --git a/plasma/dataenginemanager.cpp b/plasma/dataenginemanager.cpp index f6dabf07..361ecee1 100644 --- a/plasma/dataenginemanager.cpp +++ b/plasma/dataenginemanager.cpp @@ -246,4 +246,4 @@ void DataEngineManager::timerEvent(QTimerEvent *) } // namespace Plasma -#include "dataenginemanager.moc" +#include "moc_dataenginemanager.cpp" diff --git a/plasma/delegate.cpp b/plasma/delegate.cpp index ec35ddbf..717fbd8a 100644 --- a/plasma/delegate.cpp +++ b/plasma/delegate.cpp @@ -489,5 +489,5 @@ bool Delegate::showToolTip() const } -#include "delegate.moc" +#include "moc_delegate.cpp" diff --git a/plasma/dialog.cpp b/plasma/dialog.cpp index 5307db0c..2bfdaba1 100644 --- a/plasma/dialog.cpp +++ b/plasma/dialog.cpp @@ -884,4 +884,4 @@ void Dialog::setAspectRatioMode(Plasma::AspectRatioMode mode) } } -#include "dialog.moc" +#include "moc_dialog.cpp" diff --git a/plasma/extenders/extender.cpp b/plasma/extenders/extender.cpp index 0d278bc8..64d9ca70 100644 --- a/plasma/extenders/extender.cpp +++ b/plasma/extenders/extender.cpp @@ -944,4 +944,4 @@ bool Extender::isEmpty() const } // Plasma namespace -#include "extender.moc" +#include "moc_extender.cpp" diff --git a/plasma/extenders/extendergroup.cpp b/plasma/extenders/extendergroup.cpp index e04dc974..d4569670 100644 --- a/plasma/extenders/extendergroup.cpp +++ b/plasma/extenders/extendergroup.cpp @@ -399,4 +399,4 @@ int ExtenderGroupPrivate::insertIndexFromPos(const QPointF &pos) const } // Plasma namespace -#include "extendergroup.moc" +#include "moc_extendergroup.cpp" diff --git a/plasma/extenders/extenderitem.cpp b/plasma/extenders/extenderitem.cpp index ba671b98..edf72420 100644 --- a/plasma/extenders/extenderitem.cpp +++ b/plasma/extenders/extenderitem.cpp @@ -1077,4 +1077,4 @@ uint ExtenderItemPrivate::s_maxExtenderItemId = 0; } // namespace Plasma -#include "extenderitem.moc" +#include "moc_extenderitem.cpp" diff --git a/plasma/framesvg.cpp b/plasma/framesvg.cpp index 6e50dc15..23ed9858 100644 --- a/plasma/framesvg.cpp +++ b/plasma/framesvg.cpp @@ -1076,4 +1076,4 @@ int FrameData::refcount() const } // Plasma namespace -#include "framesvg.moc" +#include "moc_framesvg.cpp" diff --git a/plasma/glapplet.cpp b/plasma/glapplet.cpp index e55f46ad..665212ed 100644 --- a/plasma/glapplet.cpp +++ b/plasma/glapplet.cpp @@ -210,4 +210,4 @@ void GLApplet::makeCurrent() } // Plasma namespace -#include "glapplet.moc" +#include "moc_glapplet.cpp" diff --git a/plasma/packagestructure.cpp b/plasma/packagestructure.cpp index cb24b388..6b5f9a59 100644 --- a/plasma/packagestructure.cpp +++ b/plasma/packagestructure.cpp @@ -683,5 +683,5 @@ void PackageStructure::setAllowExternalPaths(bool allow) } // Plasma namespace -#include "packagestructure.moc" +#include "moc_packagestructure.cpp" diff --git a/plasma/popupapplet.cpp b/plasma/popupapplet.cpp index f50cd00e..d3dc44be 100644 --- a/plasma/popupapplet.cpp +++ b/plasma/popupapplet.cpp @@ -998,5 +998,5 @@ void PopupAppletPrivate::updateDialogPosition(bool move) } // Plasma namespace -#include "popupapplet.moc" +#include "moc_popupapplet.cpp" diff --git a/plasma/private/animablegraphicswebview.cpp b/plasma/private/animablegraphicswebview.cpp index d372caf0..0a74a60e 100644 --- a/plasma/private/animablegraphicswebview.cpp +++ b/plasma/private/animablegraphicswebview.cpp @@ -189,5 +189,5 @@ void AnimableGraphicsWebView::setScrollPositionY(qreal position) } -#include "animablegraphicswebview_p.moc" +#include "moc_animablegraphicswebview_p.cpp" diff --git a/plasma/private/applethandle.cpp b/plasma/private/applethandle.cpp index e6d0c6c9..b247cdac 100644 --- a/plasma/private/applethandle.cpp +++ b/plasma/private/applethandle.cpp @@ -1072,5 +1072,5 @@ void AppletHandle::calculateSize() } // Plasma Namespace -#include "applethandle_p.moc" +#include "moc_applethandle_p.cpp" diff --git a/plasma/private/datacontainer_p.cpp b/plasma/private/datacontainer_p.cpp index c4576e49..d2434b8d 100644 --- a/plasma/private/datacontainer_p.cpp +++ b/plasma/private/datacontainer_p.cpp @@ -166,5 +166,5 @@ void SignalRelay::timerEvent(QTimerEvent *event) } // Plasma namespace -#include "datacontainer_p.moc" +#include "moc_datacontainer_p.cpp" diff --git a/plasma/private/dataengineconsumer.cpp b/plasma/private/dataengineconsumer.cpp index c969ecd1..80fb5bb6 100644 --- a/plasma/private/dataengineconsumer.cpp +++ b/plasma/private/dataengineconsumer.cpp @@ -102,6 +102,6 @@ DataEngine *DataEngineConsumer::dataEngine(const QString &name) } // namespace Plasma -#include "dataengineconsumer_p.moc" +#include "moc_dataengineconsumer_p.cpp" diff --git a/plasma/private/dataengineservice.cpp b/plasma/private/dataengineservice.cpp index 511483bd..d6b22e5f 100644 --- a/plasma/private/dataengineservice.cpp +++ b/plasma/private/dataengineservice.cpp @@ -56,5 +56,5 @@ void DataEngineService::sourceAdded(QString source) } -#include "dataengineservice_p.moc" +#include "moc_dataengineservice_p.cpp" diff --git a/plasma/private/dialogshadows.cpp b/plasma/private/dialogshadows.cpp index 19256705..0d5efa80 100644 --- a/plasma/private/dialogshadows.cpp +++ b/plasma/private/dialogshadows.cpp @@ -419,5 +419,5 @@ bool DialogShadows::enabled() const return hasElement("shadow-left"); } -#include "dialogshadows_p.moc" +#include "moc_dialogshadows_p.cpp" diff --git a/plasma/private/effectwatcher.cpp b/plasma/private/effectwatcher.cpp index 46854a75..48f803d8 100644 --- a/plasma/private/effectwatcher.cpp +++ b/plasma/private/effectwatcher.cpp @@ -87,4 +87,4 @@ bool EffectWatcher::isEffectActive() const } -#include "effectwatcher_p.moc" +#include "moc_effectwatcher_p.cpp" diff --git a/plasma/private/extenderapplet.cpp b/plasma/private/extenderapplet.cpp index bd33615a..0ad5d448 100644 --- a/plasma/private/extenderapplet.cpp +++ b/plasma/private/extenderapplet.cpp @@ -83,5 +83,5 @@ void ExtenderApplet::extenderGeometryChanged() } // namespace Plasma -#include "extenderapplet_p.moc" +#include "moc_extenderapplet_p.cpp" diff --git a/plasma/private/focusindicator.cpp b/plasma/private/focusindicator.cpp index 1d0744fd..05f678d8 100644 --- a/plasma/private/focusindicator.cpp +++ b/plasma/private/focusindicator.cpp @@ -318,5 +318,5 @@ FrameSvg *FocusIndicator::frameSvg() const } -#include +#include "moc_focusindicator_p.cpp" diff --git a/plasma/private/getsource.cpp b/plasma/private/getsource.cpp index 94847ee3..6e634453 100644 --- a/plasma/private/getsource.cpp +++ b/plasma/private/getsource.cpp @@ -66,5 +66,5 @@ void GetSource::start() } -#include "getsource_p.moc" +#include "moc_getsource_p.cpp" diff --git a/plasma/private/nativetabbar.cpp b/plasma/private/nativetabbar.cpp index 094be43e..f7affc53 100644 --- a/plasma/private/nativetabbar.cpp +++ b/plasma/private/nativetabbar.cpp @@ -632,5 +632,5 @@ void NativeTabBar::wheelEvent(QWheelEvent *event) } // namespace Plasma -#include "nativetabbar_p.moc" +#include "moc_nativetabbar_p.cpp" diff --git a/plasma/private/packages.cpp b/plasma/private/packages.cpp index b45b9d12..60db49dc 100644 --- a/plasma/private/packages.cpp +++ b/plasma/private/packages.cpp @@ -407,5 +407,5 @@ ContainmentActionsPackage::ContainmentActionsPackage(QObject *parent) } // namespace Plasma -#include "packages_p.moc" +#include "moc_packages_p.cpp" diff --git a/plasma/private/plasmoidservice.cpp b/plasma/private/plasmoidservice.cpp index e9ab78da..93f52aec 100644 --- a/plasma/private/plasmoidservice.cpp +++ b/plasma/private/plasmoidservice.cpp @@ -134,5 +134,5 @@ Plasma::ServiceJob* PlasmoidService::createJob(const QString& operation, } -#include "plasmoidservice_p.moc" +#include "moc_plasmoidservice_p.cpp" diff --git a/plasma/private/storage.cpp b/plasma/private/storage.cpp index 01038715..94fc3c58 100644 --- a/plasma/private/storage.cpp +++ b/plasma/private/storage.cpp @@ -156,4 +156,4 @@ Storage::~Storage() { } -#include "storage_p.moc" +#include "moc_storage_p.cpp" diff --git a/plasma/private/storagethread.cpp b/plasma/private/storagethread.cpp index 58a6c7c5..d5d44281 100644 --- a/plasma/private/storagethread.cpp +++ b/plasma/private/storagethread.cpp @@ -328,4 +328,4 @@ void StorageThread::run() } -#include "storagethread_p.moc" +#include "moc_storagethread_p.cpp" diff --git a/plasma/private/style.cpp b/plasma/private/style.cpp index d3cae152..340a4336 100644 --- a/plasma/private/style.cpp +++ b/plasma/private/style.cpp @@ -413,6 +413,6 @@ QSize Style::sizeFromContents(ContentsType type, const QStyleOption *option, } -#include "style_p.moc" +#include "moc_style_p.cpp" diff --git a/plasma/private/themedwidgetinterface.cpp b/plasma/private/themedwidgetinterface.cpp index f4659091..70d234c1 100644 --- a/plasma/private/themedwidgetinterface.cpp +++ b/plasma/private/themedwidgetinterface.cpp @@ -83,5 +83,5 @@ void PaletteHelper::generatePalettes() } // namespace Plasma -#include "themedwidgetinterface_p.moc" +#include "moc_themedwidgetinterface_p.cpp" diff --git a/plasma/private/tooltip.cpp b/plasma/private/tooltip.cpp index 8d8d1dc4..b98e4b1b 100644 --- a/plasma/private/tooltip.cpp +++ b/plasma/private/tooltip.cpp @@ -397,4 +397,4 @@ void ToolTip::updateTheme() } // namespace Plasma -#include "tooltip_p.moc" +#include "moc_tooltip_p.cpp" diff --git a/plasma/private/wallpaperrenderthread.cpp b/plasma/private/wallpaperrenderthread.cpp index 0a4e2157..4ff3ccf7 100644 --- a/plasma/private/wallpaperrenderthread.cpp +++ b/plasma/private/wallpaperrenderthread.cpp @@ -265,5 +265,5 @@ void WallpaperRenderThread::run() } // namespace Plasma -#include "wallpaperrenderthread_p.moc" +#include "moc_wallpaperrenderthread_p.cpp" diff --git a/plasma/private/windowpreview.cpp b/plasma/private/windowpreview.cpp index b60566c1..fed7f99b 100644 --- a/plasma/private/windowpreview.cpp +++ b/plasma/private/windowpreview.cpp @@ -231,4 +231,4 @@ void WindowPreview::leaveEvent(QEvent *event) } // namespace Plasma -#include "windowpreview_p.moc" +#include "moc_windowpreview_p.cpp" diff --git a/plasma/runnercontext.cpp b/plasma/runnercontext.cpp index 957ba70c..1ec39732 100644 --- a/plasma/runnercontext.cpp +++ b/plasma/runnercontext.cpp @@ -585,4 +585,4 @@ void RunnerContext::run(const QueryMatch &match) } // Plasma namespace -#include "runnercontext.moc" +#include "moc_runnercontext.cpp" diff --git a/plasma/runnermanager.cpp b/plasma/runnermanager.cpp index 3c46f8c4..ea6d76eb 100644 --- a/plasma/runnermanager.cpp +++ b/plasma/runnermanager.cpp @@ -839,4 +839,4 @@ void RunnerManager::reset() } // Plasma namespace -#include "runnermanager.moc" +#include "moc_runnermanager.cpp" diff --git a/plasma/scripting/appletscript.cpp b/plasma/scripting/appletscript.cpp index cb32a216..a1faeb16 100644 --- a/plasma/scripting/appletscript.cpp +++ b/plasma/scripting/appletscript.cpp @@ -297,4 +297,4 @@ void AppletScript::setContainmentType(Containment::Type type) } // Plasma namespace -#include "appletscript.moc" +#include "moc_appletscript.cpp" diff --git a/plasma/scripting/dataenginescript.cpp b/plasma/scripting/dataenginescript.cpp index 316bb249..d50cc36d 100644 --- a/plasma/scripting/dataenginescript.cpp +++ b/plasma/scripting/dataenginescript.cpp @@ -225,4 +225,4 @@ void DataEngineScript::forceImmediateUpdateOfAllVisualizations() } // Plasma namespace -#include "dataenginescript.moc" +#include "moc_dataenginescript.cpp" diff --git a/plasma/scripting/runnerscript.cpp b/plasma/scripting/runnerscript.cpp index 0d3d0e37..1950cb01 100644 --- a/plasma/scripting/runnerscript.cpp +++ b/plasma/scripting/runnerscript.cpp @@ -201,4 +201,4 @@ QString RunnerScript::mainScript() const } // Plasma namespace -#include "runnerscript.moc" +#include "moc_runnerscript.cpp" diff --git a/plasma/scripting/scriptengine.cpp b/plasma/scripting/scriptengine.cpp index fb8cd1a1..b8664580 100644 --- a/plasma/scripting/scriptengine.cpp +++ b/plasma/scripting/scriptengine.cpp @@ -288,5 +288,5 @@ PackageStructure::Ptr packageStructure(const QString &language, ComponentType ty } // namespace Plasma -#include +#include "moc_scriptengine.cpp" diff --git a/plasma/scripting/wallpaperscript.cpp b/plasma/scripting/wallpaperscript.cpp index a983baf0..c2abc001 100644 --- a/plasma/scripting/wallpaperscript.cpp +++ b/plasma/scripting/wallpaperscript.cpp @@ -230,4 +230,4 @@ void WallpaperScript::urlDropped(const KUrl &url) } // Plasma namespace -#include "wallpaperscript.moc" +#include "moc_wallpaperscript.cpp" diff --git a/plasma/service.cpp b/plasma/service.cpp index cd6ec91a..864ec8ea 100644 --- a/plasma/service.cpp +++ b/plasma/service.cpp @@ -352,5 +352,5 @@ void Service::registerOperationsScheme() } // namespace Plasma -#include "service.moc" +#include "moc_service.cpp" diff --git a/plasma/servicejob.cpp b/plasma/servicejob.cpp index 32462504..4d06b1cc 100644 --- a/plasma/servicejob.cpp +++ b/plasma/servicejob.cpp @@ -94,5 +94,5 @@ void ServiceJob::start() } // namespace Plasma -#include "servicejob.moc" +#include "moc_servicejob.cpp" diff --git a/plasma/svg.cpp b/plasma/svg.cpp index 6d05f520..c9cf4e74 100644 --- a/plasma/svg.cpp +++ b/plasma/svg.cpp @@ -826,5 +826,5 @@ Theme *Svg::theme() const } // Plasma namespace -#include "svg.moc" +#include "moc_svg.cpp" diff --git a/plasma/tests/testcontainmentactionsplugin/test.cpp b/plasma/tests/testcontainmentactionsplugin/test.cpp index b058ed73..38ae66dc 100644 --- a/plasma/tests/testcontainmentactionsplugin/test.cpp +++ b/plasma/tests/testcontainmentactionsplugin/test.cpp @@ -104,4 +104,4 @@ void ContextTest::save(KConfigGroup &config) } -#include "test.moc" +#include "moc_test.cpp" diff --git a/plasma/tests/testengine/testengine.cpp b/plasma/tests/testengine/testengine.cpp index a94720f6..a5884003 100644 --- a/plasma/tests/testengine/testengine.cpp +++ b/plasma/tests/testengine/testengine.cpp @@ -175,4 +175,4 @@ bool TestEngine::sourceRequestEvent(const QString &source) } // sourceRequestEvent() -#include "testengine.moc" +#include "moc_testengine.cpp" diff --git a/plasma/theme.cpp b/plasma/theme.cpp index ad2ac25d..691f2f8c 100644 --- a/plasma/theme.cpp +++ b/plasma/theme.cpp @@ -1200,4 +1200,4 @@ int Theme::toolTipDelay() const } -#include +#include "moc_theme.cpp" diff --git a/plasma/tooltipmanager.cpp b/plasma/tooltipmanager.cpp index d90dc9c5..3e58baa1 100644 --- a/plasma/tooltipmanager.cpp +++ b/plasma/tooltipmanager.cpp @@ -511,5 +511,5 @@ bool ToolTipManager::eventFilter(QObject *watched, QEvent *event) } // Plasma namespace -#include "tooltipmanager.moc" +#include "moc_tooltipmanager.cpp" diff --git a/plasma/view.cpp b/plasma/view.cpp index 84064ae6..dbce91d8 100644 --- a/plasma/view.cpp +++ b/plasma/view.cpp @@ -422,5 +422,5 @@ View * View::topLevelViewAt(const QPoint & pos) } // namespace Plasma -#include "view.moc" +#include "moc_view.cpp" diff --git a/plasma/wallpaper.cpp b/plasma/wallpaper.cpp index c8461313..c69a5647 100644 --- a/plasma/wallpaper.cpp +++ b/plasma/wallpaper.cpp @@ -686,5 +686,5 @@ const Package *Wallpaper::package() const } // Plasma namespace -#include "wallpaper.moc" -#include "private/wallpaper_p.moc" +#include "moc_wallpaper.cpp" +#include "private/moc_wallpaper_p.cpp" diff --git a/plasma/widgets/busywidget.cpp b/plasma/widgets/busywidget.cpp index 65353836..23d752dc 100644 --- a/plasma/widgets/busywidget.cpp +++ b/plasma/widgets/busywidget.cpp @@ -216,5 +216,5 @@ void BusyWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) } // namespace Plasma -#include +#include "moc_busywidget.cpp" diff --git a/plasma/widgets/checkbox.cpp b/plasma/widgets/checkbox.cpp index 7d242791..7c1b903d 100644 --- a/plasma/widgets/checkbox.cpp +++ b/plasma/widgets/checkbox.cpp @@ -177,5 +177,5 @@ void CheckBox::changeEvent(QEvent *event) } // namespace Plasma -#include +#include "moc_checkbox.cpp" diff --git a/plasma/widgets/combobox.cpp b/plasma/widgets/combobox.cpp index 514edf04..dc13f201 100644 --- a/plasma/widgets/combobox.cpp +++ b/plasma/widgets/combobox.cpp @@ -351,5 +351,5 @@ void ComboBox::setCurrentIndex(int index) } // namespace Plasma -#include +#include "moc_combobox.cpp" diff --git a/plasma/widgets/declarativewidget.cpp b/plasma/widgets/declarativewidget.cpp index 019cdcca..a2537b95 100644 --- a/plasma/widgets/declarativewidget.cpp +++ b/plasma/widgets/declarativewidget.cpp @@ -326,5 +326,5 @@ void DeclarativeWidget::resizeEvent(QGraphicsSceneResizeEvent *event) } // namespace Plasma -#include +#include "moc_declarativewidget.cpp" diff --git a/plasma/widgets/flashinglabel.cpp b/plasma/widgets/flashinglabel.cpp index 210207d6..45b7882c 100644 --- a/plasma/widgets/flashinglabel.cpp +++ b/plasma/widgets/flashinglabel.cpp @@ -328,4 +328,4 @@ void FlashingLabelPrivate::setPalette() q->update(); } -#include "flashinglabel.moc" +#include "moc_flashinglabel.cpp" diff --git a/plasma/widgets/frame.cpp b/plasma/widgets/frame.cpp index 8ef4651d..f7449f02 100644 --- a/plasma/widgets/frame.cpp +++ b/plasma/widgets/frame.cpp @@ -271,5 +271,5 @@ void Frame::changeEvent(QEvent *event) } // namespace Plasma -#include +#include "moc_frame.cpp" diff --git a/plasma/widgets/groupbox.cpp b/plasma/widgets/groupbox.cpp index 0abc2ca6..a617c6ff 100644 --- a/plasma/widgets/groupbox.cpp +++ b/plasma/widgets/groupbox.cpp @@ -99,5 +99,5 @@ void GroupBox::changeEvent(QEvent *event) } // namespace Plasma -#include +#include "moc_groupbox.cpp" diff --git a/plasma/widgets/iconwidget.cpp b/plasma/widgets/iconwidget.cpp index a8d87989..361305e1 100644 --- a/plasma/widgets/iconwidget.cpp +++ b/plasma/widgets/iconwidget.cpp @@ -1634,5 +1634,5 @@ void IconWidget::changeEvent(QEvent *event) } // namespace Plasma -#include "iconwidget.moc" -#include "iconwidget_p.moc" +#include "moc_iconwidget.cpp" +#include "moc_iconwidget_p.cpp" diff --git a/plasma/widgets/itembackground.cpp b/plasma/widgets/itembackground.cpp index 3a26c3b4..bb96328e 100644 --- a/plasma/widgets/itembackground.cpp +++ b/plasma/widgets/itembackground.cpp @@ -340,6 +340,6 @@ void ItemBackgroundPrivate::refreshCurrentTarget() } // Plasma namespace -#include "itembackground.moc" +#include "moc_itembackground.cpp" diff --git a/plasma/widgets/label.cpp b/plasma/widgets/label.cpp index 6feb9848..58b5765e 100644 --- a/plasma/widgets/label.cpp +++ b/plasma/widgets/label.cpp @@ -343,5 +343,5 @@ QSizeF Label::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const } // namespace Plasma -#include +#include "moc_label.cpp" diff --git a/plasma/widgets/lineedit.cpp b/plasma/widgets/lineedit.cpp index 705e329b..eb3e3cb7 100644 --- a/plasma/widgets/lineedit.cpp +++ b/plasma/widgets/lineedit.cpp @@ -228,5 +228,5 @@ void LineEdit::focusOutEvent(QFocusEvent *event) } // namespace Plasma -#include +#include "moc_lineedit.cpp" diff --git a/plasma/widgets/meter.cpp b/plasma/widgets/meter.cpp index 6d35275e..8fa2c9e8 100644 --- a/plasma/widgets/meter.cpp +++ b/plasma/widgets/meter.cpp @@ -557,5 +557,5 @@ QSizeF Meter::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const } // End of namepace -#include "meter.moc" -#include "../private/meter_p.moc" +#include "moc_meter.cpp" +#include "../private/moc_meter_p.cpp" diff --git a/plasma/widgets/pushbutton.cpp b/plasma/widgets/pushbutton.cpp index 6cac7d7b..04846c10 100644 --- a/plasma/widgets/pushbutton.cpp +++ b/plasma/widgets/pushbutton.cpp @@ -532,5 +532,5 @@ QSizeF PushButton::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const } // namespace Plasma -#include +#include "moc_pushbutton.cpp" diff --git a/plasma/widgets/radiobutton.cpp b/plasma/widgets/radiobutton.cpp index 834868ae..8f4a21cb 100644 --- a/plasma/widgets/radiobutton.cpp +++ b/plasma/widgets/radiobutton.cpp @@ -166,5 +166,5 @@ void RadioButton::changeEvent(QEvent *event) } // namespace Plasma -#include +#include "moc_radiobutton.cpp" diff --git a/plasma/widgets/scrollbar.cpp b/plasma/widgets/scrollbar.cpp index 1426f0dc..f72a24e9 100644 --- a/plasma/widgets/scrollbar.cpp +++ b/plasma/widgets/scrollbar.cpp @@ -149,4 +149,4 @@ void ScrollBar::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) } -#include +#include "moc_scrollbar.cpp" diff --git a/plasma/widgets/scrollwidget.cpp b/plasma/widgets/scrollwidget.cpp index fdb2f427..6106feaa 100644 --- a/plasma/widgets/scrollwidget.cpp +++ b/plasma/widgets/scrollwidget.cpp @@ -1584,5 +1584,5 @@ bool ScrollWidget::hasOverShoot() const } // namespace Plasma -#include +#include "moc_scrollwidget.cpp" diff --git a/plasma/widgets/separator.cpp b/plasma/widgets/separator.cpp index 6af93b85..96024204 100644 --- a/plasma/widgets/separator.cpp +++ b/plasma/widgets/separator.cpp @@ -96,4 +96,4 @@ QSizeF Separator::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const } // Plasma namespace -#include "separator.moc" +#include "moc_separator.cpp" diff --git a/plasma/widgets/signalplotter.cpp b/plasma/widgets/signalplotter.cpp index 8e9e2941..d63e45c0 100644 --- a/plasma/widgets/signalplotter.cpp +++ b/plasma/widgets/signalplotter.cpp @@ -1104,5 +1104,5 @@ QString SignalPlotter::lastValueAsString(uint i) const } // Plasma namespace -#include "signalplotter.moc" +#include "moc_signalplotter.cpp" diff --git a/plasma/widgets/slider.cpp b/plasma/widgets/slider.cpp index bfad249b..c3021107 100644 --- a/plasma/widgets/slider.cpp +++ b/plasma/widgets/slider.cpp @@ -251,5 +251,5 @@ QSlider *Slider::nativeWidget() const } // namespace Plasma -#include +#include "moc_slider.cpp" diff --git a/plasma/widgets/spinbox.cpp b/plasma/widgets/spinbox.cpp index 9c1c3fe6..7ea7a6a5 100644 --- a/plasma/widgets/spinbox.cpp +++ b/plasma/widgets/spinbox.cpp @@ -228,5 +228,5 @@ void SpinBox::focusOutEvent(QFocusEvent *event) } // namespace Plasma -#include +#include "moc_spinbox.cpp" diff --git a/plasma/widgets/svgwidget.cpp b/plasma/widgets/svgwidget.cpp index d55a9985..f22e490a 100644 --- a/plasma/widgets/svgwidget.cpp +++ b/plasma/widgets/svgwidget.cpp @@ -139,4 +139,4 @@ QSizeF SvgWidget::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const } // Plasma namespace -#include "svgwidget.moc" +#include "moc_svgwidget.cpp" diff --git a/plasma/widgets/tabbar.cpp b/plasma/widgets/tabbar.cpp index 191c67cb..b4230e9a 100644 --- a/plasma/widgets/tabbar.cpp +++ b/plasma/widgets/tabbar.cpp @@ -678,5 +678,5 @@ QGraphicsWidget *TabBar::lastPositionWidget() const } // namespace Plasma -#include +#include "moc_tabbar.cpp" diff --git a/plasma/widgets/textbrowser.cpp b/plasma/widgets/textbrowser.cpp index 870d570e..dc0aa239 100644 --- a/plasma/widgets/textbrowser.cpp +++ b/plasma/widgets/textbrowser.cpp @@ -189,5 +189,5 @@ void TextBrowser::changeEvent(QEvent *event) } // namespace Plasma -#include +#include "moc_textbrowser.cpp" diff --git a/plasma/widgets/textedit.cpp b/plasma/widgets/textedit.cpp index 271f6cbf..f99b0813 100644 --- a/plasma/widgets/textedit.cpp +++ b/plasma/widgets/textedit.cpp @@ -203,5 +203,5 @@ void TextEdit::focusOutEvent(QFocusEvent *event) } // namespace Plasma -#include +#include "moc_textedit.cpp" diff --git a/plasma/widgets/toolbutton.cpp b/plasma/widgets/toolbutton.cpp index f7b5a85a..2e24c4b5 100644 --- a/plasma/widgets/toolbutton.cpp +++ b/plasma/widgets/toolbutton.cpp @@ -452,5 +452,5 @@ QSizeF ToolButton::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const } // namespace Plasma -#include +#include "moc_toolbutton.cpp" diff --git a/plasma/widgets/treeview.cpp b/plasma/widgets/treeview.cpp index ca770660..f73b26bc 100644 --- a/plasma/widgets/treeview.cpp +++ b/plasma/widgets/treeview.cpp @@ -84,5 +84,5 @@ QTreeView *TreeView::nativeWidget() const } -#include +#include "moc_treeview.cpp" diff --git a/plasma/widgets/videowidget.cpp b/plasma/widgets/videowidget.cpp index 04b3529a..30452da2 100644 --- a/plasma/widgets/videowidget.cpp +++ b/plasma/widgets/videowidget.cpp @@ -628,5 +628,5 @@ void VideoWidget::hoverMoveEvent(QGraphicsSceneHoverEvent *event) } // namespace Plasma -#include +#include "moc_videowidget.cpp" diff --git a/plasma/widgets/webview.cpp b/plasma/widgets/webview.cpp index 11ebc8f9..8b5614fd 100644 --- a/plasma/widgets/webview.cpp +++ b/plasma/widgets/webview.cpp @@ -333,5 +333,5 @@ void WebViewPrivate::loadingFinished(bool success) } // namespace Plasma -#include "webview.moc" +#include "moc_webview.cpp" diff --git a/security/crypto/certexport.cpp b/security/crypto/certexport.cpp index 6476c4dd..69e87593 100644 --- a/security/crypto/certexport.cpp +++ b/security/crypto/certexport.cpp @@ -154,5 +154,5 @@ void KCertExport::slotTextChanged(const QString& x) { } -#include "certexport.moc" +#include "moc_certexport.cpp" diff --git a/security/crypto/crypto.cpp b/security/crypto/crypto.cpp index d2af2b3e..761b17c2 100644 --- a/security/crypto/crypto.cpp +++ b/security/crypto/crypto.cpp @@ -2405,4 +2405,4 @@ bool noneDef, noneHost; } -#include "crypto.moc" +#include "moc_crypto.cpp" diff --git a/security/crypto/kdatetimedlg.cpp b/security/crypto/kdatetimedlg.cpp index 08870c9d..ea279813 100644 --- a/security/crypto/kdatetimedlg.cpp +++ b/security/crypto/kdatetimedlg.cpp @@ -116,5 +116,5 @@ void KDateTimeDlg::setDateTime(const QDateTime& qdatetime) { } -#include "kdatetimedlg.moc" +#include "moc_kdatetimedlg.cpp" diff --git a/security/kcert/kcertpart.cc b/security/kcert/kcertpart.cc index 3c8cdad3..e83a0f08 100644 --- a/security/kcert/kcertpart.cc +++ b/security/kcert/kcertpart.cc @@ -887,4 +887,4 @@ KAboutData *KCertPart::createAboutData() return new KAboutData("KCertPart", 0, ki18n("KDE Certificate Part"), "1.0"); } -#include "kcertpart.moc" +#include "moc_kcertpart.cpp" diff --git a/solid/solid/acadapter.cpp b/solid/solid/acadapter.cpp index 02a1eed9..e3ab7921 100644 --- a/solid/solid/acadapter.cpp +++ b/solid/solid/acadapter.cpp @@ -42,4 +42,4 @@ bool Solid::AcAdapter::isPlugged() const return_SOLID_CALL(Ifaces::AcAdapter *, d->backendObject(), false, isPlugged()); } -#include "acadapter.moc" +#include "moc_acadapter.cpp" diff --git a/solid/solid/audiointerface.cpp b/solid/solid/audiointerface.cpp index ddf6cbc9..98e42b2b 100644 --- a/solid/solid/audiointerface.cpp +++ b/solid/solid/audiointerface.cpp @@ -67,4 +67,4 @@ Solid::AudioInterface::SoundcardType Solid::AudioInterface::soundcardType() cons return_SOLID_CALL(Ifaces::AudioInterface *, d->backendObject(), InternalSoundcard, soundcardType()); } -#include "audiointerface.moc" +#include "moc_audiointerface.cpp" diff --git a/solid/solid/backends/fakehw/fakeacadapter.cpp b/solid/solid/backends/fakehw/fakeacadapter.cpp index feb56e4c..76f9ab01 100644 --- a/solid/solid/backends/fakehw/fakeacadapter.cpp +++ b/solid/solid/backends/fakehw/fakeacadapter.cpp @@ -49,4 +49,4 @@ void FakeAcAdapter::unplug() emit plugStateChanged(false, fakeDevice()->udi()); } -#include "backends/fakehw/fakeacadapter.moc" +#include "backends/fakehw/moc_fakeacadapter.cpp" diff --git a/solid/solid/backends/fakehw/fakeaudiointerface.cpp b/solid/solid/backends/fakehw/fakeaudiointerface.cpp index 8ff967a4..3478d4c3 100644 --- a/solid/solid/backends/fakehw/fakeaudiointerface.cpp +++ b/solid/solid/backends/fakehw/fakeaudiointerface.cpp @@ -121,4 +121,4 @@ Solid::AudioInterface::SoundcardType FakeAudioInterface::soundcardType() const return Solid::AudioInterface::InternalSoundcard; } -#include "backends/fakehw/fakeaudiointerface.moc" +#include "backends/fakehw/moc_fakeaudiointerface.cpp" diff --git a/solid/solid/backends/fakehw/fakebattery.cpp b/solid/solid/backends/fakehw/fakebattery.cpp index 147cea0a..fe6e3a8d 100644 --- a/solid/solid/backends/fakehw/fakebattery.cpp +++ b/solid/solid/backends/fakehw/fakebattery.cpp @@ -150,4 +150,4 @@ void FakeBattery::setChargeLevel(int newLevel) emit chargePercentChanged(chargePercent(), fakeDevice()->udi()); } -#include "backends/fakehw/fakebattery.moc" +#include "backends/fakehw/moc_fakebattery.cpp" diff --git a/solid/solid/backends/fakehw/fakeblock.cpp b/solid/solid/backends/fakehw/fakeblock.cpp index 91415a3d..7bdfa521 100644 --- a/solid/solid/backends/fakehw/fakeblock.cpp +++ b/solid/solid/backends/fakehw/fakeblock.cpp @@ -48,4 +48,4 @@ QString FakeBlock::device() const return fakeDevice()->property("device").toString(); } -#include "backends/fakehw/fakeblock.moc" +#include "backends/fakehw/moc_fakeblock.cpp" diff --git a/solid/solid/backends/fakehw/fakebutton.cpp b/solid/solid/backends/fakehw/fakebutton.cpp index 6be4fcc0..f1136a22 100644 --- a/solid/solid/backends/fakehw/fakebutton.cpp +++ b/solid/solid/backends/fakehw/fakebutton.cpp @@ -71,4 +71,4 @@ void FakeButton::press() emit pressed(type(), fakeDevice()->udi()); } -#include "backends/fakehw/fakebutton.moc" +#include "backends/fakehw/moc_fakebutton.cpp" diff --git a/solid/solid/backends/fakehw/fakecamera.cpp b/solid/solid/backends/fakehw/fakecamera.cpp index 7358c6d4..2b39cfb8 100644 --- a/solid/solid/backends/fakehw/fakecamera.cpp +++ b/solid/solid/backends/fakehw/fakecamera.cpp @@ -60,4 +60,4 @@ QVariant Solid::Backends::Fake::FakeCamera::driverHandle(const QString &driver) return QVariant(); } -#include "backends/fakehw/fakecamera.moc" +#include "backends/fakehw/moc_fakecamera.cpp" diff --git a/solid/solid/backends/fakehw/fakecdrom.cpp b/solid/solid/backends/fakehw/fakecdrom.cpp index f5a906a7..f5c54d1c 100644 --- a/solid/solid/backends/fakehw/fakecdrom.cpp +++ b/solid/solid/backends/fakehw/fakecdrom.cpp @@ -98,4 +98,4 @@ bool FakeCdrom::eject() return false; } -#include "backends/fakehw/fakecdrom.moc" +#include "backends/fakehw/moc_fakecdrom.cpp" diff --git a/solid/solid/backends/fakehw/fakedevice.cpp b/solid/solid/backends/fakehw/fakedevice.cpp index ba233e45..67058a83 100644 --- a/solid/solid/backends/fakehw/fakedevice.cpp +++ b/solid/solid/backends/fakehw/fakedevice.cpp @@ -335,5 +335,5 @@ QObject *FakeDevice::createDeviceInterface(const Solid::DeviceInterface::Type &t return iface; } -#include "backends/fakehw/fakedevice.moc" -#include "backends/fakehw/fakedevice_p.moc" +#include "backends/fakehw/moc_fakedevice.cpp" +#include "backends/fakehw/moc_fakedevice_p.cpp" diff --git a/solid/solid/backends/fakehw/fakedeviceinterface.cpp b/solid/solid/backends/fakehw/fakedeviceinterface.cpp index 761c6c56..c78eb2bf 100644 --- a/solid/solid/backends/fakehw/fakedeviceinterface.cpp +++ b/solid/solid/backends/fakehw/fakedeviceinterface.cpp @@ -30,4 +30,4 @@ FakeDeviceInterface::~FakeDeviceInterface() { } -#include "backends/fakehw/fakedeviceinterface.moc" +#include "backends/fakehw/moc_fakedeviceinterface.cpp" diff --git a/solid/solid/backends/fakehw/fakedvbinterface.cpp b/solid/solid/backends/fakehw/fakedvbinterface.cpp index be770bcd..4b4dcd90 100644 --- a/solid/solid/backends/fakehw/fakedvbinterface.cpp +++ b/solid/solid/backends/fakehw/fakedvbinterface.cpp @@ -74,4 +74,4 @@ int FakeDvbInterface::deviceIndex() const return fakeDevice()->property("deviceIndex").toInt(); } -#include "backends/fakehw/fakedvbinterface.moc" +#include "backends/fakehw/moc_fakedvbinterface.cpp" diff --git a/solid/solid/backends/fakehw/fakegenericinterface.cpp b/solid/solid/backends/fakehw/fakegenericinterface.cpp index 2efe03d4..07ef4980 100644 --- a/solid/solid/backends/fakehw/fakegenericinterface.cpp +++ b/solid/solid/backends/fakehw/fakegenericinterface.cpp @@ -50,4 +50,4 @@ bool FakeGenericInterface::propertyExists(const QString &key) const return fakeDevice()->propertyExists(key); } -#include "backends/fakehw/fakegenericinterface.moc" +#include "backends/fakehw/moc_fakegenericinterface.cpp" diff --git a/solid/solid/backends/fakehw/fakemanager.cpp b/solid/solid/backends/fakehw/fakemanager.cpp index 826dcd73..f32c1c4c 100644 --- a/solid/solid/backends/fakehw/fakemanager.cpp +++ b/solid/solid/backends/fakehw/fakemanager.cpp @@ -282,4 +282,4 @@ FakeDevice *FakeManager::parseDeviceElement(const QDomElement &deviceElement) return device; } -#include "backends/fakehw/fakemanager.moc" +#include "backends/fakehw/moc_fakemanager.cpp" diff --git a/solid/solid/backends/fakehw/fakenetworkinterface.cpp b/solid/solid/backends/fakehw/fakenetworkinterface.cpp index 3e5d8bd2..b9ff128f 100644 --- a/solid/solid/backends/fakehw/fakenetworkinterface.cpp +++ b/solid/solid/backends/fakehw/fakenetworkinterface.cpp @@ -52,4 +52,4 @@ qulonglong FakeNetworkInterface::macAddress() const return fakeDevice()->property("macAddress").toULongLong(); } -#include "backends/fakehw/fakenetworkinterface.moc" +#include "backends/fakehw/moc_fakenetworkinterface.cpp" diff --git a/solid/solid/backends/fakehw/fakeopticaldisc.cpp b/solid/solid/backends/fakehw/fakeopticaldisc.cpp index 61a0f81b..abaf69dc 100644 --- a/solid/solid/backends/fakehw/fakeopticaldisc.cpp +++ b/solid/solid/backends/fakehw/fakeopticaldisc.cpp @@ -157,4 +157,4 @@ qulonglong FakeOpticalDisc::capacity() const return fakeDevice()->property("capacity").toULongLong(); } -#include "backends/fakehw/fakeopticaldisc.moc" +#include "backends/fakehw/moc_fakeopticaldisc.cpp" diff --git a/solid/solid/backends/fakehw/fakeportablemediaplayer.cpp b/solid/solid/backends/fakehw/fakeportablemediaplayer.cpp index 5eec428d..6a522f16 100644 --- a/solid/solid/backends/fakehw/fakeportablemediaplayer.cpp +++ b/solid/solid/backends/fakehw/fakeportablemediaplayer.cpp @@ -53,4 +53,4 @@ QVariant Solid::Backends::Fake::FakePortableMediaPlayer::driverHandle(const QStr return QVariant(); } -#include "backends/fakehw/fakeportablemediaplayer.moc" +#include "backends/fakehw/moc_fakeportablemediaplayer.cpp" diff --git a/solid/solid/backends/fakehw/fakeprocessor.cpp b/solid/solid/backends/fakehw/fakeprocessor.cpp index 8055e57a..a79313a1 100644 --- a/solid/solid/backends/fakehw/fakeprocessor.cpp +++ b/solid/solid/backends/fakehw/fakeprocessor.cpp @@ -84,4 +84,4 @@ Solid::Processor::InstructionSets FakeProcessor::instructionSets() const } -#include "backends/fakehw/fakeprocessor.moc" +#include "backends/fakehw/moc_fakeprocessor.cpp" diff --git a/solid/solid/backends/fakehw/fakesmartcardreader.cpp b/solid/solid/backends/fakehw/fakesmartcardreader.cpp index 65e1fa1b..ca88a15e 100644 --- a/solid/solid/backends/fakehw/fakesmartcardreader.cpp +++ b/solid/solid/backends/fakehw/fakesmartcardreader.cpp @@ -46,4 +46,4 @@ Solid::SmartCardReader::ReaderType FakeSmartCardReader::readerType() const } } -#include "backends/fakehw/fakesmartcardreader.moc" +#include "backends/fakehw/moc_fakesmartcardreader.cpp" diff --git a/solid/solid/backends/fakehw/fakestorage.cpp b/solid/solid/backends/fakehw/fakestorage.cpp index 93a86102..3161e450 100644 --- a/solid/solid/backends/fakehw/fakestorage.cpp +++ b/solid/solid/backends/fakehw/fakestorage.cpp @@ -120,4 +120,4 @@ qulonglong FakeStorage::size() const return fakeDevice()->property("size").toULongLong(); } -#include "backends/fakehw/fakestorage.moc" +#include "backends/fakehw/moc_fakestorage.cpp" diff --git a/solid/solid/backends/fakehw/fakestorageaccess.cpp b/solid/solid/backends/fakehw/fakestorageaccess.cpp index 189eb885..31e89f8c 100644 --- a/solid/solid/backends/fakehw/fakestorageaccess.cpp +++ b/solid/solid/backends/fakehw/fakestorageaccess.cpp @@ -79,4 +79,4 @@ void Solid::Backends::Fake::FakeStorageAccess::onPropertyChanged(const QMapsoundcardType(); } -#include "backends/udev/udevaudiointerface.moc" +#include "backends/udev/moc_udevaudiointerface.cpp" diff --git a/solid/solid/backends/udev/udevblock.cpp b/solid/solid/backends/udev/udevblock.cpp index 2aa43d96..63c10049 100644 --- a/solid/solid/backends/udev/udevblock.cpp +++ b/solid/solid/backends/udev/udevblock.cpp @@ -46,4 +46,4 @@ QString Block::device() const return m_device->property("DEVNAME").toString(); } -#include "backends/udev/udevblock.moc" +#include "backends/udev/moc_udevblock.cpp" diff --git a/solid/solid/backends/udev/udevcamera.cpp b/solid/solid/backends/udev/udevcamera.cpp index 659bc68c..5f8fcc25 100644 --- a/solid/solid/backends/udev/udevcamera.cpp +++ b/solid/solid/backends/udev/udevcamera.cpp @@ -72,4 +72,4 @@ QVariant Camera::driverHandle(const QString &driver) const return QVariant(); } -#include "backends/udev/udevcamera.moc" +#include "backends/udev/moc_udevcamera.cpp" diff --git a/solid/solid/backends/udev/udevdeviceinterface.cpp b/solid/solid/backends/udev/udevdeviceinterface.cpp index 7bcaf16a..5a40c5be 100644 --- a/solid/solid/backends/udev/udevdeviceinterface.cpp +++ b/solid/solid/backends/udev/udevdeviceinterface.cpp @@ -31,4 +31,4 @@ DeviceInterface::~DeviceInterface() { } -#include "backends/udev/udevdeviceinterface.moc" +#include "backends/udev/moc_udevdeviceinterface.cpp" diff --git a/solid/solid/backends/udev/udevdvbinterface.cpp b/solid/solid/backends/udev/udevdvbinterface.cpp index 153eed1b..1c217be1 100644 --- a/solid/solid/backends/udev/udevdvbinterface.cpp +++ b/solid/solid/backends/udev/udevdvbinterface.cpp @@ -90,4 +90,4 @@ int DvbInterface::deviceIndex() const return -1; } -#include "backends/udev/udevdvbinterface.moc" +#include "backends/udev/moc_udevdvbinterface.cpp" diff --git a/solid/solid/backends/udev/udevgenericinterface.cpp b/solid/solid/backends/udev/udevgenericinterface.cpp index b7b1b441..422fdffe 100644 --- a/solid/solid/backends/udev/udevgenericinterface.cpp +++ b/solid/solid/backends/udev/udevgenericinterface.cpp @@ -55,4 +55,4 @@ bool GenericInterface::propertyExists(const QString &key) const return m_device->propertyExists(key); } -#include "backends/udev/udevgenericinterface.moc" +#include "backends/udev/moc_udevgenericinterface.cpp" diff --git a/solid/solid/backends/udev/udevnetworkinterface.cpp b/solid/solid/backends/udev/udevnetworkinterface.cpp index cf9c7379..4ca211cf 100644 --- a/solid/solid/backends/udev/udevnetworkinterface.cpp +++ b/solid/solid/backends/udev/udevnetworkinterface.cpp @@ -118,4 +118,4 @@ qulonglong NetworkInterface::macAddress() const return mac_address; } -#include "backends/udev/udevnetworkinterface.moc" +#include "backends/udev/moc_udevnetworkinterface.cpp" diff --git a/solid/solid/backends/udev/udevportablemediaplayer.cpp b/solid/solid/backends/udev/udevportablemediaplayer.cpp index 284aa10a..ed2520fa 100644 --- a/solid/solid/backends/udev/udevportablemediaplayer.cpp +++ b/solid/solid/backends/udev/udevportablemediaplayer.cpp @@ -149,4 +149,4 @@ QString PortableMediaPlayer::mediaPlayerInfoFilePath() const return filename; } -#include "backends/udev/udevportablemediaplayer.moc" +#include "backends/udev/moc_udevportablemediaplayer.cpp" diff --git a/solid/solid/backends/udev/udevprocessor.cpp b/solid/solid/backends/udev/udevprocessor.cpp index 9e07d7b7..966adfe6 100644 --- a/solid/solid/backends/udev/udevprocessor.cpp +++ b/solid/solid/backends/udev/udevprocessor.cpp @@ -106,4 +106,4 @@ QString Processor::prefix() const return QString(); } -#include "backends/udev/udevprocessor.moc" +#include "backends/udev/moc_udevprocessor.cpp" diff --git a/solid/solid/backends/udev/udevserialinterface.cpp b/solid/solid/backends/udev/udevserialinterface.cpp index 3408cfb9..3919472d 100644 --- a/solid/solid/backends/udev/udevserialinterface.cpp +++ b/solid/solid/backends/udev/udevserialinterface.cpp @@ -68,4 +68,4 @@ int SerialInterface::port() const return m_portnum; } -#include "backends/udev/udevserialinterface.moc" +#include "backends/udev/moc_udevserialinterface.cpp" diff --git a/solid/solid/backends/udev/udevvideo.cpp b/solid/solid/backends/udev/udevvideo.cpp index 67af6bf3..03dcf10d 100644 --- a/solid/solid/backends/udev/udevvideo.cpp +++ b/solid/solid/backends/udev/udevvideo.cpp @@ -69,4 +69,4 @@ QVariant Video::driverHandle(const QString &driver) const return QVariant(); } -#include "backends/udev/udevvideo.moc" +#include "backends/udev/moc_udevvideo.cpp" diff --git a/solid/solid/backends/udisks/udisksgenericinterface.cpp b/solid/solid/backends/udisks/udisksgenericinterface.cpp index 049452b2..ff3b684b 100644 --- a/solid/solid/backends/udisks/udisksgenericinterface.cpp +++ b/solid/solid/backends/udisks/udisksgenericinterface.cpp @@ -54,4 +54,4 @@ bool GenericInterface::propertyExists(const QString &key) const return m_device->propertyExists(key); } -#include "backends/udisks/udisksgenericinterface.moc" +#include "backends/udisks/moc_udisksgenericinterface.cpp" diff --git a/solid/solid/backends/udisks/udisksmanager.cpp b/solid/solid/backends/udisks/udisksmanager.cpp index e18cc66c..0a0c6737 100644 --- a/solid/solid/backends/udisks/udisksmanager.cpp +++ b/solid/solid/backends/udisks/udisksmanager.cpp @@ -267,4 +267,4 @@ const QStringList &UDisksManager::deviceCache() } -#include "backends/udisks/udisksmanager.moc" +#include "backends/udisks/moc_udisksmanager.cpp" diff --git a/solid/solid/backends/udisks/udisksstorageaccess.cpp b/solid/solid/backends/udisks/udisksstorageaccess.cpp index 63470ecf..e58c50ab 100644 --- a/solid/solid/backends/udisks/udisksstorageaccess.cpp +++ b/solid/solid/backends/udisks/udisksstorageaccess.cpp @@ -387,4 +387,4 @@ bool UDisksStorageAccess::callCryptoTeardown(bool actOnParent) SLOT(slotDBusError(QDBusError))); } -#include "backends/udisks/udisksstorageaccess.moc" +#include "backends/udisks/moc_udisksstorageaccess.cpp" diff --git a/solid/solid/backends/upower/upoweracadapter.cpp b/solid/solid/backends/upower/upoweracadapter.cpp index 61ceb375..cf4a52a6 100644 --- a/solid/solid/backends/upower/upoweracadapter.cpp +++ b/solid/solid/backends/upower/upoweracadapter.cpp @@ -58,4 +58,4 @@ void AcAdapter::updateCache() m_isPlugged = isPlugged(); } -#include "backends/upower/upoweracadapter.moc" +#include "backends/upower/moc_upoweracadapter.cpp" diff --git a/solid/solid/backends/upower/upowerbattery.cpp b/solid/solid/backends/upower/upowerbattery.cpp index 7b5bdc4f..a5603044 100644 --- a/solid/solid/backends/upower/upowerbattery.cpp +++ b/solid/solid/backends/upower/upowerbattery.cpp @@ -165,4 +165,4 @@ void Battery::updateCache() m_isPowerSupply = isPowerSupply(); } -#include "backends/upower/upowerbattery.moc" +#include "backends/upower/moc_upowerbattery.cpp" diff --git a/solid/solid/backends/upower/upowergenericinterface.cpp b/solid/solid/backends/upower/upowergenericinterface.cpp index 217f34b5..735b9059 100644 --- a/solid/solid/backends/upower/upowergenericinterface.cpp +++ b/solid/solid/backends/upower/upowergenericinterface.cpp @@ -48,4 +48,4 @@ bool GenericInterface::propertyExists(const QString &key) const return m_device.data()->propertyExists(key); } -#include "backends/upower/upowergenericinterface.moc" +#include "backends/upower/moc_upowergenericinterface.cpp" diff --git a/solid/solid/backends/upower/upowermanager.cpp b/solid/solid/backends/upower/upowermanager.cpp index 5012f0b7..2ca8fb04 100644 --- a/solid/solid/backends/upower/upowermanager.cpp +++ b/solid/solid/backends/upower/upowermanager.cpp @@ -178,4 +178,4 @@ void UPowerManager::onDeviceRemoved(const QDBusObjectPath &path) emit deviceRemoved(path.path()); } -#include "backends/upower/upowermanager.moc" +#include "backends/upower/moc_upowermanager.cpp" diff --git a/solid/solid/battery.cpp b/solid/solid/battery.cpp index f8e20485..4871ff3f 100644 --- a/solid/solid/battery.cpp +++ b/solid/solid/battery.cpp @@ -90,4 +90,4 @@ Solid::Battery::ChargeState Solid::Battery::chargeState() const return_SOLID_CALL(Ifaces::Battery *, d->backendObject(), NoCharge, chargeState()); } -#include "battery.moc" +#include "moc_battery.cpp" diff --git a/solid/solid/block.cpp b/solid/solid/block.cpp index d2327879..150fc003 100644 --- a/solid/solid/block.cpp +++ b/solid/solid/block.cpp @@ -52,4 +52,4 @@ QString Solid::Block::device() const return_SOLID_CALL(Ifaces::Block *, d->backendObject(), QString(), device()); } -#include "block.moc" +#include "moc_block.cpp" diff --git a/solid/solid/button.cpp b/solid/solid/button.cpp index 8d9de0d5..30e031a5 100644 --- a/solid/solid/button.cpp +++ b/solid/solid/button.cpp @@ -55,4 +55,4 @@ bool Solid::Button::stateValue() const return_SOLID_CALL(Ifaces::Button *, d->backendObject(), false, stateValue()); } -#include "button.moc" +#include "moc_button.cpp" diff --git a/solid/solid/camera.cpp b/solid/solid/camera.cpp index 4000bf48..3ed04092 100644 --- a/solid/solid/camera.cpp +++ b/solid/solid/camera.cpp @@ -52,5 +52,5 @@ QVariant Solid::Camera::driverHandle(const QString &driver) const return_SOLID_CALL(Ifaces::Camera *, d->backendObject(), QVariant(), driverHandle(driver)); } -#include "camera.moc" +#include "moc_camera.cpp" diff --git a/solid/solid/device.cpp b/solid/solid/device.cpp index 20044d70..57cca4ac 100644 --- a/solid/solid/device.cpp +++ b/solid/solid/device.cpp @@ -324,4 +324,4 @@ void Solid::DevicePrivate::setInterface(const DeviceInterface::Type &type, Devic m_ifaces[type] = interface; } -#include "device_p.moc" +#include "moc_device_p.cpp" diff --git a/solid/solid/deviceinterface.cpp b/solid/solid/deviceinterface.cpp index af7155b7..c789db9e 100644 --- a/solid/solid/deviceinterface.cpp +++ b/solid/solid/deviceinterface.cpp @@ -146,4 +146,4 @@ void Solid::DeviceInterfacePrivate::setDevicePrivate(DevicePrivate *devicePrivat m_devicePrivate = devicePrivate; } -#include "deviceinterface.moc" +#include "moc_deviceinterface.cpp" diff --git a/solid/solid/devicemanager.cpp b/solid/solid/devicemanager.cpp index a4651692..48c92547 100644 --- a/solid/solid/devicemanager.cpp +++ b/solid/solid/devicemanager.cpp @@ -288,6 +288,6 @@ void Solid::DeviceManagerStorage::ensureManagerCreated() } } -#include "devicenotifier.moc" -#include "devicemanager_p.moc" +#include "moc_devicenotifier.cpp" +#include "moc_devicemanager_p.cpp" diff --git a/solid/solid/dvbinterface.cpp b/solid/solid/dvbinterface.cpp index c6719e03..b32c97c6 100644 --- a/solid/solid/dvbinterface.cpp +++ b/solid/solid/dvbinterface.cpp @@ -58,4 +58,4 @@ int Solid::DvbInterface::deviceIndex() const return_SOLID_CALL(Ifaces::DvbInterface *, d->backendObject(), -1, deviceIndex()); } -#include "dvbinterface.moc" +#include "moc_dvbinterface.cpp" diff --git a/solid/solid/genericinterface.cpp b/solid/solid/genericinterface.cpp index 826e01c0..c18411fe 100644 --- a/solid/solid/genericinterface.cpp +++ b/solid/solid/genericinterface.cpp @@ -60,4 +60,4 @@ bool Solid::GenericInterface::propertyExists(const QString &key) const return_SOLID_CALL(Ifaces::GenericInterface *, d->backendObject(), false, propertyExists(key)); } -#include "genericinterface.moc" +#include "moc_genericinterface.cpp" diff --git a/solid/solid/ifaces/device.cpp b/solid/solid/ifaces/device.cpp index 4689b5e0..22b72856 100644 --- a/solid/solid/ifaces/device.cpp +++ b/solid/solid/ifaces/device.cpp @@ -74,4 +74,4 @@ QString Solid::Ifaces::Device::deviceDBusPath() const return QString("/org/kde/solid/Device_") + QString::fromLatin1(encodedUdi); } -#include "ifaces/device.moc" +#include "ifaces/moc_device.cpp" diff --git a/solid/solid/ifaces/devicemanager.cpp b/solid/solid/ifaces/devicemanager.cpp index b31906e0..9ab01308 100644 --- a/solid/solid/ifaces/devicemanager.cpp +++ b/solid/solid/ifaces/devicemanager.cpp @@ -32,4 +32,4 @@ Solid::Ifaces::DeviceManager::~DeviceManager() } -#include "ifaces/devicemanager.moc" +#include "ifaces/moc_devicemanager.cpp" diff --git a/solid/solid/networking.cpp b/solid/solid/networking.cpp index 6c3a5f99..81e153b1 100644 --- a/solid/solid/networking.cpp +++ b/solid/solid/networking.cpp @@ -155,5 +155,5 @@ void Solid::Networking::setDisconnectPolicy( Solid::Networking::ManagementPolicy globalNetworkManager->disconnectPolicy = policy; } -#include "networking_p.moc" -#include "networking.moc" +#include "moc_networking_p.cpp" +#include "moc_networking.cpp" diff --git a/solid/solid/networkinterface.cpp b/solid/solid/networkinterface.cpp index 395652af..1132bffc 100644 --- a/solid/solid/networkinterface.cpp +++ b/solid/solid/networkinterface.cpp @@ -58,4 +58,4 @@ qulonglong Solid::NetworkInterface::macAddress() const return_SOLID_CALL(Ifaces::NetworkInterface *, d->backendObject(), 0, macAddress()); } -#include "networkinterface.moc" +#include "moc_networkinterface.cpp" diff --git a/solid/solid/networkshare.cpp b/solid/solid/networkshare.cpp index 1287fc98..0801da8e 100644 --- a/solid/solid/networkshare.cpp +++ b/solid/solid/networkshare.cpp @@ -46,5 +46,5 @@ QUrl Solid::NetworkShare::url() const return_SOLID_CALL(Ifaces::NetworkShare *, d->backendObject(), QUrl(), url()); } -#include "networkshare.moc" +#include "moc_networkshare.cpp" diff --git a/solid/solid/opticaldisc.cpp b/solid/solid/opticaldisc.cpp index 84c3fe5a..c8aa40e3 100644 --- a/solid/solid/opticaldisc.cpp +++ b/solid/solid/opticaldisc.cpp @@ -70,4 +70,4 @@ qulonglong Solid::OpticalDisc::capacity() const return_SOLID_CALL(Ifaces::OpticalDisc *, d->backendObject(), 0, capacity()); } -#include "opticaldisc.moc" +#include "moc_opticaldisc.cpp" diff --git a/solid/solid/opticaldrive.cpp b/solid/solid/opticaldrive.cpp index 0b0e9b40..24a7a781 100644 --- a/solid/solid/opticaldrive.cpp +++ b/solid/solid/opticaldrive.cpp @@ -70,4 +70,4 @@ bool Solid::OpticalDrive::eject() return_SOLID_CALL(Ifaces::OpticalDrive *, d->backendObject(), false, eject()); } -#include "opticaldrive.moc" +#include "moc_opticaldrive.cpp" diff --git a/solid/solid/portablemediaplayer.cpp b/solid/solid/portablemediaplayer.cpp index b399b1c4..0c7813fb 100644 --- a/solid/solid/portablemediaplayer.cpp +++ b/solid/solid/portablemediaplayer.cpp @@ -54,4 +54,4 @@ QVariant Solid::PortableMediaPlayer::driverHandle(const QString &driver) const return_SOLID_CALL(Ifaces::PortableMediaPlayer *, d->backendObject(), QVariant(), driverHandle(driver)); } -#include "portablemediaplayer.moc" +#include "moc_portablemediaplayer.cpp" diff --git a/solid/solid/powermanagement.cpp b/solid/solid/powermanagement.cpp index e185a78f..387f6d52 100644 --- a/solid/solid/powermanagement.cpp +++ b/solid/solid/powermanagement.cpp @@ -299,6 +299,6 @@ void Solid::PowerManagementPrivate::slotServiceUnregistered(const QString &servi } } -#include "powermanagement_p.moc" -#include "powermanagement.moc" +#include "moc_powermanagement_p.cpp" +#include "moc_powermanagement.cpp" diff --git a/solid/solid/processor.cpp b/solid/solid/processor.cpp index 70acbd66..9f86ec84 100644 --- a/solid/solid/processor.cpp +++ b/solid/solid/processor.cpp @@ -59,4 +59,4 @@ Solid::Processor::InstructionSets Solid::Processor::instructionSets() const return_SOLID_CALL(Ifaces::Processor *, d->backendObject(), InstructionSets(), instructionSets()); } -#include "processor.moc" +#include "moc_processor.cpp" diff --git a/solid/solid/serialinterface.cpp b/solid/solid/serialinterface.cpp index d361800f..08689a48 100644 --- a/solid/solid/serialinterface.cpp +++ b/solid/solid/serialinterface.cpp @@ -54,4 +54,4 @@ int Solid::SerialInterface::port() const return_SOLID_CALL(Ifaces::SerialInterface *, d->backendObject(), -1, port()); } -#include "serialinterface.moc" +#include "moc_serialinterface.cpp" diff --git a/solid/solid/smartcardreader.cpp b/solid/solid/smartcardreader.cpp index 1427d6ef..238e53fe 100644 --- a/solid/solid/smartcardreader.cpp +++ b/solid/solid/smartcardreader.cpp @@ -40,5 +40,5 @@ Solid::SmartCardReader::ReaderType Solid::SmartCardReader::readerType() const return_SOLID_CALL(Ifaces::SmartCardReader *, d->backendObject(), CardReader, readerType()); } -#include "smartcardreader.moc" +#include "moc_smartcardreader.cpp" diff --git a/solid/solid/storageaccess.cpp b/solid/solid/storageaccess.cpp index cfb37def..c29f7437 100644 --- a/solid/solid/storageaccess.cpp +++ b/solid/solid/storageaccess.cpp @@ -92,4 +92,4 @@ bool Solid::StorageAccess::isIgnored() const return_SOLID_CALL(Ifaces::StorageAccess *, d->backendObject(), true, isIgnored()); } -#include "storageaccess.moc" +#include "moc_storageaccess.cpp" diff --git a/solid/solid/storagedrive.cpp b/solid/solid/storagedrive.cpp index 2b92a3e9..164cf039 100644 --- a/solid/solid/storagedrive.cpp +++ b/solid/solid/storagedrive.cpp @@ -90,5 +90,5 @@ bool Solid::StorageDrive::isInUse() const return inUse; } -#include "storagedrive.moc" +#include "moc_storagedrive.cpp" diff --git a/solid/solid/storagevolume.cpp b/solid/solid/storagevolume.cpp index da3ed45b..1c99788b 100644 --- a/solid/solid/storagevolume.cpp +++ b/solid/solid/storagevolume.cpp @@ -90,4 +90,4 @@ Solid::Device Solid::StorageVolume::encryptedContainer() const } } -#include "storagevolume.moc" +#include "moc_storagevolume.cpp" diff --git a/solid/solid/video.cpp b/solid/solid/video.cpp index caa468fd..d2e2592a 100644 --- a/solid/solid/video.cpp +++ b/solid/solid/video.cpp @@ -53,5 +53,5 @@ QVariant Solid::Video::driverHandle(const QString &driver) const return_SOLID_CALL(Ifaces::Video *, d->backendObject(), QVariant(), driverHandle(driver)); } -#include "video.moc" +#include "moc_video.cpp" diff --git a/solid/tests/fakehardwaretest.cpp b/solid/tests/fakehardwaretest.cpp index e5aaa97d..f5459328 100644 --- a/solid/tests/fakehardwaretest.cpp +++ b/solid/tests/fakehardwaretest.cpp @@ -74,4 +74,4 @@ void FakeHardwareTest::testFakeBackend() delete fakeManager; } -#include "fakehardwaretest.moc" +#include "moc_fakehardwaretest.cpp" diff --git a/solid/tests/networkingclient.cpp b/solid/tests/networkingclient.cpp index 4ead8d69..dd5a7367 100644 --- a/solid/tests/networkingclient.cpp +++ b/solid/tests/networkingclient.cpp @@ -217,5 +217,5 @@ int main(int argc, char **argv) return app.exec(); } -#include "networkingclient.moc" +#include "moc_networkingclient.cpp" diff --git a/solid/tests/solidhwtest.cpp b/solid/tests/solidhwtest.cpp index 63463f85..8ce8c613 100644 --- a/solid/tests/solidhwtest.cpp +++ b/solid/tests/solidhwtest.cpp @@ -483,5 +483,5 @@ void SolidHwTest::slotPropertyChanged(const QMap &changes) } -#include "solidhwtest.moc" +#include "moc_solidhwtest.cpp" diff --git a/solid/tests/solidnettestdbusservice.cpp b/solid/tests/solidnettestdbusservice.cpp index 3150af71..0b5d5210 100644 --- a/solid/tests/solidnettestdbusservice.cpp +++ b/solid/tests/solidnettestdbusservice.cpp @@ -162,6 +162,6 @@ int main( int argc, char** argv ) // - request, delay, online until released // -#include "solidnettestdbusservice.moc" +#include "moc_solidnettestdbusservice.cpp" diff --git a/sonnet/plugins/enchant/enchantclient.cpp b/sonnet/plugins/enchant/enchantclient.cpp index 3e3500e4..57808b7f 100644 --- a/sonnet/plugins/enchant/enchantclient.cpp +++ b/sonnet/plugins/enchant/enchantclient.cpp @@ -101,4 +101,4 @@ void QSpellEnchantClient::removeDictRef(EnchantDict *dict) } } -#include "enchantclient.moc" +#include "moc_enchantclient.cpp" diff --git a/sonnet/plugins/hspell/kspell_hspellclient.cpp b/sonnet/plugins/hspell/kspell_hspellclient.cpp index f8cb5d96..ba6b9bdc 100644 --- a/sonnet/plugins/hspell/kspell_hspellclient.cpp +++ b/sonnet/plugins/hspell/kspell_hspellclient.cpp @@ -58,4 +58,4 @@ QStringList HSpellClient::languages() const return langs; } -#include "kspell_hspellclient.moc" +#include "moc_kspell_hspellclient.cpp" diff --git a/sonnet/plugins/hunspell/kspell_hunspellclient.cpp b/sonnet/plugins/hunspell/kspell_hunspellclient.cpp index f1c890c0..fc842092 100644 --- a/sonnet/plugins/hunspell/kspell_hunspellclient.cpp +++ b/sonnet/plugins/hunspell/kspell_hunspellclient.cpp @@ -65,4 +65,4 @@ QStringList HunspellClient::languages() const return lst; } -#include "kspell_hunspellclient.moc" +#include "moc_kspell_hunspellclient.cpp" diff --git a/threadweaver/Examples/Jobs/Jobs.cpp b/threadweaver/Examples/Jobs/Jobs.cpp index f2e7bc73..e79d1326 100644 --- a/threadweaver/Examples/Jobs/Jobs.cpp +++ b/threadweaver/Examples/Jobs/Jobs.cpp @@ -193,4 +193,4 @@ int main ( int argc, char ** argv) return app.exec(); } -#include "Jobs.moc" +#include "moc_Jobs.cpp" diff --git a/threadweaver/Examples/Jobs/WeaverObserverTest.cpp b/threadweaver/Examples/Jobs/WeaverObserverTest.cpp index 9523e225..5c9715d6 100644 --- a/threadweaver/Examples/Jobs/WeaverObserverTest.cpp +++ b/threadweaver/Examples/Jobs/WeaverObserverTest.cpp @@ -69,4 +69,4 @@ namespace ThreadWeaver { } -#include "WeaverObserverTest.moc" +#include "moc_WeaverObserverTest.cpp" diff --git a/threadweaver/Examples/QProcessJob/MainWindow.cpp b/threadweaver/Examples/QProcessJob/MainWindow.cpp index c8532854..9488bdb0 100644 --- a/threadweaver/Examples/QProcessJob/MainWindow.cpp +++ b/threadweaver/Examples/QProcessJob/MainWindow.cpp @@ -68,4 +68,4 @@ void MainWindow::update( ThreadWeaver::Job *j ) ui.pushButtonQuit->setEnabled( true ); } -#include "MainWindow.moc" +#include "moc_MainWindow.cpp" diff --git a/threadweaver/Examples/QProcessJob/QProcessJob.cpp b/threadweaver/Examples/QProcessJob/QProcessJob.cpp index 5da7b7f6..8f023437 100644 --- a/threadweaver/Examples/QProcessJob/QProcessJob.cpp +++ b/threadweaver/Examples/QProcessJob/QProcessJob.cpp @@ -57,4 +57,4 @@ QString QProcessJob::result() return m_result; } -#include "QProcessJob.moc" +#include "moc_QProcessJob.cpp" diff --git a/threadweaver/Examples/SMIV/ComputeThumbNailJob.cpp b/threadweaver/Examples/SMIV/ComputeThumbNailJob.cpp index 4b6141a2..80fe6de8 100644 --- a/threadweaver/Examples/SMIV/ComputeThumbNailJob.cpp +++ b/threadweaver/Examples/SMIV/ComputeThumbNailJob.cpp @@ -73,4 +73,4 @@ void ComputeThumbNailJob::run() #endif } -#include "ComputeThumbNailJob.moc" +#include "moc_ComputeThumbNailJob.cpp" diff --git a/threadweaver/Examples/SMIV/QImageLoaderJob.cpp b/threadweaver/Examples/SMIV/QImageLoaderJob.cpp index fe4505d1..088b66c1 100644 --- a/threadweaver/Examples/SMIV/QImageLoaderJob.cpp +++ b/threadweaver/Examples/SMIV/QImageLoaderJob.cpp @@ -61,4 +61,4 @@ namespace ThreadWeaver { } -#include "QImageLoaderJob.moc" +#include "moc_QImageLoaderJob.cpp" diff --git a/threadweaver/Examples/SMIV/SMIV.cpp b/threadweaver/Examples/SMIV/SMIV.cpp index 3556750d..e328c3cc 100644 --- a/threadweaver/Examples/SMIV/SMIV.cpp +++ b/threadweaver/Examples/SMIV/SMIV.cpp @@ -174,4 +174,4 @@ int main ( int argc, char** argv ) return app.exec(); } -#include "SMIV.moc" +#include "moc_SMIV.cpp" diff --git a/threadweaver/Examples/SMIV/SMIVItem.cpp b/threadweaver/Examples/SMIV/SMIVItem.cpp index b07ce5b4..92334df5 100644 --- a/threadweaver/Examples/SMIV/SMIVItem.cpp +++ b/threadweaver/Examples/SMIV/SMIVItem.cpp @@ -120,4 +120,4 @@ QImage SMIVItem::thumb() const return m_thumb->thumb(); } -#include "SMIVItem.moc" +#include "moc_SMIVItem.cpp" diff --git a/threadweaver/Examples/SMIV/SMIVItemDelegate.cpp b/threadweaver/Examples/SMIV/SMIVItemDelegate.cpp index 2a454aa5..b22ee914 100644 --- a/threadweaver/Examples/SMIV/SMIVItemDelegate.cpp +++ b/threadweaver/Examples/SMIV/SMIVItemDelegate.cpp @@ -111,4 +111,4 @@ QSize SMIVItemDelegate::sizeHint(const QStyleOptionViewItem & , return QSize ( Width, Height ); } -#include "SMIVItemDelegate.moc" +#include "moc_SMIVItemDelegate.cpp" diff --git a/threadweaver/Examples/SMIV/SMIVModel.cpp b/threadweaver/Examples/SMIV/SMIVModel.cpp index 4dbe7181..36a96201 100644 --- a/threadweaver/Examples/SMIV/SMIVModel.cpp +++ b/threadweaver/Examples/SMIV/SMIVModel.cpp @@ -84,4 +84,4 @@ const SMIVItem* SMIVModel::data( int index ) const return m_data[index]; } -#include "SMIVModel.moc" +#include "moc_SMIVModel.cpp" diff --git a/threadweaver/Examples/SMIV/SMIVView.cpp b/threadweaver/Examples/SMIV/SMIVView.cpp index 2fe068d0..930bec9d 100644 --- a/threadweaver/Examples/SMIV/SMIVView.cpp +++ b/threadweaver/Examples/SMIV/SMIVView.cpp @@ -26,4 +26,4 @@ SMIVView::~SMIVView () { } -#include "SMIVView.moc" +#include "moc_SMIVView.cpp" diff --git a/threadweaver/Experimental/FileLoaderJob.cpp b/threadweaver/Experimental/FileLoaderJob.cpp index 80c2c51f..50b4bfd8 100644 --- a/threadweaver/Experimental/FileLoaderJob.cpp +++ b/threadweaver/Experimental/FileLoaderJob.cpp @@ -98,4 +98,4 @@ void FileLoaderJob::freeMemory() } -#include "FileLoaderJob.moc" +#include "moc_FileLoaderJob.cpp" diff --git a/threadweaver/Tests/AppendCharacterJob.cpp b/threadweaver/Tests/AppendCharacterJob.cpp index a8f7d1d8..28c45a74 100644 --- a/threadweaver/Tests/AppendCharacterJob.cpp +++ b/threadweaver/Tests/AppendCharacterJob.cpp @@ -1,6 +1,6 @@ #include "AppendCharacterJob.h" // make qmake generate the moc file -#include "AppendCharacterJob.moc" +#include "moc_AppendCharacterJob.cpp" diff --git a/threadweaver/Tests/DeleteTest.cpp b/threadweaver/Tests/DeleteTest.cpp index 57b1dc3f..cf2c519d 100644 --- a/threadweaver/Tests/DeleteTest.cpp +++ b/threadweaver/Tests/DeleteTest.cpp @@ -64,4 +64,4 @@ void DeleteTest::deleteSequence(ThreadWeaver::Job* job) QMutex s_GlobalMutex; -#include "DeleteTest.moc" +#include "moc_DeleteTest.cpp" diff --git a/threadweaver/Tests/JobTests.cpp b/threadweaver/Tests/JobTests.cpp index f5e7dacd..bba5604d 100644 --- a/threadweaver/Tests/JobTests.cpp +++ b/threadweaver/Tests/JobTests.cpp @@ -437,4 +437,4 @@ void JobTests::DequeSuspendedSequence() QTEST_MAIN ( JobTests ) -#include "JobTests.moc" +#include "moc_JobTests.cpp" diff --git a/threadweaver/Tests/QueueTests.cpp b/threadweaver/Tests/QueueTests.cpp index 965035ab..f0bf9162 100644 --- a/threadweaver/Tests/QueueTests.cpp +++ b/threadweaver/Tests/QueueTests.cpp @@ -180,4 +180,4 @@ void QueueTests::DeleteCollectionOnDoneTest() QTEST_MAIN ( QueueTests ) -#include "QueueTests.moc" +#include "moc_QueueTests.cpp" diff --git a/threadweaver/Weaver/IncludeMocs.cpp b/threadweaver/Weaver/IncludeMocs.cpp index 6be01920..5bcb27d5 100644 --- a/threadweaver/Weaver/IncludeMocs.cpp +++ b/threadweaver/Weaver/IncludeMocs.cpp @@ -7,7 +7,7 @@ from Trolltech. */ -#include "ThreadWeaver.moc" -#include "WeaverImpl.moc" +#include "moc_ThreadWeaver.cpp" +#include "moc_WeaverImpl.cpp" #include "WeaverInterface.moc" #include "WeaverObserver.moc" diff --git a/threadweaver/Weaver/Job.cpp b/threadweaver/Weaver/Job.cpp index 5a550ca4..c1b70e22 100644 --- a/threadweaver/Weaver/Job.cpp +++ b/threadweaver/Weaver/Job.cpp @@ -237,5 +237,5 @@ void Job::setFinished ( bool status ) // return * d->mutex; // } -#include "Job.moc" -#include "Job_p.moc" +#include "moc_Job.cpp" +#include "moc_Job_p.cpp" diff --git a/threadweaver/Weaver/JobCollection.cpp b/threadweaver/Weaver/JobCollection.cpp index 37ee440f..cfb285c2 100644 --- a/threadweaver/Weaver/JobCollection.cpp +++ b/threadweaver/Weaver/JobCollection.cpp @@ -352,5 +352,5 @@ void JobCollection::dequeueElements() emit done(this); } -#include "JobCollection.moc" -#include "JobCollection_p.moc" +#include "moc_JobCollection.cpp" +#include "moc_JobCollection_p.cpp" diff --git a/threadweaver/Weaver/JobSequence.cpp b/threadweaver/Weaver/JobSequence.cpp index 375995aa..19fb1c09 100644 --- a/threadweaver/Weaver/JobSequence.cpp +++ b/threadweaver/Weaver/JobSequence.cpp @@ -70,4 +70,4 @@ void JobSequence::internalJobDone( Job* job) JobCollection::internalJobDone(job); } -#include "JobSequence.moc" +#include "moc_JobSequence.cpp" diff --git a/threadweaver/Weaver/Thread.cpp b/threadweaver/Weaver/Thread.cpp index db781f0c..44a36253 100644 --- a/threadweaver/Weaver/Thread.cpp +++ b/threadweaver/Weaver/Thread.cpp @@ -127,4 +127,4 @@ void Thread::requestAbort () } } -#include "Thread.moc" +#include "moc_Thread.cpp" diff --git a/threadweaver/Weaver/ThreadWeaver.cpp b/threadweaver/Weaver/ThreadWeaver.cpp index ae8945e0..e5257ed3 100644 --- a/threadweaver/Weaver/ThreadWeaver.cpp +++ b/threadweaver/Weaver/ThreadWeaver.cpp @@ -159,4 +159,4 @@ void Weaver::requestAbort() d->implementation->requestAbort(); } -#include "ThreadWeaver.moc" +#include "moc_ThreadWeaver.cpp" diff --git a/threadweaver/Weaver/WeaverImpl.cpp b/threadweaver/Weaver/WeaverImpl.cpp index 6042c96e..9b4cf11a 100644 --- a/threadweaver/Weaver/WeaverImpl.cpp +++ b/threadweaver/Weaver/WeaverImpl.cpp @@ -423,4 +423,4 @@ void WeaverImpl::dumpJobs() } } -#include "WeaverImpl.moc" +#include "moc_WeaverImpl.cpp" diff --git a/threadweaver/Weaver/WeaverInterface.cpp b/threadweaver/Weaver/WeaverInterface.cpp index b119f8e0..3caf6172 100644 --- a/threadweaver/Weaver/WeaverInterface.cpp +++ b/threadweaver/Weaver/WeaverInterface.cpp @@ -35,4 +35,4 @@ WeaverInterface:: WeaverInterface ( QObject* parent ) { } -#include "WeaverInterface.moc" +#include "moc_WeaverInterface.cpp" diff --git a/threadweaver/Weaver/WeaverObserver.cpp b/threadweaver/Weaver/WeaverObserver.cpp index 361ea61b..07564cac 100644 --- a/threadweaver/Weaver/WeaverObserver.cpp +++ b/threadweaver/Weaver/WeaverObserver.cpp @@ -39,4 +39,4 @@ WeaverObserver::~WeaverObserver() { } -#include "WeaverObserver.moc" +#include "moc_WeaverObserver.cpp" diff --git a/threadweaver/WeaverGui/WeaverThreadGrid.cpp b/threadweaver/WeaverGui/WeaverThreadGrid.cpp index 1c6ec7d8..0278dfd2 100644 --- a/threadweaver/WeaverGui/WeaverThreadGrid.cpp +++ b/threadweaver/WeaverGui/WeaverThreadGrid.cpp @@ -134,4 +134,4 @@ namespace ThreadWeaver { } -#include "WeaverThreadGrid.moc" +#include "moc_WeaverThreadGrid.cpp"