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

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

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

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})

dnssd/avahi-domainbrowser.cpp

@@ -105,5 +105,5 @@ bool DomainBrowser::isRunning() const
 
 
 }
-#include "domainbrowser.moc"
+#include "moc_domainbrowser.cpp"
-#include "avahi-domainbrowser_p.moc"
+#include "moc_avahi-domainbrowser_p.cpp"

dnssd/avahi-publicservice.cpp

@@ -259,5 +259,5 @@ void PublicService::virtual_hook(int, void*)
 
 }
 
-#include "publicservice.moc"
+#include "moc_publicservice.cpp"
-#include "avahi-publicservice_p.moc"
+#include "moc_avahi-publicservice_p.cpp"

dnssd/avahi-remoteservice.cpp

@@ -120,5 +120,5 @@ void RemoteService::virtual_hook(int, void*)
 
 }
 
-#include "remoteservice.moc"
+#include "moc_remoteservice.cpp"
-#include "avahi-remoteservice_p.moc"
+#include "moc_avahi-remoteservice_p.cpp"

dnssd/avahi-servicebrowser.cpp

@@ -189,5 +189,5 @@ QString ServiceBrowser::getLocalHostName()
 
 }
 
-#include "servicebrowser.moc"
+#include "moc_servicebrowser.cpp"
-#include "avahi-servicebrowser_p.moc"
+#include "moc_avahi-servicebrowser_p.cpp"

dnssd/avahi-servicetypebrowser.cpp

@@ -98,5 +98,5 @@ bool ServiceTypeBrowser::isRunning() const
 
 
 }
-#include "servicetypebrowser.moc"
+#include "moc_servicetypebrowser.cpp"
-#include "avahi-servicetypebrowser_p.moc"
+#include "moc_avahi-servicetypebrowser_p.cpp"

dnssd/avahi_entrygroup_interface.cpp

@@ -27,4 +27,4 @@ OrgFreedesktopAvahiEntryGroupInterface::~OrgFreedesktopAvahiEntryGroupInterface(
 }
 
 
-#include "avahi_entrygroup_interface.moc"
+#include "moc_avahi_entrygroup_interface.cpp"

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"

dnssd/avahi_serviceresolver_interface.cpp

@@ -26,4 +26,4 @@ OrgFreedesktopAvahiServiceResolverInterface::~OrgFreedesktopAvahiServiceResolver
 }
 
 
-#include "avahi_serviceresolver_interface.moc"
+#include "moc_avahi_serviceresolver_interface.cpp"

dnssd/dummy-domainbrowser.cpp

@@ -45,4 +45,4 @@ bool DomainBrowser::isRunning() const
 }
 
 }
-#include "domainbrowser.moc"
+#include "moc_domainbrowser.cpp"

dnssd/dummy-publicservice.cpp

@@ -95,4 +95,4 @@ void PublicService::virtual_hook(int, void*)
 
 }
 
-#include "publicservice.moc"
+#include "moc_publicservice.cpp"

dnssd/dummy-remoteservice.cpp

@@ -58,4 +58,4 @@ void RemoteService::virtual_hook(int, void*)
 
 }
 
-#include "remoteservice.moc"
+#include "moc_remoteservice.cpp"

dnssd/dummy-servicebrowser.cpp

@@ -69,4 +69,4 @@ QString ServiceBrowser::getLocalHostName()
 
 }
 
-#include "servicebrowser.moc"
+#include "moc_servicebrowser.cpp"

dnssd/dummy-servicetypebrowser.cpp

@@ -47,4 +47,4 @@ bool ServiceTypeBrowser::isRunning() const
 #endif
 
 }
-#include "servicetypebrowser.moc"
+#include "moc_servicetypebrowser.cpp"

dnssd/mdnsd-domainbrowser.cpp

@@ -127,5 +127,5 @@ void domain_callback(DNSServiceRef, DNSServiceFlags flags, uint32_t, DNSServiceE
 
 
 
-#include "domainbrowser.moc"
+#include "moc_domainbrowser.cpp"
-#include "mdnsd-domainbrowser_p.moc"
+#include "moc_mdnsd-domainbrowser_p.cpp"

dnssd/mdnsd-publicservice.cpp

@@ -204,4 +204,4 @@ void PublicService::virtual_hook(int, void*)
 
 }
 
-#include "publicservice.moc"
+#include "moc_publicservice.cpp"

dnssd/mdnsd-remoteservice.cpp

@@ -151,4 +151,4 @@ void resolve_callback    (    DNSServiceRef,
 
 }
 
-#include "remoteservice.moc"
+#include "moc_remoteservice.cpp"

dnssd/mdnsd-responder.cpp

@@ -82,4 +82,4 @@ QString DNSToDomain(const char* domain)
 }
 
 }
-#include "mdnsd-responder.moc"
+#include "moc_mdnsd-responder.cpp"

dnssd/mdnsd-servicebrowser.cpp

@@ -197,5 +197,5 @@ QString ServiceBrowser::getLocalHostName()
 
 }
 
-#include "servicebrowser.moc"
+#include "moc_servicebrowser.cpp"
-#include "mdnsd-servicebrowser_p.moc"
+#include "moc_mdnsd-servicebrowser_p.cpp"

dnssd/mdnsd-servicetypebrowser.cpp

@@ -76,5 +76,5 @@ void ServiceTypeBrowserPrivate::removeService(DNSSD::RemoteService::Ptr srv)
 
 
 
-#include "servicetypebrowser.moc"
+#include "moc_servicetypebrowser.cpp"
-#include "mdnsd-servicetypebrowser_p.moc"
+#include "moc_mdnsd-servicetypebrowser_p.cpp"

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"

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"

interfaces/kimproxy/library/kimproxy.cpp

@@ -651,4 +651,4 @@ QString KIMProxy::preferredApp()
 	return preferredApp;
 }
 
-#include "kimproxy.moc"
+#include "moc_kimproxy.cpp"

interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp

@@ -150,4 +150,4 @@ void KFileAudioPreview::toggleAuto( bool on )
         d->player->stop();
 }
 
-#include "kfileaudiopreview.moc"
+#include "moc_kfileaudiopreview.cpp"

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

interfaces/kmediaplayer/kmediaplayeradaptor.cpp

@@ -128,4 +128,4 @@ void KMediaPlayerAdaptor::stop()
 }
 
 
-#include "kmediaplayeradaptor_p.moc"
+#include "moc_kmediaplayeradaptor_p.cpp"

interfaces/kmediaplayer/player.cpp

@@ -74,4 +74,4 @@ int KMediaPlayer::Player::state(void) const
 	return (int)currentState;
 }
 
-#include "player.moc"
+#include "moc_player.cpp"

interfaces/kmediaplayer/view.cpp

@@ -86,4 +86,4 @@ QWidget* KMediaPlayer::View::videoWidget()
 	return d->videoWidget;
 }
 
-#include "view.moc"
+#include "moc_view.cpp"

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"

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;

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;
 

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"
 

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;

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"

kconf_update/tests/test_kconfigutils.cpp

@@ -149,4 +149,4 @@ void TestKConfigUtils::testUnescapeString()
     }
 }
 
-#include "test_kconfigutils.moc"
+#include "moc_test_kconfigutils.cpp"

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"

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<KConfigBackend> BackendPtr;
 

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"
 

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 <config.h>
 #include <config-date.h>

kdecore/io/kautosavefile.cpp

@@ -226,4 +226,4 @@ QList<KAutoSaveFile *> KAutoSaveFile::allStaleFiles(const QString &applicationNa
     return list;
 }
 
-#include "kautosavefile.moc"
+#include "moc_kautosavefile.cpp"

kdecore/io/kdebugdbusiface.cpp

@@ -43,4 +43,4 @@ void KDebugDBusIface::printBacktrace()
     kDebug() << kBacktrace();
 }
 
-#include "kdebugdbusiface_p.moc"
+#include "moc_kdebugdbusiface_p.cpp"

kdecore/io/kdirwatch.cpp

@@ -1915,7 +1915,7 @@ KDirWatch::Method KDirWatch::internalMethod()
 }
 
 
-#include "kdirwatch.moc"
+#include "moc_kdirwatch.cpp"
-#include "kdirwatch_p.moc"
+#include "moc_kdirwatch_p.cpp"
 
 //sven

kdecore/io/kprocess.cpp

@@ -358,4 +358,4 @@ int KProcess::pid() const
 #endif
 }
 
-#include "kprocess.moc"
+#include "moc_kprocess.cpp"

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"

kdecore/jobs/kjob.cpp

@@ -367,4 +367,4 @@ void KJob::setAutoDelete( bool autodelete )
     d->isAutoDelete = autodelete;
 }
 
-#include "kjob.moc"
+#include "moc_kjob.cpp"

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"

kdecore/jobs/kjobuidelegate.cpp

@@ -117,4 +117,4 @@ void KJobUiDelegate::Private::_k_result(KJob *job2)
         q->showErrorMessage();
 }
 
-#include "kjobuidelegate.moc"
+#include "moc_kjobuidelegate.cpp"

kdecore/kernel/ktoolinvocation.cpp

@@ -386,4 +386,4 @@ void KToolInvocation::startKdeinit()
 //    qApp->restoreOverrideCursor();
 }
 
-#include "ktoolinvocation.moc"
+#include "moc_ktoolinvocation.cpp"

kdecore/network/klocalsocket.cpp

@@ -222,4 +222,4 @@ QString KLocalSocketServer::errorString() const
     return d->errorString;
 }
 
-#include "klocalsocket.moc"
+#include "moc_klocalsocket.cpp"

kdecore/network/ksslcertificatemanager.cpp

@@ -530,4 +530,4 @@ void _setAllKsslCaCertificates(KSslCertificateManager *cm, const QList<KSslCaCer
     KSslCertificateManagerPrivate::get(cm)->setAllCertificates(certsIn);
 }
 
-#include "kssld/kssld_interface.moc"
+#include "kssld/moc_kssld_interface.cpp"

kdecore/network/kssld/kssld.cpp

@@ -280,5 +280,5 @@ KSslCertificateRule KSSLD::rule(const QSslCertificate &cert, const QString &host
 }
 
 
-#include "kssld.moc"
+#include "moc_kssld.cpp"
-#include "kssld_adaptor.moc"
+#include "moc_kssld_adaptor.cpp"

kdecore/network/ktcpsocket.cpp

@@ -1150,4 +1150,4 @@ KSslErrorUiData &KSslErrorUiData::operator=(const KSslErrorUiData &other)
 }
 
 
-#include "ktcpsocket.moc"
+#include "moc_ktcpsocket.cpp"

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"

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"

kdecore/sonnet/client.cpp

@@ -30,4 +30,4 @@ Client::Client( QObject *parent )
 
 }
 
-#include "client_p.moc"
+#include "moc_client_p.cpp"

kdecore/sonnet/loader.cpp

@@ -295,4 +295,4 @@ void Loader::changed()
 
 }
 
-#include "loader_p.moc"
+#include "moc_loader_p.cpp"

kdecore/sonnet/tests/test_core.cpp

@@ -169,4 +169,4 @@ void SonnetCoreTest::testCore2()
     kDebug()<<"\tlang is "<<Sonnet::detectLanguage(sentence);
 }
 
-#include "test_core.moc"
+#include "moc_test_core.cpp"

kdecore/sonnet/tests/test_dialog.cpp

@@ -20,7 +20,7 @@
  * 02110-1301  USA
  */
 #include "test_dialog.h"
-#include "test_dialog.moc"
+#include "moc_test_dialog.cpp"
 
 #include "backgroundchecker.h"
 #include "filter_p.h"

kdecore/sonnet/tests/test_filter.cpp

@@ -158,4 +158,4 @@ void SonnetFilterTest::testIndic()
     QCOMPARE( hitNumber, hits.count() );
 }
 
-#include "test_filter.moc"
+#include "moc_test_filter.cpp"

kdecore/sycoca/ksycoca.cpp

@@ -590,4 +590,4 @@ void KSycoca::clearCaches()
         ksycocaInstance->sycoca()->d->closeDatabase();
 }
 
-#include "ksycoca.moc"
+#include "moc_ksycoca.cpp"

kdecore/tests/karchivetest.cpp

@@ -21,7 +21,7 @@
 
 #include "karchivetest.h"
 #include <kmimetype.h>
-#include "karchivetest.moc"
+#include "moc_karchivetest.cpp"
 #include <ktar.h>
 #include <kzip.h>
 

kdecore/tests/kasciitest.cpp

@@ -50,4 +50,4 @@ void KAsciiTest::testkasciistricmp()
   QVERIFY( kasciistricmp( "B", "A" ) > 0 );
 }
 
-#include "kasciitest.moc"
+#include "moc_kasciitest.cpp"

kdecore/tests/kautosavefiletest.cpp

@@ -111,4 +111,4 @@ void KAutoSaveFileTest::test_locking()
 
 }
 
-#include "kautosavefiletest.moc"
+#include "moc_kautosavefiletest.cpp"

kdecore/tests/kautostarttest.cpp

@@ -23,7 +23,7 @@
 
 #include <qtest_kde.h>
 
-#include "kautostarttest.moc"
+#include "moc_kautostarttest.cpp"
 
 #include <QtCore/QFile>
 

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*/)
 

kdecore/tests/kcompositejobtest.cpp

@@ -104,4 +104,4 @@ void KCompositeJobTest::testDeletionDuringExecution()
 
 QTEST_KDEMAIN_CORE( KCompositeJobTest );
 
-#include "kcompositejobtest.moc"
+#include "moc_kcompositejobtest.cpp"

kdecore/tests/kconfigtest.cpp

@@ -23,7 +23,7 @@
 #include <ktempdir.h>
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
-#include "kconfigtest.moc"
+#include "moc_kconfigtest.cpp"
 
 #include <kconfig.h>
 #include <kdebug.h>

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*/)
 

kdecore/tests/kdatetimetest.cpp

@@ -28,7 +28,7 @@
 #include <kconfiggroup.h>
 #include <QtDBus/QtDBus>
 
-#include "kdatetimetest.moc"
+#include "moc_kdatetimetest.cpp"
 
 //TODO: test new methods
 

kdecore/tests/kdebug_unittest.cpp

@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include "kdebug_unittest.moc"
+#include "moc_kdebug_unittest.cpp"
 
 QTEST_KDEMAIN_CORE( KDebugTest )
 

kdecore/tests/kdesktopfiletest.cpp

@@ -19,7 +19,7 @@
 #include <kconfiggroup.h>
 #include <ktemporaryfile.h>
 #include <kstandarddirs.h>
-#include "kdesktopfiletest.moc"
+#include "moc_kdesktopfiletest.cpp"
 
 #include "kdesktopfile.h"
 

kdecore/tests/kdirwatchtest.cpp

@@ -83,4 +83,4 @@ int main (int argc, char **argv)
 
   return a.exec();
 }
-#include "kdirwatchtest.moc"
+#include "moc_kdirwatchtest.cpp"

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"

kdecore/tests/kencodingdetectortest.cpp

@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kencodingdetector.h>
 
-#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";

kdecore/tests/kentrymaptest.cpp

@@ -22,7 +22,7 @@
 #include <qtest_kde.h>
 #include "kconfigdata.h"
 
-#include "kentrymaptest.moc"
+#include "moc_kentrymaptest.cpp"
 
 const QByteArray group1("A Group");
 const QByteArray key1("A Key");

kdecore/tests/kfiltertest.cpp

@@ -428,4 +428,4 @@ void KFilterTest::slotFilterOutput(const QByteArray& data)
     m_filterOutput += data;
 }
 
-#include "kfiltertest.moc"
+#include "moc_kfiltertest.cpp"

kdecore/tests/kjobtest.cpp

@@ -416,4 +416,4 @@ void TestJobUiDelegate::connectJob( KJob *job )
     QVERIFY( job->uiDelegate()!=0 );
 }
 
-#include "kjobtest.moc"
+#include "moc_kjobtest.cpp"

kdecore/tests/klibloadertest.cpp

@@ -19,7 +19,7 @@
 #include "klibloadertest.h"
 
 #include <qtest_kde.h>
-#include "klibloadertest.moc"
+#include "moc_klibloadertest.cpp"
 
 QTEST_KDEMAIN_CORE( KLibLoaderTest )
 

kdecore/tests/klimitediodevicetest.cpp

@@ -76,4 +76,4 @@ void KLimitedIODeviceTest::testSeeking()
     QCOMPARE(dev.readAll(), chunk.data);
 }
 
-#include "klimitediodevicetest.moc"
+#include "moc_klimitediodevicetest.cpp"

kdecore/tests/klocaletest.cpp

@@ -33,7 +33,7 @@
 #include <QtCore/QDate>
 #include <QtDBus/QtDBus>
 
-#include "klocaletest.moc"
+#include "moc_klocaletest.cpp"
 
 void
 KLocaleTest::initTestCase()

kdecore/tests/klocaletimeformattest.cpp

@@ -213,4 +213,4 @@ void KLocaleTimeFormatTest::formatAndReadAllCountriesTest()
 }
 
 QTEST_MAIN(KLocaleTimeFormatTest)
-#include "klocaletimeformattest.moc"
+#include "moc_klocaletimeformattest.cpp"

kdecore/tests/klocalizedstringtest.cpp

@@ -35,7 +35,7 @@
 
 #include <QtCore/QString>
 
-#include "klocalizedstringtest.moc"
+#include "moc_klocalizedstringtest.cpp"
 
 void KLocalizedStringTest::initTestCase ()
 {

kdecore/tests/klocalsocketservertest.cpp

@@ -299,4 +299,4 @@ void tst_KLocalSocketServer::abstractUnixSocket()
 
 QTEST_MAIN(tst_KLocalSocketServer)
 
-#include "klocalsocketservertest.moc"
+#include "moc_klocalsocketservertest.cpp"

kdecore/tests/klocalsockettest.cpp

@@ -243,4 +243,4 @@ void tst_KLocalSocket::connected()
 
 QTEST_MAIN(tst_KLocalSocket)
 
-#include "klocalsockettest.moc"
+#include "moc_klocalsockettest.cpp"

kdecore/tests/klockfiletest.cpp

@@ -17,7 +17,7 @@
 */
 
 #include "klockfiletest.h"
-#include "klockfiletest.moc"
+#include "moc_klockfiletest.cpp"
 
 #include <kdebug.h>
 #include <unistd.h>

kdecore/tests/kmd5benchmark.cpp

@@ -114,4 +114,4 @@ private Q_SLOTS:
 
 QTEST_KDEMAIN_CORE( KMd5Test )
 
-#include "kmd5test.moc"
+#include "kmd5benchmark.moc"

kdecore/tests/kmimeglobsfileparsertest.cpp

@@ -272,4 +272,4 @@ private:
 
 QTEST_KDEMAIN_CORE( KMimeFileParserTest )
 
-#include "kmimefileparsertest.moc"
+#include "kmimeglobsfileparsertest.moc"

kdecore/tests/kmimetypetest.cpp

@@ -996,4 +996,4 @@ void KMimeTypeTest::testProperties()
     QCOMPARE(patterns.toStringList(), pngMimeType->patterns());
 }
 
-#include "kmimetypetest.moc"
+#include "moc_kmimetypetest.cpp"

kdecore/tests/kmountpointtest.cpp

@@ -18,7 +18,7 @@
 
 #include "kmountpointtest.h"
 #include <qtest_kde.h>
-#include "kmountpointtest.moc"
+#include "moc_kmountpointtest.cpp"
 
 #include "kmountpoint.h"
 #include <kdebug.h>

kdecore/tests/ksavefiletest.cpp

@@ -462,4 +462,4 @@ void KSaveFileTest::cleanupTestCase()
     }
 }
 
-#include "ksavefiletest.moc"
+#include "moc_ksavefiletest.cpp"

kdecore/tests/kservicetest.cpp

@@ -19,7 +19,7 @@
 #include <locale.h>
 
 #include "kservicetest.h"
-#include "kservicetest.moc"
+#include "moc_kservicetest.cpp"
 #include <qtest_kde.h>
 
 #include <kconfig.h>

kdecore/tests/ksharedptrtest.cpp

@@ -162,4 +162,4 @@ void KSharedPtrTest::testOrdering()
 	QCOMPARE( map.count(), 2 );
 }
 
-#include "ksharedptrtest.moc"
+#include "moc_ksharedptrtest.cpp"

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 )
 

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)
 

kdecore/tests/ktcpsockettest.cpp

@@ -386,4 +386,4 @@ void Server::errors()
 
 QTEST_MAIN(KTcpSocketTest)
 
-#include "ktcpsockettest.moc"
+#include "moc_ktcpsockettest.cpp"

kdecore/tests/ktempdirtest.cpp

@@ -23,7 +23,7 @@
 #include <QtCore/QDir>
 
 #include "ktempdir.h"
-#include "ktempdirtest.moc"
+#include "moc_ktempdirtest.cpp"
 
 void KTempDirTest::testNoDelete()
 {

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 )
 

kdecore/tests/ktimezonestest.cpp

@@ -27,7 +27,7 @@
 #include <config-date.h> // for HAVE_TM_GMTOFF
 #include "ksystemtimezone.h"
 #include "ktzfiletimezone.h"
-#include "ktimezonestest.moc"
+#include "moc_ktimezonestest.cpp"
 
 QTEST_KDEMAIN_CORE(KTimeZonesTest)